From 424c197f952cd2e123fbc50392d57b7ce8f3f006 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Mon, 17 Aug 2020 20:11:17 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?](v2.5):=20=E5=8D=87=E7=BA=A7treeselect=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=92=E8=89=B2=E7=BC=96=E8=BE=91=E6=97=B6=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E9=97=AA=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 554143855a8d0011e7f20fdb0b424a9f764de422.
---
 package.json                    |  2 +-
 src/views/system/role/index.vue | 39 +++++++++++++++++++----------
 src/views/system/user/index.vue | 44 ++++++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index d03bdcd..ade22ab 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "url": "https://github.com/elunez/eladmin/issues"
   },
   "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
+    "@riophae/vue-treeselect": "0.1.0",
     "axios": "0.18.1",
     "clipboard": "2.0.4",
     "codemirror": "^5.49.2",
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 011bd4f..02dead3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
           <treeselect
-            v-model="deptDatas"
+            v-model="form.depts"
             :load-options="loadDepts"
             :options="depts"
             multiple
@@ -144,7 +144,7 @@ export default {
       defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
       dateScopes: ['全部', '本级', '自定义'], level: 3,
       currentId: 0, menuLoading: false, showButton: false,
-      menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
+      menus: [], menuIds: [], depts: [],
       permission: {
         add: ['admin', 'roles:add'],
         edit: ['admin', 'roles:edit'],
@@ -176,24 +176,24 @@ export default {
     [CRUD.HOOK.afterRefresh]() {
       this.$refs.menu.setCheckedKeys([])
     },
-    // 新增前初始化部门信息
-    [CRUD.HOOK.beforeToAdd]() {
-      this.deptDatas = []
-    },
-    // 编辑前初始化自定义数据权限的部门信息
+    // 编辑前
     [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.deptDatas = []
       if (form.dataScope === '自定义') {
-        this.getSupDepts(form.depts)
+        if (form.id == null) {
+          this.getDepts()
+        } else {
+          this.getSupDepts(form.depts)
+        }
       }
-      const _this = this
+      const depts = []
       form.depts.forEach(function(dept) {
-        _this.deptDatas.push(dept.id)
+        depts.push(dept.id)
       })
+      form.depts = depts
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
-      if (crud.form.dataScope === '自定义' && this.deptDatas.length === 0) {
+      if (crud.form.dataScope === '自定义' && crud.form.depts.length === 0) {
         this.$message({
           message: '自定义数据权限不能为空',
           type: 'warning'
@@ -201,7 +201,7 @@ export default {
         return false
       } else if (crud.form.dataScope === '自定义') {
         const depts = []
-        this.deptDatas.forEach(function(data) {
+        crud.form.depts.forEach(function(data) {
           const dept = { id: data }
           depts.push(dept)
         })
@@ -211,6 +211,19 @@ export default {
       }
       return true
     },
+    [CRUD.HOOK.afterAddError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    [CRUD.HOOK.afterEditError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    afterErrorMethod(crud) {
+      const depts = []
+      crud.form.depts.forEach(function(dept) {
+        depts.push(dept.id)
+      })
+      crud.form.depts = depts
+    },
     // 触发单选
     handleCurrentChange(val) {
       if (val) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 902b047..214e3c0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -85,7 +85,7 @@
             </el-form-item>
             <el-form-item label="岗位" prop="jobs">
               <el-select
-                v-model="jobDatas"
+                v-model="form.jobs"
                 style="width: 178px"
                 multiple
                 placeholder="请选择"
@@ -117,7 +117,7 @@
             </el-form-item>
             <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
               <el-select
-                v-model="roleDatas"
+                v-model="form.roles"
                 style="width: 437px"
                 multiple
                 placeholder="请选择"
@@ -233,7 +233,6 @@ export default {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
       deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
-      jobDatas: [], roleDatas: [], // 多选时使用
       defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
       permission: {
         add: ['admin', 'user:add'],
@@ -292,6 +291,25 @@ export default {
         userJobs.push(job)
       })
     },
+    [CRUD.HOOK.afterAddError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    [CRUD.HOOK.afterEditError](crud) {
+      this.afterErrorMethod(crud)
+    },
+    afterErrorMethod(crud) {
+      // 恢复select
+      const initRoles = []
+      const initJobs = []
+      userRoles.forEach(function(role, index) {
+        initRoles.push(role.id)
+      })
+      userJobs.forEach(function(job, index) {
+        initJobs.push(job.id)
+      })
+      crud.form.roles = initRoles
+      crud.form.jobs = initJobs
+    },
     deleteTag(value) {
       userRoles.forEach(function(data, index) {
         if (data.id === value) {
@@ -311,29 +329,27 @@ export default {
       this.getJobs()
       form.enabled = form.enabled.toString()
     },
-    // 新增前将多选的值设置为空
-    [CRUD.HOOK.beforeToAdd]() {
-      this.jobDatas = []
-      this.roleDatas = []
-    },
-    // 初始化编辑时候的角色与岗位
+    // 打开编辑弹窗前做的操作
     [CRUD.HOOK.beforeToEdit](crud, form) {
       this.getJobs(this.form.dept.id)
-      this.jobDatas = []
-      this.roleDatas = []
       userRoles = []
       userJobs = []
-      const _this = this
+      const roles = []
+      const jobs = []
       form.roles.forEach(function(role, index) {
-        _this.roleDatas.push(role.id)
+        roles.push(role.id)
+        // 初始化编辑时候的角色
         const rol = { id: role.id }
         userRoles.push(rol)
       })
       form.jobs.forEach(function(job, index) {
-        _this.jobDatas.push(job.id)
+        jobs.push(job.id)
+        // 初始化编辑时候的岗位
         const data = { id: job.id }
         userJobs.push(data)
       })
+      form.roles = roles
+      form.jobs = jobs
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {