refactor: eslint代码检查优化

Former-commit-id: 4c11b5d0cdd10f28148cf3d9b593f85e082cdc51

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

@@ -3,43 +3,23 @@
     <!-- 搜索表单 -->
     <el-form ref="queryFormRef" :model="state.queryParams" :inline="true">
       <el-form-item>
-        <el-button type="success" :icon="Plus" @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button
-          type="danger"
-          :icon="Delete"
-          :disabled="state.multiple"
-          @click="handleDelete"
-          >删除
+        <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="字典名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="state.queryParams.name" placeholder="字典名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" :icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button :icon="Refresh" @click="resetForm">重置</el-button>
+        <el-button type="primary" :icon="Search" @click="handleQuery()">搜索</el-button>
+        <el-button :icon="Refresh" @click="resetQuery()">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 数据表格 -->
-    <el-table
-      highlight-current-row
-      :data="dictList"
-      v-loading="loading"
-      @row-click="handleRowClick"
-      @selection-change="handleSelectionChange"
-      border
-    >
+    <el-table highlight-current-row :data="dictList" v-loading="loading" @row-click="handleRowClick"
+      @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典名称" prop="name" width="120" />
       <el-table-column label="字典编码" prop="code" />
@@ -52,45 +32,18 @@
 
       <el-table-column label="操作" align="center" width="150">
         <template #default="scope">
-          <el-button
-            type="primary"
-            :icon="Edit"
-            circle
-            plain
-            @click.stop="handleUpdate(scope.row)"
-          />
-          <el-button
-            type="danger"
-            :icon="Delete"
-            circle
-            plain
-            @click.stop="handleDelete(scope.row)"
-          />
+          <el-button type="primary" :icon="Edit" circle plain @click.stop="handleUpdate(scope.row)" />
+          <el-button type="danger" :icon="Delete" circle plain @click.stop="handleDelete(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="handleQuery"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="handleQuery" />
 
     <!-- 弹窗表单 -->
-    <el-dialog
-      :title="dialog.title"
-      v-model="dialog.visible"
-      width="500px"
-      @close="cancel"
-    >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-      >
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" @close="cancel">
+      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入字典名称" />
         </el-form-item>
@@ -104,12 +57,8 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="formData.remark"
-            type="textarea"
-            placeholder="请输入内容"
-            :autosize="{ minRows: 2, maxRows: 4 }"
-          />
+          <el-input v-model="formData.remark" type="textarea" placeholder="请输入内容"
+            :autosize="{ minRows: 2, maxRows: 4 }" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -123,7 +72,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, toRefs } from "vue";
+import { onMounted, reactive, ref, toRefs, defineEmits } from "vue";
 import {
   listDictPages,
   getDictFormDetail,
@@ -134,7 +83,6 @@ import {
 import { Search, Plus, Edit, Refresh, Delete } from "@element-plus/icons-vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
 import { Dialog, Dict, DictFormData, DictQueryParam } from "@/types";
-import { status } from "nprogress";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -155,7 +103,7 @@ const state = reactive({
   } as DictQueryParam,
   dictList: [] as Dict[],
   total: 0,
-  dialog: {visible:false} as Dialog,
+  dialog: { visible: false } as Dialog,
   formData: {
     status: 1,
   } as DictFormData,
@@ -168,14 +116,11 @@ const state = reactive({
 const {
   total,
   dialog,
-  ids,
   loading,
-  single,
-  multiple,
-  queryParams,
   dictList,
   formData,
   rules,
+  queryParams
 } = toRefs(state);
 
 function handleQuery() {
@@ -221,15 +166,15 @@ function submitForm() {
   dataFormRef.value.validate((isValid: boolean) => {
     if (isValid) {
       if (state.formData.id) {
-        updateDict(state.formData.id, state.formData).then((response) => {
+        updateDict(state.formData.id, state.formData).then(() => {
           ElMessage.success("修改成功");
-          state.dialog.visible = false;
+         cancel()
           handleQuery();
         });
       } else {
-        addDict(state.formData).then((response) => {
+        addDict(state.formData).then(() => {
           ElMessage.success("新增成功");
-          state.dialog.visible = false;
+          cancel()
           handleQuery();
         });
       }
@@ -237,12 +182,9 @@ function submitForm() {
   });
 }
 
-function resetForm() {
+function cancel() {
   state.formData.id = undefined;
   dataFormRef.value.resetFields();
-}
-
-function cancel() {
   state.dialog.visible = false;
 }
 

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

@@ -3,39 +3,20 @@
     <!-- 搜索表单 -->
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
       <el-form-item>
-        <el-button type="success" :icon="Plus" @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button
-          type="danger"
-          :icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          >删除</el-button
-        >
+        <el-button type="success" :icon="Plus" @click="handleAdd">新增</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-input v-model="queryParams.name" placeholder="数据项名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" :icon="Search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" :icon="Search" @click="handleQuery">搜索</el-button>
         <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 数据表格 -->
-    <el-table
-      :data="dictItemList"
-      v-loading="loading"
-      border
-      @selection-change="handleSelectionChange"
-    >
+    <el-table :data="dictItemList" v-loading="loading" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" min-width="5%" />
       <el-table-column label="数据项名称" prop="name" />
       <el-table-column label="数据项值" prop="value" />
@@ -47,76 +28,37 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            type="primary"
-            :icon="Edit"
-            circle
-            plain
-            @click.stop="handleUpdate(scope.row)"
-          />
-          <el-button
-            type="danger"
-            :icon="Delete"
-            circle
-            plain
-            @click.stop="handleDelete(scope.row)"
-          />
+          <el-button type="primary" :icon="Edit" circle plain @click.stop="handleUpdate(scope.row)" />
+          <el-button type="danger" :icon="Delete" circle plain @click.stop="handleDelete(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="state.total > 0"
-      :total="state.total"
-      v-model:page="state.queryParams.pageNum"
-      v-model:limit="state.queryParams.pageSize"
-      @pagination="handleQuery"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="handleQuery" />
 
     <!-- 表单弹窗 -->
-    <el-dialog
-      :title="dialog.title"
-      v-model="dialog.visible"
-      width="500px"
-      @close="cancel"
-    >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" @close="cancel">
+      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="字典名称">
-          <el-input v-model="props.dictName" :disabled="true" />
         </el-form-item>
         <el-form-item label="字典项名称" prop="name">
-          <el-input
-            v-model="state.formData.name"
-            placeholder="请输入字典项名称"
-          />
+          <el-input v-model="formData.name" placeholder="请输入字典项名称" />
         </el-form-item>
         <el-form-item label="字典项值" prop="value">
-          <el-input
-            v-model="state.formData.value"
-            placeholder="请输入字典项值"
-          />
+          <el-input v-model="formData.value" placeholder="请输入字典项值" />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input-number
-            v-model="state.formData.sort"
-            style="width: 80px"
-            controls-position="right"
-            :min="0"
-          />
+          <el-input-number v-model="formData.sort" style="width: 80px" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="state.formData.status">
+          <el-radio-group v-model="formData.status">
             <el-radio :label="1">正常</el-radio>
             <el-radio :label="0">停用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="state.formData.remark" type="textarea"></el-input>
+          <el-input v-model="formData.remark" type="textarea"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -130,7 +72,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, toRefs, unref, watch } from "vue";
+import { onMounted, reactive, ref, toRefs,  watch } from "vue";
 import { ElForm, ElMessage, ElMessageBox } from "element-plus";
 import {
   Dialog,
@@ -147,15 +89,18 @@ import {
 } from "@/api/system/dict";
 import { Search, Plus, Edit, Refresh, Delete } from "@element-plus/icons-vue";
 
-
 const props = defineProps({
   dictCode: {
     type: String,
-    default: "",
+    default: () => {
+      return ''
+    }
   },
   dictName: {
     type: String,
-    default: "",
+    default: () => {
+      return ''
+    }
   },
 });
 
@@ -179,32 +124,33 @@ const state = reactive({
   single: true,
   // 非多个禁用
   multiple: true,
+  total: 0,
   queryParams: { pageNum: 1, pageSize: 10 } as DictItemQueryParam,
   dictItemList: [] as DictItem[],
-  total: 0,
   dialog: { visible: false } as Dialog,
   formData: {
     dictCode: props.dictCode,
+    dictName: props.dictName,
     status: 1,
     sort: 1,
   } as DictItemFormData,
   rules: {
     name: [{ required: true, message: "请输入字典项名称", trigger: "blur" }],
-    value: [{ required: true, message: "请输入字典项值", trigger: "blur" }],
+    value: [{ required: true, message: "请输入字典项值", trigger: "blur" }]
   },
+  localDictCode: props.dictCode,
+  localDictName: props.dictName
 });
 
 const {
   loading,
-  ids,
-  single,
   multiple,
   queryParams,
   dictItemList,
-  total,
   dialog,
   formData,
   rules,
+  total
 } = toRefs(state);
 
 function handleQuery() {
@@ -260,15 +206,15 @@ function submitForm() {
   dataFormRef.value.validate((isValid: boolean) => {
     if (isValid) {
       if (state.formData.id) {
-        updateDictItem(state.formData.id, state.formData).then((response) => {
+        updateDictItem(state.formData.id, state.formData).then(() => {
           ElMessage.success("修改成功");
-          state.dialog.visible = false;
+          cancel();
           handleQuery();
         });
       } else {
-        addDictItem(state.formData).then((response) => {
+        addDictItem(state.formData).then(() => {
           ElMessage.success("新增成功");
-          state.dialog.visible = false;
+          cancel();
           handleQuery();
         });
       }
@@ -276,13 +222,10 @@ function submitForm() {
   });
 }
 
-function resetForm() {
-  state.formData.id = undefined;
-  dataFormRef.value.resetFields();
-}
-
 function cancel() {
   state.dialog.visible = false;
+  state.formData.id = undefined;
+  dataFormRef.value.resetFields();
 }
 
 function handleDelete(row: any) {

src/views/system/dict/index.vue

@@ -17,11 +17,11 @@
           <template #header>
             <svg-icon color="#333" icon-class="dict"/>
             <span style="margin:0 5px;">字典数据项</span>
-            <el-tag type="success" v-if=" state.dictCode" size="small">{{ state.dictName }}</el-tag>
+            <el-tag type="success" v-if="dictCode" size="small">{{dictName }}</el-tag>
             <el-tag type="warning" v-else size="small">未选择字典</el-tag>
           </template>
           <!-- 字典项组件 -->
-          <dict-item :dictName="state.dictName" :dictCode='state.dictCode'/>
+          <dict-item :dictName="dictName" :dictCode='dictCode'/>
         </el-card>
       </el-col>
     </el-row>