refactor: 字典界面优化

Former-commit-id: e071bde67c7c65152a1fda1607d1ad4846153404

src/views/system/dict/components/DictItem.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 export default {
-  name: 'dictItem',
+  name: 'dictItem'
 };
 </script>
 
@@ -13,7 +13,7 @@ import {
   getDictItemData,
   saveDictItem,
   updateDictItem,
-  deleteDictItems,
+  deleteDictItems
 } from '@/api/dict';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
 import { DictItem, DictItemForm, DictItemQuery } from '@/api/dict/types';
@@ -23,19 +23,19 @@ const props = defineProps({
     type: String,
     default: () => {
       return '';
-    },
+    }
   },
   typeName: {
     type: String,
     default: () => {
       return '';
-    },
+    }
-  },
+  }
 });
 
 watch(
   () => props.typeCode,
-  (value) => {
+  value => {
     state.queryParams.typeCode = value;
     state.formData.typeCode = value;
     handleQuery();
@@ -49,10 +49,6 @@ const state = reactive({
   loading: true,
   // 选中ID数组
   ids: [] as number[],
-  // 非单个禁用
-  single: true,
-  // 非多个禁用
-  multiple: true,
   total: 0,
   queryParams: { pageNum: 1, pageSize: 10 } as DictItemQuery,
   dictItemList: [] as DictItem[],
@@ -61,40 +57,40 @@ const state = reactive({
     typeCode: props.typeCode,
     typeName: props.typeName,
     status: 1,
-    sort: 1,
+    sort: 1
   } as DictItemForm,
   rules: {
     name: [{ required: true, message: '请输入字典项名称', trigger: 'blur' }],
-    value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }],
+    value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }]
   },
   localDictCode: props.typeCode,
-  localDictName: props.typeName,
+  localDictName: props.typeName
 });
 
 const {
   loading,
-  multiple,
+  ids,
   queryParams,
   dictItemList,
   dialog,
   formData,
   rules,
-  total,
+  total
 } = toRefs(state);
 
 function handleQuery() {
-  if (state.queryParams.typeCode) {
+  if (queryParams.value.typeCode) {
-    state.loading = true;
+    loading.value = true;
     listDictItemPages(state.queryParams).then(({ data }) => {
-      state.dictItemList = data.list;
+      dictItemList.value = data.list;
-      state.total = data.total;
+      total.value = data.total;
-      state.loading = false;
+      loading.value = false;
     });
   } else {
-    state.dictItemList = [];
+    dictItemList.value = [];
-    state.total = 0;
+    total.value = 0;
-    state.queryParams.pageNum = 1;
+    queryParams.value.pageNum = 1;
-    state.loading = false;
+    loading.value = false;
   }
 }
 
@@ -105,8 +101,6 @@ function resetQuery() {
 
 function handleSelectionChange(selection: any) {
   state.ids = selection.map((item: any) => item.id);
-  state.single = selection.length !== 1;
-  state.multiple = !selection.length;
 }
 
 function handleAdd() {
@@ -116,14 +110,14 @@ function handleAdd() {
   }
   state.dialog = {
     title: '添加字典数据项',
-    visible: true,
+    visible: true
   };
 }
 
 function handleUpdate(row: any) {
   state.dialog = {
     title: '修改字典数据项',
-    visible: true,
+    visible: true
   };
   const id = row.id || state.ids;
   getDictItemData(id).then(({ data }) => {
@@ -162,7 +156,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning',
+    type: 'warning'
   })
     .then(() => {
       deleteDictItems(ids).then(() => {
@@ -182,24 +176,8 @@ onMounted(() => {
   <div class="app-container">
     <!-- 搜索表单 -->
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-      <el-form-item>
+      <el-form-item label="关键字" prop="name">
-        <el-button type="success" :icon="Plus" @click="handleAdd"
+        <el-input v-model="queryParams.name" placeholder="数据标签" clearable />
-          >新增</el-button
-        >
-        <el-button
-          type="danger"
-          :icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          >删除</el-button
-        >
-      </el-form-item>
-      <el-form-item prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="数据项名称"
-          clearable
-        />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" :icon="Search" @click="handleQuery"
@@ -209,6 +187,20 @@ onMounted(() => {
       </el-form-item>
     </el-form>
 
+    <el-card shadow="false">
+      <template #header>
+        <el-button type="success" :icon="Plus" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          type="danger"
+          :icon="Delete"
+          :disabled="ids.length === 0"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </template>
+
       <!-- 数据表格 -->
       <el-table
         :data="dictItemList"
@@ -216,9 +208,9 @@ onMounted(() => {
         border
         @selection-change="handleSelectionChange"
       >
-      <el-table-column type="selection" min-width="5%" />
+        <el-table-column type="selection" width="50" />
-      <el-table-column label="数据项名称" prop="name" />
+        <el-table-column label="数据标签" prop="name" />
-      <el-table-column label="数据项值" prop="value" />
+        <el-table-column label="数据值" prop="value" />
         <el-table-column label="状态" align="center">
           <template #default="scope">
             <el-tag v-if="scope.row.status === 1" type="success">启用</el-tag>
@@ -227,20 +219,12 @@ onMounted(() => {
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template #default="scope">
-          <el-button
+            <el-button type="primary" link @click="handleUpdate(scope.row)"
-            type="primary"
+              >编辑</el-button
-            :icon="Edit"
+            >
-            circle
+            <el-button type="danger" link @click.stop="handleDelete(scope.row)"
-            plain
+              >删除</el-button
-            @click.stop="handleUpdate(scope.row)"
+            >
-          />
-          <el-button
-            type="danger"
-            :icon="Delete"
-            circle
-            plain
-            @click.stop="handleDelete(scope.row)"
-          />
           </template>
         </el-table-column>
       </el-table>
@@ -252,6 +236,7 @@ onMounted(() => {
         v-model:limit="queryParams.pageSize"
         @pagination="handleQuery"
       />
+    </el-card>
 
     <!-- 表单弹窗 -->
     <el-dialog

src/views/system/dict/components/DictType.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 export default {
-  name: 'dictType',
+  name: 'dictType'
 };
 </script>
 
@@ -8,20 +8,7 @@ export default {
   <div class="app-container">
     <!-- 搜索表单 -->
     <el-form ref="queryFormRef" :model="state.queryParams" :inline="true">
-      <el-form-item>
+      <el-form-item label="关键字" prop="name">
-        <el-button type="success" :icon="Plus" @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button
-          type="danger"
-          :icon="Delete"
-          :disabled="state.multiple"
-          @click="handleDelete"
-          >删除
-        </el-button>
-      </el-form-item>
-
-      <el-form-item prop="name">
         <el-input
           v-model="state.queryParams.name"
           placeholder="字典名称"
@@ -36,7 +23,19 @@ export default {
         <el-button :icon="Refresh" @click="resetQuery()">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <el-card shadow="false">
+      <template #header>
+        <el-button type="success" :icon="Plus" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          type="danger"
+          :icon="Delete"
+          :disabled="ids.length === 0"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </template>
       <!-- 数据表格 -->
       <el-table
         highlight-current-row
@@ -58,20 +57,12 @@ export default {
 
         <el-table-column label="操作" align="center" width="150">
           <template #default="scope">
-          <el-button
+            <el-button type="primary" link @click.stop="handleUpdate(scope.row)"
-            type="primary"
+              >编辑</el-button
-            :icon="Edit"
+            >
-            circle
+            <el-button type="danger" link @click.stop="handleDelete(scope.row)"
-            plain
+              >删除</el-button
-            @click.stop="handleUpdate(scope.row)"
+            >
-          />
-          <el-button
-            type="danger"
-            :icon="Delete"
-            circle
-            plain
-            @click.stop="handleDelete(scope.row)"
-          />
           </template>
         </el-table-column>
       </el-table>
@@ -83,6 +74,7 @@ export default {
         v-model:limit="queryParams.pageSize"
         @pagination="handleQuery"
       />
+    </el-card>
 
     <!-- 弹窗表单 -->
     <el-dialog
@@ -135,9 +127,9 @@ import {
   getDictTypeForm,
   addDictType,
   updateDictType,
-  deleteDictTypes,
+  deleteDictTypes
 } from '@/api/dict';
-import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
+import { Search, Plus, Refresh, Delete } from '@element-plus/icons-vue';
 import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
 import { Dict, DictQuery, DictTypeForm } from '@/api/dict/types';
 
@@ -150,27 +142,23 @@ const state = reactive({
   loading: true,
   // 选中ID数组
   ids: [] as number[],
-  // 非单个禁用
-  single: true,
-  // 非多个禁用
-  multiple: true,
   queryParams: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 10
   } as DictQuery,
   dictList: [] as Dict[],
   total: 0,
   dialog: { visible: false } as DialogType,
   formData: {
-    status: 1,
+    status: 1
   } as DictTypeForm,
   rules: {
     name: [{ required: true, message: '请输入字典名称', trigger: 'blur' }],
-    code: [{ required: true, message: '请输入字典编码', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入字典编码', trigger: 'blur' }]
-  },
+  }
 });
 
-const { total, dialog, loading, dictList, formData, rules, queryParams } =
+const { total, ids, dialog, loading, dictList, formData, rules, queryParams } =
   toRefs(state);
 
 function handleQuery() {
@@ -190,21 +178,19 @@ function resetQuery() {
 
 function handleSelectionChange(selection: any) {
   state.ids = selection.map((item: any) => item.id);
-  state.single = selection.length !== 1;
-  state.multiple = !selection.length;
 }
 
 function handleAdd() {
   state.dialog = {
     title: '添加字典',
-    visible: true,
+    visible: true
   };
 }
 
 function handleUpdate(row: any) {
   state.dialog = {
     title: '修改字典',
-    visible: true,
+    visible: true
   };
   const id = row.id || state.ids;
   getDictTypeForm(id).then(({ data }) => {
@@ -233,9 +219,9 @@ function submitForm() {
 }
 
 function cancel() {
-  state.formData.id = undefined;
+  formData.value.id = undefined;
   dataFormRef.value.resetFields();
-  state.dialog.visible = false;
+  dialog.value.visible = false;
 }
 
 function handleDelete(row: any) {
@@ -243,7 +229,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning',
+    type: 'warning'
   })
     .then(() => {
       deleteDictTypes(ids).then(() => {