From ac3ad638949e4d560ddf69320a5f9bb28ca5aaca Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 19 七月 2023 22:48:30 +0800
Subject: [PATCH] !29 修改列表打开对话框和接口请求顺序 Merge pull request !29 from ahaos/tspr
---
src/views/system/client/index.vue | 58 ++----
src/views/system/config/index.vue | 16 -
src/views/system/role/index.vue | 42 +---
src/views/system/oss/config.vue | 26 +-
src/plugins/download.ts | 4
src/views/system/dept/index.vue | 65 +++---
src/views/system/post/index.vue | 16 -
src/views/demo/tree/index.vue | 36 +--
src/views/monitor/online/index.vue | 2
src/views/system/tenant/index.vue | 26 +-
src/views/system/oss/index.vue | 24 +-
src/views/system/menu/index.vue | 22 -
src/views/system/user/index.vue | 46 ++--
src/utils/jsencrypt.ts | 2
src/views/tool/gen/index.vue | 2
src/utils/propTypes.ts | 3
src/views/demo/demo/index.vue | 18 -
src/views/system/dict/data.vue | 16 -
src/views/system/notice/index.vue | 16 -
src/views/system/tenantPackage/index.vue | 32 +--
src/views/system/dict/index.vue | 17 -
21 files changed, 193 insertions(+), 296 deletions(-)
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index c6c8521..49e0333 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -54,8 +54,8 @@
}
downloadLoadingInstance.close();
} catch (r) {
- console.error(r)
- ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒')
+ console.error(r);
+ ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒');
downloadLoadingInstance.close();
}
},
diff --git a/src/utils/jsencrypt.ts b/src/utils/jsencrypt.ts
index 6a8edf6..98114b4 100644
--- a/src/utils/jsencrypt.ts
+++ b/src/utils/jsencrypt.ts
@@ -1,7 +1,7 @@
import JSEncrypt from 'jsencrypt';
// 瀵嗛挜瀵圭敓鎴� http://web.chacuo.net/netrsakeypair
-const publicKey = import.meta.env.VITE_APP_RSA_PUBLIC_KEY
+const publicKey = import.meta.env.VITE_APP_RSA_PUBLIC_KEY;
// 鍓嶇涓嶅缓璁瓨鏀剧閽� 涓嶅缓璁В瀵嗘暟鎹� 鍥犱负閮芥槸閫忔槑鐨勬剰涔変笉澶�
const privateKey = '**********';
diff --git a/src/utils/propTypes.ts b/src/utils/propTypes.ts
index 2f31820..1847040 100644
--- a/src/utils/propTypes.ts
+++ b/src/utils/propTypes.ts
@@ -19,8 +19,7 @@
return toValidableType('style', {
type: [String, Object],
default: undefined
-
- })
+ });
}
}
export { propTypes };
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 54f7c86..fa2c625 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -208,25 +208,19 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞娴嬭瘯鍗�";
- nextTick(() => {
- reset();
- });
}
/** 淇敼鎸夐挳鎿嶄綔 */
-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);
- });
}
/** 鎻愪氦鎸夐挳 */
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index f6ec15c..162ddf6 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -201,17 +201,15 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = (row?: TreeVO) => {
+ reset();
+ getTreeselect();
+ if (row && row.id) {
+ form.value.parentId = row.id;
+ } else {
+ form.value.parentId = 0;
+ }
dialog.visible = true;
dialog.title = "娣诲姞娴嬭瘯鏍�";
- nextTick(() => {
- reset();
- getTreeselect();
- if (row != null && row.id) {
- form.value.parentId = row.id;
- } else {
- form.value.parentId = 0;
- }
- });
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
@@ -229,20 +227,16 @@
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row: TreeVO) => {
- loading.value = true;
+const handleUpdate = async (row: TreeVO) => {
+ reset();
+ await getTreeselect();
+ if (row) {
+ form.value.parentId = row.id;
+ }
+ const res = await getTree(row.id);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼娴嬭瘯鏍�";
- nextTick(async () => {
- reset();
- await getTreeselect();
- if (row != null) {
- form.value.parentId = row.id;
- }
- const res = await getTree(row.id);
- loading.value = false;
- Object.assign(form.value, res.data);
- });
}
/** 鎻愪氦鎸夐挳 */
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 6d7bf87..ddbd385 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -95,7 +95,7 @@
const handleForceLogout = async (row: OnlineVO) => {
await proxy?.$modal.confirm('鏄惁纭寮洪��鍚嶇О涓�"' + row.userName + '"鐨勭敤鎴�?');
await forceLogout(row.tokenId);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 2130d03..827eaf2 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -29,10 +29,14 @@
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:client:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']">淇敼</el-button>
+ <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']">
+ 淇敼
+ </el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']">鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']">
+ 鍒犻櫎
+ </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:client:export']">瀵煎嚭</el-button>
@@ -50,7 +54,7 @@
<el-table-column label="鎺堟潈绫诲瀷" align="center">
<template #default="scope">
<div>
- <template v-for="type in scope.row.grantTypeList">
+ <template v-for="(type, index) in scope.row.grantTypeList" :key="index">
<dict-tag class="el-check-tag" :options="sys_grant_type" :value="type" />
</template>
</div>
@@ -80,13 +84,7 @@
</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" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 娣诲姞鎴栦慨鏀瑰鎴风绠＄悊瀵硅瘽妗� -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@@ -99,18 +97,12 @@
</el-form-item>
<el-form-item label="鎺堟潈绫诲瀷" prop="grantTypeList">
<el-select v-model="form.grantTypeList" multiple placeholder="璇疯緭鍏ユ巿鏉冪被鍨�">
- <el-option
- v-for="dict in sys_grant_type"
- :key="dict.value" :label="dict.label" :value="dict.value"
- ></el-option>
+ <el-option v-for="dict in sys_grant_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="璇疯緭鍏ヨ澶囩被鍨�">
- <el-option
- v-for="dict in sys_device_type"
- :key="dict.value" :label="dict.label" :value="dict.value"
- ></el-option>
+ <el-option v-for="dict in sys_device_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="activeTimeout" label-width="auto">
@@ -156,8 +148,6 @@
<script setup name="Client" lang="ts">
import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client';
import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types';
-import { ComponentInternalInstance } from 'vue';
-import { ElForm } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
@@ -173,8 +163,8 @@
const multiple = ref(true);
const total = ref(0);
-const queryFormRef = ref(ElForm);
-const clientFormRef = ref(ElForm);
+const queryFormRef = ref<ElFormInstance>();
+const clientFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -248,7 +238,7 @@
/** 琛ㄥ崟閲嶇疆 */
const reset = () => {
form.value = {...initFormData};
- clientFormRef.value.resetFields();
+ clientFormRef.value?.resetFields();
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -259,7 +249,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- queryFormRef.value.resetFields();
+ queryFormRef.value?.resetFields();
handleQuery();
}
@@ -272,30 +262,24 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞瀹㈡埛绔鐞�";
- nextTick(() => {
- reset();
- });
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: ClientVO) => {
- loading.value = true
+const handleUpdate = async (row?: ClientVO) => {
+ reset();
+ const _id = row?.id || ids.value[0]
+ const res = await getClient(_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 getClient(_id);
- loading.value = false;
- Object.assign(form.value, res.data);
- });
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
- clientFormRef.value.validate(async (valid: boolean) => {
+ clientFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 8ed9f79..7e2e161 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -207,22 +207,18 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞鍙傛暟";
- nextTick(() => {
- reset();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: ConfigVO) => {
+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 configId = row?.configId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getConfig(configId);
- form.value = res.data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index a1dcb9f..12f7564 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -219,23 +219,7 @@
queryFormRef.value?.resetFields();
handleQuery()
}
-/** 鏂板鎸夐挳鎿嶄綔 */
-const handleAdd = (row?: DeptVO) => {
- listDept().then(res => {
- const data = proxy?.handleTree<DeptOptionsType>(res.data, "deptId");
- if (data) {
- deptOptions.value = data
- dialog.visible = true;
- dialog.title = "娣诲姞閮ㄩ棬";
- nextTick(() => {
- reset();
- if (row && row.deptId) {
- form.value.parentId = row?.deptId;
- }
- })
- }
- })
-}
+
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
isExpandAll.value = !isExpandAll.value;
@@ -249,28 +233,41 @@
})
}
+/** 鏂板鎸夐挳鎿嶄綔 */
+const handleAdd = async (row?: DeptVO) => {
+ reset();
+ const res = await listDept();
+ const data = proxy?.handleTree<DeptOptionsType>(res.data, "deptId");
+ if (data) {
+ deptOptions.value = data
+ if (row && row.deptId) {
+ form.value.parentId = row?.deptId;
+ }
+ dialog.visible = true;
+ dialog.title = "娣诲姞閮ㄩ棬";
+ }
+}
+
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row: DeptVO) => {
+ reset();
const res = await getDept(row.deptId);
+ form.value = res.data
+ const response = await listDeptExcludeChild(row.deptId);
+ const data = proxy?.handleTree<DeptOptionsType>(response.data, "deptId")
+ if (data) {
+ deptOptions.value = data;
+ if (data.length === 0) {
+ const noResultsOptions: DeptOptionsType = {
+ deptId: res.data.parentId,
+ deptName: res.data.parentName,
+ children: []
+ };
+ deptOptions.value.push(noResultsOptions);
+ }
+ }
dialog.visible = true;
dialog.title = "淇敼閮ㄩ棬";
- await nextTick(async () => {
- reset();
- form.value = res.data
- const response = await listDeptExcludeChild(row.deptId);
- const data = proxy?.handleTree<DeptOptionsType>(response.data, "deptId")
- if (data) {
- deptOptions.value = data;
- if (data.length === 0) {
- const noResultsOptions: DeptOptionsType = {
- deptId: res.data.parentId,
- deptName: res.data.parentName,
- children: []
- };
- deptOptions.value.push(noResultsOptions);
- }
- }
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index f40c129..117754c 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -251,12 +251,10 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
+ form.value.dictType = queryParams.value.dictType;
dialog.visible = true;
dialog.title = "娣诲姞瀛楀吀鏁版嵁";
- nextTick(() => {
- reset();
- form.value.dictType = queryParams.value.dictType;
- })
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictDataVO[]) => {
@@ -265,15 +263,13 @@
multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: DictDataVO) => {
+const handleUpdate = async (row?: DictDataVO) => {
+ reset();
const dictCode = row?.dictCode || ids.value[0];
+ const res = await getData(dictCode);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼瀛楀吀鏁版嵁";
- nextTick(async () => {
- const res = await getData(dictCode);
- reset();
- form.value = res.data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index c246462..a182c9f 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -204,11 +204,9 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞瀛楀吀绫诲瀷";
- nextTick(() => {
- reset();
- })
}
/** 澶氶�夋閫変腑鏁版嵁 */
const handleSelectionChange = (selection: DictTypeVO[]) => {
@@ -217,16 +215,13 @@
multiple.value = !selection.length;
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: DictTypeVO) => {
+const handleUpdate = async (row?: DictTypeVO) => {
+ reset();
+ const dictId = row?.dictId || ids.value[0];
+ const res = await getType(dictId);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼瀛楀吀绫诲瀷";
- const dictId = row?.dictId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getType(dictId);
- form.value = res.data;
- })
-
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3b496ea..fca76df 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -356,14 +356,11 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = (row?: MenuVO) => {
+ reset();
+ getTreeselect();
+ row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
dialog.visible = true;
dialog.title = "娣诲姞鑿滃崟";
- getTreeselect();
- nextTick(() => {
- reset();
- row && row.menuId ? form.value.parentId = row.menuId : form.value.parentId = 0;
- })
-
}
/** 灞曞紑/鎶樺彔鎿嶄綔 */
const handleToggleExpandAll = () => {
@@ -379,17 +376,14 @@
}
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = async (row: MenuVO) => {
+ reset();
await getTreeselect();
+ if (row.menuId) {
+ const { data } = await getMenu(row.menuId);
+ form.value = data;
+ }
dialog.visible = true;
dialog.title = "淇敼鑿滃崟";
- await nextTick(async () => {
- if (row.menuId) {
- const { data } = await getMenu(row.menuId);
- reset();
- form.value = data;
- }
- })
-
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 9548093..0c41ce1 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -206,22 +206,18 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞鍏憡";
- nextTick(() => {
- reset();
- })
}
/**淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: NoticeVO) => {
+const handleUpdate = async (row?: NoticeVO) => {
+ reset();
+ const noticeId = row?.noticeId || ids.value[0];
+ const { data } = await getNotice(noticeId);
+ Object.assign(form.value, data);
dialog.visible = true;
dialog.title = "淇敼鍏憡";
- nextTick(async () => {
- const noticeId = row?.noticeId || ids.value[0];
- reset();
- const { data } = await getNotice(noticeId);
- form.value = data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index ba64c1b..1fd14fc 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -64,7 +64,7 @@
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" width="150" class-name="small-padding">
<template #default="scope">
<el-tooltip content="淇敼" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']"></el-button>
@@ -282,24 +282,18 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞瀵硅薄瀛樺偍閰嶇疆";
- nextTick(() => {
- reset();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: OssConfigVO) => {
- loading.value = true;
+const handleUpdate = async (row?: OssConfigVO) => {
+ reset();
+ const ossConfigId = row?.ossConfigId || ids.value[0];
+ const res = await getOssConfig(ossConfigId);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼瀵硅薄瀛樺偍閰嶇疆";
- const ossConfigId = row?.ossConfigId || ids.value[0];
- nextTick(async () => {
- reset();
- const res = await getOssConfig(ossConfigId);
- loading.value = false;
- form.value = res.data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
@@ -313,7 +307,7 @@
}
proxy?.$modal.msgSuccess("鏂板鎴愬姛");
dialog.visible = false;
- getList();
+ await getList();
}
});
}
@@ -323,7 +317,7 @@
try {
await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.configKey + '"閰嶇疆鍚�?');
await changeOssConfigStatus(row.ossConfigId, row.status, row.configKey);
- getList()
+ await getList()
proxy?.$modal.msgSuccess(text + "鎴愬姛");
} catch { return } finally {
row.status = row.status === "0" ? "1" : "0";
@@ -336,7 +330,7 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS閰嶇疆缂栧彿涓�"' + ossConfigIds + '"鐨勬暟鎹」?');
loading.value = true;
await delOssConfig(ossConfigIds).finally(() => loading.value = false);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 7bfaabe..ebb7610 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -15,7 +15,7 @@
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker
- v-model="daterangeCreateTime"
+ v-model="dateRangeCreateTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
@@ -151,7 +151,7 @@
const total = ref(0);
const type = ref(0);
const previewListResource = ref(true);
-const daterangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
const dialog = reactive<DialogOption>({
visible: false,
@@ -195,7 +195,7 @@
loading.value = true;
const res = await proxy?.getConfigKey("sys.oss.previewListResource");
previewListResource.value = res?.msg === undefined ? true : res.msg === 'true';
- const response = await listOss(proxy?.addDateRange(queryParams.value, daterangeCreateTime.value, "CreateTime"));
+ const response = await listOss(proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, "CreateTime"));
ossList.value = response.rows;
total.value = response.total;
loading.value = false;
@@ -225,7 +225,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
showTable.value = false;
- daterangeCreateTime.value = ['', ''];
+ dateRangeCreateTime.value = ['', ''];
queryFormRef.value?.resetFields();
queryParams.value.orderByColumn = defaultSort.value.prop;
queryParams.value.isAsc = defaultSort.value.order;
@@ -288,21 +288,17 @@
}
/** 鏂囦欢鎸夐挳鎿嶄綔 */
const handleFile = () => {
+ reset();
+ type.value = 0;
dialog.visible = true;
dialog.title = "涓婁紶鏂囦欢";
- nextTick(() => {
- reset();
- type.value = 0;
- })
}
/** 鍥剧墖鎸夐挳鎿嶄綔 */
const handleImage = () => {
+ reset();
+ type.value = 1;
dialog.visible = true;
dialog.title = "涓婁紶鍥剧墖";
- nextTick(() => {
- reset();
- type.value = 1;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
@@ -319,7 +315,7 @@
try {
await proxy?.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?');
await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
- getList()
+ await getList()
proxy?.$modal.msgSuccess(text + "鎴愬姛");
} catch { return }
}
@@ -329,7 +325,7 @@
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?');
loading.value = true;
await delOss(ossIds).finally(() => loading.value = false);
- getList();
+ await getList();
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index d53eb1c..b1cddd3 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -192,22 +192,18 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
dialog.visible = true;
dialog.title = "娣诲姞宀椾綅";
- nextTick(() => {
- reset();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: PostVO) => {
+const handleUpdate = async (row?: PostVO) => {
+ reset();
+ const postId = row?.postId || ids.value[0];
+ const res = await getPost(postId);
+ Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "淇敼宀椾綅";
- nextTick(async () => {
- reset();
- const postId = row?.postId || ids.value[0];
- const res = await getPost(postId);
- form.value = res.data;
- })
}
/** 鎻愪氦鎸夐挳 */
const submitForm = () => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index bcc893f..ffbd67c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -265,12 +265,10 @@
})
const { form, queryParams, rules } = toRefs(data)
-
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
-
/**
* 鏌ヨ瑙掕壊鍒楄〃
@@ -367,34 +365,27 @@
/** 娣诲姞瑙掕壊 */
const handleAdd = () => {
+ reset();
+ getMenuTreeselect();
dialog.visible = true;
dialog.title = "娣诲姞瑙掕壊";
- nextTick(() => {
- reset();
- getMenuTreeselect();
- })
}
/** 淇敼瑙掕壊 */
const handleUpdate = async (row?: RoleVO) => {
+ reset();
const roleId = row?.roleId || ids.value[0]
- const roleMenu = getRoleMenuTreeselect(roleId)
const { data } = await getRole(roleId);
- dialog.visible = true;
+ Object.assign(form.value, data);
+ form.value.roleSort = Number(form.value.roleSort);
+ const res = await getRoleMenuTreeselect(roleId);
dialog.title = "淇敼瑙掕壊";
- await nextTick(() => {
- reset();
- Object.assign(form.value, data);
- form.value.roleSort = Number(form.value.roleSort);
- nextTick(async () => {
- const res = await roleMenu;
- let checkedKeys = res.checkedKeys;
- checkedKeys.forEach((v) => {
- nextTick(() => {
- menuRef.value?.setChecked(v, true, false);
- })
- })
+ dialog.visible = true;
+ res.checkedKeys.forEach((v) => {
+ nextTick(() => {
+ menuRef.value?.setChecked(v, true, false);
})
})
+
}
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
const getRoleMenuTreeselect = (roleId: string | number) => {
@@ -479,18 +470,13 @@
}
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
const handleDataScope = async (row: RoleVO) => {
- const roleDeptTreeselect = getRoleDeptTreeSelect(row.roleId);
const response = await getRole(row.roleId);
Object.assign(form.value, response.data);
+ const res = await getRoleDeptTreeSelect(row.roleId);
openDataScope.value = true;
dialog.title = "鍒嗛厤鏁版嵁鏉冮檺";
- await nextTick(async () => {
- const res = await roleDeptTreeselect;
- await nextTick(() => {
- if (deptRef.value) {
- deptRef.value.setCheckedKeys(res.checkedKeys);
- }
- })
+ await nextTick(() => {
+ deptRef.value?.setCheckedKeys(res.checkedKeys);
})
}
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 711ee7f..2d610a9 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -66,7 +66,7 @@
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column width="150" label="鎿嶄綔" align="center" fixed="right" 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:tenant:edit']"></el-button>
@@ -275,27 +275,21 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
+ getTenantPackage();
dialog.visible = true;
dialog.title = "娣诲姞绉熸埛";
- nextTick(() => {
- reset();
- getTenantPackage();
- })
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: TenantVO) => {
- loading.value = true;
+const handleUpdate = async (row?: TenantVO) => {
+ reset();
+ await getTenantPackage();
+ const _id = row?.id || ids.value[0];
+ const res = await getTenant(_id);
+ Object.assign(form.value, res.data)
dialog.visible = true;
dialog.title = "淇敼绉熸埛";
- nextTick(async () => {
- reset();
- await getTenantPackage();
- const _id = row?.id || ids.value[0];
- const res = await getTenant(_id);
- loading.value = false;
- Object.assign(form.value, res.data)
- })
}
/** 鎻愪氦鎸夐挳 */
@@ -310,7 +304,7 @@
}
proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
dialog.visible = false;
- getList();
+ await getList();
}
});
}
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index add2eb5..055c413 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -267,34 +267,24 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
+ reset();
+ getMenuTreeselect();
dialog.visible = true;
dialog.title = "娣诲姞绉熸埛濂楅";
- nextTick(() => {
- reset();
- getMenuTreeselect();
- });
};
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: TenantPkgVO) => {
- loading.value = true;
+const handleUpdate = async (row?: TenantPkgVO) => {
+ reset();
+ const _packageId = row?.packageId || ids.value[0];
+ const response = await getTenantPackage(_packageId);
+ form.value = response.data;
+ const res = await getPackageMenuTreeselect(_packageId);
dialog.visible = true;
dialog.title = "淇敼绉熸埛濂楅";
- nextTick(async () => {
- reset();
- const _packageId = row?.packageId || ids.value[0];
- const packageMenu = getPackageMenuTreeselect(_packageId);
- const response = await getTenantPackage(_packageId);
- loading.value = false;
- form.value = response.data;
- await nextTick(async () => {
- const res = await packageMenu;
- let checkedKeys = res.data.checkedKeys;
- checkedKeys.forEach((v) => {
- nextTick(() => {
- menuTreeRef.value?.setChecked(v, true, false);
- });
- });
+ res.data.checkedKeys.forEach((v) => {
+ nextTick(() => {
+ menuTreeRef.value?.setChecked(v, true, false);
});
});
};
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8e3bcfa..f8aa2e8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -154,7 +154,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
+ <el-dialog ref="formDialogRef" :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
<el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
<el-row>
<el-col :span="12">
@@ -354,6 +354,7 @@
const queryFormRef = ref<ElFormInstance>();
const userFormRef = ref<ElFormInstance>();
const uploadRef = ref<ElUploadInstance>();
+const formDialogRef = ref<ElDialogInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -547,40 +548,35 @@
}
/** 鍙栨秷鎸夐挳 */
const cancel = () => {
- reset();
dialog.visible = false;
+ reset();
}
/** 鏂板鎸夐挳鎿嶄綔 */
-const handleAdd = () => {
+const handleAdd = async () => {
+ reset();
+ const { data } = await api.getUser();
dialog.visible = true;
dialog.title = "鏂板鐢ㄦ埛";
- nextTick(async () => {
- reset();
- await initTreeData();
- const { data } = await api.getUser();
- postOptions.value = data.posts;
- roleOptions.value = data.roles;
- form.value.password = initPassword.value;
- })
+ await initTreeData();
+ postOptions.value = data.posts;
+ roleOptions.value = data.roles;
+ form.value.password = initPassword.value;
}
/** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: UserForm) => {
+const handleUpdate = async (row?: UserForm) => {
+ reset();
+ const userId = row?.userId || ids.value[0]
+ const { data } = await api.getUser(userId)
dialog.visible = true;
dialog.title = "淇敼鐢ㄦ埛";
- nextTick(async () => {
- reset();
- await initTreeData();
- const userId = row?.userId || ids.value[0]
- const { data } = await api.getUser(userId)
- Object.assign(form.value, data.user);
- postOptions.value = data.posts;
- roleOptions.value = data.roles;
- form.value.postIds = data.postIds;
- form.value.roleIds = data.roleIds;
- form.value.password = "";
- })
-
+ await initTreeData();
+ Object.assign(form.value, data.user);
+ postOptions.value = data.posts;
+ roleOptions.value = data.roles;
+ form.value.postIds = data.postIds;
+ form.value.roleIds = data.roleIds;
+ form.value.password = "";
}
/** 鎻愪氦鎸夐挳 */
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 66300bd..82d5228 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -240,7 +240,7 @@
const tableIds = row?.tableId || ids.value;
await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
await delTable(tableIds);
- getList();
+ await getList();
proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
}
--
Gitblit v1.9.3