Bläddra i källkod

chore: 改为实时获取应用数据

喵你个旺呀 1 år sedan
förälder
incheckning
9edbff1692

+ 5 - 7
Web/src/layout/navBars/topBar/changeApp.vue

@@ -53,14 +53,12 @@ const state = reactive({
 
 
 // 打开弹窗
 // 打开弹窗
 const openDialog = async () => {
 const openDialog = async () => {
-  if (state.appList.length == 0) {
-    const result = await getAPI(SysAppApi).apiSysAppChangeAppGet().then(res => res.data.result);
-    state.appList = result?.selectList ?? [];
-    state.tenantList = state.appList.find((u: any) => u.id === result?.appId)?.children ?? [];
+  const result = await getAPI(SysAppApi).apiSysAppChangeAppGet().then(res => res.data.result ?? {});
+  state.appList = result.selectList ?? [];
+  state.tenantList = state.appList.find((u: any) => u.id === result.appId)?.children ?? [];
+  state.ruleForm.tenantId = result.tenantId;
+  state.ruleForm.id = result.appId;
 
 
-    state.ruleForm.tenantId = result?.tenantId;
-    state.ruleForm.id = result?.appId;
-  }
   ruleFormRef.value?.resetFields();
   ruleFormRef.value?.resetFields();
   state.isShowDialog = true;
   state.isShowDialog = true;
   state.loading = false;
   state.loading = false;

+ 6 - 15
Web/src/views/system/app/component/editApp.vue

@@ -93,13 +93,12 @@
 </template>
 </template>
 
 
 <script lang="ts" setup name="sysEditApp">
 <script lang="ts" setup name="sysEditApp">
-import { onMounted, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import type { ElTree } from 'element-plus';
 import type { ElTree } from 'element-plus';
-
+import { auth } from "/@/utils/authFunction";
 import { getAPI } from '/@/utils/axios-utils';
 import { getAPI } from '/@/utils/axios-utils';
-import { SysMenuApi, SysAppApi } from '/@/api-services/api';
 import { SysMenu } from '/@/api-services/models';
 import { SysMenu } from '/@/api-services/models';
-import {auth} from "/@/utils/authFunction";
+import { SysMenuApi, SysAppApi } from '/@/api-services/api';
 
 
 const props = defineProps({
 const props = defineProps({
 	title: String,
 	title: String,
@@ -114,23 +113,15 @@ const state = reactive({
 	menuData: [] as Array<SysMenu>, // 菜单数据
 	menuData: [] as Array<SysMenu>, // 菜单数据
 });
 });
 
 
-onMounted(async () => {
-	state.loading = true;
-  if (auth('sysApp:grantMenu')) {
-    const res = await getAPI(SysMenuApi).apiSysMenuListGet(undefined, undefined, true);
-    state.menuData = res.data.result ?? [];
-  }
-	state.loading = false;
-});
-
 // 打开弹窗
 // 打开弹窗
 const openDialog = async (row: any) => {
 const openDialog = async (row: any) => {
 	ruleFormRef.value?.resetFields();
 	ruleFormRef.value?.resetFields();
 	treeRef.value?.setCheckedKeys([]); // 清空选中值
 	treeRef.value?.setCheckedKeys([]); // 清空选中值
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	if (row.id && auth('sysApp:grantMenu')) {
 	if (row.id && auth('sysApp:grantMenu')) {
-    const res = await getAPI(SysAppApi).apiSysAppGrantMenuGet(row.id);
-    setTimeout(() => treeRef.value?.setCheckedKeys(res.data.result ?? []), 100);
+    state.menuData = await getAPI(SysMenuApi).apiSysMenuListGet(undefined, undefined, true).then(res => res.data.result ?? []);
+    const menuIds = await getAPI(SysAppApi).apiSysAppGrantMenuGet(row.id).then(res => res.data.result ?? []);
+    setTimeout(() => treeRef.value?.setCheckedKeys(menuIds), 100);
 	}
 	}
 	state.isShowDialog = true;
 	state.isShowDialog = true;
 };
 };