1、eldialog优化

Former-commit-id: 5aa57fdb924ee4ed2b1d16960eb34d437e366d00

src/main/resources/modules/SpringBoot/resources/static/css/base.css

@@ -701,20 +701,25 @@ code {
     margin: 10px;
     min-width: 1060px;
 }
-
+.el-dialog.dialog {
-.form-dialog .el-form-item__content,
+    width: 700px;
-.form-dialog .el-form-item__content > div,
+}
+.el-dialog.dialog .el-form-item__content,
+.el-dialog.dialog .el-form-item__content > div,
 .el-form.form .el-form-item__content,
 .el-form.form .el-form-item__content > div,
 .el-form.search .el-form-item__content,
 .el-form.search .el-form-item__content > div {
     width: 200px;
 }
-
+.el-transfer-panel__item {
-.form-dialog .el-dialog{
+    height: 30px!important;
-    width: 700px;
+    line-height: 30px!important;
+    padding-left: 15px!important;
+    display: block!important;
 }
 
+
 .el-table.data {
     margin-top: 10px;
     width: 100%;

src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl

@@ -388,14 +388,6 @@
 
                     });
                 }
-            },
-            beforeDialogClose:function (done) {
-                this.$confirm('确认关闭？')
-                    .then(function () {
-                        done();
-                    }).catch(function () {
-
-                    });
             }
         },
         created: function () {

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -165,7 +165,11 @@
         </el-pagination>
     </el-card>
 	
-	<el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+	<el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
 		<el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
         <#list fields as item>
             <#if !item.isSystem>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl

@@ -201,7 +201,11 @@
         </el-tabs>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
             <el-form-item label="部门代码" prop="deptCode">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl

@@ -128,7 +128,11 @@
         </el-pagination>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
 			<el-form-item label="字典名称" prop="dictName" required>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl

@@ -130,7 +130,11 @@
         </el-pagination>
     </el-card>
 
-	<el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
              label-position="right" label-width="90px">
 			<el-form-item label="字典键" prop="key">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl

@@ -119,7 +119,11 @@
         </el-pagination>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
 			<el-form-item label="文件名称" prop="name">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -196,7 +196,11 @@
         </el-tabs>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
             <el-form-item label="资源代码" prop="resCode">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl

@@ -114,7 +114,11 @@
         </el-pagination>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
             <el-form-item label="角色代码" prop="code">

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl

@@ -141,7 +141,11 @@
         </el-pagination>
     </el-card>
 
-    <el-dialog class="form-dialog" :title="form.title" :before-close="beforeDialogClose" :visible.sync="form.dialog">
+    <el-dialog
+            :custom-class="'dialog'"
+            :title="form.title"
+            :close-on-click-modal="false"
+            :visible.sync="form.dialog">
         <el-form class=form" :model="form" :inline="true" :rules="formRules" ref="form"
                  label-position="right" label-width="90px">
             <el-form-item label="用户账户" prop="userName">
@@ -159,8 +163,11 @@
             <el-form-item label="用户状态" prop="userStatus">
                 <el-input-dict v-model="form.userStatus" clearable size="small" placeholder="请输入用户状态" dict-name="USER_STATUS"></el-input-dict>
             </el-form-item>
+
+            <br>
+
             <el-form-item label="用户角色" prop="roleIdList">
-                <el-transfer v-model="form.roleIdList" :data="roleList" :titles="['未选角色','已选角色']" style="width: 500px" ></el-transfer>
+                <el-transfer v-model="form.roleIdList" :data="roleList" :titles="['未选角色','已选角色']" style="width: 500px"></el-transfer>
             </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -214,7 +221,7 @@
                     {min: 1, max: 50, message: '用户别名长度在 1 到 50 个字符', trigger: 'blur'}
                 ],
                 userPwd: [
-                    { pattern:/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/, message: '密码至少包含 数字和英文，长度6-20'}
+                    {pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/, message: '密码至少包含 数字和英文，长度6-20'}
                 ],
                 userStatus: [
                     {required: true, message: '用户状态不能为空', trigger: 'blur'},