feat: use common-ui ContentWrap

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 流程 表单 */

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' });

apps/web-antd/src/components/content-wrap/content-wrap.vue

@@ -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>

apps/web-antd/src/components/content-wrap/index.ts

@@ -1 +0,0 @@
-export { default as ContentWrap } from './content-wrap.vue';

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' });
 

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"

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';

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';

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';
 

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';

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';
 

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';
 

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';

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; // 学生编号（主表的关联字段）

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';

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';

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,