bri-components 1.4.40 → 1.4.42

package/package.json

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

package/src/components/controls/DshControlInput.vue

@@ -111,7 +111,21 @@
                 this.$emit("clickItem", ...params);
             },
             clickClear () {
-                this.$emit("clear");
+                const cb = () => {
+                    this.$emit("clear");
+                };
+
+                if (this.propsObj._useDeleteTip === true) {
+                    this.$Modal.confirm({
+                        title: "提示",
+                        content: "确定清除全部内容吗？",
+                        onOk: () => {
+                            cb();
+                        }
+                    });
+                } else {
+                    cb();
+                }
             }
         }
     };

package/src/components/controls/base/DshInput/DshInput.vue

@@ -203,6 +203,7 @@
             // 参数event
             onChange (event) {
                 this.quickChange(); // 立马触发
+
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {
                     this.change();

package/src/components/controls/mixins/controlMixin.js

@@ -105,12 +105,17 @@ export default {
         commonDealPropsObj () {
             const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
-                // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true && this.propsObj._readonly !== true
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : "",
                 _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
-                _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly)
+                _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly),
+                // 目前部门、用户在用，以后还会增多
+                _useDeleteTip: this.isInDftSearch || this.isInSearch
+                    ? false
+                    : this.propsObj._useDeleteTip == undefined
+                        ? false
+                        : this.propsObj._useDeleteTip // 删除项进行提示（筛选下删除项不提示）
             };
         },
         // 是否为多选模式

package/src/components/controls/mixins/userAndDepartMixin.js

@@ -53,7 +53,6 @@ export default {
             return {
                 _highSearch: false,
                 _searchString: "",
-                _useDeleteTip: false, // 删除项进行提示
 
                 _reverseFilter: false, // 反向过滤
                 _userDepartFilterVals: [], // 过滤的数据的第一级选项

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -190,7 +190,7 @@
                             class="selectUsers-show-unit-img"
                         />
                         <span
-                            :key="item._key"
+                            :key="item._key + 'img'"
                             class="selectUsers-show-unit-text"
                         >
                             {{ getShowName(item) }}

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

@@ -275,18 +275,20 @@ export default {
             });
         },
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.dealSameRowsVal({ row, rowIndex, column });
+            if (this.isUseQuickChange({ row, rowIndex, column })) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealSameRowsVal({ row, rowIndex, column });
 
-            this.change("quickChangeVal", row, rowIndex, column, ...params);
+                this.change("quickChangeVal", row, rowIndex, column, ...params);
+            }
         },
         changeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._key)) {
+            if (!this.isUseQuickChange({ row, rowIndex, column })) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
-            }
 
-            this.change("changeVal", row, rowIndex, column, ...params);
+                this.change("changeVal", row, rowIndex, column, ...params);
+            }
         },
 
         /* ----------- 方法 ---------- */
@@ -337,15 +339,19 @@ export default {
 
             return rowspan;
         },
+        // 是都满足使用quickChange
+        isUseQuickChange ({ row, rowIndex, column }) {
+            return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
+                this.mergeRowColKeys.includes(column._key) &&
+                this.rowspanMap[this.getMixKey(row, column)] > 1;
+        },
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
-            if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {
-                const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
-                list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
-                    .forEach(rowItem => {
-                        rowItem[column._key] = this.$deepCopy(row[column._key]);
-                });
-            }
+            const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
+            list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
+                .forEach(rowItem => {
+                    rowItem[column._key] = this.$deepCopy(row[column._key]);
+            });
         }
     }
 };

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

@@ -813,8 +813,7 @@ export default {
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.change("quickChangeVal", row, rowIndex, column, ...params);
+            // 啥也不做，平级表格合并单元格时用这个方法
         },
         // 输入框值改变
         changeVal (operationItem, row, rowIndex, column, params) {