Merge branch 'master' into deploy

# Conflicts:
#	README.md

package.json

@@ -65,7 +65,7 @@
     "vuex": "3.1.0",
     "wangeditor": "^4.7.11",
     "webpack": "^4.46.0",
-    "xlsx": "^0.17.4"
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@babel/parser": "^7.7.4",

src/views/system/role/index.vue

@@ -34,6 +34,9 @@
             v-model="deptDatas"
             :load-options="loadDepts"
             :options="depts"
+            :flat="true"
+            :auto-select-descendants="true"
+            :default-expand-level="1"
             multiple
             style="width: 380px"
             placeholder="请选择"
@@ -192,6 +195,7 @@ export default {
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
+      console.log(this.deptDatas)
       if (crud.form.dataScope === '自定义' && this.deptDatas.length === 0) {
         this.$message({
           message: '自定义数据权限不能为空',