Browse Source

fix: 优化需求240及eta1.8.9解决bug

ldong 7 months ago
parent
commit
aa6da09ad3

+ 2 - 0
src/views/datasheet_manage/components/batchSetDia.vue

@@ -106,6 +106,7 @@ export default {
             // console.log(item)
             if (item) {
                 this.searchList.push(item)
+                this.$refs.selectRef.search_txt = ''
             }
         },
         // 打开弹框
@@ -129,6 +130,7 @@ export default {
 .batch-set-dialog {
     .dialog-main {
         .dialog-main-content {
+            margin-top: 10px;
             .content-list {
 
                 .content-list-item {

+ 5 - 9
src/views/datasheet_manage/mixins/conditionTableMixin.js

@@ -57,12 +57,14 @@ export default {
         // 删除规则
         deleteExcelRule(item) {
             // console.log(item);
-            this.commonInitCell("delete", [item]);
+            this.resetTableData()
+            this.getExcelRule();
         },
         // 修改规则
         editExcelRule(item) {
             // console.log(item);
-            this.commonInitCell("editRule", [item]);
+            this.resetTableData()
+            this.getExcelRule();
         },
         // 清空全部单元格样式
         resetTableData() {
@@ -202,18 +204,12 @@ export default {
                                         ? el.BackgroundColor
                                         : "#fff",
                                 }
-                                : initType == 'editRule' ? null : styleCss.glObj;
-                            if (initType == "delete") {
-                                glObj = null;
-                            }
+                                : styleCss.glObj;
                             this.config.data[item.row - 1][item.column - 1].ShowStyle =
                                 JSON.stringify({
                                     ...styleCss,
                                     glObj,
                                 });
-                            if (["editRule", "delete"].includes(initType)) {
-                                this.getExcelRule();
-                            }
                         }
                     }
                 });