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 3d96a708..399e8898 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 3861b5b1..2ad52ed8 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 73ccf014..01a12b54 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 acc34ca4..85985ae8 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 b9f1ce4f..f1d3ee48 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 05bbd959..4baaf3b2 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 9772c98b..eeb720d1 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 0c8c3e1a..24c81b70 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 acabd37f..9dfe3c46 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 055e6aa7..063572ec 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 f350796a..bd90dd5d 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 8437d661..1d6d7167 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 2a16ff47..ef56d794 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 8cbeeaa7..5fb58d3c 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 9c76b24d..933af133 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 a27ebcf6..c6c43588 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 59aa1564..8f107bb5 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 e09b475b..3517681b 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 c4b419e7..7d082bf1 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 06bdf3f3..1b589305 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 4a338dc9..b338c012 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 5398cdba..565e802d 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 dcbd714d..69e420b9 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 d92a98c9..2203d2ff 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 042a78c9..dea93ec5 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 4871e227..39b23f76 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 2fd1de2c..d8da07b2 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 2a7e9c5b..e31861fe 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 e6c9d110..b8e2d8d6 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 af1a657c..eaae98c1 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 436e7318..079371d7 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 a8732356..b1d4877b 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 ce86b1c4..327ee15d 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 cce88878..e6765a4d 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 394bfe14..2674c373 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 cfdd46f0..45cd6b74 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 dcf648cf..6eb484c0 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 d58d2e92..84b27a09 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 bfbf6cc9..b8e566ba 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 15115feb..4d3f3ed1 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 f6436098..a7215d67 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 120a7a90..8ddedb84 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 7d24c171..bdd97adf 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 7370dce3..71a99d2a 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 7e209a90..f9cc6805 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 99c2767d..7aef17ae 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 028f48d1..d7e7fb94 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 85858419..e21a427c 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 cf00e715..d80c5f7f 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 b4a57ab2..bb227ddb 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 44623e1c..5f674ec6 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 8ee79253..f1ff9335 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 ea659e24..c9c5f65c 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 ad5d8452..f48af2fd 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 521ddcf7..6d1df3a2 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 4f93bee6..12ce39d7 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 56d65757..2df52a4a 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 faaea982..aa09f979 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 81c48bf9..c86c84e2 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 1cefe9f5..9423073a 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 21a14399..9ebbce0e 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 bcd8edce..0d8a411b 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 083eade5..c055f880 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 1b04f02c..b5cb4f02 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/data.ts b/apps/web-antd/src/views/system/notice/data.ts index c00fb0d5..0bc86bb8 100644 --- a/apps/web-antd/src/views/system/notice/data.ts +++ b/apps/web-antd/src/views/system/notice/data.ts @@ -92,14 +92,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'id', title: '公告编号', + minWidth: 100, }, { field: 'title', title: '公告标题', + minWidth: 200, }, { field: 'type', title: '公告类型', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.SYSTEM_NOTICE_TYPE }, @@ -108,6 +111,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'status', title: '公告状态', + minWidth: 100, cellRender: { name: 'CellDict', props: { type: DICT_TYPE.COMMON_STATUS }, @@ -116,6 +120,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { field: 'createTime', title: '创建时间', + minWidth: 180, formatter: 'formatDateTime', }, { diff --git a/apps/web-antd/src/views/system/notice/index.vue b/apps/web-antd/src/views/system/notice/index.vue index 7e4ec29d..472dd190 100644 --- a/apps/web-antd/src/views/system/notice/index.vue +++ b/apps/web-antd/src/views/system/notice/index.vue @@ -4,7 +4,7 @@ import type { SystemNoticeApi } from '#/api/system/notice'; import { ref } from 'vue'; -import { Page, useVbenModal } from '@vben/common-ui'; +import { confirm, Page, useVbenModal } from '@vben/common-ui'; import { isEmpty } from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -45,14 +45,11 @@ function handleEdit(row: SystemNoticeApi.Notice) { async function handleDelete(row: SystemNoticeApi.Notice) { const hideLoading = message.loading({ content: $t('ui.actionMessage.deleting', [row.title]), - key: 'action_key_msg', + duration: 0, }); try { await deleteNotice(row.id as number); - message.success({ - content: $t('ui.actionMessage.deleteSuccess', [row.title]), - key: 'action_key_msg', - }); + message.success($t('ui.actionMessage.deleteSuccess', [row.title])); onRefresh(); } finally { hideLoading(); @@ -61,10 +58,10 @@ async function handleDelete(row: SystemNoticeApi.Notice) { /** 批量删除公告 */ async function handleDeleteBatch() { + await confirm($t('ui.actionMessage.deleteBatchConfirm')); const hideLoading = message.loading({ - content: $t('ui.actionMessage.deleting'), + content: $t('ui.actionMessage.deletingBatch'), duration: 0, - key: 'action_process_msg', }); try { await deleteNoticeList(checkedIds.value); @@ -82,21 +79,17 @@ function handleRowCheckboxChange({ }: { records: SystemNoticeApi.Notice[]; }) { - checkedIds.value = records.map((item) => item.id as number); + checkedIds.value = records.map((item) => item.id!); } /** 推送公告 */ async function handlePush(row: SystemNoticeApi.Notice) { const hideLoading = message.loading({ - content: '正在推送中', - key: 'action_process_msg', + content: '正在推送中...', }); try { await pushNotice(row.id as number); - message.success({ - content: $t('ui.actionMessage.operationSuccess'), - key: 'action_key_msg', - }); + message.success($t('ui.actionMessage.operationSuccess')); } finally { hideLoading(); } @@ -152,12 +145,12 @@ const [Grid, gridApi] = useVbenVxeGrid({ onClick: handleCreate, }, { - label: '批量删除', + label: $t('ui.actionTitle.deleteBatch'), type: 'primary', danger: true, - disabled: isEmpty(checkedIds), icon: ACTION_ICON.DELETE, auth: ['system:notice:delete'], + disabled: isEmpty(checkedIds), onClick: handleDeleteBatch, }, ]" 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 4578acac..d15762e5 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 efbd9b4e..20bb704a 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 bc7b8cf3..ea3f47d4 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 77217010..bb2c0a63 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 00a890a2..5356fa40 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 b1479fa8..19de580a 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 0cd075d3..2d0b2707 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 8e211074..117a0e02 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 2644f75a..34dc4652 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 418284b8..c4f6f60d 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 7116bc0f..cd40c00f 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 fd853e8a..61ed064f 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 00a1cfc4..479c7113 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 d775a1a5..777f29da 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 2fc05345..6291c740 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 2a957c68..57e973c6 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 943b1830..580152b3 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 dc46d419..76103ce3 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 44bb6ba3..fdaea3c7 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 1e8ed0fa..a24d011a 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 b37ac6de..b81e0162 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 b6608566..48f6db6e 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 45cc3e37..b7ab57aa 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 fc1d3333..c715ebe5 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 cc04080c..3a5ec47f 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 aa82b513..04fa5dfc 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 3d02d550..ba8f8f85 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 12caa3be..4b5a601f 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 cc9c46bb..7feafc1f 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 f2b9fd24..7004377d 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 8562c6c5..cb3e2af0 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 f96d2940..9e89c5a8 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 fcdaefe2..3de767ce 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 ce57d7c8..36aaf29b 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 5cf29b3b..aa671db7 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 715bfedf..b7e3f8c8 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 1f841e7c..e7aa2712 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 2a4afeaa..d46501b9 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 b25a6cbc..f75e46c6 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 95a693b3..f951dd97 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 f24c6bd1..4fbc5247 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 0517412d..c1bffdd9 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 e9b13e50..cd8aa7a7 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 cb15a59c..3e8fa65a 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 faf56f7c..9f41e3cc 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 48fe0d3d..a99e2e21 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 7c594595..1a582c25 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 f625f338..c54b86b6 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 9f982e56..5c9591c7 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 c96f8e9e..42cb9104 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 8b74f238..f3fd14ab 100644 --- a/apps/web-ele/src/views/system/notice/data.ts +++ b/apps/web-ele/src/views/system/notice/data.ts @@ -1,13 +1,8 @@ import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemNoticeApi } from '#/api/system/notice'; -import { useAccess } from '@vben/access'; - -import { z } from '#/adapter/form'; -import { CommonStatusEnum, DICT_TYPE, getDictOptions } from '#/utils'; - -const { hasAccessByCodes } = useAccess(); +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps, } from '#/utils'; /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { @@ -23,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: '请输入备注', - }, }, ]; } @@ -73,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, }, }, @@ -91,28 +108,28 @@ export function useGridFormSchema(): VbenFormSchema[] { } /** 列表的字段 */ -export function useGridColumns( - onActionClick: OnActionClickFn, -): VxeTableGridOptions['columns'] { +export function useGridColumns(): VxeTableGridOptions['columns'] { return [ - { - type: 'checkbox', - width: 40, - }, + { 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 }, @@ -120,48 +137,20 @@ export function useGridColumns( }, { 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', }, { - field: 'operation', title: '操作', - minWidth: 180, - align: 'center', + width: 200, fixed: 'right', - cellRender: { - attrs: { - nameField: 'title', - nameTitle: '公告', - onClick: onActionClick, - }, - name: 'CellOperation', - options: [ - { - code: 'edit', - show: hasAccessByCodes(['system:notice:update']), - }, - { - code: 'push', - text: '推送', - show: hasAccessByCodes(['system:notice:update']), - }, - { - code: 'delete', - show: hasAccessByCodes(['system:notice:delete']), - }, - ], - }, + 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 c34e8f75..909daba7 100644 --- a/apps/web-ele/src/views/system/notice/index.vue +++ b/apps/web-ele/src/views/system/notice/index.vue @@ -1,14 +1,11 @@