Pre Merge pull request !190 from xingyu/dev

apps/web-antd/src/views/ai/image/manager/index.vue

@@ -104,7 +104,10 @@ onMounted(async () => {
       </template>
       <template #userId="{ row }">
         <span>
-          {{ userList.find((item) => item.id === row.userId)?.nickname }}
+          {{
+            userList.find((item: SystemUserApi.User) => item.id === row.userId)
+              ?.nickname
+          }}
         </span>
       </template>
       <template #publicStatus="{ row }">

apps/web-antd/src/views/ai/mindmap/manager/index.vue

@@ -108,7 +108,10 @@ onMounted(async () => {
       </template>
       <template #userId="{ row }">
         <span>
-          {{ userList.find((item) => item.id === row.userId)?.nickname }}
+          {{
+            userList.find((item: SystemUserApi.User) => item.id === row.userId)
+              ?.nickname
+          }}
         </span>
       </template>
       <template #actions="{ row }">

apps/web-antd/src/views/ai/model/model/index.vue

@@ -112,7 +112,11 @@ onMounted(async () => {
       </template>
       <template #keyId="{ row }">
         <span>
-          {{ apiKeyList.find((item) => item.id === row.keyId)?.name }}
+          {{
+            apiKeyList.find(
+              (item: AiModelApiKeyApi.ApiKey) => item.id === row.keyId,
+            )?.name
+          }}
         </span>
       </template>
       <template #actions="{ row }">

apps/web-antd/src/views/system/role/modules/assign-menu-form.vue

@@ -66,6 +66,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -75,8 +77,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {

apps/web-ele/src/views/system/role/modules/assign-menu-form.vue

@@ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {

apps/web-naive/src/views/system/role/modules/assign-menu-form.vue

@@ -63,6 +63,8 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 加载菜单列表
+    await loadMenuTree();
     const data = modalApi.getData<SystemRoleApi.Role>();
     if (!data || !data.id) {
       return;
@@ -72,8 +74,6 @@ const [Modal, modalApi] = useVbenModal({
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
-      // 加载菜单列表
-      await loadMenuTree();
 
       await formApi.setValues(data);
     } finally {