bri-components 1.3.92 → 1.3.94

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.92",
+    "version": "1.3.94",
     "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/form/DshForm.vue

@@ -348,13 +348,33 @@
                 let rules = [];
                 let ruleConfig = this.$getFieldRuleConfig(formItem);
 
+                // 数据格式校验
+                if (ruleConfig.type) {
+                    rules.push({
+                        message: `${formItem._name}数据格式有错!`,
+                        trigger: "blur, change",
+                        type: "string",
+                        ...ruleConfig,
+                        fields: ruleConfig.fields && Object.entries(ruleConfig.fields).reduce((obj, arr) => {
+                            return {
+                                ...obj,
+                                [arr[0]]: {
+                                    ...arr[1],
+                                    required: false,
+                                    message: `${formItem._name}${arr[1].message || ""}`
+                                }
+                            };
+                        }, ruleConfig.fields)
+                    });
+                }
+
                 // 必填校验
                 if (formItem._required) {
                     rules.push({
-                        required: true,
                         message: `${formItem._name}为必填项!`,
                         trigger: "blur, change",
                         type: "string",
+                        required: true,
                         ...ruleConfig,
                         fields: ruleConfig.fields && Object.entries(ruleConfig.fields).reduce((obj, arr) => {
                             return {
@@ -384,7 +404,7 @@
                 }
 
                 // 对比校验（横向同类型字段对比）-暂时只number和date对比校验
-                if (formItem._saveRuleConfigs) {
+                if (formItem._saveRuleConfigs && formItem._saveRuleConfigs.length) {
                     const ruleObj = {
                         message: `${formItem._name}对比不通过!`,
                         trigger: "blur, change",

package/src/components/list/DshCascaderTable.vue

@@ -8,7 +8,7 @@
 
         <!-- 搜索条件 -->
         <dsh-render
-            v-if="!this.isEnlarge"
+            v-if="!isEnlarge && showTopSearch"
             :render="topSearchRender"
         ></dsh-render>
 
@@ -71,12 +71,14 @@
 
 <script>
     import tableBaseMixin from "./mixins/tableBaseMixin.js";
+    import treeTableBaseMixin from "./mixins/treeTableBaseMixin.js";
     import DshCascaderTableMixin from "./mixins/DshCascaderTableMixin.js";
 
     export default {
         name: "DshCascaderTable",
         mixins: [
             tableBaseMixin,
+            treeTableBaseMixin,
             DshCascaderTableMixin
         ],
         components: {},

package/src/components/list/DshFlatTable.vue

@@ -5,7 +5,7 @@
 
         <!-- 搜索条件 -->
         <dsh-render
-            v-if="!this.isEnlarge"
+            v-if="!isEnlarge && showTopSearch"
             :render="topSearchRender"
         ></dsh-render>
 
@@ -126,6 +126,7 @@
 
 <script>
     import tableBaseMixin from "./mixins/tableBaseMixin.js";
+    import treeTableBaseMixin from "./mixins/treeTableBaseMixin.js";
     import DshFlatTableMixin from "./mixins/DshFlatTableMixin.js";
     import DshDivider from "../controls/base/DshDivider.vue";
 
@@ -133,6 +134,7 @@
         name: "DshFlatTable",
         mixins: [
             tableBaseMixin,
+            treeTableBaseMixin,
             DshFlatTableMixin
         ],
         components: {

package/src/components/list/DshTreeTable.vue

@@ -5,7 +5,7 @@
 
         <!-- 搜索条件 -->
         <dsh-render
-            v-if="!this.isEnlarge"
+            v-if="!isEnlarge && showTopSearch"
             :render="topSearchRender"
         ></dsh-render>
 

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

@@ -24,23 +24,18 @@ export default {
             boxWidth: 0,
 
             baseOperationMap: {
-                clickTh: {
-                    name: "点击列的表头",
-                    type: "clickTh",
-                    event: "clickTh"
-                },
-                createCol: {
+                canCreateCol: {
                     name: "添加一列",
-                    type: "createCol",
+                    type: "canCreateCol",
                     icon: "md-add",
-                    event: "createCol"
+                    event: "clickCreateCol"
                 },
-                deleteCol: {
+                canDeleteCol: {
                     name: "删除该列",
-                    type: "deleteCol",
+                    type: "canDeleteCol",
                     icon: "md-trash",
                     color: "red",
-                    event: "deleteCol"
+                    event: "clickDeleteCol"
                 },
 
                 clickNode: {
@@ -59,43 +54,16 @@ export default {
                     event: "changeNode"
                 },
 
-                canCreateBrother: {
-                    name: "添加同级节点",
-                    type: "canCreateBrother",
-                    icon: "md-add",
-                    event: "clickCreate"
-                },
-                canCreateChildNode: {
-                    name: "添加子节点",
-                    type: "canCreateChildNode",
-                    icon: "md-add",
-                    event: "clickCreateChild"
-                },
-                deleteSelfAndChildNodes: {
-                    name: "删除该节点",
-                    type: "deleteSelfAndChildNodes",
-                    icon: "md-trash",
-                    color: "red",
-                    divided: true,
-                    event: "clickDelete"
-                },
-                deleteChildNodes: {
-                    name: "删除所有子节点",
-                    type: "deleteChildNodes",
-                    icon: "md-trash",
-                    color: "red",
-                    event: "clickDeleteChilds"
-                },
-                clearNode: {
-                    name: "清除该节点内容",
-                    type: "clearNode",
+                canClearNode: {
+                    name: "清除内容",
+                    type: "canClearNode",
                     icon: "md-trash",
                     divided: true,
                     event: "clickClearNode"
                 },
-                clearChildNodes: {
-                    name: "清除所有子节点内容",
-                    type: "clearChildNodes",
+                canClearChildNodes: {
+                    name: "清除所有下级内容",
+                    type: "canClearChildNodes",
                     icon: "md-trash",
                     event: "clickClearChildNodes"
                 }
@@ -103,16 +71,6 @@ export default {
         };
     },
     computed: {
-        selfPropsObj () {
-            return {
-                _treeForm: [],
-                ...this.commonPropsObj,
-
-                _maxLevel: this.commonPropsObj._maxLevel || 3, // 最大级数
-                _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
-            };
-        },
-
         allTreeData () {
             // console.log("allTreeData");
             return this.getCalcuedTree(this.data, this.treeColumns, this.selfColumns);
@@ -150,36 +108,11 @@ 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;
         },
 
         /* ----------- 操作 ---------- */
-        // 表头操作 -点击
-        clickTh (operationItem, col, colIndex) {
-            this.$emit("clickTh", col, colIndex);
-        },
         // 表头操作 -树形表头-添加一列
-        createCol (operationItem, col, colIndex) {
+        clickCreateCol (operationItem, col, colIndex) {
             if (col.colType === "tree" && col.level === this.treeColumns.length) {
                 this.treeColumns.push({
                     _id: this.$ObjectID().str,
@@ -196,7 +129,7 @@ export default {
             }
         },
         // 表头操作 -树形表头-删除一列
-        deleteCol (operationItem, col, colIndex) {
+        clickDeleteCol (operationItem, col, colIndex) {
             if (col.colType === "tree" && col.canDelete !== false) {
                 this.isDeleteColStatus = true; // isDeleteStatus不用在data中定义
                 this.treeColumns.pop();
@@ -232,59 +165,17 @@ export default {
         changeNode (operationItem, col, row, rowIndex) {
             this.change("changeNode", col, row, rowIndex);
         },
-
-        /* -----------  ---------- */
-        // 节点操作 -插入一行
-        clickCreate (operationItem, row, rowIndex, col) {
-            const nodeData = this.getNodeData(col, row, rowIndex);
-            const newNode = this.getNewNode(nodeData.level, nodeData.brotherList);
-            nodeData.brotherList.splice(nodeData.index + 1, 0, newNode);
-
-            this.change("createRow", col, row, rowIndex);
-        },
-        // 节点操作 -添加子行
-        clickCreateChild (operationItem, row, rowIndex, col) {
-            const nodeData = this.getNodeData(col, row, rowIndex);
-            const newNode = this.getNewNode(nodeData.level + 1, nodeData.childList);
-            nodeData.childList.splice(nodeData.childList.length, 0, newNode);
-
-            this.change("createChildRow", col, row, rowIndex);
-        },
-        // 节点操作 -删除该行
-        clickDelete (operationItem, row, rowIndex, col) {
-            const nodeData = this.getNodeData(col, row, rowIndex);
-            nodeData.brotherList.splice(nodeData.index, 1);
-            // 此处应该判断子节点是否是最后一个，是的话就要添加一个一直到叶子节点，不过现在只需要添加一个子节点，transforBriTreeData会捎带着处理了
-            if (!nodeData.brotherList.length) {
-                const newNode = this.getNewNode(nodeData.level, nodeData.brotherList);
-                nodeData.brotherList.push(newNode);
-            }
-
-            this.change("deleteRow", col, row, rowIndex);
-        },
-        // 节点操作 -删除所有子行
-        clickDeleteChilds (operationItem, row, rowIndex, col) {
-            const nodeData = this.getNodeData(col, row, rowIndex);
-            nodeData.childList.splice(0);
-            // 删除完应该添加一个子节点一直到叶子节点，不过现在只需要添加一个子节点，transforBriTreeData会捎带着处理了
-            const newNode = this.getNewNode(nodeData.level + 1, nodeData.childList);
-            nodeData.childList.push(newNode);
-
-            this.change("deleteChildRows", col, row, rowIndex);
-        },
         // 节点操作 -清除该节点内容
         clickClearNode (operationItem, row, rowIndex, col) {
-            const nodeData = this.getNodeData(col, row, rowIndex);
-            nodeData.dataObj.name = "";
+            row.name = "";
 
-            this.change("clearNode", col, row, rowIndex);
+            this.change("clearNode", null, row, rowIndex);
         },
         // 节点操作 -清除所有子节点内容
         clickClearChildNodes (operationItem, row, rowIndex, col) {
-            let nodeData = this.getNodeData(col, row, rowIndex);
-            this.$clearPropertyValToLeaf(nodeData.childList);
+            this.$clearPropertyValToLeaf(row.children);
 
-            this.change("clearChildNodes", col, row, rowIndex);
+            this.change("clearChildNodes", null, row, rowIndex);
         },
         change (eventType, col, row, rowIndex, ...params) {
             this.$emit("change", this.tableDataObj, eventType, col, row, rowIndex, ...params);
@@ -318,12 +209,7 @@ export default {
                                         return h("th", {
                                             key: column._id,
                                             class: "bri-table-th",
-                                            style: this.getThStyle(column, "th"),
-                                            on: {
-                                                click: () => {
-                                                    this.$dispatchEvent(this.operationMap.clickTh, column, colIndex);
-                                                }
-                                            }
+                                            style: this.getThStyle(column, "th")
                                         }, [
                                             // 表头单元格
                                             this.getThRender(column, colIndex)(h)
@@ -413,14 +299,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 +365,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 +389,62 @@ 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 = this.$getOperationList(
+                position === "th"
+                    ? [
+                        ...(column.level <= this.maxLevel ? ["canCreateCol"] : []), // 限制最大添加到几级
+                        ...(column.level > 1 && column.canDelete === true ? ["canDeleteCol"] : []) // 只有一级和最后两级节点数不一致时，不能删
+                    ]
+                    : row.isLeaf === true
+                        ? ["canCreate", "canDelete", "canClearNode"]
+                        : ["canCreate", "canCreateChild", "canDelete", "canDeleteChilds", "canClearNode", "canClearChildNodes"]
+            );
+
+            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;
         },
 
         /* ----------- 方法 ---------- */
@@ -588,13 +479,6 @@ export default {
                 ...selfStyle
             };
         },
-        // 表头 -树节点表头-获取下拉操作
-        getTreeThBtns (col) {
-            return [
-                "createCol",
-                ...(col.level > 1 && col.canDelete === true ? ["deleteCol"] : [])
-            ];
-        },
 
         // 单元格 -获取样式
         getTdStyle (col, row, rowIndex) {
@@ -641,35 +525,6 @@ export default {
                         : "未选择算法";
             }
         },
-        // 单元格 -树节点单元格-获取下拉操作
-        getTreeTdBtns (col, row, rowIndex) {
-            return row.children.length === 0
-                ? ["canCreateBrother", "deleteSelfAndChildNodes", "clearNode"]
-                : ["canCreateBrother", "canCreateChildNode", "deleteSelfAndChildNodes", "deleteChildNodes", "clearNode", "clearChildNodes"];
-        },
-        // 单元格 -普通单元格-获取节点系列数据
-        getNodeData (col, row, rowIndex) {
-            const parentRow = this.getParentRow(row, this.data);
-
-            return {
-                level: col.level,
-                dataObj: row,
-                childList: row.children,
-                brotherList: parentRow.children,
-                index: parentRow.children.findIndex(childRowItem => childRowItem._id === row._id)
-            };
-        },
-        // 单元格 -普通单元格-新增节点数据
-        getNewNode (level, list) {
-            return {
-                ...this.$deepCopy(this.selfRowDefault),
-                _id: this.$ObjectID().str,
-                name: `${this.$numToChinese(level)}级节点${list.length + 1}`,
-                level: level,
-                isLeaf: true,
-                children: []
-            };
-        },
 
         /* ----------- 工具方法 ---------- */
         // 合并表头
@@ -713,10 +568,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 +580,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.getNewRowData(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 +681,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;
@@ -84,36 +77,39 @@ export default {
     methods: {
         // 点击 -添加行
         clickCreate (operationItem, row, rowIndex, col) {
-            // 处理单元格合并相关
-            let mergeRowData = {};
-            if (col && col._mergeRow) {
-                const newList = this.showListData.slice(rowIndex);
-                const newIndex = newList.findIndex(rowItem => row[col._key] !== rowItem[col._key]);
-                row = newList[newIndex - 1];
-
-                // 当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，则所有的合并列不用处理
-                const curIndex = this.mergeRowColumns.findIndex(column => col._key === column._key);
-                mergeRowData = this.mergeRowColumns.reduce((obj, column, colIndex) => {
-                    return colIndex < curIndex
-                        ? Object.assign(obj, { [column._key]: row[column._key] })
-                        : obj;
-                }, {});
-            }
-
-            const newRow = {
-                ...this.$deepCopy(this.selfRowDefault),
-                ...this.$deepCopy(mergeRowData),
-                _id: this.$ObjectID().str,
-                __isRendered__: true,
-                __isShow__: true,
-                __isTmpShow__: true,
-                __isSearchShow__: false,
-                __isDefault__: this.controlKey === "_default"
-            };
             const list = this.data;
+            const newRow = this.getNewRowData();
             const newRowIndex = row
                 ? list.findIndex(rowItem => rowItem._id === row._id) + 1
                 : list.length;
+
+            // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按最后合并列的操作处理）
+            if (col) {
+                if (col._mergeRow === true) {
+                    const newList = this.allListData.slice(rowIndex); // 从该行开始截取
+                    const nextRowIndex = newList.findIndex(rowItem => rowItem[col._key] !== row[col._key]); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
+                    row = nextRowIndex < 0 ? newList[newList.length - 1] : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
+
+                    const colIndex = this.mergeRowColumns.findIndex(column => column._key === col._key);
+                    this.mergeRowColumns.reduce((obj, column, columnIndex) => {
+                        return columnIndex < colIndex
+                            ? Object.assign(obj, {
+                                [column._key]: this.$deepCopy(row[column._key])
+                            })
+                            : obj;
+                    }, newRow);
+                }
+                else {
+                    const colIndex = this.selfColumns.findIndex(column => column._key === col._key);
+                    const mergeRowColumns = this.selfColumns.filter((column, columnIndex) => columnIndex < colIndex && column._mergeRow === true);
+                    mergeRowColumns.slice(0, mergeRowColumns.length - 1).reduce((obj, column) => {
+                        return Object.assign(obj, {
+                            [column._key]: this.$deepCopy(row[column._key])
+                        });
+                    }, newRow);
+                }
+            }
+
             list.splice(newRowIndex, 0, newRow);
 
             this.change("createRow", null, newRow, newRowIndex);
@@ -129,6 +125,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

@@ -1,44 +1,11 @@
-import { resourceData } from "bri-datas";
-
 export default {
     mixins: [],
     components: {},
     props: {},
     data () {
-        return {
-            // 除了__readonly__, __isDefault__, __old__, __isQuote__不处理
-            deleteProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"],
-            searchMode: "flat" // "flat", "tree"
-        };
+        return {};
     },
     computed: {
-        selfColumns () {
-            return this.columns.map(column => {
-                // 层级表格类型，level字段的进行特殊处理（_treeForm加工成_data）
-                return column._key === "level"
-                    ? {
-                        ...column,
-                        _data: this.selfPropsObj._treeForm.map((treeFormItem, treeFormIndex) => ({
-                            name: treeFormItem._name,
-                            _key: (treeFormIndex + 1),
-                            color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
-                        }))
-                    }
-                    : column;
-            });
-        },
-        selfPropsObj () {
-            return {
-                _treeForm: [],
-                ...this.commonPropsObj,
-
-                _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
-            };
-        },
-        maxLevel () {
-            return this.selfPropsObj._maxLevel;
-        },
-
         allTreeData () {
             return this.getCalcuedTree(this.data, this.selfColumns);
         },
@@ -150,76 +117,8 @@ export default {
     },
     created () { },
     methods: {
-        // 本身的初始化
-        selfReset () {
-            this.searchMode = "flat";
-            this.dftAdvSearch = {
-                logic: "and",
-                conditions: []
-            };
-        },
-
-        // 点击 -添加一行
-        clickCreate (operationItem, row, rowIndex, col) {
-            const newRow = {
-                ...this.$deepCopy(this.selfRowDefault),
-                _id: this.$ObjectID().str,
-                level: row ? row.level : 1,
-                isLeaf: true,
-                children: [],
-                // __old__: false,
-                __isExpand__: false,
-                __isRendered__: true,
-                __isShow__: true,
-                __isTmpShow__: false,
-                __isSearchShow__: false
-            };
-            const list = row
-                ? this.getParentRow(row, this.data).children
-                : this.data;
-            const newRowIndex = row
-                ? list.findIndex(rowItem => rowItem._id === row._id) + 1
-                : list.length;
-            list.splice(newRowIndex, 0, newRow);
-
-            this.change("createRow", null, newRow, newRowIndex);
-        },
-        // 点击 -添加子行
-        clickCreateChild (operationItem, row, rowIndex, col) {
-            const newRow = {
-                ...this.$deepCopy(this.selfRowDefault),
-                _id: this.$ObjectID().str,
-                level: row.level + 1,
-                isLeaf: true,
-                children: [],
-                // __old__: false,
-                __isExpand__: false,
-                __isRendered__: true,
-                __isShow__: true,
-                __isTmpShow__: false,
-                __isSearchShow__: false
-            };
-            const list = row.children;
-            const newRowIndex = list.length;
-            list.splice(newRowIndex, 0, newRow);
-            // 展开子级
-            this.toggleExpand(row, true);
-
-            this.change("createChildRow", null, newRow, newRowIndex);
-        },
-        // 点击 -删除行
-        clickDelete (operationItem, row, rowIndex) {
-            this.$Modal.confirm({
-                title: "警告",
-                content: "确定删除吗？",
-                onOk: () => {
-                    const parentRow = this.getParentRow(row, this.data);
-                    const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
-                    parentRow.children.splice(index, 1);
-
-                    this.change("deleteRow", null, row, rowIndex);
-                }
-            });
+        change (eventType, col, row, rowIndex, ...params) {
+            this.$emit("change", { tree: this.data, rowDefault: this.rowDefault }, eventType, col, row, rowIndex, ...params);
         },
 
         /* ------ 工具方法 ------- */
@@ -299,62 +198,12 @@ 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);
 
             this.initFlag = false;
             return treeData;
-        },
-        // 展开／隐藏节点
-        toggleExpand (row, bool = true) {
-            this.isExpandAction = true;
-            this.$set(row, "__isExpand__", bool);
-
-            this.toggleDescendantsShow(row, bool);
-        },
-        // 切换子孙后代的显示／隐藏
-        toggleDescendantsShow (row, bool) {
-            const loop = (row, isFirstSon) => {
-                if (row.children && row.children.length) {
-                    row.children.forEach(subRow => {
-                        if (isFirstSon) {
-                            this.$set(subRow, "__isRendered__", true);
-                            this.$set(subRow, "__isShow__", bool);
-                            this.$set(subRow, "__isTmpShow__", bool);
-                        } else {
-                            if (bool) {
-                                this.$set(subRow, "__isShow__", subRow.__isTmpShow__);
-                            } else {
-                                this.$set(subRow, "__isShow__", false);
-                            }
-                        }
-
-                        loop(subRow);
-                    });
-                }
-            };
-
-            loop(row, true);
         }
     }
 };

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

@@ -63,6 +63,8 @@ export default {
         return {
             widthMap: this.$getModFieldPropertyMap("width"),
             initDftValMap: this.$getModFieldPropertyMap("initDefaultVal"),
+            saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
+            resetProperties: ["__treeIndex__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"],
 
             initFlag: true,
             showRuleMessage: false, // 进行全体校验
@@ -70,10 +72,7 @@ export default {
             hoverRecordMap: {},
             isExpandAction: false,
 
-            dftAdvSearch: {
-                logic: "and",
-                conditions: []
-            },
+            showTopSearch: true,
             selfLogicPropsObj: {
                 _name: "逻辑",
                 _key: "logic",
@@ -84,6 +83,10 @@ export default {
                     { _key: "or", name: "或" }
                 ]
             },
+            dftAdvSearch: {
+                logic: "and",
+                conditions: []
+            },
 
             dshRenderName: undefined,
             hideStatus: true,
@@ -167,6 +170,16 @@ export default {
                     disabled: false,
                     event: "clickDelete"
                 },
+                canDeleteChilds: {
+                    name: "删除所有子级",
+                    type: "canDeleteChilds",
+                    btnType: "errorText",
+                    icon: "ios-trash-outline",
+                    size: "small",
+                    color: "#E83636",
+                    disabled: false,
+                    event: "clickDeleteChilds"
+                },
                 changeVal: {
                     name: "改变输入框值",
                     type: "changeVal",
@@ -207,7 +220,7 @@ export default {
             return this.columns;
         },
         mergeRowColumns () {
-            return this.columns.filter(column => column._mergeRow === true);
+            return this.selfColumns.filter(column => column._mergeRow === true);
         },
         filterColumns () {
             return this.selfColumns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
@@ -396,26 +409,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 +441,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
@@ -807,7 +820,13 @@ export default {
             this.initFlag = true;
             this.showRuleMessage = false;
             this.ruleRecordMap = {};
+            this.hoverRecordMap = {};
             this.isExpandAction = false;
+            this.dftAdvSearch = {
+                logic: "and",
+                conditions: []
+            };
+            this.hideStatus = true;
             this.selfReset && this.selfReset();
         },
         // 共外部使用
@@ -834,9 +853,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 () {
@@ -880,10 +896,10 @@ export default {
             if (dataObj) {
                 const fieldVal = dataObj[this.controlKey];
                 const isEmpty = this.$isEmptyData(fieldVal) || (
-                    ["flatTable"].includes(this.controlType)
-                        ? !fieldVal.list || !fieldVal.list.length
-                        : ["cascaderTable"].includes(this.controlType)
-                            ? !fieldVal.tree || !fieldVal.tree.length
+                    ["cascaderTable"].includes(this.controlType)
+                        ? !fieldVal.tree || !fieldVal.tree.length
+                        : ["flatTable"].includes(this.controlType)
+                            ? !fieldVal.list || !fieldVal.list.length
                             : false
                 );
 
@@ -895,17 +911,7 @@ export default {
                     });
                 }
                 else {
-                    if (["flatTable"].includes(this.controlType)) {
-                        this.parentObj[this.controlKey] = {
-                            ...fieldVal,
-                            list: fieldVal.list.map(item => ({
-                                ...item,
-                                __isQuote__: true,
-                                __old__: false
-                            }))
-                        };
-                    }
-                    else if (["cascaderTable"].includes(this.controlType)) {
+                    if (["cascaderTable"].includes(this.controlType)) {
                         const transformData = (list = []) => {
                             const loop = (list = []) =>
                                 list.map(item => ({
@@ -923,9 +929,24 @@ export default {
                             tree: transformData(fieldVal.tree)
                         };
                     }
+                    else if (["flatTable"].includes(this.controlType)) {
+                        this.parentObj[this.controlKey] = {
+                            ...fieldVal,
+                            list: fieldVal.list.map(item => ({
+                                ...item,
+                                __isQuote__: true,
+                                __old__: false
+                            }))
+                        };
+                    }
 
                     this.$Message.success("引用成功！");
                     this.reset();
+                    this.showTopSearch = false;
+                    this.$nextTick(() => {
+                        this.showTopSearch = true;
+                    });
+
                     this.change("quote");
                 }
             } else {
@@ -1231,6 +1252,43 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
+        // 生成新的一行数据
+        getNewRowData (level, list) {
+            if (["cascaderTable"].includes(this.controlType)) {
+                return {
+                    ...this.$deepCopy(this.selfRowDefault),
+                    _id: this.$ObjectID().str,
+                    level: level,
+                    isLeaf: true,
+                    children: [],
+                    ...(
+                        ["treeTable"].includes(this.inTableType)
+                            ? {}
+                            : {
+                                name: `${this.$numToChinese(level)}级节点${list.length + 1}`
+                            }
+                    ),
+                    // __old__: false,
+                    __isDefault__: this.controlKey === "_default",
+                    __isRendered__: true,
+                    __isShow__: true,
+                    __isTmpShow__: true,
+                    __isSearchShow__: false,
+                    __isExpand__: false
+                };
+            } else {
+                return {
+                    ...this.$deepCopy(this.selfRowDefault),
+                    _id: this.$ObjectID().str,
+                    // __old__: false,
+                    __isDefault__: this.controlKey === "_default",
+                    __isRendered__: true,
+                    __isShow__: true,
+                    __isTmpShow__: true,
+                    __isSearchShow__: false
+                };
+            }
+        },
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
             return this.filterColumns.every(column => this.getColRuleResult(column, row, rowIndex).bool);
@@ -1368,25 +1426,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;
+                }
+            }
         }
     }
 };

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

@@ -0,0 +1,132 @@
+import { resourceData } from "bri-datas";
+
+export default {
+    mixins: [],
+    components: {},
+    props: {},
+    data () {
+        return {
+            searchMode: "flat" // "flat", "tree"
+        };
+    },
+    computed: {
+        selfPropsObj () {
+            return {
+                _treeForm: [],
+                ...this.commonPropsObj,
+
+                _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
+            };
+        },
+        maxLevel () {
+            return this.selfPropsObj._maxLevel;
+        },
+
+        selfColumns () {
+            return this.columns.map(column => {
+                // 层级表格类型，level字段的进行特殊处理（_treeForm加工成_data）
+                return column._key === "level"
+                    ? {
+                        ...column,
+                        _data: this.selfPropsObj._treeForm.map((treeFormItem, treeFormIndex) => ({
+                            name: treeFormItem._name,
+                            _key: (treeFormIndex + 1),
+                            color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
+                        }))
+                    }
+                    : column;
+            });
+        }
+    },
+    created () { },
+    methods: {
+        // 本身的初始化
+        selfReset () {
+            this.searchMode = "flat";
+        },
+
+        // 节点操作 -添加一行
+        clickCreate (operationItem, row, rowIndex, col) {
+            const list = row
+                ? this.getParentRow(row, this.data).children
+                : this.data;
+            const newRowIndex = row
+                ? list.findIndex(rowItem => rowItem._id === row._id) + 1
+                : list.length;
+            const newRow = this.getNewRowData(row ? row.level : 1, list);
+            list.splice(newRowIndex, 0, newRow);
+
+            this.change("createRow", null, newRow, newRowIndex);
+        },
+        // 节点操作 -添加子行
+        clickCreateChild (operationItem, row, rowIndex, col) {
+            const list = row.children;
+            const newRowIndex = list.length;
+            const newRow = this.getNewRowData(row.level + 1, list);
+            list.splice(newRowIndex, 0, newRow);
+
+            // 展开子级
+            this.toggleExpand(row, true);
+
+            this.change("createChildRow", null, newRow, newRowIndex);
+        },
+        // 节点操作 -删除行
+        clickDelete (operationItem, row, rowIndex, col) {
+            // this.$Modal.confirm({
+            //     title: "警告",
+            //     content: "确定删除该行及其所有下级吗？",
+            //     onOk: () => {
+            const parentRow = this.getParentRow(row, this.data);
+            const index = parentRow.children.findIndex(childRowItem => childRowItem._id === row._id);
+            parentRow.children.splice(index, 1);
+
+            this.change("deleteRow", null, row, rowIndex);
+            // }
+            // });
+        },
+        // 节点操作 -删除所有子行
+        clickDeleteChilds (operationItem, row, rowIndex, col) {
+            // this.$Modal.confirm({
+            //     title: "警告",
+            //     content: "确定删除该行及其所有下级吗？",
+            //     onOk: () => {
+            row.children.splice(0);
+
+            this.change("deleteChildRows", null, row, rowIndex);
+            // }
+            // });
+        },
+
+        // 展开／隐藏节点
+        toggleExpand (row, bool = true) {
+            this.isExpandAction = true;
+            this.$set(row, "__isExpand__", bool);
+
+            this.toggleDescendantsShow(row, bool);
+        },
+        // 切换子孙后代的显示／隐藏
+        toggleDescendantsShow (row, bool) {
+            const loop = (row, isFirstSon) => {
+                if (row.children && row.children.length) {
+                    row.children.forEach(subRow => {
+                        if (isFirstSon) {
+                            this.$set(subRow, "__isRendered__", true);
+                            this.$set(subRow, "__isShow__", bool);
+                            this.$set(subRow, "__isTmpShow__", bool);
+                        } else {
+                            if (bool) {
+                                this.$set(subRow, "__isShow__", subRow.__isTmpShow__);
+                            } else {
+                                this.$set(subRow, "__isShow__", false);
+                            }
+                        }
+
+                        loop(subRow);
+                    });
+                }
+            };
+
+            loop(row, true);
+        }
+    }
+};