From 3b709f1e0a8ceb65196d2583768c4ef94bc4959d Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Fri, 16 May 2025 11:11:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Doss=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8A=9F=E8=83=BDbug=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=87=8D=E7=BD=AE=E6=97=B6=E6=B2=A1=E6=9C=89=E5=AF=B9?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oss-config/index.vue |  1 +
 src/views/system/post/index.vue       | 26 +++++++++++++++++++-------
 src/views/system/user/index.vue       |  9 ++++++++-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/system/oss-config/index.vue b/src/views/system/oss-config/index.vue
index 6778fa48..ae698f49 100644
--- a/src/views/system/oss-config/index.vue
+++ b/src/views/system/oss-config/index.vue
@@ -204,6 +204,7 @@ async function handleStatusChange(
   callback: (flag: boolean) => void
 ) {
   const { error } = await fetchUpdateOssConfigStatus({
+    configKey: row.configKey,
     ossConfigId: row.ossConfigId,
     status: value
   });
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index c065d996..07ff5ab0 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { NButton, NDivider } from 'naive-ui';
 import { useLoading } from '@sa/hooks';
 import { fetchBatchDeletePost, fetchGetPostList } from '@/service/api/system/post';
@@ -43,7 +43,8 @@ const {
     // the value can not be undefined, otherwise the property in Form will not be reactive
     postCode: null,
     postName: null,
-    status: null
+    status: null,
+    belongDeptId: null
   },
   columns: () => [
     {
@@ -180,10 +181,16 @@ async function handleExport() {
   download('/system/post/export', searchParams, `岗位信息_${new Date().getTime()}.xlsx`);
 }
 
+const expandedKeys = ref<CommonType.IdType[]>([100]);
+
+const selectable = computed(() => {
+  return !loading.value;
+});
+
 const { loading: treeLoading, startLoading: startTreeLoading, endLoading: endTreeLoading } = useLoading();
 const deptPattern = ref<string>();
 const deptData = ref<Api.Common.CommonTreeRecord>([]);
-
+const selectedKeys = ref<string[]>([]);
 async function getTreeData() {
   startTreeLoading();
   const { data: tree, error } = await fetchGetDeptTree();
@@ -203,9 +210,12 @@ function handleClickTree(keys: string[]) {
 
 function handleResetTreeData() {
   deptPattern.value = undefined;
-  searchParams.belongDeptId = null;
   getTreeData();
-  getDataByPage();
+}
+
+function handleResetSearch() {
+  resetSearchParams();
+  selectedKeys.value = [];
 }
 </script>
 
@@ -222,10 +232,11 @@ function handleResetTreeData() {
       <NInput v-model:value="deptPattern" clearable :placeholder="$t('common.keywordSearch')" />
       <NSpin class="dept-tree" :show="treeLoading">
         <NTree
+          v-model:expanded-keys="expandedKeys"
+          v-model:selected-keys="selectedKeys"
           block-node
           show-line
           :data="deptData as []"
-          :default-expanded-keys="deptData?.length ? [deptData[0].id!] : []"
           :show-irrelevant-nodes="false"
           :pattern="deptPattern"
           block-line
@@ -233,6 +244,7 @@ function handleResetTreeData() {
           key-field="id"
           label-field="label"
           virtual-scroll
+          :selectable="selectable"
           @update:selected-keys="handleClickTree"
         >
           <template #empty>
@@ -242,7 +254,7 @@ function handleResetTreeData() {
       </NSpin>
     </template>
     <div class="h-full flex-col-stretch gap-12px overflow-hidden lt-sm:overflow-auto">
-      <PostSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+      <PostSearch v-model:model="searchParams" @reset="handleResetSearch" @search="getDataByPage" />
       <NCard title="岗位信息列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
         <template #header-extra>
           <TableHeaderOperation
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4f63cc66..effb8e89 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -212,6 +212,7 @@ async function handleResetPwd(userId: CommonType.IdType) {
 const { loading: treeLoading, startLoading: startTreeLoading, endLoading: endTreeLoading } = useLoading();
 const deptPattern = ref<string>();
 const deptData = ref<Api.Common.CommonTreeRecord>([]);
+const selectedKeys = ref<string[]>([]);
 
 async function getTreeData() {
   startTreeLoading();
@@ -267,6 +268,11 @@ const expandedKeys = ref<CommonType.IdType[]>([100]);
 const selectable = computed(() => {
   return !loading.value;
 });
+
+function handleResetSearch() {
+  resetSearchParams();
+  selectedKeys.value = [];
+}
 </script>
 
 <template>
@@ -283,6 +289,7 @@ const selectable = computed(() => {
       <NSpin class="dept-tree" :show="treeLoading">
         <NTree
           v-model:expanded-keys="expandedKeys"
+          v-model:selected-keys="selectedKeys"
           block-node
           show-line
           :data="deptData as []"
@@ -302,7 +309,7 @@ const selectable = computed(() => {
       </NSpin>
     </template>
     <div class="h-full flex-col-stretch gap-12px overflow-hidden lt-sm:overflow-auto">
-      <UserSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+      <UserSearch v-model:model="searchParams" @reset="handleResetSearch" @search="getDataByPage" />
       <TableRowCheckAlert v-model:checked-row-keys="checkedRowKeys" />
       <NCard :title="$t('page.system.user.title')" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
         <template #header-extra>