diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index 1b2d2264..7e4bcb42 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -133,7 +133,7 @@ $('#dataGrid').dataGrid({ editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } }, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();} }, @@ -141,7 +141,7 @@ $('#dataGrid').dataGrid({ // editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', // items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), // itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ -// $(element).select2().on("change",function(){$(this).resetValid()}); +// js.select2(element).on("change",function(){$(this).resetValid()}); // } // }, unformat: function(val, obj, cell){return $('#'+obj.rowId+'_'+obj.colModel.name, cell).val();} // }, diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index 7c00e7df..3be4e152 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -14,105 +14,105 @@
- <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="testInput" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/> -  -  - <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" - dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> -
-
-
- -
- <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/> -  -  - <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" - dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> -
-
-
- -
- <#form:treeselect id="testUser" title="用户选择" - path="testUser.userCode" labelPath="testUser.userName" - url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> -
-
-
- -
- <#form:treeselect id="testOffice" title="机构选择" - path="testOffice.officeCode" labelPath="testOffice.officeName" - url="${ctx}/sys/office/treeData" allowClear="true"/> -
-
-
- -
- <#form:treeselect id="testAreaCode" title="区域选择" - path="testAreaCode" labelPath="testAreaName" - url="${ctx}/sys/area/treeData" allowClear="true"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> -
-
-
- -
- <#form:input path="remarks" maxlength="500" class="form-control width-120"/> -
-
-
- - -
- + <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date" + dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="testDate_lte.click()"/> +  -  + <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control laydate width-date" + dataFormat="date" data-type="date" data-format="yyyy-MM-dd"/> +
+
+
+ +
+ <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control laydate width-datetime" + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm" data-done="testDatetime_lte.click()"/> +  -  + <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control laydate width-datetime" + dataFormat="datetime" data-type="datetime" data-format="yyyy-MM-dd HH:mm"/> +
+
+
+ +
+ <#form:treeselect id="testUser" title="用户选择" + path="testUser.userCode" labelPath="testUser.userName" + url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testOffice" title="机构选择" + path="testOffice.officeCode" labelPath="testOffice.officeName" + url="${ctx}/sys/office/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testAreaCode" title="区域选择" + path="testAreaCode" labelPath="testAreaName" + url="${ctx}/sys/area/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control isQuick"/> +
+
+
+ +
+ <#form:input path="remarks" maxlength="500" class="form-control width-120"/> +
+
+
+ + +
+
diff --git a/web/src/main/resources/views/modules/demo/demoFormEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html index 1c7ca916..4f5dc135 100644 --- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html @@ -333,7 +333,7 @@ $("#testDataChildDataGrid").dataGrid({ editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } } }, @@ -341,7 +341,7 @@ $("#testDataChildDataGrid").dataGrid({ editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } } }, @@ -349,7 +349,7 @@ $("#testDataChildDataGrid").dataGrid({ editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } } }, @@ -357,7 +357,7 @@ $("#testDataChildDataGrid").dataGrid({ editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } } }, diff --git a/web/src/main/resources/views/modules/demo/demoFormTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html index c5e00206..7d7f3792 100644 --- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html @@ -163,7 +163,7 @@ $("#testDataChildDataGrid").dataGrid({ editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ - $(element).select2().on("change",function(){$(this).resetValid()}); + js.select2(element).on("change",function(){$(this).resetValid()}); } } }, diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index aaa13bb1..a106be91 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -14,11 +14,11 @@
${text('基本信息')}
<#form:hidden path="id"/>
-
+
-