From 0b9c16a02353261e043854b0cfdb287fdbbb4699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com> Date: Mon, 5 May 2025 18:18:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E5=AE=9D=E3=80=81=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E3=80=81=E9=92=B1=E5=8C=85=E5=92=8C=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/package.json | 2 +- apps/web-antd/src/views/pay/app/index.vue | 8 ++++---- .../{AlipayChannelForm.vue => alipay-channel-form.vue} | 0 .../{MockChannelForm.vue => mock-channel-form.vue} | 0 .../{WalletChannelForm.vue => wallet-channel-form.vue} | 0 .../{WeixinChannelForm.vue => weixin-channel-form.vue} | 0 apps/web-antd/src/views/pay/order/index.vue | 2 +- .../order/modules/{OrderDetail.vue => order-detail.vue} | 0 pnpm-lock.yaml | 5 ++++- pnpm-workspace.yaml | 1 + 10 files changed, 11 insertions(+), 7 deletions(-) rename apps/web-antd/src/views/pay/app/modules/channel/{AlipayChannelForm.vue => alipay-channel-form.vue} (100%) rename apps/web-antd/src/views/pay/app/modules/channel/{MockChannelForm.vue => mock-channel-form.vue} (100%) rename apps/web-antd/src/views/pay/app/modules/channel/{WalletChannelForm.vue => wallet-channel-form.vue} (100%) rename apps/web-antd/src/views/pay/app/modules/channel/{WeixinChannelForm.vue => weixin-channel-form.vue} (100%) rename apps/web-antd/src/views/pay/order/modules/{OrderDetail.vue => order-detail.vue} (100%) diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index cd817905a..be092084f 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -26,7 +26,7 @@ "#/*": "./src/*" }, "dependencies": { - "@ant-design/icons-vue": "^7.0.1", + "@ant-design/icons-vue": "catalog:", "@form-create/ant-design-vue": "catalog:", "@form-create/antd-designer": "catalog:", "@tinymce/tinymce-vue": "catalog:", diff --git a/apps/web-antd/src/views/pay/app/index.vue b/apps/web-antd/src/views/pay/app/index.vue index 5116d91ba..08cfc1b35 100644 --- a/apps/web-antd/src/views/pay/app/index.vue +++ b/apps/web-antd/src/views/pay/app/index.vue @@ -18,10 +18,10 @@ import { PayChannelEnum } from '#/utils/constants'; import { columns, querySchema } from './data'; import appFrom from './modules/app-form.vue'; -import aliPayFrom from './modules/channel/AlipayChannelForm.vue'; -import mockFrom from './modules/channel/MockChannelForm.vue'; -import walletFrom from './modules/channel/WalletChannelForm.vue'; -import weixinFrom from './modules/channel/WeixinChannelForm.vue'; +import aliPayFrom from './modules/channel/alipay-channel-form.vue'; +import mockFrom from './modules/channel/mock-channel-form.vue'; +import walletFrom from './modules/channel/wallet-channel-form.vue'; +import weixinFrom from './modules/channel/weixin-channel-form.vue'; const formOptions: VbenFormProps = { commonConfig: { diff --git a/apps/web-antd/src/views/pay/app/modules/channel/AlipayChannelForm.vue b/apps/web-antd/src/views/pay/app/modules/channel/alipay-channel-form.vue similarity index 100% rename from apps/web-antd/src/views/pay/app/modules/channel/AlipayChannelForm.vue rename to apps/web-antd/src/views/pay/app/modules/channel/alipay-channel-form.vue diff --git a/apps/web-antd/src/views/pay/app/modules/channel/MockChannelForm.vue b/apps/web-antd/src/views/pay/app/modules/channel/mock-channel-form.vue similarity index 100% rename from apps/web-antd/src/views/pay/app/modules/channel/MockChannelForm.vue rename to apps/web-antd/src/views/pay/app/modules/channel/mock-channel-form.vue diff --git a/apps/web-antd/src/views/pay/app/modules/channel/WalletChannelForm.vue b/apps/web-antd/src/views/pay/app/modules/channel/wallet-channel-form.vue similarity index 100% rename from apps/web-antd/src/views/pay/app/modules/channel/WalletChannelForm.vue rename to apps/web-antd/src/views/pay/app/modules/channel/wallet-channel-form.vue diff --git a/apps/web-antd/src/views/pay/app/modules/channel/WeixinChannelForm.vue b/apps/web-antd/src/views/pay/app/modules/channel/weixin-channel-form.vue similarity index 100% rename from apps/web-antd/src/views/pay/app/modules/channel/WeixinChannelForm.vue rename to apps/web-antd/src/views/pay/app/modules/channel/weixin-channel-form.vue diff --git a/apps/web-antd/src/views/pay/order/index.vue b/apps/web-antd/src/views/pay/order/index.vue index 0a751cb02..acb53f3d4 100644 --- a/apps/web-antd/src/views/pay/order/index.vue +++ b/apps/web-antd/src/views/pay/order/index.vue @@ -12,7 +12,7 @@ import * as OrderApi from '#/api/pay/order'; import { DocAlert } from '#/components/doc-alert'; import { columns, querySchema } from './data'; -import detailFrom from './modules/OrderDetail.vue'; +import detailFrom from './modules/order-detail.vue'; const formOptions: VbenFormProps = { commonConfig: { diff --git a/apps/web-antd/src/views/pay/order/modules/OrderDetail.vue b/apps/web-antd/src/views/pay/order/modules/order-detail.vue similarity index 100% rename from apps/web-antd/src/views/pay/order/modules/OrderDetail.vue rename to apps/web-antd/src/views/pay/order/modules/order-detail.vue diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e868a7ce..414a112ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,9 @@ settings: catalogs: default: + '@ant-design/icons-vue': + specifier: ^7.0.1 + version: 7.0.1 '@changesets/changelog-github': specifier: ^0.5.1 version: 0.5.1 @@ -678,7 +681,7 @@ importers: apps/web-antd: dependencies: '@ant-design/icons-vue': - specifier: ^7.0.1 + specifier: 'catalog:' version: 7.0.1(vue@3.5.13(typescript@5.8.3)) '@form-create/ant-design-vue': specifier: 'catalog:' diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index efe0a2668..d12ba4ff2 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -40,6 +40,7 @@ catalog: '@tanstack/vue-store': ^0.7.0 '@tinymce/tinymce-vue': ^6.1.0 '@form-create/ant-design-vue': ^3.2.22 + '@ant-design/icons-vue': ^7.0.1 '@form-create/antd-designer': ^3.2.11 '@types/archiver': ^6.0.3 '@types/eslint': ^9.6.1