From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/system/dict/data.vue | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index c2ef550..33df638 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,9 +1,9 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="mb-[10px]" v-show="showSearch">
+ <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictType">
<el-select v-model="queryParams.dictType" style="width: 200px">
<el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
@@ -24,29 +24,29 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:dict:add']">鏂板</el-button>
+ <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:dict:edit']">淇敼</el-button>
+ <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:dict:remove']">
+ <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:dict:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Close" @click="handleClose">鍏抽棴</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
<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="dictCode" v-if="false" />
+ <el-table-column v-if="false" label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
<span v-if="(scope.row.listClass === '' || scope.row.listClass === 'default') && (scope.row.cssClass === '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
@@ -64,19 +64,19 @@
<el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="淇敼" placement="top">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"></el-button>
+ <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
</el-tooltip>
<el-tooltip content="鍒犻櫎" placement="top">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"></el-button>
+ <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
<el-form ref="dataFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瀛楀吀绫诲瀷">
<el-input v-model="form.dictType" :disabled="true" />
@@ -118,13 +118,13 @@
</template>
<script setup name="Data" lang="ts">
-import useDictStore from '@/store/modules/dict'
-import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
+import useDictStore from '@/store/modules/dict';
+import { optionselect as getDictOptionselect, getType } from '@/api/system/dict/type';
+import { listData, getData, delData, addData, updateData } from '@/api/system/dict/data';
import { DictTypeVO } from '@/api/system/dict/type/types';
-import { DictDataForm, DictDataQuery, DictDataVO } from "@/api/system/dict/data/types";
+import { DictDataForm, DictDataQuery, DictDataVO } from '@/api/system/dict/data/types';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const dataList = ref<DictDataVO[]>([]);
@@ -134,12 +134,11 @@
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const defaultDictType = ref("");
+const defaultDictType = ref('');
const typeOptions = ref<DictTypeVO[]>([]);
const dataFormRef = ref<ElFormInstance>();
const queryFormRef = ref<ElFormInstance>();
-
const dialog = reactive<DialogOption>({
visible: false,
@@ -147,13 +146,13 @@
});
// 鏁版嵁鏍囩鍥炴樉鏍峰紡
-const listClassOptions = ref<Array<{ value: string, label: string }>>([
- { value: "default", label: "榛樿" },
- { value: "primary", label: "涓昏" },
- { value: "success", label: "鎴愬姛" },
- { value: "info", label: "淇℃伅" },
- { value: "warning", label: "璀﹀憡" },
- { value: "danger", label: "鍗遍櫓" }
+const listClassOptions = ref<Array<{ value: string; label: string }>>([
+ { value: 'default', label: '榛樿' },
+ { value: 'primary', label: '涓昏' },
+ { value: 'success', label: '鎴愬姛' },
+ { value: 'info', label: '淇℃伅' },
+ { value: 'warning', label: '璀﹀憡' },
+ { value: 'danger', label: '鍗遍櫓' }
]);
const initFormData: DictDataForm = {
@@ -161,10 +160,10 @@
dictLabel: '',
dictValue: '',
cssClass: '',
- listClass: "default",
+ listClass: 'default',
dictSort: 0,
remark: ''
-}
+};
const data = reactive<PageData<DictDataForm, DictDataQuery>>({
form: { ...initFormData },
queryParams: {
@@ -175,9 +174,9 @@
dictLabel: ''
},
rules: {
- dictLabel: [{ required: true, message: "鏁版嵁鏍囩涓嶈兘涓虹┖", trigger: "blur" }],
- dictValue: [{ required: true, message: "鏁版嵁閿�间笉鑳戒负绌�", trigger: "blur" }],
- dictSort: [{ required: true, message: "鏁版嵁椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
+ dictLabel: [{ required: true, message: '鏁版嵁鏍囩涓嶈兘涓虹┖', trigger: 'blur' }],
+ dictValue: [{ required: true, message: '鏁版嵁閿�间笉鑳戒负绌�', trigger: 'blur' }],
+ dictSort: [{ required: true, message: '鏁版嵁椤哄簭涓嶈兘涓虹┖', trigger: 'blur' }]
}
});
@@ -189,13 +188,13 @@
queryParams.value.dictType = data.dictType;
defaultDictType.value = data.dictType;
getList();
-}
+};
/** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
const getTypeList = async () => {
- const res = await getDictOptionselect()
+ const res = await getDictOptionselect();
typeOptions.value = res.data;
-}
+};
/** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
const getList = async () => {
loading.value = true;
@@ -203,46 +202,46 @@
dataList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
dialog.visible = false;
reset();
-}
+};
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
form.value = { ...initFormData };
dataFormRef.value?.resetFields();
-}
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 杩斿洖鎸夐挳鎿嶄綔 */
const handleClose = () => {
- const obj = { path: "/system/dict" };
+ const obj = { path: '/system/dict' };
proxy?.$tab.closeOpenPage(obj);
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
queryParams.value.dictType = defaultDictType.value;
handleQuery();
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
reset();
form.value.dictType = queryParams.value.dictType;
dialog.visible = true;
- dialog.title = "娣诲姞瀛楀吀鏁版嵁";
-}
+ dialog.title = '娣诲姞瀛楀吀鏁版嵁';
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictDataVO[]) => {
- ids.value = selection.map(item => item.dictCode);
+ ids.value = selection.map((item) => item.dictCode);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row?: DictDataVO) => {
reset();
@@ -250,40 +249,42 @@
const res = await getData(dictCode);
Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "淇敼瀛楀吀鏁版嵁";
-}
+ dialog.title = '淇敼瀛楀吀鏁版嵁';
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
dataFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.dictCode ? await updateData(form.value) : await addData(form.value);
useDictStore().removeDict(queryParams.value.dictType);
- proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
dialog.visible = false;
await getList();
-
}
});
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DictDataVO) => {
const dictCodes = row?.dictCode || ids.value;
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�');
await delData(dictCodes);
await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
useDictStore().removeDict(queryParams.value.dictType);
-
-}
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download("system/dict/data/export", {
- ...queryParams.value
- }, `dict_data_${new Date().getTime()}.xlsx`);
-}
+ proxy?.download(
+ 'system/dict/data/export',
+ {
+ ...queryParams.value
+ },
+ `dict_data_${new Date().getTime()}.xlsx`
+ );
+};
onMounted(() => {
- getTypes(route.params && route.params.dictId as string);
+ getTypes(route.params && (route.params.dictId as string));
getTypeList();
-})
+});
</script>
--
Gitblit v1.9.3