bri-components 1.4.84 → 1.4.86

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

@@ -68,13 +68,13 @@ export default {
     data () {
         return {
             widthMap: this.$getModFieldPropertyMap("width"),
-            initDftValMap: this.$getModFieldPropertyMap("initDefaultVal"),
-            saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
-            resetProperties: ["__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__", "__isExpand__", "__treeIndex__"],
+            dftInitValMap: this.$getModFieldPropertyMap("initDefaultVal"),
+            // saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
+            resetProperties: ["__isShow__", "__isTmpShow__", "__isExpand__", "__treeIndex__"],
 
             initFlag: true,
             isExpandAction: false,
-            showRuleMessage: false, // 进行全体校验
+            // showRuleMessage: false, // 进行全体校验
 
             idRecordMap: {}, // 默认id转换映射
             // hoverRecordMap: {},
@@ -416,7 +416,8 @@ export default {
                 ]
             };
         },
-        // 是否搜索状态
+
+        // 是否筛选状态
         isSearching () {
             return this.parentObj.__isCreate__ === true
                 ? false
@@ -425,88 +426,15 @@ export default {
         searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据；`;
         },
-        controlShowKey () {
-            return this.isSearching ? "__isSearchShow__" : "__isShow__";
-        },
-
-        /* --- 数据 --- */
-        // 默认数据
-        defaultListData () {
-            const loop = (tree = [], list = []) => {
-                return tree.reduce((newList, rowItem) => {
-                    newList = [...newList, rowItem];
-
-                    return rowItem.children && rowItem.children.length
-                        ? loop(rowItem.children, newList)
-                        : newList;
-                }, list);
-            };
-
-            return ["cascaderTable"].includes(this.controlType)
-                ? loop(this.selfPropsObj._default.tree)
-                : this.selfPropsObj._default.list;
-        },
-        defaultListDataIds () {
-            return this.defaultListData
-                .map(rowItem => rowItem._id)
-                .filter(id => !!id);
-        },
-        // 全部数据 或 筛选时符合条件的数据
-        showListData () {
-            return this.allListData
-                .filter(rowItem => {
-                    this.dealSearchShow(rowItem);
-                    return rowItem.__isRendered__ && !!rowItem[this.controlShowKey];
-                })
-                .map((rowItem, rowIndex) => {
-                    rowItem.__index__ = rowIndex + 1;
-                    return rowItem;
-            });
-        },
-        // 全部数据 或 筛选时符合条件的数据 -总数
-        selfTotal () {
-            return this.showListData.length;
-        },
-
-        parentDataId () {
-            return this.parentObj._id;
-        },
-        selfRowDft () {
-            return this.selfColumns.reduce((obj, column) => {
-                const dftInRowVal = this.rowDefault[column._key];
-                const dftVal = column._default;
-                const initDftVal = this.initDftValMap[column._type];
-
-                return Object.assign(obj, {
-                    [column._key]: dftInRowVal === undefined
-                        ? dftVal === undefined
-                            ? initDftVal
-                            : dftVal
-                        : dftInRowVal
-                        // [column._key]: this.$isEmptyData(dftInRowVal)
-                        //     ? this.$isEmptyData(dftVal)
-                        //         ? initDftVal
-                        //         : dftVal
-                        //     : dftInRowVal
-                });
-            }, {});
-        },
-        compareListData () {
-            this.compareData.forEach(item => {
-                !item._id && this.$set(item, "_id", this.$ObjectID().str);
-            });
-            return this.compareData;
-        },
-        useCampare () {
-            return !!this.compareListData.length;
-        },
 
         /* --- 列字段 --- */
-        // columns => selfColumns => useFormColumns => contentColumns => showContentColumns => showColumns
+        // columns => selfColumns => usedColumns => contentColumns => showContentColumns => showColumns
         selfColumns () {
+            // console.log("selfColumns");
             return this.columns;
         },
-        useFormColumns () {
+        usedColumns () {
+            // console.log("usedColumns");
             const list = this.selfColumns.filter(colItem =>
                 this.showOrHideColKeys.includes(colItem._key)
                     ? this.showColKeys.includes(colItem._key)
@@ -516,9 +444,7 @@ export default {
             return list.filter(colItem => this.$isAdvRelyShow(colItem, this.allListData, this.parentObj, true));
         },
         contentColumns () {
-            return this.useFormColumns.map(colItem => ({
-                filter: undefined,
-                sortBy: undefined,
+            return this.usedColumns.map(colItem => ({
                 renderHeaderCell: ({ column }, h) => {
                     return this.contentThCellRender(h, { column });
                 },
@@ -564,14 +490,9 @@ export default {
             };
         },
 
-        checkboxOption () {
-            return {
-                selectedRowKeys: this.selectIds
-            };
-        },
+        /* --- 表格参数 --- */
         tablePropsObj () {
             return {
-                // isLoading: false,
                 // rowStyleOption: {
                 //     hoverHighlight: true,
                 //     clickHighlight: true,
@@ -599,8 +520,13 @@ export default {
                 maxHeight: undefined
             };
         },
+        checkboxOption () {
+            return {
+                selectedRowKeys: this.selectIds
+            };
+        },
 
-        // 联动隐藏
+        /* --- 联动隐藏 --- */
         showColKeys () {
             return this.showByNumFieldVal != null && this.showByNumFieldVal >= 0
                 ? this.showOrHideColKeys.slice(0, this.showByNumFieldVal)
@@ -609,21 +535,23 @@ export default {
         showOrHideColKeys () {
             return this.selfPropsObj._showOrHideColKeys || [];
         },
+        // 控制联动隐藏的数字类型字段
         showByNumFieldKey () {
-            // 控制联动隐藏的数字类型字段
             return this.selfPropsObj._showByNumFieldKey;
         },
+        // 控制联动隐藏的数字类型字段的值
         showByNumFieldVal () {
-            // 控制联动隐藏的数字类型字段的值
             return this.showByNumFieldKey
                 ? this.parentObj[this.showByNumFieldKey]
                 : undefined;
         },
-        // 显示／隐藏
+
+        /* --- 显示／隐藏 --- */
         hideColKeys () {
             return this.selfPropsObj._hideColKeys;
         },
-        // 引用
+
+        /* --- 引用 --- */
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
@@ -657,7 +585,8 @@ export default {
                 }
             };
         },
-        // 导入
+
+        /* --- 导入 --- */
         isImport () {
             return this.selfPropsObj._isImport;
         },
@@ -671,7 +600,8 @@ export default {
                 importType: this.inTableType
             };
         },
-        // 导出
+
+        /* --- 导出 --- */
         isExport () {
             return this.selfPropsObj._isExport;
         },
@@ -684,7 +614,8 @@ export default {
                 advSearch: this.finalTableAdvSearch
             };
         },
-        // 全屏
+
+        /* --- 全屏 --- */
         useEnlarge () {
             return this.selfPropsObj._useEnlarge;
         },
@@ -695,6 +626,62 @@ export default {
             };
         },
 
+        /* --- 数据 --- */
+        // 默认值数据
+        defaultListData () {
+            const loop = (tree = [], list = []) => {
+                return tree.reduce((newList, rowItem) => {
+                    newList = [...newList, rowItem];
+
+                    return rowItem.children && rowItem.children.length
+                        ? loop(rowItem.children, newList)
+                        : newList;
+                }, list);
+            };
+
+            return ["cascaderTable"].includes(this.controlType)
+                ? loop(this.selfPropsObj._default.tree)
+                : this.selfPropsObj._default.list;
+        },
+        defaultListDataIds () {
+            return this.defaultListData
+                .map(rowItem => rowItem._id)
+                .filter(id => !!id);
+        },
+        // 全部数据（或筛选出的数据）-总数
+        selfTotal () {
+            return this.showListData.length;
+        },
+
+        // 新增行的默认值
+        selfRowDft () {
+            return this.selfColumns.reduce((obj, column) => {
+                const dftInRowVal = this.rowDefault[column._key];
+                const dftVal = column._default;
+                const dftInitVal = this.dftInitValMap[column._type];
+
+                return Object.assign(obj, {
+                    [column._key]: dftInRowVal === undefined // 不用isEmptyData判断原因：为空值时可能是故意置空的
+                        ? this.$isEmptyData(dftVal)
+                            ? dftInitVal
+                            : dftVal
+                        : dftInRowVal
+                });
+            }, {});
+        },
+        compareListData () {
+            this.compareData.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.compareData;
+        },
+        useCampare () {
+            return !!this.compareListData.length;
+        },
+        parentDataId () {
+            return this.parentObj._id;
+        },
+
         /* --- 功能按钮 --- */
         baseOperationBtns () {
             return Object.keys(this.baseOperationMap);
@@ -729,9 +716,6 @@ export default {
                         ? this.baseOperationMap.canInsert.tip.replace("行", "条")
                         : this.baseOperationMap.canInsert.tip,
                     color: this.appColor
-                    // style: {
-                    //     color: this.appColor
-                    // }
                 },
                 canHideOrShow: {
                     ...this.topOperationMap.canHideOrShow,
@@ -796,15 +780,25 @@ export default {
 
         // 共外部使用
         validate () {
-            this.showRuleMessage = true;
+            // this.showRuleMessage = true;
+            // return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+
+            let bool = true;
+            this.allListData.forEach((row, rowIndex) => {
+                const resultBool = this.getRowRuleResult(row, rowIndex);
+
+                if (resultBool === false) {
+                    bool = false;
+                }
+            });
 
-            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+            return bool;
         },
         // 重置
         reset () {
             this.initFlag = true;
             this.isExpandAction = false;
-            this.showRuleMessage = false;
+            // this.showRuleMessage = false;
 
             this.idRecordMap = {};
             // this.hoverRecordMap = {};
@@ -1211,6 +1205,7 @@ export default {
         },
         contentThCellRender (h, { column }) {
             column = this.$transformDynamicProperty(column, undefined, this.parentObj);
+            // console.log(column._name);
 
             return this.$getHeadRender(h, column, {
                 showRequired: this.showRequired,
@@ -1219,6 +1214,7 @@ export default {
             });
         },
         contentTdCellRender (h, { row, rowIndex, column }) {
+            // console.log(rowIndex);
             column = this.$transformDynamicProperty(column, row, this.parentObj);
             column = this.getResetCol({ row, rowIndex, column });
             const unitCanEdit = this.getUnitCanEdit({ row, rowIndex, column });
@@ -1263,6 +1259,7 @@ export default {
                         }
                     })
                     : h("dsh-list-unit", {
+                        key: `${row._id}--${column._key}`,
                         props: {
                             canEdit: unitCanEdit,
                             formData: row,
@@ -1390,23 +1387,15 @@ export default {
         },
         bodyCellClass ({ row, rowIndex, column }) {
             return "bri-table-td" +
-                `${["__isExpand__"].includes(column._key)
-                    ? " bri-table-td-expand"
-                    : ["__treeIndex__"].includes(column._key)
-                        ? " bri-table-td-treeIndex"
-                        : this.getRowCanEdit(row, rowIndex)
-                            ? " bri-table-td-edit"
-                            : ""
-                }` +
-                `${this.isSearching
-                    ? row.__isSearchShow__ === false
-                        ? " bri-table-td-hide"
+                `${["__treeIndex__"].includes(column._key)
+                    ? " bri-table-td-treeIndex"
+                    : this.getRowCanEdit(row, rowIndex)
+                        ? " bri-table-td-edit"
                         : ""
-                    : row.__isShow__ === true
-                        ? this.isExpandAction
-                            ? " bri-table-td-visible"
-                            : ""
-                        : " bri-table-td-hide"
+                }` +
+                `${this.isExpandAction
+                    ? " bri-table-td-visible"
+                    : ""
                 }` +
                 `${this.noborderColKeys.includes(column._key)
                     ? " bri-table-td-noborder"
@@ -1420,13 +1409,13 @@ export default {
         eventCustomOption ({ row, rowIndex, column }) {
             return {
                 click: (event) => {
-                    // console.log("click::", row, rowIndex, column, event);
+
                 },
                 dblclick: (event) => {
-                    // console.log("dblclick::", row, rowIndex, column, event);
+
                 },
                 contextmenu: (event) => {
-                    // console.log("contextmenu::", row, rowIndex, column, event);
+
                 },
                 mouseenter: (event) => {
                     // this.$set(this.hoverRecordMap, `${row._id}`, true);
@@ -1440,7 +1429,20 @@ export default {
         /* ----------- 方法 ---------- */
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
-            return this.useFormColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
+            // return this.usedColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
+
+            let bool = true;
+            this.usedColumns.forEach(column => {
+                column = this.$transformDynamicProperty(column, row, this.parentObj);
+
+                const resultObj = this.getColRuleResultObj({ row, rowIndex, column });
+                if (!resultObj.bool) {
+                    bool = false;
+                    this.dealRuleRecord(row, column);
+                }
+            });
+
+            return bool;
         },
         getRowFormList (row, rowIndex) {
             return this.selfColumns.map(column => {
@@ -1476,21 +1478,23 @@ export default {
             column = this.$transformDynamicProperty(column, row, this.parentObj);
 
             // 未触发校验时 不显示错误
-            if (this.ruleRecordMap[this.getMixKey(row, column)] || this.showRuleMessage) {
-                // 校验必填不通过 => 校验对比
-                const resultObj = {};
-                this.$getFieldRuleResult(column, row, resultObj) &&
-                    this.$normalComparedFunc(column, row, this.selfColumns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
-                    this.$levelComparedFunc(column, row, this.allListData, this.inTableType, resultObj);
-
-                return resultObj;
-            }
-            else {
-                return {
+            // return this.ruleRecordMap[this.getMixKey(row, column)] || this.showRuleMessage
+            return this.ruleRecordMap[this.getMixKey(row, column)]
+                ? this.getColRuleResultObj({ row, rowIndex, column })
+                : {
                     bool: true,
                     message: "未触发校验，通过!"
-                };
-            }
+            };
+        },
+        // 获取单元格校验对象
+        getColRuleResultObj ({ row, rowIndex, column }) {
+            // 校验必填不通过 => 校验对比
+            const resultObj = {};
+            this.$getFieldRuleResult(column, row, resultObj) &&
+                this.$normalComparedFunc(column, row, this.selfColumns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
+                this.$levelComparedFunc(column, row, this.allListData, this.inTableType, resultObj);
+
+            return resultObj;
         },
         // 加工单元格对应的配置
         getResetCol ({ row, rowIndex, column }) {
@@ -1544,7 +1548,7 @@ export default {
 
         /* ----------- 工具方法 ---------- */
         // 初始化时 修复数据
-        fixRowItem (row, levelNum) {
+        fixRowData (row, levelNum) {
             if (this.initFlag) {
                 // 配置端设置的地方，不会运行下面的，因为_default被过滤掉没值，defaultListDataIds就是空的
                 if (row._id) {
@@ -1564,58 +1568,13 @@ export default {
                 row.__old__ = this.isDftSet ? false : this.parentObj.__isCreate__ !== true; // 标记老数据
                 row.__isDefault__ = this.isDftSet ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
 
-                // 初次进来 把关于展示的状态值全部清除
+                // 初次进来 把关于展示的状态值全部清除（只有层级表在用，按理说应放在DshTreeTableMixin.js，但为了清除三大表格的老数据，才放在这）
                 this.resetProperties.forEach(property => {
                     delete row[property];
                 });
-                if (["treeTable"].includes(this.inTableType)) {
-                    // row.__isSearchShow__ = false;
-                    // row.__isExpand__ = 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;
-                    row.__isExpand__ = false;
-                }
-            }
-            // 计算或其它重新传进来值时
-            else {
-                if (["treeTable"].includes(this.inTableType)) {
-                    // row.__isSearchShow__ = Object.prototype.hasOwnProperty.call(row, "__isSearchShow__") ? row.__isSearchShow__ : false;
-                    // row.__isExpand__ = Object.prototype.hasOwnProperty.call(row, "__isExpand__") ? row.__isExpand__ : false;
-
-                    // 第一级的需要显示出来
-                    if (row.level == 1) {
-                        row.__isRendered__ = Object.prototype.hasOwnProperty.call(row, "__isRendered__") ? row.__isRendered__ : true;
-                        row.__isShow__ = Object.prototype.hasOwnProperty.call(row, "__isShow__") ? row.__isShow__ : true;
-                        row.__isTmpShow__ = Object.prototype.hasOwnProperty.call(row, "__isTmpShow__") ? row.__isTmpShow__ : true;
-                    } else {
-                        // row.__isRendered__ = Object.prototype.hasOwnProperty.call(row, "__isRendered__") ? row.__isRendered__ : false;
-                        // row.__isShow__ = Object.prototype.hasOwnProperty.call(row, "__isShow__") ? row.__isShow__ : false;
-                        // row.__isTmpShow__ = Object.prototype.hasOwnProperty.call(row, "__isTmpShow__") ? row.__isTmpShow__ : false;
-                    }
-                } else {
-                    row.__isRendered__ = Object.prototype.hasOwnProperty.call(row, "__isRendered__") ? row.__isRendered__ : true;
-                    row.__isShow__ = Object.prototype.hasOwnProperty.call(row, "__isShow__") ? row.__isShow__ : true;
-                    row.__isTmpShow__ = Object.prototype.hasOwnProperty.call(row, "__isTmpShow__") ? row.__isTmpShow__ : true;
-                    row.__isSearchShow__ = Object.prototype.hasOwnProperty.call(row, "__isSearchShow__") ? row.__isSearchShow__ : false;
-                    row.__isExpand__ = Object.prototype.hasOwnProperty.call(row, "__isExpand__") ? row.__isExpand__ : false;
-                }
             }
 
-            this.selfFixRowItem && this.selfFixRowItem(row, levelNum);
+            this.fixSelfRowData && this.fixSelfRowData(row, levelNum);
         },
         // 生成新的一行数据
         getNewRowData (level, list) {
@@ -1628,24 +1587,14 @@ export default {
                     isLeaf: true,
                     children: [],
                     // __old__: false,
-                    __isDefault__: this.isDftSet,
-                    __isRendered__: true,
-                    __isShow__: true,
-                    __isTmpShow__: true,
-                    __isSearchShow__: false,
-                    __isExpand__: false
+                    __isDefault__: this.isDftSet
                 };
             } else {
                 return {
                     ...this.$deepCopy(this.selfRowDft),
                     _id: this.$ObjectID().str,
                     // __old__: false,
-                    __isDefault__: this.isDftSet,
-                    __isRendered__: true,
-                    __isShow__: true,
-                    __isTmpShow__: true,
-                    __isSearchShow__: false,
-                    __isExpand__: false
+                    __isDefault__: this.isDftSet
                 };
             }
         },
@@ -1674,24 +1623,6 @@ export default {
                 return parentRow;
             }
         },
-        // 判断是否符合搜索条件，且处理行状态值等
-        dealSearchShow (rowItem) {
-            if (this.isSearching) {
-                const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
-
-                // 重置
-                rowItem.__isSearchShow__ = false;
-                if (bool) {
-                    rowItem.__isRendered__ = true;
-                    rowItem.__isSearchShow__ = true;
-                }
-
-                return bool;
-            }
-            else {
-                return true;
-            }
-        },
         // 单元格是否显示对比
         isShowCompare ({ row, rowIndex, column }) {
             const oldRow = this.compareListData[rowIndex] || {};

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

@@ -3,7 +3,14 @@ import { resourceData } from "bri-datas";
 export default {
     mixins: [],
     components: {},
-    props: {},
+    props: {
+        treeColumns: {
+            type: Array,
+            default () {
+                return [];
+            }
+        }
+    },
     data () {
         return {
             searchMode: "flat", // "flat", "tree"
@@ -34,27 +41,25 @@ export default {
     computed: {
         treeTableBasePropsObj () {
             return {
-                _treeForm: [],
+                // _treeForm: [],
                 _maxLevel: 3 // 最大级数
             };
         },
-        treeForm () {
-            return this.selfPropsObj._treeForm;
-        },
-        treeFormKeys () {
-            return this.treeForm.map(treeFormItem => treeFormItem._key);
-        },
         maxLevel () {
             return this.selfPropsObj._maxLevel || 3;
         },
+        treeColKeys () {
+            return this.treeColumns.map(colItem => colItem._key);
+        },
 
+        /* --- 列字段 --- */
         selfColumns () {
             return this.columns.map(column => {
                 // 层级表格类型，level字段的进行特殊处理（treeForm加工成_data）
                 return column._key === "level"
                     ? {
                         ...column,
-                        _data: this.treeForm.map((treeFormItem, treeFormIndex) => ({
+                        _data: this.treeColumns.map((treeFormItem, treeFormIndex) => ({
                             name: treeFormItem._name,
                             _key: (treeFormIndex + 1),
                             color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
@@ -63,6 +68,7 @@ export default {
                     : column;
             });
         },
+
         selfAllOperationMap () {
             return {
                 canCreateChild: {
@@ -109,7 +115,7 @@ export default {
             list.splice(newRowIndex, 0, newRow);
 
             // 展开子级
-            this.toggleExpand(row, true);
+            this.toggleExpand && this.toggleExpand(row, true);
 
             this.change("createChildRow", newRow, newRowIndex, null);
         },
@@ -126,7 +132,7 @@ export default {
                     this.change("deleteRow", row, rowIndex, null);
                 }
             });
-        },
+        }
         // // 节点操作 -删除所有子行
         // clickDeleteChilds (operationItem, row, rowIndex, col) {
         //     this.$Modal.confirm({
@@ -139,43 +145,5 @@ export default {
         //         }
         //     });
         // },
-
-        selfFixRowItem (row, levelNum) {
-            if (this.initFlag) {
-                // TODO：修正数据level属性，后期可以删除
-                row.level = row.level || levelNum;
-            }
-        },
-        // 展开／隐藏节点
-        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);
-        }
     }
 };