diff --git a/apps/web-antd/src/components/description/description.vue b/apps/web-antd/src/components/description/description.vue index 25dab3cec..23682e7aa 100644 --- a/apps/web-antd/src/components/description/description.vue +++ b/apps/web-antd/src/components/description/description.vue @@ -29,8 +29,8 @@ const Description = defineComponent({ }, setup(props: DescriptionsOptions) { - // TODO @puhui999:每个 field 的 slot 的考虑 - // TODO @puhui999:from 5.0:extra: () => getSlot(slots, 'extra') + // TODO @xingyu:每个 field 的 slot 的考虑 + // TODO @xingyu:from 5.0:extra: () => getSlot(slots, 'extra') /** 过滤掉不需要展示的 */ const shouldShowItem = (item: DescriptionItemSchema) => { if (item.hidden === undefined) return true; @@ -75,6 +75,6 @@ const Description = defineComponent({ }, }); -// TODO @puhui999:from 5.0:emits: ['register'] 事件 +// TODO @xingyu:from 5.0:emits: ['register'] 事件 export default Description; diff --git a/apps/web-antd/src/components/description/typing.ts b/apps/web-antd/src/components/description/typing.ts index c1628d248..a0e997770 100644 --- a/apps/web-antd/src/components/description/typing.ts +++ b/apps/web-antd/src/components/description/typing.ts @@ -2,9 +2,9 @@ import type { DescriptionsProps } from 'ant-design-vue'; import type { CSSProperties, VNode } from 'vue'; -// TODO @puhui999:【content】这个纠结下;1)vben2.0 是 render;https://doc.vvbin.cn/components/desc.html#usage 2) -// TODO @puhui999:vben2.0 还有 sapn【done】、labelMinWidth、contentMinWidth -// TODO @puhui999:【hidden】这个纠结下;1)vben2.0 是 show; +// TODO @xingyu:【content】这个纠结下;1)vben2.0 是 render;https://doc.vvbin.cn/components/desc.html#usage 2) +// TODO @xingyu:vben2.0 还有 sapn【done】、labelMinWidth、contentMinWidth +// TODO @xingyu:【hidden】这个纠结下;1)vben2.0 是 show; export interface DescriptionItemSchema { label: string | VNode; // 内容的描述 field?: string; // 对应 data 中的字段名 @@ -15,11 +15,11 @@ export interface DescriptionItemSchema { hidden?: ((data: any) => boolean) | boolean; // 是否显示 } -// TODO @puhui999:vben2.0 还有 title【done】、bordered【done】d、useCollapse、collapseOptions -// TODO @puhui999:from 5.0:bordered 默认为 true -// TODO @puhui999:from 5.0:column 默认为 lg: 3, md: 3, sm: 2, xl: 3, xs: 1, xxl: 4 -// TODO @puhui999:from 5.0:size 默认为 small;有 'default', 'middle', 'small', undefined -// TODO @puhui999:from 5.0:useCollapse 默认为 true +// TODO @xingyu:vben2.0 还有 title【done】、bordered【done】d、useCollapse、collapseOptions +// TODO @xingyu:from 5.0:bordered 默认为 true +// TODO @xingyu:from 5.0:column 默认为 lg: 3, md: 3, sm: 2, xl: 3, xs: 1, xxl: 4 +// TODO @xingyu:from 5.0:size 默认为 small;有 'default', 'middle', 'small', undefined +// TODO @xingyu:from 5.0:useCollapse 默认为 true export interface DescriptionsOptions { data?: Record; // 数据 schema?: DescriptionItemSchema[]; // 描述项配置 diff --git a/apps/web-antd/src/components/description/use-description.ts b/apps/web-antd/src/components/description/use-description.ts index c131be26a..7f99238bf 100644 --- a/apps/web-antd/src/components/description/use-description.ts +++ b/apps/web-antd/src/components/description/use-description.ts @@ -16,7 +16,7 @@ class DescriptionApi { return this.state as DescriptionsOptions; } - // TODO @puhui999:【setState】纠结下:1)vben2.0 是 data https://doc.vvbin.cn/components/desc.html#usage; + // TODO @xingyu:【setState】纠结下:1)vben2.0 是 data https://doc.vvbin.cn/components/desc.html#usage; setState(newState: Partial) { this.state = { ...this.state, ...newState }; } @@ -27,7 +27,7 @@ export type ExtendedDescriptionApi = DescriptionApi; export function useDescription(options: DescriptionsOptions) { const IS_REACTIVE = isReactive(options); const api = new DescriptionApi(options); - // 扩展API + // 扩展 API const extendedApi: ExtendedDescriptionApi = api as never; const Desc = defineComponent({ name: 'UseDescription', diff --git a/apps/web-antd/src/views/crm/business/modules/detail-info.vue b/apps/web-antd/src/views/crm/business/modules/detail-info.vue index 64e4a9fe7..1ce3c3534 100644 --- a/apps/web-antd/src/views/crm/business/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/business/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ business: CrmBusinessApi.Business; // 商机信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/business/modules/detail.vue b/apps/web-antd/src/views/crm/business/modules/detail.vue index 81ff5863d..aebfd6e3b 100644 --- a/apps/web-antd/src/views/crm/business/modules/detail.vue +++ b/apps/web-antd/src/views/crm/business/modules/detail.vue @@ -40,7 +40,7 @@ const business = ref({} as CrmBusinessApi.Business); const businessLogList = ref([]); const permissionListRef = ref>(); // 团队成员列表 Ref -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -134,7 +134,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/clue/modules/detail-info.vue b/apps/web-antd/src/views/crm/clue/modules/detail-info.vue index fc9dbe3b4..000a58d10 100644 --- a/apps/web-antd/src/views/crm/clue/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/clue/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ clue: CrmClueApi.Clue; // 线索信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/clue/modules/detail.vue b/apps/web-antd/src/views/crm/clue/modules/detail.vue index b2415bab5..08e43079c 100644 --- a/apps/web-antd/src/views/crm/clue/modules/detail.vue +++ b/apps/web-antd/src/views/crm/clue/modules/detail.vue @@ -42,7 +42,7 @@ const validateOwnerUser = computed( ); const validateWrite = computed(() => permissionListRef.value?.validateWrite); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -151,7 +151,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/contact/modules/detail-info.vue b/apps/web-antd/src/views/crm/contact/modules/detail-info.vue index 9e71bd593..e9b8c1ac8 100644 --- a/apps/web-antd/src/views/crm/contact/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/contact/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ contact: CrmContactApi.Contact; // 联系人信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/contact/modules/detail.vue b/apps/web-antd/src/views/crm/contact/modules/detail.vue index 9aeb21eda..48c4febeb 100644 --- a/apps/web-antd/src/views/crm/contact/modules/detail.vue +++ b/apps/web-antd/src/views/crm/contact/modules/detail.vue @@ -34,7 +34,7 @@ const contact = ref({} as CrmContactApi.Contact); const contactLogList = ref([]); const permissionListRef = ref>(); // 团队成员列表 Ref -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -113,7 +113,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/contract/modules/detail-info.vue b/apps/web-antd/src/views/crm/contract/modules/detail-info.vue index 7968e6dad..dde87803c 100644 --- a/apps/web-antd/src/views/crm/contract/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/contract/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ contract: CrmContractApi.Contract; // 合同信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/contract/modules/detail.vue b/apps/web-antd/src/views/crm/contract/modules/detail.vue index eb8c12669..a546169cc 100644 --- a/apps/web-antd/src/views/crm/contract/modules/detail.vue +++ b/apps/web-antd/src/views/crm/contract/modules/detail.vue @@ -45,7 +45,7 @@ const validateOwnerUser = computed( ); const validateWrite = computed(() => permissionListRef.value?.validateWrite); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -125,7 +125,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/customer/modules/detail-info.vue b/apps/web-antd/src/views/crm/customer/modules/detail-info.vue index 0dded9c8f..8368a8160 100644 --- a/apps/web-antd/src/views/crm/customer/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/customer/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ customer: CrmCustomerApi.Customer; // 客户信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/customer/modules/detail.vue b/apps/web-antd/src/views/crm/customer/modules/detail.vue index b06177b1c..6c7ccbf85 100644 --- a/apps/web-antd/src/views/crm/customer/modules/detail.vue +++ b/apps/web-antd/src/views/crm/customer/modules/detail.vue @@ -51,7 +51,7 @@ const customer = ref({} as CrmCustomerApi.Customer); const customerLogList = ref([]); const permissionListRef = ref>(); // 团队成员列表 Ref -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -269,7 +269,7 @@ onMounted(() => { /> - + diff --git a/apps/web-antd/src/views/crm/product/modules/detail-info.vue b/apps/web-antd/src/views/crm/product/modules/detail-info.vue index a7868f05d..4f728e019 100644 --- a/apps/web-antd/src/views/crm/product/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/product/modules/detail-info.vue @@ -9,7 +9,7 @@ defineProps<{ product: CrmProductApi.Product; // 产品信息 }>(); -const [ProductDescription] = useDescription({ +const [ProductDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,6 +22,6 @@ const [ProductDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/product/modules/detail.vue b/apps/web-antd/src/views/crm/product/modules/detail.vue index 1255e4671..726413fcd 100644 --- a/apps/web-antd/src/views/crm/product/modules/detail.vue +++ b/apps/web-antd/src/views/crm/product/modules/detail.vue @@ -30,7 +30,7 @@ const productId = ref(0); const product = ref({} as CrmProductApi.Product); const productLogList = ref([]); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -73,7 +73,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail-info.vue b/apps/web-antd/src/views/crm/receivable/modules/detail-info.vue index 884a1ce49..134d067c6 100644 --- a/apps/web-antd/src/views/crm/receivable/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/receivable/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ receivable: CrmReceivableApi.Receivable; // 收款信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/receivable/modules/detail.vue b/apps/web-antd/src/views/crm/receivable/modules/detail.vue index 038908dec..e61d5bdb5 100644 --- a/apps/web-antd/src/views/crm/receivable/modules/detail.vue +++ b/apps/web-antd/src/views/crm/receivable/modules/detail.vue @@ -39,7 +39,7 @@ const permissionListRef = ref>(); // 团队 // 校验编辑权限 const validateWrite = computed(() => permissionListRef.value?.validateWrite); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -105,7 +105,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-info.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-info.vue index 530b4e1a6..3b77b8685 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail-info.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail-info.vue @@ -12,7 +12,7 @@ defineProps<{ receivablePlan: CrmReceivablePlanApi.Plan; // 收款计划信息 }>(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -22,7 +22,7 @@ const [BaseDescription] = useDescription({ schema: useDetailBaseSchema(), }); -const [SystemDescription] = useDescription({ +const [SystemDescriptions] = useDescription({ componentProps: { title: '系统信息', bordered: false, @@ -35,8 +35,8 @@ const [SystemDescription] = useDescription({ diff --git a/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue b/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue index 0ca57a9ae..253823212 100644 --- a/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue +++ b/apps/web-antd/src/views/crm/receivable/plan/modules/detail.vue @@ -39,7 +39,7 @@ const permissionListRef = ref>(); // 团队 // 校验编辑权限 const validateWrite = computed(() => permissionListRef.value?.validateWrite); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 4, @@ -109,7 +109,7 @@ onMounted(() => { - + diff --git a/apps/web-antd/src/views/member/user/components/user-account-info.vue b/apps/web-antd/src/views/member/user/components/user-account-info.vue index cb2b69012..4bc7ec4e0 100644 --- a/apps/web-antd/src/views/member/user/components/user-account-info.vue +++ b/apps/web-antd/src/views/member/user/components/user-account-info.vue @@ -19,7 +19,7 @@ withDefaults( }, ); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, class: 'mx-4', @@ -72,7 +72,7 @@ const [Description] = useDescription({ - - + diff --git a/apps/web-antd/src/views/pay/order/modules/detail.vue b/apps/web-antd/src/views/pay/order/modules/detail.vue index 3ae087426..6d06605ba 100644 --- a/apps/web-antd/src/views/pay/order/modules/detail.vue +++ b/apps/web-antd/src/views/pay/order/modules/detail.vue @@ -12,7 +12,7 @@ import { useDetailSchema } from '../data'; const detailData = ref(); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { bordered: false, column: 2, @@ -48,6 +48,6 @@ const [Modal, modalApi] = useVbenModal({ :show-cancel-button="false" :show-confirm-button="false" > - + diff --git a/apps/web-antd/src/views/pay/refund/modules/detail.vue b/apps/web-antd/src/views/pay/refund/modules/detail.vue index ab1f9e88c..1df2ec035 100644 --- a/apps/web-antd/src/views/pay/refund/modules/detail.vue +++ b/apps/web-antd/src/views/pay/refund/modules/detail.vue @@ -14,7 +14,7 @@ import { useBaseDetailSchema, useChannelDetailSchema } from '../data'; const formData = ref(); -const [BaseDescription] = useDescription({ +const [BaseDescriptions] = useDescription({ componentProps: { bordered: false, column: 2, @@ -23,7 +23,7 @@ const [BaseDescription] = useDescription({ schema: useBaseDetailSchema(), }); -const [ChannelDescription] = useDescription({ +const [ChannelDescriptions] = useDescription({ componentProps: { bordered: false, column: 2, @@ -60,8 +60,8 @@ const [Modal, modalApi] = useVbenModal({ :show-cancel-button="false" :show-confirm-button="false" > - + - + diff --git a/apps/web-antd/src/views/pay/transfer/modules/detail.vue b/apps/web-antd/src/views/pay/transfer/modules/detail.vue index 132a7cc91..e08fe1674 100644 --- a/apps/web-antd/src/views/pay/transfer/modules/detail.vue +++ b/apps/web-antd/src/views/pay/transfer/modules/detail.vue @@ -32,7 +32,7 @@ const [Modal, modalApi] = useVbenModal({ }, }); -const [Description] = useDescription({ +const [Descriptions] = useDescription({ componentProps: { title: '基本信息', bordered: false, @@ -50,6 +50,6 @@ const [Description] = useDescription({ :show-cancel-button="false" :show-confirm-button="false" > - +