fix: 解决合并冲突并更新依赖

解决多个组件模块的合并冲突，包括： - BPM流程实例创建页面 - 基础设施相关模块（API访问日志、错误日志等） - 商城促销相关组件 - 支付相关模块 - 系统管理模块 - Element Plus组件描述模块 - 依赖包更新 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-28 14:44:29 +08:00
parent 01ffcb3598 32d8af5475
commit 71fe98723a
38 changed files with 467 additions and 524 deletions
--- a/apps/web-ele/src/views/infra/apiAccessLog/data.ts
+++ b/apps/web-ele/src/views/infra/apiAccessLog/data.ts
@@ -245,7 +245,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
      render: (val, data) => {
        if (val === 0) {
          return '正常';
-        } else if (data && data.resultCode > 0) {
+        } else if (data && data.resultMsg) {
          return `失败 | ${val} | ${data.resultMsg}`;
        }
        return '';
--- a/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue
+++ b/apps/web-ele/src/views/infra/apiAccessLog/modules/detail.vue
@@ -11,8 +11,8 @@ import { useDetailSchema } from '../data';

 const formData = ref<InfraApiAccessLogApi.ApiAccessLog>();

-// TODO @xingyu：antd 和 el 这 2 个组件在这个模块的 detail.vue 不一样，看看是不是统一？还是就是区分的哈？
 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
  labelWidth: 110,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/infra/apiErrorLog/modules/detail.vue
+++ b/apps/web-ele/src/views/infra/apiErrorLog/modules/detail.vue
@@ -12,6 +12,7 @@ import { useDetailSchema } from '../data';
 const formData = ref<InfraApiErrorLogApi.ApiErrorLog>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
  labelWidth: 110,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/infra/job/modules/detail.vue
+++ b/apps/web-ele/src/views/infra/job/modules/detail.vue
@@ -14,6 +14,7 @@ const formData = ref<InfraJobApi.Job>(); // 任务详情
 const nextTimes = ref<Date[]>([]); // 下一次执行时间

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
  labelWidth: 140,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/infra/redis/modules/info.vue
+++ b/apps/web-ele/src/views/infra/redis/modules/info.vue
@@ -8,7 +8,7 @@ defineProps<{
 }>();

 const [Descriptions] = useDescription({
-  bordered: false,
+  border: false,
  column: 6,
  schema: [
    {
--- a/apps/web-ele/src/views/mall/trade/afterSale/detail/data.ts
+++ b/apps/web-ele/src/views/mall/trade/afterSale/detail/data.ts
@@ -1,4 +1,3 @@
-import type { MallAfterSaleApi } from '#/api/mall/trade/afterSale';
 import type { DescriptionItemSchema } from '#/components/description';

 import { h } from 'vue';
@@ -20,19 +19,19 @@ export function useOrderInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'order.deliveryType',
      label: '配送方式',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_DELIVERY_TYPE,
-          value: data?.order?.deliveryType,
+          value: val,
        }),
    },
    {
      field: 'order.type',
      label: '订单类型',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_ORDER_TYPE,
-          value: data?.order?.type,
+          value: val,
        }),
    },
    {
@@ -46,10 +45,10 @@ export function useOrderInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'order.terminal',
      label: '订单来源',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TERMINAL,
-          value: data?.order?.terminal,
+          value: val,
        }),
    },
    {
@@ -67,10 +66,10 @@ export function useOrderInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'order.payChannelCode',
      label: '付款方式',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.PAY_CHANNEL_CODE,
-          value: data?.order?.payChannelCode,
+          value: val,
        }),
    },
    {
@@ -90,32 +89,30 @@ export function useAfterSaleInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'auditTime',
      label: '申请时间',
-      content: (data: MallAfterSaleApi.AfterSale) =>
-        formatDate(data?.auditTime) as string,
+      render: (val) => formatDate(val) as string,
    },
    {
      field: 'type',
      label: '售后类型',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_AFTER_SALE_TYPE,
-          value: data?.type,
+          value: val,
        }),
    },
    {
      field: 'way',
      label: '售后方式',
-      content: (data: MallAfterSaleApi.AfterSale) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_AFTER_SALE_WAY,
-          value: data?.way,
+          value: val,
        }),
    },
    {
      field: 'refundPrice',
      label: '退款金额',
-      content: (data: MallAfterSaleApi.AfterSale) =>
-        fenToYuan(data?.refundPrice ?? 0),
+      render: (val) => fenToYuan(val ?? 0),
    },
    {
      field: 'applyReason',
@@ -128,8 +125,8 @@ export function useAfterSaleInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'applyPicUrls',
      label: '凭证图片',
-      content: (data) => {
-        const images = data?.applyPicUrls || [];
+      render: (val) => {
+        const images = val || [];
        return h(
          'div',
          { class: 'flex gap-10px' },
@@ -153,16 +150,16 @@ export function useRefundStatusSchema(): DescriptionItemSchema[] {
    {
      field: 'status',
      label: '退款状态',
-      content: (data) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_AFTER_SALE_STATUS,
-          value: data?.status,
+          value: val,
        }),
    },
    {
      field: 'reminder',
      label: '提醒',
-      content: () =>
+      render: () =>
        h('div', { class: 'text-red-500 mb-10px' }, [
          h('div', '如果未发货，请点击同意退款给买家。'),
          h('div', '如果实际已发货，请主动与买家联系。'),
--- a/apps/web-ele/src/views/mall/trade/afterSale/detail/index.vue
+++ b/apps/web-ele/src/views/mall/trade/afterSale/detail/index.vue
@@ -49,38 +49,29 @@ const afterSale = ref<MallAfterSaleApi.AfterSale>({
 });

 const [OrderDescriptions] = useDescription({
-  componentProps: {
-    title: '订单信息',
-    border: false,
-    column: 3,
-    direction: 'horizontal',
-    labelWidth: 140,
-    extra: '',
-  },
+  title: '订单信息',
+  border: false,
+  column: 3,
+  direction: 'horizontal',
+  labelWidth: 140,
  schema: useOrderInfoSchema(),
 });

 const [AfterSaleDescriptions] = useDescription({
-  componentProps: {
-    title: '售后信息',
-    border: false,
-    column: 3,
-    direction: 'horizontal',
-    labelWidth: 140,
-    extra: '',
-  },
+  title: '售后信息',
+  border: false,
+  column: 3,
+  direction: 'horizontal',
+  labelWidth: 140,
  schema: useAfterSaleInfoSchema(),
 });

 const [RefundStatusDescriptions] = useDescription({
-  componentProps: {
-    title: '退款状态',
-    border: false,
-    column: 1,
-    direction: 'horizontal',
-    labelWidth: 140,
-    extra: '',
-  },
+  title: '退款状态',
+  border: false,
+  column: 1,
+  direction: 'horizontal',
+  labelWidth: 140,
  schema: useRefundStatusSchema(),
 });

--- a/apps/web-ele/src/views/mall/trade/order/detail/data.ts
+++ b/apps/web-ele/src/views/mall/trade/order/detail/data.ts
@@ -1,5 +1,4 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MallOrderApi } from '#/api/mall/trade/order';
 import type { DescriptionItemSchema } from '#/components/description';

 import { h } from 'vue';
@@ -23,19 +22,19 @@ export function useOrderInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'type',
      label: '订单类型',
-      content: (data: MallOrderApi.Order) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_ORDER_TYPE,
-          value: data?.type,
+          value: val,
        }),
    },
    {
      field: 'terminal',
      label: '订单来源',
-      content: (data: MallOrderApi.Order) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TERMINAL,
-          value: data?.terminal,
+          value: val,
        }),
    },
    {
@@ -53,10 +52,10 @@ export function useOrderInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'payChannelCode',
      label: '付款方式',
-      content: (data: MallOrderApi.Order) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.PAY_CHANNEL_CODE,
-          value: data?.payChannelCode,
+          value: val,
        }),
    },
    {
@@ -72,16 +71,16 @@ export function useOrderStatusSchema(): DescriptionItemSchema[] {
    {
      field: 'status',
      label: '订单状态',
-      content: (data: MallOrderApi.Order) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_ORDER_STATUS,
-          value: data?.status,
+          value: val,
        }),
    },
    {
      field: 'reminder',
      label: '提醒',
-      content: () =>
+      render: () =>
        h('div', { class: 'space-y-1' }, [
          h('div', '买家付款成功后，货款将直接进入您的商户号（微信、支付宝）'),
          h('div', '请及时关注你发出的包裹状态，确保可以配送至买家手中'),
@@ -100,66 +99,46 @@ export function useOrderPriceSchema(): DescriptionItemSchema[] {
    {
      field: 'totalPrice',
      label: '商品总额',
-      content: (data: MallOrderApi.Order) =>
-        `${fenToYuan(data?.totalPrice ?? 0)} 元`,
+      render: (val) => `${fenToYuan(val ?? 0)} 元`,
    },
    {
      field: 'deliveryPrice',
      label: '运费金额',
-      content: (data: MallOrderApi.Order) =>
-        `${fenToYuan(data?.deliveryPrice ?? 0)} 元`,
+      render: (val) => `${fenToYuan(val ?? 0)} 元`,
    },
    {
      field: 'adjustPrice',
      label: '订单调价',
-      content: (data: MallOrderApi.Order) =>
-        `${fenToYuan(data?.adjustPrice ?? 0)} 元`,
+      render: (val) => `${fenToYuan(val ?? 0)} 元`,
    },
    {
      field: 'couponPrice',
      label: '优惠劵优惠',
-      content: (data: MallOrderApi.Order) =>
-        h(
-          'span',
-          { class: 'text-red-500' },
-          `${fenToYuan(data?.couponPrice ?? 0)} 元`,
-        ),
+      render: (val) =>
+        h('span', { class: 'text-red-500' }, `${fenToYuan(val ?? 0)} 元`),
    },
    {
      field: 'vipPrice',
      label: 'VIP 优惠',
-      content: (data: MallOrderApi.Order) =>
-        h(
-          'span',
-          { class: 'text-red-500' },
-          `${fenToYuan(data?.vipPrice ?? 0)} 元`,
-        ),
+      render: (val) =>
+        h('span', { class: 'text-red-500' }, `${fenToYuan(val ?? 0)} 元`),
    },
    {
      field: 'discountPrice',
      label: '活动优惠',
-      content: (data: MallOrderApi.Order) =>
-        h(
-          'span',
-          { class: 'text-red-500' },
-          `${fenToYuan(data?.discountPrice ?? 0)} 元`,
-        ),
+      render: (val) =>
+        h('span', { class: 'text-red-500' }, `${fenToYuan(val ?? 0)} 元`),
    },
    {
      field: 'pointPrice',
      label: '积分抵扣',
-      content: (data: MallOrderApi.Order) =>
-        h(
-          'span',
-          { class: 'text-red-500' },
-          `${fenToYuan(data?.pointPrice ?? 0)} 元`,
-        ),
+      render: (val) =>
+        h('span', { class: 'text-red-500' }, `${fenToYuan(val ?? 0)} 元`),
    },
    {
      field: 'payPrice',
      label: '应付金额',
-      content: (data: MallOrderApi.Order) =>
-        `${fenToYuan(data?.payPrice ?? 0)} 元`,
+      render: (val) => `${fenToYuan(val ?? 0)} 元`,
    },
  ];
 }
@@ -170,10 +149,10 @@ export function useDeliveryInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'deliveryType',
      label: '配送方式',
-      content: (data: MallOrderApi.Order) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.TRADE_DELIVERY_TYPE,
-          value: data?.deliveryType,
+          value: val,
        }),
    },
    {
@@ -187,14 +166,12 @@ export function useDeliveryInfoSchema(): DescriptionItemSchema[] {
    {
      field: 'receiverAddress',
      label: '收货地址',
-      content: (data: MallOrderApi.Order) =>
-        `${data?.receiverAreaName} ${data?.receiverDetailAddress}`.trim(),
+      render: (val, data) => `${data?.receiverAreaName} ${val}`.trim(),
    },
    {
      field: 'deliveryTime',
      label: '发货时间',
-      content: (data: MallOrderApi.Order) =>
-        formatDateTime(data?.deliveryTime) as string,
+      render: (val) => formatDateTime(val) as string,
    },
  ];
 }
--- a/apps/web-ele/src/views/mall/trade/order/detail/index.vue
+++ b/apps/web-ele/src/views/mall/trade/order/detail/index.vue
@@ -57,38 +57,30 @@ const expressTrackList = ref<any[]>([]);
 const pickUpStore = ref<MallDeliveryPickUpStoreApi.PickUpStore | undefined>();

 const [OrderInfoDescriptions] = useDescription({
-  componentProps: {
-    title: '订单信息',
-    border: false,
-    column: 3,
-  },
+  title: '订单信息',
+  border: false,
+  column: 3,
  schema: useOrderInfoSchema(),
 });

 const [OrderStatusDescriptions] = useDescription({
-  componentProps: {
-    title: '订单状态',
-    border: false,
-    column: 1,
-  },
+  title: '订单状态',
+  border: false,
+  column: 1,
  schema: useOrderStatusSchema(),
 });

 const [OrderPriceDescriptions] = useDescription({
-  componentProps: {
-    title: '费用信息',
-    border: false,
-    column: 4,
-  },
+  title: '费用信息',
+  border: false,
+  column: 4,
  schema: useOrderPriceSchema(),
 });

 const [DeliveryInfoDescriptions] = useDescription({
-  componentProps: {
-    title: '收货信息',
-    border: false,
-    column: 3,
-  },
+  title: '收货信息',
+  border: false,
+  column: 3,
  schema: useDeliveryInfoSchema(),
 });

--- a/apps/web-ele/src/views/pay/notify/data.ts
+++ b/apps/web-ele/src/views/pay/notify/data.ts
@@ -1,6 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { PayNotifyApi } from '#/api/pay/notify';
 import type { DescriptionItemSchema } from '#/components/description';

 import { h } from 'vue';
@@ -182,10 +181,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'type',
      label: '通知类型',
-      content: (data: PayNotifyApi.NotifyTask) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.PAY_NOTIFY_TYPE,
-          value: data?.type,
+          value: val,
        }),
    },
    {
@@ -195,10 +194,10 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'status',
      label: '通知状态',
-      content: (data: PayNotifyApi.NotifyTask) =>
+      render: (val) =>
        h(DictTag, {
          type: DICT_TYPE.PAY_NOTIFY_STATUS,
-          value: data?.status,
+          value: val,
        }),
    },
    {
@@ -208,14 +207,12 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'lastExecuteTime',
      label: '最后通知时间',
-      content: (data: PayNotifyApi.NotifyTask) =>
-        formatDateTime(data?.lastExecuteTime) as string,
+      render: (val) => formatDateTime(val) as string,
    },
    {
      field: 'nextNotifyTime',
      label: '下次通知时间',
-      content: (data: PayNotifyApi.NotifyTask) =>
-        formatDateTime(data?.nextNotifyTime) as string,
+      render: (val) => formatDateTime(val) as string,
    },
    {
      field: 'notifyTimes',
@@ -228,14 +225,12 @@ export function useDetailSchema(): DescriptionItemSchema[] {
    {
      field: 'createTime',
      label: '创建时间',
-      content: (data: PayNotifyApi.NotifyTask) =>
-        formatDateTime(data?.createTime) as string,
+      render: (val) => formatDateTime(val) as string,
    },
    {
      field: 'updateTime',
      label: '更新时间',
-      content: (data: PayNotifyApi.NotifyTask) =>
-        formatDateTime(data?.updateTime) as string,
+      render: (val) => formatDateTime(val) as string,
    },
  ];
 }
--- a/apps/web-ele/src/views/pay/notify/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/notify/modules/detail.vue
@@ -17,14 +17,10 @@ import { useDetailLogColumns, useDetailSchema } from '../data';
 const formData = ref<PayNotifyApi.NotifyTask>();

 const [Description] = useDescription({
-  componentProps: {
-    border: true,
-    column: 2,
-    direction: 'horizontal',
-    labelWidth: 140,
-    title: '',
-    extra: '',
-  },
+  border: true,
+  column: 2,
+  direction: 'horizontal',
+  labelWidth: 140,
  schema: useDetailSchema(),
 });

--- a/apps/web-ele/src/views/pay/order/modules/detail.vue
+++ b/apps/web-ele/src/views/pay/order/modules/detail.vue
@@ -13,6 +13,7 @@ import { useDetailSchema } from '../data';
 const formData = ref<PayOrderApi.Order>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 2,
  labelWidth: 140,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/system/notify/message/modules/detail.vue
+++ b/apps/web-ele/src/views/system/notify/message/modules/detail.vue
@@ -12,6 +12,7 @@ import { useDetailSchema } from '../data';
 const formData = ref<SystemNotifyMessageApi.NotifyMessage>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
  labelWidth: 140,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/system/notify/my/modules/detail.vue
+++ b/apps/web-ele/src/views/system/notify/my/modules/detail.vue
@@ -12,6 +12,7 @@ import { useDetailSchema } from '../data';
 const formData = ref<SystemNotifyMessageApi.NotifyMessage>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
  labelWidth: 140,
  schema: useDetailSchema(),
--- a/apps/web-ele/src/views/system/operatelog/modules/detail.vue
+++ b/apps/web-ele/src/views/system/operatelog/modules/detail.vue
@@ -12,8 +12,8 @@ import { useDetailSchema } from '../data';
 const formData = ref<SystemOperateLogApi.OperateLog>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
-  direction: 'horizontal',
  labelWidth: 110,
  schema: useDetailSchema(),
 });
--- a/apps/web-ele/src/views/system/social/user/modules/detail.vue
+++ b/apps/web-ele/src/views/system/social/user/modules/detail.vue
@@ -14,7 +14,9 @@ import { useDetailSchema } from '../data';
 const formData = ref<SystemSocialUserApi.SocialUser>();

 const [Descriptions] = useDescription({
+  border: true,
  column: 1,
+  size: 'large',
  labelWidth: 185,
  schema: useDetailSchema(),
 });