Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev

2025-07-25 08:15:07 +08:00 · 2023-05-12 15:50:45 +08:00
parent bf629a9554 e92361ed40
commit 8456c671e8
302 changed files with 9886 additions and 8199 deletions
--- a/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
+++ b/src/views/infra/apiAccessLog/ApiAccessLogDetail.vue
@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500" width="800">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
      <el-descriptions-item label="日志主键" min-width="120">
        {{ detailData.id }}
      </el-descriptions-item>
@ -33,14 +33,14 @@
      <el-descriptions-item label="操作结果">
        <div v-if="detailData.resultCode === 0">正常</div>
        <div v-else-if="detailData.resultCode > 0"
-          >失败 | {{ detailData.resultCode }} | {{ detailData.resultMsg }}</div
-        >
+          >失败 | {{ detailData.resultCode }} | {{ detailData.resultMsg }}
+        </div>
      </el-descriptions-item>
    </el-descriptions>
  </Dialog>
 </template>

-<script setup lang="ts">
+<script lang="ts" name="ApiAccessLogDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as ApiAccessLog from '@/api/infra/apiAccessLog'
--- a/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
+++ b/src/views/infra/apiErrorLog/ApiErrorLogDetail.vue
@ -1,6 +1,6 @@
 <template>
-  <Dialog title="详情" v-model="dialogVisible" :scroll="true" :max-height="500" width="800">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="详情" width="800">
+    <el-descriptions :column="1" border>
      <el-descriptions-item label="日志主键" min-width="120">
        {{ detailData.id }}
      </el-descriptions-item>
@ -32,12 +32,12 @@
      <el-descriptions-item label="异常名">
        {{ detailData.exceptionName }}
      </el-descriptions-item>
-      <el-descriptions-item label="异常堆栈" v-if="detailData.exceptionStackTrace">
+      <el-descriptions-item v-if="detailData.exceptionStackTrace" label="异常堆栈">
        <el-input
-          type="textarea"
-          :readonly="true"
-          :autosize="{ maxRows: 20 }"
          v-model="detailData.exceptionStackTrace"
+          :autosize="{ maxRows: 20 }"
+          :readonly="true"
+          type="textarea"
        />
      </el-descriptions-item>
      <el-descriptions-item label="处理状态">
@ -46,16 +46,16 @@
          :value="detailData.processStatus"
        />
      </el-descriptions-item>
-      <el-descriptions-item label="处理人" v-if="detailData.processUserId">
+      <el-descriptions-item v-if="detailData.processUserId" label="处理人">
        {{ detailData.processUserId }}
      </el-descriptions-item>
-      <el-descriptions-item label="处理时间" v-if="detailData.processTime">
+      <el-descriptions-item v-if="detailData.processTime" label="处理时间">
        {{ formatDate(detailData.processTime) }}
      </el-descriptions-item>
    </el-descriptions>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="ApiErrorLogDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as ApiErrorLog from '@/api/infra/apiErrorLog'
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
@ -4,13 +4,13 @@
      <el-col>
        <div class="mb-2 float-right">
          <el-button size="small" type="primary" @click="showJson">生成 JSON</el-button>
-          <el-button size="small" type="success" @click="showOption">生成O ptions</el-button>
+          <el-button size="small" type="success" @click="showOption">生成 Options</el-button>
          <el-button size="small" type="danger" @click="showTemplate">生成组件</el-button>
        </div>
      </el-col>
      <!-- 表单设计器 -->
      <el-col>
-        <fc-designer ref="designer" height="780px" />
+        <FcDesigner ref="designer" height="780px" />
      </el-col>
    </el-row>
  </ContentWrap>
@ -22,18 +22,17 @@
        {{ t('common.copy') }}
      </el-button>
      <el-scrollbar height="580">
-        <div v-highlight>
-          <code class="hljs">
-            {{ formData }}
-          </code>
+        <div>
+          <pre><code class="hljs" v-html="highlightedCode(formData)"></code></pre>
        </div>
      </el-scrollbar>
    </div>
  </Dialog>
 </template>
 <script setup lang="ts" name="InfraBuild">
-import formCreate from '@form-create/element-ui'
+import FcDesigner from '@form-create/designer'
 import { useClipboard } from '@vueuse/core'
+import { isString } from '@/utils/is'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息

@ -109,4 +108,32 @@ const copy = async (text: string) => {
    }
  }
 }
+
+/**
+ * 代码高亮
+ */
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import xml from 'highlight.js/lib/languages/java'
+import json from 'highlight.js/lib/languages/json'
+const highlightedCode = (code) => {
+  // 处理语言和代码
+  let language = 'json'
+  if (formType.value === 2) {
+    language = 'xml'
+  }
+  if (!isString(code)) {
+    code = JSON.stringify(code)
+  }
+  // 高亮
+  const result = hljs.highlight(language, code, true)
+  return result.value || '&nbsp;'
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 注册代码高亮的各种语言
+  hljs.registerLanguage('xml', xml)
+  hljs.registerLanguage('json', json)
+})
 </script>
--- a/src/views/infra/codegen/EditTable.vue
+++ b/src/views/infra/codegen/EditTable.vue
@ -13,16 +13,17 @@
    </el-tabs>
    <el-form>
      <el-form-item style="float: right">
-        <el-button type="primary" @click="submitForm" :loading="formLoading">保存</el-button>
+        <el-button :loading="formLoading" type="primary" @click="submitForm">保存</el-button>
        <el-button @click="close">返回</el-button>
      </el-form-item>
    </el-form>
  </ContentWrap>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraCodegenEditTable" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { BasicInfoForm, ColumInfoForm, GenerateInfoForm } from './components'
 import * as CodegenApi from '@/api/infra/codegen'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { push, currentRoute } = useRouter() // 路由
@ -30,7 +31,7 @@ const { query } = useRoute() // 查询参数
 const { delView } = useTagsViewStore() // 视图操作

 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const activeName = ref('basicInfo') // Tag 激活的窗口
+const activeName = ref('colum') // Tag 激活的窗口
 const basicInfoRef = ref<ComponentRef<typeof BasicInfoForm>>()
 const columInfoRef = ref<ComponentRef<typeof ColumInfoForm>>()
 const generateInfoRef = ref<ComponentRef<typeof GenerateInfoForm>>()
--- a/src/views/infra/codegen/ImportTable.vue
+++ b/src/views/infra/codegen/ImportTable.vue
@ -1,12 +1,12 @@
 <template>
-  <Dialog title="导入表" v-model="dialogVisible" width="800px">
+  <Dialog v-model="dialogVisible" title="导入表" width="800px">
    <!-- 搜索栏 -->
-    <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+    <el-form ref="queryFormRef" :inline="true" :model="queryParams" label-width="68px">
      <el-form-item label="数据源" prop="dataSourceConfigId">
        <el-select
          v-model="queryParams.dataSourceConfigId"
-          placeholder="请选择数据源"
          class="!w-240px"
+          placeholder="请选择数据源"
        >
          <el-option
            v-for="config in dataSourceConfigList"
@ -19,54 +19,61 @@
      <el-form-item label="表名称" prop="name">
        <el-input
          v-model="queryParams.name"
-          placeholder="请输入表名称"
-          clearable
-          @keyup.enter="getList"
          class="!w-240px"
+          clearable
+          placeholder="请输入表名称"
+          @keyup.enter="getList"
        />
      </el-form-item>
      <el-form-item label="表描述" prop="comment">
        <el-input
          v-model="queryParams.comment"
-          placeholder="请输入表描述"
-          clearable
-          @keyup.enter="getList"
          class="!w-240px"
+          clearable
+          placeholder="请输入表描述"
+          @keyup.enter="getList"
        />
      </el-form-item>
      <el-form-item>
-        <el-button @click="getList"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button @click="getList">
+          <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>
    <!-- 列表 -->
    <el-row>
      <el-table
-        v-loading="dbTableLoading"
-        @row-click="handleRowClick"
        ref="tableRef"
+        v-loading="dbTableLoading"
        :data="dbTableList"
-        @selection-change="handleSelectionChange"
        height="260px"
+        @row-click="handleRowClick"
+        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55" />
-        <el-table-column prop="name" label="表名称" :show-overflow-tooltip="true" />
-        <el-table-column prop="comment" label="表描述" :show-overflow-tooltip="true" />
+        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="name" />
+        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="comment" />
      </el-table>
    </el-row>
    <!-- 操作 -->
    <template #footer>
-      <el-button @click="handleImportTable" type="primary" :disabled="tableList.length === 0">
+      <el-button :disabled="tableList.length === 0" type="primary" @click="handleImportTable">
        导入
      </el-button>
      <el-button @click="close">关闭</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraCodegenImportTable" setup>
 import * as CodegenApi from '@/api/infra/codegen'
 import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
 import { ElTable } from 'element-plus'
+
 const message = useMessage() // 消息弹窗

 const dialogVisible = ref(false) // 弹窗的是否展示
--- a/src/views/infra/codegen/PreviewCode.vue
+++ b/src/views/infra/codegen/PreviewCode.vue
@ -1,52 +1,52 @@
 <template>
  <Dialog
-    title="代码预览"
    v-model="dialogVisible"
    align-center
-    width="80%"
    class="app-infra-codegen-preview-container"
+    title="代码预览"
+    width="80%"
  >
    <div class="flex">
      <!-- 代码目录树 -->
      <el-card
-        class="w-1/3"
-        :gutter="12"
-        shadow="hover"
        v-loading="loading"
+        :gutter="12"
+        class="w-1/3"
        element-loading-text="生成文件目录中..."
+        shadow="hover"
      >
-        <el-scrollbar height="calc(100vh - 88px - 40px - 50px)">
+        <el-scrollbar height="calc(100vh - 88px - 40px)">
          <el-tree
            ref="treeRef"
-            node-key="id"
            :data="preview.fileTree"
            :expand-on-click-node="false"
-            highlight-current
-            @node-click="handleNodeClick"
            default-expand-all
+            highlight-current
+            node-key="id"
+            @node-click="handleNodeClick"
          />
        </el-scrollbar>
      </el-card>
      <!-- 代码 -->
      <el-card
-        class="w-2/3 ml-3"
-        :gutter="12"
-        shadow="hover"
        v-loading="loading"
+        :gutter="12"
+        class="w-2/3 ml-3"
        element-loading-text="加载代码中..."
+        shadow="hover"
      >
        <el-tabs v-model="preview.activeName">
          <el-tab-pane
            v-for="item in previewCodegen"
+            :key="item.filePath"
            :label="item.filePath.substring(item.filePath.lastIndexOf('/') + 1)"
            :name="item.filePath"
-            :key="item.filePath"
          >
-            <el-button text type="primary" class="float-right" @click="copy(item.code)">
+            <el-button class="float-right" text type="primary" @click="copy(item.code)">
              {{ t('common.copy') }}
            </el-button>
-            <div v-highlight>
-              <code>{{ item.code }}</code>
+            <div>
+              <pre><code class="hljs" v-html="highlightedCode(item)"></code></pre>
            </div>
          </el-tab-pane>
        </el-tabs>
@ -54,10 +54,11 @@
    </div>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraCodegenPreviewCode" setup>
 import { useClipboard } from '@vueuse/core'
 import { handleTree2 } from '@/utils/tree'
 import * as CodegenApi from '@/api/infra/codegen'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

@ -179,6 +180,34 @@ const copy = async (text: string) => {
    message.success(t('common.copySuccess'))
  }
 }
+
+/**
+ * 代码高亮
+ */
+import hljs from 'highlight.js' // 导入代码高亮文件
+import 'highlight.js/styles/github.css' // 导入代码高亮样式
+import java from 'highlight.js/lib/languages/java'
+import xml from 'highlight.js/lib/languages/java'
+import javascript from 'highlight.js/lib/languages/javascript'
+import sql from 'highlight.js/lib/languages/sql'
+import typescript from 'highlight.js/lib/languages/typescript'
+const highlightedCode = (item) => {
+  const language = item.filePath.substring(item.filePath.lastIndexOf('.') + 1)
+  const result = hljs.highlight(language, item.code || '', true)
+  return result.value || '&nbsp;'
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  // 注册代码高亮的各种语言
+  hljs.registerLanguage('java', java)
+  hljs.registerLanguage('xml', xml)
+  hljs.registerLanguage('html', xml)
+  hljs.registerLanguage('vue', xml)
+  hljs.registerLanguage('javascript', javascript)
+  hljs.registerLanguage('sql', sql)
+  hljs.registerLanguage('typescript', typescript)
+})
 </script>
 <style lang="scss">
 .app-infra-codegen-preview-container {
--- a/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/src/views/infra/codegen/components/BasicInfoForm.vue
@ -3,12 +3,12 @@
    <el-row>
      <el-col :span="12">
        <el-form-item label="表名称" prop="tableName">
-          <el-input placeholder="请输入仓库名称" v-model="formData.tableName" />
+          <el-input v-model="formData.tableName" placeholder="请输入仓库名称" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="表描述" prop="tableComment">
-          <el-input placeholder="请输入" v-model="formData.tableComment" />
+          <el-input v-model="formData.tableComment" placeholder="请输入" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
@ -20,27 +20,27 @@
                content="默认去除表名的前缀。如果存在重复，则需要手动添加前缀，避免 MyBatis 报 Alias 重复的问题。"
                placement="top"
              >
-                <Icon icon="ep:question-filled" class="" />
+                <Icon class="" icon="ep:question-filled" />
              </el-tooltip>
            </span>
          </template>
-          <el-input placeholder="请输入" v-model="formData.className" />
+          <el-input v-model="formData.className" placeholder="请输入" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="作者" prop="author">
-          <el-input placeholder="请输入" v-model="formData.author" />
+          <el-input v-model="formData.author" placeholder="请输入" />
        </el-form-item>
      </el-col>
      <el-col :span="24">
        <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" :rows="3" v-model="formData.remark" />
+          <el-input v-model="formData.remark" :rows="3" type="textarea" />
        </el-form-item>
      </el-col>
    </el-row>
  </el-form>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraCodegenBasicInfoForm" setup>
 import * as CodegenApi from '@/api/infra/codegen'
 import { PropType } from 'vue'

--- a/src/views/infra/codegen/components/ColumInfoForm.vue
+++ b/src/views/infra/codegen/components/ColumInfoForm.vue
@ -1,10 +1,10 @@
 <template>
-  <el-table ref="dragTable" :data="formData" row-key="columnId" :max-height="tableHeight">
+  <el-table ref="dragTable" :data="formData" :max-height="tableHeight" row-key="columnId">
    <el-table-column
-      label="字段列名"
-      prop="columnName"
-      min-width="10%"
      :show-overflow-tooltip="true"
+      label="字段列名"
+      min-width="10%"
+      prop="columnName"
    />
    <el-table-column label="字段描述" min-width="10%">
      <template #default="scope">
@ -12,10 +12,10 @@
      </template>
    </el-table-column>
    <el-table-column
-      label="物理类型"
-      prop="dataType"
-      min-width="10%"
      :show-overflow-tooltip="true"
+      label="物理类型"
+      min-width="10%"
+      prop="dataType"
    />
    <el-table-column label="Java类型" min-width="11%">
      <template #default="scope">
@ -37,26 +37,26 @@
    </el-table-column>
    <el-table-column label="插入" min-width="4%">
      <template #default="scope">
-        <el-checkbox true-label="true" false-label="false" v-model="scope.row.createOperation" />
+        <el-checkbox v-model="scope.row.createOperation" false-label="false" true-label="true" />
      </template>
    </el-table-column>
    <el-table-column label="编辑" min-width="4%">
      <template #default="scope">
-        <el-checkbox true-label="true" false-label="false" v-model="scope.row.updateOperation" />
+        <el-checkbox v-model="scope.row.updateOperation" false-label="false" true-label="true" />
      </template>
    </el-table-column>
    <el-table-column label="列表" min-width="4%">
      <template #default="scope">
        <el-checkbox
-          true-label="true"
-          false-label="false"
          v-model="scope.row.listOperationResult"
+          false-label="false"
+          true-label="true"
        />
      </template>
    </el-table-column>
    <el-table-column label="查询" min-width="4%">
      <template #default="scope">
-        <el-checkbox true-label="true" false-label="false" v-model="scope.row.listOperation" />
+        <el-checkbox v-model="scope.row.listOperation" false-label="false" true-label="true" />
      </template>
    </el-table-column>
    <el-table-column label="查询方式" min-width="10%">
@ -75,7 +75,7 @@
    </el-table-column>
    <el-table-column label="允许空" min-width="5%">
      <template #default="scope">
-        <el-checkbox true-label="true" false-label="false" v-model="scope.row.nullable" />
+        <el-checkbox v-model="scope.row.nullable" false-label="false" true-label="true" />
      </template>
    </el-table-column>
    <el-table-column label="显示类型" min-width="12%">
@ -112,7 +112,7 @@
    </el-table-column>
  </el-table>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraCodegenColumInfoForm" setup>
 import { PropType } from 'vue'
 import * as CodegenApi from '@/api/infra/codegen'
 import * as DictDataApi from '@/api/system/dict/dict.type'
--- a/src/views/infra/codegen/components/GenerateInfoForm.vue
+++ b/src/views/infra/codegen/components/GenerateInfoForm.vue
@ -2,7 +2,7 @@
  <el-form ref="formRef" :model="formData" :rules="rules" label-width="150px">
    <el-row>
      <el-col :span="12">
-        <el-form-item prop="templateType" label="生成模板">
+        <el-form-item label="生成模板" prop="templateType">
          <el-select v-model="formData.templateType" @change="tplSelectChange">
            <el-option
              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
@ -14,7 +14,20 @@
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item prop="scene" label="生成场景">
+        <el-form-item label="前端类型" prop="frontType">
+          <el-select v-model="formData.frontType">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_FRONT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="生成场景" prop="scene">
          <el-select v-model="formData.scene">
            <el-option
              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
@ -25,6 +38,26 @@
          </el-select>
        </el-form-item>
      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <template #label>
+            <span>
+              上级菜单
+              <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+          </template>
+          <el-tree-select
+            v-model="formData.parentMenuId"
+            :data="menus"
+            :props="menuTreeProps"
+            check-strictly
+            node-key="id"
+            placeholder="请选择系统菜单"
+          />
+        </el-form-item>
+      </el-col>

      <!--      <el-col :span="12">-->
      <!--        <el-form-item prop="packageName">-->
@ -115,28 +148,7 @@
        </el-form-item>
      </el-col>

-      <el-col :span="12">
-        <el-form-item>
-          <template #label>
-            <span>
-              上级菜单
-              <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
-                <Icon icon="ep:question-filled" />
-              </el-tooltip>
-            </span>
-          </template>
-          <el-tree-select
-            v-model="formData.parentMenuId"
-            placeholder="请选择系统菜单"
-            node-key="id"
-            check-strictly
-            :data="menus"
-            :props="menuTreeProps"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="24" v-if="formData.genType === '1'">
+      <el-col v-if="formData.genType === '1'" :span="24">
        <el-form-item prop="genPath">
          <template #label>
            <span>
@ -279,8 +291,8 @@
    </el-row>
  </el-form>
 </template>
-<script setup lang="ts">
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+<script lang="ts" name="InfraCodegenGenerateInfoForm" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { handleTree } from '@/utils/tree'
 import * as CodegenApi from '@/api/infra/codegen'
 import * as MenuApi from '@/api/system/menu'
@ -297,6 +309,7 @@ const props = defineProps({
 const formRef = ref()
 const formData = ref({
  templateType: null,
+  frontType: null,
  scene: null,
  moduleName: '',
  businessName: '',
@ -315,6 +328,7 @@ const formData = ref({

 const rules = reactive({
  templateType: [required],
+  frontType: [required],
  scene: [required],
  moduleName: [required],
  businessName: [required],
--- a/src/views/infra/codegen/index.vue
+++ b/src/views/infra/codegen/index.vue
@ -5,46 +5,53 @@
  <!-- 搜索 -->
  <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="tableName">
        <el-input
          v-model="queryParams.tableName"
-          placeholder="请输入表名称"
-          clearable
-          @keyup.enter="handleQuery"
          class="!w-240px"
+          clearable
+          placeholder="请输入表名称"
+          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="表描述" prop="tableComment">
        <el-input
          v-model="queryParams.tableComment"
-          placeholder="请输入表描述"
-          clearable
-          @keyup.enter="handleQuery"
          class="!w-240px"
+          clearable
+          placeholder="请输入表描述"
+          @keyup.enter="handleQuery"
        />
      </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="resetQuery"><Icon icon="ep:refresh" class="mr-5px" />重置</el-button>
-        <el-button type="primary" v-hasPermi="['infra:codegen:create']" @click="openImportTable()">
-          <Icon icon="ep:zoom-in" class="mr-5px" /> 导入
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button v-hasPermi="['infra:codegen:create']" type="primary" @click="openImportTable()">
+          <Icon class="mr-5px" icon="ep:zoom-in" />
+          导入
        </el-button>
      </el-form-item>
    </el-form>
@ -53,75 +60,75 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="数据源" align="center">
+      <el-table-column align="center" label="数据源">
        <template #default="scope">
          {{
            dataSourceConfigList.find((config) => config.id === scope.row.dataSourceConfigId)?.name
          }}
        </template>
      </el-table-column>
-      <el-table-column label="表名称" align="center" prop="tableName" width="200" />
+      <el-table-column align="center" label="表名称" prop="tableName" width="200" />
      <el-table-column
-        label="表描述"
-        align="center"
-        prop="tableComment"
        :show-overflow-tooltip="true"
+        align="center"
+        label="表描述"
+        prop="tableComment"
        width="200"
      />
-      <el-table-column label="实体" align="center" prop="className" width="200" />
+      <el-table-column align="center" label="实体" prop="className" width="200" />
      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
        label="创建时间"
-        align="center"
        prop="createTime"
        width="180"
-        :formatter="dateFormatter"
      />
      <el-table-column
-        label="更新时间"
+        :formatter="dateFormatter"
        align="center"
+        label="更新时间"
        prop="createTime"
        width="180"
-        :formatter="dateFormatter"
      />
-      <el-table-column label="操作" align="center" width="300px" fixed="right">
+      <el-table-column align="center" fixed="right" label="操作" width="300px">
        <template #default="scope">
          <el-button
+            v-hasPermi="['infra:codegen:preview']"
            link
            type="primary"
            @click="handlePreview(scope.row)"
-            v-hasPermi="['infra:codegen:preview']"
          >
            预览
          </el-button>
          <el-button
+            v-hasPermi="['infra:codegen:update']"
            link
            type="primary"
            @click="handleUpdate(scope.row.id)"
-            v-hasPermi="['infra:codegen:update']"
          >
            编辑
          </el-button>
          <el-button
+            v-hasPermi="['infra:codegen:delete']"
            link
            type="danger"
            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['infra:codegen:delete']"
          >
            删除
          </el-button>
          <el-button
+            v-hasPermi="['infra:codegen:update']"
            link
            type="primary"
            @click="handleSyncDB(scope.row)"
-            v-hasPermi="['infra:codegen:update']"
          >
            同步
          </el-button>
          <el-button
+            v-hasPermi="['infra:codegen:download']"
            link
            type="primary"
            @click="handleGenTable(scope.row)"
-            v-hasPermi="['infra:codegen:download']"
          >
            生成代码
          </el-button>
@ -130,25 +137,26 @@
    </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>

  <!-- 弹窗：导入表 -->
-  <ImportTable ref="importRef" success="getList" />
+  <ImportTable ref="importRef" @success="getList" />
  <!-- 弹窗：预览代码 -->
  <PreviewCode ref="previewRef" />
 </template>
-<script setup lang="ts" name="InfraCodegen">
+<script lang="ts" name="InfraCodegen" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CodegenApi from '@/api/infra/codegen'
 import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'
 import ImportTable from './ImportTable.vue'
 import PreviewCode from './PreviewCode.vue'
+
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 const { push } = useRouter() // 路由跳转
--- a/src/views/infra/config/ConfigForm.vue
+++ b/src/views/infra/config/ConfigForm.vue
@ -1,11 +1,11 @@
 <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="80px"
-      v-loading="formLoading"
    >
      <el-form-item label="参数分类" prop="category">
        <el-input v-model="formData.category" placeholder="请输入参数分类" />
@ -31,16 +31,16 @@
        </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="InfraConfigForm" setup>
 import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import * as ConfigApi from '@/api/infra/config'

--- a/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
+++ b/src/views/infra/dataSourceConfig/DataSourceConfigForm.vue
@ -1,11 +1,11 @@
 <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="请输入参数名称" />
@ -21,12 +21,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="InfraDataSourceConfigForm" setup>
 import * as DataSourceConfigApi from '@/api/infra/dataSourceConfig'

 const { t } = useI18n() // 国际化
--- a/src/views/infra/file/FileForm.vue
+++ b/src/views/infra/file/FileForm.vue
@ -1,23 +1,23 @@
 <template>
-  <Dialog title="上传文件" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" title="上传文件">
    <el-upload
      ref="uploadRef"
-      :action="url"
-      :data="data"
-      :headers="uploadHeaders"
      v-model:file-list="fileList"
-      drag
-      accept=".jpg, .png, .gif"
-      :limit="1"
-      :on-success="submitFormSuccess"
-      :on-exceed="handleExceed"
-      :on-error="submitFormError"
-      :on-change="handleFileChange"
+      :action="url"
      :auto-upload="false"
+      :data="data"
      :disabled="formLoading"
+      :headers="uploadHeaders"
+      :limit="1"
+      :on-change="handleFileChange"
+      :on-error="submitFormError"
+      :on-exceed="handleExceed"
+      :on-success="submitFormSuccess"
+      accept=".jpg, .png, .gif"
+      drag
    >
      <i class="el-icon-upload"></i>
-      <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">
          提示：仅允许导入 jpg、png、gif 格式文件！
@ -25,13 +25,14 @@
      </template>
    </el-upload>
    <template #footer>
-      <el-button @click="submitFileForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitFileForm">确 定</el-button>
      <el-button @click="dialogVisible = false">取 消</el-button>
    </template>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraFileForm" setup>
 import { getAccessToken, getTenantId } from '@/utils/auth'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/views/infra/fileConfig/FileConfigForm.vue
+++ b/src/views/infra/fileConfig/FileConfigForm.vue
@ -1,11 +1,11 @@
 <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="120px"
-      v-loading="formLoading"
    >
      <el-form-item label="配置名" prop="name">
        <el-input v-model="formData.name" placeholder="请输入配置名" />
@ -16,8 +16,8 @@
      <el-form-item label="存储器" prop="storage">
        <el-select
          v-model="formData.storage"
-          placeholder="请选择存储器"
          :disabled="formData.id !== undefined"
+          placeholder="请选择存储器"
        >
          <el-option
            v-for="dict in getDictOptions(DICT_TYPE.INFRA_FILE_STORAGE)"
@ -48,7 +48,7 @@
        label="主机端口"
        prop="config.port"
      >
-        <el-input-number :min="0" v-model="formData.config.port" placeholder="请输入主机端口" />
+        <el-input-number v-model="formData.config.port" :min="0" placeholder="请输入主机端口" />
      </el-form-item>
      <el-form-item
        v-if="formData.storage >= 11 && formData.storage <= 12"
@ -93,14 +93,15 @@
      </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="InfraFileConfigForm" setup>
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import * as FileConfigApi from '@/api/infra/fileConfig'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/views/infra/job/JobDetail.vue
+++ b/src/views/infra/job/JobDetail.vue
@ -1,6 +1,6 @@
 <template>
-  <Dialog title="任务详细" v-model="dialogVisible" width="700px">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" title="任务详细" width="700px">
+    <el-descriptions :column="1" border>
      <el-descriptions-item label="任务编号" min-width="60">
        {{ detailData.id }}
      </el-descriptions-item>
@ -42,7 +42,7 @@
    </el-descriptions>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraJobDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as JobApi from '@/api/infra/job'
--- a/src/views/infra/job/logger/JobLogDetail.vue
+++ b/src/views/infra/job/logger/JobLogDetail.vue
@ -1,6 +1,6 @@
 <template>
-  <Dialog title="任务详细" v-model="dialogVisible" width="700px">
-    <el-descriptions border :column="1">
+  <Dialog v-model="dialogVisible" title="任务详细" width="700px">
+    <el-descriptions :column="1" border>
      <el-descriptions-item label="日志编号" min-width="60">
        {{ detailData.id }}
      </el-descriptions-item>
@ -31,7 +31,7 @@
    </el-descriptions>
  </Dialog>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="JobLogDetail" setup>
 import { DICT_TYPE } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 import * as JobLogApi from '@/api/infra/jobLog'
--- a/src/views/infra/redis/index.vue
+++ b/src/views/infra/redis/index.vue
@ -218,6 +218,7 @@ const getSummary = () => {
  usedMemoryInstance()
 }

+<<<<<<< HEAD
 /** 命令使用情况 */
 const initcommandStatsChart = async () => {
  usedmemoryEchartChika.series[0].data = []
@ -264,6 +265,10 @@ const usedMemoryInstance = async () => {

 /** 初始化 **/
 onMounted(() => {
+=======
+onBeforeMount(() => {
+  // TODO @hiiwbs 微信，优化使用 Echart 组件
+>>>>>>> e92361ed401771998c6abd6d9ba53801a6e0cfa6
  readRedisInfo()
  // 加载数据
  getSummary()
--- a/src/views/infra/webSocket/index.vue
+++ b/src/views/infra/webSocket/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="flex">
-    <el-card class="w-1/2" :gutter="12" shadow="always">
+    <el-card :gutter="12" class="w-1/2" shadow="always">
      <template #header>
        <div class="card-header">
          <span>连接</span>
@ -14,7 +14,7 @@

      <div class="flex">
        <el-input v-model="server" disabled>
-          <template #prepend> 服务地址 </template>
+          <template #prepend> 服务地址</template>
        </el-input>
        <el-button :type="getIsOpen ? 'danger' : 'primary'" @click="toggle">
          {{ getIsOpen ? '关闭连接' : '开启连接' }}
@ -25,15 +25,15 @@
      <el-input
        v-model="sendValue"
        :autosize="{ minRows: 2, maxRows: 4 }"
-        type="textarea"
        :disabled="!getIsOpen"
        clearable
+        type="textarea"
      />
-      <el-button type="primary" block class="mt-4" :disabled="!getIsOpen" @click="handlerSend">
+      <el-button :disabled="!getIsOpen" block class="mt-4" type="primary" @click="handlerSend">
        发送
      </el-button>
    </el-card>
-    <el-card class="w-1/2" :gutter="12" shadow="always">
+    <el-card :gutter="12" class="w-1/2" shadow="always">
      <template #header>
        <div class="card-header">
          <span>消息记录</span>
@ -41,7 +41,7 @@
      </template>
      <div class="max-h-80 overflow-auto">
        <ul>
-          <li v-for="item in getList" class="mt-2" :key="item.time">
+          <li v-for="item in getList" :key="item.time" class="mt-2">
            <div class="flex items-center">
              <span class="mr-2 text-primary font-medium">收到消息:</span>
              <span>{{ formatDate(item.time) }}</span>
@ -55,7 +55,7 @@
    </el-card>
  </div>
 </template>
-<script setup lang="ts">
+<script lang="ts" name="InfraWebSocket" setup>
 import { formatDate } from '@/utils/formatTime'
 import { useUserStore } from '@/store/modules/user'
 import { useWebSocket } from '@vueuse/core'