Переглянути джерело

[Mod 0000]修改通用表格的批量删除弹框字体颜色及逻辑

wangkeyi 1 день тому
батько
коміт
546bd378ef

+ 9 - 8
src/views/vent/deviceManager/comment/NormalTable.vue

@@ -31,7 +31,7 @@
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
     </BasicTable>
-    <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab" :deviceType="deviceType" />
+    <DeviceModal @register="registerModal" @save-or-update="saveOrUpdateHandler" :showTab="showTab" :deviceType="deviceType" />
     <!-- <DeviceModal v-model:visible="modalVisible" @saveOrUpdate="saveOrUpdateHandler" @close-modal="closeModal" :showTab="showTab"  /> -->
   </div>
 </template>
@@ -254,13 +254,6 @@
               reject(err);
             }
           );
-          // 兜底:API 未触发任何回调时(如取消弹窗),自动结束 pending 状态
-          setTimeout(() => {
-            if (!done) {
-              done = true;
-              resolve(undefined);
-            }
-          }, 3000);
         }),
       { confirm: false }
     );
@@ -335,3 +328,11 @@
     }
   }
 </style>
+<style lang="less">
+  .delete-confirm-modal {
+    .zxm-modal-confirm-title,
+    .zxm-modal-confirm-content {
+      color: #fff;
+    }
+  }
+</style>

+ 1 - 0
src/views/vent/deviceManager/deviceTable/device.api.ts

@@ -70,6 +70,7 @@ export const batchDeleteById = (params, handleSuccess, handleCancel) => {
     content: '是否删除选中数据',
     okText: '确认',
     cancelText: '取消',
+    wrapClassName: 'delete-confirm-modal',
     onOk: () => {
       return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
         handleSuccess();