bri-components 1.3.57 → 1.3.60

package/package.json

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

package/src/components/controls/senior/cascaderTable.vue

@@ -35,6 +35,7 @@
                         :rowDefault="curVal.rowDefault"
                         :columns="subForm"
                         :data="curVal"
+                        :treeColumns="treeForm"
                         :propsObj="defaultPropsObj"
                         :allFormList="allFormList"
                         :parentObj="value"
@@ -129,8 +130,55 @@
                     : this.selfPropsObj._treeForm;
             },
 
+            searchList () {
+                return this.selfPropsObj._searchList || []; // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
+            },
+            searchListMap () {
+                return this.$arrToMap(this.searchList, "_key");
+            },
+            searchListFields () {
+                return this.searchList.map(searchItem => searchItem._key);
+            },
+            tableAdvSearch () {
+                return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.value);
+            },
+            dftAdvSearch () {
+                return {
+                    logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                    conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                        this.searchListFields.includes(conditionItem.fieldKey)
+                    )
+                };
+            },
+            // 配置的默认筛选值里 隐藏的看不到的筛选条件
+            hideAdvSearch () {
+                return {
+                    logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                    conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                        !this.searchListFields.includes(conditionItem.fieldKey)
+                    )
+                };
+            },
+            // 过滤行数据的 最终的筛选条件
+            finalTableAdvSearch () {
+                return {
+                    logic: "and",
+                    conditions: [
+                        this.hideAdvSearch,
+                        this.dftAdvSearch
+                    ]
+                };
+            },
             showVal () {
-                return `${this.curVal ? this.$getTreeLeafTotal(this.curVal.tree, this.showMode === "treeTable") : 0} 行`;
+                return `${
+                    this.curVal
+                        ? this.$getTreeFlatArr(this.curVal.tree, (row) => {
+                            return (this.showMode === "treeTable" ? true : row.isLeaf === true) &&
+                                this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
+                        }).length
+                        // ? this.$getTreeLeafTotal(this.curVal.tree, this.showMode === "treeTable")
+                        : 0
+                } 行`;
             }
         },
         created () {},

package/src/components/form/searchMixin.js

@@ -199,18 +199,22 @@ export default {
                                     : fieldData.operators
                     ) || [];
 
-                    const fieldOperator = ["_id"].includes(fieldKey)
-                        ? "eq"
-                        : ["reference"].includes(fieldType) && this.isSimpleSearch
+                    const fieldOperator = initContion.fieldOperator || (
+                        ["_id"].includes(fieldKey)
                             ? "eq"
-                            : (operators[0] || {})._key;
+                            : ["reference"].includes(fieldType) && this.isSimpleSearch
+                                ? "eq"
+                                : (operators[0] || {})._key
+                    );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
-                    const parameterType = (
-                        (initContion.fieldParams || []).length ||
-                        initContion.chainFieldKey ||
-                        (!!dynamicList.length && operators.some(operator => ["subSearch", "subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(operator._key)))
-                    ) ? "dynamicText" : "fixedText";
+                    const parameterType = initContion.parameterType || (
+                        (
+                            (initContion.fieldParams || []).length ||
+                            initContion.chainFieldKey ||
+                            (!!dynamicList.length && operators.some(operator => ["subSearch", "subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(operator._key)))
+                        ) ? "dynamicText" : "fixedText"
+                    );
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
                     return {
@@ -358,7 +362,7 @@ export default {
                                     ? loop(item[key])
                                     : item[key]
                             : item[key]
-                })), {});
+                    })), {});
             };
 
             return loop(list);

package/src/components/list/BriTable.vue

@@ -130,7 +130,7 @@
                                 }
                             },
                             dblclick: (event) => {
-                                this.$emit("db-click-row", row, rowIndex, event);
+                                this.$emit("db-click-row", row, rowIndex, column, event);
                             }
                         };
                     },

package/src/components/list/DshCascaderTable.vue

@@ -490,22 +490,6 @@
             allTreeData () {
                 return this.getCalcuedTree();
             },
-            showAllTreeData () {
-                const loop = (list = []) => {
-                    return list.filter(row => {
-                        if (row.children && row.children.length) {
-                            row.children = loop(row.children);
-                            return !!row.children.length;
-                        } else {
-                            return this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
-                        }
-                    });
-                };
-
-                return this.isSearching
-                    ? loop(this.allTreeData)
-                    : this.allTreeData;
-            },
             allListData () {
                 return this.$getTreeFlatArr(this.data.tree, node => !(node.children && node.children.length));
             },
@@ -770,8 +754,10 @@
                 return this.data.tree;
             },
             // 转化渲染使用的columns数组
-            transformRowColumnsArr (nodes = this.showAllTreeData, treeForm = this.treeColumns) {
+            transformRowColumnsArr (nodes = this.allTreeData, treeForm = this.treeColumns) {
                 let loop = (nodes, rowColumnsArr) => {
+                    nodes = this.getFilteredNodes(nodes);
+
                     return nodes.reduce((rowColumnsArr, node, nodeIndex) => {
                         if (nodeIndex !== 0 || rowColumnsArr.length === 0) {
                             rowColumnsArr.push(this.transformColumns(treeForm.slice(node.level - 1)));
@@ -784,11 +770,14 @@
                         }
                     }, rowColumnsArr);
                 };
+
                 return loop(nodes, []);
             },
             // 转化表格数据
-            transformRows (nodes = this.showAllTreeData, treeForm = this.treeColumns) {
+            transformRows (nodes = this.allTreeData, treeForm = this.treeColumns) {
                 const loop = (nodes, rows) => {
+                    nodes = this.getFilteredNodes(nodes);
+
                     return nodes.reduce((rows, node, nodeIndex) => {
                         // 创建行，并把节点数据（对象类型）注入到行对象内
                         if (nodeIndex !== 0 || rows.length === 0) {
@@ -811,6 +800,20 @@
                 };
                 return loop(nodes, []);
             },
+            getFilteredNodes (nodes) {
+                const loop = (nodes = []) => {
+                    return nodes.filter(node => {
+                        if (node.children && node.children.length) {
+                            const children = loop(node.children);
+                            return !!children.length;
+                        } else {
+                            return this.$isAdvRelyAccord(this.finalTableAdvSearch, node);
+                        }
+                    });
+                };
+
+                return loop(nodes);
+            },
 
             // 清除节点到叶子节点
             clearNodeToLeaf (list) {

package/src/components/list/mixins/tableBaseMixin.js

@@ -501,7 +501,7 @@ export default {
     methods: {
         baseInit () {
             this.dftAdvSearch = {
-                logic: this.tableAdvSearch.logic || "and",
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
                 conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
                     this.searchListFields.includes(conditionItem.fieldKey)
                 )