bri-components 1.3.41 → 1.3.43
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bri-components",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.43",
|
|
4
4
|
"author": "dengshanghui",
|
|
5
5
|
"description": "a component lib for vue project",
|
|
6
6
|
"main": "src/index.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"ali-oss": "^6.13.1",
|
|
34
34
|
"axios": "^0.23.0",
|
|
35
|
-
"bri-datas": "^1.1.
|
|
35
|
+
"bri-datas": "^1.1.57",
|
|
36
36
|
"jshint": "^2.12.0",
|
|
37
37
|
"jsonlint": "^1.6.3",
|
|
38
38
|
"minio": "7.1.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import controlMixin from "./controlMixin.js";
|
|
2
|
-
import { resourceData, regionData, userIndustryData } from "bri-datas";
|
|
2
|
+
import { resourceData, regionData, benjiRegionData, userIndustryData } from "bri-datas";
|
|
3
3
|
|
|
4
4
|
export default {
|
|
5
5
|
mixins: [
|
|
@@ -14,6 +14,7 @@ export default {
|
|
|
14
14
|
basePropsObj () {
|
|
15
15
|
const _joinSymbol = this.propsObj._joinSymbol || "/";
|
|
16
16
|
return {
|
|
17
|
+
_regionType: "default", // "default", "benji", "userIndustry"
|
|
17
18
|
_showMode: "default", // "default", "custom", "simple"
|
|
18
19
|
colorMap: resourceData.colorMap,
|
|
19
20
|
_useColor: false,
|
|
@@ -35,6 +36,9 @@ export default {
|
|
|
35
36
|
_joinSymbol: _joinSymbol // 级联拼接符
|
|
36
37
|
};
|
|
37
38
|
},
|
|
39
|
+
regionType () {
|
|
40
|
+
return this.selfPropsObj._regionType;
|
|
41
|
+
},
|
|
38
42
|
showMode () {
|
|
39
43
|
return this.selfPropsObj._showMode;
|
|
40
44
|
},
|
|
@@ -67,10 +71,12 @@ export default {
|
|
|
67
71
|
},
|
|
68
72
|
|
|
69
73
|
originData () {
|
|
70
|
-
return ["
|
|
71
|
-
?
|
|
72
|
-
: ["
|
|
73
|
-
?
|
|
74
|
+
return ["userIndustry"].includes(this.controlType)
|
|
75
|
+
? userIndustryData
|
|
76
|
+
: ["region", "regions"].includes(this.controlType)
|
|
77
|
+
? this.regionType === "benji"
|
|
78
|
+
? benjiRegionData
|
|
79
|
+
: regionData
|
|
74
80
|
: this.selfPropsObj._data;
|
|
75
81
|
},
|
|
76
82
|
cascaderAllData () {
|
|
@@ -217,7 +223,7 @@ export default {
|
|
|
217
223
|
: {
|
|
218
224
|
[this.saveKey]: val,
|
|
219
225
|
[this.nameKey]: `提示：选项${val}已不存在`
|
|
220
|
-
|
|
226
|
+
};
|
|
221
227
|
|
|
222
228
|
return !this.$isEmptyData(val)
|
|
223
229
|
? {
|
|
@@ -650,18 +650,18 @@ export default {
|
|
|
650
650
|
},
|
|
651
651
|
// 列本身是否可编辑
|
|
652
652
|
getColCanEdit (col, row) {
|
|
653
|
-
return
|
|
653
|
+
return (
|
|
654
654
|
["cascaderTable"].includes(this.controlType)
|
|
655
655
|
? (
|
|
656
656
|
// 树形表格 -“需要计算的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
|
|
657
657
|
["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType)
|
|
658
|
-
? row.isLeaf
|
|
658
|
+
? row.isLeaf === true
|
|
659
659
|
: true
|
|
660
660
|
) && (
|
|
661
661
|
// 树形表格 -“需要限制的日期列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
|
|
662
662
|
["date"].includes(col._type)
|
|
663
663
|
? ["downToUp"].includes(col._writeSort)
|
|
664
|
-
? row.isLeaf
|
|
664
|
+
? row.isLeaf === true
|
|
665
665
|
: ["upToDown"].includes(col._writeSort)
|
|
666
666
|
? row.level === 1 || !!this.getParentNode(row, this.allTreeData)[col._key]
|
|
667
667
|
: true
|