Merge branch 'dev', remote-tracking branch 'origin' into contrib

68d00912 · dhb52 · a00c612f · 60cc4357 · 84dcac77 · 68d00912
Commit 68d00912 authored Apr 16, 2023 by dhb52
192 changed files
--- a/.env.stage
+++ b/.env.stage
+# 生产环境
+NODE_ENV=production
+VITE_DEV=false
+# 请求路径
+VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+# 上传路径
+VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
+# 接口前缀
+VITE_API_BASEPATH=
+# 接口地址
+VITE_API_URL=/admin-api
+# 是否删除debugger
+VITE_DROP_DEBUGGER=true
+# 是否删除console.log
+VITE_DROP_CONSOLE=true
+# 是否sourcemap
+VITE_SOURCEMAP=false
+# 打包路径
+VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
+# 输出路径
+VITE_OUT_DIR=dist-stage
--- a/.env.test
+++ b/.env.test
@@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true
 # 打包路径
-VITE_BASE_PATH=/dist-test/
+VITE_BASE_PATH=/
 # 输出路径
 VITE_OUT_DIR=dist-test
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,6 @@ dist-ssr
 /dist*
 *-lock.*
 pnpm-debug
+auto-*.d.ts
 .idea
 .history
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -40,5 +40,15 @@
  "i18n-ally.displayLanguage": "zh-CN",
  "i18n-ally.enabledFrameworks": ["vue", "react"],
  "god.tsconfig": "./tsconfig.json",
-  "vue-i18n.i18nPaths": "src/locales"
+  "vue-i18n.i18nPaths": "src/locales",
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "*.ts": "$(capture).test.ts, $(capture).test.tsx",
+    "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
+    "*.env": "$(capture).env.*",
+    "CHANGELOG.md": "CHANGELOG*",
+    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*",
+    ".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig"
+  }
 }
--- a/build/vite/index.ts
+++ b/build/vite/index.ts
@@ -19,10 +19,12 @@ import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 export function createVitePlugins() {
  const root = process.cwd()
  // 路径查找
  function pathResolve(dir: string) {
    return resolve(root, '.', dir)
  }
  return [
    Vue(),
    VueJsx(),
@@ -45,8 +47,6 @@ export function createVitePlugins() {
        {
          '@/hooks/web/useI18n': ['useI18n'],
          '@/hooks/web/useMessage': ['useMessage'],
-          '@/hooks/web/useXTable': ['useXTable'],
-          '@/hooks/web/useVxeCrudSchemas': ['useVxeCrudSchemas'],
          '@/hooks/web/useTable': ['useTable'],
          '@/hooks/web/useCrudSchemas': ['useCrudSchemas'],
          '@/utils/formRules': ['required'],

--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
    "ts:check": "vue-tsc --noEmit",
    "build:pro": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode pro",
    "build:dev": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode dev",
+    "build:stage": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode stage",
    "build:test": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode test",
    "build:static": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode static",
    "build:front": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode front",
@@ -32,13 +33,12 @@
    "@form-create/element-ui": "^3.1.17",
    "@iconify/iconify": "^3.1.0",
    "@videojs-player/vue": "^1.0.0",
-    "@vueup/vue-quill": "^1.1.1",
    "@vueuse/core": "^9.13.0",
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^5.1.10",
    "@zxcvbn-ts/core": "^2.2.1",
    "animate.css": "^4.1.1",
-    "axios": "^1.3.4",
+    "axios": "^1.3.5",
    "benz-amr-recorder": "^1.1.5",
    "bpmn-js-token-simulation": "^0.10.0",
    "camunda-bpmn-moddle": "^7.0.1",
@@ -48,16 +48,16 @@
    "diagram-js": "^11.6.0",
    "echarts": "^5.4.1",
    "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.3.1",
+    "element-plus": "2.3.3",
    "fast-xml-parser": "^4.1.3",
    "highlight.js": "^11.7.0",
-    "intro.js": "^6.0.0",
+    "intro.js": "^7.0.1",
    "jsencrypt": "^3.3.2",
    "lodash-es": "^4.17.21",
    "min-dash": "^4.0.0",
    "mitt": "^3.0.0",
    "nprogress": "^0.2.0",
-    "pinia": "^2.0.33",
+    "pinia": "^2.0.34",
    "qrcode": "^1.5.1",
    "qs": "^6.11.1",
    "steady-xml": "^0.1.0",

--- a/src/App.vue
+++ b/src/App.vue
-<script setup lang="ts">
+<script lang="ts" name="APP" setup>
 import { isDark } from '@/utils/is'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -32,6 +32,7 @@ $prefix-cls: #{$namespace}-app;
  width: 100%;
  height: 100%;
 }
 html,
 body {
  padding: 0 !important;
@@ -43,6 +44,7 @@ body {
    @extend .size;
  }
 }
 .#{$prefix-cls}-grey-mode {
  filter: grayscale(100%);
 }

--- a/src/api/system/notify/template/index.ts
+++ b/src/api/system/notify/template/index.ts
 import request from '@/config/axios'
 export interface NotifyTemplateVO {
-  id: number
+  id?: number
  name: string
+  nickname: string
  code: string
  content: string
  type: number
@@ -11,36 +12,29 @@ export interface NotifyTemplateVO {
  remark: string
 }
-export interface NotifyTemplatePageReqVO extends PageParam {
-  name?: string
-  code?: string
-  status?: number
-  createTime?: Date[]
-}
 export interface NotifySendReqVO {
-  userId: number
+  userId: number | null
  templateCode: string
  templateParams: Map<String, Object>
 }
 // 查询站内信模板列表
-export const getNotifyTemplatePageApi = async (params: NotifyTemplatePageReqVO) => {
+export const getNotifyTemplatePage = async (params: PageParam) => {
  return await request.get({ url: '/system/notify-template/page', params })
 }
 // 查询站内信模板详情
-export const getNotifyTemplateApi = async (id: number) => {
+export const getNotifyTemplate = async (id: number) => {
  return await request.get({ url: '/system/notify-template/get?id=' + id })
 }
 // 新增站内信模板
-export const createNotifyTemplateApi = async (data: NotifyTemplateVO) => {
+export const createNotifyTemplate = async (data: NotifyTemplateVO) => {
  return await request.post({ url: '/system/notify-template/create', data })
 }
 // 修改站内信模板
-export const updateNotifyTemplateApi = async (data: NotifyTemplateVO) => {
+export const updateNotifyTemplate = async (data: NotifyTemplateVO) => {
  return await request.put({ url: '/system/notify-template/update', data })
 }
@@ -50,6 +44,6 @@ export const deleteNotifyTemplateApi = async (id: number) => {
 }
 // 发送站内信
-export const sendNotifyApi = (data: NotifySendReqVO) => {
+export const sendNotify = (data: NotifySendReqVO) => {
  return request.post({ url: '/system/notify-template/send-notify', data })
 }
--- a/src/components/Backtop/src/Backtop.vue
+++ b/src/components/Backtop/src/Backtop.vue
-<script setup lang="ts">
+<script lang="ts" name="BackTop" setup>
 import { ElBacktop } from 'element-plus'
 import { useDesign } from '@/hooks/web/useDesign'

--- a/src/components/ConfigGlobal/src/ConfigGlobal.vue
+++ b/src/components/ConfigGlobal/src/ConfigGlobal.vue
-<script setup lang="ts">
+<script lang="ts" name="ConfigGlobal" setup>
 import { propTypes } from '@/utils/propTypes'
 import { useLocaleStore } from '@/store/modules/locale'
 import { useAppStore } from '@/store/modules/app'
@@ -51,9 +51,9 @@ const currentLocale = computed(() => localeStore.currentLocale)
 <template>
  <ElConfigProvider
-    :namespace="variables.elNamespace"
    :locale="currentLocale.elLocale"
    :message="{ max: 1 }"
+    :namespace="variables.elNamespace"
    :size="size"
  >
    <slot></slot>

--- a/src/components/ContentDetailWrap/src/ContentDetailWrap.vue
+++ b/src/components/ContentDetailWrap/src/ContentDetailWrap.vue
-<script setup lang="ts">
+<script lang="ts" name="ContentDetailWrap" setup>
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -21,7 +21,7 @@ onMounted(() => {
 </script>
 <template>
-  <div :class="[`${prefixCls}-container`]" ref="contentDetailWrap">
+  <div ref="contentDetailWrap" :class="[`${prefixCls}-container`]">
    <Sticky :offset="offset">
      <div
        :class="[
@@ -31,7 +31,7 @@ onMounted(() => {
      >
        <div :class="[`${prefixCls}-header__back`, 'flex pl-10px pr-10px ']">
          <ElButton @click="emit('back')">
-            <Icon icon="ep:arrow-left" class="mr-5px" />
+            <Icon class="mr-5px" icon="ep:arrow-left" />
            {{ t('common.back') }}
          </ElButton>
        </div>
@@ -47,7 +47,9 @@ onMounted(() => {
    </Sticky>
    <div style="padding: var(--app-content-padding)">
      <ElCard :class="[`${prefixCls}-body`, 'mb-20px']" shadow="never">
-        <div> <slot></slot> </div>
+        <div>
+          <slot></slot>
+        </div>
      </ElCard>
    </div>
  </div>

--- a/src/components/ContentWrap/src/ContentWrap.vue
+++ b/src/components/ContentWrap/src/ContentWrap.vue
-<script setup lang="ts">
+<script lang="ts" name="ContentWrap" setup>
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -21,7 +21,7 @@ defineProps({
          <template #content>
            <div class="max-w-200px">{{ message }}</div>
          </template>
-          <Icon class="ml-5px" icon="ep:question-filled" :size="14" />
+          <Icon :size="14" class="ml-5px" icon="ep:question-filled" />
        </ElTooltip>
      </div>
    </template>

--- a/src/components/CountTo/src/CountTo.vue
+++ b/src/components/CountTo/src/CountTo.vue
-<script setup lang="ts">
+<script lang="ts" name="CountTo" setup>
 import { PropType } from 'vue'
 import { isNumber } from '@/utils/is'
 import { propTypes } from '@/utils/propTypes'

--- a/src/components/Crontab/src/Crontab.vue
+++ b/src/components/Crontab/src/Crontab.vue
--- a/src/components/Cropper/src/CopperModal.vue
+++ b/src/components/Cropper/src/CopperModal.vue
@@ -2,26 +2,26 @@
  <div>
    <Dialog
      v-model="dialogVisible"
+      :canFullscreen="false"
      :title="t('cropper.modalTitle')"
-      width="800px"
      maxHeight="380px"
-      :canFullscreen="false"
+      width="800px"
    >
      <div :class="prefixCls">
        <div :class="`${prefixCls}-left`">
          <div :class="`${prefixCls}-cropper`">
            <CropperImage
              v-if="src"
+              :circled="circled"
              :src="src"
              height="300px"
-              :circled="circled"
              @cropend="handleCropend"
              @ready="handleReady"
            />
          </div>
          <div :class="`${prefixCls}-toolbar`">
-            <el-upload :fileList="[]" accept="image/*" :beforeUpload="handleBeforeUpload">
+            <el-upload :beforeUpload="handleBeforeUpload" :fileList="[]" accept="image/*">
              <el-tooltip :content="t('cropper.selectImage')" placement="bottom">
                <XButton preIcon="ant-design:upload-outlined" type="primary" />
              </el-tooltip>
@@ -29,64 +29,64 @@
            <el-space>
              <el-tooltip :content="t('cropper.btn_reset')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="ant-design:reload-outlined"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('reset')"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_rotate_left')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="ant-design:rotate-left-outlined"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('rotate', -45)"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_rotate_right')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="ant-design:rotate-right-outlined"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('rotate', 45)"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_scale_x')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="vaadin:arrows-long-h"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('scaleX')"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_scale_y')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="vaadin:arrows-long-v"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('scaleY')"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_zoom_in')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="ant-design:zoom-in-outlined"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('zoom', 0.1)"
                />
              </el-tooltip>
              <el-tooltip :content="t('cropper.btn_zoom_out')" placement="bottom">
                <XButton
-                  type="primary"
+                  :disabled="!src"
                  preIcon="ant-design:zoom-out-outlined"
                  size="small"
-                  :disabled="!src"
+                  type="primary"
                  @click="handlerToolbar('zoom', -0.1)"
                />
              </el-tooltip>
@@ -95,14 +95,14 @@
        </div>
        <div :class="`${prefixCls}-right`">
          <div :class="`${prefixCls}-preview`">
-            <img :src="previewSource" v-if="previewSource" :alt="t('cropper.preview')" />
+            <img v-if="previewSource" :alt="t('cropper.preview')" :src="previewSource" />
          </div>
          <template v-if="previewSource">
            <div :class="`${prefixCls}-group`">
              <el-avatar :src="previewSource" size="large" />
-              <el-avatar :src="previewSource" :size="48" />
+              <el-avatar :size="48" :src="previewSource" />
-              <el-avatar :src="previewSource" :size="64" />
+              <el-avatar :size="64" :src="previewSource" />
-              <el-avatar :src="previewSource" :size="80" />
+              <el-avatar :size="80" :src="previewSource" />
            </div>
          </template>
        </div>
@@ -113,7 +113,7 @@
    </Dialog>
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="CopperModal" setup>
 import { useDesign } from '@/hooks/web/useDesign'
 import { dataURLtoBlob } from '@/utils/filt'
 import { useI18n } from 'vue-i18n'
@@ -173,12 +173,15 @@ async function handleOk() {
  const blob = dataURLtoBlob(previewSource.value)
  emit('uploadSuccess', { source: previewSource.value, data: blob, filename: filename })
 }
 function openModal() {
  dialogVisible.value = true
 }
 function closeModal() {
  dialogVisible.value = false
 }
 defineExpose({ openModal, closeModal })
 </script>
 <style lang="scss">

--- a/src/components/Cropper/src/Cropper.vue
+++ b/src/components/Cropper/src/Cropper.vue
@@ -3,14 +3,14 @@
    <img
      v-show="isReady"
      ref="imgElRef"
-      :src="src"
      :alt="alt"
      :crossorigin="crossorigin"
+      :src="src"
      :style="getImageStyle"
    />
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="Cropper" setup>
 import { CSSProperties, PropType } from 'vue'
 import Cropper from 'cropperjs'
 import 'cropperjs/dist/cropper.css'

--- a/src/components/Cropper/src/CropperAvatar.vue
+++ b/src/components/Cropper/src/CropperAvatar.vue
 <template>
  <div class="user-info-head" @click="open()">
-    <img :src="sourceValue" v-if="sourceValue" class="img-circle img-lg" alt="avatar" />
+    <img v-if="sourceValue" :src="sourceValue" alt="avatar" class="img-circle img-lg" />
-    <el-button :class="`${prefixCls}-upload-btn`" @click="open()" v-if="showBtn">
+    <el-button v-if="showBtn" :class="`${prefixCls}-upload-btn`" @click="open()">
      {{ btnText ? btnText : t('cropper.selectImage') }}
    </el-button>
    <CopperModal
      ref="cropperModelRef"
-      @upload-success="handleUploadSuccess"
      :srcValue="sourceValue"
+      @upload-success="handleUploadSuccess"
    />
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="CropperAvatar" setup>
 import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
@@ -54,9 +54,11 @@ function handleUploadSuccess({ source, data, filename }) {
 function open() {
  cropperModelRef.value.openModal()
 }
 function close() {
  cropperModelRef.value.closeModal()
 }
 defineExpose({
  open,
  close
@@ -104,17 +106,21 @@ $prefix-cls: #{$namespace}--cropper-avatar;
    margin: 10px auto;
  }
 }
 .user-info-head {
  position: relative;
  display: inline-block;
 }
 .img-circle {
  border-radius: 50%;
 }
 .img-lg {
  width: 120px;
  height: 120px;
 }
 .user-info-head:hover:after {
  content: '+';
  position: absolute;

--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
-<script setup lang="ts">
+<script lang="ts" name="Descriptions" setup>
 import { PropType } from 'vue'
 import dayjs from 'dayjs'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -84,7 +84,7 @@ const toggleClick = () => {
        <div class="flex items-center">
          {{ title }}
          <ElTooltip v-if="message" :content="message" placement="right">
-            <Icon icon="ep:warning" class="ml-5px" />
+            <Icon class="ml-5px" icon="ep:warning" />
          </ElTooltip>
        </div>
      </div>
@@ -95,8 +95,8 @@ const toggleClick = () => {
      <div v-show="show" :class="[`${prefixCls}-content`, 'p-10px']">
        <ElDescriptions
          :column="props.columns"
-          border
          :direction="mobile ? 'vertical' : 'horizontal'"
+          border
          v-bind="getBindValue"
        >
          <template v-if="slots['extra']" #extra>
@@ -114,8 +114,8 @@ const toggleClick = () => {
                :row="{
                  label: item.label
                }"
-                >{{ item.label }}</slot
+                >{{ item.label }}
-              >
+              </slot>
            </template>
            <template #default>

--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
-<script setup lang="ts">
+<script lang="ts" name="Dialog" setup>
 import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
@@ -59,13 +59,13 @@ const dialogStyle = computed(() => {
 <template>
  <ElDialog
-    v-bind="getBindValue"
+    :close-on-click-modal="true"
    :fullscreen="isFullscreen"
+    :width="width"
    destroy-on-close
-    lock-scroll
    draggable
-    :width="width"
+    lock-scroll
-    :close-on-click-modal="true"
+    v-bind="getBindValue"
  >
    <template #header>
      <div class="flex justify-between">
@@ -74,8 +74,8 @@ const dialogStyle = computed(() => {
        </slot>
        <Icon
          v-if="fullscreen"
-          class="mr-22px cursor-pointer is-hover mt-2px z-10"
          :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+          class="mr-22px cursor-pointer is-hover mt-2px z-10"
          color="var(--el-color-info)"
          @click="toggleFull"
        />
@@ -83,7 +83,7 @@ const dialogStyle = computed(() => {
    </template>
    <!-- 情况一：如果 scroll 为 true，说明开启滚动条 -->
-    <ElScrollbar :style="dialogStyle" v-if="scroll">
+    <ElScrollbar v-if="scroll" :style="dialogStyle">
      <slot></slot>
    </ElScrollbar>
    <!-- 情况二：如果 scroll 为 false，说明关闭滚动条滚动条 -->

--- a/src/components/Echart/src/Echart.vue
+++ b/src/components/Echart/src/Echart.vue
-<script setup lang="ts">
+<script lang="ts" name="EChart" setup>
 import type { EChartsOption } from 'echarts'
 import echarts from '@/plugins/echarts'
 import { debounce } from 'lodash-es'

--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
-<script setup lang="ts">
+<script lang="ts" name="Editor" setup>
 import { PropType } from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-import { IDomEditor, IEditorConfig, i18nChangeLanguage } from '@wangeditor/editor'
+import { i18nChangeLanguage, IDomEditor, IEditorConfig } from '@wangeditor/editor'
 import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { ElMessage } from 'element-plus'
@@ -20,7 +20,7 @@ const props = defineProps({
  editorId: propTypes.string.def('wangeEditor-1'),
  height: propTypes.oneOfType([Number, String]).def('500px'),
  editorConfig: {
-    type: Object as PropType<IEditorConfig>,
+    type: Object as PropType<Partial<IEditorConfig>>,
    default: () => undefined
  },
  readonly: propTypes.bool.def(false),
@@ -147,6 +147,7 @@ const editorConfig = computed((): IEditorConfig => {
    props.editorConfig || {}
  )
 })
 const editorStyle = computed(() => {
  return {
    height: isNumber(props.height) ? `${props.height}px` : props.height
@@ -188,8 +189,8 @@ defineExpose({
    <!-- 编辑器 -->
    <Editor
      v-model="valueHtml"
-      :editorId="editorId"
      :defaultConfig="editorConfig"
+      :editorId="editorId"
      :style="editorStyle"
      @on-change="handleChange"
      @on-created="handleCreated"

--- a/src/components/Error/src/Error.vue
+++ b/src/components/Error/src/Error.vue
-<script setup lang="ts">
+<script lang="ts" name="Error" setup>
 import pageError from '@/assets/svgs/404.svg'
 import networkError from '@/assets/svgs/500.svg'
 import noPermission from '@/assets/svgs/403.svg'
@@ -46,7 +46,7 @@ const btnClick = () => {
 <template>
  <div class="flex justify-center">
    <div class="text-center">
-      <img width="350" :src="errorMap[type].url" alt="" />
+      <img :src="errorMap[type].url" alt="" width="350" />
      <div class="text-14px text-[var(--el-color-info)]">{{ errorMap[type].message }}</div>
      <div class="mt-20px">
        <ElButton type="primary" @click="btnClick">{{ errorMap[type].buttonText }}</ElButton>

--- a/src/components/IFrame/src/IFrame.vue
+++ b/src/components/IFrame/src/IFrame.vue
-<script setup lang="ts">
+<script lang="ts" name="IFrame" setup>
 import { propTypes } from '@/utils/propTypes'
 const props = defineProps({
@@ -20,11 +20,11 @@ onMounted(() => {
 <template>
  <div v-loading="loading" :style="'height:' + height">
    <iframe
+      ref="frameRef"
      :src="props.src"
-      style="width: 100%; height: 100%"
      frameborder="no"
      scrolling="auto"
-      ref="frameRef"
+      style="width: 100%; height: 100%"
    ></iframe>
  </div>
 </template>
--- a/src/components/Icon/src/Icon.vue
+++ b/src/components/Icon/src/Icon.vue
-<script setup lang="ts">
+<script lang="ts" name="Icon" setup>
 import { propTypes } from '@/utils/propTypes'
 import Iconify from '@purge-icons/generated'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -72,7 +72,7 @@ watch(
 <template>
  <ElIcon :class="prefixCls" :color="color" :size="size">
-    <svg v-if="isLocal" aria-hidden="true" :class="getSvgClass">
+    <svg v-if="isLocal" :class="getSvgClass" aria-hidden="true">
      <use :xlink:href="symbolId" />
    </svg>

--- a/src/components/Icon/src/IconSelect.vue
+++ b/src/components/Icon/src/IconSelect.vue
-<script setup lang="ts">
+<script lang="ts" name="IconSelect" setup>
 import { CSSProperties } from 'vue'
 import { cloneDeep } from 'lodash-es'
 import { IconJson } from '@/components/Icon/src/data'
@@ -116,13 +116,13 @@ watch(
    <ElInput v-model="inputValue" @click="visible = !visible">
      <template #append>
        <ElPopover
-          :width="350"
-          trigger="click"
-          popper-class="pure-popper"
          :popper-options="{
            placement: 'auto'
          }"
          :visible="visible"
+          :width="350"
+          popper-class="pure-popper"
+          trigger="click"
        >
          <template #reference>
            <div
@@ -133,7 +133,7 @@ watch(
            </div>
          </template>
-          <ElInput class="p-2" v-model="filterValue" placeholder="搜索图标" clearable />
+          <ElInput v-model="filterValue" class="p-2" clearable placeholder="搜索图标" />
          <ElDivider border-style="dashed" />
          <ElTabs v-model="currentActiveType" @tab-click="handleClick">
@@ -143,15 +143,15 @@ watch(
              :label="pane.label"
              :name="pane.name"
            >
-              <ElDivider class="tab-divider" border-style="dashed" />
+              <ElDivider border-style="dashed" class="tab-divider" />
              <ElScrollbar height="220px">
                <ul class="flex flex-wrap px-2 ml-2">
                  <li
                    v-for="(item, key) in pageList"
                    :key="key"
+                    :style="iconItemStyle(item)"
                    :title="item"
                    class="icon-item p-2 w-1/10 cursor-pointer mr-2 mt-1 flex justify-center items-center border border-solid"
-                    :style="iconItemStyle(item)"
                    @click="onChangeIcon(item)"
                  >
                    <Icon :icon="currentActiveType + item" />
@@ -163,13 +163,13 @@ watch(
          <ElDivider border-style="dashed" />
          <ElPagination
-            small
-            :total="iconCount"
-            :page-size="pageSize"
            :current-page="currentPage"
+            :page-size="pageSize"
+            :total="iconCount"
            background
-            layout="prev, pager, next"
            class="flex items-center justify-center h-10"
+            layout="prev, pager, next"
+            small
            @current-change="onCurrentChange"
          />
        </ElPopover>

--- a/src/components/ImageViewer/src/ImageViewer.vue
+++ b/src/components/ImageViewer/src/ImageViewer.vue
-<script setup lang="ts">
+<script lang="ts" name="ImageViewer" setup>
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'

--- a/src/components/Infotip/src/Infotip.vue
+++ b/src/components/Infotip/src/Infotip.vue
-<script setup lang="ts">
+<script lang="ts" name="InfoTip" setup>
 import { PropType } from 'vue'
 import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
@@ -34,14 +34,14 @@ const keyClick = (key: string) => {
    ]"
  >
    <div v-if="title" :class="[`${prefixCls}__header`, 'flex items-center']">
-      <Icon icon="ep:warning-filled" :size="22" color="var(--el-color-primary)" />
+      <Icon :size="22" color="var(--el-color-primary)" icon="ep:warning-filled" />
      <span :class="[`${prefixCls}__title`, 'pl-5px text-16px font-bold']">{{ title }}</span>
    </div>
    <div :class="`${prefixCls}__content`">
      <p v-for="(item, $index) in schema" :key="$index" class="text-14px mt-15px">
        <Highlight
-          :keys="typeof item === 'string' ? [] : item.keys"
          :color="highlightColor"
+          :keys="typeof item === 'string' ? [] : item.keys"
          @click="keyClick"
        >
          {{ showIndex ? `${$index + 1}、` : '' }}{{ typeof item === 'string' ? item : item.label }}

--- a/src/components/InputPassword/src/InputPassword.vue
+++ b/src/components/InputPassword/src/InputPassword.vue
-<script setup lang="ts">
+<script lang="ts" name="InputPassword" setup>
 import { propTypes } from '@/utils/propTypes'
 import { useConfigGlobal } from '@/hooks/web/useConfigGlobal'
-import { zxcvbn } from '@zxcvbn-ts/core'
 import type { ZxcvbnResult } from '@zxcvbn-ts/core'
+import { zxcvbn } from '@zxcvbn-ts/core'
 import { useDesign } from '@/hooks/web/useDesign'
 const { getPrefixCls } = useDesign()
@@ -57,9 +57,9 @@ const getIconName = computed(() => (unref(textType) === 'password' ? 'ep:hide' :
 <template>
  <div :class="[prefixCls, `${prefixCls}--${configGlobal?.size}`]">
-    <ElInput v-bind="$attrs" v-model="valueRef" :type="textType">
+    <ElInput v-model="valueRef" :type="textType" v-bind="$attrs">
      <template #suffix>
-        <Icon class="el-input__icon cursor-pointer" :icon="getIconName" @click="changeTextType" />
+        <Icon :icon="getIconName" class="el-input__icon cursor-pointer" @click="changeTextType" />
      </template>
    </ElInput>
    <div

--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -2,19 +2,19 @@
 <template>
  <el-pagination
    v-show="total > 0"
-    class="float-right mt-15px mb-15px"
-    :background="true"
-    layout="total, sizes, prev, pager, next, jumper"
-    :page-sizes="[10, 20, 30, 50, 100]"
    v-model:current-page="currentPage"
    v-model:page-size="pageSize"
+    :background="true"
+    :page-sizes="[10, 20, 30, 50, 100]"
    :pager-count="pagerCount"
    :total="total"
+    class="float-right mt-15px mb-15px"
+    layout="total, sizes, prev, pager, next, jumper"
    @size-change="handleSizeChange"
    @current-change="handleCurrentChange"
  />
 </template>
-<script setup>
+<script name="Pagination" setup>
 import { computed } from 'vue'
 const props = defineProps({

--- a/src/components/Qrcode/src/Qrcode.vue
+++ b/src/components/Qrcode/src/Qrcode.vue
-<script setup lang="ts">
+<script lang="ts" name="Qrcode" setup>
-import { PropType, nextTick, ref, watch, computed, unref } from 'vue'
+import { computed, nextTick, PropType, ref, unref, watch } from 'vue'
-import QRCode from 'qrcode'
+import QRCode, { QRCodeRenderersOptions } from 'qrcode'
-import { QRCodeRenderersOptions } from 'qrcode'
 import { cloneDeep } from 'lodash-es'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -230,7 +229,7 @@ const disabledClick = () => {
      @click="disabledClick"
    >
      <div class="absolute top-[50%] left-[50%] font-bold">
-        <Icon icon="ep:refresh-right" :size="30" color="var(--el-color-primary)" />
+        <Icon :size="30" color="var(--el-color-primary)" icon="ep:refresh-right" />
        <div>{{ disabledText }}</div>
      </div>
    </div>

--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
-<script setup lang="ts">
+<script lang="ts" name="Search" setup>
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
@@ -100,25 +100,25 @@ const setVisible = () => {
 <template>
  <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
  <Form
-    :is-custom="false"
-    :label-width="labelWidth"
-    hide-required-asterisk
    :inline="inline"
    :is-col="isCol"
+    :is-custom="false"
+    :label-width="labelWidth"
    :schema="newSchema"
-    @register="register"
    class="-mb-15px"
+    hide-required-asterisk
+    @register="register"
  >
    <template #action>
      <div v-if="layout === 'inline'">
        <!-- update by 芋艿：去除搜索的 type="primary"，颜色变淡一点 -->
        <ElButton v-if="showSearch" @click="search">
-          <Icon icon="ep:search" class="mr-5px" />
+          <Icon class="mr-5px" icon="ep:search" />
          {{ t('common.query') }}
        </ElButton>
        <!-- update by 芋艿：将 icon="ep:refresh-right" 修改成 icon="ep:refresh"，和 ruoyi-vue 搜索保持一致  -->
        <ElButton v-if="showReset" @click="reset">
-          <Icon icon="ep:refresh" class="mr-5px" />
+          <Icon class="mr-5px" icon="ep:refresh" />
          {{ t('common.reset') }}
        </ElButton>
        <ElButton v-if="expand" text @click="setVisible">
@@ -129,19 +129,19 @@ const setVisible = () => {
        <slot name="actionMore"></slot>
      </div>
    </template>
-    <template #[name] v-for="name in Object.keys($slots)" :key="name"
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]>
-      ><slot :name="name"></slot
+      <slot :name="name"></slot>
-    ></template>
+    </template>
  </Form>
  <template v-if="layout === 'bottom'">
    <div :style="bottonButtonStyle">
      <ElButton v-if="showSearch" type="primary" @click="search">
-        <Icon icon="ep:search" class="mr-5px" />
+        <Icon class="mr-5px" icon="ep:search" />
        {{ t('common.query') }}
      </ElButton>
      <ElButton v-if="showReset" @click="reset">
-        <Icon icon="ep:refresh-right" class="mr-5px" />
+        <Icon class="mr-5px" icon="ep:refresh-right" />
        {{ t('common.reset') }}
      </ElButton>
      <ElButton v-if="expand" text @click="setVisible">

--- a/src/components/Sticky/src/Sticky.vue
+++ b/src/components/Sticky/src/Sticky.vue
-<script setup lang="ts">
+<script lang="ts" name="Sticky" setup>
 import { propTypes } from '@/utils/propTypes'
 import { isClient, useEventListener, useWindowSize } from '@vueuse/core'
 import type { CSSProperties } from 'vue'
 const props = defineProps({
  // 距离顶部或者底部的距离(单位px)
  offset: propTypes.number.def(0),
@@ -120,7 +121,7 @@ const reset = () => {
 }
 </script>
 <template>
-  <div :style="{ height: height, zIndex: zIndex }" ref="refSticky">
+  <div ref="refSticky" :style="{ height: height, zIndex: zIndex }">
    <div
      :class="className"
      :style="{

--- a/src/components/Tooltip/src/Tooltip.vue
+++ b/src/components/Tooltip/src/Tooltip.vue
-<script setup lang="ts">
+<script lang="ts" name="Tooltip" setup>
 import { propTypes } from '@/utils/propTypes'
 defineProps({
  titel: propTypes.string.def(''),
  message: propTypes.string.def(''),

--- a/src/components/Verifition/src/Verify.vue
+++ b/src/components/Verifition/src/Verify.vue
 <template>
-  <div :class="mode == 'pop' ? 'mask' : ''" v-show="showBox">
+  <div v-show="showBox" :class="mode == 'pop' ? 'mask' : ''">
    <div
      :class="mode == 'pop' ? 'verifybox' : ''"
      :style="{ 'max-width': parseInt(imgSize.width) + 20 + 'px' }"
    >
-      <div class="verifybox-top" v-if="mode == 'pop'">
+      <div v-if="mode == 'pop'" class="verifybox-top">
        {{ t('captcha.verification') }}
        <span class="verifybox-close" @click="closeBox">
          <i class="iconfont icon-close"></i>
        </span>
      </div>
-      <div class="verifybox-bottom" :style="{ padding: mode == 'pop' ? '10px' : '0' }">
+      <div :style="{ padding: mode == 'pop' ? '10px' : '0' }" class="verifybox-bottom">
        <!-- 验证码容器 -->
        <component
-          v-if="componentType"
          :is="componentType"
+          v-if="componentType"
+          ref="instance"
+          :arith="arith"
+          :barSize="barSize"
+          :blockSize="blockSize"
          :captchaType="captchaType"
-          :type="verifyType"
+          :explain="explain"
          :figure="figure"
-          :arith="arith"
+          :imgSize="imgSize"
          :mode="mode"
+          :type="verifyType"
          :vSpace="vSpace"
-          :explain="explain"
-          :imgSize="imgSize"
-          :blockSize="blockSize"
-          :barSize="barSize"
-          ref="instance"
        />
      </div>
    </div>
  </div>
 </template>
-<script type="text/babel">
+<script name="Verify" type="text/babel">
 /**
 * Verify 验证码组件
 * @description 分发验证码使用
 * */
-import { VerifySlide, VerifyPoints } from './Verify'
+import { VerifyPoints, VerifySlide } from './Verify'
 import { computed, ref, toRefs, watchEffect } from 'vue'
 export default {
@@ -155,6 +155,7 @@ export default {
  border-radius: 5px;
  transform: translate(-50%, -50%);
 }
 .verifybox-top {
  padding: 0 15px;
  height: 40px;
@@ -165,10 +166,12 @@ export default {
  border-bottom: 1px solid #e4e7eb;
  box-sizing: border-box;
 }
 .verifybox-bottom {
  padding: 10px;
  box-sizing: border-box;
 }
 .verifybox-close {
  position: absolute;
  top: 13px;
@@ -178,6 +181,7 @@ export default {
  text-align: center;
  cursor: pointer;
 }
 .mask {
  position: fixed;
  top: 0;
@@ -189,6 +193,7 @@ export default {
  /* display: none; */
  transition: all 0.5s;
 }
 .verify-tips {
  text-indent: 10px;
  position: absolute;
@@ -199,22 +204,27 @@ export default {
  line-height: 30px;
  color: #fff;
 }
 .suc-bg {
  background-color: rgba(92, 184, 92, 0.5);
  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7f5CB85C, endcolorstr=#7f5CB85C);
 }
 .err-bg {
  background-color: rgba(217, 83, 79, 0.5);
  filter: progid:DXImageTransform.Microsoft.gradient(startcolorstr=#7fD9534F, endcolorstr=#7fD9534F);
 }
 .tips-enter,
 .tips-leave-to {
  bottom: -30px;
 }
 .tips-enter-active,
 .tips-leave-active {
  transition: bottom 0.5s;
 }
 /* ---------------------------- */
 /*常规验证码*/
 .verify-code {

--- a/src/components/Verifition/src/Verify/VerifyPoints.vue
+++ b/src/components/Verifition/src/Verify/VerifyPoints.vue
@@ -2,20 +2,20 @@
  <div style="position: relative">
    <div class="verify-img-out">
      <div
-        class="verify-img-panel"
        :style="{
          width: setSize.imgWidth,
          height: setSize.imgHeight,
          'background-size': setSize.imgWidth + ' ' + setSize.imgHeight,
          'margin-bottom': vSpace + 'px'
        }"
+        class="verify-img-panel"
      >
-        <div class="verify-refresh" style="z-index: 3" @click="refresh" v-show="showRefresh">
+        <div v-show="showRefresh" class="verify-refresh" style="z-index: 3" @click="refresh">
          <i class="iconfont icon-refresh"></i>
        </div>
        <img
-          :src="'data:image/png;base64,' + pointBackImgBase"
          ref="canvas"
+          :src="'data:image/png;base64,' + pointBackImgBase"
          alt=""
          style="width: 100%; height: 100%; display: block"
          @click="bindingClick ? canvasClick($event) : undefined"
@@ -24,7 +24,6 @@
        <div
          v-for="(tempPoint, index) in tempPoints"
          :key="index"
-          class="point-area"
          :style="{
            'background-color': '#1abd6c',
            color: '#fff',
@@ -38,6 +37,7 @@
            top: parseInt(tempPoint.y - 10) + 'px',
            left: parseInt(tempPoint.x - 10) + 'px'
          }"
+          class="point-area"
        >
          {{ index + 1 }}
        </div>
@@ -45,19 +45,19 @@
    </div>
    <!-- 'height': this.barSize.height, -->
    <div
-      class="verify-bar-area"
      :style="{
        width: setSize.imgWidth,
        color: barAreaColor,
        'border-color': barAreaBorderColor,
        'line-height': barSize.height
      }"
+      class="verify-bar-area"
    >
      <span class="verify-msg">{{ text }}</span>
    </div>
  </div>
 </template>
-<script type="text/babel" setup>
+<script name="VerifyPoints" setup type="text/babel">
 /**
 * VerifyPoints
 * @description 点选
@@ -65,7 +65,7 @@
 import { resetSize } from './../utils/util'
 import { aesEncrypt } from './../utils/ase'
 import { getCode, reqCheck } from '@/api/login'
-import { onMounted, reactive, ref, nextTick, toRefs, getCurrentInstance } from 'vue'
+import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs } from 'vue'
 const props = defineProps({
  //弹出式pop，固定fixed

--- a/src/components/Verifition/src/Verify/VerifySlide.vue
+++ b/src/components/Verifition/src/Verify/VerifySlide.vue
@@ -2,20 +2,20 @@
  <div style="position: relative">
    <div
      v-if="type === '2'"
-      class="verify-img-out"
      :style="{ height: parseInt(setSize.imgHeight) + vSpace + 'px' }"
+      class="verify-img-out"
    >
-      <div class="verify-img-panel" :style="{ width: setSize.imgWidth, height: setSize.imgHeight }">
+      <div :style="{ width: setSize.imgWidth, height: setSize.imgHeight }" class="verify-img-panel">
        <img
          :src="'data:image/png;base64,' + backImgBase"
          alt=""
          style="width: 100%; height: 100%; display: block"
        />
-        <div class="verify-refresh" @click="refresh" v-show="showRefresh">
+        <div v-show="showRefresh" class="verify-refresh" @click="refresh">
          <i class="iconfont icon-refresh"></i>
        </div>
        <transition name="tips">
-          <span class="verify-tips" v-if="tipWords" :class="passFlag ? 'suc-bg' : 'err-bg'">
+          <span v-if="tipWords" :class="passFlag ? 'suc-bg' : 'err-bg'" class="verify-tips">
            {{ tipWords }}
          </span>
        </transition>
@@ -23,24 +23,21 @@
    </div>
    <!-- 公共部分 -->
    <div
-      class="verify-bar-area"
      :style="{ width: setSize.imgWidth, height: barSize.height, 'line-height': barSize.height }"
+      class="verify-bar-area"
    >
      <span class="verify-msg" v-text="text"></span>
      <div
-        class="verify-left-bar"
        :style="{
          width: leftBarWidth !== undefined ? leftBarWidth : barSize.height,
          height: barSize.height,
          'border-color': leftBarBorderColor,
          transaction: transitionWidth
        }"
+        class="verify-left-bar"
      >
        <span class="verify-msg" v-text="finishText"></span>
        <div
-          class="verify-move-block"
-          @touchstart="start"
-          @mousedown="start"
          :style="{
            width: barSize.height,
            height: barSize.height,
@@ -48,17 +45,20 @@
            left: moveBlockLeft,
            transition: transitionLeft
          }"
+          class="verify-move-block"
+          @mousedown="start"
+          @touchstart="start"
        >
          <i :class="['verify-icon iconfont', iconClass]" :style="{ color: iconColor }"></i>
          <div
            v-if="type === '2'"
-            class="verify-sub-block"
            :style="{
              width: Math.floor((parseInt(setSize.imgWidth) * 47) / 310) + 'px',
              height: setSize.imgHeight,
              top: '-' + (parseInt(setSize.imgHeight) + vSpace) + 'px',
              'background-size': setSize.imgWidth + ' ' + setSize.imgHeight
            }"
+            class="verify-sub-block"
          >
            <img
              :src="'data:image/png;base64,' + blockBackImgBase"
@@ -71,7 +71,7 @@
    </div>
  </div>
 </template>
-<script type="text/babel" setup>
+<script name="VerifySlide" setup type="text/babel">
 /**
 * VerifySlide
 * @description 滑块

--- a/src/components/XButton/src/XButton.vue
+++ b/src/components/XButton/src/XButton.vue
-<script setup lang="ts">
+<script lang="ts" name="XButton" setup>
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
@@ -30,9 +30,9 @@ const getBindValue = computed(() => {
 <template>
  <el-button v-bind="getBindValue" @click="onClick">
-    <Icon :icon="preIcon" v-if="preIcon" class="mr-1px" />
+    <Icon v-if="preIcon" :icon="preIcon" class="mr-1px" />
    {{ title ? title : '' }}
-    <Icon :icon="postIcon" v-if="postIcon" class="mr-1px" />
+    <Icon v-if="postIcon" :icon="postIcon" class="mr-1px" />
  </el-button>
 </template>
 <style lang="scss" scoped>
@@ -40,6 +40,7 @@ const getBindValue = computed(() => {
  margin-left: 0;
  padding: 8px 4px;
 }
 :deep(.el-button.is-link) {
  margin-left: 0;
  padding: 8px 4px;

--- a/src/components/XButton/src/XTextButton.vue
+++ b/src/components/XButton/src/XTextButton.vue
-<script setup lang="ts">
+<script lang="ts" name="XTextButton" setup>
 import { propTypes } from '@/utils/propTypes'
 import { PropType } from 'vue'
@@ -29,9 +29,9 @@ const getBindValue = computed(() => {
 <template>
  <el-button link v-bind="getBindValue" @click="onClick">
-    <Icon :icon="preIcon" v-if="preIcon" class="mr-1px" />
+    <Icon v-if="preIcon" :icon="preIcon" class="mr-1px" />
    {{ title ? title : '' }}
-    <Icon :icon="postIcon" v-if="postIcon" class="mr-1px" />
+    <Icon v-if="postIcon" :icon="postIcon" class="mr-1px" />
  </el-button>
 </template>
 <style lang="scss" scoped>
@@ -39,6 +39,7 @@ const getBindValue = computed(() => {
  margin-left: 0;
  padding: 8px 4px;
 }
 :deep(.el-button.is-link) {
  margin-left: 0;
  padding: 8px 4px;

--- a/src/components/bpmnProcessDesigner/package/index.ts
+++ b/src/components/bpmnProcessDesigner/package/index.ts
-import { App } from 'vue'
 import MyProcessDesigner from './designer'
 import MyProcessPenal from './penal'
 import MyProcessViewer from './designer/index2'
-const components = [MyProcessDesigner, MyProcessPenal, MyProcessViewer]
+import './theme/index.scss'
+import 'bpmn-js/dist/assets/diagram-js.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
-// const install = function (Vue) {
+export { MyProcessDesigner, MyProcessPenal, MyProcessViewer }
-//   components.forEach(component => {
-//     Vue.component(component.name, component)
-//   })
-// }
-// if (typeof window !== "undefined" && window.Vue) {
-//   install(window.Vue)
-// }
-//   components.forEach(component => {
-//     Vue.component(component.name, component)
-//   })
-const componentss = {
-  install: (Vue: App): void => {
-    components.forEach((component) => {
-      Vue.component(component.name, component)
-    })
-  }
-}
-// let version = "0.0.1"
-export const MyPD = (app) => {
-  // export default {
-  // app.use(version)
-  // app.use(install)
-  // app.use(MyProcessDesigner)
-  // app.use(MyProcessPenal)
-  // app.use(MyProcessViewer)
-  // app.use(components)
-  app.use(componentss)
-}
--- a/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue
@@ -111,7 +111,8 @@
              >
              <el-divider direction="vertical" />
              <el-button
-                type="text"
+                type="primary"
+                link
                style="color: #ff4d4f"
                @click="removeFieldOptionItem(scope, scope.$index, 'enum')"
                >移除</el-button
@@ -143,7 +144,8 @@
            >
            <el-divider direction="vertical" />
            <el-button
-              type="text"
+              type="primary"
+              link
              style="color: #ff4d4f"
              @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"
              >移除</el-button
@@ -174,7 +176,8 @@
            >
            <el-divider direction="vertical" />
            <el-button
-              type="text"
+              type="primary"
+              link
              style="color: #ff4d4f"
              @click="removeFieldOptionItem(scope, scope.$index, 'property')"
              >移除</el-button

--- a/src/components/index.ts
+++ b/src/components/index.ts
 import type { App } from 'vue'
 import { Icon } from './Icon'
-import { Form } from '@/components/Form'
-import { Table } from '@/components/Table'
-import { Search } from '@/components/Search'
-import { XButton, XTextButton } from '@/components/XButton'
-import { DictTag } from '@/components/DictTag'
-import { ContentWrap } from '@/components/ContentWrap'
-import { Descriptions } from '@/components/Descriptions'
 export const setupGlobCom = (app: App<Element>): void => {
  app.component('Icon', Icon)
-  app.component('Form', Form)
-  app.component('Table', Table)
-  app.component('Search', Search)
-  app.component('XButton', XButton)
-  app.component('XTextButton', XTextButton)
-  app.component('DictTag', DictTag)
-  app.component('ContentWrap', ContentWrap)
-  app.component('Descriptions', Descriptions)
 }
--- a/src/hooks/web/useCrudSchemas.ts
+++ b/src/hooks/web/useCrudSchemas.ts
@@ -29,6 +29,8 @@ type CrudSearchParams = {
  show?: boolean
  // 接口
  api?: () => Promise<any>
+  // 搜索字段
+  field?: string
 } & Omit<FormSchema, 'field'>
 type CrudTableParams = {

--- a/src/layout/components/AppView.vue
+++ b/src/layout/components/AppView.vue
-<script setup lang="ts">
+<script lang="ts" name="AppView" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useAppStore } from '@/store/modules/app'
 import { Footer } from '@/layout/components/Footer'
@@ -21,16 +21,17 @@ const getCaches = computed((): string[] => {
 <template>
  <section
    :class="[
-      'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-contnet-bg-color)] dark:bg-[var(--el-bg-color)]',
+      'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
      {
        '!min-h-[calc(100%-var(--app-footer-height))]':
-          fixedHeader && (layout === 'classic' || layout === 'topLeft') && footer,
+          ((fixedHeader && (layout === 'classic' || layout === 'topLeft')) || layout === 'top') &&
+          footer,
        '!min-h-[calc(100%-var(--tags-view-height)-var(--top-tool-height)-var(--app-footer-height))]':
-          ((!fixedHeader && layout === 'classic') || layout === 'top') && footer,
+          !fixedHeader && layout === 'classic' && footer,
        '!min-h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]':
-          !fixedHeader && layout === 'topLeft' && footer,
+          !fixedHeader && (layout === 'topLeft' || layout === 'top') && footer,
        '!min-h-[calc(100%-var(--top-tool-height))]': fixedHeader && layout === 'cutMenu' && footer,

--- a/src/layout/components/Collapse/src/Collapse.vue
+++ b/src/layout/components/Collapse/src/Collapse.vue
-<script setup lang="ts">
+<script lang="ts" name="Collapse" setup>
 import { useAppStore } from '@/store/modules/app'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -24,9 +24,9 @@ const toggleCollapse = () => {
 <template>
  <div :class="prefixCls">
    <Icon
-      :size="18"
-      :icon="collapse ? 'ep:expand' : 'ep:fold'"
      :color="color"
+      :icon="collapse ? 'ep:expand' : 'ep:fold'"
+      :size="18"
      class="cursor-pointer"
      @click="toggleCollapse"
    />

--- a/src/layout/components/ContextMenu/src/ContextMenu.vue
+++ b/src/layout/components/ContextMenu/src/ContextMenu.vue
-<script setup lang="ts">
+<script lang="ts" name="ContextMenu" setup>
 import { PropType } from 'vue'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -51,9 +51,9 @@ defineExpose({
    :class="prefixCls"
    :trigger="trigger"
    placement="bottom-start"
+    popper-class="v-context-menu-popper"
    @command="command"
    @visible-change="visibleChange"
-    popper-class="v-context-menu-popper"
  >
    <slot></slot>
    <template #dropdown>
@@ -61,11 +61,12 @@ defineExpose({
        <ElDropdownItem
          v-for="(item, index) in schema"
          :key="`dropdown${index}`"
-          :divided="item.divided"
-          :disabled="item.disabled"
          :command="item"
+          :disabled="item.disabled"
+          :divided="item.divided"
        >
-          <Icon :icon="item.icon" /> {{ t(item.label) }}
+          <Icon :icon="item.icon" />
+          {{ t(item.label) }}
        </ElDropdownItem>
      </ElDropdownMenu>
    </template>

--- a/src/layout/components/Footer/src/Footer.vue
+++ b/src/layout/components/Footer/src/Footer.vue
-<script setup lang="ts">
+<script lang="ts" name="Footer" setup>
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'

--- a/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
+++ b/src/layout/components/LocaleDropdown/src/LocaleDropdown.vue
-<script setup lang="ts">
+<script lang="ts" name="LocaleDropdown" setup>
 import { useLocaleStore } from '@/store/modules/locale'
 import { useLocale } from '@/hooks/web/useLocale'
 import { propTypes } from '@/utils/propTypes'
@@ -33,11 +33,11 @@ const setLang = (lang: LocaleType) => {
 <template>
  <ElDropdown :class="prefixCls" trigger="click" @command="setLang">
    <Icon
-      :size="18"
-      icon="ion:language-sharp"
-      class="cursor-pointer"
      :class="$attrs.class"
      :color="color"
+      :size="18"
+      class="cursor-pointer"
+      icon="ion:language-sharp"
    />
    <template #dropdown>
      <ElDropdownMenu>

--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
-<script setup lang="ts">
+<script lang="ts" name="Logo" setup>
-import { ref, watch, computed, onMounted, unref } from 'vue'
+import { computed, onMounted, ref, unref, watch } from 'vue'
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -66,8 +66,8 @@ watch(
      to="/"
    >
      <img
-        src="@/assets/imgs/logo.png"
        class="w-[calc(var(--logo-height)-10px)] h-[calc(var(--logo-height)-10px)]"
+        src="@/assets/imgs/logo.png"
      />
      <div
        v-if="show"

--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
-<script setup lang="ts">
+<script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
@@ -40,10 +40,10 @@ onMounted(() => {
 </script>
 <template>
  <div class="message">
-    <ElPopover placement="bottom" :width="400" trigger="click">
+    <ElPopover :width="400" placement="bottom" trigger="click">
      <template #reference>
        <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon icon="ep:bell" :size="18" class="cursor-pointer" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
        </ElBadge>
      </template>
      <ElTabs v-model="activeName">
@@ -51,7 +51,7 @@ onMounted(() => {
          <div class="message-list">
            <template v-for="item in list" :key="item.id">
              <div class="message-item">
-                <img src="@/assets/imgs/avatar.gif" alt="" class="message-icon" />
+                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                <div class="message-content">
                  <span class="message-title">
                    {{ item.templateNickname }}：{{ item.templateContent }}
@@ -67,12 +67,12 @@ onMounted(() => {
      </ElTabs>
      <!-- 更多 -->
      <div style="text-align: right; margin-top: 10px">
-        <XButton type="primary" preIcon="ep:view" title="查看全部" @click="goMyList" />
+        <XButton preIcon="ep:view" title="查看全部" type="primary" @click="goMyList" />
      </div>
    </ElPopover>
  </div>
 </template>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .message-empty {
  display: flex;
  flex-direction: column;
@@ -81,28 +81,35 @@ onMounted(() => {
  height: 260px;
  line-height: 45px;
 }
 .message-list {
  display: flex;
  flex-direction: column;
  .message-item {
    display: flex;
    align-items: center;
    padding: 20px 0;
    border-bottom: 1px solid var(--el-border-color-light);
    &:last-child {
      border: none;
    }
    .message-icon {
      width: 40px;
      height: 40px;
      margin: 0 20px 0 5px;
    }
    .message-content {
      display: flex;
      flex-direction: column;
      .message-title {
        margin-bottom: 5px;
      }
      .message-date {
        font-size: 12px;
        color: var(--el-text-color-secondary);

--- a/src/layout/components/Screenfull/src/Screenfull.vue
+++ b/src/layout/components/Screenfull/src/Screenfull.vue
-<script setup lang="ts">
+<script lang="ts" name="ScreenFull" setup>
 import { Icon } from '@/components/Icon'
 import { useFullscreen } from '@vueuse/core'
 import { propTypes } from '@/utils/propTypes'
@@ -22,9 +22,9 @@ const toggleFullscreen = () => {
 <template>
  <div :class="prefixCls" @click="toggleFullscreen">
    <Icon
-      :size="18"
-      :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
      :color="color"
+      :icon="isFullscreen ? 'zmdi:fullscreen-exit' : 'zmdi:fullscreen'"
+      :size="18"
    />
  </div>
 </template>
--- a/src/layout/components/Setting/src/Setting.vue
+++ b/src/layout/components/Setting/src/Setting.vue
-<script setup lang="ts">
+<script lang="ts" name="Setting" setup>
 import { ElMessage } from 'element-plus'
-import { useCssVar, useClipboard } from '@vueuse/core'
+import { useClipboard, useCssVar } from '@vueuse/core'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
-import { trim, setCssVar } from '@/utils'
+import { setCssVar, trim } from '@/utils'
-import { colorIsDark, lighten, hexToRGB } from '@/utils/color'
+import { colorIsDark, hexToRGB, lighten } from '@/utils/color'
 import { useAppStore } from '@/store/modules/app'
 import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
@@ -202,10 +202,10 @@ const clear = () => {
    class="fixed top-[45%] right-0 w-40px h-40px text-center leading-40px bg-[var(--el-color-primary)] cursor-pointer"
    @click="drawer = true"
  >
-    <Icon icon="ep:setting" color="#fff" />
+    <Icon color="#fff" icon="ep:setting" />
  </div>
-  <ElDrawer v-model="drawer" direction="rtl" size="350px" :z-index="4000">
+  <ElDrawer v-model="drawer" :z-index="4000" direction="rtl" size="350px">
    <template #header>
      <span class="text-16px font-700">{{ t('setting.projectSetting') }}</span>
    </template>
@@ -279,10 +279,10 @@ const clear = () => {
    <ElDivider />
    <div>
-      <ElButton type="primary" class="w-full" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
+      <ElButton class="w-full" type="primary" @click="copyConfig">{{ t('setting.copy') }}</ElButton>
    </div>
    <div class="mt-5px">
-      <ElButton type="danger" class="w-full" @click="clear">
+      <ElButton class="w-full" type="danger" @click="clear">
        {{ t('setting.clearAndReset') }}
      </ElButton>
    </div>

--- a/src/layout/components/Setting/src/components/ColorRadioPicker.vue
+++ b/src/layout/components/Setting/src/components/ColorRadioPicker.vue
-<script setup lang="ts">
+<script lang="ts" name="ColorRadioPicker" setup>
 import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -42,14 +42,14 @@ watch(
    <span
      v-for="(item, i) in schema"
      :key="`radio-${i}`"
-      class="w-20px h-20px cursor-pointer rounded-2px border-solid border-gray-300 border-2px text-center leading-20px mb-5px"
      :class="{ 'is-active': colorVal === item }"
      :style="{
        background: item
      }"
+      class="w-20px h-20px cursor-pointer rounded-2px border-solid border-gray-300 border-2px text-center leading-20px mb-5px"
      @click="colorVal = item"
    >
-      <Icon v-if="colorVal === item" color="#fff" icon="ep:check" :size="16" />
+      <Icon v-if="colorVal === item" :size="16" color="#fff" icon="ep:check" />
    </span>
  </div>
 </template>

--- a/src/layout/components/Setting/src/components/InterfaceDisplay.vue
+++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue
-<script setup lang="ts">
+<script lang="ts" name="InterfaceDisplay" setup>
 import { setCssVar } from '@/utils'
 import { useDesign } from '@/hooks/web/useDesign'

--- a/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
+++ b/src/layout/components/Setting/src/components/LayoutRadioPicker.vue
-<script setup lang="ts">
+<script lang="ts" name="LayoutRadioPicker" setup>
 import { useAppStore } from '@/store/modules/app'
 import { useDesign } from '@/hooks/web/useDesign'

--- a/src/layout/components/SizeDropdown/src/SizeDropdown.vue
+++ b/src/layout/components/SizeDropdown/src/SizeDropdown.vue
-<script setup lang="ts">
+<script lang="ts" name="SizeDropdown" setup>
 import { useAppStore } from '@/store/modules/app'
 import { propTypes } from '@/utils/propTypes'
@@ -26,7 +26,7 @@ const setCurrentSize = (size: ElementPlusSize) => {
 <template>
  <ElDropdown :class="prefixCls" trigger="click" @command="setCurrentSize">
-    <Icon :size="18" icon="mdi:format-size" :color="color" class="cursor-pointer" />
+    <Icon :color="color" :size="18" class="cursor-pointer" icon="mdi:format-size" />
    <template #dropdown>
      <ElDropdownMenu>
        <ElDropdownItem v-for="item in sizeMap" :key="item" :command="item">

--- a/src/layout/components/TagsView/src/TagsView.vue
+++ b/src/layout/components/TagsView/src/TagsView.vue
-<script setup lang="ts">
+<script lang="ts" name="TagsView" setup>
 import type { RouteLocationNormalizedLoaded, RouterLinkProps } from 'vue-router'
 import { usePermissionStore } from '@/store/modules/permission'
 import { useTagsViewStore } from '@/store/modules/tagsView'
@@ -266,15 +266,24 @@ watch(
      @click="move(-200)"
    >
      <Icon
-        icon="ep:d-arrow-left"
        :color="appStore.getIsDark ? 'var(--el-text-color-regular)' : '#333'"
+        icon="ep:d-arrow-left"
      />
    </span>
    <div class="overflow-hidden flex-1">
      <ElScrollbar ref="scrollbarRef" class="h-full" @scroll="scroll">
        <div class="flex h-full">
          <ContextMenu
+            v-for="item in visitedViews"
+            :key="item.fullPath"
            :ref="itemRefs.set"
+            :class="[
+              `${prefixCls}__item`,
+              item?.meta?.affix ? `${prefixCls}__item--affix` : '',
+              {
+                'is-active': isActive(item)
+              }
+            ]"
            :schema="[
              {
                icon: 'ep:refresh',
@@ -332,23 +341,14 @@ watch(
                }
              }
            ]"
-            v-for="item in visitedViews"
-            :key="item.fullPath"
            :tag-item="item"
-            :class="[
-              `${prefixCls}__item`,
-              item?.meta?.affix ? `${prefixCls}__item--affix` : '',
-              {
-                'is-active': isActive(item)
-              }
-            ]"
            @visible-change="visibleChange"
          >
            <div>
-              <router-link :ref="tagLinksRefs.set" :to="{ ...item }" custom v-slot="{ navigate }">
+              <router-link :ref="tagLinksRefs.set" v-slot="{ navigate }" :to="{ ...item }" custom>
                <div
-                  @click="navigate"
                  class="h-full flex justify-center items-center whitespace-nowrap pl-15px"
+                  @click="navigate"
                >
                  <Icon
                    v-if="
@@ -364,9 +364,9 @@ watch(
                  {{ t(item?.meta?.title as string) }}
                  <Icon
                    :class="`${prefixCls}__item--close`"
+                    :size="12"
                    color="#333"
                    icon="ep:close"
-                    :size="12"
                    @click.prevent.stop="closeSelectedTag(item)"
                  />
                </div>
@@ -382,8 +382,8 @@ watch(
      @click="move(200)"
    >
      <Icon
-        icon="ep:d-arrow-right"
        :color="appStore.getIsDark ? 'var(--el-text-color-regular)' : '#333'"
+        icon="ep:d-arrow-right"
      />
    </span>
    <span
@@ -392,12 +392,11 @@ watch(
      @click="refreshSelectedTag(selectedTag)"
    >
      <Icon
-        icon="ep:refresh-right"
        :color="appStore.getIsDark ? 'var(--el-text-color-regular)' : '#333'"
+        icon="ep:refresh-right"
      />
    </span>
    <ContextMenu
-      trigger="click"
      :schema="[
        {
          icon: 'ep:refresh',
@@ -449,14 +448,15 @@ watch(
          }
        }
      ]"
+      trigger="click"
    >
      <span
        :class="`${prefixCls}__tool`"
        class="w-[var(--tags-view-height)] h-[var(--tags-view-height)] text-center leading-[var(--tags-view-height)] cursor-pointer block"
      >
        <Icon
-          icon="ep:menu"
          :color="appStore.getIsDark ? 'var(--el-text-color-regular)' : '#333'"
+          icon="ep:menu"
        />
      </span>
    </ContextMenu>
@@ -513,6 +513,7 @@ $prefix-cls: #{$namespace}-tags-view;
      display: none;
      transform: translate(0, -50%);
    }
    &:not(.#{$prefix-cls}__item--affix):hover {
      .#{$prefix-cls}__item--close {
        display: block;
@@ -530,6 +531,7 @@ $prefix-cls: #{$namespace}-tags-view;
    color: var(--el-color-white);
    background-color: var(--el-color-primary);
    border: 1px solid var(--el-color-primary);
    .#{$prefix-cls}__item--close {
      :deep(span) {
        color: var(--el-color-white) !important;
@@ -573,6 +575,7 @@ $prefix-cls: #{$namespace}-tags-view;
    &__item.is-active {
      color: var(--el-color-white);
      background-color: var(--el-color-primary);
      .#{$prefix-cls}__item--close {
        :deep(span) {
          color: var(--el-color-white) !important;

--- a/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
+++ b/src/layout/components/ThemeSwitch/src/ThemeSwitch.vue
-<script setup lang="ts">
+<script lang="ts" name="ThemeSwitch" setup>
 import { useAppStore } from '@/store/modules/app'
 import { useIcon } from '@/hooks/web/useIcon'
 import { useDesign } from '@/hooks/web/useDesign'
@@ -26,14 +26,14 @@ const themeChange = (val: boolean) => {
 <template>
  <ElSwitch
-    :class="prefixCls"
    v-model="isDark"
-    inline-prompt
-    :border-color="blackColor"
-    :inactive-color="blackColor"
    :active-color="blackColor"
    :active-icon="Sun"
+    :border-color="blackColor"
+    :class="prefixCls"
+    :inactive-color="blackColor"
    :inactive-icon="CrescentMoon"
+    inline-prompt
    @change="themeChange"
  />
 </template>

--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
-<script setup lang="ts">
+<script lang="ts" name="UserInfo" setup>
 import { ElMessageBox } from 'element-plus'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'

--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -177,7 +177,9 @@ export const useRenderLayout = () => {
            class={[
              `${prefixCls}-content-scrollbar`,
              {
-                'mt-[var(--tags-view-height)]': fixedHeader.value
+                'mt-[var(--tags-view-height)] !pb-[calc(var(--tags-view-height)+var(--app-footer-height))]':
+                  fixedHeader.value,
+                'pb-[var(--app-footer-height)]': !fixedHeader.value
              }
            ]}
          >

--- a/src/main.ts
+++ b/src/main.ts
@@ -37,43 +37,16 @@ import App from './App.vue'
 import './permission'
-import { isDevMode } from '@/utils/env'
-import { MyPD } from '@/components/bpmnProcessDesigner/package/index.js'
-import '@/components/bpmnProcessDesigner/package/theme/index.scss'
-import 'bpmn-js/dist/assets/diagram-js.css'
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
-import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
-import hljs from 'highlight.js' //导入代码高亮文件
-import 'highlight.js/styles/github.css' //导入代码高亮样式  新版
 import '@/plugins/tongji' // 百度统计
 import Logger from '@/utils/Logger'
-// 本地开发模式 全局引入 element-plus 样式，加快第一次进入速度
-if (isDevMode()) {
-  import('element-plus/dist/index.css')
-}
 // 创建实例
 const setupAll = async () => {
  const app = createApp(App)
-  //自定义一个代码高亮指令
-  app.directive('highlight', function (el) {
-    const blocks = el.querySelectorAll('code')
-    blocks.forEach((block: any) => {
-      hljs.highlightElement(block)
-    })
-  })
  await setupI18n(app)
-  MyPD(app)
  setupStore(app)
  setupGlobCom(app)

--- a/src/plugins/formCreate/index.ts
+++ b/src/plugins/formCreate/index.ts
@@ -17,7 +17,6 @@ import {
 import formCreate from '@form-create/element-ui'
 import install from '@form-create/element-ui/auto-import'
-import FcDesigner from '@form-create/designer'
 const components = [
  ElAside,
@@ -34,14 +33,11 @@ const components = [
  ElTabPane
 ]
+// 参考 http://www.form-create.com/v3/element-ui/auto-import.html 文档
 export const setupFormCreate = (app: App<Element>) => {
  components.forEach((component) => {
    app.component(component.name, component)
  })
  formCreate.use(install)
  app.use(formCreate)
-  app.use(FcDesigner)
 }
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -313,7 +313,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
          hidden: true,
          canTo: true,
          title: '发起 OA 请假',
-          activeMenu: 'bpm/oa/leave/create'
+          activeMenu: '/bpm/oa/leave'
+        }
+      },
+      {
+        path: '/bpm/oa/leave/detail',
+        component: () => import('@/views/bpm/oa/leave/detail.vue'),
+        name: 'OALeaveDetail',
+        meta: {
+          noCache: true,
+          hidden: true,
+          canTo: true,
+          title: '查看 OA 请假',
+          activeMenu: '/bpm/oa/leave'
        }
      }
    ]

--- a/src/styles/index.scss
+++ b/src/styles/index.scss
 @import './var.css';
-@import './vxe.css';
 @import 'element-plus/theme-chalk/dark/css-vars.css';
 .reset-margin [class*='el-icon'] + span {

--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -2,5 +2,3 @@
 $namespace: v;
 // el命名空间
 $elNamespace: el;
-// vxe命名空间
-$vxeNamespace: vxe;
--- a/src/styles/vxe.css
+++ b/src/styles/vxe.css
-/*滚动条整体部分*/
-.xtable-scrollbar ::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-/*滚动条的轨道*/
-.xtable-scrollbar ::-webkit-scrollbar-track {
-  background-color: #ffffff;
-}
-/*滚动条里面的小方块，能向上向下移动*/
-.xtable-scrollbar ::-webkit-scrollbar-thumb {
-  background-color: #bfbfbf;
-  border-radius: 5px;
-  border: 1px solid #f1f1f1;
-  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-}
-.xtable-scrollbar ::-webkit-scrollbar-thumb:hover {
-  background-color: #a8a8a8;
-}
-.xtable-scrollbar ::-webkit-scrollbar-thumb:active {
-  background-color: #787878;
-}
-/*边角，即两个滚动条的交汇处*/
-.xtable-scrollbar ::-webkit-scrollbar-corner {
-  background-color: #ffffff;
-}
-/*移除 vxe-grid 右侧外框*/
-.vxe-button.size--medium.type--button.is--circle {
-  border: 0;
-}
--- a/src/types/auto-components.d.ts
+++ b/src/types/auto-components.d.ts
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-export {}
-declare module '@vue/runtime-core' {
-  export interface GlobalComponents {
-    Backtop: typeof import('./../components/Backtop/src/Backtop.vue')['default']
-    ConfigGlobal: typeof import('./../components/ConfigGlobal/src/ConfigGlobal.vue')['default']
-    ContentDetailWrap: typeof import('./../components/ContentDetailWrap/src/ContentDetailWrap.vue')['default']
-    ContentWrap: typeof import('./../components/ContentWrap/src/ContentWrap.vue')['default']
-    CopperModal: typeof import('./../components/Cropper/src/CopperModal.vue')['default']
-    CountTo: typeof import('./../components/CountTo/src/CountTo.vue')['default']
-    Crontab: typeof import('./../components/Crontab/src/Crontab.vue')['default']
-    Cropper: typeof import('./../components/Cropper/src/Cropper.vue')['default']
-    CropperAvatar: typeof import('./../components/Cropper/src/CropperAvatar.vue')['default']
-    Descriptions: typeof import('./../components/Descriptions/src/Descriptions.vue')['default']
-    Dialog: typeof import('./../components/Dialog/src/Dialog.vue')['default']
-    DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default']
-    DocAlert: typeof import('./../components/DocAlert/index.vue')['default']
-    Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
-    Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
-    ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
-    ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBadge: typeof import('element-plus/es')['ElBadge']
-    ElButton: typeof import('element-plus/es')['ElButton']
-    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
-    ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElementBaseInfo: typeof import('./../components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue')['default']
-    ElementForm: typeof import('./../components/bpmnProcessDesigner/package/penal/form/ElementForm.vue')['default']
-    ElementListeners: typeof import('./../components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue')['default']
-    ElementMultiInstance: typeof import('./../components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue')['default']
-    ElementOtherConfig: typeof import('./../components/bpmnProcessDesigner/package/penal/other/ElementOtherConfig.vue')['default']
-    ElementProperties: typeof import('./../components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue')['default']
-    ElementTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/ElementTask.vue')['default']
-    ElForm: typeof import('element-plus/es')['ElForm']
-    ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
-    ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRow: typeof import('element-plus/es')['ElRow']
-    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTableV2: typeof import('element-plus/es')['ElTableV2']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
-    ElTag: typeof import('element-plus/es')['ElTag']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
-    Error: typeof import('./../components/Error/src/Error.vue')['default']
-    FlowCondition: typeof import('./../components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue')['default']
-    Form: typeof import('./../components/Form/src/Form.vue')['default']
-    Highlight: typeof import('./../components/Highlight/src/Highlight.vue')['default']
-    Icon: typeof import('./../components/Icon/src/Icon.vue')['default']
-    IconSelect: typeof import('./../components/Icon/src/IconSelect.vue')['default']
-    IFrame: typeof import('./../components/IFrame/src/IFrame.vue')['default']
-    ImageViewer: typeof import('./../components/ImageViewer/src/ImageViewer.vue')['default']
-    Infotip: typeof import('./../components/Infotip/src/Infotip.vue')['default']
-    InputPassword: typeof import('./../components/InputPassword/src/InputPassword.vue')['default']
-    Pagination: typeof import('./../components/Pagination/index.vue')['default']
-    ProcessDesigner: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue')['default']
-    ProcessPalette: typeof import('./../components/bpmnProcessDesigner/package/palette/ProcessPalette.vue')['default']
-    ProcessViewer: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessViewer.vue')['default']
-    PropertiesPanel: typeof import('./../components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue')['default']
-    Qrcode: typeof import('./../components/Qrcode/src/Qrcode.vue')['default']
-    ReceiveTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue')['default']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    ScriptTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ScriptTask.vue')['default']
-    Search: typeof import('./../components/Search/src/Search.vue')['default']
-    SignalAndMessage: typeof import('./../components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue')['default']
-    Sticky: typeof import('./../components/Sticky/src/Sticky.vue')['default']
-    Table: typeof import('./../components/Table/src/Table.vue')['default']
-    Tooltip: typeof import('./../components/Tooltip/src/Tooltip.vue')['default']
-    UploadFile: typeof import('./../components/UploadFile/src/UploadFile.vue')['default']
-    UploadImg: typeof import('./../components/UploadFile/src/UploadImg.vue')['default']
-    UploadImgs: typeof import('./../components/UploadFile/src/UploadImgs.vue')['default']
-    UserTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue')['default']
-    UserTaskListeners: typeof import('./../components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue')['default']
-    Verify: typeof import('./../components/Verifition/src/Verify.vue')['default']
-    VerifyPoints: typeof import('./../components/Verifition/src/Verify/VerifyPoints.vue')['default']
-    VerifySlide: typeof import('./../components/Verifition/src/Verify/VerifySlide.vue')['default']
-    XButton: typeof import('./../components/XButton/src/XButton.vue')['default']
-    XTextButton: typeof import('./../components/XButton/src/XTextButton.vue')['default']
-  }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
-}
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-auto-import
-export {}
-declare global {
-  const DICT_TYPE: typeof import('@/utils/dict')['DICT_TYPE']
-  const EffectScope: typeof import('vue')['EffectScope']
-  const computed: typeof import('vue')['computed']
-  const createApp: typeof import('vue')['createApp']
-  const customRef: typeof import('vue')['customRef']
-  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
-  const defineComponent: typeof import('vue')['defineComponent']
-  const effectScope: typeof import('vue')['effectScope']
-  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
-  const getCurrentScope: typeof import('vue')['getCurrentScope']
-  const h: typeof import('vue')['h']
-  const inject: typeof import('vue')['inject']
-  const isProxy: typeof import('vue')['isProxy']
-  const isReactive: typeof import('vue')['isReactive']
-  const isReadonly: typeof import('vue')['isReadonly']
-  const isRef: typeof import('vue')['isRef']
-  const markRaw: typeof import('vue')['markRaw']
-  const nextTick: typeof import('vue')['nextTick']
-  const onActivated: typeof import('vue')['onActivated']
-  const onBeforeMount: typeof import('vue')['onBeforeMount']
-  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
-  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
-  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
-  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
-  const onDeactivated: typeof import('vue')['onDeactivated']
-  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
-  const onMounted: typeof import('vue')['onMounted']
-  const onRenderTracked: typeof import('vue')['onRenderTracked']
-  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
-  const onScopeDispose: typeof import('vue')['onScopeDispose']
-  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
-  const onUnmounted: typeof import('vue')['onUnmounted']
-  const onUpdated: typeof import('vue')['onUpdated']
-  const provide: typeof import('vue')['provide']
-  const reactive: typeof import('vue')['reactive']
-  const readonly: typeof import('vue')['readonly']
-  const ref: typeof import('vue')['ref']
-  const required: typeof import('@/utils/formRules')['required']
-  const resolveComponent: typeof import('vue')['resolveComponent']
-  const shallowReactive: typeof import('vue')['shallowReactive']
-  const shallowReadonly: typeof import('vue')['shallowReadonly']
-  const shallowRef: typeof import('vue')['shallowRef']
-  const toRaw: typeof import('vue')['toRaw']
-  const toRef: typeof import('vue')['toRef']
-  const toRefs: typeof import('vue')['toRefs']
-  const triggerRef: typeof import('vue')['triggerRef']
-  const unref: typeof import('vue')['unref']
-  const useAttrs: typeof import('vue')['useAttrs']
-  const useCrudSchemas: typeof import('@/hooks/web/useCrudSchemas')['useCrudSchemas']
-  const useCssModule: typeof import('vue')['useCssModule']
-  const useCssVars: typeof import('vue')['useCssVars']
-  const useI18n: typeof import('@/hooks/web/useI18n')['useI18n']
-  const useLink: typeof import('vue-router')['useLink']
-  const useMessage: typeof import('@/hooks/web/useMessage')['useMessage']
-  const useRoute: typeof import('vue-router')['useRoute']
-  const useRouter: typeof import('vue-router')['useRouter']
-  const useSlots: typeof import('vue')['useSlots']
-  const useTable: typeof import('@/hooks/web/useTable')['useTable']
-  const useVxeCrudSchemas: typeof import('@/hooks/web/useVxeCrudSchemas')['useVxeCrudSchemas']
-  const useXTable: typeof import('@/hooks/web/useXTable')['useXTable']
-  const watch: typeof import('vue')['watch']
-  const watchEffect: typeof import('vue')['watchEffect']
-  const watchPostEffect: typeof import('vue')['watchPostEffect']
-  const watchSyncEffect: typeof import('vue')['watchSyncEffect']
-}
-// for type re-export
-declare global {
-  // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
-}
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
-export const isDevMode = () => {
-  const dev = import.meta.env.VITE_DEV
-  if (dev && dev === 'true') {
-    return true
-  } else {
-    return false
-  }
-}
--- a/src/views/Error/403.vue
+++ b/src/views/Error/403.vue
 <template>
  <Error type="403" @error-click="push('/')" />
 </template>
-<script setup lang="ts">
+<script lang="ts" name="Error403" setup>
 const { push } = useRouter()
 </script>
--- a/src/views/Error/404.vue
+++ b/src/views/Error/404.vue
 <template>
  <Error @error-click="push('/')" />
 </template>
-<script setup lang="ts">
+<script lang="ts" name="Error404" setup>
 const { push } = useRouter()
 </script>
--- a/src/views/Error/500.vue
+++ b/src/views/Error/500.vue
 <template>
  <Error type="500" @error-click="push('/')" />
 </template>
-<script setup lang="ts">
+<script lang="ts" name="Error500" setup>
 const { push } = useRouter()
 </script>
--- a/src/views/Home/Index2.vue
+++ b/src/views/Home/Index2.vue
 <template>
-  <el-row :gutter="20" justify="space-between" :class="prefixCls">
+  <el-row :class="prefixCls" :gutter="20" justify="space-between">
-    <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
-        <el-skeleton :loading="loading" animated :rows="2">
+        <el-skeleton :loading="loading" :rows="2" animated>
          <template #default>
            <div :class="`${prefixCls}__item flex justify-between`">
              <div>
                <div
                  :class="`${prefixCls}__item--icon ${prefixCls}__item--peoples p-16px inline-block rounded-6px`"
                >
-                  <Icon icon="svg-icon:peoples" :size="40" />
+                  <Icon :size="40" icon="svg-icon:peoples" />
                </div>
              </div>
              <div class="flex flex-col justify-between">
-                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`">{{
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
-                  t('analysis.newUser')
+                  >{{ t('analysis.newUser') }}
-                }}</div>
+                </div>
                <CountTo
-                  class="text-20px font-700 text-right"
-                  :start-val="0"
-                  :end-val="102400"
                  :duration="2600"
+                  :end-val="102400"
+                  :start-val="0"
+                  class="text-20px font-700 text-right"
                />
              </div>
            </div>
@@ -29,27 +29,27 @@
      </el-card>
    </el-col>
-    <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
-        <el-skeleton :loading="loading" animated :rows="2">
+        <el-skeleton :loading="loading" :rows="2" animated>
          <template #default>
            <div :class="`${prefixCls}__item flex justify-between`">
              <div>
                <div
                  :class="`${prefixCls}__item--icon ${prefixCls}__item--message p-16px inline-block rounded-6px`"
                >
-                  <Icon icon="svg-icon:message" :size="40" />
+                  <Icon :size="40" icon="svg-icon:message" />
                </div>
              </div>
              <div class="flex flex-col justify-between">
-                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`">{{
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
-                  t('analysis.unreadInformation')
+                  >{{ t('analysis.unreadInformation') }}
-                }}</div>
+                </div>
                <CountTo
-                  class="text-20px font-700 text-right"
-                  :start-val="0"
-                  :end-val="81212"
                  :duration="2600"
+                  :end-val="81212"
+                  :start-val="0"
+                  class="text-20px font-700 text-right"
                />
              </div>
            </div>
@@ -58,27 +58,27 @@
      </el-card>
    </el-col>
-    <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
-        <el-skeleton :loading="loading" animated :rows="2">
+        <el-skeleton :loading="loading" :rows="2" animated>
          <template #default>
            <div :class="`${prefixCls}__item flex justify-between`">
              <div>
                <div
                  :class="`${prefixCls}__item--icon ${prefixCls}__item--money p-16px inline-block rounded-6px`"
                >
-                  <Icon icon="svg-icon:money" :size="40" />
+                  <Icon :size="40" icon="svg-icon:money" />
                </div>
              </div>
              <div class="flex flex-col justify-between">
-                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`">{{
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
-                  t('analysis.transactionAmount')
+                  >{{ t('analysis.transactionAmount') }}
-                }}</div>
+                </div>
                <CountTo
-                  class="text-20px font-700 text-right"
-                  :start-val="0"
-                  :end-val="9280"
                  :duration="2600"
+                  :end-val="9280"
+                  :start-val="0"
+                  class="text-20px font-700 text-right"
                />
              </div>
            </div>
@@ -87,27 +87,27 @@
      </el-card>
    </el-col>
-    <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+    <el-col :lg="6" :md="12" :sm="12" :xl="6" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
-        <el-skeleton :loading="loading" animated :rows="2">
+        <el-skeleton :loading="loading" :rows="2" animated>
          <template #default>
            <div :class="`${prefixCls}__item flex justify-between`">
              <div>
                <div
                  :class="`${prefixCls}__item--icon ${prefixCls}__item--shopping p-16px inline-block rounded-6px`"
                >
-                  <Icon icon="svg-icon:shopping" :size="40" />
+                  <Icon :size="40" icon="svg-icon:shopping" />
                </div>
              </div>
              <div class="flex flex-col justify-between">
-                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`">{{
+                <div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
-                  t('analysis.totalShopping')
+                  >{{ t('analysis.totalShopping') }}
-                }}</div>
+                </div>
                <CountTo
-                  class="text-20px font-700 text-right"
-                  :start-val="0"
-                  :end-val="13600"
                  :duration="2600"
+                  :end-val="13600"
+                  :start-val="0"
+                  class="text-20px font-700 text-right"
                />
              </div>
            </div>
@@ -117,36 +117,36 @@
    </el-col>
  </el-row>
  <el-row :gutter="20" justify="space-between">
-    <el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
+    <el-col :lg="10" :md="24" :sm="24" :xl="10" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
        <el-skeleton :loading="loading" animated>
-          <Echart :options="pieOptionsData" :height="300" />
+          <Echart :height="300" :options="pieOptionsData" />
        </el-skeleton>
      </el-card>
    </el-col>
-    <el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
+    <el-col :lg="14" :md="24" :sm="24" :xl="14" :xs="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
        <el-skeleton :loading="loading" animated>
-          <Echart :options="barOptionsData" :height="300" />
+          <Echart :height="300" :options="barOptionsData" />
        </el-skeleton>
      </el-card>
    </el-col>
    <el-col :span="24">
-      <el-card shadow="hover" class="mb-20px">
+      <el-card class="mb-20px" shadow="hover">
-        <el-skeleton :loading="loading" animated :rows="4">
+        <el-skeleton :loading="loading" :rows="4" animated>
-          <Echart :options="lineOptionsData" :height="350" />
+          <Echart :height="350" :options="lineOptionsData" />
        </el-skeleton>
      </el-card>
    </el-col>
  </el-row>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="Home2" setup>
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 import { useDesign } from '@/hooks/web/useDesign'
 import type { AnalysisTotalTypes } from './types'
-import { pieOptions, barOptions, lineOptions } from './echarts-data'
+import { barOptions, lineOptions, pieOptions } from './echarts-data'
 const { t } = useI18n()
 const loading = ref(true)
@@ -291,18 +291,23 @@ $prefix-cls: #{$namespace}-panel;
      :deep(.#{$namespace}-icon) {
        color: #fff !important;
      }
      .#{$prefix-cls}__item--icon {
        transition: all 0.38s ease-out;
      }
      .#{$prefix-cls}__item--peoples {
        background: #40c9c6;
      }
      .#{$prefix-cls}__item--message {
        background: #36a3f7;
      }
      .#{$prefix-cls}__item--money {
        background: #f4516c;
      }
      .#{$prefix-cls}__item--shopping {
        background: #34bfa3;
      }

--- a/src/views/Login/Login.vue
+++ b/src/views/Login/Login.vue
@@ -60,7 +60,7 @@
    </div>
  </div>
 </template>
-<script lang="ts" setup>
+<script lang="ts" name="Login" setup>
 import { underlineToHump } from '@/utils'
 import { useDesign } from '@/hooks/web/useDesign'

--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
 <template>
  <el-form
+    v-show="getShow"
+    ref="formLogin"
    :model="loginData.loginForm"
    :rules="LoginRules"
-    label-position="top"
    class="login-form"
+    label-position="top"
    label-width="120px"
    size="large"
-    v-show="getShow"
-    ref="formLogin"
  >
    <el-row style="maring-left: -10px; maring-right: -10px">
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
@@ -16,12 +16,13 @@
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-        <el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
+        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
          <el-input
-            type="text"
            v-model="loginData.loginForm.tenantName"
            :placeholder="t('login.tenantNamePlaceholder')"
            :prefix-icon="iconHouse"
+            type="primary"
+            link
          />
        </el-form-item>
      </el-col>
@@ -38,11 +39,11 @@
        <el-form-item prop="password">
          <el-input
            v-model="loginData.loginForm.password"
-            type="password"
            :placeholder="t('login.passwordPlaceholder')"
+            :prefix-icon="iconLock"
            show-password
+            type="password"
            @keyup.enter="getCode()"
-            :prefix-icon="iconLock"
          />
        </el-form-item>
      </el-col>
@@ -57,8 +58,8 @@
                {{ t('login.remember') }}
              </el-checkbox>
            </el-col>
-            <el-col :span="12" :offset="6">
+            <el-col :offset="6" :span="12">
-              <el-link type="primary" style="float: right">{{ t('login.forgetPassword') }}</el-link>
+              <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
            </el-col>
          </el-row>
        </el-form-item>
@@ -67,41 +68,41 @@
        <el-form-item>
          <XButton
            :loading="loginLoading"
-            type="primary"
-            class="w-[100%]"
            :title="t('login.login')"
+            class="w-[100%]"
+            type="primary"
            @click="getCode()"
          />
        </el-form-item>
      </el-col>
      <Verify
        ref="verify"
-        mode="pop"
        :captchaType="captchaType"
        :imgSize="{ width: '400px', height: '200px' }"
+        mode="pop"
        @success="handleLogin"
      />
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
        <el-form-item>
-          <el-row justify="space-between" style="width: 100%" :gutter="5">
+          <el-row :gutter="5" justify="space-between" style="width: 100%">
            <el-col :span="8">
              <XButton
-                class="w-[100%]"
                :title="t('login.btnMobile')"
+                class="w-[100%]"
                @click="setLoginState(LoginStateEnum.MOBILE)"
              />
            </el-col>
            <el-col :span="8">
              <XButton
-                class="w-[100%]"
                :title="t('login.btnQRCode')"
+                class="w-[100%]"
                @click="setLoginState(LoginStateEnum.QR_CODE)"
              />
            </el-col>
            <el-col :span="8">
              <XButton
-                class="w-[100%]"
                :title="t('login.btnRegister')"
+                class="w-[100%]"
                @click="setLoginState(LoginStateEnum.REGISTER)"
              />
            </el-col>
@@ -127,7 +128,7 @@
    </el-row>
  </el-form>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="LoginForm" setup>
 import { ElLoading } from 'element-plus'
 import LoginFormTitle from './LoginFormTitle.vue'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'

--- a/src/views/Login/components/LoginFormTitle.vue
+++ b/src/views/Login/components/LoginFormTitle.vue
@@ -3,7 +3,7 @@
    {{ getFormTitle }}
  </h2>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="LoginFormTitle" setup>
 import { LoginStateEnum, useLoginState } from './useLogin'
 const { t } = useI18n()

--- a/src/views/Login/components/MobileForm.vue
+++ b/src/views/Login/components/MobileForm.vue
 <template>
  <el-form
+    v-show="getShow"
+    ref="formSmsLogin"
    :model="loginData.loginForm"
    :rules="rules"
-    label-position="top"
    class="login-form"
+    label-position="top"
    label-width="120px"
    size="large"
-    v-show="getShow"
-    ref="formSmsLogin"
  >
    <el-row style="margin-left: -10px; margin-right: -10px">
      <!-- 租户名 -->
@@ -17,12 +17,13 @@
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-        <el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
+        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
          <el-input
-            type="text"
            v-model="loginData.loginForm.tenantName"
            :placeholder="t('login.tenantNamePlaceholder')"
            :prefix-icon="iconHouse"
+            type="primary"
+            link
          />
        </el-form-item>
      </el-col>
@@ -39,7 +40,7 @@
      <!-- 验证码 -->
      <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
        <el-form-item prop="code">
-          <el-row justify="space-between" style="width: 100%" :gutter="5">
+          <el-row :gutter="5" justify="space-between" style="width: 100%">
            <el-col :span="24">
              <el-input
                v-model="loginData.loginForm.code"
@@ -50,9 +51,9 @@
                <template #append>
                  <span
                    v-if="mobileCodeTimer <= 0"
-                    @click="getSmsCode"
                    class="getMobileCode"
                    style="cursor: pointer"
+                    @click="getSmsCode"
                  >
                    {{ t('login.getSmsCode') }}
                  </span>
@@ -71,9 +72,9 @@
        <el-form-item>
          <XButton
            :loading="loginLoading"
-            type="primary"
-            class="w-[100%]"
            :title="t('login.login')"
+            class="w-[100%]"
+            type="primary"
            @click="signIn()"
          />
        </el-form-item>
@@ -82,8 +83,8 @@
        <el-form-item>
          <XButton
            :loading="loginLoading"
-            class="w-[100%]"
            :title="t('login.backLogin')"
+            class="w-[100%]"
            @click="handleBackLogin()"
          />
        </el-form-item>
@@ -91,7 +92,7 @@
    </el-row>
  </el-form>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="MobileForm" setup>
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
 import { useIcon } from '@/hooks/web/useIcon'
@@ -100,7 +101,7 @@ import { setTenantId, setToken } from '@/utils/auth'
 import { usePermissionStore } from '@/store/modules/permission'
 import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
 import LoginFormTitle from './LoginFormTitle.vue'
-import { useLoginState, LoginStateEnum, useFormValid } from './useLogin'
+import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
 const { t } = useI18n()
 const message = useMessage()

--- a/src/views/Login/components/QrCodeForm.vue
+++ b/src/views/Login/components/QrCodeForm.vue
@@ -4,23 +4,23 @@
      <LoginFormTitle style="width: 100%" />
    </el-col>
    <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-      <el-card shadow="hover" class="mb-10px text-center">
+      <el-card class="mb-10px text-center" shadow="hover">
        <Qrcode :logo="logoImg" />
      </el-card>
    </el-col>
    <el-divider class="enter-x">{{ t('login.qrcode') }}</el-divider>
    <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
      <div class="w-[100%] mt-15px">
-        <XButton class="w-[100%]" :title="t('login.backLogin')" @click="handleBackLogin()" />
+        <XButton :title="t('login.backLogin')" class="w-[100%]" @click="handleBackLogin()" />
      </div>
    </el-col>
  </el-row>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="QrCodeForm" setup>
 import logoImg from '@/assets/imgs/logo.png'
 import LoginFormTitle from './LoginFormTitle.vue'
-import { useLoginState, LoginStateEnum } from './useLogin'
+import { LoginStateEnum, useLoginState } from './useLogin'
 const { t } = useI18n()
 const { handleBackLogin, getLoginState } = useLoginState()

--- a/src/views/Login/components/RegisterForm.vue
+++ b/src/views/Login/components/RegisterForm.vue
 <template>
  <Form
-    :schema="schema"
+    v-show="getShow"
    :rules="rules"
-    label-position="top"
+    :schema="schema"
+    class="dark:(border-1 border-[var(--el-border-color)] border-solid)"
    hide-required-asterisk
+    label-position="top"
    size="large"
-    v-show="getShow"
-    class="dark:(border-1 border-[var(--el-border-color)] border-solid)"
    @register="register"
  >
    <template #title>
@@ -23,25 +23,25 @@
      <div class="w-[100%]">
        <XButton
          :loading="loading"
-          type="primary"
-          class="w-[100%]"
          :title="t('login.register')"
+          class="w-[100%]"
+          type="primary"
          @click="loginRegister()"
        />
      </div>
      <div class="w-[100%] mt-15px">
-        <XButton class="w-[100%]" :title="t('login.hasUser')" @click="handleBackLogin()" />
+        <XButton :title="t('login.hasUser')" class="w-[100%]" @click="handleBackLogin()" />
      </div>
    </template>
  </Form>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="RegisterForm" setup>
 import type { FormRules } from 'element-plus'
 import { useForm } from '@/hooks/web/useForm'
 import { useValidator } from '@/hooks/web/useValidator'
 import LoginFormTitle from './LoginFormTitle.vue'
-import { useLoginState, LoginStateEnum } from './useLogin'
+import { LoginStateEnum, useLoginState } from './useLogin'
 import { FormSchema } from '@/types/form'
 const { t } = useI18n()

--- a/src/views/Profile/components/BasicInfo.vue
+++ b/src/views/Profile/components/BasicInfo.vue
 <template>
-  <Form ref="formRef" :rules="rules" :schema="schema" :labelWidth="80">
+  <Form ref="formRef" :labelWidth="80" :rules="rules" :schema="schema">
    <template #sex="form">
      <el-radio-group v-model="form['sex']">
        <el-radio :label="1">{{ t('profile.user.man') }}</el-radio>
@@ -8,9 +8,9 @@
    </template>
  </Form>
  <XButton :title="t('common.save')" @click="submit()" />
-  <XButton type="danger" :title="t('common.reset')" @click="init()" />
+  <XButton :title="t('common.reset')" type="danger" @click="init()" />
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BasicInfo" setup>
 import type { FormRules } from 'element-plus'
 import { ElMessage } from 'element-plus'

--- a/src/views/Profile/components/ProfileUser.vue
+++ b/src/views/Profile/components/ProfileUser.vue
@@ -5,41 +5,48 @@
    </div>
    <ul class="list-group list-group-striped">
      <li class="list-group-item">
-        <Icon icon="ep:user" class="mr-5px" />{{ t('profile.user.username') }}
+        <Icon class="mr-5px" icon="ep:user" />
+        {{ t('profile.user.username') }}
        <div class="pull-right">{{ userInfo?.username }}</div>
      </li>
      <li class="list-group-item">
-        <Icon icon="ep:phone" class="mr-5px" />{{ t('profile.user.mobile') }}
+        <Icon class="mr-5px" icon="ep:phone" />
+        {{ t('profile.user.mobile') }}
        <div class="pull-right">{{ userInfo?.mobile }}</div>
      </li>
      <li class="list-group-item">
-        <Icon icon="fontisto:email" class="mr-5px" />{{ t('profile.user.email') }}
+        <Icon class="mr-5px" icon="fontisto:email" />
+        {{ t('profile.user.email') }}
        <div class="pull-right">{{ userInfo?.email }}</div>
      </li>
      <li class="list-group-item">
-        <Icon icon="carbon:tree-view-alt" class="mr-5px" />{{ t('profile.user.dept') }}
+        <Icon class="mr-5px" icon="carbon:tree-view-alt" />
-        <div class="pull-right" v-if="userInfo?.dept">{{ userInfo?.dept.name }}</div>
+        {{ t('profile.user.dept') }}
+        <div v-if="userInfo?.dept" class="pull-right">{{ userInfo?.dept.name }}</div>
      </li>
      <li class="list-group-item">
-        <Icon icon="ep:suitcase" class="mr-5px" />{{ t('profile.user.posts') }}
+        <Icon class="mr-5px" icon="ep:suitcase" />
-        <div class="pull-right" v-if="userInfo?.posts">
+        {{ t('profile.user.posts') }}
+        <div v-if="userInfo?.posts" class="pull-right">
          {{ userInfo?.posts.map((post) => post.name).join(',') }}
        </div>
      </li>
      <li class="list-group-item">
-        <Icon icon="icon-park-outline:peoples" class="mr-5px" />{{ t('profile.user.roles') }}
+        <Icon class="mr-5px" icon="icon-park-outline:peoples" />
-        <div class="pull-right" v-if="userInfo?.roles">
+        {{ t('profile.user.roles') }}
+        <div v-if="userInfo?.roles" class="pull-right">
          {{ userInfo?.roles.map((role) => role.name).join(',') }}
        </div>
      </li>
      <li class="list-group-item">
-        <Icon icon="ep:calendar" class="mr-5px" />{{ t('profile.user.createTime') }}
+        <Icon class="mr-5px" icon="ep:calendar" />
+        {{ t('profile.user.createTime') }}
        <div class="pull-right">{{ formatDate(userInfo?.createTime) }}</div>
      </li>
    </ul>
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="ProfileUser" setup>
 import { formatDate } from '@/utils/formatTime'
 import UserAvatar from './UserAvatar.vue'
@@ -62,6 +69,7 @@ onMounted(async () => {
  position: relative;
  height: 120px;
 }
 .list-group-striped > .list-group-item {
  border-left: 0;
  border-right: 0;
@@ -82,6 +90,7 @@ onMounted(async () => {
  padding: 11px 0px;
  font-size: 13px;
 }
 .pull-right {
  float: right !important;
 }

--- a/src/views/Profile/components/ResetPwd.vue
+++ b/src/views/Profile/components/ResetPwd.vue
@@ -10,13 +10,13 @@
      <InputPassword v-model="password.confirmPassword" strength />
    </el-form-item>
    <el-form-item>
-      <XButton type="primary" @click="submit(formRef)" :title="t('common.save')" />
+      <XButton :title="t('common.save')" type="primary" @click="submit(formRef)" />
-      <XButton type="danger" :title="t('common.reset')" @click="reset(formRef)" />
+      <XButton :title="t('common.reset')" type="danger" @click="reset(formRef)" />
    </el-form-item>
  </el-form>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="ResetPwd" setup>
-import type { FormRules, FormInstance } from 'element-plus'
+import type { FormInstance, FormRules } from 'element-plus'
 import { InputPassword } from '@/components/InputPassword'
 import { updateUserPassword } from '@/api/system/user/profile'

--- a/src/views/Profile/components/UserAvatar.vue
+++ b/src/views/Profile/components/UserAvatar.vue
@@ -2,17 +2,18 @@
  <div class="change-avatar">
    <CropperAvatar
      ref="cropperRef"
-      :value="avatar"
-      :showBtn="false"
-      @change="handelUpload"
      :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
+      :showBtn="false"
+      :value="avatar"
      width="120px"
+      @change="handelUpload"
    />
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="UserAvatar" setup>
 import { propTypes } from '@/utils/propTypes'
 import { uploadAvatar } from '@/api/system/user/profile'
 const props = defineProps({
  img: propTypes.string.def('')
 })
@@ -27,7 +28,7 @@ const handelUpload = async ({ data }) => {
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .change-avatar {
  img {
    display: block;

--- a/src/views/Profile/components/UserSocial.vue
+++ b/src/views/Profile/components/UserSocial.vue
 <template>
  <el-table :data="socialUsers" :show-header="false">
-    <el-table-column type="seq" title="序号" width="60" fixed="left" />
+    <el-table-column fixed="left" title="序号" type="seq" width="60" />
-    <el-table-column label="社交平台" align="left" width="120">
+    <el-table-column align="left" label="社交平台" width="120">
      <template #default="{ row }">
-        <img class="h-5 align-middle" :src="row.img" alt="" />
+        <img :src="row.img" alt="" class="h-5 align-middle" />
        <p class="mr-5">{{ row.title }}</p>
      </template>
    </el-table-column>
-    <el-table-column label="操作" align="center">
+    <el-table-column align="center" label="操作">
      <template #default="{ row }">
        <template v-if="row.openid">
          已绑定
-          <XTextButton type="primary" class="mr-5" @click="unbind(row)" title="(解绑)" />
+          <XTextButton class="mr-5" title="(解绑)" type="primary" @click="unbind(row)" />
        </template>
        <template v-else>
          未绑定
-          <XTextButton type="primary" class="mr-5" @click="bind(row)" title="(绑定)" />
+          <XTextButton class="mr-5" title="(绑定)" type="primary" @click="bind(row)" />
        </template>
      </template>
    </el-table-column>
  </el-table>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="UserSocial" setup>
 import { SystemUserSocialTypeEnum } from '@/utils/constants'
 import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
-import { socialAuthRedirect, socialUnbind } from '@/api/system/user/socialUser'
+import { socialAuthRedirect, socialBind, socialUnbind } from '@/api/system/user/socialUser'
 const message = useMessage()
 const socialUsers = ref<any[]>([])
@@ -46,11 +46,25 @@ const initSocial = async () => {
    }
  }
 }
+const route = useRoute()
+const bindSocial = () => {
+  // 社交绑定
+  const type = route.query.type
+  const code = route.query.code
+  const state = route.query.state
+  if (!code) {
+    return
+  }
+  socialBind(type, code, state).then(() => {
+    message.success('绑定成功')
+    initSocial()
+  })
+}
 const bind = (row) => {
  const redirectUri = location.origin + '/user/profile?type=' + row.type
  // 进行跳转
  socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {
-    window.location.href = res.data
+    window.location.href = res
  })
 }
 const unbind = async (row) => {
@@ -64,4 +78,15 @@ const unbind = async (row) => {
 onMounted(async () => {
  await initSocial()
 })
+watch(
+  () => route,
+  (newRoute) => {
+    bindSocial()
+    console.log(newRoute)
+  },
+  {
+    immediate: true
+  }
+)
 </script>
--- a/src/views/bpm/definition/index.vue
+++ b/src/views/bpm/definition/index.vue
@@ -18,7 +18,8 @@
        <template #default="scope">
          <el-button
            v-if="scope.row.formType === 10"
-            type="text"
+            type="primary"
+            link
            @click="handleFormDetail(scope.row)"
          >
            <span>{{ scope.row.formName }}</span>
@@ -83,7 +84,7 @@
  <!-- 弹窗：流程模型图的预览 -->
  <Dialog title="流程图" v-model="bpmnDetailVisible" width="800">
-    <my-process-viewer
+    <MyProcessViewer
      key="designer"
      v-model="bpmnXML"
      :value="bpmnXML"
@@ -96,6 +97,7 @@
 <script setup lang="ts" name="BpmProcessDefinition">
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
 import * as DefinitionApi from '@/api/bpm/definition'
 import { setConfAndFields2 } from '@/utils/formCreate'
 const { push } = useRouter() // 路由

--- a/src/views/bpm/form/editor/index.vue
+++ b/src/views/bpm/form/editor/index.vue
 <template>
  <ContentWrap>
    <!-- 表单设计器 -->
-    <fc-designer ref="designer" height="780px">
+    <FcDesigner ref="designer" height="780px">
      <template #handle>
        <el-button round size="small" type="primary" @click="handleSave">
-          <Icon icon="ep:plus" class="mr-5px" /> 保存
+          <Icon class="mr-5px" icon="ep:plus" />
+          保存
        </el-button>
      </template>
-    </fc-designer>
+    </FcDesigner>
  </ContentWrap>
  <!-- 表单保存的弹窗 -->
-  <Dialog title="保存表单" v-model="dialogVisible" width="600">
+  <Dialog v-model="dialogVisible" title="保存表单" width="600">
    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
      <el-form-item label="表单名" prop="name">
        <el-input v-model="formData.name" placeholder="请输入表单名" />
@@ -28,19 +29,20 @@
        </el-radio-group>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
      </el-form-item>
    </el-form>
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmFormEditor" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as FormApi from '@/api/bpm/form'
+import FcDesigner from '@form-create/designer'
 import { encodeConf, encodeFields, setConfAndFields } from '@/utils/formCreate'
 const { t } = useI18n() // 国际化

--- a/src/views/bpm/group/UserGroupForm.vue
+++ b/src/views/bpm/group/UserGroupForm.vue
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
    <el-form
      ref="formRef"
+      v-loading="formLoading"
      :model="formData"
      :rules="formRules"
      label-width="100px"
-      v-loading="formLoading"
    >
      <el-form-item label="组名" prop="name">
        <el-input v-model="formData.name" placeholder="请输入组名" />
      </el-form-item>
      <el-form-item label="描述">
-        <el-input type="textarea" v-model="formData.name" placeholder="请输入描述" />
+        <el-input v-model="formData.name" placeholder="请输入描述" type="textarea" />
      </el-form-item>
      <el-form-item label="成员" prop="memberUserIds">
        <el-select v-model="formData.memberUserIds" multiple placeholder="请选择成员">
@@ -36,12 +36,12 @@
      </el-form-item>
    </el-form>
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="UserGroupForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as UserGroupApi from '@/api/bpm/userGroup'

--- a/src/views/bpm/model/ModelForm.vue
+++ b/src/views/bpm/model/ModelForm.vue
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="600">
    <el-form
      ref="formRef"
+      v-loading="formLoading"
      :model="formData"
      :rules="formRules"
      label-width="110px"
-      v-loading="formLoading"
    >
      <el-form-item label="流程标识" prop="key">
        <el-input
          v-model="formData.key"
+          :disabled="!!formData.id"
          placeholder="请输入流标标识"
          style="width: 330px"
-          :disabled="!!formData.id"
        />
        <el-tooltip
          v-if="!formData.id"
          class="item"
-          effect="light"
          content="新建后，流程标识不可修改！"
+          effect="light"
          placement="top"
        >
-          <i style="padding-left: 5px" class="el-icon-question"></i>
+          <i class="el-icon-question" style="padding-left: 5px"></i>
        </el-tooltip>
-        <el-tooltip v-else class="item" effect="light" content="流程标识不可修改！" placement="top">
+        <el-tooltip v-else class="item" content="流程标识不可修改！" effect="light" placement="top">
-          <i style="padding-left: 5px" class="el-icon-question"></i>
+          <i class="el-icon-question" style="padding-left: 5px"></i>
        </el-tooltip>
      </el-form-item>
      <el-form-item label="流程名称" prop="name">
        <el-input
          v-model="formData.name"
-          placeholder="请输入流程名称"
          :disabled="!!formData.id"
          clearable
+          placeholder="请输入流程名称"
        />
      </el-form-item>
      <el-form-item v-if="formData.id" label="流程分类" prop="category">
        <el-select
          v-model="formData.category"
-          placeholder="请选择流程分类"
          clearable
+          placeholder="请选择流程分类"
          style="width: 100%"
        >
          <el-option
@@ -51,7 +51,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="流程描述" prop="description">
-        <el-input type="textarea" v-model="formData.description" clearable />
+        <el-input v-model="formData.description" clearable type="textarea" />
      </el-form-item>
      <div v-if="formData.id">
        <el-form-item label="表单类型" prop="formType">
@@ -87,11 +87,11 @@
          />
          <el-tooltip
            class="item"
-            effect="light"
            content="自定义表单的提交路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/create"
+            effect="light"
            placement="top"
          >
-            <i style="padding-left: 5px" class="el-icon-question"></i>
+            <i class="el-icon-question" style="padding-left: 5px"></i>
          </el-tooltip>
        </el-form-item>
        <el-form-item
@@ -106,26 +106,27 @@
          />
          <el-tooltip
            class="item"
-            effect="light"
            content="自定义表单的查看路径，使用 Vue 的路由地址，例如说：bpm/oa/leave/view"
+            effect="light"
            placement="top"
          >
-            <i style="padding-left: 5px" class="el-icon-question"></i>
+            <i class="el-icon-question" style="padding-left: 5px"></i>
          </el-tooltip>
        </el-form-item>
      </div>
    </el-form>
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="ModelForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { ElMessageBox } from 'element-plus'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/views/bpm/model/ModelImportForm.vue
+++ b/src/views/bpm/model/ModelImportForm.vue
 <template>
-  <Dialog title="导入流程" v-model="dialogVisible" width="400">
+  <Dialog v-model="dialogVisible" title="导入流程" width="400">
    <div>
      <el-upload
        ref="uploadRef"
-        :action="importUrl"
-        :headers="uploadHeaders"
-        :data="formData"
-        name="bpmnFile"
        v-model:file-list="fileList"
-        drag
+        :action="importUrl"
        :auto-upload="false"
-        accept=".bpmn, .xml"
+        :data="formData"
+        :disabled="formLoading"
+        :headers="uploadHeaders"
        :limit="1"
+        :on-error="submitFormError"
        :on-exceed="handleExceed"
        :on-success="submitFormSuccess"
-        :on-error="submitFormError"
+        accept=".bpmn, .xml"
-        :disabled="formLoading"
+        drag
+        name="bpmnFile"
      >
        <Icon class="el-icon--upload" icon="ep:upload-filled" />
-        <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em> </div>
+        <div class="el-upload__text"> 将文件拖到此处，或 <em>点击上传</em></div>
        <template #tip>
          <div class="el-upload__tip" style="color: red">
            提示：仅允许导入“bpm”或“xml”格式文件！
@@ -33,10 +33,10 @@
                />
              </el-form-item>
              <el-form-item label="流程名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入流程名称" clearable />
+                <el-input v-model="formData.name" clearable placeholder="请输入流程名称" />
              </el-form-item>
              <el-form-item label="流程描述" prop="description">
-                <el-input type="textarea" v-model="formData.description" clearable />
+                <el-input v-model="formData.description" clearable type="textarea" />
              </el-form-item>
            </el-form>
          </div>
@@ -44,13 +44,14 @@
      </el-upload>
    </div>
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="ModelImportForm" setup>
 import { getAccessToken, getTenantId } from '@/utils/auth'
 const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示

--- a/src/views/bpm/model/editor/index.vue
+++ b/src/views/bpm/model/editor/index.vue
 <template>
  <ContentWrap>
    <!-- 流程设计器，负责绘制流程等 -->
-    <my-process-designer
+    <MyProcessDesigner
      key="designer"
      v-if="xmlString !== undefined"
      v-model="xmlString"
@@ -14,7 +14,7 @@
      @save="save"
    />
    <!-- 流程属性器，负责编辑每个流程节点的属性 -->
-    <my-properties-panel
+    <MyProcessPenal
      key="penal"
      :bpmnModeler="modeler"
      :prefix="controlForm.prefix"
@@ -25,6 +25,7 @@
 </template>
 <script setup lang="ts" name="BpmModelEditor">
+import { MyProcessDesigner, MyProcessPenal } from '@/components/bpmnProcessDesigner/package'
 // 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
 import CustomContentPadProvider from '@/components/bpmnProcessDesigner/package/designer/plugins/content-pad'
 // 自定义左侧菜单（修改 默认任务 为 用户任务）

--- a/src/views/bpm/model/index.vue
+++ b/src/views/bpm/model/index.vue
@@ -79,14 +79,16 @@
        <template #default="scope">
          <el-button
            v-if="scope.row.formType === 10"
-            type="text"
+            type="primary"
+            link
            @click="handleFormDetail(scope.row)"
          >
            <span>{{ scope.row.formName }}</span>
          </el-button>
          <el-button
            v-else-if="scope.row.formType === 20"
-            type="text"
+            type="primary"
+            link
            @click="handleFormDetail(scope.row)"
          >
            <span>{{ scope.row.formCustomCreatePath }}</span>
@@ -214,7 +216,7 @@
  <!-- 弹窗：流程模型图的预览 -->
  <Dialog title="流程图" v-model="bpmnDetailVisible" width="800">
-    <my-process-viewer
+    <MyProcessViewer
      key="designer"
      v-model="bpmnXML"
      :value="bpmnXML"
@@ -227,6 +229,7 @@
 <script setup lang="ts" name="BpmModel">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
 import * as ModelApi from '@/api/bpm/model'
 import * as FormApi from '@/api/bpm/form'
 import ModelForm from './ModelForm.vue'

--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
 <template>
-  <Dialog title="发起 OA 请假流程" v-model="dialogVisible">
+  <el-form
-    <el-form
+    ref="formRef"
-      ref="formRef"
+    :model="formData"
-      :model="formData"
+    :rules="formRules"
-      :rules="formRules"
+    label-width="80px"
-      label-width="80px"
+    v-loading="formLoading"
-      v-loading="formLoading"
+  >
-    >
+    <el-form-item label="请假类型" prop="type">
-      <el-form-item label="请假类型" prop="type">
+      <el-select v-model="formData.type" placeholder="请选择请假类型" clearable>
-        <el-select v-model="formData.type" placeholder="请选择请假类型" clearable>
+        <el-option
-          <el-option
+          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
-            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
+          :key="dict.value"
-            :key="dict.value"
+          :label="dict.label"
-            :label="dict.label"
+          :value="dict.value"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker
-          clearable
-          v-model="formData.startTime"
-          type="datetime"
-          value-format="x"
-          placeholder="请选择开始时间"
        />
-      </el-form-item>
+      </el-select>
-      <el-form-item label="结束时间" prop="endTime">
+    </el-form-item>
-        <el-date-picker
+    <el-form-item label="开始时间" prop="startTime">
-          clearable
+      <el-date-picker
-          v-model="formData.endTime"
+        clearable
-          type="datetime"
+        v-model="formData.startTime"
-          value-format="x"
+        type="datetime"
-          placeholder="请选择结束时间"
+        value-format="x"
-        />
+        placeholder="请选择开始时间"
-      </el-form-item>
+      />
-      <el-form-item label="原因" prop="reason">
+    </el-form-item>
-        <el-input v-model="formData.reason" type="textarea" placeholder="请输请假原因" />
+    <el-form-item label="结束时间" prop="endTime">
-      </el-form-item>
+      <el-date-picker
-    </el-form>
+        clearable
-    <template #footer>
+        v-model="formData.endTime"
+        type="datetime"
+        value-format="x"
+        placeholder="请选择结束时间"
+      />
+    </el-form-item>
+    <el-form-item label="原因" prop="reason">
+      <el-input v-model="formData.reason" type="textarea" placeholder="请输请假原因" />
+    </el-form-item>
+    <el-form-item>
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+    </el-form-item>
-    </template>
+  </el-form>
-  </Dialog>
 </template>
-<script setup lang="ts">
+<script setup name="BpmOALeaveCreate" lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as LeaveApi from '@/api/bpm/leave'
+import { useTagsViewStore } from '@/store/modules/tagsView'
 const message = useMessage() // 消息弹窗
+const { delView } = useTagsViewStore() // 视图操作
+const { currentRoute } = useRouter() // 路由
-const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formData = ref({
  type: undefined,
@@ -66,15 +65,7 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
-/** 打开弹窗 */
-const open = async () => {
-  dialogVisible.value = true
-  resetForm()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
  // 校验表单
  if (!formRef) return
@@ -85,23 +76,11 @@ const submitForm = async () => {
  try {
    const data = formData.value as unknown as LeaveApi.LeaveVO
    await LeaveApi.createLeave(data)
-    message.success('新增成功')
+    message.success('发起成功')
-    dialogVisible.value = false
+    // 关闭当前 Tab
-    // 发送操作成功的事件
+    delView(unref(currentRoute))
-    emit('success')
  } finally {
    formLoading.value = false
  }
 }
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    type: undefined,
-    reason: undefined,
-    startTime: undefined,
-    endTime: undefined
-  }
-  formRef.value?.resetFields()
-}
 </script>
--- a/src/views/bpm/oa/leave/detail.vue
+++ b/src/views/bpm/oa/leave/detail.vue
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="200">
+  <ContentWrap>
    <el-descriptions border :column="1">
      <el-descriptions-item label="请假类型">
        <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
      </el-descriptions-item>
      <el-descriptions-item label="开始时间">
-        {{ formatDate(detailData.startTime) }}
+        {{ formatDate(detailData.startTime, 'YYYY-MM-DD') }}
      </el-descriptions-item>
      <el-descriptions-item label="结束时间">
-        {{ formatDate(detailData.endTime) }}
+        {{ formatDate(detailData.endTime, 'YYYY-MM-DD') }}
      </el-descriptions-item>
      <el-descriptions-item label="原因">
        {{ detailData.reason }}
      </el-descriptions-item>
    </el-descriptions>
-  </Dialog>
+  </ContentWrap>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmOALeaveDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
+import { propTypes } from '@/utils/propTypes'
 import * as LeaveApi from '@/api/bpm/leave'
+const { query } = useRoute() // 查询参数
-const dialogVisible = ref(false) // 弹窗的是否展示
+const props = defineProps({
+  id: propTypes.number.def(undefined)
+})
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref() // 详情数据
+const detailData = ref({}) // 详情数据
+const queryId = query.id as unknown as number // 从 URL 传递过来的 id 编号
-/** 打开弹窗 */
+/** 获得数据 */
-const open = async (data: LeaveApi.LeaveVO) => {
+const getInfo = async () => {
-  dialogVisible.value = true
-  // 设置数据
  detailLoading.value = true
  try {
-    detailData.value = data
+    detailData.value = await LeaveApi.getLeave(queryId || props.id)
  } finally {
    detailLoading.value = false
  }
 }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
+/** 初始化 **/
+onMounted(() => {
+  getInfo()
+})
 </script>
--- a/src/views/bpm/oa/leave/index.vue
+++ b/src/views/bpm/oa/leave/index.vue
@@ -137,19 +137,12 @@
      @pagination="getList"
    />
  </ContentWrap>
-  <!-- 表单弹窗：详情 -->
-  <LeaveDetail ref="detailRef" />
-  <!-- 表单弹窗：添加 -->
-  <LeaveForm ref="formRef" @success="getList" />
 </template>
 <script setup lang="ts" name="BpmOALeave">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as LeaveApi from '@/api/bpm/leave'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
-import LeaveDetail from './detail.vue'
-import LeaveForm from './create.vue'
 const message = useMessage() // 消息弹窗
 const router = useRouter() // 路由
 const { t } = useI18n() // 国际化
@@ -192,15 +185,18 @@ const resetQuery = () => {
 }
 /** 添加操作 */
-const formRef = ref()
 const handleCreate = () => {
-  formRef.value.open()
+  router.push({ name: 'OALeaveCreate' })
 }
 /** 详情操作 */
-const detailRef = ref()
+const handleDetail = (row: LeaveApi.LeaveVO) => {
-const handleDetail = (data: LeaveApi.LeaveVO) => {
+  router.push({
-  detailRef.value.open(data)
+    name: 'OALeaveDetail',
+    query: {
+      id: row.id
+    }
+  })
 }
 /** 取消请假操作 */

--- a/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
 <template>
-  <el-card class="box-card" v-loading="loading">
+  <el-card v-loading="loading" class="box-card">
    <template #header>
      <span class="el-icon-picture-outline">流程图</span>
    </template>
-    <my-process-viewer
+    <MyProcessViewer
      key="designer"
-      :value="bpmnXml"
-      v-bind="bpmnControlForm"
-      :prefix="bpmnControlForm.prefix"
      :activityData="activityList"
+      :prefix="bpmnControlForm.prefix"
      :processInstanceData="processInstance"
      :taskData="tasks"
+      :value="bpmnXml"
+      v-bind="bpmnControlForm"
    />
  </el-card>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmProcessInstanceBpmnViewer" setup>
 import { propTypes } from '@/utils/propTypes'
+import { MyProcessViewer } from '@/components/bpmnProcessDesigner/package'
 import * as ActivityApi from '@/api/bpm/activity'
-// import * as DefinitionApi from '@/api/bpm/definition'
 const props = defineProps({
  loading: propTypes.bool, // 是否加载中

--- a/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
+++ b/src/views/bpm/processInstance/detail/ProcessInstanceTaskList.vue
 <template>
-  <el-card class="box-card" v-loading="loading">
+  <el-card v-loading="loading" class="box-card">
    <template #header>
      <span class="el-icon-picture-outline">审批记录</span>
    </template>
-    <el-col :span="16" :offset="4">
+    <el-col :offset="4" :span="16">
      <div class="block">
        <el-timeline>
          <el-timeline-item
@@ -16,9 +16,9 @@
            <el-card :body-style="{ padding: '10px' }">
              <label v-if="item.assigneeUser" style="font-weight: normal; margin-right: 30px">
                审批人：{{ item.assigneeUser.nickname }}
-                <el-tag type="info" size="small">{{ item.assigneeUser.deptName }}</el-tag>
+                <el-tag size="small" type="info">{{ item.assigneeUser.deptName }}</el-tag>
              </label>
-              <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
+              <label v-if="item.createTime" style="font-weight: normal">创建时间：</label>
              <label style="color: #8a909c; font-weight: normal">
                {{ formatDate(item?.createTime) }}
              </label>
@@ -44,7 +44,7 @@
    </el-col>
  </el-card>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmProcessInstanceTaskList" setup>
 import { formatDate, formatPast2 } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'

--- a/src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue
+++ b/src/views/bpm/processInstance/detail/TaskUpdateAssigneeForm.vue
 <template>
-  <Dialog title="转派审批人" v-model="dialogVisible" width="500">
+  <Dialog v-model="dialogVisible" title="转派审批人" width="500">
    <el-form
      ref="formRef"
+      v-loading="formLoading"
      :model="formData"
      :rules="formRules"
      label-width="110px"
-      v-loading="formLoading"
    >
      <el-form-item label="新审批人" prop="assigneeUserId">
        <el-select v-model="formData.assigneeUserId" clearable style="width: 100%">
@@ -19,12 +19,12 @@
      </el-form-item>
    </el-form>
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmTaskUpdateAssigneeForm" setup>
 import * as TaskApi from '@/api/bpm/task'
 import * as UserApi from '@/api/system/user'

--- a/src/views/bpm/task/done/TaskDetail.vue
+++ b/src/views/bpm/task/done/TaskDetail.vue
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情">
-    <el-descriptions border :column="1">
+    <el-descriptions :column="1" border>
      <el-descriptions-item label="任务编号" min-width="120">
        {{ detailData.id }}
      </el-descriptions-item>
@@ -25,7 +25,7 @@
    </el-descriptions>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmTaskDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as TaskApi from '@/api/bpm/task'

--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -2,35 +2,41 @@
  <ContentWrap>
    <!-- 搜索工作栏 -->
    <el-form
-      class="-mb-15px"
-      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
      label-width="68px"
    >
      <el-form-item label="任务名称" prop="name">
        <el-input
          v-model="queryParams.name"
-          placeholder="请输入任务名称"
+          class="!w-240px"
          clearable
+          placeholder="请输入任务名称"
          @keyup.enter="handleQuery"
-          class="!w-240px"
        />
      </el-form-item>
      <el-form-item label="创建时间" prop="createTime">
        <el-date-picker
          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
        />
      </el-form-item>
      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
      </el-form-item>
    </el-form>
  </ContentWrap>
@@ -38,24 +44,24 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="任务编号" align="center" prop="id" width="300px" />
+      <el-table-column align="center" label="任务编号" prop="id" width="300px" />
-      <el-table-column label="任务名称" align="center" prop="name" />
+      <el-table-column align="center" label="任务名称" prop="name" />
-      <el-table-column label="所属流程" align="center" prop="processInstance.name" />
+      <el-table-column align="center" label="所属流程" prop="processInstance.name" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
-      <el-table-column label="状态" align="center" prop="result">
+      <el-table-column align="center" label="状态" prop="result">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
        </template>
      </el-table-column>
-      <el-table-column label="原因" align="center" prop="reason" />
+      <el-table-column align="center" label="原因" prop="reason" />
      <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
        align="center"
+        label="创建时间"
        prop="createTime"
        width="180"
-        :formatter="dateFormatter"
      />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
        <template #default="scope">
          <el-button link type="primary" @click="openDetail(scope.row)">详情</el-button>
          <el-button link type="primary" @click="handleAudit(scope.row)">流程</el-button>
@@ -64,9 +70,9 @@
    </el-table>
    <!-- 分页 -->
    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
      @pagination="getList"
    />
  </ContentWrap>
@@ -74,11 +80,12 @@
  <!-- 表单弹窗：详情 -->
  <TaskDetail ref="detailRef" @success="getList" />
 </template>
-<script setup lang="tsx" name="BpmTodoTask">
+<script lang="ts" name="BpmTodoTask" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as TaskApi from '@/api/bpm/task'
 import TaskDetail from './TaskDetail.vue'
 const { push } = useRouter() // 路由
 const loading = ref(true) // 列表的加载中

--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -2,35 +2,41 @@
  <ContentWrap>
    <!-- 搜索工作栏 -->
    <el-form
-      class="-mb-15px"
-      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
      label-width="68px"
    >
      <el-form-item label="任务名称" prop="name">
        <el-input
          v-model="queryParams.name"
-          placeholder="请输入任务名称"
+          class="!w-240px"
          clearable
+          placeholder="请输入任务名称"
          @keyup.enter="handleQuery"
-          class="!w-240px"
        />
      </el-form-item>
      <el-form-item label="创建时间" prop="createTime">
        <el-date-picker
          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
        />
      </el-form-item>
      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
      </el-form-item>
    </el-form>
  </ContentWrap>
@@ -38,24 +44,24 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="任务编号" align="center" prop="id" width="300px" />
+      <el-table-column align="center" label="任务编号" prop="id" width="300px" />
-      <el-table-column label="任务名称" align="center" prop="name" />
+      <el-table-column align="center" label="任务名称" prop="name" />
-      <el-table-column label="所属流程" align="center" prop="processInstance.name" />
+      <el-table-column align="center" label="所属流程" prop="processInstance.name" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column align="center" label="流程发起人" prop="processInstance.startUserNickname" />
      <el-table-column
-        label="创建时间"
+        :formatter="dateFormatter"
        align="center"
+        label="创建时间"
        prop="createTime"
        width="180"
-        :formatter="dateFormatter"
      />
      <el-table-column label="任务状态" prop="suspensionState">
        <template #default="scope">
-          <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
+          <el-tag v-if="scope.row.suspensionState === 1" type="success">激活</el-tag>
-          <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
+          <el-tag v-if="scope.row.suspensionState === 2" type="warning">挂起</el-tag>
        </template>
      </el-table-column>
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
        <template #default="scope">
          <el-button link type="primary" @click="handleAudit(scope.row)">审批进度</el-button>
        </template>
@@ -63,19 +69,20 @@
    </el-table>
    <!-- 分页 -->
    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
      @pagination="getList"
    />
  </ContentWrap>
 </template>
-<script setup lang="tsx" name="BpmDoneTask">
+<script lang="ts" name="BpmDoneTask" setup>
 import { dateFormatter } from '@/utils/formatTime'
-const { push } = useRouter() // 路由
 import * as TaskApi from '@/api/bpm/task'
+const { push } = useRouter() // 路由
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据

--- a/src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue
+++ b/src/views/bpm/taskAssignRule/TaskAssignRuleForm.vue
 <template>
-  <Dialog title="修改任务规则" v-model="dialogVisible" width="600">
+  <Dialog v-model="dialogVisible" title="修改任务规则" width="600">
    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
      <el-form-item label="任务名称" prop="taskDefinitionName">
-        <el-input v-model="formData.taskDefinitionName" placeholder="请输入流标标识" disabled />
+        <el-input v-model="formData.taskDefinitionName" disabled placeholder="请输入流标标识" />
      </el-form-item>
      <el-form-item label="任务标识" prop="taskDefinitionKey">
-        <el-input v-model="formData.taskDefinitionKey" placeholder="请输入任务标识" disabled />
+        <el-input v-model="formData.taskDefinitionKey" disabled placeholder="请输入任务标识" />
      </el-form-item>
      <el-form-item label="规则类型" prop="type">
        <el-select v-model="formData.type" clearable style="width: 100%">
@@ -18,7 +18,7 @@
        </el-select>
      </el-form-item>
      <el-form-item v-if="formData.type === 10" label="指定角色" prop="roleIds">
-        <el-select v-model="formData.roleIds" multiple clearable style="width: 100%">
+        <el-select v-model="formData.roleIds" clearable multiple style="width: 100%">
          <el-option
            v-for="item in roleOptions"
            :key="item.id"
@@ -28,24 +28,24 @@
        </el-select>
      </el-form-item>
      <el-form-item
+        v-if="formData.type === 20 || formData.type === 21"
        label="指定部门"
        prop="deptIds"
        span="24"
-        v-if="formData.type === 20 || formData.type === 21"
      >
        <el-tree-select
          ref="treeRef"
          v-model="formData.deptIds"
-          node-key="id"
-          show-checkbox
-          :props="defaultProps"
          :data="deptTreeOptions"
+          :props="defaultProps"
          empty-text="加载中，请稍后"
          multiple
+          node-key="id"
+          show-checkbox
        />
      </el-form-item>
-      <el-form-item label="指定岗位" prop="postIds" span="24" v-if="formData.type === 22">
+      <el-form-item v-if="formData.type === 22" label="指定岗位" prop="postIds" span="24">
-        <el-select v-model="formData.postIds" multiple clearable style="width: 100%">
+        <el-select v-model="formData.postIds" clearable multiple style="width: 100%">
          <el-option
            v-for="item in postOptions"
            :key="parseInt(item.id)"
@@ -55,12 +55,12 @@
        </el-select>
      </el-form-item>
      <el-form-item
+        v-if="formData.type === 30 || formData.type === 31 || formData.type === 32"
        label="指定用户"
        prop="userIds"
        span="24"
-        v-if="formData.type === 30 || formData.type === 31 || formData.type === 32"
      >
-        <el-select v-model="formData.userIds" multiple clearable style="width: 100%">
+        <el-select v-model="formData.userIds" clearable multiple style="width: 100%">
          <el-option
            v-for="item in userOptions"
            :key="parseInt(item.id)"
@@ -69,8 +69,8 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item label="指定用户组" prop="userGroupIds" v-if="formData.type === 40">
+      <el-form-item v-if="formData.type === 40" label="指定用户组" prop="userGroupIds">
-        <el-select v-model="formData.userGroupIds" multiple clearable style="width: 100%">
+        <el-select v-model="formData.userGroupIds" clearable multiple style="width: 100%">
          <el-option
            v-for="item in userGroupOptions"
            :key="parseInt(item.id)"
@@ -79,8 +79,8 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item label="指定脚本" prop="scripts" v-if="formData.type === 50">
+      <el-form-item v-if="formData.type === 50" label="指定脚本" prop="scripts">
-        <el-select v-model="formData.scripts" multiple clearable style="width: 100%">
+        <el-select v-model="formData.scripts" clearable multiple style="width: 100%">
          <el-option
            v-for="dict in taskAssignScriptDictDatas"
            :key="dict.value"
@@ -92,20 +92,21 @@
    </el-form>
    <!-- 操作按钮 -->
    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="BpmTaskAssignRuleForm" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { handleTree, defaultProps } from '@/utils/tree'
+import { defaultProps, handleTree } from '@/utils/tree'
 import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule'
 import * as RoleApi from '@/api/system/role'
 import * as DeptApi from '@/api/system/dept'
 import * as PostApi from '@/api/system/post'
 import * as UserApi from '@/api/system/user'
 import * as UserGroupApi from '@/api/bpm/userGroup'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
+++ b/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
--- a/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
+++ b/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
--- a/src/views/infra/codegen/EditTable.vue
+++ b/src/views/infra/codegen/EditTable.vue
--- a/src/views/infra/codegen/ImportTable.vue
+++ b/src/views/infra/codegen/ImportTable.vue
--- a/src/views/infra/codegen/PreviewCode.vue
+++ b/src/views/infra/codegen/PreviewCode.vue
--- a/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/src/views/infra/codegen/components/BasicInfoForm.vue
--- a/src/views/infra/codegen/components/ColumInfoForm.vue
+++ b/src/views/infra/codegen/components/ColumInfoForm.vue
--- a/src/views/infra/codegen/components/GenerateInfoForm.vue
+++ b/src/views/infra/codegen/components/GenerateInfoForm.vue
--- a/src/views/infra/config/ConfigForm.vue
+++ b/src/views/infra/config/ConfigForm.vue
--- a/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
+++ b/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
--- a/src/views/infra/file/FileForm.vue
+++ b/src/views/infra/file/FileForm.vue
--- a/src/views/infra/fileConfig/FileConfigForm.vue
+++ b/src/views/infra/fileConfig/FileConfigForm.vue
--- a/src/views/infra/job/JobDetail.vue
+++ b/src/views/infra/job/JobDetail.vue
--- a/src/views/infra/job/logger/JobLogDetail.vue
+++ b/src/views/infra/job/logger/JobLogDetail.vue
--- a/src/views/infra/webSocket/index.vue
+++ b/src/views/infra/webSocket/index.vue
--- a/src/views/mall/product/property/PropertyForm.vue
+++ b/src/views/mall/product/property/PropertyForm.vue
--- a/src/views/mall/product/property/value/ValueForm.vue
+++ b/src/views/mall/product/property/value/ValueForm.vue
--- a/src/views/mp/account/AccountForm.vue
+++ b/src/views/mp/account/AccountForm.vue
--- a/src/views/mp/autoReply/index.vue
+++ b/src/views/mp/autoReply/index.vue
--- a/src/views/mp/components/WxMpSelect.vue
+++ b/src/views/mp/components/WxMpSelect.vue
--- a/src/views/mp/components/img.png
+++ b/src/views/mp/components/img.png
--- a/src/views/mp/components/wx-account-select/main.vue
+++ b/src/views/mp/components/wx-account-select/main.vue
--- a/src/views/mp/components/wx-editor/WxEditor.vue
+++ b/src/views/mp/components/wx-editor/WxEditor.vue
--- a/src/views/mp/components/wx-editor/quill-options.js
+++ b/src/views/mp/components/wx-editor/quill-options.js
--- a/src/views/mp/components/wx-news/main.vue
+++ b/src/views/mp/components/wx-news/main.vue
--- a/src/views/mp/components/wx-reply/main.vue
+++ b/src/views/mp/components/wx-reply/main.vue
--- a/src/views/mp/draft/components/CoverSelect.vue
+++ b/src/views/mp/draft/components/CoverSelect.vue
--- a/src/views/mp/draft/components/DraftTable.vue
+++ b/src/views/mp/draft/components/DraftTable.vue
--- a/src/views/mp/draft/components/NewsForm.vue
+++ b/src/views/mp/draft/components/NewsForm.vue
--- a/src/views/mp/draft/components/index.ts
+++ b/src/views/mp/draft/components/index.ts
--- a/src/views/mp/draft/components/types.ts
+++ b/src/views/mp/draft/components/types.ts
--- a/src/views/mp/draft/editor-config.ts
+++ b/src/views/mp/draft/editor-config.ts
--- a/src/views/mp/draft/index.vue
+++ b/src/views/mp/draft/index.vue
--- a/src/views/mp/freePublish/index.vue
+++ b/src/views/mp/freePublish/index.vue
--- a/src/views/mp/material/components/ImageTable.vue
+++ b/src/views/mp/material/components/ImageTable.vue
--- a/src/views/mp/material/components/UploadFile.vue
+++ b/src/views/mp/material/components/UploadFile.vue
--- a/src/views/mp/material/components/UploadVideo.vue
+++ b/src/views/mp/material/components/UploadVideo.vue
--- a/src/views/mp/material/components/VideoTable.vue
+++ b/src/views/mp/material/components/VideoTable.vue
--- a/src/views/mp/material/components/VoiceTable.vue
+++ b/src/views/mp/material/components/VoiceTable.vue
--- a/src/views/mp/material/components/upload.ts
+++ b/src/views/mp/material/components/upload.ts
--- a/src/views/mp/material/index.vue
+++ b/src/views/mp/material/index.vue
--- a/src/views/mp/menu/index.vue
+++ b/src/views/mp/menu/index.vue
--- a/src/views/mp/message/MessageTable.vue
+++ b/src/views/mp/message/MessageTable.vue
--- a/src/views/mp/message/index.vue
+++ b/src/views/mp/message/index.vue
--- a/src/views/mp/tag/TagForm.vue
+++ b/src/views/mp/tag/TagForm.vue
--- a/src/views/mp/tag/index.vue
+++ b/src/views/mp/tag/index.vue
--- a/src/views/mp/user/UserForm.vue
+++ b/src/views/mp/user/UserForm.vue
--- a/src/views/mp/user/index.vue
+++ b/src/views/mp/user/index.vue
--- a/src/views/pay/app/AppForm.vue
+++ b/src/views/pay/app/AppForm.vue
--- a/src/views/pay/merchant/MerchantForm.vue
+++ b/src/views/pay/merchant/MerchantForm.vue
--- a/src/views/pay/order/OrderDetail.vue
+++ b/src/views/pay/order/OrderDetail.vue
--- a/src/views/pay/refund/RefundDetail.vue
+++ b/src/views/pay/refund/RefundDetail.vue
--- a/src/views/system/area/AreaForm.vue
+++ b/src/views/system/area/AreaForm.vue
--- a/src/views/system/dept/DeptForm.vue
+++ b/src/views/system/dept/DeptForm.vue
--- a/src/views/system/dict/DictTypeForm.vue
+++ b/src/views/system/dict/DictTypeForm.vue
--- a/src/views/system/dict/data/DictDataForm.vue
+++ b/src/views/system/dict/data/DictDataForm.vue
--- a/src/views/system/errorCode/ErrorCodeForm.vue
+++ b/src/views/system/errorCode/ErrorCodeForm.vue
--- a/src/views/system/loginlog/LoginLogDetail.vue
+++ b/src/views/system/loginlog/LoginLogDetail.vue
--- a/src/views/system/mail/account/MailAccountDetail.vue
+++ b/src/views/system/mail/account/MailAccountDetail.vue
--- a/src/views/system/mail/account/MailAccountForm.vue
+++ b/src/views/system/mail/account/MailAccountForm.vue
--- a/src/views/system/mail/log/MailLogDetail.vue
+++ b/src/views/system/mail/log/MailLogDetail.vue
--- a/src/views/system/mail/template/MailTemplateForm.vue
+++ b/src/views/system/mail/template/MailTemplateForm.vue
--- a/src/views/system/mail/template/MailTemplateSendForm.vue
+++ b/src/views/system/mail/template/MailTemplateSendForm.vue
--- a/src/views/system/menu/MenuForm.vue
+++ b/src/views/system/menu/MenuForm.vue
--- a/src/views/system/notice/NoticeForm.vue
+++ b/src/views/system/notice/NoticeForm.vue
--- a/src/views/system/notify/message/NotifyMessageDetail.vue
+++ b/src/views/system/notify/message/NotifyMessageDetail.vue
--- a/src/views/system/notify/my/MyNotifyMessageDetail.vue
+++ b/src/views/system/notify/my/MyNotifyMessageDetail.vue
--- a/src/views/system/notify/template/NotifyTemplateForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateForm.vue
--- a/src/views/system/notify/template/NotifyTemplateSendForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateSendForm.vue
--- a/src/views/system/notify/template/index.vue
+++ b/src/views/system/notify/template/index.vue
--- a/src/views/system/notify/template/template.data.ts
+++ b/src/views/system/notify/template/template.data.ts
--- a/src/views/system/oauth2/client/ClientForm.vue
+++ b/src/views/system/oauth2/client/ClientForm.vue
--- a/src/views/system/operatelog/OperateLogDetail.vue
+++ b/src/views/system/operatelog/OperateLogDetail.vue
--- a/src/views/system/post/PostForm.vue
+++ b/src/views/system/post/PostForm.vue
--- a/src/views/system/role/RoleAssignMenuForm.vue
+++ b/src/views/system/role/RoleAssignMenuForm.vue
--- a/src/views/system/role/RoleDataPermissionForm.vue
+++ b/src/views/system/role/RoleDataPermissionForm.vue
--- a/src/views/system/role/RoleForm.vue
+++ b/src/views/system/role/RoleForm.vue
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
--- a/src/views/system/sensitiveWord/SensitiveWordForm.vue
+++ b/src/views/system/sensitiveWord/SensitiveWordForm.vue
--- a/src/views/system/sensitiveWord/SensitiveWordTestForm.vue
+++ b/src/views/system/sensitiveWord/SensitiveWordTestForm.vue
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
--- a/src/views/system/sms/channel/SmsChannelForm.vue
+++ b/src/views/system/sms/channel/SmsChannelForm.vue
--- a/src/views/system/sms/log/SmsLogDetail.vue
+++ b/src/views/system/sms/log/SmsLogDetail.vue
--- a/src/views/system/sms/template/SmsTemplateForm.vue
+++ b/src/views/system/sms/template/SmsTemplateForm.vue
--- a/src/views/system/sms/template/SmsTemplateSendForm.vue
+++ b/src/views/system/sms/template/SmsTemplateSendForm.vue
--- a/src/views/system/tenant/TenantForm.vue
+++ b/src/views/system/tenant/TenantForm.vue
--- a/src/views/system/tenantPackage/TenantPackageForm.vue
+++ b/src/views/system/tenantPackage/TenantPackageForm.vue
--- a/src/views/system/user/DeptTree.vue
+++ b/src/views/system/user/DeptTree.vue
--- a/src/views/system/user/UserAssignRoleForm.vue
+++ b/src/views/system/user/UserAssignRoleForm.vue
--- a/src/views/system/user/UserForm.vue
+++ b/src/views/system/user/UserForm.vue
--- a/src/views/system/user/UserImportForm.vue
+++ b/src/views/system/user/UserImportForm.vue