cloud-web-corejs 1.0.54-dev.37 → 1.0.54-dev.38

package/package.json

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

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;
+            }
           }
         }
       };