cloud-web-corejs 1.0.61 → 1.0.63
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/VabUpload/index.vue +2 -1
- package/src/components/VabUpload/mixins.js +1 -1
- package/src/components/VabUpload/view.vue +2 -1
- package/src/components/excelExport/exportFieldDialog.vue +16 -6
- package/src/components/excelExport/index.js +2 -1
- package/src/components/excelExport/index.vue +8 -6
- package/src/components/excelExport/mixins.js +1 -1
- package/src/components/fileLibrary/mixins/indexMixins.js +23 -15
- package/src/components/table/index.js +2 -1
- package/src/views/user/area/dialog.vue +21 -8
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
</label>
|
|
36
36
|
</el-popover>
|
|
37
37
|
<el-popover
|
|
38
|
-
:disabled="!value1 || cities.length==0"
|
|
38
|
+
:disabled="selectTopLevel || (!value1 || cities.length==0)"
|
|
39
39
|
placement="bottom"
|
|
40
40
|
width="486"
|
|
41
41
|
trigger="click"
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
</label>
|
|
56
56
|
</el-popover>
|
|
57
57
|
<el-popover
|
|
58
|
-
:disabled="!value2 || districts.length==0"
|
|
58
|
+
:disabled="selectTopLevel || (!value2 || districts.length==0)"
|
|
59
59
|
placement="bottom"
|
|
60
60
|
width="486"
|
|
61
61
|
trigger="click"
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
</label>
|
|
76
76
|
</el-popover>
|
|
77
77
|
<el-popover
|
|
78
|
-
:disabled="!value3 || counties.length == 0"
|
|
78
|
+
:disabled="selectTopLevel || (!value3 || counties.length == 0)"
|
|
79
79
|
placement="bottom"
|
|
80
80
|
width="486"
|
|
81
81
|
trigger="click"
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
@checkbox-all="checkAll"
|
|
108
108
|
@cell-dblclick="checkWithSubmit"
|
|
109
109
|
>
|
|
110
|
-
<template #form>
|
|
110
|
+
<template #form v-if="!(param && param.onlySearchTopLevel)">
|
|
111
111
|
<div class="clearfix screen-btns">
|
|
112
112
|
<div class="fr">
|
|
113
113
|
<vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
|
|
@@ -175,7 +175,7 @@ import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
|
|
|
175
175
|
|
|
176
176
|
export default {
|
|
177
177
|
name: 'areaDialog',
|
|
178
|
-
props: ['visiable', 'multi', 'rows', 'param'],
|
|
178
|
+
props: ['visiable', 'multi', 'rows', 'param', 'selectTopLevel'],
|
|
179
179
|
mixins: [selectDialogMixins],
|
|
180
180
|
created() {
|
|
181
181
|
this.initSetting();
|
|
@@ -329,7 +329,8 @@ export default {
|
|
|
329
329
|
url: USER_PREFIX + '/area/getChildren',
|
|
330
330
|
method: "post",
|
|
331
331
|
data: {
|
|
332
|
-
id: id
|
|
332
|
+
id: id,
|
|
333
|
+
enabled: true
|
|
333
334
|
},
|
|
334
335
|
success: res => {
|
|
335
336
|
// const {level} = node;
|
|
@@ -378,7 +379,8 @@ export default {
|
|
|
378
379
|
field: 'name',
|
|
379
380
|
width: 250,
|
|
380
381
|
fixed: 'left',
|
|
381
|
-
treeNode: true,
|
|
382
|
+
// treeNode: true,
|
|
383
|
+
treeNode: !(this.param && this.param.onlySearchTopLevel)
|
|
382
384
|
},
|
|
383
385
|
{
|
|
384
386
|
field: 'fullName',
|
|
@@ -396,7 +398,18 @@ export default {
|
|
|
396
398
|
checkboxConfig: {
|
|
397
399
|
checkStrictly: true,
|
|
398
400
|
showHeader: this.selectMulti,
|
|
399
|
-
trigger: 'row'
|
|
401
|
+
trigger: 'row',
|
|
402
|
+
checkMethod: ({row}) => {
|
|
403
|
+
if (this.selectTopLevel) {
|
|
404
|
+
if (row.parent) {
|
|
405
|
+
return false;
|
|
406
|
+
} else {
|
|
407
|
+
return true;
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
|
|
411
|
+
return true;
|
|
412
|
+
}
|
|
400
413
|
}
|
|
401
414
|
}
|
|
402
415
|
};
|