diff --git a/modules/app/src/main/resources/views/modules/app/appCommentList.html b/modules/app/src/main/resources/views/modules/app/appCommentList.html index 12088760..582de8e2 100644 --- a/modules/app/src/main/resources/views/modules/app/appCommentList.html +++ b/modules/app/src/main/resources/views/modules/app/appCommentList.html @@ -60,7 +60,7 @@ <% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 33becfb7..011b0cb4 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -62,7 +62,7 @@ <% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html index fa605145..3c698fda 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html @@ -27,14 +27,14 @@ <% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html index 50cb4fba..857bb184 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html @@ -74,7 +74,7 @@ checkbox="false" itemCode="userCode" itemName="userName"/> <% } %> - - - - -
-
- -
- <#form:input path="areaSelectValue" maxlength="200" class="form-control"/> -
-
-
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ +
+ <#form:input path="areaSelectValue" maxlength="200" class="form-control"/> +
+
+
@@ -242,7 +242,7 @@
- <#form:ueditor path="remarks" maxlength="10000" height="200" class="" + <#form:ueditor path="remarks" maxlength="10000" height="200" class="" simpleToolbars="true" readonly="false" outline="false"/>
@@ -258,20 +258,20 @@
- -
-
-
- -
- <#form:fileupload id="uploadImage2" returnPath="true" - filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name" - uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/> - <#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/> - <#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/> -
-
-
+
+
+
+
+ +
+ <#form:fileupload id="uploadImage2" returnPath="true" + filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name" + uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/> + <#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/> + <#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/> +
+
+
@@ -291,26 +291,26 @@ 增行 <% } %>
-
-
-
-
- <% if (hasPermi('test:testData:edit')){ %> -   - <% } %> - -
-
-
- - - -<% } %> + +
+
+
+ <% if (hasPermi('test:testData:edit')){ %> +   + <% } %> + +
+
+
+ + + +<% } %> - - + \ No newline at end of file diff --git a/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html b/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html index 7d7f3792..884a359d 100644 --- a/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html +++ b/web-fast/src/main/resources/views/modules/demo/demoFormTableForm.html @@ -149,7 +149,7 @@ //初始化测试数据子表DataGrid对象 $("#testDataChildDataGrid").dataGrid({ - data: ${toJson(testData.testDataChildList)}, + data: "#{toJson(testData.testDataChildList)}", datatype: "local", // 设置本地数据 autoGridHeight: function(){return 'auto'}, // 设置自动高度 @@ -161,7 +161,7 @@ $("#testDataChildDataGrid").dataGrid({ {header:'多行文本', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'下拉框', name:'testSelect', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -211,7 +211,7 @@ $("#testDataChildDataGrid").dataGrid({ editGridInputFormListName: 'testDataChildList', // 提交的数据列表名 editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,testAreaCode,testAreaName,', // 提交数据列表的属性字段 - // 加载成功后执行事件 + //# // 加载成功后执行事件 ajaxSuccess: function(data){ } diff --git a/web-fast/src/main/resources/views/modules/test/testDataForm.html b/web-fast/src/main/resources/views/modules/test/testDataForm.html index a106be91..1df64c29 100644 --- a/web-fast/src/main/resources/views/modules/test/testDataForm.html +++ b/web-fast/src/main/resources/views/modules/test/testDataForm.html @@ -196,7 +196,7 @@ //初始化测试数据子表DataGrid对象 $("#testDataChildDataGrid").dataGrid({ - data: ${toJson(testData.testDataChildList)}, + data: "#{toJson(testData.testDataChildList)}", datatype: "local", // 设置本地数据 autoGridHeight: function(){return 'auto'}, // 设置自动高度 @@ -221,7 +221,7 @@ $("#testDataChildDataGrid").dataGrid({ {header:'${text("多行文本")}', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'${text("下拉框")}', name:'testSelect', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -229,7 +229,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("下拉多选")}', name:'testSelectMultiple', width:90, fixed: true, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -237,7 +237,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("单选框")}', name:'testRadio', width:135, fixed: true, editable:true, edittype:'radio', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -245,7 +245,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("复选框")}', name:'testCheckbox', width:135, fixed: true, editable:true, edittype:'checkbox', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -364,7 +364,7 @@ $("#testDataChildDataGrid").dataGrid({ +'testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,' +'testAreaCode,testAreaName,testDataChild_file,testDataChild_file__del', // 提交数据列表的属性字段 - // 加载成功后执行事件 + //# // 加载成功后执行事件 ajaxSuccess: function(data){ // $('#jqgh_testDataChildDataGrid_rn').append('' diff --git a/web-fast/src/main/resources/views/modules/test/testDataList.html b/web-fast/src/main/resources/views/modules/test/testDataList.html index d730342d..ba70b40b 100644 --- a/web-fast/src/main/resources/views/modules/test/testDataList.html +++ b/web-fast/src/main/resources/views/modules/test/testDataList.html @@ -118,7 +118,7 @@ <% } %> - - - - -
-
- -
- <#form:input path="areaSelectValue" maxlength="200" class="form-control"/> -
-
-
+ +
+
+
+ +
+
+ + +
+
+
+
+
+ +
+ <#form:input path="areaSelectValue" maxlength="200" class="form-control"/> +
+
+
@@ -242,7 +242,7 @@
- <#form:ueditor path="remarks" maxlength="10000" height="200" class="" + <#form:ueditor path="remarks" maxlength="10000" height="200" class="" simpleToolbars="true" readonly="false" outline="false"/>
@@ -258,20 +258,20 @@
- -
-
-
- -
- <#form:fileupload id="uploadImage2" returnPath="true" - filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name" - uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/> - <#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/> - <#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/> -
-
-
+
+
+
+
+ +
+ <#form:fileupload id="uploadImage2" returnPath="true" + filePathInputId="uploadImage2Path" fileNameInputId="uploadImage2Name" + uploadType="image" readonly="false" preview="true" maxUploadNum="3" isMini="false"/> + <#form:input name="uploadImage2Path" value="/js/userfiles/fileupload/201812/1073024549485039616.png|/js/userfiles/fileupload/201812/1073043095867133952.png" class="form-control"/> + <#form:input name="uploadImage2Name" value="0 (1).png|0 (2).png" class="form-control"/> +
+
+
@@ -291,26 +291,26 @@ 增行 <% } %>
-
-
-
-
- <% if (hasPermi('test:testData:edit')){ %> -   - <% } %> - -
-
-
- - - -<% } %> + +
+
+
+ <% if (hasPermi('test:testData:edit')){ %> +   + <% } %> + +
+
+
+ + + +<% } %> - - + \ No newline at end of file diff --git a/web/src/main/resources/views/modules/demo/demoFormTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html index 7d7f3792..884a359d 100644 --- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html @@ -149,7 +149,7 @@ //初始化测试数据子表DataGrid对象 $("#testDataChildDataGrid").dataGrid({ - data: ${toJson(testData.testDataChildList)}, + data: "#{toJson(testData.testDataChildList)}", datatype: "local", // 设置本地数据 autoGridHeight: function(){return 'auto'}, // 设置自动高度 @@ -161,7 +161,7 @@ $("#testDataChildDataGrid").dataGrid({ {header:'多行文本', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'下拉框', name:'testSelect', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -211,7 +211,7 @@ $("#testDataChildDataGrid").dataGrid({ editGridInputFormListName: 'testDataChildList', // 提交的数据列表名 editGridInputFormListAttrs: 'status,id,testSort,testData.id,testInput,testTextarea,testSelect,testSelectMultiple,testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,testAreaCode,testAreaName,', // 提交数据列表的属性字段 - // 加载成功后执行事件 + //# // 加载成功后执行事件 ajaxSuccess: function(data){ } diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index a106be91..1df64c29 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -196,7 +196,7 @@ //初始化测试数据子表DataGrid对象 $("#testDataChildDataGrid").dataGrid({ - data: ${toJson(testData.testDataChildList)}, + data: "#{toJson(testData.testDataChildList)}", datatype: "local", // 设置本地数据 autoGridHeight: function(){return 'auto'}, // 设置自动高度 @@ -221,7 +221,7 @@ $("#testDataChildDataGrid").dataGrid({ {header:'${text("多行文本")}', name:'testTextarea', width:100, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, {header:'${text("下拉框")}', name:'testSelect', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -229,7 +229,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("下拉多选")}', name:'testSelectMultiple', width:90, fixed: true, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -237,7 +237,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("单选框")}', name:'testRadio', width:135, fixed: true, editable:true, edittype:'radio', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -245,7 +245,7 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("复选框")}', name:'testCheckbox', width:135, fixed: true, editable:true, edittype:'checkbox', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -364,7 +364,7 @@ $("#testDataChildDataGrid").dataGrid({ +'testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testOffice.officeCode,' +'testAreaCode,testAreaName,testDataChild_file,testDataChild_file__del', // 提交数据列表的属性字段 - // 加载成功后执行事件 + //# // 加载成功后执行事件 ajaxSuccess: function(data){ // $('#jqgh_testDataChildDataGrid_rn').append('' diff --git a/web/src/main/resources/views/modules/test/testDataForm2.html b/web/src/main/resources/views/modules/test/testDataForm2.html index 53db0c08..fcf7f6db 100644 --- a/web/src/main/resources/views/modules/test/testDataForm2.html +++ b/web/src/main/resources/views/modules/test/testDataForm2.html @@ -211,7 +211,7 @@ //初始化测试数据子表DataGrid对象 $("#testDataChildDataGrid").dataGrid({ - data: ${toJson(testData.testDataChildList)}, + data: "#{toJson(testData.testDataChildList)}", datatype: "local", // 设置本地数据 autoGridHeight: function(){return 'auto'}, // 设置自动高度 @@ -243,7 +243,7 @@ $("#testDataChildDataGrid").dataGrid({ return val; }, editable:true, edittype:'select', editoptions:{'class':'form-control', - items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -257,7 +257,7 @@ $("#testDataChildDataGrid").dataGrid({ return val; }, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); } @@ -271,7 +271,7 @@ $("#testDataChildDataGrid").dataGrid({ return val; }, editable:true, edittype:'radio', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -279,13 +279,13 @@ $("#testDataChildDataGrid").dataGrid({ }, {header:'${text("复选框")}', name:'testCheckbox', width:135, fixed: true, formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true); + return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_type')}", val, '${text("未知")}', true); }, unformat: function(val, obj, cell){ return val; }, editable:true, edittype:'checkbox', editoptions:{'class':'form-control icheck', - items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), + items: $.merge([], "#{@DictUtils.getDictListJson('sys_menu_type')}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.iCheck(element).on("ifChanged",function(){$(this).resetValid()}); } @@ -449,7 +449,7 @@ $("#testDataChildDataGrid").dataGrid({ +'testRadio,testCheckbox,testDate,testDatetime,testUser.userCode,testUser.userName,testOffice.officeCode,' +'testOffice.officeName,testAreaCode,testAreaName,testDataChild_file,testDataChild_file__del', // 提交数据列表的属性字段 - // 加载成功后执行事件 + //# // 加载成功后执行事件 ajaxSuccess: function(data){ // $('#jqgh_testDataChildDataGrid_rn').append('' diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 87b737c7..4a3b7248 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -118,7 +118,7 @@ <% } %>