From 70120a8f2fe8f604dd40ad482de6daed97b84888 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 09 四月 2024 11:27:51 +0800
Subject: [PATCH] !97 解决页面偶尔出现的白屏问题 Merge pull request !97 from 吴均/dev
---
src/views/demo/demo/index.vue | 505 +++++++++++++++++++------------------------------------
1 files changed, 178 insertions(+), 327 deletions(-)
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 362d5b2..1430a54 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -1,132 +1,79 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
- <el-form-item label="key閿�" prop="testKey">
- <el-input
- v-model="queryParams.testKey"
- placeholder="璇疯緭鍏ey閿�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍊�" prop="value">
- <el-input
- v-model="queryParams.value"
- placeholder="璇疯緭鍏ュ��"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="daterangeCreateTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="search" @click="handleQuery">鎼滅储</el-button>
- <el-button type="primary" icon="search" @click="handlePage">鎼滅储(鑷畾涔夊垎椤垫帴鍙�)</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form-item label="閮ㄩ棬id" prop="deptId">
+ <el-input v-model="queryParams.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛id" prop="userId">
+ <el-input v-model="queryParams.userId" placeholder="璇疯緭鍏ョ敤鎴穒d" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭鍙�" prop="orderNum">
+ <el-input v-model="queryParams.orderNum" placeholder="璇疯緭鍏ユ帓搴忓彿" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="key閿�" prop="testKey">
+ <el-input v-model="queryParams.testKey" placeholder="璇疯緭鍏ey閿�" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍊�" prop="value">
+ <el-input v-model="queryParams.value" placeholder="璇疯緭鍏ュ��" clearable style="width: 240px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </div>
+ </transition>
- <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-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-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['demo:demo:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="Upload"
- @click="handleImport"
- v-hasPermi="['demo:demo:import']"
- >瀵煎叆(鏍￠獙)</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-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <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 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 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 v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar v-model:showSearch="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="columns[0].visible"/>
- <el-table-column label="閮ㄩ棬id" align="center" prop="deptId" v-if="columns[1].visible"/>
- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" v-if="columns[2].visible"/>
- <el-table-column label="鎺掑簭鍙�" align="center" prop="orderNum" v-if="columns[3].visible"/>
- <el-table-column label="key閿�" align="center" prop="testKey" v-if="columns[4].visible"/>
- <el-table-column label="鍊�" align="center" prop="value" v-if="columns[5].visible"/>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" v-if="columns[6].visible" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" align="center" prop="createByName" v-if="columns[7].visible" />
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" v-if="columns[8].visible" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏇存柊浜�" align="center" prop="updateByName" v-if="columns[9].visible" />
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:demo:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:demo:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table v-loading="loading" :data="demoList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <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" />
+ <el-table-column label="key閿�" align="center" prop="testKey" />
+ <el-table-column label="鍊�" align="center" prop="value" />
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <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 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"
- />
-
- <!-- 娣诲姞鎴栦慨鏀规祴璇曞崟琛ㄥ璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="demoRef" :model="form" :rules="rules" label-width="80px">
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+ </el-card>
+ <!-- 娣诲姞鎴栦慨鏀规祴璇曞崟瀵硅瘽妗� -->
+ <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" />
</el-form-item>
@@ -142,14 +89,6 @@
<el-form-item label="鍊�" prop="value">
<el-input v-model="form.value" placeholder="璇疯緭鍏ュ��" />
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" prop="createTime">
- <el-date-picker clearable
- v-model="form.createTime"
- type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss"
- placeholder="閫夋嫨鍒涘缓鏃堕棿">
- </el-date-picker>
- </el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -158,246 +97,158 @@
</div>
</template>
</el-dialog>
- <!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
- <el-upload
- ref="uploadRef"
- :limit="1"
- accept=".xlsx, .xls"
- :headers="upload.headers"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- :auto-upload="false"
- drag
- >
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
- <el-button @click="upload.open = false">鍙� 娑�</el-button>
- </div>
- </el-dialog>
</div>
</template>
-<script setup name="Demo">
-import { listDemo, pageDemo, getDemo, delDemo, addDemo, updateDemo } from "@/api/demo/demo";
-import {getToken} from "@/utils/auth";
+<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';
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const demoList = ref([]);
-const open = ref(false);
+const demoList = ref<DemoVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const title = ref("");
-const daterangeCreateTime = ref([]);
-/*** 鐢ㄦ埛瀵煎叆鍙傛暟 */
-const upload = reactive({
- // 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
- open: false,
- // 寮瑰嚭灞傛爣棰橈紙鐢ㄦ埛瀵煎叆锛�
- title: "",
- // 鏄惁绂佺敤涓婁紶
- isUploading: false,
- // 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() },
- // 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "demo/demo/importData"
+const queryFormRef = ref<ElFormInstance>();
+const demoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
});
-// 鍒楁樉闅愪俊鎭�
-const columns = ref([
- { key: 0, label: `涓婚敭`, visible: false },
- { key: 1, label: `閮ㄩ棬id`, visible: true },
- { key: 2, label: `鐢ㄦ埛id`, visible: true },
- { key: 3, label: `鎺掑簭鍙穈, visible: true },
- { key: 4, label: `key閿甡, visible: true },
- { key: 5, label: `鍊糮, visible: true },
- { key: 6, label: `鍒涘缓鏃堕棿`, visible: true },
- { key: 7, label: `鍒涘缓浜篳, visible: true },
- { key: 8, label: `鏇存柊鏃堕棿`, visible: true },
- { key: 9, label: `鏇存柊浜篳, visible: true }
-]);
-
-const data = reactive({
- form: {},
+const initFormData: DemoForm = {
+ id: undefined,
+ deptId: undefined,
+ userId: undefined,
+ orderNum: undefined,
+ testKey: undefined,
+ value: undefined
+};
+const data = reactive<PageData<DemoForm, DemoQuery>>({
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
+ deptId: undefined,
+ userId: undefined,
+ orderNum: undefined,
testKey: undefined,
- value: undefined,
- createTime: undefined,
+ value: undefined
},
rules: {
- 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' }]
}
});
const { queryParams, form, rules } = toRefs(data);
-/** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */
-function getList() {
+/** 鏌ヨ娴嬭瘯鍗曞垪琛� */
+const getList = async () => {
loading.value = true;
- listDemo(proxy.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime")).then(response => {
- demoList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
-}
-/** 鑷畾涔夊垎椤垫煡璇� */
-function getPage() {
- loading.value = true;
- pageDemo(proxy.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime")).then(response => {
- demoList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
-}
+ const res = await listDemo(queryParams.value);
+ demoList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+};
+
/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
+const cancel = () => {
reset();
-}
+ dialog.visible = false;
+};
+
/** 琛ㄥ崟閲嶇疆 */
-function reset() {
- form.value = {
- id: undefined,
- deptId: undefined,
- userId: undefined,
- orderNum: undefined,
- testKey: undefined,
- value: undefined,
- version: undefined,
- createTime: undefined,
- createBy: undefined,
- updateTime: undefined,
- updateBy: undefined,
- delFlag: undefined
- };
- proxy.resetForm("demoRef");
-}
+const reset = () => {
+ form.value = { ...initFormData };
+ demoFormRef.value?.resetFields();
+};
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handlePage() {
- queryParams.value.pageNum = 1;
- getList();
-}
+};
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- daterangeCreateTime.value = [];
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
handleQuery();
-}
-/** 閫夋嫨鏉℃暟 */
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.id);
+};
+
+/** 澶氶�夋閫変腑鏁版嵁 */
+const handleSelectionChange = (selection: DemoVO[]) => {
+ ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
+
/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
+const handleAdd = () => {
reset();
- open.value = true;
- title.value = "娣诲姞娴嬭瘯鍗曡〃";
-}
+ dialog.visible = true;
+ dialog.title = '娣诲姞娴嬭瘯鍗�';
+};
+
/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- loading.value = true;
+const handleUpdate = async (row?: DemoVO) => {
reset();
- const ids = row.id || ids.value;
- getDemo(ids).then((response) => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- title.value = "淇敼娴嬭瘯鍗曡〃";
- });
-}
+ const _id = row?.id || ids.value[0];
+ const res = await getDemo(_id);
+ Object.assign(form.value, res.data);
+ dialog.visible = true;
+ dialog.title = '淇敼娴嬭瘯鍗�';
+};
+
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["demoRef"].validate(valid => {
+const submitForm = () => {
+ demoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
- if (form.value.ossConfigId != null) {
- updateDemo(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ if (form.value.id) {
+ await updateDemo(form.value).finally(() => (buttonLoading.value = false));
} else {
- addDemo(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ await addDemo(form.value).finally(() => (buttonLoading.value = false));
}
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
+ dialog.visible = false;
+ await getList();
}
});
-}
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const ids = row.id || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曡〃缂栧彿涓�"' + ids + '"鐨勬暟鎹」?').then(() => {
- loading.value = true;
- return delDemo(ids);
- }).then(() => {
- loading.value = false;
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).finally(() => {
- loading.value = false;
- });
-}
-/** 瀵煎叆鎸夐挳鎿嶄綔 */
-function handleImport() {
- upload.title = "娴嬭瘯瀵煎叆";
- upload.open = true;
-}
-/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download("demo/demo/export", {
- ...queryParams.value,
- },`demo_${new Date().getTime()}.xlsx`);
-}
-/**鏂囦欢涓婁紶涓鐞� */
-const handleFileUploadProgress = (event, file, fileList) => {
- upload.isUploading = true;
-}
-/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
-const handleFileSuccess = (response, file, fileList) => {
- upload.open = false;
- upload.isUploading = false;
- proxy.$refs["uploadRef"].clearFiles();
- proxy.$alert(response.msg, "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
- getList();
-}
-/** 鎻愪氦涓婁紶鏂囦欢 */
-function submitFileForm() {
- proxy.$refs["uploadRef"].submit();
-}
+};
-getList()
-getPage()
+/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+const handleDelete = async (row?: DemoVO) => {
+ const _ids = row?.id || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎娴嬭瘯鍗曠紪鍙蜂负"' + _ids + '"鐨勬暟鎹」锛�').finally(() => (loading.value = false));
+ await delDemo(_ids);
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+ await getList();
+};
+
+/** 瀵煎嚭鎸夐挳鎿嶄綔 */
+const handleExport = () => {
+ proxy?.download(
+ 'demo/demo/export',
+ {
+ ...queryParams.value
+ },
+ `demo_${new Date().getTime()}.xlsx`
+ );
+};
+
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3