bri-components 1.3.92 → 1.3.93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.92",
+    "version": "1.3.93",
     "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.65",
+        "bri-datas": "^1.1.94",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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

@@ -112,6 +112,9 @@ export default {
                 _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
             };
         },
+        maxLevel () {
+            return this.selfPropsObj._maxLevel;
+        },
 
         allTreeData () {
             // console.log("allTreeData");
@@ -150,27 +153,6 @@ export default {
                 this.$set(treeFormItem, "level", treeFormIndex + 1);
                 this.$set(treeFormItem, "canDelete", true);
             });
-
-            // 循环遍树,给根节点赋值
-            const loop = (nodes = []) => {
-                nodes.forEach(rowItem => {
-                    if (rowItem.children && rowItem.children.length) {
-                        loop(rowItem.children);
-                    } else {
-                        // 根节点下所有表格字段加上监测，注入到节点对象中，必须$set，牵扯_rely值再出现并没有检测
-                        this.selfColumns.forEach(subFormItem => {
-                            this.$set(rowItem, subFormItem._key, rowItem[subFormItem._key]);
-                        });
-                    }
-
-                    if (this.initFlag) {
-                        this.fixRowItem(rowItem);
-                    }
-                });
-            };
-            loop(this.data);
-
-            this.initFlag = false;
         },
 
         /* ----------- 操作 ---------- */
@@ -233,7 +215,6 @@ export default {
             this.change("changeNode", col, row, rowIndex);
         },
 
-        /* -----------  ---------- */
         // 节点操作 -插入一行
         clickCreate (operationItem, row, rowIndex, col) {
             const nodeData = this.getNodeData(col, row, rowIndex);
@@ -413,14 +394,7 @@ export default {
                     }),
 
                     // 级联最末级表头的下拉
-                    (
-                        !this.isSearching &&
-                        column.colType === "tree" &&
-                        column.level === this.treeColumns.length &&
-                        this.$getOperationList(this.getTreeThBtns(column, colIndex)).length
-                    )
-                        ? this.getDropdownRender(h, "th", column, colIndex)
-                        : undefined
+                    this.getDropdownRender(h, "th", column, colIndex)
                 ]);
             };
         },
@@ -486,12 +460,7 @@ export default {
                                 ]),
 
                                 // 操作下拉
-                                (
-                                    !this.isSearching &&
-                                    this.$getOperationList(this.getTreeTdBtns(column, row, rowIndex)).length
-                                )
-                                    ? this.getDropdownRender(h, "td", column, undefined, row, rowIndex)
-                                    : undefined
+                                this.getDropdownRender(h, "td", column, undefined, row, rowIndex)
                             ]
                         // 汇总单元格
                         : h("span", this.getSummaryTdVal(column, row, rowIndex))
@@ -515,45 +484,55 @@ export default {
         },
         // 下拉渲染函数
         getDropdownRender (h, position = "th", column, colIndex, row, rowIndex) {
-            return h("dsh-dropdown", {
-                class: "bri-table-dropdown",
-                props: {
-                    menuClass: "bri-table-dropdown-list",
-                    trigger: "hover",
-                    list: position === "th"
-                        ? this.$getOperationList(this.getTreeThBtns(column, colIndex))
-                        : this.$getOperationList(this.getTreeTdBtns(column, row, rowIndex))
-                },
-                on: {
-                    click: (operationItem) => {
-                        position === "th"
-                            ? this.$dispatchEvent(operationItem, column, colIndex)
-                            : this.$dispatchEvent(operationItem, row, rowIndex, column);
-                    }
-                },
-                nativeOn: {
-                    click: (e) => {
-                        e.stopPropagation();
-                    }
-                }
-            }, [
-                h("a", {
-                    style: {
-                        fontWeight: "500",
-                        color: this.appColor
+            const list = position === "th"
+                ? this.$getOperationList(this.getTreeThBtns(column, colIndex))
+                : this.$getOperationList(this.getTreeTdBtns(column, row, rowIndex));
+
+            return !this.isSearching &&
+                list.length &&
+                (
+                    position === "th"
+                        ? column.colType === "tree" && column.level === this.treeColumns.length
+                        : true
+                )
+                ? h("dsh-dropdown", {
+                    class: "bri-table-dropdown",
+                    props: {
+                        menuClass: "bri-table-dropdown-list",
+                        trigger: "hover",
+                        list: list
                     },
-                    attrs: {
-                        href: "javascript:void(0)"
+                    on: {
+                        click: (operationItem) => {
+                            position === "th"
+                                ? this.$dispatchEvent(operationItem, column, colIndex)
+                                : this.$dispatchEvent(operationItem, row, rowIndex, column);
+                        }
+                    },
+                    nativeOn: {
+                        click: (e) => {
+                            e.stopPropagation();
+                        }
                     }
                 }, [
-                    h("Icon", {
-                        props: {
-                            type: "md-arrow-dropdown-circle",
-                            size: "16"
+                    h("a", {
+                        style: {
+                            fontWeight: "500",
+                            color: this.appColor
+                        },
+                        attrs: {
+                            href: "javascript:void(0)"
                         }
-                    })
+                    }, [
+                        h("Icon", {
+                            props: {
+                                type: "md-arrow-dropdown-circle",
+                                size: "16"
+                            }
+                        })
+                    ])
                 ])
-            ]);
+                : undefined;
         },
 
         /* ----------- 方法 ---------- */
@@ -591,8 +570,8 @@ export default {
         // 表头 -树节点表头-获取下拉操作
         getTreeThBtns (col) {
             return [
-                "createCol",
-                ...(col.level > 1 && col.canDelete === true ? ["deleteCol"] : [])
+                ...(col.level <= this.maxLevel ? ["createCol"] : []), // 限制最大添加到几级
+                ...(col.level > 1 && col.canDelete === true ? ["deleteCol"] : []) // 只有一级和最后两级节点数不一致时，不能删
             ];
         },
 
@@ -667,7 +646,13 @@ export default {
                 name: `${this.$numToChinese(level)}级节点${list.length + 1}`,
                 level: level,
                 isLeaf: true,
-                children: []
+                children: [],
+                // __old__: false,
+                __isDefault__: this.controlKey === "_default",
+                __isRendered__: true,
+                __isShow__: true,
+                __isTmpShow__: true,
+                __isSearchShow__: false
             };
         },
 
@@ -713,10 +698,10 @@ export default {
 
             // 循环遍树节点
             const loop = (nodes = []) => {
-                nodes.forEach(node => {
+                nodes.forEach(rowItem => {
                     // 初始化树节点的数据，给节点加上一些属性并监测，注入到节点对象中
-                    let curCol = treeForm[node.level - 1];
-                    this.$setObj(node, {
+                    let curCol = treeForm[rowItem.level - 1];
+                    this.$setObj(rowItem, {
                         _key: curCol._key,
                         level: curCol.level,
                         isEdit: false,
@@ -725,51 +710,54 @@ export default {
                     });
 
                     // 最后一列（根节点）
-                    if (node.level === treeForm.length) {
+                    if (rowItem.level === treeForm.length) {
                         // 处理删除了最后一列后，把根节点上的subForm属性值全部给上级节点
                         if (this.isDeleteColStatus) {
-                            let subNode = node.children[0];
+                            let subNode = rowItem.children[0];
                             subForm.forEach(subFormItem => {
                                 // 用$set也可以
-                                node[subFormItem._key] = subNode[subFormItem._key];
+                                rowItem[subFormItem._key] = subNode[subFormItem._key];
                             });
                         }
 
-                        node.children = [];
-                        node.isLeaf = true;
+                        rowItem.children = [];
+                        rowItem.isLeaf = true;
                     }
                     // 非最后一列（最后一列前的列，非根节点），需继续向下循环
                     else {
                         // 判断是否能删除最后一列（1.判断条件：判断根节点列的前一列的所有节点 都必须只有一个子结点 2.canDelete放在表头treeForm最后一项，默认true）
-                        if (node.level === treeForm.length - 1) {
-                            if (node.children.length > 1) {
-                                treeForm[node.level].canDelete = false;
+                        if (rowItem.level === treeForm.length - 1) {
+                            if (rowItem.children.length > 1) {
+                                treeForm[rowItem.level].canDelete = false;
                             }
                         }
 
                         // 非最后一列的 正常的非根节点
-                        if (node.children && node.children.length) {
-                            loop(node.children);
+                        if (rowItem.children && rowItem.children.length) {
+                            loop(rowItem.children);
                         }
                         // 非最后一列的 新增的非根节点(此时是新增一列或新增非根节点行) -添加一个子节点，并把该节点上的subForm属性值全部给下级节点
                         // 特别提示：新增的是根节点行，不会走此处代码
                         else {
-                            const newNode = this.getNewNode(node.level + 1, node.children);
+                            const newNode = this.getNewNode(rowItem.level + 1, rowItem.children);
                             subForm.forEach(subFormItem => {
                                 // 用$set也可以
-                                newNode[subFormItem._key] = node[subFormItem._key];
-                                delete node[subFormItem._key];
+                                newNode[subFormItem._key] = rowItem[subFormItem._key];
+                                delete rowItem[subFormItem._key];
                             });
-                            node.children.push(newNode);
+                            rowItem.children.push(newNode);
 
-                            loop(node.children);
+                            loop(rowItem.children);
                         }
                     }
+
+                    this.fixRowItem(rowItem);
                 });
             };
             loop(nodes);
-            this.isDeleteColStatus = false;
 
+            this.isDeleteColStatus = false;
+            this.initFlag = false;
             return nodes;
         },
         // 转化渲染使用的columns数组
@@ -823,12 +811,20 @@ export default {
         },
         getFilteredNodes (nodes = []) {
             const loop = (nodes = []) => {
-                return nodes.filter(node => {
-                    if (node.children && node.children.length) {
-                        const children = loop(node.children);
+                return nodes.filter(rowItem => {
+                    if (rowItem.children && rowItem.children.length) {
+                        const children = loop(rowItem.children);
                         return !!children.length;
                     } else {
-                        return this.$isAdvRelyAccord(this.finalTableAdvSearch, node);
+                        const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
+                        // 重置
+                        rowItem.__isSearchShow__ = false;
+                        if (bool) {
+                            rowItem.__isRendered__ = true;
+                            rowItem.__isSearchShow__ = true;
+                        }
+
+                        return bool;
                     }
                 });
             };

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

@@ -8,14 +8,7 @@ export default {
     computed: {
         allListData () {
             this.data.forEach(rowItem => {
-                if (this.initFlag) {
-                    this.fixRowItem(rowItem);
-                }
-
-                rowItem.__isRendered__ = true;
-                rowItem.__isShow__ = true;
-                rowItem.__isTmpShow__ = true;
-                rowItem.__isSearchShow__ = false;
+                this.fixRowItem(rowItem);
             });
 
             this.initFlag = false;
@@ -104,11 +97,12 @@ export default {
                 ...this.$deepCopy(this.selfRowDefault),
                 ...this.$deepCopy(mergeRowData),
                 _id: this.$ObjectID().str,
+                // __old__: false,
+                __isDefault__: this.controlKey === "_default",
                 __isRendered__: true,
                 __isShow__: true,
                 __isTmpShow__: true,
-                __isSearchShow__: false,
-                __isDefault__: this.controlKey === "_default"
+                __isSearchShow__: false
             };
             const list = this.data;
             const newRowIndex = row
@@ -129,6 +123,10 @@ export default {
                     this.change("deleteRow", null, row, rowIndex);
                 }
             });
+        },
+
+        change (eventType, col, row, rowIndex, ...params) {
+            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
         }
     }
 };

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

@@ -6,8 +6,6 @@ export default {
     props: {},
     data () {
         return {
-            // 除了__readonly__, __isDefault__, __old__, __isQuote__不处理
-            deleteProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"],
             searchMode: "flat" // "flat", "tree"
         };
     },
@@ -168,11 +166,12 @@ export default {
                 isLeaf: true,
                 children: [],
                 // __old__: false,
-                __isExpand__: false,
+                __isDefault__: this.controlKey === "_default",
                 __isRendered__: true,
                 __isShow__: true,
-                __isTmpShow__: false,
-                __isSearchShow__: false
+                __isTmpShow__: true,
+                __isSearchShow__: false,
+                __isExpand__: false
             };
             const list = row
                 ? this.getParentRow(row, this.data).children
@@ -193,11 +192,12 @@ export default {
                 isLeaf: true,
                 children: [],
                 // __old__: false,
-                __isExpand__: false,
+                __isDefault__: this.controlKey === "_default",
                 __isRendered__: true,
                 __isShow__: true,
-                __isTmpShow__: false,
-                __isSearchShow__: false
+                __isTmpShow__: true,
+                __isSearchShow__: false,
+                __isExpand__: false
             };
             const list = row.children;
             const newRowIndex = list.length;
@@ -221,6 +221,9 @@ export default {
                 }
             });
         },
+        change (eventType, col, row, rowIndex, ...params) {
+            this.$emit("change", { tree: this.data, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
+        },
 
         /* ------ 工具方法 ------- */
         // 加工树形数据
@@ -299,26 +302,7 @@ export default {
                         }, rowItem);
                     }
 
-                    if (this.initFlag) {
-                        this.fixRowItem(rowItem);
-
-                        // 初次进来把前端存的状态值全部清除
-                        this.deleteProperties.forEach(property => {
-                            delete rowItem[property];
-                        });
-                        // rowItem.__isExpand__ = false;
-                        // rowItem.__isSearchShow__ = false;
-                        // 第一级的需要显示出来
-                        if (rowItem.level == 1) {
-                            rowItem.__isRendered__ = true;
-                            rowItem.__isShow__ = true;
-                            rowItem.__isTmpShow__ = true;
-                        } else {
-                            // rowItem.__isRendered__ = false;
-                            // rowItem.__isShow__ = false;
-                            // rowItem.__isTmpShow__ = false;
-                        }
-                    }
+                    this.fixRowItem(rowItem);
                 });
             loop(treeData);
 

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

@@ -64,6 +64,8 @@ export default {
             widthMap: this.$getModFieldPropertyMap("width"),
             initDftValMap: this.$getModFieldPropertyMap("initDefaultVal"),
 
+            saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
+            resetProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"],
             initFlag: true,
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
@@ -396,26 +398,26 @@ export default {
                 .filter(id => !!id);
         },
         renderedListData () {
-            return this.allListData.filter(row => {
+            return this.allListData.filter(rowItem => {
                 if (this.isSearching) {
-                    const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
+                    const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
 
                     // 重置
-                    row.__isSearchShow__ = false;
+                    rowItem.__isSearchShow__ = false;
                     if (bool) {
-                        row.__isRendered__ = true;
-                        row.__isSearchShow__ = true;
+                        rowItem.__isRendered__ = true;
+                        rowItem.__isSearchShow__ = true;
                     }
                 }
 
-                return row.__isRendered__;
+                return rowItem.__isRendered__;
             });
         },
         showListData () {
-            return this.renderedListData.filter(row =>
+            return this.renderedListData.filter(rowItem =>
                 this.isSearching
-                    ? !!row.__isSearchShow__
-                    : !!row.__isShow__
+                    ? !!rowItem.__isSearchShow__
+                    : !!rowItem.__isShow__
             );
         },
         parentDataId () {
@@ -428,7 +430,7 @@ export default {
                 const initDftVal = this.initDftValMap[column._type];
 
                 return Object.assign(obj, {
-                    [column._key]: this.$isEmptyData(dftInRowVal)
+                    [column._key]: dftInRowVal === undefined
                         ? this.$isEmptyData(dftVal)
                             ? initDftVal
                             : dftVal
@@ -834,9 +836,6 @@ export default {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
             this.change("changeVal", col, row, rowIndex, ...params);
         },
-        change (eventType, col, row, rowIndex, ...params) {
-            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
-        },
 
         /* ----------- 隐藏／显示字段 ---------- */
         toggleHideOrShow () {
@@ -1368,25 +1367,50 @@ export default {
         },
         // 初始化时 修复数据
         fixRowItem (row) {
-            // TODO：修正数据level属性，后期可以删除
-            if (["cascaderTable"].includes(this.controlType)) {
-                row.level = row.level || levelNum;
-            }
+            if (this.initFlag) {
+                // TODO：修正数据level属性，后期可以删除
+                if (["cascaderTable"].includes(this.controlType)) {
+                    row.level = row.level || levelNum;
+                }
 
-            if (row._id) {
-                if (this.defaultListDataIds.includes(row._id)) {
-                    row.__isDefault__ = true;
+                if (row._id) {
+                    if (this.defaultListDataIds.includes(row._id)) {
+                        row.__isDefault__ = true;
 
-                    // 默认数据的id置换一遍，不然每条数据里该列表的id都是重复的
+                        // 默认数据的id置换一遍，不然每条数据里该列表的id都是重复的
+                        row._id = this.$ObjectID().str;
+                    }
+                } else {
                     row._id = this.$ObjectID().str;
                 }
-            } else {
-                row._id = this.$ObjectID().str;
-            }
 
-            // 除了__readonly__, __isDefault__, __old__, __isQuote__不处理
-            row.__old__ = this.controlKey === "_default" ? false : !this.parentObj.__isCreate__; // 标记老数据
-            row.__isDefault__ = this.controlKey === "_default" ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
+                row.__old__ = this.controlKey === "_default" ? false : !this.parentObj.__isCreate__; // 标记老数据
+                row.__isDefault__ = this.controlKey === "_default" ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
+
+                // 初次进来 把关于展示的状态值全部清除
+                this.resetProperties.forEach(property => {
+                    delete row[property];
+                });
+                if (["treeTable"].includes(this.inTableType)) {
+                    // row.__isExpand__ = false;
+                    // row.__isSearchShow__ = false;
+                    // 第一级的需要显示出来
+                    if (row.level == 1) {
+                        row.__isRendered__ = true;
+                        row.__isShow__ = true;
+                        row.__isTmpShow__ = true;
+                    } else {
+                        // row.__isRendered__ = false;
+                        // row.__isShow__ = false;
+                        // row.__isTmpShow__ = false;
+                    }
+                } else {
+                    row.__isRendered__ = true;
+                    row.__isShow__ = true;
+                    row.__isTmpShow__ = true;
+                    row.__isSearchShow__ = false;
+                }
+            }
         }
     }
 };