From 8295b75371305224d5b223ae2566c50efbb94749 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 14:41:38 +0800
Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9C?=
 =?UTF-8?q?=E9=97=B4=E6=A8=A1=E5=BC=8F=E4=BC=9A=E7=99=BD=E5=B1=8F=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/index.html b/index.html
index 16722a6..753eb82 100644
--- a/index.html
+++ b/index.html
@@ -19,6 +19,10 @@
           line-height: 1.15;
         }
 
+        html[data-theme='dark'] {
+          background-color: #2c344a;
+        }
+
         html[data-theme='dark'] .app-loading {
           background-color: #2c344a;
         }
@@ -143,6 +147,17 @@
           }
         }
       </style>
+      <script>
+        // 从localStorage中获取主题 第一次打开页面未null 也就是默认的是light
+        const mode = localStorage.getItem('__APP__DARK__MODE__');
+        // data-theme设置之后 html[data-theme='dark'] 才会生效
+        // 主要解决夜间模式加载会白屏的问题
+        if (mode === 'dark') {
+          htmlRoot.setAttribute('data-theme', 'dark');
+        } else {
+          htmlRoot.setAttribute('data-theme', 'light');
+        }
+      </script>
       <div class="app-loading">
         <div class="app-loading-wrap">
           <img src="/logo.png" class="app-loading-logo" alt="Logo" />
-- 
Gitee


From c6a052521ea6d833926ac5e1f96d68e98ee3e7a7 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 14:56:08 +0800
Subject: [PATCH 02/13] =?UTF-8?q?chore:=20=E9=87=87=E7=94=A8skeleton?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/UserInfoModal.vue | 56 +++++++++++++------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/views/system/user/UserInfoModal.vue b/src/views/system/user/UserInfoModal.vue
index 9b3b3ef..35eefb5 100644
--- a/src/views/system/user/UserInfoModal.vue
+++ b/src/views/system/user/UserInfoModal.vue
@@ -1,6 +1,7 @@
 <template>
   <BasicModal v-bind="$attrs" :width="600" title="用户信息" @register="registerInnerModal">
-    <Description @register="registerDescription" />
+    <Description v-show="!showSkeleton" @register="registerDescription" />
+    <Skeleton active v-if="showSkeleton" :paragraph="{ rows: 8 }" />
     <template #footer>
       <a-button @click="closeModal">关闭</a-button>
     </template>
@@ -12,35 +13,36 @@
   import { userInfo } from '@/api/system/user';
   import { Description, useDescription } from '@/components/Description';
   import { descSchema } from './user.info';
+  import { Skeleton } from 'ant-design-vue';
+  import { ref } from 'vue';
 
   defineOptions({ name: 'UserInfoModal' });
 
-  const [registerInnerModal, { modalLoading, closeModal }] = useModalInner(
-    async (userId: string | number) => {
-      modalLoading(true);
-      if (!userId) {
-        return closeModal();
-      }
-      const response = await userInfo(userId);
-      // 外部的roleIds postIds才是真正对应的  新增时为空
-      const { postIds = [], roleIds = [], user, roles, posts } = response;
-
-      const postNames = posts
-        .filter((item) => postIds.includes(item.postId))
-        .map((item) => item.postName);
-
-      const roleNames = roles
-        .filter((item) => roleIds.includes(item.roleId))
-        .map((item) => item.roleName);
-
-      (user as any).postNames = postNames;
-      (user as any).roleNames = roleNames;
-
-      // 赋值
-      setDescProps({ data: user });
-      modalLoading(false);
-    },
-  );
+  const showSkeleton = ref<boolean>(true);
+  const [registerInnerModal, { closeModal }] = useModalInner(async (userId: string | number) => {
+    showSkeleton.value = true;
+    if (!userId) {
+      return closeModal();
+    }
+    const response = await userInfo(userId);
+    // 外部的roleIds postIds才是真正对应的  新增时为空
+    const { postIds = [], roleIds = [], user, roles, posts } = response;
+
+    const postNames = posts
+      .filter((item) => postIds.includes(item.postId))
+      .map((item) => item.postName);
+
+    const roleNames = roles
+      .filter((item) => roleIds.includes(item.roleId))
+      .map((item) => item.roleName);
+
+    (user as any).postNames = postNames;
+    (user as any).roleNames = roleNames;
+
+    // 赋值
+    setDescProps({ data: user });
+    showSkeleton.value = false;
+  });
 
   const [registerDescription, { setDescProps }] = useDescription({
     column: 1,
-- 
Gitee


From f00ca48738746d11b7e46b173e113df5f7aacaf0 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:18:44 +0800
Subject: [PATCH 03/13] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 49 +++++++++++++++++----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8f91035..591f4a2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,22 +2,24 @@
   <PageWrapper dense>
     <Row>
       <!-- 左边部门选择 -->
-      <Col v-bind="{ xs: 24, sm: 24, md: 24, lg: 4 }" class="tree-full-content">
-        <BasicTree
-          v-if="data.tree.length"
-          :fieldNames="{ title: 'label', key: 'id' }"
-          :tree-data="data.tree"
-          :showLine="{ showLeafIcon: false }"
-          :search="true"
-          v-model:searchValue="deptSearchText"
-          defaultExpandAll
-          @select="handleSelectDept"
-          v-model:selectedKeys="data.selectDeptId"
-        />
-        <!-- 仅本人数据权限 可以考虑直接不显示 -->
-        <div class="mt-5" v-else>
-          <Empty description="无部门数据" />
-        </div>
+      <Col v-bind="{ xs: 24, sm: 24, md: 24, lg: 4 }" class="h-[calc(100vh-80px)]">
+        <Skeleton :active="true" :paragraph="{ rows: 8 }" :loading="showTreeSkeleton">
+          <BasicTree
+            v-if="data.tree.length"
+            :fieldNames="{ title: 'label', key: 'id' }"
+            :tree-data="data.tree"
+            :showLine="{ showLeafIcon: false }"
+            :search="true"
+            v-model:searchValue="deptSearchText"
+            defaultExpandAll
+            @select="handleSelectDept"
+            v-model:selectedKeys="data.selectDeptId"
+          />
+          <!-- 仅本人数据权限 可以考虑直接不显示 -->
+          <div class="mt-5" v-else>
+            <Empty :image="Empty.PRESENTED_IMAGE_SIMPLE" description="无部门数据" />
+          </div>
+        </Skeleton>
       </Col>
       <!-- 右边表格及菜单 -->
       <Col v-bind="{ xs: 24, sm: 24, md: 24, lg: 20 }">
@@ -70,6 +72,7 @@
             </template>
             <template v-if="column.dataIndex === 'status'">
               <TableSwitch
+                v-auth="'system:user:edit'"
                 v-model="record.status"
                 :disabled="record.userId === 1"
                 :api="() => userStatusChange(record)"
@@ -142,7 +145,7 @@
 
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
-  import { Row, Col, Space, Empty } from 'ant-design-vue';
+  import { Row, Col, Space, Empty, Skeleton } from 'ant-design-vue';
   import { BasicTree } from '@/components/Tree/index';
   import {
     departmentTree,
@@ -169,16 +172,17 @@
   // 缓存
   defineOptions({ name: 'User' });
 
-  type Data = {
+  interface TreeProps {
     tree: DeptTreeData[];
     selectDeptId: string[];
-  };
+  }
   /** 左边搜索框 */
   const deptSearchText = ref<string>('');
-  const data: Data = reactive({
+  const data: TreeProps = reactive({
     tree: [],
     selectDeptId: [],
   });
+  const showTreeSkeleton = ref<boolean>(true);
 
   // 选中部门后刷新表格
   async function handleSelectDept() {
@@ -187,6 +191,7 @@
 
   onMounted(async () => {
     data.tree = await departmentTree();
+    showTreeSkeleton.value = false;
   });
 
   const [registerTable, { reload, selected, reloadWithCallback, multipleRemove }] = useTable({
@@ -279,10 +284,6 @@
 </script>
 
 <style lang="less" scoped>
-  .tree-full-content {
-    height: calc(100vh - 80px);
-  }
-
   /** 去掉表格padding */
   :deep(.vben-basic-table-form-container) {
     padding: 5px;
-- 
Gitee


From c0bd0cacfb41629d5ef328084719f7bc6599146d Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:38:50 +0800
Subject: [PATCH 04/13] fix: v-auth

---
 src/views/system/oss/OssConfig.vue |  9 +++++----
 src/views/system/oss/index.vue     | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/views/system/oss/OssConfig.vue b/src/views/system/oss/OssConfig.vue
index 98beda3..32897a2 100644
--- a/src/views/system/oss/OssConfig.vue
+++ b/src/views/system/oss/OssConfig.vue
@@ -7,7 +7,7 @@
             type="primary"
             :pre-icon="IconEnum.ADD"
             @click="handleAdd"
-            v-auth="'system:oss:add'"
+            v-auth="'system:ossConfig:add'"
             >新增配置</a-button
           >
           <a-button
@@ -16,7 +16,7 @@
             danger
             @click="multipleRemove(ossConfigRemove)"
             :disabled="!selected"
-            v-auth="'system:oss:edit'"
+            v-auth="'system:ossConfig:remove'"
             >选中删除</a-button
           >
           <OpenSelector class="<sm:hidden" v-model:value="openType" />
@@ -25,6 +25,7 @@
       <template #bodyCell="{ column, record }">
         <template v-if="column.dataIndex === 'status'">
           <TableSwitch
+            v-auth="'system:ossConfig:edit'"
             v-model="record.status"
             :api="() => ossConfigChangeStatus(record)"
             :custom-content="
@@ -42,7 +43,7 @@
                 icon: IconEnum.EDIT,
                 type: 'primary',
                 ghost: true,
-                auth: 'system:oss:edit',
+                auth: 'system:ossConfig:edit',
                 onClick: handleEdit.bind(null, record),
               },
               {
@@ -50,7 +51,7 @@
                 icon: IconEnum.DELETE,
                 type: 'error',
                 ghost: true,
-                auth: 'system:oss:edit',
+                auth: 'system:ossConfig:remove',
                 popConfirm: {
                   placement: 'left',
                   title: `是否删除oss配置[${record.configKey}]?`,
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index b510dc1..dd1cbd7 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -3,8 +3,13 @@
     <BasicTable @register="registerTable">
       <template #tableTitle>
         <Space>
-          <FileUpload class="<sm:hidden" v-bind="fileAttrs" @reload="reload" />
-          <FileUpload v-bind="imageAttrs" @reload="reload" />
+          <FileUpload
+            v-auth="'system:oss:upload'"
+            class="<sm:hidden"
+            v-bind="fileAttrs"
+            @reload="reload"
+          />
+          <FileUpload v-auth="'system:oss:upload'" v-bind="imageAttrs" @reload="reload" />
           <a-button
             class="<sm:hidden"
             :preIcon="IconEnum.DELETE"
@@ -15,15 +20,19 @@
             v-auth="'system:oss:remove'"
             >选中删除</a-button
           >
-          <div class="<sm:hidden">
-            预览图片:
+          <div class="flex gap-1 <sm:hidden">
+            预览图片
             <Switch v-model:checked="preview" />
           </div>
         </Space>
       </template>
       <template #toolbar>
         <Space>
-          <a-button preIcon="icon-park-outline:setting" type="primary" @click="handleToSettings"
+          <a-button
+            v-auth="'system:ossConfig:list'"
+            preIcon="icon-park-outline:setting"
+            type="primary"
+            @click="handleToSettings"
             >OSS配置管理</a-button
           >
         </Space>
-- 
Gitee


From 8f2538184ee7fb10d5be2a86873d1e0f63b2f55d Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:46:06 +0800
Subject: [PATCH 05/13] chore: client v-auth

---
 src/views/system/client/index.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 1f630c5..e0b3499 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -37,6 +37,18 @@
         </Space>
       </template>
       <template #bodyCell="{ column, record }">
+        <template v-if="column.dataIndex === 'status'">
+          <TableSwitch
+            v-auth="'system:client:edit'"
+            v-model="record.status"
+            :disabled="record.userId === 1"
+            :api="() => clientChangeStatus(record)"
+            :custom-content="
+              (newStatusStr: string) => `确认${newStatusStr}客户端[${record.clientKey}]吗?`
+            "
+            :reload="reload"
+          />
+        </template>
         <template v-if="column.key === 'action'">
           <TableAction
             stopButtonPropagation
@@ -73,9 +85,9 @@
 
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import { BasicTable, useTable, TableAction, TableSwitch } from '@/components/Table';
   import { Space } from 'ant-design-vue';
-  import { clientList, clientExport, clientRemove } from '@/api/system/client';
+  import { clientList, clientExport, clientRemove, clientChangeStatus } from '@/api/system/client';
   import { downloadExcel } from '@/utils/file/download';
   import { useModal } from '@/components/Modal';
   import ClientModal from './ClientModal.vue';
-- 
Gitee


From 27a88fa92d3447b6934a93cc25e3c6cb5e111e4f Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:46:32 +0800
Subject: [PATCH 06/13] chore: tenant

---
 src/views/system/tenant/tenant.data.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index ba995e9..a468ad7 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -154,7 +154,6 @@ export const modalSchemas: FormSchema[] = [
       min: -1,
     },
     renderComponentContent({ model }) {
-      console.log(model.accountCount);
       return {
         addonBefore: () => (model.accountCount == -1 ? '不限制数量' : '输入数量'),
       };
-- 
Gitee


From 27c8eeb8f6448ee0747d20367b60a943303471b5 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:49:01 +0800
Subject: [PATCH 07/13] =?UTF-8?q?chore:=20=E7=A7=9F=E6=88=B7package?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenantPackage/index.vue      | 20 +++++++++++++++++--
 .../tenantPackage/tenantPackage.data.ts       | 13 +++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 4da6cbf..fb388cf 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -35,6 +35,17 @@
         >
       </template>
       <template #bodyCell="{ column, record }">
+        <template v-if="column.dataIndex === 'status'">
+          <TableSwitch
+            v-auth="'system:tenantPackage:edit'"
+            v-model="record.status"
+            :api="() => packageChangeStatus(record)"
+            :custom-content="
+              (newStatusStr: string) => `确认${newStatusStr}租户套餐[${record.packageName}]吗?`
+            "
+            :reload="reload"
+          />
+        </template>
         <template v-if="column.key === 'action'">
           <TableAction
             :actions="[
@@ -69,8 +80,13 @@
 
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
-  import { packageList, packageRemove, packageExport } from '@/api/system/tenantPackage';
-  import { BasicTable, useTable, TableAction } from '@/components/Table';
+  import {
+    packageList,
+    packageRemove,
+    packageExport,
+    packageChangeStatus,
+  } from '@/api/system/tenantPackage';
+  import { BasicTable, useTable, TableAction, TableSwitch } from '@/components/Table';
   import { columns, formSchemas } from './tenantPackage.data';
   import { IconEnum } from '@/enums/appEnum';
   import { Space } from 'ant-design-vue';
diff --git a/src/views/system/tenantPackage/tenantPackage.data.ts b/src/views/system/tenantPackage/tenantPackage.data.ts
index 742e22d..0356fea 100644
--- a/src/views/system/tenantPackage/tenantPackage.data.ts
+++ b/src/views/system/tenantPackage/tenantPackage.data.ts
@@ -1,9 +1,6 @@
 import { BasicColumn } from '@/components/Table';
-import { useRender } from '@/hooks/component/useRender';
 import { FormSchema } from '@/components/Form';
-import { packageChangeStatus } from '@/api/system/tenantPackage';
 
-const { renderSwitch } = useRender();
 export const columns: BasicColumn[] = [
   {
     title: '套餐名称',
@@ -16,11 +13,11 @@ export const columns: BasicColumn[] = [
   {
     title: '租户状态',
     dataIndex: 'status',
-    customRender({ record }) {
-      return renderSwitch(record, packageChangeStatus, (newStatusStr) => {
-        return `确认${newStatusStr}租户套餐[${record.packageName}]吗?`;
-      });
-    },
+    // customRender({ record }) {
+    //   return renderSwitch(record, packageChangeStatus, (newStatusStr) => {
+    //     return `确认${newStatusStr}租户套餐[${record.packageName}]吗?`;
+    //   });
+    // },
   },
 ];
 
-- 
Gitee


From 25a712b7e5c7bc9c42306b7a2d8d852633bb3eca Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 15:59:12 +0800
Subject: [PATCH 08/13] chore: auth

---
 src/views/tool/gen/index.vue | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index b011590..422a834 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -6,11 +6,23 @@
     <BasicTable @register="registerTable">
       <template #tableTitle>
         <Space>
-          <a-button type="primary" :pre-icon="IconEnum.IMPORT" @click="handleImport">导入</a-button>
-          <a-button type="success" :pre-icon="IconEnum.ADD" :disabled="!selected" @click="batchGen"
+          <a-button
+            v-auth="'tool:gen:import'"
+            type="primary"
+            :pre-icon="IconEnum.IMPORT"
+            @click="handleImport"
+            >导入</a-button
+          >
+          <a-button
+            v-auth="'tool:gen:code'"
+            type="success"
+            :pre-icon="IconEnum.ADD"
+            :disabled="!selected"
+            @click="batchGen"
             >选中生成</a-button
           >
           <a-button
+            v-auth="'tool:gen:remove'"
             :preIcon="IconEnum.DELETE"
             type="primary"
             danger
@@ -31,28 +43,32 @@
               {
                 label: '预览',
                 icon: IconEnum.PREVIEW,
+                auth: 'tool:gen:preview',
                 onClick: handlePreview.bind(null, record),
               },
               {
                 label: '编辑',
                 icon: IconEnum.EDIT,
+                auth: 'tool:gen:edit',
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '同步',
                 icon: IconEnum.SYNC,
+                auth: 'tool:gen:edit',
                 onClick: handleSync.bind(null, record),
               },
               {
                 label: '生成代码',
                 icon: IconEnum.DOWNLOAD,
+                auth: 'tool:gen:code',
                 onClick: handleGenerate.bind(null, record),
               },
               {
                 label: '删除',
                 icon: IconEnum.DELETE,
                 type: 'error',
-                ghost: true,
+                auth: 'tool:gen:remove',
                 popConfirm: {
                   placement: 'left',
                   title: `是否删除表[${record.tableName}]?`,
-- 
Gitee


From b56d20577f59854051186df7d2a0291d646a88ed Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 16:00:37 +0800
Subject: [PATCH 09/13] =?UTF-8?q?chore:=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/gen/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 422a834..ca8f4c7 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -67,7 +67,7 @@
               {
                 label: '删除',
                 icon: IconEnum.DELETE,
-                type: 'error',
+                color: 'error',
                 auth: 'tool:gen:remove',
                 popConfirm: {
                   placement: 'left',
-- 
Gitee


From 6332d990852adb20cb6e18ae1144f0e2afa1629a Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 16:12:31 +0800
Subject: [PATCH 10/13] =?UTF-8?q?chore:=20menu=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/menu.data.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/system/menu/menu.data.ts b/src/views/system/menu/menu.data.ts
index 9ba01c4..9db7bf9 100644
--- a/src/views/system/menu/menu.data.ts
+++ b/src/views/system/menu/menu.data.ts
@@ -7,9 +7,9 @@ import { isUrl } from '@/utils/is';
 
 // （M目录 C菜单 F按钮）
 const menuTypes = {
-  M: { value: '目录', icon: 'ic:outline-folder' },
-  C: { value: '菜单', icon: 'gg:menu-round' },
-  F: { value: '按钮', icon: 'mdi:button-cursor' },
+  M: { value: '目录', icon: 'fxemoji:folder' },
+  C: { value: '菜单', icon: 'fluent-emoji-flat:open-book' },
+  F: { value: '按钮', icon: 'fluent-emoji:ok-button' },
 };
 
 const { renderDict, renderIcon, renderIconSpan } = useRender();
@@ -40,7 +40,7 @@ export const tableColumns: BasicColumn[] = [
     width: 150,
     customRender({ value }) {
       const current = menuTypes[value];
-      return renderIconSpan(current.icon, current.value, true);
+      return renderIconSpan(current.icon, current.value, true, '5px');
     },
   },
   {
-- 
Gitee


From b3205dbae55eb62dd63992f7dd4444dd05b510b4 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 1 Feb 2024 18:13:21 +0800
Subject: [PATCH 11/13] docs: changelog

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cc12b4..66dfd0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# 1.1.4
+
+**Bug Fixed**
+
+夜间模式通过刷新加载会有短暂白屏问题
+
+**Feature**
+
+用户管理 部门树skeleton加载
+
+**其他**
+
+用户管理 用户信息modal使用skeleton加载
+
+oss配置 v-auth
+
+代码生成 v-auth
+
 # 1.1.3
 
 **Bug Fixed**
-- 
Gitee


From b93d1ec94d289d8f6414c9625e7d755e0d5a6282 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 2 Feb 2024 00:24:01 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/DeptModal.vue | 72 +++++++++++++----------------
 src/views/system/dept/dept.data.ts  |  4 ++
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/views/system/dept/DeptModal.vue b/src/views/system/dept/DeptModal.vue
index f023e5a..b26a5e0 100644
--- a/src/views/system/dept/DeptModal.vue
+++ b/src/views/system/dept/DeptModal.vue
@@ -30,25 +30,24 @@
   });
 
   const [registerInnerModal, { modalLoading, closeModal }] = useModalInner(
-    async (data: { deptId: string | number; update: boolean }) => {
+    async (data: { deptId?: string | number; update: boolean }) => {
       modalLoading(true);
       const { deptId, update } = data;
       isUpdate.value = update;
-      // deptId必填
-      if (update) {
-        const ret = await deptInfo(deptId);
-        await setFieldsValue(ret);
-      } else {
-        // 新增
+      if (deptId) {
         await setFieldsValue({ parentId: deptId });
+        if (unref(isUpdate)) {
+          const ret = await deptInfo(deptId);
+          await setFieldsValue(ret);
+        }
       }
-
-      // 部门负责人下拉框
-      await initDeptUsers(deptId);
-
-      // 部门选择框
+      if (deptId && update) {
+        await initDeptUsers(deptId);
+      } else {
+        await setLeaderOptions();
+      }
+      /** 部门选择 下拉框 */
       await initDeptSelect(deptId);
-
       modalLoading(false);
     },
   );
@@ -56,38 +55,21 @@
   async function initDeptSelect(deptId?: string | number) {
     // 需要动态更新TreeSelect组件 这里允许为空
     const treeData = await getDeptTree(deptId, !unref(isUpdate));
-    // onChange 切换时刷新部门用户列表
     await updateSchema({
       field: 'parentId',
-      componentProps({ formModel }) {
-        return {
-          /**
-           * 这里不能用onChnage 因为每次打开都会触发
-           * 和useModalInner回调函数会总共调用两次initDeptUsers
-           * 使用onSelect只会在选择后触发
-           * @param value
-           */
-          async onSelect(deptId: number) {
-            if (typeof deptId !== 'number') {
-              return;
-            }
-            await initDeptUsers(deptId);
-            // 清空已经选择的部门管理员
-            formModel.leader = void 0;
-          },
-          treeData,
-          treeLine: { showLeafIcon: false },
-          fieldNames: { label: 'deptName', value: 'deptId' },
-          treeDefaultExpandAll: true,
-          // 选中后显示在输入框的值
-          treeNodeLabelProp: 'fullName',
-        };
+      componentProps: {
+        treeData,
+        treeLine: { showLeafIcon: false },
+        fieldNames: { label: 'deptName', value: 'deptId' },
+        treeDefaultExpandAll: true,
+        // 选中后显示在输入框的值
+        treeNodeLabelProp: 'fullName',
       },
     });
   }
 
   /**
-   * 部门管理员下拉框
+   * 部门管理员下拉框 更新时才会enable
    * @param deptId
    */
   async function initDeptUsers(deptId: string | number) {
@@ -96,13 +78,23 @@
       label: `${user.userName} | ${user.nickName}`,
       value: user.userId,
     }));
-
     await updateSchema({
       field: 'leader',
       componentProps: {
         options,
         disabled: ret.length === 0,
-        placeholder: ret.length === 0 ? '该部门暂无用户' : '请选择部门管理员',
+        placeholder: ret.length === 0 ? '该部门暂无用户' : '请选择部门负责人',
+      },
+    });
+  }
+
+  async function setLeaderOptions() {
+    await updateSchema({
+      field: 'leader',
+      componentProps: {
+        options: [],
+        disabled: true,
+        placeholder: '仅在更新时可选部门负责人',
       },
     });
   }
diff --git a/src/views/system/dept/dept.data.ts b/src/views/system/dept/dept.data.ts
index ca01b75..0ad3cf9 100644
--- a/src/views/system/dept/dept.data.ts
+++ b/src/views/system/dept/dept.data.ts
@@ -79,6 +79,10 @@ export const modalSchemas: FormSchema[] = [
     field: 'leader',
     label: '负责人',
     component: 'Select',
+    componentProps: {
+      // 选中了就只能修改 不能重置为无负责人
+      allowClear: false,
+    },
   },
   {
     field: 'phone',
-- 
Gitee


From 395c6e93134180b2e90bcd4cd0e23582a169f933 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 2 Feb 2024 00:25:18 +0800
Subject: [PATCH 13/13] =?UTF-8?q?docs:=20=E7=89=88=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66dfd0c..27e4995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 夜间模式通过刷新加载会有短暂白屏问题
 
+回滚部门管理代码 逻辑有问题 --!
+
 **Feature**
 
 用户管理 部门树skeleton加载
diff --git a/package.json b/package.json
index a7fe2b9..60c05f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-plus-vben",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "homepage": "https://gitee.com/dapppp/ruoyi-plus-vben.git",
   "bugs": {
     "url": "https://gitee.com/dapppp/ruoyi-plus-vben/issues"
-- 
Gitee