diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css index 9082636e..9f780611 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css +++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css @@ -322,6 +322,11 @@ } /** 表单验证 样式布局 **/ +.control-label.is-required:before { + content: '* '; + color: red; +} + label.error { position: absolute; right: 18px; diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index fb11b71c..e279d087 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -394,7 +394,7 @@ var table = { var index = layer.load(2, {shade: false}); $.modal.disable(); var formData = new FormData(); - formData.append("file", $('#file')[0].files[0]); + formData.append("file", layero.find('#file')[0].files[0]); formData.append("updateSupport", $("input[name='updateSupport']").is(':checked')); $.ajax({ url: table.options.importUrl, diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html b/ruoyi-admin/src/main/resources/templates/demo/modal/form.html index ec294fb9..f9e20151 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/modal/form.html +++ b/ruoyi-admin/src/main/resources/templates/demo/modal/form.html @@ -9,7 +9,7 @@
- +
@@ -17,7 +17,7 @@
- +
@@ -30,7 +30,7 @@
- +
@@ -38,7 +38,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -56,7 +56,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html b/ruoyi-admin/src/main/resources/templates/demo/operate/add.html index 3a95e793..e1cf566e 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/add.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/add.html @@ -13,7 +13,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html b/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html index 42eda918..3a3c4e7d 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/detail.html @@ -11,7 +11,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html b/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html index d7d87fcf..2e6adc07 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html +++ b/ruoyi-admin/src/main/resources/templates/demo/operate/edit.html @@ -14,7 +14,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/child.html b/ruoyi-admin/src/main/resources/templates/demo/table/child.html index 73ad5447..8a50491f 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/child.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/child.html @@ -77,12 +77,12 @@ }); initChildTable = function(index, row, $detail) { - var cur_table = $detail.html('
').find('table'); - $(cur_table).bootstrapTable({ + var childTable = $detail.html('
').find('table'); + $(childTable).bootstrapTable({ url: prefix + "/list", method: 'post', sidePagination: "server", - contentType: "application/x-www-form-urlencoded", // 编码类型 + contentType: "application/x-www-form-urlencoded", queryParams : { userName: '测试8' }, diff --git a/ruoyi-admin/src/main/resources/templates/system/config/add.html b/ruoyi-admin/src/main/resources/templates/system/config/add.html index 68b6dee3..d93aacb6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/config/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/config/add.html @@ -7,19 +7,19 @@
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/edit.html b/ruoyi-admin/src/main/resources/templates/system/config/edit.html index b74007e8..471e9e1e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/config/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/config/edit.html @@ -8,19 +8,19 @@
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/add.html b/ruoyi-admin/src/main/resources/templates/system/dept/add.html index 3ce6aae1..fe11d1fa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dept/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/dept/add.html @@ -8,7 +8,7 @@
- +
@@ -17,13 +17,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/edit.html b/ruoyi-admin/src/main/resources/templates/system/dept/edit.html index f21db084..7752e29c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dept/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/dept/edit.html @@ -9,7 +9,7 @@
- +
@@ -18,13 +18,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html index c780d5db..068ddb26 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/add.html @@ -7,13 +7,13 @@
- +
- +
@@ -31,7 +31,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/edit.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/edit.html index bdb2bd2a..a1a55531 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dict/data/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/edit.html @@ -8,13 +8,13 @@
- +
- +
@@ -32,7 +32,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html index 31756c56..2ae428f0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/add.html @@ -7,13 +7,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html index 2bcb15f8..abb35330 100644 --- a/ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html @@ -8,13 +8,13 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/add.html b/ruoyi-admin/src/main/resources/templates/system/menu/add.html index 3e402003..39ebb735 100644 --- a/ruoyi-admin/src/main/resources/templates/system/menu/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/menu/add.html @@ -8,7 +8,7 @@
- +
@@ -17,7 +17,7 @@
- +
@@ -25,7 +25,7 @@
- +
@@ -53,7 +53,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html index 9a31a5a4..66086cea 100644 --- a/ruoyi-admin/src/main/resources/templates/system/menu/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/menu/edit.html @@ -9,7 +9,7 @@
- +
@@ -18,7 +18,7 @@
- +
@@ -26,7 +26,7 @@
- +
@@ -54,7 +54,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/add.html b/ruoyi-admin/src/main/resources/templates/system/notice/add.html index 4c1893e3..50bd8634 100644 --- a/ruoyi-admin/src/main/resources/templates/system/notice/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/notice/add.html @@ -8,7 +8,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html index 8987df2c..63a3f5e9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html @@ -9,7 +9,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/add.html b/ruoyi-admin/src/main/resources/templates/system/post/add.html index cd84ada2..d76f4a1b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/post/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/post/add.html @@ -7,19 +7,19 @@
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/edit.html b/ruoyi-admin/src/main/resources/templates/system/post/edit.html index 862e7211..50c5ef0d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/post/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/post/edit.html @@ -8,19 +8,19 @@
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/add.html b/ruoyi-admin/src/main/resources/templates/system/role/add.html index 91942e6a..2675d093 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/add.html @@ -8,20 +8,20 @@
- +
- +
控制器中定义的权限字符,如:@RequiresRoles("")
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html index 7cb3d8cb..d23fe588 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html @@ -9,7 +9,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/edit.html b/ruoyi-admin/src/main/resources/templates/system/role/edit.html index 063968e3..8d510da8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/edit.html @@ -9,20 +9,20 @@
- +
- +
控制器中定义的权限字符,如:@RequiresRoles("")
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index bf4be350..5025eec9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -12,7 +12,7 @@
- +
@@ -20,7 +20,7 @@
- +
@@ -33,7 +33,7 @@
- +
@@ -41,7 +41,7 @@
- +
@@ -51,7 +51,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index 9724a7e2..869e96fc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -13,7 +13,7 @@
- +
@@ -21,7 +21,7 @@
- +
@@ -34,7 +34,7 @@
- +
@@ -42,7 +42,7 @@
- +
@@ -52,7 +52,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html index e6a87b68..7b2b0da6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html @@ -8,7 +8,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html b/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html index e20dc85b..dd44b415 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html @@ -8,7 +8,7 @@
- +
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html index cde416e9..ece8d61e 100644 --- a/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html +++ b/ruoyi-generator/src/main/resources/templates/tool/gen/edit.html @@ -30,7 +30,7 @@
- +
@@ -38,7 +38,7 @@
- +
@@ -48,7 +48,7 @@
- +
@@ -56,7 +56,7 @@
- +
@@ -87,7 +87,7 @@
- +
@@ -108,7 +108,7 @@
- +
@@ -116,7 +116,7 @@
- +
@@ -126,7 +126,7 @@
- +
@@ -138,7 +138,7 @@
- +
@@ -162,7 +162,7 @@
- +
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm index e8edd670..bfc971ee 100644 --- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm @@ -38,7 +38,7 @@
#elseif($column.htmlType == "input")
- +
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html index d15cedf3..f4b4af8e 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html @@ -8,7 +8,7 @@
- +
@@ -22,7 +22,7 @@
- +
Bean调用示例:ryTask.ryParams('ry') @@ -31,7 +31,7 @@
- +
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html index 2f26ec24..208cbf67 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html @@ -9,7 +9,7 @@
- +
@@ -23,7 +23,7 @@
- +
Bean调用示例:ryTask.ryParams('ry') @@ -32,7 +32,7 @@
- +