From d2a4eb92547c26388d233d0a1cb3b0c9b902e85c Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Thu, 10 Nov 2022 14:38:16 +0800
Subject: [PATCH] perf: dict

---
 .../src/hooks/web/useVxeCrudSchemas.ts        |   6 +-
 .../src/hooks/web/useVxeGrid.ts               |  10 +-
 .../src/plugins/vxeTable/index.ts             |   3 -
 .../src/views/system/dict/index.vue           | 301 +++++++++---------
 .../src/views/system/post/index.vue           |   4 +-
 .../src/views/system/post/post.data.ts        |   2 +-
 6 files changed, 161 insertions(+), 165 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
index 57db7578f..4eafbcbdb 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
@@ -121,10 +121,10 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema[]): VxeFormItemProps[] =>
           props: { placeholder: t('common.selectText') }
         }
       }
-
       const searchSchemaItem = {
         // 默认为 input
-        span: 6,
+        span: 8,
+        folding: searchSchema.length > 2,
         itemRender: itemRender,
         ...schemaItem.search,
         field: schemaItem.field,
@@ -140,7 +140,7 @@ const filterSearchSchema = (crudSchema: VxeCrudSchema[]): VxeFormItemProps[] =>
   const buttons: VxeFormItemProps = {
     span: 24,
     align: 'center',
-    collapseNode: true,
+    collapseNode: searchSchema.length > 3,
     itemRender: {
       name: '$buttons',
       children: [
diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
index e27ed52be..c13f0ffbb 100644
--- a/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
+++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeGrid.ts
@@ -38,7 +38,7 @@ export const useVxeGrid = <T = any>(config?: UseVxeGridConfig<T>) => {
   const gridOptions = reactive<VxeGridProps>({
     loading: true,
     size: currentSize as any,
-    height: 800,
+    height: 700,
     rowConfig: {
       isCurrent: true, // 当鼠标点击行时，是否要高亮当前行
       isHover: true // 当鼠标移到行时，是否要高亮当前行
@@ -97,9 +97,11 @@ export const useVxeGrid = <T = any>(config?: UseVxeGridConfig<T>) => {
     }
   })
   const delList = (ids: string | number | string[] | number[]) => {
-    message.delConfirm().then(() => {
-      config?.delListApi && config?.delListApi(ids)
-      message.success(t('common.delSuccess'))
+    return new Promise(async () => {
+      message.delConfirm().then(() => {
+        config?.delListApi && config?.delListApi(ids)
+        message.success(t('common.delSuccess'))
+      })
     })
   }
   return {
diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
index 2b5157635..1da528f70 100644
--- a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
+++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts
@@ -7,7 +7,6 @@ import enUS from 'vxe-table/lib/locale/lang/en-US'
 import {
   // 全局对象
   VXETable,
-
   // 表格功能
   Filter,
   Edit,
@@ -15,7 +14,6 @@ import {
   Export,
   Keyboard,
   Validator,
-
   // 可选组件
   Icon,
   Column,
@@ -42,7 +40,6 @@ import {
   Modal,
   List,
   Pulldown,
-
   // 表格
   Table
 } from 'vxe-table'
diff --git a/yudao-ui-admin-vue3/src/views/system/dict/index.vue b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
index 26cc911a3..f9018d6e1 100644
--- a/yudao-ui-admin-vue3/src/views/system/dict/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/dict/index.vue
@@ -1,3 +1,152 @@
+<template>
+  <div class="flex">
+    <el-card class="w-1/2 dict" :gutter="12" shadow="always">
+      <template #header>
+        <div class="card-header">
+          <span>字典分类</span>
+        </div>
+      </template>
+      <Search
+        :schema="DictTypeSchemas.allSchemas.searchSchema"
+        @search="setTypeSearchParams"
+        @reset="setTypeSearchParams"
+      />
+      <!-- 操作工具栏 -->
+      <div class="mb-10px">
+        <XButton
+          type="primary"
+          preIcon="ep:zoom-in"
+          :title="t('action.add')"
+          v-hasPermi="['system:dict:create']"
+          @click="handleTypeCreate()"
+        />
+      </div>
+      <!-- 列表 -->
+      <Table
+        @row-click="onClickType"
+        :columns="DictTypeSchemas.allSchemas.tableColumns"
+        :selection="false"
+        :data="typeTableObject.tableList"
+        :loading="typeTableObject.loading"
+        :pagination="{
+          total: typeTableObject.total
+        }"
+        :highlight-current-row="true"
+        v-model:pageSize="typeTableObject.pageSize"
+        v-model:currentPage="typeTableObject.currentPage"
+        @register="typeRegister"
+      >
+        <template #status="{ row }">
+          <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
+        </template>
+        <template #action="{ row }">
+          <XTextButton
+            preIcon="ep:edit"
+            :title="t('action.edit')"
+            v-hasPermi="['system:dict:update']"
+            @click="handleTypeUpdate(row)"
+          />
+          <XTextButton
+            preIcon="ep:delete"
+            :title="t('action.del')"
+            v-hasPermi="['system:dict:delete']"
+            @click="delTypeList(row.id, false)"
+          />
+        </template>
+      </Table>
+    </el-card>
+    <el-card class="w-1/2 dict" style="margin-left: 10px" :gutter="12" shadow="hover">
+      <template #header>
+        <div class="card-header">
+          <span>字典数据</span>
+        </div>
+      </template>
+      <!-- 列表 -->
+      <div v-if="!tableTypeSelect">
+        <span>请从左侧选择</span>
+      </div>
+      <div v-if="tableTypeSelect">
+        <Search
+          :schema="DictDataSchemas.allSchemas.searchSchema"
+          @search="setDataSearchParams"
+          @reset="setDataSearchParams"
+        />
+        <!-- 操作工具栏 -->
+        <div class="mb-10px">
+          <XButton
+            type="primary"
+            preIcon="ep:zoom-in"
+            :title="t('action.add')"
+            v-hasPermi="['system:dict:create']"
+            @click="handleDataCreate()"
+          />
+        </div>
+        <Table
+          :columns="DictDataSchemas.allSchemas.tableColumns"
+          :selection="false"
+          :data="dataTableObject.tableList"
+          :loading="dataTableObject.loading"
+          :pagination="{
+            total: dataTableObject.total
+          }"
+          v-model:pageSize="dataTableObject.pageSize"
+          v-model:currentPage="dataTableObject.currentPage"
+          @register="dataRegister"
+        >
+          <template #status="{ row }">
+            <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
+          </template>
+          <template #action="{ row }">
+            <XTextButton
+              v-hasPermi="['system:dict:update']"
+              preIcon="ep:edit"
+              :title="t('action.edit')"
+              @click="handleDataUpdate(row)"
+            />
+            <XTextButton
+              v-hasPermi="['system:dict:delete']"
+              preIcon="ep:delete"
+              :title="t('action.del')"
+              @click="delDataList(row.id, false)"
+            />
+          </template>
+        </Table>
+      </div>
+    </el-card>
+    <Dialog v-model="dialogVisible" :title="dialogTitle">
+      <Form
+        v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
+        :schema="DictTypeSchemas.allSchemas.formSchema"
+        :rules="DictTypeSchemas.dictTypeRules"
+        ref="typeFormRef"
+      />
+      <Form
+        v-if="['dataCreate', 'dataUpdate'].includes(actionType)"
+        :schema="DictDataSchemas.allSchemas.formSchema"
+        :rules="DictDataSchemas.dictDataRules"
+        ref="dataFormRef"
+      />
+      <!-- 操作按钮 -->
+      <template #footer>
+        <XButton
+          v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
+          type="primary"
+          :title="t('action.save')"
+          :loading="actionLoading"
+          @click="submitTypeForm"
+        />
+        <XButton
+          v-if="['dataCreate', 'dataUpdate'].includes(actionType)"
+          type="primary"
+          :title="t('action.save')"
+          :loading="actionLoading"
+          @click="submitDataForm"
+        />
+        <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
+      </template>
+    </Dialog>
+  </div>
+</template>
 <script setup lang="ts">
 import { ref, unref, onMounted } from 'vue'
 import { DICT_TYPE } from '@/utils/dict'
@@ -148,155 +297,3 @@ onMounted(async () => {
   typeTableObject.tableList[0] && onClickType(typeTableObject.tableList[0])
 })
 </script>
-
-<template>
-  <div class="flex">
-    <el-card class="w-1/2 dict" :gutter="12" shadow="always">
-      <template #header>
-        <div class="card-header">
-          <span>字典分类</span>
-        </div>
-      </template>
-      <Search
-        :schema="DictTypeSchemas.allSchemas.searchSchema"
-        @search="setTypeSearchParams"
-        @reset="setTypeSearchParams"
-      />
-      <!-- 操作工具栏 -->
-      <div class="mb-10px">
-        <el-button type="primary" v-hasPermi="['system:dict:create']" @click="handleTypeCreate">
-          <Icon icon="ep:zoom-in" class="mr-5px" /> {{ t('action.add') }}
-        </el-button>
-      </div>
-      <!-- 列表 -->
-      <Table
-        @row-click="onClickType"
-        :columns="DictTypeSchemas.allSchemas.tableColumns"
-        :selection="false"
-        :data="typeTableObject.tableList"
-        :loading="typeTableObject.loading"
-        :pagination="{
-          total: typeTableObject.total
-        }"
-        :highlight-current-row="true"
-        v-model:pageSize="typeTableObject.pageSize"
-        v-model:currentPage="typeTableObject.currentPage"
-        @register="typeRegister"
-      >
-        <template #status="{ row }">
-          <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
-        </template>
-        <template #action="{ row }">
-          <el-button
-            link
-            type="primary"
-            v-hasPermi="['system:dict:update']"
-            @click="handleTypeUpdate(row)"
-          >
-            <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            v-hasPermi="['system:dict:delete']"
-            @click="delTypeList(row.id, false)"
-          >
-            <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
-          </el-button>
-        </template>
-      </Table>
-    </el-card>
-    <el-card class="w-1/2 dict" style="margin-left: 10px" :gutter="12" shadow="hover">
-      <template #header>
-        <div class="card-header">
-          <span>字典数据</span>
-        </div>
-      </template>
-      <!-- 列表 -->
-      <div v-if="!tableTypeSelect">
-        <span>请从左侧选择</span>
-      </div>
-      <div v-if="tableTypeSelect">
-        <Search
-          :schema="DictDataSchemas.allSchemas.searchSchema"
-          @search="setDataSearchParams"
-          @reset="setDataSearchParams"
-        />
-        <!-- 操作工具栏 -->
-        <div class="mb-10px">
-          <el-button type="primary" v-hasPermi="['system:dict:create']" @click="handleDataCreate">
-            <Icon icon="ep:zoom-in" class="mr-1px" /> {{ t('action.add') }}
-          </el-button>
-        </div>
-        <Table
-          :columns="DictDataSchemas.allSchemas.tableColumns"
-          :selection="false"
-          :data="dataTableObject.tableList"
-          :loading="dataTableObject.loading"
-          :pagination="{
-            total: dataTableObject.total
-          }"
-          v-model:pageSize="dataTableObject.pageSize"
-          v-model:currentPage="dataTableObject.currentPage"
-          @register="dataRegister"
-        >
-          <template #status="{ row }">
-            <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="row.status" />
-          </template>
-          <template #action="{ row }">
-            <el-button
-              link
-              type="primary"
-              v-hasPermi="['system:dict:update']"
-              @click="handleDataUpdate(row)"
-            >
-              <Icon icon="ep:edit" class="mr-1px" /> {{ t('action.edit') }}
-            </el-button>
-            <el-button
-              link
-              type="primary"
-              v-hasPermi="['system:dict:delete']"
-              @click="delDataList(row.id, false)"
-            >
-              <Icon icon="ep:delete" class="mr-1px" /> {{ t('action.del') }}
-            </el-button>
-          </template>
-        </Table>
-      </div>
-    </el-card>
-    <Dialog v-model="dialogVisible" :title="dialogTitle">
-      <Form
-        v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
-        :schema="DictTypeSchemas.allSchemas.formSchema"
-        :rules="DictTypeSchemas.dictTypeRules"
-        ref="typeFormRef"
-      />
-      <Form
-        v-if="['dataCreate', 'dataUpdate'].includes(actionType)"
-        :schema="DictDataSchemas.allSchemas.formSchema"
-        :rules="DictDataSchemas.dictDataRules"
-        ref="dataFormRef"
-      />
-      <!-- 操作按钮 -->
-      <template #footer>
-        <el-button
-          v-if="['typeCreate', 'typeUpdate'].includes(actionType)"
-          type="primary"
-          :loading="actionLoading"
-          @click="submitTypeForm"
-        >
-          {{ t('action.save') }}
-        </el-button>
-        <el-button
-          v-if="['dataCreate', 'dataUpdate'].includes(actionType)"
-          type="primary"
-          :loading="actionLoading"
-          @click="submitDataForm"
-        >
-          {{ t('action.save') }}
-        </el-button>
-        <el-button @click="dialogVisible = false">{{ t('dialog.close') }}</el-button>
-      </template>
-    </Dialog>
-  </div>
-</template>
diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue
index 0f447cbf9..f1f7a7df5 100644
--- a/yudao-ui-admin-vue3/src/views/system/post/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue
@@ -60,9 +60,9 @@
     <template #footer>
       <XButton
         v-if="['create', 'update'].includes(actionType)"
-        :loading="actionLoading"
-        :title="t('action.save')"
         type="primary"
+        :title="t('action.save')"
+        :loading="actionLoading"
         @click="submitForm"
       />
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
diff --git a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts
index 6232e41a1..2226ef343 100644
--- a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts
@@ -17,7 +17,7 @@ const crudSchemas = reactive<VxeCrudSchema[]>([
   {
     title: t('common.index'),
     field: 'id',
-    type: 'index',
+    type: 'seq',
     form: {
       show: false
     },