bri-components 1.5.12 → 1.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.5.12",
+    "version": "1.5.13",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

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

@@ -264,7 +264,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();
         },