From 7f19e06631a338c4715037e5bb2144a9de2dbda1 Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Thu, 16 Jan 2020 20:15:16 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81eldialog=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 5aa57fdb924ee4ed2b1d16960eb34d437e366d00
---
 .../SpringBoot/resources/static/css/base.css    | 17 +++++++++++------
 .../resources/templates/control/nav.ftl         |  8 --------
 .../resources/templates/screen/module/mgr.ftl   |  6 +++++-
 .../templates/screen/module/system/dept.ftl     |  6 +++++-
 .../templates/screen/module/system/dict.ftl     |  6 +++++-
 .../templates/screen/module/system/dictItem.ftl |  6 +++++-
 .../templates/screen/module/system/file.ftl     |  6 +++++-
 .../templates/screen/module/system/res.ftl      |  6 +++++-
 .../templates/screen/module/system/role.ftl     |  6 +++++-
 .../templates/screen/module/system/user.ftl     | 13 ++++++++++---
 10 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/resources/static/css/base.css b/src/main/resources/modules/SpringBoot/resources/static/css/base.css
index 1c8fd366..cc673da8 100644
--- a/src/main/resources/modules/SpringBoot/resources/static/css/base.css
+++ b/src/main/resources/modules/SpringBoot/resources/static/css/base.css
@@ -701,20 +701,25 @@ code {
     margin: 10px;
     min-width: 1060px;
 }
-
-.form-dialog .el-form-item__content,
-.form-dialog .el-form-item__content > div,
+.el-dialog.dialog {
+    width: 700px;
+}
+.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;
 }
-
-.form-dialog .el-dialog{
-    width: 700px;
+.el-transfer-panel__item {
+    height: 30px!important;
+    line-height: 30px!important;
+    padding-left: 15px!important;
+    display: block!important;
 }
 
+
 .el-table.data {
     margin-top: 10px;
     width: 100%;
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
index b2a5b9c5..8d767b72 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/nav.ftl
+++ b/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 () {
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
index 6dcb37d7..7d185030 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl
+++ b/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>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
index e53524be..4690c878 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl
+++ b/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">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
index d08aa9df..ef936024 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dict.ftl
+++ b/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>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
index 25e768a9..c9b6b940 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dictItem.ftl
+++ b/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">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
index d35f97ed..101351fd 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/file.ftl
+++ b/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">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
index b2068745..eb3fc3c7 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
+++ b/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">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
index bb204236..ecdd509a 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/role.ftl
+++ b/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">
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
index ac669a04..38b78308 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/user.ftl
+++ b/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'},