From b26f9b1380c31054fa1bdd0f2a153094dc3d81db Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Wed, 24 Sep 2025 15:05:23 +0800
Subject: [PATCH] feat: use common-ui ContentWrap

---
 .../penal/listeners/ProcessListenerDialog.vue |  2 +-
 .../ProcessExpressionDialog.vue               |  2 +-
 .../components/content-wrap/content-wrap.vue  | 49 -----------------
 .../src/components/content-wrap/index.ts      |  1 -
 .../model/form/modules/bpm-model-editor.vue   |  2 +-
 .../form/modules/simple-model-design.vue      |  5 +-
 .../src/views/bpm/oa/leave/detail.vue         |  3 +-
 .../views/infra/demo/general/demo01/index.vue |  3 +-
 .../views/infra/demo/general/demo02/index.vue |  3 +-
 .../infra/demo/general/demo03/erp/index.vue   |  3 +-
 .../demo03/erp/modules/demo03-course-list.vue |  3 +-
 .../demo03/erp/modules/demo03-grade-list.vue  |  3 +-
 .../infra/demo/general/demo03/inner/index.vue |  3 +-
 .../inner/modules/demo03-course-list.vue      |  2 +-
 .../inner/modules/demo03-grade-list.vue       |  1 +
 .../demo/general/demo03/normal/index.vue      |  3 +-
 .../views/mall/product/spu/modules/form.vue   |  3 +-
 .../components/content-wrap/content-wrap.vue  | 53 -------------------
 .../src/components/content-wrap/index.ts      |  1 -
 .../views/infra/demo/general/demo01/index.vue |  3 +-
 .../views/infra/demo/general/demo02/index.vue |  3 +-
 .../infra/demo/general/demo03/erp/index.vue   |  3 +-
 .../demo03/erp/modules/demo03-course-list.vue |  3 +-
 .../demo03/erp/modules/demo03-grade-list.vue  |  3 +-
 .../infra/demo/general/demo03/inner/index.vue |  3 +-
 .../inner/modules/demo03-course-list.vue      |  2 +-
 .../inner/modules/demo03-grade-list.vue       |  2 +-
 .../demo/general/demo03/normal/index.vue      |  3 +-
 .../spu/components/spu-table-select.vue       |  2 +-
 .../components/combination-table-select.vue   |  1 +
 .../coupon/components/coupon-select.vue       |  1 +
 .../point/components/point-table-select.vue   |  1 +
 .../components/seckill-table-select.vue       |  1 +
 .../mall/trade/afterSale/modules/detail.vue   |  3 +-
 .../views/mall/trade/order/modules/detail.vue |  3 +-
 .../effects/common-ui/src/components/index.ts |  1 +
 36 files changed, 35 insertions(+), 148 deletions(-)
 delete mode 100644 apps/web-antd/src/components/content-wrap/content-wrap.vue
 delete mode 100644 apps/web-antd/src/components/content-wrap/index.ts
 delete mode 100644 apps/web-ele/src/components/content-wrap/content-wrap.vue
 delete mode 100644 apps/web-ele/src/components/content-wrap/index.ts

diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
index 5bdb51c9..754d4179 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/listeners/ProcessListenerDialog.vue
@@ -4,12 +4,12 @@ import type { BpmProcessListenerApi } from '#/api/bpm/processListener';
 
 import { reactive, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 
 import { Button, Modal, Pagination, Table } from 'ant-design-vue';
 
 import { getProcessListenerPage } from '#/api/bpm/processListener';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 
 /** BPM 流程 表单 */
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ProcessExpressionDialog.vue b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ProcessExpressionDialog.vue
index 3f33afaa..7ef79b1f 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ProcessExpressionDialog.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/penal/task/task-components/ProcessExpressionDialog.vue
@@ -4,12 +4,12 @@ import type { BpmProcessExpressionApi } from '#/api/bpm/processExpression';
 
 import { reactive, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { CommonStatusEnum } from '@vben/constants';
 
 import { Button, Modal, Pagination, Table, TableColumn } from 'ant-design-vue';
 
 import { getProcessExpressionPage } from '#/api/bpm/processExpression';
-import { ContentWrap } from '#/components/content-wrap';
 
 /** BPM 流程 表单 */
 defineOptions({ name: 'ProcessExpressionDialog' });
diff --git a/apps/web-antd/src/components/content-wrap/content-wrap.vue b/apps/web-antd/src/components/content-wrap/content-wrap.vue
deleted file mode 100644
index 8acb2fbd..00000000
--- a/apps/web-antd/src/components/content-wrap/content-wrap.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-  参考自 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/components/ContentWrap/src/ContentWrap.vue
-  保证和 yudao-ui-admin-vue3 功能的一致性
--->
-<script lang="ts" setup>
-import type { CSSProperties } from 'vue';
-
-import { ShieldQuestion } from '@vben/icons';
-
-import { Card, Tooltip } from 'ant-design-vue';
-
-defineOptions({ name: 'ContentWrap' });
-
-withDefaults(
-  defineProps<{
-    bodyStyle?: CSSProperties;
-    message?: string;
-    title?: string;
-  }>(),
-  {
-    bodyStyle: () => ({ padding: '10px' }),
-    title: '',
-    message: '',
-  },
-);
-</script>
-
-<template>
-  <Card :body-style="bodyStyle" :title="title" class="mb-4">
-    <template v-if="title" #title>
-      <div class="flex items-center">
-        <span class="text-base font-bold">{{ title }}</span>
-        <Tooltip placement="right">
-          <template #title>
-            <div class="max-w-[200px]">{{ message }}</div>
-          </template>
-          <ShieldQuestion :size="14" class="ml-1" />
-        </Tooltip>
-        <div class="flex flex-grow pl-5">
-          <slot name="header"></slot>
-        </div>
-      </div>
-    </template>
-    <template #extra>
-      <slot name="extra"></slot>
-    </template>
-    <slot></slot>
-  </Card>
-</template>
diff --git a/apps/web-antd/src/components/content-wrap/index.ts b/apps/web-antd/src/components/content-wrap/index.ts
deleted file mode 100644
index d4f95fdd..00000000
--- a/apps/web-antd/src/components/content-wrap/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ContentWrap } from './content-wrap.vue';
diff --git a/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue b/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue
index fef66c4b..7d621cfe 100644
--- a/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/bpm-model-editor.vue
@@ -5,6 +5,7 @@ import type { BpmModelApi } from '#/api/bpm/model';
 
 import { inject, onBeforeUnmount, provide, ref, shallowRef, watch } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { BpmModelFormType } from '@vben/constants';
 
 import { message } from 'ant-design-vue';
@@ -18,7 +19,6 @@ import {
 import CustomContentPadProvider from '#/components/bpmn-process-designer/package/designer/plugins/content-pad';
 // 自定义左侧菜单（修改 默认任务 为 用户任务）
 import CustomPaletteProvider from '#/components/bpmn-process-designer/package/designer/plugins/palette';
-import { ContentWrap } from '#/components/content-wrap';
 
 defineOptions({ name: 'BpmModelEditor' });
 
diff --git a/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue b/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue
index bf67401d..ea1e5061 100644
--- a/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
-import ContentWrap from '#/components/content-wrap/content-wrap.vue';
+import { ContentWrap } from '@vben/common-ui';
+
 import { SimpleProcessDesigner } from '#/components/simple-process-design';
 
 defineOptions({ name: 'SimpleModelDesign' });
@@ -30,7 +31,7 @@ async function validateConfig() {
 defineExpose({ validateConfig });
 </script>
 <template>
-  <ContentWrap :body-style="{ padding: '20px 16px' }">
+  <ContentWrap class="px-4 py-5">
     <SimpleProcessDesigner
       :model-form-id="modelFormId"
       :model-name="modelName"
diff --git a/apps/web-antd/src/views/bpm/oa/leave/detail.vue b/apps/web-antd/src/views/bpm/oa/leave/detail.vue
index f2ccc7b4..dc09fe59 100644
--- a/apps/web-antd/src/views/bpm/oa/leave/detail.vue
+++ b/apps/web-antd/src/views/bpm/oa/leave/detail.vue
@@ -4,8 +4,9 @@ import type { BpmOALeaveApi } from '#/api/bpm/oa/leave';
 import { computed, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
+import { ContentWrap } from '@vben/common-ui';
+
 import { getLeave } from '#/api/bpm/oa/leave';
-import { ContentWrap } from '#/components/content-wrap';
 import { Description } from '#/components/description';
 
 import { useDetailFormSchema } from './data';
diff --git a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue
index 955598ff..2b2c7f03 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo01/index.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo01/index.vue
@@ -3,7 +3,7 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -32,7 +32,6 @@ import {
   exportDemo01Contact,
   getDemo01ContactPage,
 } from '#/api/infra/demo/demo01';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
diff --git a/apps/web-antd/src/views/infra/demo/general/demo02/index.vue b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue
index a0f3aa45..ed06ac0e 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo02/index.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo02/index.vue
@@ -3,7 +3,7 @@ import type { Demo02CategoryApi } from '#/api/infra/demo/demo02';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { Download, Plus } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import {
@@ -21,7 +21,6 @@ import {
   exportDemo02Category,
   getDemo02CategoryList,
 } from '#/api/infra/demo/demo02';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
 
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
index 1174db95..39529fc9 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -33,7 +33,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
index 74359bf2..5085556b 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
 
-import { useVbenModal } from '@vben/common-ui';
+import { ContentWrap, useVbenModal } from '@vben/common-ui';
 import { Plus, Trash2 } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import { cloneDeep, formatDateTime, isEmpty } from '@vben/utils';
@@ -23,7 +23,6 @@ import {
   deleteDemo03CourseList,
   getDemo03CoursePage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
 
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
index cf331bfd..4ddfc024 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
 
-import { useVbenModal } from '@vben/common-ui';
+import { ContentWrap, useVbenModal } from '@vben/common-ui';
 import { Plus, Trash2 } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import { cloneDeep, formatDateTime, isEmpty } from '@vben/utils';
@@ -23,7 +23,6 @@ import {
   deleteDemo03GradeList,
   getDemo03GradePage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
 
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
index 2bb55cce..a58de8ab 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -33,7 +33,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/normal';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
index 79dc7713..bb49eeb7 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
@@ -3,11 +3,11 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal';
 
 import { nextTick, ref, watch } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { formatDateTime } from '@vben/utils';
 
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
 import { getDemo03CourseListByStudentId } from '#/api/infra/demo/demo03/normal';
-import { ContentWrap } from '#/components/content-wrap';
 
 const props = defineProps<{
   studentId?: number; // 学生编号（主表的关联字段）
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
index c03fc3ea..a08d67af 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
@@ -3,6 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal';
 
 import { nextTick, ref, watch } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { formatDateTime } from '@vben/utils';
 
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
diff --git a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
index 941f6d32..017a8739 100644
--- a/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
+++ b/apps/web-antd/src/views/infra/demo/general/demo03/normal/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -32,7 +32,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/normal';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
diff --git a/apps/web-antd/src/views/mall/product/spu/modules/form.vue b/apps/web-antd/src/views/mall/product/spu/modules/form.vue
index 9da5b7b5..3cfb43da 100644
--- a/apps/web-antd/src/views/mall/product/spu/modules/form.vue
+++ b/apps/web-antd/src/views/mall/product/spu/modules/form.vue
@@ -4,14 +4,13 @@ import type { MallSpuApi } from '#/api/mall/product/spu';
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
-import { Page } from '@vben/common-ui';
+import { ContentWrap, Page } from '@vben/common-ui';
 import { convertToInteger, formatToFraction } from '@vben/utils';
 
 import { Button, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createSpu, getSpu, updateSpu } from '#/api/mall/product/spu';
-import { ContentWrap } from '#/components/content-wrap';
 
 import {
   useDeliveryFormSchema,
diff --git a/apps/web-ele/src/components/content-wrap/content-wrap.vue b/apps/web-ele/src/components/content-wrap/content-wrap.vue
deleted file mode 100644
index c02ec6e0..00000000
--- a/apps/web-ele/src/components/content-wrap/content-wrap.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  参考自 https://github.com/yudaocode/yudao-ui-admin-vue3/blob/master/src/components/ContentWrap/src/ContentWrap.vue
-  保证和 yudao-ui-admin-vue3 功能的一致性
--->
-<script lang="ts" setup>
-import type { CSSProperties } from 'vue';
-
-import { ShieldQuestion } from '@vben/icons';
-
-import { ElCard, ElTooltip } from 'element-plus';
-
-defineOptions({ name: 'ContentWrap' });
-
-withDefaults(
-  defineProps<{
-    bodyStyle?: CSSProperties;
-    message?: string;
-    title?: string;
-  }>(),
-  {
-    bodyStyle: () => ({ padding: '10px' }),
-    title: '',
-    message: '',
-  },
-);
-</script>
-
-<template>
-  <ElCard :body-style="bodyStyle" :header="title" class="mb-4">
-    <template v-if="title" #header>
-      <div class="flex items-center justify-between">
-        <div class="flex items-center">
-          <span class="text-4 font-[700]">{{ title }}</span>
-          <ElTooltip placement="right">
-            <template #content>
-              <div class="max-w-[200px]">{{ message }}</div>
-            </template>
-            <ShieldQuestion :size="14" class="ml-5px" />
-          </ElTooltip>
-          <div class="pl-20px flex flex-grow">
-            <slot name="header"></slot>
-          </div>
-        </div>
-        <div>
-          <slot name="extra"></slot>
-        </div>
-      </div>
-    </template>
-    <template #default>
-      <slot></slot>
-    </template>
-  </ElCard>
-</template>
diff --git a/apps/web-ele/src/components/content-wrap/index.ts b/apps/web-ele/src/components/content-wrap/index.ts
deleted file mode 100644
index d4f95fdd..00000000
--- a/apps/web-ele/src/components/content-wrap/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ContentWrap } from './content-wrap.vue';
diff --git a/apps/web-ele/src/views/infra/demo/general/demo01/index.vue b/apps/web-ele/src/views/infra/demo/general/demo01/index.vue
index cbb99d16..15c1c393 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo01/index.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo01/index.vue
@@ -3,7 +3,7 @@ import type { Demo01ContactApi } from '#/api/infra/demo/demo01';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -35,7 +35,6 @@ import {
   exportDemo01Contact,
   getDemo01ContactPage,
 } from '#/api/infra/demo/demo01';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 
diff --git a/apps/web-ele/src/views/infra/demo/general/demo02/index.vue b/apps/web-ele/src/views/infra/demo/general/demo02/index.vue
index 33e53e98..d1a0c398 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo02/index.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo02/index.vue
@@ -3,7 +3,7 @@ import type { Demo02CategoryApi } from '#/api/infra/demo/demo02';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { Download, Plus } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import {
@@ -29,7 +29,6 @@ import {
   exportDemo02Category,
   getDemo02CategoryList,
 } from '#/api/infra/demo/demo02';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 
 import Demo02CategoryForm from './modules/form.vue';
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/erp/index.vue b/apps/web-ele/src/views/infra/demo/general/demo03/erp/index.vue
index 917e3d92..ac2b1533 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/erp/index.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/erp/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -37,7 +37,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue b/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
index 1e29ced5..10408f3d 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-course-list.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
 
-import { useVbenModal } from '@vben/common-ui';
+import { ContentWrap, useVbenModal } from '@vben/common-ui';
 import { Plus, Trash2 } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import { cloneDeep, formatDateTime, isEmpty } from '@vben/utils';
@@ -25,7 +25,6 @@ import {
   deleteDemo03CourseList,
   getDemo03CoursePage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 
 import Demo03CourseForm from './demo03-course-form.vue';
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue b/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
index 7ad05699..a418e3ae 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/erp/modules/demo03-grade-list.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp';
 
 import { h, nextTick, onMounted, reactive, ref, watch } from 'vue';
 
-import { useVbenModal } from '@vben/common-ui';
+import { ContentWrap, useVbenModal } from '@vben/common-ui';
 import { Plus, Trash2 } from '@vben/icons';
 import { useTableToolbar, VbenVxeTableToolbar } from '@vben/plugins/vxe-table';
 import { cloneDeep, formatDateTime, isEmpty } from '@vben/utils';
@@ -25,7 +25,6 @@ import {
   deleteDemo03GradeList,
   getDemo03GradePage,
 } from '#/api/infra/demo/demo03/erp';
-import { ContentWrap } from '#/components/content-wrap';
 import { $t } from '#/locales';
 
 import Demo03GradeForm from './demo03-grade-form.vue';
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/inner/index.vue b/apps/web-ele/src/views/infra/demo/general/demo03/inner/index.vue
index c326f461..5b8076bc 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/inner/index.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/inner/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -37,7 +37,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/inner';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue b/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
index 9cf3a555..678042aa 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-course-list.vue
@@ -3,11 +3,11 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner';
 
 import { nextTick, ref, watch } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { formatDateTime } from '@vben/utils';
 
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
 import { getDemo03CourseListByStudentId } from '#/api/infra/demo/demo03/inner';
-import { ContentWrap } from '#/components/content-wrap';
 
 const props = defineProps<{
   studentId?: number; // 学生编号（主表的关联字段）
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue b/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
index 20322a47..4272b63e 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/inner/modules/demo03-grade-list.vue
@@ -3,11 +3,11 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner';
 
 import { nextTick, ref, watch } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { formatDateTime } from '@vben/utils';
 
 import { VxeColumn, VxeTable } from '#/adapter/vxe-table';
 import { getDemo03GradeByStudentId } from '#/api/infra/demo/demo03/inner';
-import { ContentWrap } from '#/components/content-wrap';
 
 const props = defineProps<{
   studentId?: number; // 学生编号（主表的关联字段）
diff --git a/apps/web-ele/src/views/infra/demo/general/demo03/normal/index.vue b/apps/web-ele/src/views/infra/demo/general/demo03/normal/index.vue
index 1262599c..ec666172 100644
--- a/apps/web-ele/src/views/infra/demo/general/demo03/normal/index.vue
+++ b/apps/web-ele/src/views/infra/demo/general/demo03/normal/index.vue
@@ -3,7 +3,7 @@ import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal';
 
 import { h, onMounted, reactive, ref } from 'vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { Download, Plus, Trash2 } from '@vben/icons';
@@ -35,7 +35,6 @@ import {
   exportDemo03Student,
   getDemo03StudentPage,
 } from '#/api/infra/demo/demo03/normal';
-import { ContentWrap } from '#/components/content-wrap';
 import { DictTag } from '#/components/dict-tag';
 import { $t } from '#/locales';
 
diff --git a/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue b/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue
index 1c6c451f..960302c1 100644
--- a/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue
+++ b/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue
@@ -4,6 +4,7 @@ import type { MallSpuApi } from '#/api/mall/product/spu';
 
 import { onMounted, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
 import {
@@ -24,7 +25,6 @@ import {
 
 import * as ProductCategoryApi from '#/api/mall/product/category';
 import * as ProductSpuApi from '#/api/mall/product/spu';
-
 /**
  * 商品表格选择对话框
  * 1. 单选模式：
diff --git a/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue b/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
index 4d26e398..84db075b 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
@@ -3,6 +3,7 @@ import type { MallCombinationActivityApi } from '#/api/mall/promotion/combinatio
 
 import { onMounted, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import {
diff --git a/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue b/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
index 2c9ab796..b29626d8 100644
--- a/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
@@ -3,6 +3,7 @@ import type { MallCouponTemplateApi } from '#/api/mall/promotion/coupon/couponTe
 
 import { reactive, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { CouponTemplateTakeTypeEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
diff --git a/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue b/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
index 583b49c8..69e5ebf7 100644
--- a/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
@@ -3,6 +3,7 @@ import type { MallPointActivityApi } from '#/api/mall/promotion/point';
 
 import { computed, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import { dateFormatter, fenToYuanFormat } from '@vben/utils';
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue b/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
index 39435519..6014338f 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
@@ -3,6 +3,7 @@ import type { MallSeckillActivityApi } from '#/api/mall/promotion/seckill/seckil
 
 import { onMounted, ref } from 'vue';
 
+import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 import {
diff --git a/apps/web-ele/src/views/mall/trade/afterSale/modules/detail.vue b/apps/web-ele/src/views/mall/trade/afterSale/modules/detail.vue
index c7afee1a..292a0914 100644
--- a/apps/web-ele/src/views/mall/trade/afterSale/modules/detail.vue
+++ b/apps/web-ele/src/views/mall/trade/afterSale/modules/detail.vue
@@ -5,7 +5,7 @@ import type { MallOrderApi } from '#/api/mall/trade/order';
 import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import { confirm, Page } from '@vben/common-ui';
+import { confirm, ContentWrap, Page } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictLabel, getDictObj } from '@vben/hooks';
 import { $t } from '@vben/locales';
@@ -21,7 +21,6 @@ import {
 } from 'element-plus';
 
 import * as AfterSaleApi from '#/api/mall/trade/afterSale/index';
-import ContentWrap from '#/components/content-wrap/content-wrap.vue';
 import { DictTag } from '#/components/dict-tag';
 
 import UpdateAuditReasonForm from './disagree-form.vue';
diff --git a/apps/web-ele/src/views/mall/trade/order/modules/detail.vue b/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
index 21b89e47..5ddad388 100644
--- a/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
+++ b/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
@@ -6,7 +6,7 @@ import type { MallOrderApi } from '#/api/mall/trade/order';
 import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import { confirm, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, ContentWrap, Page, useVbenModal } from '@vben/common-ui';
 import {
   DeliveryTypeEnum,
   DICT_TYPE,
@@ -26,7 +26,6 @@ import {
 import * as DeliveryExpressApi from '#/api/mall/trade/delivery/express';
 import * as DeliveryPickUpStoreApi from '#/api/mall/trade/delivery/pickUpStore';
 import * as TradeOrderApi from '#/api/mall/trade/order';
-import ContentWrap from '#/components/content-wrap/content-wrap.vue';
 import { DictTag } from '#/components/dict-tag';
 
 import OrderDeliveryForm from './delevery-form.vue';
diff --git a/packages/effects/common-ui/src/components/index.ts b/packages/effects/common-ui/src/components/index.ts
index 37024caa..bd12f89f 100644
--- a/packages/effects/common-ui/src/components/index.ts
+++ b/packages/effects/common-ui/src/components/index.ts
@@ -1,6 +1,7 @@
 export * from './api-component';
 export * from './captcha';
 export * from './col-page';
+export * from './content-wrap';
 export * from './count-to';
 export * from './doc-alert';
 export * from './ellipsis-text';