cloud-web-corejs 1.0.60 → 1.0.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.60",
+  "version": "1.0.62",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/fileLibrary/fileObjNotifyEdit.vue

@@ -15,7 +15,7 @@
           </el-button>
         </div>
       </div>
-      <div class="d-cont">
+      <div class="d-cont" style="height: 470px;">
         <div class="d-item d-i-left">
           <div class="d-i-tit">
             {{ $t1('文件操作，是否发系统通知') }}
@@ -182,7 +182,7 @@ export default {
 }
 
 .tips {
-  margin-top: -156px;
+  margin-top: -40px;
   background: #FFF;
   position: relative;
   line-height: 40px;

package/src/components/fileLibrary/mixins/indexMixins.js

@@ -1008,36 +1008,44 @@ modules = {
           rows.forEach((value) => {
             value.leaf = !value.hasChild;
           });
+          let items = [];
           if (node.level === 0) {
+            let item = {
+              parent: null,
+              fileName: this.title,
+              leaf: rows.length == 0,
+              allFileBtn: true,
+              id: 0,
+              children: rows,
+            };
+            items.push(item);
             setTimeout(() => {
               this.$refs.tree.setCurrentKey(node.childNodes[0].data);
               this.handleNodeData(node.childNodes[0]);
               node.childNodes[0].expand();
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes[0].childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
             }, 200);
             this.$nextTick(() => {
               callback && callback();
             });
             this.searchEvent();
           } else {
+            items = rows;
             this.$nextTick(() => {
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
               callback && callback();
             });
           }
-          let items = [];
-          if (node.level === 0) {
-            let item = {
-              parent: null,
-              fileName: this.title,
-              leaf: rows.length == 0,
-              allFileBtn: true,
-              id: 0,
-              children: rows,
-            };
-            items.push(item);
-          } else {
-            items = rows;
-          }
-
           resolve(items);
         },
       });

package/src/views/user/area/dialog.vue

@@ -35,7 +35,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value1 || cities.length==0"
+            :disabled="selectTopLevel || (!value1 || cities.length==0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -55,7 +55,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value2 || districts.length==0"
+            :disabled="selectTopLevel || (!value2 || districts.length==0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -75,7 +75,7 @@
             </label>
           </el-popover>
           <el-popover
-            :disabled="!value3 || counties.length == 0"
+            :disabled="selectTopLevel || (!value3 || counties.length == 0)"
             placement="bottom"
             width="486"
             trigger="click"
@@ -175,7 +175,7 @@ import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
 
 export default {
   name: 'areaDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
+  props: ['visiable', 'multi', 'rows', 'param', 'selectTopLevel'],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -329,7 +329,8 @@ export default {
         url: USER_PREFIX + '/area/getChildren',
         method: "post",
         data: {
-          id: id
+          id: id,
+          enabled: true
         },
         success: res => {
           // const {level} = node;
@@ -396,7 +397,18 @@ export default {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: 'row',
+            checkMethod: ({row}) => {
+              if (this.selectTopLevel) {
+                if (row.parent) {
+                  return false;
+                } else {
+                  return true;
+                }
+              }
+
+              return true;
+            }
           }
         }
       };