bri-components 1.5.12 → 1.5.14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.5.12",
+    "version": "1.5.14",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.3.10",
+        "bri-datas": "^1.4.0",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -451,18 +451,14 @@
                 }
             },
             getBtns (fileItem) {
-                if (["image", "application/pdf", "text/plain"].some(type => fileItem.mimetype.includes(type)) ||
+                return ["image", "application/pdf", "text/plain"].some(type => fileItem.mimetype.includes(type)) ||
                     fileItem.mimetype.includes("wordprocessingml.document") ||
                     fileItem.mimetype.includes("application/msword") ||
                     fileItem.mimetype.includes("presentationml.presentation") ||
                     fileItem.mimetype.includes("application/vnd.ms-powerpoint") ||
-                    fileItem.mimetype.includes("spreadsheetml.sheet"))
-                {
-                    return undefined;
-                }
-                else {
-                    ["canDelete", "canEdit", "canDownload"];
-                }
+                    fileItem.mimetype.includes("spreadsheetml.sheet")
+                    ? undefined
+                    : ["canDelete", "canEdit", "canDownload"];
             }
         }
     };

package/src/components/controls/base/DshCascader/components/cascaderTree.vue

@@ -70,12 +70,14 @@
         components: {},
         props: {},
         data () {
-            return {};
+            return {
+                checkList: []
+            };
         },
         computed: {},
         created () {},
         methods: {
-            changeCheck (checkList, curItem) {
+            changeCheck (checkList = [], curItem) {
                 // 不是末级节点 -点击后是选中状态话，把子孙后代节点全部展开；点击后是取消勾选状态话，把子孙后代节点全部收起来
                 if (!curItem.isLeaf) {
                     const loop = (node = { children: [] }) => {
@@ -85,19 +87,17 @@
                     loop(curItem);
                 }
 
-                this.selectedValueArr = checkList
-                    .reduce((newNodeArr, node, nodeIndex) => {
-                        return newNodeArr.every(newNode => !node.code.startsWith(newNode.code))
-                            ? [
-                                ...newNodeArr,
-                                node
-                            ]
-                            : newNodeArr;
-                    }, [])
-                    .map(node => node.keys);
+                this.confirmed = false;
+                this.checkList = checkList;
             },
             clickConfirm () {
-                this.$emit("confirmMul", this.selectedValueArr, this.selectedOptionsArr);
+                if (this.confirmed === false) {
+                    this.selectedValueArr = this.checkList.filter(node => !!node.checked).map(node => node.keys);
+                    this.$emit("confirmMul", this.selectedValueArr, this.selectedOptionsArr);
+                    this.confirmed = true;
+                } else {
+                    this.clickCancel();
+                }
             }
         }
     };

package/src/components/controls/mixins/cascaderMixin.js

@@ -1,5 +1,5 @@
 import controlMixin from "./controlMixin.js";
-import { resourceData, regionData, benjiRegionData, userIndustryData } from "bri-datas";
+import { resourceData, regionDataMap, userIndustryData } from "bri-datas";
 
 export default {
     mixins: [
@@ -14,7 +14,7 @@ export default {
         basePropsObj () {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
-                _regionType: "default", // "default", "benji", "userIndustry"
+                _regionType: "default", // "default", "benji"
                 _showMode: "default", // "default", "custom", "simple"
                 _searchShowMode: undefined, // "tree", "default", "custom", "simple"
 
@@ -87,9 +87,7 @@ export default {
             return ["userIndustry"].includes(this.controlType)
                 ? userIndustryData
                 : ["region", "regions"].includes(this.controlType)
-                    ? this.subType === "benji"
-                        ? benjiRegionData
-                        : regionData
+                    ? regionDataMap[this.subType] || regionDataMap.default
                     : this.selfPropsObj._data;
         },
         cascaderAllData () {
@@ -264,7 +262,16 @@ export default {
         },
         // 多选 -整体多选的回调
         confirmMulCb (selectedValueArr, selectedOptionsArr) {
-            this.curValList = selectedValueArr;
+            this.curValList = ["eq", "ne"].includes(this.value.fieldOperator)
+                ? [...selectedValueArr]
+                : selectedValueArr.reduce((newNodeArr, node, nodeIndex) => (
+                    newNodeArr.every(newNode => !node.join("").startsWith(newNode.join("")))
+                        ? [
+                            ...newNodeArr,
+                            node
+                        ]
+                        : newNodeArr
+                ), []);
 
             this.closeModal();
         },

package/src/data/index.js

@@ -1,9 +1,4 @@
-import {
-    resourceData, regionData, benjiRegionData, userIndustryData,
-    dynDateData
-} from "bri-datas";
-
 export {
-    resourceData, regionData, benjiRegionData, userIndustryData,
-    dynDateData
-};
+    resourceData
+    // regionDataMap, userIndustryData, dynDateData
+} from "bri-datas";