Merge remote-tracking branch 'origin/feature/0915_素材中心新增手动上传' into test

This commit is contained in:
rd
2025-09-22 11:26:47 +08:00
2 changed files with 36 additions and 24 deletions

View File

@ -259,6 +259,8 @@ export default defineComponent({
};
const onConfirm = async () => {
try {
submitLoading.value = true;
const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
if (hasUploading) {
modalRef.value = Modal.warning({
@ -277,6 +279,9 @@ export default defineComponent({
emit('update');
onClose();
}
} finally {
submitLoading.value = false;
}
};
const openDeleteModal = (file) => {
modalRef.value = Modal.warning({

View File

@ -6,7 +6,7 @@
</div>
<template #footer>
<Button size="medium" @click="onClose">取消</Button>
<Button type="primary" class="ml-16px" danger size="medium" @click="onDelete">确认删除</Button>
<Button :loading="loading" class="ml-16px" danger size="medium" type="primary" @click="onDelete">确认删除</Button>
</template>
</Modal>
</template>
@ -24,12 +24,14 @@ const emits = defineEmits(['update', 'batchUpdate']);
const visible = ref(false);
const fileId = ref(null);
const fileName = ref('');
const loading = ref(false);
const isBatch = computed(() => Array.isArray(fileId.value));
function onClose() {
visible.value = false;
fileId.value = null;
loading.value = false;
fileName.value = '';
}
@ -42,6 +44,8 @@ const open = (record) => {
};
async function onDelete() {
try {
loading.value = true;
const _fn = isBatch.value ? batchDeleteRawMaterials : deleteRawMaterial;
const _params = isBatch.value ? { ids: fileId.value } : fileId.value;
const { code } = await _fn(_params);
@ -51,6 +55,9 @@ async function onDelete() {
onClose();
}
} finally {
loading.value = false;
}
}
defineExpose({ open });