From df5dd24c2989375681c13fa335d0200bbe7ade96 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 4 Nov 2024 11:16:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |   2 +-
 package.json                                  |   2 +-
 src/components/custom/post-select.vue         |   8 +-
 src/hooks/business/download.ts                |   9 +-
 src/hooks/common/form.ts                      |   7 +-
 src/layouts/modules/global-footer/index.vue   |   4 +-
 src/store/modules/route/index.ts              |   3 +
 .../menu/modules/menu-operate-drawer.vue      |   6 +-
 .../user/modules/user-operate-drawer.vue      | 103 +++++++++---------
 src/views/system/user/modules/user-search.vue |   4 +-
 10 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/.env.dev b/.env.dev
index 21403bf7..c5cda27b 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,5 +1,5 @@
 # backend service base url, test environment
-VITE_SERVICE_BASE_URL=http://127.0.0.1:8080
+VITE_SERVICE_BASE_URL=http://192.168.0.52:18181
 
 VITE_APP_BASE_API=/dev-api
 
diff --git a/package.json b/package.json
index 80d48716..f9b34e9e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "cleanup": "sa cleanup",
     "commit": "sa git-commit",
     "commit:zh": "sa git-commit -l=zh-cn",
-    "dev": "vite --mode test",
+    "dev": "vite --mode dev",
     "dev:prod": "vite --mode prod",
     "dev:test": "vite --mode test",
     "gen-route": "sa gen-route",
diff --git a/src/components/custom/post-select.vue b/src/components/custom/post-select.vue
index be7ebd59..cbaae050 100644
--- a/src/components/custom/post-select.vue
+++ b/src/components/custom/post-select.vue
@@ -19,7 +19,7 @@ const value = defineModel<CommonType.IdType[] | null>('value', { required: false
 
 const attrs: SelectProps = useAttrs();
 
-const { loading: roleLoading, startLoading: startRoleLoading, endLoading: endRoleLoading } = useLoading();
+const { loading: postLoading, startLoading: startPostLoading, endLoading: endPostLoading } = useLoading();
 
 /** the enabled role options */
 const roleOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
@@ -34,7 +34,7 @@ watch(
 );
 
 async function getRoleOptions() {
-  startRoleLoading();
+  startPostLoading();
   const { error, data } = await fetchGetPostSelect(props.deptId!);
 
   if (!error) {
@@ -43,14 +43,14 @@ async function getRoleOptions() {
       value: item.postId
     }));
   }
-  endRoleLoading();
+  endPostLoading();
 }
 </script>
 
 <template>
   <NSelect
     v-model:value="value"
-    :loading="roleLoading"
+    :loading="postLoading"
     :options="roleOptions"
     v-bind="attrs"
     placeholder="请选择岗位"
diff --git a/src/hooks/business/download.ts b/src/hooks/business/download.ts
index 9b673125..3bde55a1 100644
--- a/src/hooks/business/download.ts
+++ b/src/hooks/business/download.ts
@@ -88,7 +88,14 @@ export function useDownload() {
         Clientid: clientId!
       }
     })
-      .then(async response => response.blob())
+      .then(async response => {
+        if (response.headers.get('Content-Type')?.includes('application/json')) {
+          const res = await response.json();
+          const code = res.code as CommonType.ErrorCode;
+          throw new Error(errorCodeRecord[code] || res.msg || errorCodeRecord.default);
+        }
+        return response.blob();
+      })
       .then(data => downloadByData(data, fileName, 'application/zip'))
       .catch(err => window.$message?.error(err.message))
       .finally(() => window.$loading?.endLoading());
diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts
index 580bec48..60265b1c 100644
--- a/src/hooks/common/form.ts
+++ b/src/hooks/common/form.ts
@@ -53,6 +53,10 @@ export function useFormRules() {
     };
   }
 
+  function createNumberRequiredRule(message: string): App.Global.FormRule {
+    return { ...createRequiredRule(message), type: 'number' };
+  }
+
   /** create a rule for confirming the password */
   function createConfirmPwdRule(pwd: string | Ref<string> | ComputedRef<string>) {
     const confirmPwdRule: App.Global.FormRule[] = [
@@ -76,7 +80,8 @@ export function useFormRules() {
     formRules,
     defaultRequiredRule,
     createRequiredRule,
-    createConfirmPwdRule
+    createConfirmPwdRule,
+    createNumberRequiredRule
   };
 }
 
diff --git a/src/layouts/modules/global-footer/index.vue b/src/layouts/modules/global-footer/index.vue
index 603cbaff..7087c90c 100644
--- a/src/layouts/modules/global-footer/index.vue
+++ b/src/layouts/modules/global-footer/index.vue
@@ -6,9 +6,7 @@ defineOptions({
 
 <template>
   <DarkModeContainer class="h-full flex-center">
-    <a href="https://github.com/soybeanjs/soybean-admin/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">
-      Copyright MIT © 2021 Soybean
-    </a>
+    <a href="https://blog.xlsea.cn" target="_blank" rel="noopener noreferrer">Copyright MIT © 2021 马铃薯头</a>
   </DarkModeContainer>
 </template>
 
diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index bea92fe7..f5b5d935 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -93,6 +93,9 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
 
   function parseRouter(route: ElegantConstRoute, parent?: ElegantConstRoute) {
     if (authRouteMode.value === 'dynamic') {
+      if (route.component === 'Layout' && route.path === '/' && route.children?.length) {
+        Object.assign(route, route.children[0]);
+      }
       // @ts-expect-error no query field
       const query = route.query ? String(route.query) : undefined;
       route.path = route.path.startsWith('//') ? route.path.substring(1) : route.path;
diff --git a/src/views/system/menu/modules/menu-operate-drawer.vue b/src/views/system/menu/modules/menu-operate-drawer.vue
index 6ce5c403..5a04acb1 100644
--- a/src/views/system/menu/modules/menu-operate-drawer.vue
+++ b/src/views/system/menu/modules/menu-operate-drawer.vue
@@ -41,7 +41,7 @@ const visible = defineModel<boolean>('visible', {
 
 const iconType = ref<Api.System.IconType>('1');
 const { formRef, validate, restoreValidation } = useNaiveForm();
-const { createRequiredRule } = useFormRules();
+const { createRequiredRule, createNumberRequiredRule } = useFormRules();
 const queryList = ref<{ key: string; value: string }[]>([]);
 
 const drawerTitle = computed(() => {
@@ -79,7 +79,7 @@ type RuleKey = Extract<keyof Model, 'menuName' | 'orderNum' | 'path' | 'componen
 
 const rules: Record<RuleKey, App.Global.FormRule> = {
   menuName: createRequiredRule('菜单名称不能为空'),
-  orderNum: createRequiredRule('菜单排序不能为空'),
+  orderNum: createNumberRequiredRule('菜单排序不能为空'),
   path: createRequiredRule('路由地址不能为空'),
   component: createRequiredRule('组件路径不能为空')
 };
@@ -148,7 +148,7 @@ async function handleSubmit() {
 
   let path = model.path;
   let component = model.component;
-  if (isFrame !== '0') {
+  if (isFrame !== '1') {
     component = 'iframe-page';
     path = !model.path?.startsWith('/') ? `/${model.path}` : model.path;
   } else if (model.menuType === 'C') {
diff --git a/src/views/system/user/modules/user-operate-drawer.vue b/src/views/system/user/modules/user-operate-drawer.vue
index 06142a5d..a79f655e 100644
--- a/src/views/system/user/modules/user-operate-drawer.vue
+++ b/src/views/system/user/modules/user-operate-drawer.vue
@@ -30,6 +30,7 @@ const visible = defineModel<boolean>('visible', {
   default: false
 });
 
+const { loading, startLoading, endLoading } = useLoading();
 const { loading: deptLoading, startLoading: startDeptLoading, endLoading: endDeptLoading } = useLoading();
 const { formRef, validate, restoreValidation } = useNaiveForm();
 const { createRequiredRule, patternRules } = useFormRules();
@@ -73,11 +74,13 @@ const rules: Record<RuleKey, App.Global.FormRule[]> = {
 };
 
 async function getUserInfo() {
+  startLoading();
   const { error, data } = await fetchGetUserInfo(props.rowData?.userId);
   if (!error) {
     model.roleIds = data.roleIds;
     model.postIds = data.postIds;
   }
+  endLoading();
 }
 
 function handleUpdateModelWhenEdit() {
@@ -151,55 +154,57 @@ watch(visible, () => {
 <template>
   <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
     <NDrawerContent :title="title" :native-scrollbar="false" closable>
-      <NForm ref="formRef" :model="model" :rules="rules">
-        <NFormItem label="用户昵称" path="nickName">
-          <NInput v-model:value="model.nickName" placeholder="请输入用户昵称" />
-        </NFormItem>
-        <NFormItem label="归属部门" path="deptId">
-          <NTreeSelect
-            v-model:value="model.deptId"
-            :loading="deptLoading"
-            clearable
-            :options="deptData as []"
-            label-field="label"
-            key-field="id"
-            :default-expanded-keys="deptData?.length ? [deptData[0].id] : []"
-            placeholder="请选择归属部门"
-          />
-        </NFormItem>
-        <NFormItem label="手机号码" path="phonenumber">
-          <NInput v-model:value="model.phonenumber" placeholder="请输入手机号码" />
-        </NFormItem>
-        <NFormItem label="邮箱" path="email">
-          <NInput v-model:value="model.email" placeholder="请输入邮箱" />
-        </NFormItem>
-        <NFormItem v-if="operateType === 'add'" label="用户名称" path="userName">
-          <NInput v-model:value="model.userName" placeholder="请输入用户名称" />
-        </NFormItem>
-        <NFormItem v-if="operateType === 'add'" label="用户密码" path="password">
-          <NInput
-            v-model:value="model.password"
-            type="password"
-            show-password-on="click"
-            placeholder="请输入用户密码"
-          />
-        </NFormItem>
-        <NFormItem label="用户性别" path="sex">
-          <DictRadio v-model:value="model.sex" dict-code="sys_user_sex" placeholder="请选择用户性别" />
-        </NFormItem>
-        <NFormItem label="岗位" path="postIds">
-          <PostSelect v-model:value="model.postIds" :dept-id="model.deptId" multiple clearable />
-        </NFormItem>
-        <NFormItem label="角色" path="roleIds">
-          <RoleSelect v-model:value="model.roleIds" multiple clearable />
-        </NFormItem>
-        <NFormItem label="状态" path="status">
-          <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />
-        </NFormItem>
-        <NFormItem label="备注" path="remark">
-          <NInput v-model:value="model.remark" placeholder="请输入备注" />
-        </NFormItem>
-      </NForm>
+      <NSpin :show="loading">
+        <NForm ref="formRef" :model="model" :rules="rules">
+          <NFormItem label="用户昵称" path="nickName">
+            <NInput v-model:value="model.nickName" placeholder="请输入用户昵称" />
+          </NFormItem>
+          <NFormItem label="归属部门" path="deptId">
+            <NTreeSelect
+              v-model:value="model.deptId"
+              :loading="deptLoading"
+              clearable
+              :options="deptData as []"
+              label-field="label"
+              key-field="id"
+              :default-expanded-keys="deptData?.length ? [deptData[0].id] : []"
+              placeholder="请选择归属部门"
+            />
+          </NFormItem>
+          <NFormItem label="手机号码" path="phonenumber">
+            <NInput v-model:value="model.phonenumber" placeholder="请输入手机号码" />
+          </NFormItem>
+          <NFormItem label="邮箱" path="email">
+            <NInput v-model:value="model.email" placeholder="请输入邮箱" />
+          </NFormItem>
+          <NFormItem v-if="operateType === 'add'" label="用户名称" path="userName">
+            <NInput v-model:value="model.userName" placeholder="请输入用户名称" />
+          </NFormItem>
+          <NFormItem v-if="operateType === 'add'" label="用户密码" path="password">
+            <NInput
+              v-model:value="model.password"
+              type="password"
+              show-password-on="click"
+              placeholder="请输入用户密码"
+            />
+          </NFormItem>
+          <NFormItem label="用户性别" path="sex">
+            <DictRadio v-model:value="model.sex" dict-code="sys_user_sex" placeholder="请选择用户性别" />
+          </NFormItem>
+          <NFormItem label="岗位" path="postIds">
+            <PostSelect v-model:value="model.postIds" :dept-id="model.deptId" multiple clearable />
+          </NFormItem>
+          <NFormItem label="角色" path="roleIds">
+            <RoleSelect v-model:value="model.roleIds" multiple clearable />
+          </NFormItem>
+          <NFormItem label="状态" path="status">
+            <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />
+          </NFormItem>
+          <NFormItem label="备注" path="remark">
+            <NInput v-model:value="model.remark" placeholder="请输入备注" />
+          </NFormItem>
+        </NForm>
+      </NSpin>
       <template #footer>
         <NSpace :size="16">
           <NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue
index b846cd05..0a81b9d7 100644
--- a/src/views/system/user/modules/user-search.vue
+++ b/src/views/system/user/modules/user-search.vue
@@ -59,7 +59,7 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:8" label="创建时间" path="createTime" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:12" label="创建时间" path="createTime" class="pr-24px">
               <NDatePicker
                 v-model:formatted-value="dateRangeCreateTime"
                 type="datetimerange"
@@ -67,7 +67,7 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:16" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:12" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>