From d768a385e6e5a7de3e771c7be7ac65a74a9b3d5b Mon Sep 17 00:00:00 2001
From: autumnal_wind@yeah.net <autumnal_wind@yeah.net>
Date: 星期二, 28 五月 2024 16:28:08 +0800
Subject: [PATCH] feat: 数据字典改造
---
src/views/basis/sysParam/config/index.vue | 99 ++++++++++++-------------------------------------
src/views/system/dict/data.vue | 2
src/views/basis/sysParam/config/DetailForm.vue | 10 ++--
src/router/index.ts | 4 +-
src/views/system/dict/index.vue | 2
5 files changed, 33 insertions(+), 84 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 271385c..ecc6790 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -122,7 +122,7 @@
]
},
{
- path: '/system/dict-data',
+ path: '/basis/parameter/dict-data',
component: Layout,
hidden: true,
permissions: ['system:dict:list'],
@@ -131,7 +131,7 @@
path: 'index/:dictId(\\d+)',
component: () => import('@/views/system/dict/data.vue'),
name: 'Data',
- meta: { title: '字典数据', activeMenu: '/system/dict', icon: '' }
+ meta: { title: '字典数据', activeMenu: '/basis/parameter/dict', icon: '' }
}
]
},
diff --git a/src/views/basis/sysParam/config/DetailForm.vue b/src/views/basis/sysParam/config/DetailForm.vue
index f5ee739..ce7b418 100644
--- a/src/views/basis/sysParam/config/DetailForm.vue
+++ b/src/views/basis/sysParam/config/DetailForm.vue
@@ -31,10 +31,10 @@
<script setup lang="ts">
// 模块导入
import {ConfigForm} from "@/api/system/config/types";
-import {addConfig, getConfig, updateConfig} from "@/api/system/config";
+import * as configApi from '@/api/system/config'
import {useI18n} from "vue-i18n";
-
+defineOptions({ name: 'SysConfigForm' })
// 接收父组件传入属性
// const props = defineProps({})
@@ -84,7 +84,7 @@
if (id) {
formLoading.value = true
try {
- const res = await getConfig(id);
+ const res = await configApi.getConfig(id);
Object.assign(formData.value, res.data);
} finally {
formLoading.value = false
@@ -121,10 +121,10 @@
try {
const data = formData.value as unknown as ConfigForm
if (formType.value === 'create') {
- await addConfig(data)
+ await configApi.addConfig(data)
proxy?.$modal.msgSuccess("新增参数成功");
} else {
- await updateConfig(data)
+ await configApi.updateConfig(data)
proxy?.$modal.msgSuccess("修改参数成功");
}
dialog.visible = false
diff --git a/src/views/basis/sysParam/config/index.vue b/src/views/basis/sysParam/config/index.vue
index eab1c24..ab13596 100644
--- a/src/views/basis/sysParam/config/index.vue
+++ b/src/views/basis/sysParam/config/index.vue
@@ -3,7 +3,7 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="70px" class="-mb-15px">
<el-form-item label="参数名称" prop="configName">
<el-input v-model="queryParams.configName" placeholder="请输入参数名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
@@ -23,7 +23,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+ :default-time="[new Date(2024, 1, 1, 0, 0, 0), new Date(2024, 1, 1, 23, 59, 59)]"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -55,7 +55,7 @@
</el-row>
</template>
- <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="参数主键" align="center" prop="configId" v-if="false" />
<el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
@@ -91,37 +91,35 @@
</template>
<script setup name="Config" lang="ts">
+/** 模块导入 */
import { listConfig, delConfig, refreshCache } from "@/api/system/config";
import { ConfigVO } from "@/api/system/config/types";
import DetailForm from "@/views/basis/sysParam/config/DetailForm.vue";
+defineOptions({ name: 'SysConfig' })
+
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+/** 当前页面引用的数据字典 */
const { sys_yes_no } = toRefs<any>(proxy?.useDict("sys_yes_no"));
-
-const configList = ref<ConfigVO[]>([]);
+// 是否加载遮罩层
const loading = ref(true);
+// 是否显示查询项
const showSearch = ref(true);
+// 列表数据
+const dataList = ref<ConfigVO[]>([]);
+// 列表选中的记录Id
const ids = ref<Array<number | string>>([]);
+// 单选
const single = ref(true);
+// 多选
const multiple = ref(true);
+// 总记录数
const total = ref(0);
+// 日期范围
const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
-
-const detailFormRef = ref();
+// 查询表单
const queryFormRef = ref<ElFormInstance>();
-// const configFormRef = ref<ElFormInstance>();
-// const dialog = reactive<DialogOption>({
-// visible: false,
-// title: ''
-// });
-// const initFormData: ConfigForm = {
-// configId: undefined,
-// configName: '',
-// configKey: '',
-// configValue: '',
-// configType: "Y",
-// remark: ''
-// }
+// 查询参数
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
@@ -129,45 +127,21 @@
configKey: '',
configType: ''
})
-// const data = reactive<PageData<ConfigForm, ConfigQuery>>({
-// // form: { ...initFormData },
-// queryParams: {
-// pageNum: 1,
-// pageSize: 10,
-// configName: '',
-// configKey: '',
-// configType: '',
-// },
- // rules: {
- // configName: [{ required: true, message: "参数名称不能为空", trigger: "blur" }],
- // configKey: [{ required: true, message: "参数键名不能为空", trigger: "blur" }],
- // configValue: [{ required: true, message: "参数键值不能为空", trigger: "blur" }]
- // }
-// });
-
-// const { queryParams, form, rules } = toRefs(data);
/** 查询参数列表 */
const getList = async () => {
loading.value = true;
const res = await listConfig(queryParams);
- configList.value = res.rows;
+ dataList.value = res.rows;
total.value = res.total;
loading.value = false;
}
+/** 弹出框(增加、修改) */
+const detailFormRef = ref();
const openForm = (type: string, id?: number) => {
- detailFormRef.value.open(type, id)
+ detailFormRef?.value.open(type, id)
}
-/** 取消按钮 */
-// const cancel = () => {
-// reset();
- // dialog.visible = false;
-// }
-/** 表单重置 */
-// const reset = () => {
- // form.value = { ...initFormData };
- // configFormRef.value?.resetFields();
-// }
+
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNum = 1;
@@ -184,32 +158,7 @@
single.value = selection.length != 1;
multiple.value = !selection.length;
}
-/** 新增按钮操作 */
-// const handleAdd = () => {
-// reset();
- // dialog.visible = true;
- // dialog.title = "添加参数";
-// }
-/** 修改按钮操作 */
-// const handleUpdate = async (row?: ConfigVO) => {
-// reset();
- // const configId = row?.configId || ids.value[0];
- // const res = await getConfig(configId);
- // Object.assign(form.value, res.data);
- // dialog.visible = true;
- // dialog.title = "修改参数";
-// }
-/** 提交按钮 */
-// const submitForm = () => {
- // configFormRef.value?.validate(async (valid: boolean) => {
- // if (valid) {
- // form.value.configId ? await updateConfig(form.value) : await addConfig(form.value);
- // proxy?.$modal.msgSuccess("操作成功");
- // dialog.visible = false;
- // await getList();
- // }
- // });
-// }
+
/** 删除按钮操作 */
const handleDelete = async (row?: ConfigVO) => {
const configIds = row?.configId || ids.value;
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index c2ef550..1d8e082 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -221,7 +221,7 @@
}
/** 返回按钮操作 */
const handleClose = () => {
- const obj = { path: "/system/dict" };
+ const obj = { path: "/basis/parameter/dict" };
proxy?.$tab.closeOpenPage(obj);
}
/** 重置按钮操作 */
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index f3b0051..8d4f3e9 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -59,7 +59,7 @@
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template #default="scope">
- <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+ <router-link :to="'/basis/parameter/dict-data/index/' + scope.row.dictId" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
</template>
--
Gitblit v1.8.0