|
|
@@ -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>
|