From f2a5bc522d0049e8672b213983fe03aaec2276e2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 7 Jun 2026 00:31:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(mall):=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?=
 =?UTF-8?q?=E7=AB=AF=E5=95=86=E5=9F=8E=E6=A8=A1=E5=9D=97=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8E=E7=BB=84=E4=BB=B6=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复商城统计时间参数、客服消息类型导入等类型错误
- 对齐 web-antd、web-ele、web-antdv-next 的商城促销组件类型定义
- 修复 DIY 装修、组合活动、积分活动、运费模板等组件兼容问题
---
 apps/web-antd/src/api/mall/statistics/trade.ts   |  2 +-
 .../views/mall/promotion/banner/modules/form.vue |  3 +--
 .../combination/components/table-select.vue      | 16 ++++++----------
 .../components/component-container-property.vue  | 11 +++++------
 .../hot-zone-edit-dialog/controller.ts           |  4 ++--
 .../components/mobile/magic-cube/config.ts       |  7 ++-----
 .../components/mobile/navigation-bar/config.ts   |  7 ++-----
 .../components/mobile/notice-bar/property.vue    |  2 +-
 .../promotion/components/diy-editor/index.vue    |  2 --
 .../mall/promotion/kefu/modules/message-list.vue |  4 ++--
 .../promotion/point/components/table-select.vue  | 15 ++++++---------
 .../src/api/mall/statistics/trade.ts             |  2 +-
 .../promotion/components/diy-editor/index.vue    |  2 --
 apps/web-ele/src/api/mall/statistics/trade.ts    |  2 +-
 .../views/mall/promotion/banner/modules/form.vue |  3 +--
 .../combination/components/table-select.vue      | 16 ++++++----------
 .../components/component-container-property.vue  |  5 ++++-
 .../hot-zone-edit-dialog/controller.ts           |  4 ++--
 .../components/mobile/magic-cube/config.ts       |  7 ++-----
 .../components/mobile/navigation-bar/config.ts   |  7 ++-----
 .../promotion/components/diy-editor/index.vue    | 10 ++++------
 .../mall/promotion/kefu/modules/message-list.vue |  4 ++--
 .../promotion/point/components/table-select.vue  | 15 ++++++---------
 .../expressTemplate/modules/charge-item-form.vue |  1 -
 .../expressTemplate/modules/free-item-form.vue   |  1 -
 25 files changed, 59 insertions(+), 93 deletions(-)

diff --git a/apps/web-antd/src/api/mall/statistics/trade.ts b/apps/web-antd/src/api/mall/statistics/trade.ts
index 05dc7f3ef..fea420b75 100644
--- a/apps/web-antd/src/api/mall/statistics/trade.ts
+++ b/apps/web-antd/src/api/mall/statistics/trade.ts
@@ -7,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace MallTradeStatisticsApi {
   /** 交易状况 Request */
   export interface TradeTrendReqVO {
-    times: [Date, Date];
+    times?: string[];
   }
 
   /** 交易统计 Response */
diff --git a/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue b/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue
index 818380589..cc2b194c3 100644
--- a/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/banner/modules/form.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import type { MallBannerApi } from '#/api/mall/promotion/banner';
-import type { SystemUserApi } from '#/api/system/user';
 
 import { computed, ref } from 'vue';
 
@@ -19,7 +18,7 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formData = ref<SystemUserApi.User>();
+const formData = ref<MallBannerApi.Banner>();
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['Banner'])
diff --git a/apps/web-antd/src/views/mall/promotion/combination/components/table-select.vue b/apps/web-antd/src/views/mall/promotion/combination/components/table-select.vue
index f36a2b588..c32b0aa0c 100644
--- a/apps/web-antd/src/views/mall/promotion/combination/components/table-select.vue
+++ b/apps/web-antd/src/views/mall/promotion/combination/components/table-select.vue
@@ -234,12 +234,10 @@ const [Modal, modalApi] = useVbenModal({
     >();
     if (props.multiple && Array.isArray(data) && data.length > 0) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallCombinationActivityApi.CombinationActivity[];
         data.forEach((activity) => {
-          const row = tableData.find(
-            (item: MallCombinationActivityApi.CombinationActivity) =>
-              item.id === activity.id,
-          );
+          const row = tableData.find((item) => item.id === activity.id);
           if (row) {
             gridApi.grid.setCheckboxRow(row, true);
           }
@@ -247,11 +245,9 @@ const [Modal, modalApi] = useVbenModal({
       }, 300);
     } else if (!props.multiple && data && !Array.isArray(data)) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
-        const row = tableData.find(
-          (item: MallCombinationActivityApi.CombinationActivity) =>
-            item.id === data.id,
-        );
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallCombinationActivityApi.CombinationActivity[];
+        const row = tableData.find((item) => item.id === data.id);
         if (row) {
           gridApi.grid.setRadioRow(row);
         }
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
index ea688e0cb..373449de6 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { Ref } from 'vue';
+
 import type { ComponentStyle } from '../util';
 
 import { useVModel } from '@vueuse/core';
@@ -28,6 +30,7 @@ defineOptions({ name: 'ComponentContainer' });
 const props = defineProps<{ modelValue: ComponentStyle }>();
 const emit = defineEmits(['update:modelValue']);
 const formData = useVModel(props, 'modelValue', emit);
+const formStyleValues = formData as unknown as Ref<Record<string, number>>;
 
 const treeData: any[] = [
   {
@@ -182,9 +185,7 @@ function handleSliderChange(prop: string) {
                 <Row>
                   <Col :span="19">
                     <Slider
-                      v-model:value="
-                        formData[dataRef.prop as keyof ComponentStyle]
-                      "
+                      v-model:value="formStyleValues[dataRef.prop]"
                       :max="100"
                       :min="0"
                       @change="handleSliderChange(dataRef.prop)"
@@ -196,9 +197,7 @@ function handleSliderChange(prop: string) {
                       class="w-[50px]"
                       :max="100"
                       :min="0"
-                      v-model:value="
-                        formData[dataRef.prop as keyof ComponentStyle]
-                      "
+                      v-model:value="formStyleValues[dataRef.prop]"
                     />
                   </Col>
                 </Row>
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
index b4000eccc..a68831140 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
@@ -1,4 +1,4 @@
-import type { StyleValue } from 'vue';
+import type { CSSProperties } from 'vue';
 
 import type { HotZoneItemProperty } from '../../config';
 
@@ -16,7 +16,7 @@ export enum CONTROL_TYPE_ENUM {
 export interface ControlDot {
   position: string;
   types: CONTROL_TYPE_ENUM[];
-  style: StyleValue;
+  style: CSSProperties;
 }
 
 /** 热区的 8 个控制点 */
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
index 02c7bc1c4..c54b2d1ce 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
@@ -1,3 +1,4 @@
+import type { Rect } from '../../../../magic-cube-editor/util';
 import type { ComponentStyle, DiyComponent } from '../../../util';
 
 /** 广告魔方属性 */
@@ -10,13 +11,9 @@ export interface MagicCubeProperty {
 }
 
 /** 广告魔方项目属性 */
-export interface MagicCubeItemProperty {
+export interface MagicCubeItemProperty extends Rect {
   imgUrl: string; // 图标链接
   url: string; // 链接
-  width: number; // 宽
-  height: number; // 高
-  top: number; // 上
-  left: number; // 左
 }
 
 /** 定义组件 */
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
index c2769cc51..b549512ee 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
@@ -1,3 +1,4 @@
+import type { Rect } from '../../../../magic-cube-editor/util';
 import type { DiyComponent } from '../../../util';
 
 /** 顶部导航栏属性 */
@@ -16,12 +17,8 @@ export interface NavigationBarProperty {
 }
 
 /** 顶部导航栏 - 单元格 属性 */
-export interface NavigationBarCellProperty {
+export interface NavigationBarCellProperty extends Rect {
   type: 'image' | 'search' | 'text'; // 类型：文字 | 图片 | 搜索框
-  width: number; // 宽度
-  height: number; // 高度
-  top: number; // 顶部位置
-  left: number; // 左侧位置
   text: string; // 文字内容
   textColor: string; // 文字颜色
   imgUrl: string; // 图片地址
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
index f32b63410..c1bd38ac5 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/notice-bar/property.vue
@@ -22,7 +22,7 @@ const emit = defineEmits(['update:modelValue']);
 
 const formData = useVModel(props, 'modelValue', emit);
 const rules = {
-  content: [{ required: true, message: '请输入公告', trigger: 'blur' }],
+  content: [{ required: true, message: '请输入公告', trigger: 'blur' as const }],
 }; // 表单校验
 </script>
 
diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
index e420c7837..38d9a30e0 100644
--- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/index.vue
@@ -44,7 +44,6 @@ const emits = defineEmits(['reset', 'save', 'update:modelValue']); // 工具栏
 //   margin: 4,
 // }); // 预览二维码
 
-const componentLibrary = ref(); // 左侧组件库
 const pageConfigComponent = ref<DiyComponent<any>>(
   cloneDeep(PAGE_CONFIG_COMPONENT),
 ); // 页面设置组件
@@ -336,7 +335,6 @@ onMounted(() => {
       <Col :span="6">
         <ComponentLibrary
           v-if="libs && libs.length > 0"
-          ref="componentLibrary"
           :list="libs"
         />
       </Col>
diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
index b888ee66d..3817a0cb2 100644
--- a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -4,9 +4,9 @@ import type { Emoji } from './tools/emoji';
 import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation';
 import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message';
 
-import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue';
+import { computed, reactive, ref, toRefs, unref, watch } from 'vue';
 
-import { UserTypeEnum } from '@vben/constants';
+import { KeFuMessageContentTypeEnum, UserTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatDate, isEmpty, jsonParse } from '@vben/utils';
 
diff --git a/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue b/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue
index d4c1a2a27..f6926513b 100644
--- a/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue
+++ b/apps/web-antd/src/views/mall/promotion/point/components/table-select.vue
@@ -196,12 +196,10 @@ const [Modal, modalApi] = useVbenModal({
     >();
     if (props.multiple && Array.isArray(data) && data.length > 0) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallPointActivityApi.PointActivity[];
         data.forEach((activity) => {
-          const row = tableData.find(
-            (item: MallPointActivityApi.PointActivity) =>
-              item.id === activity.id,
-          );
+          const row = tableData.find((item) => item.id === activity.id);
           if (row) {
             gridApi.grid.setCheckboxRow(row, true);
           }
@@ -209,10 +207,9 @@ const [Modal, modalApi] = useVbenModal({
       }, 300);
     } else if (!props.multiple && data && !Array.isArray(data)) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
-        const row = tableData.find(
-          (item: MallPointActivityApi.PointActivity) => item.id === data.id,
-        );
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallPointActivityApi.PointActivity[];
+        const row = tableData.find((item) => item.id === data.id);
         if (row) {
           gridApi.grid.setRadioRow(row);
         }
diff --git a/apps/web-antdv-next/src/api/mall/statistics/trade.ts b/apps/web-antdv-next/src/api/mall/statistics/trade.ts
index 05dc7f3ef..fea420b75 100644
--- a/apps/web-antdv-next/src/api/mall/statistics/trade.ts
+++ b/apps/web-antdv-next/src/api/mall/statistics/trade.ts
@@ -7,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace MallTradeStatisticsApi {
   /** 交易状况 Request */
   export interface TradeTrendReqVO {
-    times: [Date, Date];
+    times?: string[];
   }
 
   /** 交易统计 Response */
diff --git a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
index 0772629b7..c1b8c27a8 100644
--- a/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-antdv-next/src/views/mall/promotion/components/diy-editor/index.vue
@@ -44,7 +44,6 @@ const emits = defineEmits(['reset', 'save', 'update:modelValue']); // 工具栏
 //   margin: 4,
 // }); // 预览二维码
 
-const componentLibrary = ref(); // 左侧组件库
 const pageConfigComponent = ref<DiyComponent<any>>(
   cloneDeep(PAGE_CONFIG_COMPONENT),
 ); // 页面设置组件
@@ -332,7 +331,6 @@ onMounted(() => {
       <Col :span="6">
         <ComponentLibrary
           v-if="libs && libs.length > 0"
-          ref="componentLibrary"
           :list="libs"
         />
       </Col>
diff --git a/apps/web-ele/src/api/mall/statistics/trade.ts b/apps/web-ele/src/api/mall/statistics/trade.ts
index 05dc7f3ef..fea420b75 100644
--- a/apps/web-ele/src/api/mall/statistics/trade.ts
+++ b/apps/web-ele/src/api/mall/statistics/trade.ts
@@ -7,7 +7,7 @@ import { requestClient } from '#/api/request';
 export namespace MallTradeStatisticsApi {
   /** 交易状况 Request */
   export interface TradeTrendReqVO {
-    times: [Date, Date];
+    times?: string[];
   }
 
   /** 交易统计 Response */
diff --git a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
index d2267a3bc..723696b79 100644
--- a/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/banner/modules/form.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import type { MallBannerApi } from '#/api/mall/promotion/banner';
-import type { SystemUserApi } from '#/api/system/user';
 
 import { computed, ref } from 'vue';
 
@@ -19,7 +18,7 @@ import { $t } from '#/locales';
 import { useFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
-const formData = ref<SystemUserApi.User>();
+const formData = ref<MallBannerApi.Banner>();
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['Banner'])
diff --git a/apps/web-ele/src/views/mall/promotion/combination/components/table-select.vue b/apps/web-ele/src/views/mall/promotion/combination/components/table-select.vue
index f36a2b588..c32b0aa0c 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/components/table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/components/table-select.vue
@@ -234,12 +234,10 @@ const [Modal, modalApi] = useVbenModal({
     >();
     if (props.multiple && Array.isArray(data) && data.length > 0) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallCombinationActivityApi.CombinationActivity[];
         data.forEach((activity) => {
-          const row = tableData.find(
-            (item: MallCombinationActivityApi.CombinationActivity) =>
-              item.id === activity.id,
-          );
+          const row = tableData.find((item) => item.id === activity.id);
           if (row) {
             gridApi.grid.setCheckboxRow(row, true);
           }
@@ -247,11 +245,9 @@ const [Modal, modalApi] = useVbenModal({
       }, 300);
     } else if (!props.multiple && data && !Array.isArray(data)) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
-        const row = tableData.find(
-          (item: MallCombinationActivityApi.CombinationActivity) =>
-            item.id === data.id,
-        );
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallCombinationActivityApi.CombinationActivity[];
+        const row = tableData.find((item) => item.id === data.id);
         if (row) {
           gridApi.grid.setRadioRow(row);
         }
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
index c9518654a..36c8d5ca9 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { Ref } from 'vue';
+
 import type { ComponentStyle } from '../util';
 
 import { useVModel } from '@vueuse/core';
@@ -26,6 +28,7 @@ defineOptions({ name: 'ComponentContainer' });
 const props = defineProps<{ modelValue: ComponentStyle }>();
 const emit = defineEmits(['update:modelValue']);
 const formData = useVModel(props, 'modelValue', emit);
+const formStyleValues = formData as unknown as Ref<Record<string, number>>;
 
 const treeData: any[] = [
   {
@@ -169,7 +172,7 @@ function handleSliderChange(prop: string) {
                 class="mb-0 w-full"
               >
                 <ElSlider
-                  v-model="formData[data.prop]"
+                  v-model="formStyleValues[data.prop]"
                   :max="100"
                   :min="0"
                   show-input
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
index b4000eccc..a68831140 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/hot-zone/components/hot-zone-edit-dialog/controller.ts
@@ -1,4 +1,4 @@
-import type { StyleValue } from 'vue';
+import type { CSSProperties } from 'vue';
 
 import type { HotZoneItemProperty } from '../../config';
 
@@ -16,7 +16,7 @@ export enum CONTROL_TYPE_ENUM {
 export interface ControlDot {
   position: string;
   types: CONTROL_TYPE_ENUM[];
-  style: StyleValue;
+  style: CSSProperties;
 }
 
 /** 热区的 8 个控制点 */
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
index 02c7bc1c4..c54b2d1ce 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/magic-cube/config.ts
@@ -1,3 +1,4 @@
+import type { Rect } from '../../../../magic-cube-editor/util';
 import type { ComponentStyle, DiyComponent } from '../../../util';
 
 /** 广告魔方属性 */
@@ -10,13 +11,9 @@ export interface MagicCubeProperty {
 }
 
 /** 广告魔方项目属性 */
-export interface MagicCubeItemProperty {
+export interface MagicCubeItemProperty extends Rect {
   imgUrl: string; // 图标链接
   url: string; // 链接
-  width: number; // 宽
-  height: number; // 高
-  top: number; // 上
-  left: number; // 左
 }
 
 /** 定义组件 */
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
index c2769cc51..b549512ee 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/components/mobile/navigation-bar/config.ts
@@ -1,3 +1,4 @@
+import type { Rect } from '../../../../magic-cube-editor/util';
 import type { DiyComponent } from '../../../util';
 
 /** 顶部导航栏属性 */
@@ -16,12 +17,8 @@ export interface NavigationBarProperty {
 }
 
 /** 顶部导航栏 - 单元格 属性 */
-export interface NavigationBarCellProperty {
+export interface NavigationBarCellProperty extends Rect {
   type: 'image' | 'search' | 'text'; // 类型：文字 | 图片 | 搜索框
-  width: number; // 宽度
-  height: number; // 高度
-  top: number; // 顶部位置
-  left: number; // 左侧位置
   text: string; // 文字内容
   textColor: string; // 文字颜色
   imgUrl: string; // 图片地址
diff --git a/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue b/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
index 172bb8d21..519843f47 100644
--- a/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/components/diy-editor/index.vue
@@ -54,7 +54,6 @@ const qrcode = useQRCode(props.previewUrl, {
   margin: 4,
 }); // 预览二维码
 
-const componentLibrary = ref(); // 左侧组件库
 const pageConfigComponent = ref<DiyComponent<any>>(
   cloneDeep(PAGE_CONFIG_COMPONENT),
 ); // 页面设置组件
@@ -343,11 +342,10 @@ onMounted(() => {
       <ElContainer class="editor-container h-[calc(100vh-135px)]">
         <!-- 左侧：组件库（ComponentLibrary） -->
         <ElAside width="261px" class="editor-left">
-          <ComponentLibrary
-            v-if="libs && libs.length > 0"
-            ref="componentLibrary"
-            :list="libs"
-          />
+        <ComponentLibrary
+          v-if="libs && libs.length > 0"
+          :list="libs"
+        />
         </ElAside>
         <!-- 中心：设计区域（ComponentContainer） -->
         <div
diff --git a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
index fc971c096..327e43ed7 100644
--- a/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
+++ b/apps/web-ele/src/views/mall/promotion/kefu/modules/message-list.vue
@@ -4,9 +4,9 @@ import type { Emoji } from './tools/emoji';
 import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation';
 import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message';
 
-import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue';
+import { computed, reactive, ref, toRefs, unref, watch } from 'vue';
 
-import { UserTypeEnum } from '@vben/constants';
+import { KeFuMessageContentTypeEnum, UserTypeEnum } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { formatDate, isEmpty, jsonParse } from '@vben/utils';
 
diff --git a/apps/web-ele/src/views/mall/promotion/point/components/table-select.vue b/apps/web-ele/src/views/mall/promotion/point/components/table-select.vue
index d4c1a2a27..f6926513b 100644
--- a/apps/web-ele/src/views/mall/promotion/point/components/table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/point/components/table-select.vue
@@ -196,12 +196,10 @@ const [Modal, modalApi] = useVbenModal({
     >();
     if (props.multiple && Array.isArray(data) && data.length > 0) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallPointActivityApi.PointActivity[];
         data.forEach((activity) => {
-          const row = tableData.find(
-            (item: MallPointActivityApi.PointActivity) =>
-              item.id === activity.id,
-          );
+          const row = tableData.find((item) => item.id === activity.id);
           if (row) {
             gridApi.grid.setCheckboxRow(row, true);
           }
@@ -209,10 +207,9 @@ const [Modal, modalApi] = useVbenModal({
       }, 300);
     } else if (!props.multiple && data && !Array.isArray(data)) {
       setTimeout(() => {
-        const tableData = gridApi.grid.getTableData().fullData;
-        const row = tableData.find(
-          (item: MallPointActivityApi.PointActivity) => item.id === data.id,
-        );
+        const tableData = gridApi.grid.getTableData()
+          .fullData as MallPointActivityApi.PointActivity[];
+        const row = tableData.find((item) => item.id === data.id);
         if (row) {
           gridApi.grid.setRadioRow(row);
         }
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
index 9025baac3..8ef0cfed7 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
@@ -149,7 +149,6 @@ defineExpose({
         node-key="id"
         :props="{
           label: 'name',
-          value: 'id',
           children: 'children',
         }"
         placeholder="请选择地区"
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
index bbdfacf8b..529ae3712 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
@@ -139,7 +139,6 @@ defineExpose({
         node-key="id"
         :props="{
           label: 'name',
-          value: 'id',
           children: 'children',
         }"
         placeholder="请选择地区"