From 769510c4f62f9c080bfe3efa002464bab971f1c9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 18 Oct 2025 17:14:28 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=9F=E4=B8=80=E4=B8=A4?= =?UTF-8?q?=E7=AB=AF=20data.ts=20=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=88=E5=86=99?= =?UTF-8?q?=E6=B3=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/mall/promotion/article/data.ts | 7 ++----- .../mall/trade/delivery/pickUpOrder/data.ts | 4 +--- .../mall/trade/delivery/pickUpStore/data.ts | 2 -- apps/web-antd/src/views/mall/trade/order/data.ts | 16 +++++++--------- apps/web-antd/src/views/system/dept/data.ts | 7 ++----- apps/web-antd/src/views/system/tenant/data.ts | 9 ++------- .../src/views/mall/promotion/article/data.ts | 7 ++----- .../mall/trade/delivery/pickUpOrder/data.ts | 4 +--- apps/web-ele/src/views/mall/trade/order/data.ts | 16 +++++++--------- apps/web-ele/src/views/system/dept/data.ts | 7 ++----- .../src/views/system/sms/template/data.ts | 1 + apps/web-ele/src/views/system/tenant/data.ts | 9 ++------- 12 files changed, 29 insertions(+), 60 deletions(-) diff --git a/apps/web-antd/src/views/mall/promotion/article/data.ts b/apps/web-antd/src/views/mall/promotion/article/data.ts index ce26e9c47..9e93bd58c 100644 --- a/apps/web-antd/src/views/mall/promotion/article/data.ts +++ b/apps/web-antd/src/views/mall/promotion/article/data.ts @@ -9,12 +9,9 @@ import { z } from '#/adapter/form'; import { getSimpleArticleCategoryList } from '#/api/mall/promotion/articleCategory'; import { getRangePickerDefaultProps } from '#/utils'; +/** 关联数据 */ let categoryList: MallArticleCategoryApi.ArticleCategory[] = []; -async function getCategoryData() { - categoryList = await getSimpleArticleCategoryList(); -} - -getCategoryData(); +getSimpleArticleCategoryList().then((data) => (categoryList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts index cdcf071f4..307ec77c0 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/data.ts @@ -10,11 +10,9 @@ import { useUserStore } from '@vben/stores'; import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; import { getRangePickerDefaultProps } from '#/utils'; -// TODO @芋艿：统一风格； +/** 关联数据 **/ const userStore = useUserStore(); const pickUpStoreList = ref([]); - -/** 自提门店列表 */ getSimpleDeliveryPickUpStoreList().then((res) => { pickUpStoreList.value = res; // 移除自己无法核销的门店 diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts index e2cdade24..ff7ba0841 100644 --- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts +++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts @@ -86,7 +86,6 @@ export function useFormSchema(): VbenFormSchema[] { rules: 'required', componentProps: { format: 'HH:mm', - placeholder: ['开始时间', '结束时间'], }, }, { @@ -195,7 +194,6 @@ export function useGridFormSchema(): VbenFormSchema[] { componentProps: { ...getRangePickerDefaultProps(), allowClear: true, - placeholder: ['开始时间', '结束时间'], }, }, ]; diff --git a/apps/web-antd/src/views/mall/trade/order/data.ts b/apps/web-antd/src/views/mall/trade/order/data.ts index ca3261cd6..dd1c2e0c7 100644 --- a/apps/web-antd/src/views/mall/trade/order/data.ts +++ b/apps/web-antd/src/views/mall/trade/order/data.ts @@ -2,8 +2,6 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore'; -import { ref } from 'vue'; - import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { convertToInteger, formatToFraction } from '@vben/utils'; @@ -13,10 +11,10 @@ import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pick import { getAreaTree } from '#/api/system/area'; import { getRangePickerDefaultProps } from '#/utils'; -const pickUpStoreList = ref([]); - -getSimpleDeliveryPickUpStoreList().then((res) => { - pickUpStoreList.value = res; +/** 关联数据 */ +let pickUpStoreList: MallDeliveryPickUpStoreApi.PickUpStore[] = []; +getSimpleDeliveryPickUpStoreList().then((data) => { + pickUpStoreList = data; }); /** 列表的搜索表单 */ @@ -227,9 +225,9 @@ export function useGridColumns(): VxeGridPropTypes.Columns { return `买家：${row.user?.nickname} / 收货人： ${row.receiverName} ${row.receiverMobile}${row.receiverAreaName}${row.receiverDetailAddress}`; } if (row.deliveryType === DeliveryTypeEnum.PICK_UP.type) { - return `门店名称：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.name} / - 门店手机：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.phone} / - 自提门店：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.detailAddress} + return `门店名称：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.name} / + 门店手机：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.phone} / + 自提门店：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.detailAddress} `; } return ''; diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index dd30cb29a..f5421c429 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -11,12 +11,9 @@ import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; +/** 关联数据 */ let userList: SystemUserApi.User[] = []; -async function getUserData() { - userList = await getSimpleUserList(); -} - -getUserData(); +getSimpleUserList().then((data) => (userList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts index 2d0552c4b..cfc6c5c21 100644 --- a/apps/web-antd/src/views/system/tenant/data.ts +++ b/apps/web-antd/src/views/system/tenant/data.ts @@ -9,14 +9,9 @@ import { z } from '#/adapter/form'; import { getTenantPackageList } from '#/api/system/tenant-package'; import { getRangePickerDefaultProps } from '#/utils'; -// TODO @xingyu：这个不用 ref 么？ +/** 关联数据 */ let tenantPackageList: SystemTenantPackageApi.TenantPackage[] = []; - -async function getTenantPackageData() { - tenantPackageList = await getTenantPackageList(); -} - -getTenantPackageData(); +getTenantPackageList().then((data) => (tenantPackageList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/promotion/article/data.ts b/apps/web-ele/src/views/mall/promotion/article/data.ts index d897db6f3..b2652227f 100644 --- a/apps/web-ele/src/views/mall/promotion/article/data.ts +++ b/apps/web-ele/src/views/mall/promotion/article/data.ts @@ -9,12 +9,9 @@ import { z } from '#/adapter/form'; import { getSimpleArticleCategoryList } from '#/api/mall/promotion/articleCategory'; import { getRangePickerDefaultProps } from '#/utils'; +/** 关联数据 */ let categoryList: MallArticleCategoryApi.ArticleCategory[] = []; -async function getCategoryData() { - categoryList = await getSimpleArticleCategoryList(); -} - -getCategoryData(); +getSimpleArticleCategoryList().then((data) => (categoryList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts index 3034ca17e..f3f9be687 100644 --- a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts +++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/data.ts @@ -10,11 +10,9 @@ import { useUserStore } from '@vben/stores'; import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pickUpStore'; import { getRangePickerDefaultProps } from '#/utils'; -// TODO @芋艿：统一风格； +/** 关联数据 */ const userStore = useUserStore(); const pickUpStoreList = ref([]); - -/** 自提门店列表 */ getSimpleDeliveryPickUpStoreList().then((res) => { pickUpStoreList.value = res; // 移除自己无法核销的门店 diff --git a/apps/web-ele/src/views/mall/trade/order/data.ts b/apps/web-ele/src/views/mall/trade/order/data.ts index 496e991ee..bcf94aea3 100644 --- a/apps/web-ele/src/views/mall/trade/order/data.ts +++ b/apps/web-ele/src/views/mall/trade/order/data.ts @@ -2,8 +2,6 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeGridPropTypes } from '#/adapter/vxe-table'; import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore'; -import { ref } from 'vue'; - import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { convertToInteger, formatToFraction } from '@vben/utils'; @@ -13,10 +11,10 @@ import { getSimpleDeliveryPickUpStoreList } from '#/api/mall/trade/delivery/pick import { getAreaTree } from '#/api/system/area'; import { getRangePickerDefaultProps } from '#/utils'; -const pickUpStoreList = ref([]); - -getSimpleDeliveryPickUpStoreList().then((res) => { - pickUpStoreList.value = res; +/** 关联数据 */ +let pickUpStoreList: MallDeliveryPickUpStoreApi.PickUpStore[] = []; +getSimpleDeliveryPickUpStoreList().then((data) => { + pickUpStoreList = data; }); /** 列表的搜索表单 */ @@ -225,9 +223,9 @@ export function useGridColumns(): VxeGridPropTypes.Columns { return `买家：${row.user?.nickname} / 收货人： ${row.receiverName} ${row.receiverMobile}${row.receiverAreaName}${row.receiverDetailAddress}`; } if (row.deliveryType === DeliveryTypeEnum.PICK_UP.type) { - return `门店名称：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.name} / - 门店手机：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.phone} / - 自提门店：${pickUpStoreList.value.find((item) => item.id === row.pickUpStoreId)?.detailAddress} + return `门店名称：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.name} / + 门店手机：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.phone} / + 自提门店：${pickUpStoreList.find((item) => item.id === row.pickUpStoreId)?.detailAddress} `; } return ''; diff --git a/apps/web-ele/src/views/system/dept/data.ts b/apps/web-ele/src/views/system/dept/data.ts index 14b0b659f..0bc18c1bc 100644 --- a/apps/web-ele/src/views/system/dept/data.ts +++ b/apps/web-ele/src/views/system/dept/data.ts @@ -11,12 +11,9 @@ import { z } from '#/adapter/form'; import { getDeptList } from '#/api/system/dept'; import { getSimpleUserList } from '#/api/system/user'; +/** 关联数据 */ let userList: SystemUserApi.User[] = []; -async function getUserData() { - userList = await getSimpleUserList(); -} - -getUserData(); +getSimpleUserList().then((data) => (userList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-ele/src/views/system/sms/template/data.ts b/apps/web-ele/src/views/system/sms/template/data.ts index ebe7a520f..814110e59 100644 --- a/apps/web-ele/src/views/system/sms/template/data.ts +++ b/apps/web-ele/src/views/system/sms/template/data.ts @@ -74,6 +74,7 @@ export function useFormSchema(): VbenFormSchema[] { component: 'Textarea', componentProps: { placeholder: '请输入模板内容', + rows: 4, }, rules: 'required', }, diff --git a/apps/web-ele/src/views/system/tenant/data.ts b/apps/web-ele/src/views/system/tenant/data.ts index c1703a63d..ecacc0401 100644 --- a/apps/web-ele/src/views/system/tenant/data.ts +++ b/apps/web-ele/src/views/system/tenant/data.ts @@ -9,14 +9,9 @@ import { z } from '#/adapter/form'; import { getTenantPackageList } from '#/api/system/tenant-package'; import { getRangePickerDefaultProps } from '#/utils'; -// TODO @xingyu：这个不用 ref 么？ +/** 关联数据 */ let tenantPackageList: SystemTenantPackageApi.TenantPackage[] = []; - -async function getTenantPackageData() { - tenantPackageList = await getTenantPackageList(); -} - -getTenantPackageData(); +getTenantPackageList().then((data) => (tenantPackageList = data)); /** 新增/修改的表单 */ export function useFormSchema(): VbenFormSchema[] {