diff --git a/apps/web-antd/src/adapter/form.ts b/apps/web-antd/src/adapter/form.ts index d9edaf19c..eb1ac968e 100644 --- a/apps/web-antd/src/adapter/form.ts +++ b/apps/web-antd/src/adapter/form.ts @@ -68,4 +68,3 @@ export { initSetupVbenForm, useVbenForm, z }; export type VbenFormSchema = FormSchema; export type { VbenFormProps }; -export type FormSchemaGetter = () => VbenFormSchema[]; diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 9935d0b0c..e14c38c25 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -268,7 +268,7 @@ setupVbenVxeTable({ // 这里可以自行扩展 vxe-table 的全局配置,比如自定义格式化 // vxeUI.formats.add // add by 星语:数量格式化,例如说:金额 - vxeUI.formats.add('formatAmount', { + vxeUI.formats.add('formatNumber', { cellFormatMethod({ cellValue }, digits = 2) { if (cellValue === null || cellValue === undefined) { return ''; diff --git a/apps/web-antd/src/views/crm/backlog/data.ts b/apps/web-antd/src/views/crm/backlog/data.ts index 6606f8013..b56566f14 100644 --- a/apps/web-antd/src/views/crm/backlog/data.ts +++ b/apps/web-antd/src/views/crm/backlog/data.ts @@ -307,7 +307,7 @@ export function useContractColumns( field: 'price', title: '合同金额(元)', minWidth: 120, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'orderDate', @@ -349,13 +349,13 @@ export function useContractColumns( field: 'totalReceivablePrice', title: '已回款金额(元)', minWidth: 140, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'noReceivablePrice', title: '未回款金额(元)', minWidth: 120, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'contactLastTime', @@ -670,7 +670,7 @@ export function useReceivableAuditColumns( field: 'price', title: '回款金额(元)', minWidth: 140, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'returnType', @@ -690,7 +690,7 @@ export function useReceivableAuditColumns( field: 'contract.totalPrice', title: '合同金额(元)', minWidth: 140, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'ownerUserName', @@ -801,7 +801,7 @@ export function useReceivablePlanRemindColumns( field: 'price', title: '计划回款金额(元)', minWidth: 120, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'returnTime', @@ -844,7 +844,7 @@ export function useReceivablePlanRemindColumns( field: 'receivable.price', title: '实际回款金额(元)', minWidth: 160, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'receivable.returnTime', diff --git a/apps/web-antd/src/views/crm/business/data.ts b/apps/web-antd/src/views/crm/business/data.ts index a010bedad..4906fed70 100644 --- a/apps/web-antd/src/views/crm/business/data.ts +++ b/apps/web-antd/src/views/crm/business/data.ts @@ -118,7 +118,7 @@ export function useGridColumns( field: 'totalPrice', title: '商机金额(元)', minWidth: 140, - formatter: 'formatAmount', + formatter: 'formatNumber', }, { field: 'dealTime', diff --git a/apps/web-antd/src/views/pay/order/data.ts b/apps/web-antd/src/views/pay/order/data.ts index bbb462fd8..b52b5bf26 100644 --- a/apps/web-antd/src/views/pay/order/data.ts +++ b/apps/web-antd/src/views/pay/order/data.ts @@ -78,17 +78,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { { title: '支付金额', field: 'price', - formatter: 'formatAmount', + formatter: 'formatNumber', }, { title: '退款金额', field: 'refundPrice', - formatter: 'formatAmount', + formatter: 'formatNumber', }, { title: '手续金额', field: 'channelFeePrice', - formatter: 'formatAmount', + formatter: 'formatNumber', }, { title: '订单号', diff --git a/apps/web-ele/src/adapter/vxe-table.ts b/apps/web-ele/src/adapter/vxe-table.ts index e0c354be1..eceaf192b 100644 --- a/apps/web-ele/src/adapter/vxe-table.ts +++ b/apps/web-ele/src/adapter/vxe-table.ts @@ -263,7 +263,7 @@ setupVbenVxeTable({ }); // 添加数量格式化,例如金额 - vxeUI.formats.add('formatAmount', { + vxeUI.formats.add('formatNumber', { cellFormatMethod({ cellValue }, digits = 2) { if (cellValue === null || cellValue === undefined) { return ''; diff --git a/apps/web-naive/src/adapter/vxe-table.ts b/apps/web-naive/src/adapter/vxe-table.ts index 61b4d5bcc..fff62cc3e 100644 --- a/apps/web-naive/src/adapter/vxe-table.ts +++ b/apps/web-naive/src/adapter/vxe-table.ts @@ -277,7 +277,7 @@ setupVbenVxeTable({ // 这里可以自行扩展 vxe-table 的全局配置,比如自定义格式化 // vxeUI.formats.add // add by 星语:数量格式化,例如说:金额 - vxeUI.formats.add('formatAmount', { + vxeUI.formats.add('formatNumber', { cellFormatMethod({ cellValue }, digits = 2) { if (cellValue === null || cellValue === undefined) { return '';