From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/demo/demo/index.vue | 136 ++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 76 deletions(-)
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index ad1dc0a..da1bc16 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.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">
<el-form-item label="閮ㄩ棬id" prop="deptId">
<el-input v-model="queryParams.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" clearable @keyup.enter="handleQuery" />
</el-form-item>
@@ -32,26 +32,26 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['demo:demo:add']">鏂板</el-button>
+ <el-button v-hasPermi="['demo:demo: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="['demo:demo:edit']">淇敼</el-button>
+ <el-button v-hasPermi="['demo:demo: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="['demo:demo:remove']"
+ <el-button v-hasPermi="['demo:demo: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="['demo:demo:export']">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="demoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭" align="center" prop="id" v-if="true" />
+ <el-table-column v-if="true" label="涓婚敭" align="center" prop="id" />
<el-table-column label="閮ㄩ棬id" align="center" prop="deptId" />
<el-table-column label="鐢ㄦ埛id" align="center" prop="userId" />
<el-table-column label="鎺掑簭鍙�" align="center" prop="orderNum" />
@@ -60,19 +60,19 @@
<el-table-column label="鎿嶄綔" align="center" 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="['demo:demo:edit']"></el-button>
+ <el-button v-hasPermi="['demo:demo: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="['demo:demo:remove']"></el-button>
+ <el-button v-hasPermi="['demo:demo: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="demoFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="閮ㄩ棬id" prop="deptId">
<el-input v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" />
@@ -103,8 +103,6 @@
<script setup name="Demo" lang="ts">
import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
-import { ComponentInternalInstance } from 'vue';
-import { ElForm } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -117,8 +115,8 @@
const multiple = ref(true);
const total = ref(0);
-const queryFormRef = ref(ElForm);
-const demoFormRef = ref(ElForm);
+const queryFormRef = ref<ElFormInstance>();
+const demoFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -131,10 +129,10 @@
userId: undefined,
orderNum: undefined,
testKey: undefined,
- value: undefined,
-}
+ value: undefined
+};
const data = reactive<PageData<DemoForm, DemoQuery>>({
- form: {...initFormData},
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -142,27 +140,15 @@
userId: undefined,
orderNum: undefined,
testKey: undefined,
- value: undefined,
+ value: undefined
},
rules: {
- id: [
- { required: true, message: "涓婚敭涓嶈兘涓虹┖", trigger: "blur" }
- ],
- deptId: [
- { required: true, message: "閮ㄩ棬id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- userId: [
- { required: true, message: "鐢ㄦ埛id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- orderNum: [
- { required: true, message: "鎺掑簭鍙蜂笉鑳戒负绌�", trigger: "blur" }
- ],
- testKey: [
- { required: true, message: "key閿笉鑳戒负绌�", trigger: "blur" }
- ],
- value: [
- { required: true, message: "鍊间笉鑳戒负绌�", trigger: "blur" }
- ],
+ id: [{ required: true, message: '涓婚敭涓嶈兘涓虹┖', trigger: 'blur' }],
+ deptId: [{ required: true, message: '閮ㄩ棬id涓嶈兘涓虹┖', trigger: 'blur' }],
+ userId: [{ required: true, message: '鐢ㄦ埛id涓嶈兘涓虹┖', trigger: 'blur' }],
+ orderNum: [{ required: true, message: '鎺掑簭鍙蜂笉鑳戒负绌�', trigger: 'blur' }],
+ testKey: [{ required: true, message: 'key閿笉鑳戒负绌�', trigger: 'blur' }],
+ value: [{ required: true, message: '鍊间笉鑳戒负绌�', trigger: 'blur' }]
}
});
@@ -175,94 +161,92 @@
demoList.value = res.rows;
total.value = res.total;
loading.value = false;
-}
+};
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
reset();
dialog.visible = false;
-}
+};
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
- form.value = {...initFormData};
- demoFormRef.value.resetFields();
-}
+ form.value = { ...initFormData };
+ demoFormRef.value?.resetFields();
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value.resetFields();
+ queryFormRef.value?.resetFields();
handleQuery();
-}
+};
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DemoVO[]) => {
- ids.value = selection.map(item => item.id);
+ ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
- dialog.title = "娣诲姞娴嬭瘯鍗�";
- nextTick(() => {
- reset();
- });
-}
+ dialog.title = '娣诲姞娴嬭瘯鍗�';
+};
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: DemoVO) => {
- loading.value = true
+const handleUpdate = async (row?: DemoVO) => {
+ reset();
+ const _id = row?.id || ids.value[0];
+ const res = await getDemo(_id);
+ Object.assign(form.value, res.data);
dialog.visible = true;
- dialog.title = "淇敼娴嬭瘯鍗�";
- nextTick(async () => {
- reset();
- const _id = row?.id || ids.value[0]
- const res = await getDemo(_id);
- loading.value = false;
- Object.assign(form.value, res.data);
- });
-}
+ dialog.title = '淇敼娴嬭瘯鍗�';
+};
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- demoFormRef.value.validate(async (valid: boolean) => {
+ demoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
- await updateDemo(form.value).finally(() => buttonLoading.value = false);
+ await updateDemo(form.value).finally(() => (buttonLoading.value = false));
} else {
- await addDemo(form.value).finally(() => buttonLoading.value = false);
+ await addDemo(form.value).finally(() => (buttonLoading.value = false));
}
- proxy?.$modal.msgSuccess("淇敼鎴愬姛");
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
dialog.visible = false;
await getList();
}
});
-}
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: DemoVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曠紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛�').finally(() => loading.value = false);
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曠紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛�').finally(() => (loading.value = false));
await delDemo(_ids);
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
await getList();
-}
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
- proxy?.download('demo/demo/export', {
- ...queryParams.value
- }, `demo_${new Date().getTime()}.xlsx`)
-}
+ proxy?.download(
+ 'demo/demo/export',
+ {
+ ...queryParams.value
+ },
+ `demo_${new Date().getTime()}.xlsx`
+ );
+};
onMounted(() => {
getList();
--
Gitblit v1.9.3