diff --git a/apps/web-antd/src/views/ai/chat/index/components/conversation/ConversationUpdateForm.vue b/apps/web-antd/src/views/ai/chat/index/components/conversation/ConversationUpdateForm.vue index 3d96a7088..399e88984 100644 --- a/apps/web-antd/src/views/ai/chat/index/components/conversation/ConversationUpdateForm.vue +++ b/apps/web-antd/src/views/ai/chat/index/components/conversation/ConversationUpdateForm.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getChatConversationMy(data.id as number); + formData.value = await getChatConversationMy(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/ai/knowledge/knowledge/modules/form.vue b/apps/web-antd/src/views/ai/knowledge/knowledge/modules/form.vue index 3861b5b1f..2ad52ed83 100644 --- a/apps/web-antd/src/views/ai/knowledge/knowledge/modules/form.vue +++ b/apps/web-antd/src/views/ai/knowledge/knowledge/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getKnowledge(data.id as number); + formData.value = await getKnowledge(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/ai/knowledge/segment/modules/form.vue b/apps/web-antd/src/views/ai/knowledge/segment/modules/form.vue index 73ccf0144..01a12b54b 100644 --- a/apps/web-antd/src/views/ai/knowledge/segment/modules/form.vue +++ b/apps/web-antd/src/views/ai/knowledge/segment/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getKnowledgeSegment(data.id as number); + formData.value = await getKnowledgeSegment(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/ai/model/apiKey/modules/form.vue b/apps/web-antd/src/views/ai/model/apiKey/modules/form.vue index acc34ca49..85985ae83 100644 --- a/apps/web-antd/src/views/ai/model/apiKey/modules/form.vue +++ b/apps/web-antd/src/views/ai/model/apiKey/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getApiKey(data.id as number); + formData.value = await getApiKey(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/ai/model/chatRole/modules/form.vue b/apps/web-antd/src/views/ai/model/chatRole/modules/form.vue index b9f1ce4f1..f1d3ee481 100644 --- a/apps/web-antd/src/views/ai/model/chatRole/modules/form.vue +++ b/apps/web-antd/src/views/ai/model/chatRole/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getChatRole(data.id as number); + formData.value = await getChatRole(data.id); // 设置到 values await formApi.setValues({ ...data, ...formData.value }); } finally { diff --git a/apps/web-antd/src/views/ai/model/model/modules/form.vue b/apps/web-antd/src/views/ai/model/model/modules/form.vue index 05bbd9595..4baaf3b2b 100644 --- a/apps/web-antd/src/views/ai/model/model/modules/form.vue +++ b/apps/web-antd/src/views/ai/model/model/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getModel(data.id as number); + formData.value = await getModel(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/ai/model/tool/modules/form.vue b/apps/web-antd/src/views/ai/model/tool/modules/form.vue index 9772c98b7..eeb720d13 100644 --- a/apps/web-antd/src/views/ai/model/tool/modules/form.vue +++ b/apps/web-antd/src/views/ai/model/tool/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getTool(data.id as number); + formData.value = await getTool(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/bpm/category/modules/form.vue b/apps/web-antd/src/views/bpm/category/modules/form.vue index 0c8c3e1a1..24c81b706 100644 --- a/apps/web-antd/src/views/bpm/category/modules/form.vue +++ b/apps/web-antd/src/views/bpm/category/modules/form.vue @@ -62,7 +62,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCategory(data.id as number); + formData.value = await getCategory(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/bpm/category/modules/rename-form.vue b/apps/web-antd/src/views/bpm/category/modules/rename-form.vue index acabd37f7..9dfe3c46e 100644 --- a/apps/web-antd/src/views/bpm/category/modules/rename-form.vue +++ b/apps/web-antd/src/views/bpm/category/modules/rename-form.vue @@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { // 获取流程分类数据 - formData.value = await getCategory(data.id as number); + formData.value = await getCategory(data.id); // 仅设置 name 字段 await formApi.setValues({ name: formData.value.name, diff --git a/apps/web-antd/src/views/bpm/form/modules/detail.vue b/apps/web-antd/src/views/bpm/form/modules/detail.vue index 055e6aa7b..063572ecd 100644 --- a/apps/web-antd/src/views/bpm/form/modules/detail.vue +++ b/apps/web-antd/src/views/bpm/form/modules/detail.vue @@ -24,7 +24,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formConfig.value = await getFormDetail(data.id as number); + formConfig.value = await getFormDetail(data.id); setConfAndFields2( formConfig.value, formConfig.value.conf, diff --git a/apps/web-antd/src/views/bpm/group/modules/form.vue b/apps/web-antd/src/views/bpm/group/modules/form.vue index f350796aa..bd90dd5d0 100644 --- a/apps/web-antd/src/views/bpm/group/modules/form.vue +++ b/apps/web-antd/src/views/bpm/group/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUserGroup(data.id as number); + formData.value = await getUserGroup(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/bpm/processExpression/modules/form.vue b/apps/web-antd/src/views/bpm/processExpression/modules/form.vue index 8437d6615..1d6d71673 100644 --- a/apps/web-antd/src/views/bpm/processExpression/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processExpression/modules/form.vue @@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProcessExpression(data.id as number); + formData.value = await getProcessExpression(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/bpm/processListener/modules/form.vue b/apps/web-antd/src/views/bpm/processListener/modules/form.vue index 2a16ff476..ef56d794c 100644 --- a/apps/web-antd/src/views/bpm/processListener/modules/form.vue +++ b/apps/web-antd/src/views/bpm/processListener/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProcessListener(data.id as number); + formData.value = await getProcessListener(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/business/modules/form.vue b/apps/web-antd/src/views/crm/business/modules/form.vue index 8cbeeaa74..5fb58d3c8 100644 --- a/apps/web-antd/src/views/crm/business/modules/form.vue +++ b/apps/web-antd/src/views/crm/business/modules/form.vue @@ -95,7 +95,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = data.id ? await getBusiness(data.id as number) : data; + formData.value = data.id ? await getBusiness(data.id) : data; // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/business/status/modules/form.vue b/apps/web-antd/src/views/crm/business/status/modules/form.vue index 9c76b24d6..933af133c 100644 --- a/apps/web-antd/src/views/crm/business/status/modules/form.vue +++ b/apps/web-antd/src/views/crm/business/status/modules/form.vue @@ -84,7 +84,7 @@ const [Modal, modalApi] = useVbenModal({ }; addStatus(); } else { - formData.value = await getBusinessStatus(data.id as number); + formData.value = await getBusinessStatus(data.id); if ( !formData.value?.statuses?.length || formData.value?.statuses?.length === 0 diff --git a/apps/web-antd/src/views/crm/clue/modules/form.vue b/apps/web-antd/src/views/crm/clue/modules/form.vue index a27ebcf6d..c6c435880 100644 --- a/apps/web-antd/src/views/crm/clue/modules/form.vue +++ b/apps/web-antd/src/views/crm/clue/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getClue(data.id as number); + formData.value = await getClue(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/contact/modules/form.vue b/apps/web-antd/src/views/crm/contact/modules/form.vue index 59aa15648..8f107bb56 100644 --- a/apps/web-antd/src/views/crm/contact/modules/form.vue +++ b/apps/web-antd/src/views/crm/contact/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getContact(data.id as number); + formData.value = await getContact(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/contract/modules/form.vue b/apps/web-antd/src/views/crm/contract/modules/form.vue index e09b475bb..3517681b7 100644 --- a/apps/web-antd/src/views/crm/contract/modules/form.vue +++ b/apps/web-antd/src/views/crm/contract/modules/form.vue @@ -96,7 +96,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getContract(data.id as number); + formData.value = await getContract(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/customer/limitConfig/modules/form.vue b/apps/web-antd/src/views/crm/customer/limitConfig/modules/form.vue index c4b419e7e..7d082bf1b 100644 --- a/apps/web-antd/src/views/crm/customer/limitConfig/modules/form.vue +++ b/apps/web-antd/src/views/crm/customer/limitConfig/modules/form.vue @@ -81,7 +81,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { if (data.id) { - data = await getCustomerLimitConfig(data.id as number); + data = await getCustomerLimitConfig(data.id); } formData.value = data; // 设置到 values diff --git a/apps/web-antd/src/views/crm/customer/modules/form.vue b/apps/web-antd/src/views/crm/customer/modules/form.vue index 06bdf3f34..1b589305f 100644 --- a/apps/web-antd/src/views/crm/customer/modules/form.vue +++ b/apps/web-antd/src/views/crm/customer/modules/form.vue @@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCustomer(data.id as number); + formData.value = await getCustomer(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/product/category/modules/form.vue b/apps/web-antd/src/views/crm/product/category/modules/form.vue index 4a338dc9d..b338c012b 100644 --- a/apps/web-antd/src/views/crm/product/category/modules/form.vue +++ b/apps/web-antd/src/views/crm/product/category/modules/form.vue @@ -67,13 +67,13 @@ const [Modal, modalApi] = useVbenModal({ } // 加载数据 let data = modalApi.getData(); - if (!data) { + if (!data || !data.id) { return; } modalApi.lock(); try { if (data.id) { - data = await getProductCategory(data.id as number); + data = await getProductCategory(data.id); } // 设置到 values formData.value = data; diff --git a/apps/web-antd/src/views/crm/product/modules/form.vue b/apps/web-antd/src/views/crm/product/modules/form.vue index 5398cdbae..565e802df 100644 --- a/apps/web-antd/src/views/crm/product/modules/form.vue +++ b/apps/web-antd/src/views/crm/product/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProduct(data.id as number); + formData.value = await getProduct(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue index dcbd714d5..69e420b94 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getReceivablePlan(data.id as number); + formData.value = await getReceivablePlan(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/erp/finance/account/modules/form.vue b/apps/web-antd/src/views/erp/finance/account/modules/form.vue index d92a98c9c..2203d2ff1 100644 --- a/apps/web-antd/src/views/erp/finance/account/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/account/modules/form.vue @@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getAccount(data.id as number); + formData.value = await getAccount(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/erp/product/product/modules/form.vue b/apps/web-antd/src/views/erp/product/product/modules/form.vue index 042a78c91..dea93ec50 100644 --- a/apps/web-antd/src/views/erp/product/product/modules/form.vue +++ b/apps/web-antd/src/views/erp/product/product/modules/form.vue @@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProduct(data.id as number); + formData.value = await getProduct(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/erp/product/unit/modules/form.vue b/apps/web-antd/src/views/erp/product/unit/modules/form.vue index 4871e227c..39b23f768 100644 --- a/apps/web-antd/src/views/erp/product/unit/modules/form.vue +++ b/apps/web-antd/src/views/erp/product/unit/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProductUnit(data.id as number); + formData.value = await getProductUnit(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/erp/sale/customer/modules/form.vue b/apps/web-antd/src/views/erp/sale/customer/modules/form.vue index 2fd1de2c1..d8da07b2b 100644 --- a/apps/web-antd/src/views/erp/sale/customer/modules/form.vue +++ b/apps/web-antd/src/views/erp/sale/customer/modules/form.vue @@ -68,7 +68,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCustomer(data.id as number); + formData.value = await getCustomer(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/infra/config/modules/form.vue b/apps/web-antd/src/views/infra/config/modules/form.vue index 2a7e9c5be..e31861fe6 100644 --- a/apps/web-antd/src/views/infra/config/modules/form.vue +++ b/apps/web-antd/src/views/infra/config/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getConfig(data.id as number); + formData.value = await getConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue index e6c9d110f..b8e2d8d69 100644 --- a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue +++ b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDataSourceConfig(data.id as number); + formData.value = await getDataSourceConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue index af1a657cf..eaae98c17 100644 --- a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue +++ b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getFileConfig(data.id as number); + formData.value = await getFileConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/product/brand/modules/form.vue b/apps/web-antd/src/views/mall/product/brand/modules/form.vue index 436e73187..079371d7a 100644 --- a/apps/web-antd/src/views/mall/product/brand/modules/form.vue +++ b/apps/web-antd/src/views/mall/product/brand/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBrand(data.id as number); + formData.value = await getBrand(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/product/category/modules/form.vue b/apps/web-antd/src/views/mall/product/category/modules/form.vue index a87323567..b1d4877b7 100644 --- a/apps/web-antd/src/views/mall/product/category/modules/form.vue +++ b/apps/web-antd/src/views/mall/product/category/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { if (data.id) { - data = await getCategory(data.id as number); + data = await getCategory(data.id); } // 设置到 values formData.value = data; diff --git a/apps/web-antd/src/views/mall/product/comment/modules/form.vue b/apps/web-antd/src/views/mall/product/comment/modules/form.vue index ce86b1c45..327ee15d4 100644 --- a/apps/web-antd/src/views/mall/product/comment/modules/form.vue +++ b/apps/web-antd/src/views/mall/product/comment/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getComment(data.id as number); + formData.value = await getComment(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue index cce88878b..e6765a4d8 100644 --- a/apps/web-antd/src/views/mall/product/property/modules/property-form.vue +++ b/apps/web-antd/src/views/mall/product/property/modules/property-form.vue @@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProperty(data.id as number); + formData.value = await getProperty(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue index 394bfe14b..2674c3734 100644 --- a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue +++ b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue @@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({ if (data && 'id' in data && data.id) { modalApi.lock(); try { - formData.value = await getPropertyValue(data.id as number); + formData.value = await getPropertyValue(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/article/category/modules/form.vue b/apps/web-antd/src/views/mall/promotion/article/category/modules/form.vue index cfdd46f01..45cd6b74f 100644 --- a/apps/web-antd/src/views/mall/promotion/article/category/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/article/category/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getArticleCategory(data.id as number); + formData.value = await getArticleCategory(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/article/modules/form.vue b/apps/web-antd/src/views/mall/promotion/article/modules/form.vue index dcf648cf5..6eb484c08 100644 --- a/apps/web-antd/src/views/mall/promotion/article/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/article/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getArticle(data.id as number); + formData.value = await getArticle(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue b/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue index d58d2e92b..84b27a097 100644 --- a/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBanner(data.id as number); + formData.value = await getBanner(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/bargain/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/bargain/activity/modules/form.vue index bfbf6cc9e..b8e566ba4 100644 --- a/apps/web-antd/src/views/mall/promotion/bargain/activity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/bargain/activity/modules/form.vue @@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBargainActivity(data.id as number); + formData.value = await getBargainActivity(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue index 15115febd..4d3f3ed15 100644 --- a/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/combination/activity/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCombinationActivity(data.id as number); + formData.value = await getCombinationActivity(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/coupon/template/modules/form.vue b/apps/web-antd/src/views/mall/promotion/coupon/template/modules/form.vue index f64360980..a7215d673 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/template/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/coupon/template/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCouponTemplate(data.id as number); + formData.value = await getCouponTemplate(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue index 120a7a909..8ddedb845 100644 --- a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue @@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiscountActivity(data.id as number); + formData.value = await getDiscountActivity(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue index 7d24c1712..bdd97adfd 100644 --- a/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/diy/page/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiyPage(data.id as number); + formData.value = await getDiyPage(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue index 7370dce31..71a99d2ac 100644 --- a/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/diy/template/modules/form.vue @@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiyTemplate(data.id as number); + formData.value = await getDiyTemplate(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue index 7e209a90e..f9cc68058 100644 --- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getReward(data.id as number); + formData.value = await getReward(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/mall/promotion/seckill/activity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/seckill/activity/modules/form.vue index 99c2767db..7aef17ae8 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/activity/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/seckill/activity/modules/form.vue @@ -104,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSeckillActivity(data.id as number); + formData.value = await getSeckillActivity(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/modules/form.vue b/apps/web-antd/src/views/mall/promotion/seckill/config/modules/form.vue index 028f48d19..d7e7fb94a 100644 --- a/apps/web-antd/src/views/mall/promotion/seckill/config/modules/form.vue +++ b/apps/web-antd/src/views/mall/promotion/seckill/config/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSeckillConfig(data.id as number); + formData.value = await getSeckillConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue index 85858419b..e21a427c2 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryExpress(data.id as number); + formData.value = await getDeliveryExpress(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue index cf00e715d..d80c5f7f9 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryExpressTemplate(data.id as number); + formData.value = await getDeliveryExpressTemplate(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue index b4a57ab28..bb227ddb1 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryPickUpStore(data.id as number); + formData.value = await getDeliveryPickUpStore(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue index 44623e1cb..5f674ec68 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryPickUpStore(data.id as number); + formData.value = await getDeliveryPickUpStore(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/group/modules/form.vue b/apps/web-antd/src/views/member/group/modules/form.vue index 8ee792535..f1ff93350 100644 --- a/apps/web-antd/src/views/member/group/modules/form.vue +++ b/apps/web-antd/src/views/member/group/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getGroup(data.id as number); + formData.value = await getGroup(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/level/modules/form.vue b/apps/web-antd/src/views/member/level/modules/form.vue index ea659e24e..c9c5f65c5 100644 --- a/apps/web-antd/src/views/member/level/modules/form.vue +++ b/apps/web-antd/src/views/member/level/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getLevel(data.id as number); + formData.value = await getLevel(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/signin/config/modules/form.vue b/apps/web-antd/src/views/member/signin/config/modules/form.vue index ad5d84524..f48af2fdd 100644 --- a/apps/web-antd/src/views/member/signin/config/modules/form.vue +++ b/apps/web-antd/src/views/member/signin/config/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSignInConfig(data.id as number); + formData.value = await getSignInConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/tag/modules/form.vue b/apps/web-antd/src/views/member/tag/modules/form.vue index 521ddcf7a..6d1df3a22 100644 --- a/apps/web-antd/src/views/member/tag/modules/form.vue +++ b/apps/web-antd/src/views/member/tag/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getMemberTag(data.id as number); + formData.value = await getMemberTag(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/user/modules/balance-form.vue b/apps/web-antd/src/views/member/user/modules/balance-form.vue index 4f93bee6e..12ce39d75 100644 --- a/apps/web-antd/src/views/member/user/modules/balance-form.vue +++ b/apps/web-antd/src/views/member/user/modules/balance-form.vue @@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - const user = await getUser(data.id as number); + const user = await getUser(data.id); if (!user || !user.id) { return; } diff --git a/apps/web-antd/src/views/member/user/modules/form.vue b/apps/web-antd/src/views/member/user/modules/form.vue index 56d65757b..2df52a4a4 100644 --- a/apps/web-antd/src/views/member/user/modules/form.vue +++ b/apps/web-antd/src/views/member/user/modules/form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/user/modules/leavel-form.vue b/apps/web-antd/src/views/member/user/modules/leavel-form.vue index faaea982e..aa09f979b 100644 --- a/apps/web-antd/src/views/member/user/modules/leavel-form.vue +++ b/apps/web-antd/src/views/member/user/modules/leavel-form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/member/user/modules/point-form.vue b/apps/web-antd/src/views/member/user/modules/point-form.vue index 81c48bf92..c86c84e29 100644 --- a/apps/web-antd/src/views/member/user/modules/point-form.vue +++ b/apps/web-antd/src/views/member/user/modules/point-form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/mp/account/modules/form.vue b/apps/web-antd/src/views/mp/account/modules/form.vue index 1cefe9f58..9423073a2 100644 --- a/apps/web-antd/src/views/mp/account/modules/form.vue +++ b/apps/web-antd/src/views/mp/account/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getAccount(data.id as number); + formData.value = await getAccount(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue index 21a143993..9ebbce0e1 100644 --- a/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue +++ b/apps/web-antd/src/views/pay/wallet/rechargePackage/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getPackage(data.id as number); + formData.value = await getPackage(data.id); // 转换金额单位 formData.value.payPrice = Number.parseFloat( fenToYuan(formData.value.payPrice), diff --git a/apps/web-antd/src/views/system/dict/modules/data-form.vue b/apps/web-antd/src/views/system/dict/modules/data-form.vue index bcd8edce1..0d8a411ba 100644 --- a/apps/web-antd/src/views/system/dict/modules/data-form.vue +++ b/apps/web-antd/src/views/system/dict/modules/data-form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ if (data && 'id' in data && data.id) { modalApi.lock(); try { - formData.value = await getDictData(data.id as number); + formData.value = await getDictData(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/system/dict/modules/type-form.vue b/apps/web-antd/src/views/system/dict/modules/type-form.vue index 083eade51..c055f880c 100644 --- a/apps/web-antd/src/views/system/dict/modules/type-form.vue +++ b/apps/web-antd/src/views/system/dict/modules/type-form.vue @@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDictType(data.id as number); + formData.value = await getDictType(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/system/menu/modules/form.vue b/apps/web-antd/src/views/system/menu/modules/form.vue index 1b04f02cb..b5cb4f022 100644 --- a/apps/web-antd/src/views/system/menu/modules/form.vue +++ b/apps/web-antd/src/views/system/menu/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ if (data.id) { modalApi.lock(); try { - data = await getMenu(data.id as number); + data = await getMenu(data.id); } finally { modalApi.unlock(); } diff --git a/apps/web-antd/src/views/system/notice/modules/form.vue b/apps/web-antd/src/views/system/notice/modules/form.vue index 4578acac9..d15762e57 100644 --- a/apps/web-antd/src/views/system/notice/modules/form.vue +++ b/apps/web-antd/src/views/system/notice/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getNotice(data.id as number); + formData.value = await getNotice(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-antd/src/views/system/notify/template/modules/form.vue b/apps/web-antd/src/views/system/notify/template/modules/form.vue index efbd9b4e9..20bb704a8 100644 --- a/apps/web-antd/src/views/system/notify/template/modules/form.vue +++ b/apps/web-antd/src/views/system/notify/template/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getNotifyTemplate(data.id as number); + formData.value = await getNotifyTemplate(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue index bc7b8cf3e..ea3f47d4b 100644 --- a/apps/web-antd/src/views/system/oauth2/client/modules/form.vue +++ b/apps/web-antd/src/views/system/oauth2/client/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getOAuth2Client(data.id as number); + formData.value = await getOAuth2Client(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/post/modules/form.vue b/apps/web-antd/src/views/system/post/modules/form.vue index 77217010b..bb2c0a63e 100644 --- a/apps/web-antd/src/views/system/post/modules/form.vue +++ b/apps/web-antd/src/views/system/post/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getPost(data.id as number); + formData.value = await getPost(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue index 00a890a26..5356fa407 100644 --- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue +++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue @@ -78,7 +78,7 @@ const [Modal, modalApi] = useVbenModal({ await loadDeptTree(); toggleExpandAll(); // 设置表单值, 一定要在加载树之后 - await formApi.setValues(await getRole(data.id as number)); + await formApi.setValues(await getRole(data.id)); } finally { modalApi.unlock(); } diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue index b1479fa8c..19de580a8 100644 --- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue +++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue @@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { // 加载角色菜单 - const menuIds = await getRoleMenuList(data.id as number); + const menuIds = await getRoleMenuList(data.id); await formApi.setFieldValue('menuIds', menuIds); await formApi.setValues(data); diff --git a/apps/web-antd/src/views/system/role/modules/form.vue b/apps/web-antd/src/views/system/role/modules/form.vue index 0cd075d3b..2d0b27071 100644 --- a/apps/web-antd/src/views/system/role/modules/form.vue +++ b/apps/web-antd/src/views/system/role/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getRole(data.id as number); + formData.value = await getRole(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/sms/channel/modules/form.vue b/apps/web-antd/src/views/system/sms/channel/modules/form.vue index 8e211074d..117a0e023 100644 --- a/apps/web-antd/src/views/system/sms/channel/modules/form.vue +++ b/apps/web-antd/src/views/system/sms/channel/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSmsChannel(data.id as number); + formData.value = await getSmsChannel(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/social/client/modules/form.vue b/apps/web-antd/src/views/system/social/client/modules/form.vue index 2644f75a8..34dc46520 100644 --- a/apps/web-antd/src/views/system/social/client/modules/form.vue +++ b/apps/web-antd/src/views/system/social/client/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSocialClient(data.id as number); + formData.value = await getSocialClient(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-antd/src/views/system/tenant/modules/form.vue b/apps/web-antd/src/views/system/tenant/modules/form.vue index 418284b87..c4f6f60db 100644 --- a/apps/web-antd/src/views/system/tenant/modules/form.vue +++ b/apps/web-antd/src/views/system/tenant/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getTenant(data.id as number); + formData.value = await getTenant(data.id); // 将数组转换为换行符分隔的字符串 const formValues = { ...formData.value, diff --git a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue index 7116bc0fd..cd40c00fd 100644 --- a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue +++ b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue @@ -82,7 +82,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getTenantPackage(data.id as number); + formData.value = await getTenantPackage(data.id); await formApi.setValues(data); } finally { modalApi.unlock(); diff --git a/apps/web-antd/src/views/system/user/modules/assign-role-form.vue b/apps/web-antd/src/views/system/user/modules/assign-role-form.vue index fd853e8a6..61ed064f6 100644 --- a/apps/web-antd/src/views/system/user/modules/assign-role-form.vue +++ b/apps/web-antd/src/views/system/user/modules/assign-role-form.vue @@ -58,7 +58,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - const roleIds = await getUserRoleList(data.id as number); + const roleIds = await getUserRoleList(data.id); // 设置到 values await formApi.setValues({ ...data, diff --git a/apps/web-antd/src/views/system/user/modules/form.vue b/apps/web-antd/src/views/system/user/modules/form.vue index 00a1cfc4c..479c71132 100644 --- a/apps/web-antd/src/views/system/user/modules/form.vue +++ b/apps/web-antd/src/views/system/user/modules/form.vue @@ -64,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/infra/config/modules/form.vue b/apps/web-ele/src/views/infra/config/modules/form.vue index d775a1a5c..777f29dab 100644 --- a/apps/web-ele/src/views/infra/config/modules/form.vue +++ b/apps/web-ele/src/views/infra/config/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getConfig(data.id as number); + formData.value = await getConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue b/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue index 2fc053458..6291c7406 100644 --- a/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue +++ b/apps/web-ele/src/views/infra/dataSourceConfig/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDataSourceConfig(data.id as number); + formData.value = await getDataSourceConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/infra/fileConfig/index.vue b/apps/web-ele/src/views/infra/fileConfig/index.vue index 2a957c68b..57e973c6f 100644 --- a/apps/web-ele/src/views/infra/fileConfig/index.vue +++ b/apps/web-ele/src/views/infra/fileConfig/index.vue @@ -53,7 +53,6 @@ async function onMaster(row: InfraFileConfigApi.FileConfig) { }); try { await updateFileConfigMaster(row.id as number); - loadingInstance.close(); ElMessage.success($t('ui.actionMessage.operationSuccess')); onRefresh(); } catch { diff --git a/apps/web-ele/src/views/infra/fileConfig/modules/form.vue b/apps/web-ele/src/views/infra/fileConfig/modules/form.vue index 943b18303..580152b37 100644 --- a/apps/web-ele/src/views/infra/fileConfig/modules/form.vue +++ b/apps/web-ele/src/views/infra/fileConfig/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getFileConfig(data.id as number); + formData.value = await getFileConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/product/brand/modules/form.vue b/apps/web-ele/src/views/mall/product/brand/modules/form.vue index dc46d4198..76103ce39 100644 --- a/apps/web-ele/src/views/mall/product/brand/modules/form.vue +++ b/apps/web-ele/src/views/mall/product/brand/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBrand(data.id as number); + formData.value = await getBrand(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/product/category/modules/form.vue b/apps/web-ele/src/views/mall/product/category/modules/form.vue index 44bb6ba3e..fdaea3c78 100644 --- a/apps/web-ele/src/views/mall/product/category/modules/form.vue +++ b/apps/web-ele/src/views/mall/product/category/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ modalApi.lock(); try { if (data.id) { - data = await getCategory(data.id as number); + data = await getCategory(data.id); } // 设置到 values formData.value = data; diff --git a/apps/web-ele/src/views/mall/product/comment/modules/form.vue b/apps/web-ele/src/views/mall/product/comment/modules/form.vue index 1e8ed0fa3..a24d011ac 100644 --- a/apps/web-ele/src/views/mall/product/comment/modules/form.vue +++ b/apps/web-ele/src/views/mall/product/comment/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getComment(data.id as number); + formData.value = await getComment(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue index b37ac6de6..b81e01625 100644 --- a/apps/web-ele/src/views/mall/product/property/modules/property-form.vue +++ b/apps/web-ele/src/views/mall/product/property/modules/property-form.vue @@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getProperty(data.id as number); + formData.value = await getProperty(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue index b66085663..48f6db6ef 100644 --- a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue +++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue @@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({ if (data && 'id' in data && data.id) { modalApi.lock(); try { - formData.value = await getPropertyValue(data.id as number); + formData.value = await getPropertyValue(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue b/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue index 45cc3e373..b7ab57aa3 100644 --- a/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/article/category/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getArticleCategory(data.id as number); + formData.value = await getArticleCategory(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/article/modules/form.vue b/apps/web-ele/src/views/mall/promotion/article/modules/form.vue index fc1d3333c..c715ebe57 100644 --- a/apps/web-ele/src/views/mall/promotion/article/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/article/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getArticle(data.id as number); + formData.value = await getArticle(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue index cc04080c5..3a5ec47f7 100644 --- a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue @@ -70,7 +70,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBanner(data.id as number); + formData.value = await getBanner(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue index aa82b5132..04fa5dfca 100644 --- a/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/bargain/activity/modules/form.vue @@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getBargainActivity(data.id as number); + formData.value = await getBargainActivity(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue index 3d02d550c..ba8f8f858 100644 --- a/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/combination/activity/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCombinationActivity(data.id as number); + formData.value = await getCombinationActivity(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue b/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue index 12caa3be1..4b5a601f1 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/coupon/template/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getCouponTemplate(data.id as number); + formData.value = await getCouponTemplate(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue index cc9c46bb0..7feafc1f4 100644 --- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue @@ -79,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiscountActivity(data.id as number); + formData.value = await getDiscountActivity(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue index f2b9fd24f..7004377d3 100644 --- a/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/diy/page/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiyPage(data.id as number); + formData.value = await getDiyPage(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue index 8562c6c5a..cb3e2af09 100644 --- a/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/diy/template/modules/form.vue @@ -80,7 +80,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDiyTemplate(data.id as number); + formData.value = await getDiyTemplate(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue index f96d2940d..9e89c5a8f 100644 --- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue @@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getReward(data.id as number); + formData.value = await getReward(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue index fcdaefe2e..3de767ce9 100644 --- a/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/seckill/activity/modules/form.vue @@ -104,7 +104,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSeckillActivity(data.id as number); + formData.value = await getSeckillActivity(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue b/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue index ce57d7c8e..36aaf29b9 100644 --- a/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue +++ b/apps/web-ele/src/views/mall/promotion/seckill/config/modules/form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSeckillConfig(data.id as number); + formData.value = await getSeckillConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue b/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue index 5cf29b3ba..aa671db76 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryExpress(data.id as number); + formData.value = await getDeliveryExpress(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue index 715bfedf9..b7e3f8c81 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryExpressTemplate(data.id as number); + formData.value = await getDeliveryExpressTemplate(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue index 1f841e7c9..e7aa27129 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryPickUpStore(data.id as number); + formData.value = await getDeliveryPickUpStore(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue index 2a4afeaac..d46501b95 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDeliveryPickUpStore(data.id as number); + formData.value = await getDeliveryPickUpStore(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/group/modules/form.vue b/apps/web-ele/src/views/member/group/modules/form.vue index b25a6cbc9..f75e46c6c 100644 --- a/apps/web-ele/src/views/member/group/modules/form.vue +++ b/apps/web-ele/src/views/member/group/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getGroup(data.id as number); + formData.value = await getGroup(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/level/modules/form.vue b/apps/web-ele/src/views/member/level/modules/form.vue index 95a693b3c..f951dd975 100644 --- a/apps/web-ele/src/views/member/level/modules/form.vue +++ b/apps/web-ele/src/views/member/level/modules/form.vue @@ -65,7 +65,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getLevel(data.id as number); + formData.value = await getLevel(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/signin/config/modules/form.vue b/apps/web-ele/src/views/member/signin/config/modules/form.vue index f24c6bd12..4fbc5247c 100644 --- a/apps/web-ele/src/views/member/signin/config/modules/form.vue +++ b/apps/web-ele/src/views/member/signin/config/modules/form.vue @@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getSignInConfig(data.id as number); + formData.value = await getSignInConfig(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/tag/modules/form.vue b/apps/web-ele/src/views/member/tag/modules/form.vue index 0517412d2..c1bffdd9b 100644 --- a/apps/web-ele/src/views/member/tag/modules/form.vue +++ b/apps/web-ele/src/views/member/tag/modules/form.vue @@ -71,7 +71,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getMemberTag(data.id as number); + formData.value = await getMemberTag(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/user/modules/balance-form.vue b/apps/web-ele/src/views/member/user/modules/balance-form.vue index e9b13e503..cd8aa7a7f 100644 --- a/apps/web-ele/src/views/member/user/modules/balance-form.vue +++ b/apps/web-ele/src/views/member/user/modules/balance-form.vue @@ -67,7 +67,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - const user = await getUser(data.id as number); + const user = await getUser(data.id); if (!user || !user.id) { return; } diff --git a/apps/web-ele/src/views/member/user/modules/form.vue b/apps/web-ele/src/views/member/user/modules/form.vue index cb15a59c3..3e8fa65ad 100644 --- a/apps/web-ele/src/views/member/user/modules/form.vue +++ b/apps/web-ele/src/views/member/user/modules/form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/user/modules/leavel-form.vue b/apps/web-ele/src/views/member/user/modules/leavel-form.vue index faf56f7c0..9f41e3cc8 100644 --- a/apps/web-ele/src/views/member/user/modules/leavel-form.vue +++ b/apps/web-ele/src/views/member/user/modules/leavel-form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/member/user/modules/point-form.vue b/apps/web-ele/src/views/member/user/modules/point-form.vue index 48fe0d3d2..a99e2e21b 100644 --- a/apps/web-ele/src/views/member/user/modules/point-form.vue +++ b/apps/web-ele/src/views/member/user/modules/point-form.vue @@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getUser(data.id as number); + formData.value = await getUser(data.id); // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue b/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue index 7c594595e..1a582c258 100644 --- a/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue +++ b/apps/web-ele/src/views/pay/wallet/rechargePackage/modules/form.vue @@ -74,7 +74,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getPackage(data.id as number); + formData.value = await getPackage(data.id); // 转换金额单位 formData.value.payPrice = Number.parseFloat( fenToYuan(formData.value.payPrice), diff --git a/apps/web-ele/src/views/system/dict/modules/data-form.vue b/apps/web-ele/src/views/system/dict/modules/data-form.vue index f625f338f..c54b86b6c 100644 --- a/apps/web-ele/src/views/system/dict/modules/data-form.vue +++ b/apps/web-ele/src/views/system/dict/modules/data-form.vue @@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({ if (data && 'id' in data && data.id) { modalApi.lock(); try { - formData.value = await getDictData(data.id as number); + formData.value = await getDictData(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/system/dict/modules/type-form.vue b/apps/web-ele/src/views/system/dict/modules/type-form.vue index 9f982e56e..5c9591c78 100644 --- a/apps/web-ele/src/views/system/dict/modules/type-form.vue +++ b/apps/web-ele/src/views/system/dict/modules/type-form.vue @@ -69,7 +69,7 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value = await getDictType(data.id as number); + formData.value = await getDictType(data.id); // 设置到 values if (formData.value) { await formApi.setValues(formData.value); diff --git a/apps/web-ele/src/views/system/menu/modules/form.vue b/apps/web-ele/src/views/system/menu/modules/form.vue index c96f8e9ee..42cb91047 100644 --- a/apps/web-ele/src/views/system/menu/modules/form.vue +++ b/apps/web-ele/src/views/system/menu/modules/form.vue @@ -66,7 +66,7 @@ const [Modal, modalApi] = useVbenModal({ if (data.id) { modalApi.lock(); try { - data = await getMenu(data.id as number); + data = await getMenu(data.id); } finally { modalApi.unlock(); } diff --git a/apps/web-ele/src/views/system/notice/data.ts b/apps/web-ele/src/views/system/notice/data.ts index 0bc86bb86..f3fd14ab7 100644 --- a/apps/web-ele/src/views/system/notice/data.ts +++ b/apps/web-ele/src/views/system/notice/data.ts @@ -1,8 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { SystemNoticeApi } from '#/api/system/notice'; -import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps, } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -18,44 +18,38 @@ export function useFormSchema(): VbenFormSchema[] { { fieldName: 'title', label: '公告标题', + rules: 'required', component: 'Input', - rules: 'required', - }, - { - fieldName: 'type', - label: '公告类型', - component: 'RadioGroup', componentProps: { - options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'), - buttonStyle: 'solid', - optionType: 'button', + placeholder: '请输入公告标题', }, - rules: 'required', }, { fieldName: 'content', label: '公告内容', - component: 'RichTextarea', rules: 'required', + component: 'RichTextarea', + }, + { + fieldName: 'type', + label: '公告类型（1通知 2公告）', + rules: 'required', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'), + placeholder: '请选择公告类型（1通知 2公告）', + }, }, { fieldName: 'status', - label: '公告状态', + label: '公告状态（0正常 1关闭）', + rules: 'required', component: 'RadioGroup', componentProps: { - options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), + options: [], buttonStyle: 'solid', optionType: 'button', }, - rules: z.number().default(CommonStatusEnum.ENABLE), - }, - { - fieldName: 'remark', - label: '备注', - component: 'Textarea', - componentProps: { - placeholder: '请输入备注', - }, }, ]; } @@ -68,17 +62,45 @@ export function useGridFormSchema(): VbenFormSchema[] { label: '公告标题', component: 'Input', componentProps: { - placeholder: '请输入公告标题', allowClear: true, + placeholder: '请输入公告标题', + }, + }, + { + fieldName: 'content', + label: '公告内容', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入公告内容', + }, + }, + { + fieldName: 'type', + label: '公告类型（1通知 2公告）', + component: 'Select', + componentProps: { + allowClear: true, + options: getDictOptions(DICT_TYPE.SYSTEM_NOTICE_TYPE, 'number'), + placeholder: '请选择公告类型（1通知 2公告）', }, }, { fieldName: 'status', - label: '公告状态', + label: '公告状态（0正常 1关闭）', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'), - placeholder: '请选择公告状态', + allowClear: true, + options: [], + placeholder: '请选择公告状态（0正常 1关闭）', + }, + }, + { + fieldName: 'createTime', + label: '创建时间', + component: 'RangePicker', + componentProps: { + ...getRangePickerDefaultProps(), allowClear: true, }, }, @@ -86,23 +108,28 @@ export function useGridFormSchema(): VbenFormSchema[] { } /** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions['columns'] { +export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { type: 'checkbox', width: 40 }, { field: 'id', - title: '公告编号', - minWidth: 100, + title: '公告ID', + minWidth: 120, }, { field: 'title', title: '公告标题', - minWidth: 200, + minWidth: 120, + }, + { + field: 'content', + title: '公告内容', + minWidth: 120, }, { field: 'type', - title: '公告类型', - minWidth: 100, + title: '公告类型（1通知 2公告）', + minWidth: 120, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE }, @@ -110,22 +137,18 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { }, { field: 'status', - title: '公告状态', - minWidth: 100, - cellRender: { - name: 'CellDict', - props: { type: DICT_TYPE.COMMON_STATUS }, - }, + title: '公告状态（0正常 1关闭）', + minWidth: 120, }, { field: 'createTime', title: '创建时间', - minWidth: 180, + minWidth: 120, formatter: 'formatDateTime', }, { title: '操作', - width: 220, + width: 200, fixed: 'right', slots: { default: 'actions' }, }, diff --git a/apps/web-ele/src/views/system/notice/index.vue b/apps/web-ele/src/views/system/notice/index.vue index fd8fa21a4..909daba73 100644 --- a/apps/web-ele/src/views/system/notice/index.vue +++ b/apps/web-ele/src/views/system/notice/index.vue @@ -5,7 +5,7 @@ import type { SystemNoticeApi } from '#/api/system/notice'; import { ref } from 'vue'; import { confirm, Page, useVbenModal } from '@vben/common-ui'; -import { isEmpty } from '@vben/utils'; +import { downloadFileFromBlobPart, isEmpty } from '@vben/utils'; import { ElLoading, ElMessage } from 'element-plus'; @@ -14,7 +14,6 @@ import { deleteNotice, deleteNoticeList, getNoticePage, - pushNotice, } from '#/api/system/notice'; import { $t } from '#/locales'; @@ -31,31 +30,31 @@ function onRefresh() { gridApi.query(); } -/** 创建公告 */ +/** 创建通知公告 */ function handleCreate() { formModalApi.setData(null).open(); } -/** 编辑公告 */ +/** 编辑通知公告 */ function handleEdit(row: SystemNoticeApi.Notice) { formModalApi.setData(row).open(); } -/** 删除公告 */ +/** 删除通知公告 */ async function handleDelete(row: SystemNoticeApi.Notice) { const loadingInstance = ElLoading.service({ - text: $t('ui.actionMessage.deleting', [row.title]), + text: $t('ui.actionMessage.deleting', [row.id]), }); try { await deleteNotice(row.id as number); - ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.title])); + ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.id])); onRefresh(); } finally { loadingInstance.close(); } } -/** 批量删除公告 */ +/** 批量删除通知公告 */ async function handleDeleteBatch() { await confirm($t('ui.actionMessage.deleteBatchConfirm')); const loadingInstance = ElLoading.service({ @@ -80,17 +79,10 @@ function handleRowCheckboxChange({ checkedIds.value = records.map((item) => item.id!); } -/** 推送公告 */ -async function handlePush(row: SystemNoticeApi.Notice) { - const loadingInstance = ElLoading.service({ - text: '正在推送中...', - }); - try { - await pushNotice(row.id as number); - ElMessage.success($t('ui.actionMessage.operationSuccess')); - } finally { - loadingInstance.close(); - } +/** 导出表格 */ +async function handleExport() { + const data = await exportNotice(await gridApi.formApi.getValues()); + downloadFileFromBlobPart({ fileName: '通知公告.xls', source: data }); } const [Grid, gridApi] = useVbenVxeGrid({ @@ -131,17 +123,24 @@ const [Grid, gridApi] = useVbenVxeGrid({