bri-components 1.4.82 → 1.4.84

package/package.json

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

package/src/components/list/DshBox/DshSingleData.vue

@@ -17,7 +17,7 @@
                 <!-- 底部编辑按钮 -->
                 <dsh-buttons
                     class="DshSingleData-btns"
-                    :list="operationList"
+                    :list="selfOperationList"
                     @click="$dshEmit($event, formData)"
                 ></dsh-buttons>
             </template>
@@ -73,6 +73,18 @@
         computed: {
             formData () {
                 return this.data[0];
+            },
+            selfOperationList () {
+                return this.operationList.map(operationItem => {
+                    return {
+                        ...operationItem,
+                        ...(
+                            operationItem.operationFunc
+                            ? operationItem.operationFunc(operationItem, this.formData, undefined, this.operationList)
+                            : {}
+                        )
+                    };
+                });
             }
         },
         created () {},

package/src/components/list/DshCascaderTable.vue

@@ -53,7 +53,7 @@
                     :isLoading="isLoading"
                     :columns="showColumns"
                     :data="isLoading ? [] : showListData"
-                    :propsObj="tablePropsObj"
+                    :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>

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

@@ -335,7 +335,7 @@ export default {
         },
         quickChangeVal (operationItem, row, rowIndex, column, params) {
             if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
-                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealRuleRecord(row, column);
                 this.dealSameRowsVal({ row, rowIndex, column });
 
                 this.change("quickChangeVal", row, rowIndex, column, ...params);
@@ -343,7 +343,7 @@ export default {
         },
         changeVal (operationItem, row, rowIndex, column, params) {
             if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
-                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealRuleRecord(row, column);
                 this.dealSameRowsVal({ row, rowIndex, column });
 
                 this.change("changeVal", row, rowIndex, column, ...params);

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

@@ -136,6 +136,7 @@ export default {
                     btnType: "errorText",
                     icon: "md-trash",
                     size: "small",
+                    color: "#E83636",
                     disabled: false,
                     event: "clickDelete"
                 }
@@ -450,22 +451,17 @@ export default {
                 .map(rowItem => rowItem._id)
                 .filter(id => !!id);
         },
-        // 渲染过的行
-        renderedListData () {
-            return this.allListData.filter(rowItem => {
-                this.dealSearchShow(rowItem);
-
-                return rowItem.__isRendered__;
-            });
-        },
         // 全部数据 或 筛选时符合条件的数据
         showListData () {
-            return this.renderedListData
-                .filter(rowItem => !!rowItem[this.controlShowKey])
+            return this.allListData
+                .filter(rowItem => {
+                    this.dealSearchShow(rowItem);
+                    return rowItem.__isRendered__ && !!rowItem[this.controlShowKey];
+                })
                 .map((rowItem, rowIndex) => {
                     rowItem.__index__ = rowIndex + 1;
                     return rowItem;
-                });
+            });
         },
         // 全部数据 或 筛选时符合条件的数据 -总数
         selfTotal () {
@@ -487,11 +483,11 @@ export default {
                             ? initDftVal
                             : dftVal
                         : dftInRowVal
-                    // [column._key]: this.$isEmptyData(dftInRowVal)
-                    //     ? this.$isEmptyData(dftVal)
-                    //         ? initDftVal
-                    //         : dftVal
-                    //     : dftInRowVal
+                        // [column._key]: this.$isEmptyData(dftInRowVal)
+                        //     ? this.$isEmptyData(dftVal)
+                        //         ? initDftVal
+                        //         : dftVal
+                        //     : dftInRowVal
                 });
             }, {});
         },
@@ -849,19 +845,19 @@ export default {
 
         // 输入框失去焦点
         controlBlur (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+            this.dealRuleRecord(row, column);
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
             if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
-                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealRuleRecord(row, column);
                 this.change("quickChangeVal", row, rowIndex, column, ...params);
             }
         },
         // 输入框值改变
         changeVal (operationItem, row, rowIndex, column, params) {
             if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
-                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealRuleRecord(row, column);
                 this.change("changeVal", row, rowIndex, column, ...params);
             }
         },
@@ -1179,7 +1175,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1465,7 +1461,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {
@@ -1480,7 +1476,7 @@ export default {
             column = this.$transformDynamicProperty(column, row, this.parentObj);
 
             // 未触发校验时 不显示错误
-            if ((this.ruleRecordMap[this.getMixKey(row, column)] || {}).showRuleMessage || this.showRuleMessage) {
+            if (this.ruleRecordMap[this.getMixKey(row, column)] || this.showRuleMessage) {
                 // 校验必填不通过 => 校验对比
                 const resultObj = {};
                 this.$getFieldRuleResult(column, row, resultObj) &&
@@ -1721,6 +1717,11 @@ export default {
         // 行id + 分隔符 + 列key 组成键
         getMixKey (row, column, splitStr = "--") {
             return `${row._id}${splitStr}${column._key}`;
+        },
+        // 更新校验显示的标记
+        dealRuleRecord (row, column) {
+            // this.$set(this.ruleRecordMap, this.getMixKey(row, column), true);
+            this.ruleRecordMap[this.getMixKey(row, column)] = true;
         }
     }
 };