bri-components 1.3.56 → 1.3.60

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.56",
+    "version": "1.3.60",
     "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.1.63",
+        "bri-datas": "^1.1.65",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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,13 +199,13 @@ export default {
                                     : fieldData.operators
                     ) || [];
 
-                    const fieldOperator = ["_id"].includes(fieldKey)
-                        ? "eq"
-                        : initContion.fieldOperator
-                            ? initContion.fieldOperator
+                    const fieldOperator = initContion.fieldOperator || (
+                        ["_id"].includes(fieldKey)
+                            ? "eq"
                             : ["reference"].includes(fieldType) && this.isSimpleSearch
                                 ? "eq"
-                                : (operators[0] || {})._key;
+                                : (operators[0] || {})._key
+                    );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
                     const parameterType = initContion.parameterType || (
@@ -222,16 +222,16 @@ export default {
                         logic: "field",
                         fieldKey: fieldKey,
                         fieldType: fieldType,
-                        fieldValue: [],
                         fieldOperator: fieldOperator,
+                        fieldValue: [],
                         fieldSearch: {
                             logic: "and",
                             conditions: []
                         },
+                        parameterType: parameterType,
                         fieldParams: [],
                         chainFieldKey: "",
                         ...initContion,
-                        parameterType: parameterType,
 
                         // 下面的是前端所用
                         dynamicList: dynamicList,
@@ -362,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/DshTreeTable.vue

@@ -1,7 +1,21 @@
 <template>
     <div class="DshTreeTable">
         <div class="DshTreeTable-top">
-            <div class="DshTreeTable-top-total">{{ rowsNumStr }}</div>
+            <div class="DshTreeTable-top-status">
+                <span class="summary">{{ rowsNumStr }};</span>
+
+                <div
+                    v-if="searchFormList.length"
+                    class="logic"
+                >
+                    <div class="logic-title">{{ selfLogicPropsObj._name }}:</div>
+                    <dsh-select
+                        class="logic-option"
+                        :value="dftAdvSearch"
+                        :propsObj="selfLogicPropsObj"
+                    ></dsh-select>
+                </div>
+            </div>
 
             <dsh-buttons
                 class="DshTreeTable-top-btns"
@@ -50,6 +64,24 @@
                 v-if="isEnlargeFlag"
                 class="DshTreeTable-fullscreen-inner"
             >
+                <div class="DshTreeTable-top">
+                    <div class="DshTreeTable-top-status">
+                        <span class="summary">{{ rowsNumStr }};</span>
+
+                        <div
+                            v-if="searchFormList.length"
+                            class="logic"
+                        >
+                            <div class="logic-title">{{ selfLogicPropsObj._name }}:</div>
+                            <dsh-select
+                                class="logic-option"
+                                :value="dftAdvSearch"
+                                :propsObj="selfLogicPropsObj"
+                            ></dsh-select>
+                        </div>
+                    </div>
+                </div>
+
                 <!-- 搜索条件 -->
                 <template v-if="searchFormList.length">
                     <dsh-default-search
@@ -118,7 +150,7 @@
 
             allTreeData () {
                 console.log("allTreeData");
-                return this.getCalcuedTree(this.data, this.filterColumns);
+                return this.getCalcuedTree(this.data, this.columns);
             },
             allListData () {
                 return this.$getTreeFlatArr(this.allTreeData);
@@ -225,9 +257,6 @@
                     }
                 };
             },
-            filterColumns () {
-                return this.columns;
-            },
             showColumns () {
                 return [
                     ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -554,8 +583,30 @@
             justify-content: space-between;
             align-items: center;
 
-            &-total {
-                font-weight: 500;
+            &-status {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+
+                .summary {
+                    font-weight: 500;
+                }
+
+                .logic {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    margin-left: 16px;
+
+                    &-title {
+
+                    }
+
+                    &-option {
+                        margin-left: 8px;
+                        margin-top: -4px;
+                    }
+                }
             }
 
             &-btns {

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

@@ -1,5 +1,5 @@
 import DshListUnit from "../../unit/DshListUnit.vue";
-import quoteListModal from "./quoteListModal.vue";
+import quoteListModal from "../common/quoteListModal.vue";
 
 export default {
     mixins: [],
@@ -63,6 +63,16 @@ export default {
                 logic: "and",
                 conditions: []
             },
+            selfLogicPropsObj: {
+                _name: "逻辑",
+                _key: "logic",
+                _optionKind: "flat",
+                _clearable: false,
+                _data: [
+                    { _key: "and", name: "且" },
+                    { _key: "or", name: "或" }
+                ]
+            },
 
             dshRenderName: undefined,
             showQuoteModal: false,
@@ -183,7 +193,7 @@ export default {
                 _tableAdvSearch: {
                     logic: "and",
                     conditions: []
-                }, // 筛选默认值
+                }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -293,7 +303,7 @@ export default {
             return this.parentObj._id;
         },
         selfRowDefault () {
-            return this.filterColumns.reduce((obj, column) => {
+            return this.columns.reduce((obj, column) => {
                 const defaultVal = this.rowDefault[column._key];
                 const initDftVal = this.initDftValMap[column._type];
 
@@ -490,9 +500,12 @@ export default {
     },
     methods: {
         baseInit () {
-            this.dftAdvSearch.conditions = this.tableAdvSearch.conditions.filter(conditionItem =>
-                this.searchListFields.includes(conditionItem.fieldKey)
-            );
+            this.dftAdvSearch = {
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
+                conditions: this.tableAdvSearch.conditions.filter(conditionItem =>
+                    this.searchListFields.includes(conditionItem.fieldKey)
+                )
+            };
         },
         // 重置
         reset () {

package/src/index.js

@@ -38,6 +38,7 @@ import BriAvatar from "./components/other/BriAvatar.vue";
 import BriLoading from "./components/other/BriLoading.vue";
 import BriIframe from "./components/other/BriIframe.vue";
 import BriSvg from "./components/other/BriSvg.vue";
+import DshColorPanel from "./components/other/DshColorPanel.vue";
 
 // small
 import DshRender from "./components/small/render.js";
@@ -91,7 +92,6 @@ import DshMenuNav from "./components/other/DshMenuNav.vue";
 import BriCode from "./components/other/BriCode.vue";
 import BriCollapseTree from "./components/other/BriCollapseTree.vue";
 import BriGantt from "./components/other/BriGantt.vue";
-import DshColorPanel from "./components/other/DshColorPanel.vue";
 
 // small
 import DshBtnModal from "./components/small/DshBtnModal.vue";
@@ -128,6 +128,7 @@ const map = {
     BriLoading,
     BriIframe,
     BriSvg,
+    DshColorPanel,
 
     // small
     BriButton,
@@ -208,6 +209,7 @@ export {
     BriLoading,
     BriIframe,
     BriSvg,
+    DshColorPanel,
 
     // small
     BriButton,
@@ -258,7 +260,6 @@ export {
     BriCode,
     BriCollapseTree,
     BriGantt,
-    DshColorPanel,
 
     // small
     DshBtnModal