bri-components 1.4.4 → 1.4.6

package/package.json

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

package/src/components/controls/base/DshNumber/BriInputNumber/BriInputNumber.vue

@@ -330,6 +330,14 @@
                         this.$emit("input", val);
                         this.$emit("on-change", val);
                         this.dispatch("FormItem", "on-form-change", val);
+                    } else {
+                        clearTimeout(this.timer);
+                        this.timer = setTimeout(() => {
+                            this.currentValue = val;
+                            this.$emit("input", val);
+                            this.$emit("on-change", val);
+                            this.dispatch("FormItem", "on-form-change", val);
+                        }, 600);
                     }
                 });
             },
@@ -340,10 +348,6 @@
             blur () {
                 this.focused = false;
                 if (this.transferValue !== this.currentValue) {
-                    this.currentValue = this.transferValue;
-                    this.$emit("input", this.transferValue);
-                    this.$emit("on-change", this.transferValue);
-                    this.dispatch("FormItem", "on-form-change", this.transferValue);
                     this.focused = false;
                     this.$emit("on-blur");
                     if (!findComponentUpward(this, ["DatePicker", "TimePicker", "Cascader", "Search"])) {
@@ -364,6 +368,7 @@
                 if (event.type == "change" && this.activeChange) return;
 
                 if (event.type == "input" && !this.activeChange) return;
+
                 let val = event.target.value.trim();
                 if (this.parser) {
                     val = this.parser(val);

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

@@ -165,7 +165,7 @@ export default {
                 {
                     key: column._id,
                     class: "bri-table-th",
-                    style: this.getThStyle(column)
+                    style: this.getThStyle({ column, colIndex })
                 },
                 [
                     this.contentThCellRender(h, { column, colIndex })
@@ -189,12 +189,11 @@ export default {
             return h(
                 "td",
                 {
-                    class: this.bodyCellClass({ row, rowIndex, column }) +
-                        `${["tree"].includes(column.colType) ? " bri-table-td-merge" : ""}`,
-                    style: this.getTdStyle(row, rowIndex, column),
+                    class: this.bodyCellClass({ row, rowIndex, column }),
+                    style: this.getTdStyle({ row, rowIndex, column }),
                     attrs: {
-                        rowspan: this.getTdRowSpan(row, rowIndex, column),
-                        colspan: this.getTdColSpan(row, rowIndex, column)
+                        rowspan: this.getTdRowSpan({ row, rowIndex, column }),
+                        colspan: this.getTdColSpan({ row, rowIndex, column })
                     },
                     on: {
                         mouseenter: (event) => {
@@ -206,7 +205,7 @@ export default {
                     }
                 },
                 column.colType === "summary"
-                    ? this.getSummaryTdVal(row, rowIndex, column)
+                    ? this.getSummaryTdVal({ row, rowIndex, column })
                     : column.colType === "operation"
                         ? this.operationTdCellRender(h, { row, rowIndex, column })
                         : this.contentTdCellRender(h, { row, rowIndex, column })
@@ -214,13 +213,19 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
+        selfBodyCellClass ({ row, rowIndex, column }) {
+            return `${["tree"].includes(column.colType)
+                ? " bri-table-td-merge"
+                : ""
+            }`;
+        },
         // 表头 -获取样式
-        getThStyle (col) {
-            const typeData = this.$modFieldMap[col._type] || {};
+        getThStyle ({ column, colIndex }) {
+            const typeData = this.$modFieldMap[column._type] || {};
             const boxColWidth = this.boxWidth / this.showColumns.length;
-            const calcWidth = (col._name ? col._name.length * 12 : 48) + (col._type === "reference" ? 200 : 32);
-            const dftWidth = Math.max(boxColWidth, this.widthMap[col._type], calcWidth);
-            const width = col._width || dftWidth;
+            const calcWidth = (column._name ? column._name.length * 12 : 48) + (column._type === "reference" ? 200 : 32);
+            const dftWidth = Math.max(boxColWidth, this.widthMap[column._type], calcWidth);
+            const width = column._width || dftWidth;
 
             return {
                 width: `${width}px`,
@@ -228,33 +233,33 @@ export default {
                 maxWidth: `${width}px`,
                 paddingTop: !this.headHeightAuto ? "10px" : undefined,
                 paddingBottom: !this.headHeightAuto ? "10px" : undefined,
-                textAlign: col._align || typeData.align,
+                textAlign: column._align || typeData.align,
                 "word-break": "break-all",
                 cursor: "pointer"
             };
         },
 
         // 单元格 -获取样式
-        getTdStyle (row, rowIndex, col) {
+        getTdStyle ({ row, rowIndex, column }) {
             return {
-                ...this.getThStyle(col),
+                ...this.getThStyle({ column }),
                 paddingTop: undefined,
                 paddingBottom: undefined,
                 backgroundColor: "#ffffff"
             };
         },
         // 单元格 -获取行合并数
-        getTdRowSpan (row, rowIndex, col) {
+        getTdRowSpan ({ row, rowIndex, column }) {
             return row.total || 1;
         },
         // 单元格 -获取列合并数
-        getTdColSpan (row, rowIndex, col) {
+        getTdColSpan ({ row, rowIndex, column }) {
             return 1;
         },
         // 单元格 -汇总节点单元格-获取值
-        getSummaryTdVal (row, rowIndex, col) {
-            if (col._calField && col._operator) {
-                const calFieldFormItem = this.selfColumns.find(item => item._key === col._calField);
+        getSummaryTdVal ({ row, rowIndex, column }) {
+            if (column._calField && column._operator) {
+                const calFieldFormItem = this.selfColumns.find(item => item._key === column._calField);
 
                 if (calFieldFormItem) {
                     let loop = (nodes, arr) => {
@@ -262,32 +267,32 @@ export default {
                             if (node.children.length) {
                                 return loop(node.children, arr);
                             } else {
-                                arr.push(node[col._calField] || 0);
+                                arr.push(node[column._calField] || 0);
                                 return arr;
                             }
                         }, arr);
                     };
                     let list = loop(row.children, []);
 
-                    return this.$calNumList(list, col._operator, calFieldFormItem);
+                    return this.$calNumList(list, column._operator, calFieldFormItem);
                 } else {
-                    return `来源列${col._calField}被删除`;
+                    return `来源列${column._calField}被删除`;
                 }
             } else {
-                return !col._calField && !col._operator
+                return !column._calField && !column._operator
                     ? "未选择来源列和算法"
-                    : !col._calField
+                    : !column._calField
                         ? "未选择来源列"
                         : "未选择算法";
             }
         },
         // 列本身是否可编辑 -针对表头列
-        getTypeColCanEdit (row, rowIndex, col) {
-            return (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
-            (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(col._key) : true); // 老数据行里某些列不可编辑
+        getTypeColCanEdit ({ row, rowIndex, column }) {
+            return (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(column._key) : true) && // 默认行的某列是否可编辑
+            (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(column._key) : true); // 老数据行里某些列不可编辑
         },
         // getNewRowData时，额外补充的行相关的数据（针对层级属性的列）
-        getRowOtherDft (level, list) {
+        getRowOtherDft (level, list = []) {
             const column = this.treeForm[level - 1];
             const dftVal = column._default;
             const initDftVal = this.initDftValMap[column._type];

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

@@ -142,6 +142,12 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
+        selfBodyCellClass ({ row, rowIndex, column }) {
+            return `${this.mergeRowColKeys && this.mergeRowColKeys.includes(column._key)
+                ? " bri-table-td-merge"
+                : ""
+            }`;
+        },
         bodyCellSpan ({ row, rowIndex, column }) {
             rowIndex = this.showListData.findIndex(dataItem => dataItem._id === row._id);
 

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

@@ -1064,12 +1064,12 @@ export default {
         },
         contentTdCellRender (h, { row, rowIndex, column }) {
             column = this.$transformDynamicProperty(column, row, this.parentObj);
-            column = this.getResetCol(row, rowIndex, column);
-            const unitCanEdit = this.getUnitCanEdit(row, rowIndex, column);
-            const ruleResultObj = this.getColRuleResult(row, rowIndex, column);
+            column = this.getResetCol({ row, rowIndex, column });
+            const unitCanEdit = this.getUnitCanEdit({ row, rowIndex, column });
+            const ruleResultObj = this.getColRuleResult({ row, rowIndex, column });
 
             return [
-                this.isShowCompare(row, rowIndex, column)
+                this.isShowCompare({ row, rowIndex, column })
                     ? h("Tooltip", {
                         style: {
                             width: "100%"
@@ -1248,10 +1248,6 @@ export default {
         },
         bodyCellClass ({ row, rowIndex, column }) {
             return "bri-table-td" +
-                `${this.mergeRowColKeys && this.mergeRowColKeys.includes(column._key)
-                    ? " bri-table-td-merge"
-                    : ""
-                }` +
                 `${["__isExpand__"].includes(column._key)
                     ? " bri-table-td-expand"
                     : ["__treeIndex__"].includes(column._key)
@@ -1269,6 +1265,10 @@ export default {
                             ? " bri-table-td-visible"
                             : ""
                         : " bri-table-td-hide"
+                }` +
+                `${this.selfBodyCellClass
+                    ? this.selfBodyCellClass({ row, rowIndex, column })
+                    : ""
                 }`;
         },
         eventCustomOption ({ row, rowIndex, column }) {
@@ -1326,15 +1326,15 @@ export default {
         },
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
-            return this.filterColumns.every(colItem => this.getColRuleResult(row, rowIndex, colItem).bool);
+            return this.filterColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
         },
         getRowFormList (row, rowIndex) {
-            return this.selfColumns.map(colItem => {
-                colItem = this.$transformDynamicProperty(colItem, row, this.parentObj);
-                const unitCanEdit = this.getColCanEdit(row, rowIndex, colItem);
+            return this.selfColumns.map(column => {
+                column = this.$transformDynamicProperty(column, row, this.parentObj);
+                const unitCanEdit = this.getColCanEdit({ row, rowIndex, column });
 
                 return {
-                    ...colItem,
+                    ...column,
                     canEdit: unitCanEdit
                 };
             });
@@ -1358,16 +1358,16 @@ export default {
         },
 
         // 单元格校验结果
-        getColRuleResult (row, rowIndex, col) {
-            col = this.$transformDynamicProperty(col, row, this.parentObj);
+        getColRuleResult ({ row, rowIndex, column }) {
+            column = this.$transformDynamicProperty(column, row, this.parentObj);
 
             // 未触发校验时 不显示错误
-            if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
+            if ((this.ruleRecordMap[`${row._id}dsh${column._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 // 校验必填不通过 => 校验对比
                 const resultObj = {};
-                this.$getFieldRuleResult(col, row, resultObj) &&
-                    this.$normalComparedFunc(col, row, this.selfColumns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
-                    this.$levelComparedFunc(col, row, this.allListData, this.inTableType, 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;
             }
@@ -1379,54 +1379,54 @@ export default {
             }
         },
         // 单元格是否显示对比
-        isShowCompare (row, rowIndex, col) {
+        isShowCompare ({ row, rowIndex, column }) {
             const oldRow = this.compareListData[rowIndex] || {};
-            const curVal = row[col._key];
-            const oldVal = oldRow[col._key];
+            const curVal = row[column._key];
+            const oldVal = oldRow[column._key];
 
             return this.useCampare &&
-                ["number"].includes(col._type) &&
+                ["number"].includes(column._type) &&
                 !(this.$isEmptyData(curVal) && this.$isEmptyData(oldVal)) &&
                 curVal !== oldVal;
         },
         // 加工单元格对应的配置
-        getResetCol (row, rowIndex, col) {
+        getResetCol ({ row, rowIndex, column }) {
             return {
                 // isShare: this.isShare,
-                ...col,
+                ...column,
                 _heightAuto: this.heightAuto
             };
         },
+        // 单元格最终编辑状态
+        getUnitCanEdit ({ row, rowIndex, column }) {
+            return this.getRowCanEdit(row, rowIndex) &&
+                this.getColCanEdit({ row, rowIndex, column }) &&
+                this.$isAdvRelyShow(column, row, this.parentObj, true);
+        },
         // 列本身是否可编辑
-        getColCanEdit (row, rowIndex, col) {
-            return (col._oldReadonly ? row.__old__ !== true : true) && // 某些列在老数据行里不可编辑
-                (this.getIsDftRow(row) ? !this.dftReadonlyColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
-                (row.__old__ === true ? !this.oldReadonlyColKeys.includes(col._key) : true) && // 老数据行里某些列不可编辑
-                (row.__isQuote__ ? !this.quoteReadonlyColKeys.includes(col._key) : true) && // 引用过来的数据是否可编辑
-                (!this.getTypeColCanEdit || this.getTypeColCanEdit(row, rowIndex, col)) &&
+        getColCanEdit ({ row, rowIndex, column }) {
+            return (column._oldReadonly ? row.__old__ !== true : true) && // 某些列在老数据行里不可编辑
+                (this.getIsDftRow(row) ? !this.dftReadonlyColKeys.includes(column._key) : true) && // 默认行的某列是否可编辑
+                (row.__old__ === true ? !this.oldReadonlyColKeys.includes(column._key) : true) && // 老数据行里某些列不可编辑
+                (row.__isQuote__ ? !this.quoteReadonlyColKeys.includes(column._key) : true) && // 引用过来的数据是否可编辑
+                (!this.getTypeColCanEdit || this.getTypeColCanEdit({ row, rowIndex, column })) &&
                 (
-                    ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(col._type)
-                        ? col._summaryType
+                    ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(column._type)
+                        ? column._summaryType
                             ? row.isLeaf === true
-                            : ["downToUp", "upToDown"].includes(col._writeSort)
-                                ? col._noLimitWrite === true
+                            : ["downToUp", "upToDown"].includes(column._writeSort)
+                                ? column._noLimitWrite === true
                                     ? true
-                                    : ["downToUp"].includes(col._writeSort)
-                                        ? !(row.children && row.children.length) || row.children.every(sonRow => !this.$isEmptyData(sonRow[col._key]))
-                                        : row.level === 1 || !this.$isEmptyData(this.getParentRow(row, this.data)[col._key])
+                                    : ["downToUp"].includes(column._writeSort)
+                                        ? !(row.children && row.children.length) || row.children.every(sonRow => !this.$isEmptyData(sonRow[column._key]))
+                                        : row.level === 1 || !this.$isEmptyData(this.getParentRow(row, this.data)[column._key])
                                 : true
                         : true
                 ) &&
-                !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(col._key)) && // 层级表格的固定字段不可编辑
-                col._enterType !== "calculate" && // 计算的不可编辑
-                col._readonly !== true && // 只读
-                col.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
-        },
-        // 单元格最终编辑状态
-        getUnitCanEdit (row, rowIndex, col) {
-            return this.getRowCanEdit(row, rowIndex) &&
-                this.getColCanEdit(row, rowIndex, col) &&
-                this.$isAdvRelyShow(col, row, this.parentObj, true);
+                !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(column._key)) && // 层级表格的固定字段不可编辑
+                column._enterType !== "calculate" && // 计算的不可编辑
+                column._readonly !== true && // 只读
+                column.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
         },
 
         /* ----------- 工具方法 ---------- */
@@ -1485,6 +1485,7 @@ export default {
                 if (["treeTable"].includes(this.inTableType)) {
                     // row.__isSearchShow__ = false;
                     // row.__isExpand__ = false;
+
                     // 第一级的需要显示出来
                     if (row.level == 1) {
                         row.__isRendered__ = true;
@@ -1503,6 +1504,30 @@ export default {
                     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;
+                }
+            }
         },
         dealSearchShow (rowItem) {
             if (this.isSearching) {