From 5156b9ccae0db0d18d3722d03bd398573ec88b2a Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 13 Apr 2024 11:18:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=88=E5=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   6 +-
 src/views/home/aside/Aside.vue                | 392 +++++++++---------
 src/views/home/aside/comp/Search.vue          |  77 ++--
 .../aside/comp/modals/CustomFilterModal.vue   | 147 +++++--
 4 files changed, 353 insertions(+), 269 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e12f925..61136d3 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -23,7 +23,6 @@ declare module 'vue' {
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
-    NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NGi: typeof import('naive-ui')['NGi']
@@ -38,17 +37,14 @@ declare module 'vue' {
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
+    NProgress: typeof import('naive-ui')['NProgress']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
     NSlider: typeof import('naive-ui')['NSlider']
     NSpace: typeof import('naive-ui')['NSpace']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
-    NTabPane: typeof import('naive-ui')['NTabPane']
-    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
-    NTimeline: typeof import('naive-ui')['NTimeline']
-    NTimelineItem: typeof import('naive-ui')['NTimelineItem']
     NTooltip: typeof import('naive-ui')['NTooltip']
     NUpload: typeof import('naive-ui')['NUpload']
     NUploadDragger: typeof import('naive-ui')['NUploadDragger']
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index a6b2249..04e198b 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -10,263 +10,281 @@ import {
   shallowRef,
   unref,
   watch,
-} from "vue";
-import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from "./comp/modals";
-import Search from "./comp/Search.vue";
-import AdvanceFilter from "./comp/AdvanceFilter.vue";
-import { getViewportOffset } from "@/utils/domUtils";
-import { useWindowSizeFn } from "@/hooks/event/useWindowSizeFn";
-import { useConfig } from "@/store/modules/asideConfig";
-import type { Filter } from "/#/home";
-import type { AsideEntity } from "@/config/aside";
-import { asideMap } from "@/config/aside";
-import type { AsideConfig } from "/#/api";
-import emitter from "@/utils/mitt";
-import { getFilterList } from "@/api/home/main";
-import dayjs from "dayjs";
-import { cloneDeep, isEqual } from "lodash-es";
-
-const configStore = useConfig();
+} from 'vue'
+import dayjs from 'dayjs'
+import { cloneDeep, isEqual } from 'lodash-es'
+import { CustomFilterModalVue, FilterModalVue, NewFilterModalVue } from './comp/modals'
+import Search from './comp/Search.vue'
+import AdvanceFilter from './comp/AdvanceFilter.vue'
+import { getViewportOffset } from '@/utils/domUtils'
+import { useWindowSizeFn } from '@/hooks/event/useWindowSizeFn'
+import { useConfig } from '@/store/modules/asideConfig'
+import type { Filter } from '/#/home'
+import type { AsideEntity } from '@/config/aside'
+import { asideMap } from '@/config/aside'
+import type { AsideConfig } from '/#/api'
+import emitter from '@/utils/mitt'
+import { getFilterList } from '@/api/home/main'
+
+const configStore = useConfig()
 
 // 所有左侧模块的值
-let asideValue: Record<keyof typeof asideMap, any> = reactive({});
+const asideValue: Record<keyof typeof asideMap, any> = reactive({})
 // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
-const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({});
+const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
 // 当前显示的模块，按照数组顺序显示
-const showItems = shallowRef<{ key: string; config: AsideEntity }[]>([]);
+const showItems = shallowRef<{ key: string, config: AsideEntity }[]>([])
 
 Object.keys(asideMap).forEach((key) => {
-  const entity = asideMap[key];
-  const { defaultValue } = entity;
-  asideValue[key] = defaultValue;
-});
-
-const filterModalRef: any = ref(null);
-const newFilterModalRef = ref(null);
-const customModalRef = ref(null);
-const customObjRef = ref<any>(null); // 获取高级筛选获取的值
-const customTempObjRef = ref<any>(null); // 获取高级筛选获取的值(作对比)
-const configFilterRef = ref<any>([]); // 获取排序的值
-const AdvanceFilterRef: any = ref(null);
+  const entity = asideMap[key]
+  const { defaultValue } = entity
+  asideValue[key] = defaultValue
+})
+
+const filterModalRef: any = ref(null)
+const newFilterModalRef = ref(null)
+const customModalRef = ref(null)
+const customObjRef = ref<any>(null) // 获取高级筛选获取的值
+const customTempObjRef = ref<any>(null) // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref<any>([]) // 获取排序的值
+const AdvanceFilterRef: any = ref(null)
 
 function showModal(modalRef: any) {
-  const modal = unref(modalRef)! as any;
-  modal.showModal();
+  const modal = unref(modalRef)! as any
+  modal.showModal()
 }
 
 onMounted(() => {
   nextTick(() => {
-    computeSlideHeight();
-    let tempAsideValue = cloneDeep(asideValue);
+    computeSlideHeight()
+    const tempAsideValue = cloneDeep(asideValue)
     // configStore.setAsideValue(tempAsideValue);
-    console.log("asideMap和asideValue", tempAsideValue);
-  });
-});
+    console.log('asideMap和asideValue', tempAsideValue)
+  })
+})
 
-const collapse = ref(false);
-const mousetrap = inject("mousetrap") as any;
-mousetrap.bind("[", collapseHandler);
+const collapse = ref(false)
+const mousetrap = inject('mousetrap') as any
+mousetrap.bind('[', collapseHandler)
 
 function collapseHandler() {
-  collapse.value = !collapse.value;
+  collapse.value = !collapse.value
 }
 
 const asideWidth = computed(() => {
-  return collapse.value ? 0 : 308;
-});
+  return collapse.value ? 0 : 308
+})
 
-const asideHeight = ref(500);
+const asideHeight = ref(500)
 const asideStyle = computed(() => {
   return {
     width: `${asideWidth.value}px`,
     height: `${asideHeight.value}px`,
-  };
-});
+  }
+})
 
 const collapseIcon = computed(() => {
-  return collapse.value ? "expand-cir" : "collapse-cir";
-});
+  return collapse.value ? 'expand-cir' : 'collapse-cir'
+})
 
 function computeSlideHeight() {
-  const headEl = document.querySelector(".aside-header")!;
-  const { bottomIncludeBody } = getViewportOffset(headEl);
-  const height = bottomIncludeBody;
-  asideHeight.value = height - 24;
+  const headEl = document.querySelector('.aside-header')!
+  const { bottomIncludeBody } = getViewportOffset(headEl)
+  const height = bottomIncludeBody
+  asideHeight.value = height - 24
 }
 
-useWindowSizeFn(computeSlideHeight, 280);
+useWindowSizeFn(computeSlideHeight, 280)
 
 onBeforeMount(async () => {
-  configStore.fetchConfig();
-  configStore.fetchCustomConfig();
-});
+  configStore.fetchConfig()
+  configStore.fetchCustomConfig()
+})
 
-nextTick(()=>{
+nextTick(() => {
   configStore.$subscribe(() => {
-  const config = configStore.getConfig;
-  const customConfig = configStore.getCustomConfig;
-  if (
-    configFilterRef.value.length > 0 &&
-    isEqual(configFilterRef.value, configStore.getFilterConfig) &&
-    customObjRef.value &&
-    isEqual(customObjRef.value, customTempObjRef.value)
-  ) {
-    return;
-  }
-  if (config == null || customConfig == null) return;
-  // console.log("config", config, "customConfig", customConfig);
-  /* rao
+    const config = configStore.getConfig
+    const customConfig = configStore.getCustomConfig
+    if (
+      configFilterRef.value.length > 0
+      && isEqual(configFilterRef.value, configStore.getFilterConfig)
+      && customObjRef.value
+      && isEqual(customObjRef.value, customTempObjRef.value)
+    )
+      return
+
+    if (config == null || customConfig == null)
+      return
+    // console.log("config", config, "customConfig", customConfig);
+    /* rao
   const showKeys = [...customConfig].filter(key => !asideMap[key].isDefaultFilter)// 获取customConfig 非isDefaultFilter的选项
   const defaultKeys = Object.keys(asideMap).filter(key => asideMap[key].isDefaultFilter)// 获取asideMap isDefaultFilter的选项
   showKeys.unshift(...defaultKeys)
   */
 
-  let sortKeyList: any = [];
-  configStore.getFilterConfig.map((item: any) => {
-    sortKeyList.push(item?.id);
-  });
-  const showKeys = [...sortKeyList];
-
-  Object.keys(config).forEach((key) => {
-    if (key.startsWith("iz") && asideMap[key] !== undefined)
-      asideVisible[key] =
-        (showKeys.includes(key) || asideMap[key].isDefaultFilter) && config[key] === "Y";
-  });
-  if (customObjRef.value) {
-    // 赋值
-    Object.keys(customObjRef.value).map((key) => {
-      if (asideMap.hasOwnProperty(key)) {
-        const str = key.toLowerCase();
-        // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
-        if (str == "izsimilarity") {
-          if (typeof customObjRef.value[str] == "string") {
-            customObjRef.value[str] = customObjRef.value[str].split(",");
+    const sortKeyList: any = []
+    configStore.getFilterConfig.map((item: any) => {
+      sortKeyList.push(item?.id)
+      return item
+    })
+    const showKeys = [...sortKeyList]
+
+    Object.keys(config).forEach((key) => {
+      if (key.startsWith('iz') && asideMap[key] !== undefined) {
+        asideVisible[key]
+          = (showKeys.includes(key) || asideMap[key].isDefaultFilter)
+          && config[key] === 'Y'
+      }
+    })
+    if (customObjRef.value) {
+      // 赋值
+      Object.keys(customObjRef.value).map((key) => {
+        // TODO hasOwnProperty避免直接调用
+        // if (asideMap.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(customObjRef.value, key)) {
+          const str = key.toLowerCase()
+          // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
+          if (str == 'izsimilarity') {
+            if (typeof customObjRef.value[str] == 'string')
+              customObjRef.value[str] = customObjRef.value[str].split(',')
+
+            asideValue[key] = customObjRef.value[str] // 赋值
+            console.log('相似度2222222222', asideValue[key])
           }
-          asideValue[key] = customObjRef.value[str]; // 赋值
-          console.log("相似度2222222222", asideValue[key]);
-        } else if (str == "izyear") {
-          if (typeof customObjRef.value[str] == "string") {
-            let time = customObjRef.value[str].split("-");
-            time[0] = new Date(time[0]).getTime();
-            time[1] = new Date(time[1]).getTime();
-            customObjRef.value[str] = time;
+          else if (str == 'izyear') {
+            if (typeof customObjRef.value[str] == 'string') {
+              const time = customObjRef.value[str].split('-')
+              time[0] = new Date(time[0]).getTime()
+              time[1] = new Date(time[1]).getTime()
+              customObjRef.value[str] = time
+            }
+            asideValue[key] = customObjRef.value[str] // 赋值
+            console.log('时间2222222222', asideValue[key])
           }
-          asideValue[key] = customObjRef.value[str]; // 赋值
-          console.log("时间2222222222", asideValue[key]);
-        } else if (str != "izsimilarity" && str != "izyear" && customObjRef.value[str]) {
-          console.log("customObjRef.value[str]222222", customObjRef.value[str]);
-          // let list = customObjRef.value[str].split(',');
-          // console.log("list222222", list);
-          asideValue[key] = customObjRef.value[str]; // 赋值
-        } else {
-          asideValue[key] = null;
+          else if (
+            str != 'izsimilarity'
+            && str != 'izyear'
+            && customObjRef.value[str]
+          ) {
+            console.log('customObjRef.value[str]222222', customObjRef.value[str])
+            // let list = customObjRef.value[str].split(',');
+            // console.log("list222222", list);
+            asideValue[key] = customObjRef.value[str] // 赋值
+          }
+          else {
+            asideValue[key] = null
+          }
+          // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
         }
-        // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
-      }
-    });
-    customTempObjRef.value = customObjRef.value;
-    console.log("asideValue直接处理后的结果", asideValue);
-    console.log("customTempObjRef.value", customTempObjRef.value);
-    let tempobj = cloneDeep(asideValue);
-    console.log("tempObj", tempobj);
-    configStore.setAsideValue(tempobj);
-  }
-  // console.log("showKeys", showKeys);
-  const items = showKeys.reduce((acc, key) => {
-    const currentData = asideMap[key];
-    const render = currentData?.render;
-    if (render !== false) {
-      const str = key?.toLowerCase();
-
-      const o = {
-        key: str,
-        config: asideMap[str],
-      };
-      return [...acc, o];
-    } else {
-      return acc;
+        return key
+      })
+      customTempObjRef.value = customObjRef.value
+      console.log('asideValue直接处理后的结果', asideValue)
+      console.log('customTempObjRef.value', customTempObjRef.value)
+      const tempobj = cloneDeep(asideValue)
+      console.log('tempObj', tempobj)
+      configStore.setAsideValue(tempobj)
     }
-  }, []);
-  console.log("showItems=================================", items);
-  showItems.value = items;
-  configFilterRef.value = configStore.getFilterConfig;
-});
-
+    // console.log("showKeys", showKeys);
+    const items = showKeys.reduce((acc, key) => {
+      const currentData = asideMap[key]
+      const render = currentData?.render
+      if (render !== false) {
+        const str = key?.toLowerCase()
+
+        const o = {
+          key: str,
+          config: asideMap[str],
+        }
+        return [...acc, o]
+      }
+      else {
+        return acc
+      }
+    }, [])
+    console.log('showItems=================================', items)
+    showItems.value = items
+    configFilterRef.value = configStore.getFilterConfig
+  })
 })
-const asideEnter = ref(false);
+const asideEnter = ref(false)
 
 const showCollapse = computed(() => {
-  return collapse.value ? true : asideEnter.value;
-});
+  return collapse.value ? true : asideEnter.value
+})
 
-const showSearch = ref(false);
+const showSearch = ref(false)
 
 function setShowSearch(value: boolean) {
-  showSearch.value = value;
+  showSearch.value = value
 }
-const newFilterOk = () => {
+function newFilterOk() {
   filterModalRef.value.query(
     filterModalRef.value.pagination.page,
-    filterModalRef.value.pagination.pageSize
-  );
-  filterModalRef.value.showModal();
-};
+    filterModalRef.value.pagination.pageSize,
+  )
+  filterModalRef.value.showModal()
+}
 
 // 滚动容器，让key对应模块处于可视区域
 function scrollHandler(key: string) {
-  const element = document.querySelector(`#${key}`);
-  element?.scrollIntoView(true);
+  const element = document.querySelector(`#${key}`)
+  element?.scrollIntoView(true)
 }
 
 // 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
 async function filterHandler(searchId: string) {
   // emitter.emit('filter', searchId)
-  const res = await getFilterList({ userSearchId: searchId });
+  const res = await getFilterList({ userSearchId: searchId })
   // console.log("顾虑结果", res);
-  if (res.code == "OK") {
-    let obj = res.data;
-    customObjRef.value = res.data;
-    let showKeys: any[] = [];
+  if (res.code == 'OK') {
+    const obj = res.data
+    customObjRef.value = res.data
+    const showKeys: any[] = []
     Object.keys(obj).map((key) => {
-      if (asideMap.hasOwnProperty(key)) {
-        showKeys.push(key);
-      }
-    });
+      // TODO hasOwnProperty避免直接调用
+      // if (asideMap.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(asideMap, key))
+        showKeys.push(key)
+
+      return key
+    })
     // console.log(showKeys);
-    configStore.setCustomConfig(showKeys);
+    configStore.setCustomConfig(showKeys)
   }
 }
 
 function editFilter(filter: any) {
-  const modal = unref(newFilterModalRef)! as any;
-  modal.showModal();
-  modal.edit(filter);
+  const modal = unref(newFilterModalRef)! as any
+  modal.showModal()
+  modal.edit(filter)
 }
 
 function updateComponent(key, e) {
-  console.log("跟新值", key, e);
-  console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
+  console.log('跟新值', key, e)
+  console.log('tempAsideValue跟新值', configStore.getAsideValue, asideValue)
   // let tempAsideValue = configStore.getAsideValue || asideValue;
-  let tempobj = cloneDeep(asideValue);
-  console.log(tempobj, "tempobj");
-  tempobj[key] = e;
-  console.log(tempobj, "tempobj After");
-  customObjRef.value = tempobj;
+  const tempobj = cloneDeep(asideValue)
+  console.log(tempobj, 'tempobj')
+  tempobj[key] = e
+  console.log(tempobj, 'tempobj After')
+  customObjRef.value = tempobj
   // asideValue = Object.assign({}, asideValue, tempobj);
-  console.log("asideValue跟新值", tempobj);
-  configStore.setAsideValue(tempobj);
+  console.log('asideValue跟新值', tempobj)
+  configStore.setAsideValue(tempobj)
 }
 
-const handleOk = (item: any) => {
-  console.log("handleOk", item);
+function handleOk(item: any) {
+  console.log('handleOk', item)
   if (item) {
-    AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname);
-    filterHandler(item.id);
-  } else {
-    AdvanceFilterRef.value.setCurrentlySelectedAdvanced("高级筛选");
-    filterHandler("");
+    AdvanceFilterRef.value.setCurrentlySelectedAdvanced(item.searchname)
+    filterHandler(item.id)
+  }
+  else {
+    AdvanceFilterRef.value.setCurrentlySelectedAdvanced('高级筛选')
+    filterHandler('')
   }
-};
+}
 
 // watch(asideValue, (newVal) => {
 //   console.log("asideValue处理后", newVal);
@@ -297,22 +315,22 @@ const handleOk = (item: any) => {
         <!-- 高级筛选 -->
         <AdvanceFilter
           v-show="!showSearch"
+          ref="AdvanceFilterRef"
           :type="0"
           @select="filterHandler"
           @update:search="setShowSearch(true)"
           @show-custom="showModal(customModalRef)"
           @show-filter="showModal(filterModalRef)"
-          ref="AdvanceFilterRef"
         />
       </div>
 
       <component
-        :is="item.config.component"
-        v-for="(item, index) in showItems"
+        :is="item.config?.component"
+        v-for="item in showItems"
         :id="item.key"
         :key="item.key"
         v-model:value="asideValue[item.key]"
-        :label="item.config.label"
+        :label="item.config?.label"
         @update:value="(e) => updateComponent(item.key, e)"
       />
 
@@ -321,10 +339,10 @@ const handleOk = (item: any) => {
         ref="filterModalRef"
         @edit-filter="editFilter"
         @show-new-filter="showModal(newFilterModalRef)"
-        @handleOk="handleOk"
+        @handle-ok="handleOk"
       />
       <!-- 新增过滤 -->
-      <NewFilterModalVue ref="newFilterModalRef" @onOk="newFilterOk" />
+      <NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk" />
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
     </n-scrollbar>
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 05278a0..8f226ac 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -1,16 +1,12 @@
 <script lang="ts" setup>
 import { nextTick, onMounted, ref, watch } from 'vue'
 import { debounce } from 'lodash-es'
+import { useRoute } from 'vue-router'
 import { asideMap } from '@/config/aside'
 import type { SearchEntity } from '/#/home'
 import { useConfig } from '@/store/modules/asideConfig'
-import { useRoute } from 'vue-router'
-import { useFinal } from "@/store/modules/final";
-
-const finalStore = useFinal();
+import { useFinal } from '@/store/modules/final'
 
-const route = useRoute()
-const searchContent = route.query.searchContent as string;
 defineOptions({ name: 'Search' })
 
 const emit = defineEmits<{
@@ -20,13 +16,17 @@ const emit = defineEmits<{
   (e: 'showSearch'): void
 }>()
 
+const finalStore = useFinal()
+
+const route = useRoute()
+const searchContent = route.query.searchContent as string
 const data = ref<SearchEntity[]>([])
 const popover = ref<ComponentRef | null>(null)
 const configStore = useConfig()
 const searchKeyword = ref('')
 
 const inputHandler = debounce((keyword) => {
-  searchKeyword.value = keyword;
+  searchKeyword.value = keyword
   emit('inputChange', keyword)
 }, 300)
 
@@ -42,7 +42,7 @@ configStore.$subscribe(() => {
     return
 
   const list = keys.map((key) => {
-    const name = asideMap[key].label
+    const name = asideMap[key]?.label
 
     return {
       key,
@@ -59,30 +59,25 @@ function selectHandler(item: SearchEntity) {
 }
 
 // 模糊搜索
-const searchName = () => {
-  configStore.setSearchValue(searchKeyword.value);
-  finalStore.setSearchValue(searchKeyword.value);
-  emit('inputChange', searchKeyword.value);
+function searchName() {
+  configStore.setSearchValue(searchKeyword.value)
+  finalStore.setSearchValue(searchKeyword.value)
+  emit('inputChange', searchKeyword.value)
 }
 
-
-
-
-const close = () => {
-  searchKeyword.value = "";
-  configStore.setSearchValue(searchKeyword.value);
-  finalStore.setSearchValue(searchKeyword.value);
-  emit('close');
+function close() {
+  searchKeyword.value = ''
+  configStore.setSearchValue(searchKeyword.value)
+  finalStore.setSearchValue(searchKeyword.value)
+  emit('close')
 }
 
-
-
-const initSerach = () => {
+function initSerach() {
   if (searchContent) {
     emit('showSearch')
-    const id_param = searchContent.match(/-\d+-/);
+    const id_param = searchContent.match(/-\d+-/)
     if (id_param) {
-      searchKeyword.value = id_param[0].slice(1, -1);
+      searchKeyword.value = id_param[0].slice(1, -1)
       emit('inputChange', searchKeyword.value)
     }
   }
@@ -94,13 +89,28 @@ onMounted(() => {
 
 <template>
   <div class="wrapper">
-    <n-popover ref="popover" :style="{ padding: '0px' }" style="width: 248px" :show-arrow="false"
-      placement="bottom-start" trigger="focus">
+    <n-popover
+      ref="popover"
+      :style="{ padding: '0px' }"
+      style="width: 248px"
+      :show-arrow="false"
+      placement="bottom-start"
+      trigger="focus"
+    >
       <template #trigger>
-        <n-input v-model:value="searchKeyword" style="width: 260px;height: 32px;" placeholder="请输入你需要搜索的内容"
-          @input="inputHandler">
+        <n-input
+          v-model:value="searchKeyword"
+          style="width: 260px; height: 32px"
+          placeholder="请输入你需要搜索的内容"
+          @input="inputHandler"
+        >
           <template #suffix>
-            <SvgIcon size="14px" name="magnifying-1" @click="searchName" style="cursor: pointer;" />
+            <SvgIcon
+              size="14px"
+              name="magnifying-1"
+              style="cursor: pointer"
+              @click="searchName"
+            />
           </template>
         </n-input>
       </template>
@@ -113,7 +123,12 @@ onMounted(() => {
       </div> -->
     </n-popover>
 
-    <SvgIcon size="16px" style="margin-left: 6px;cursor: pointer;" name="clear" @click="close" />
+    <SvgIcon
+      size="16px"
+      style="margin-left: 6px; cursor: pointer"
+      name="clear"
+      @click="close"
+    />
   </div>
 </template>
 
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 90f9e95..514f677 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -14,6 +14,13 @@ const configStore = useConfig()
 const checkAll = ref(false)
 const selectIds = ref<string[]>([])
 const tempList = ref<string[]>([])
+// 左侧隐藏列表
+const offList = ref<any[]>([])
+// 右侧显示列表
+const onList = ref<any[]>([])
+
+const offKeyword = ref('')
+const onKeyword = ref('')
 
 function showModal() {
   show.value = true
@@ -27,7 +34,10 @@ function showModal() {
   if (tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig))
     return
 
-  console.log('开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------', customConfig)
+  console.log(
+    '开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------',
+    customConfig,
+  )
   const { showList, hideList } = generatList(config, customConfig)
   tempList.value = cloneDeep(showList)
   if (tempList.value.length > 0)
@@ -46,11 +56,6 @@ function closeModal() {
   show.value = false
 }
 
-// 左侧隐藏列表
-const offList = ref<any[]>([])
-// 右侧显示列表
-const onList = ref<any[]>([])
-
 const allCount = computed(() => {
   return `全部筛选(共${offList.value.length}个)`
 })
@@ -138,7 +143,8 @@ function generatList(config, customConfig) {
 
   const sortKeyList: any = []
   configStore.getFilterConfig.map((item: any) => {
-    sortKeyList.push(item.id)
+    sortKeyList.push(item?.id)
+    return item
   })
   console.log('原始筛选条件sortKeyList', sortKeyList)
   const sortList: any = []
@@ -146,12 +152,14 @@ function generatList(config, customConfig) {
     sortKeyList.map((key) => {
       const tempItem = tempOnList.find(item => item.id == key)
       sortList.push(tempItem)
+      return key
     })
   }
   else {
     customConfig.map((key) => {
       const tempItem = tempOnList.find(item => item.id == key)
       sortList.push(tempItem)
+      return key
     })
   }
   console.log('原始筛选条件sortList', sortList)
@@ -185,9 +193,11 @@ configStore.$subscribe(() => {
 
 async function handleSumbit(e: MouseEvent) {
   e.preventDefault()
-  const param = onList.value.map((item) => {
-    return item.id
-  }).join(',')
+  const param = onList.value
+    .map((item) => {
+      return item.id
+    })
+    .join(',')
 
   await setFilter({ searchcount: param, type: 0 })
   const obj = await configStore.fetchCustomConfig()
@@ -198,6 +208,7 @@ async function handleSumbit(e: MouseEvent) {
   obj.map((key) => {
     const tempItem = tempOnList.find(item => item.id == key)
     sortList.push(tempItem)
+    return key
   })
   console.log('configStore.sortList---------------', sortList)
   // setTimeout(() => {
@@ -228,8 +239,7 @@ function onCheckChange(checked: any, item: any) {
 
   if (index === -1 && checked)
     selectIds.value.push(item.id)
-  else
-    index !== -1 && selectIds.value.splice(index, 1)
+  else index !== -1 && selectIds.value.splice(index, 1)
 
   checkAll.value = offList.value.every(item => item.checked)
 }
@@ -247,7 +257,10 @@ watch(
       return
 
     const action = newVal > oldVal ? 'add' : 'remove'
-    const diff = action === 'add' ? difference(selectIds.value, showIds.value) : difference(showIds.value, selectIds.value)
+    const diff
+      = action === 'add'
+        ? difference(selectIds.value, showIds.value)
+        : difference(showIds.value, selectIds.value)
 
     if (diff.length === 0)
       return
@@ -314,9 +327,6 @@ function removeHandler(id: string) {
     onList.value.splice(index, 1)
 }
 
-const offKeyword = ref('')
-const onKeyword = ref('')
-
 const leftInputHandler = debounce((keyword) => {
   offKeyword.value = keyword
 }, 300)
@@ -345,7 +355,13 @@ onMounted(() => {
 
 <template>
   <n-modal v-model:show="show" transform-origin="center" :mask-closable="false">
-    <n-card class="cardstyle" :bordered="false" size="huge" role="dialog" aria-modal="true">
+    <n-card
+      class="cardstyle"
+      :bordered="false"
+      size="huge"
+      role="dialog"
+      aria-modal="true"
+    >
       <div class="wrapper">
         <span class="wrapper-title">自定义筛选</span>
         <div class="wrapper-bar">
@@ -357,7 +373,10 @@ onMounted(() => {
         <n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
           <n-grid-item span="11">
             <NCard
-              :title="allCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :title="allCount"
+              class="dragcardStyle"
+              :segmented="{ content: true, footer: true }"
+              size="small"
               :bordered="false"
             >
               <div class="input_wrap">
@@ -366,17 +385,29 @@ onMounted(() => {
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
                 </n-input>
-                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;">
+                <n-scrollbar
+                  style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
+                >
                   <div class="draggable-ul">
                     <div class="draggable-li">
-                      <n-checkbox v-model:checked="checkAll" label="全选" :indeterminate="!checkAll" @update:checked="onCheckAllChange" />
+                      <n-checkbox
+                        v-model:checked="checkAll"
+                        label="全选"
+                        :indeterminate="!checkAll"
+                        @update:checked="onCheckAllChange"
+                      />
                     </div>
                     <div
-                      v-for="item in offList" v-show="item.name.includes(offKeyword)" :key="item.id" :class="{ 'disable-check': item.fix }"
+                      v-for="item in offList"
+                      v-show="item.name.includes(offKeyword)"
+                      :key="item.id"
+                      :class="{ 'disable-check': item.fix }"
                       class="draggable-li"
                     >
                       <n-checkbox
-                        v-model:checked="item.checked" :label="item.name" :disabled="item.fix"
+                        v-model:checked="item.checked"
+                        :label="item.name"
+                        :disabled="item.fix"
                         @update:checked="onCheckChange($event, item)"
                       />
                     </div>
@@ -385,12 +416,15 @@ onMounted(() => {
               </div>
             </NCard>
           </n-grid-item>
-          <n-grid-item style="display: flex;align-items: center;" span="2">
+          <n-grid-item style="display: flex; align-items: center" span="2">
             <SvgIcon size="20" name="switchsvg" />
           </n-grid-item>
           <n-grid-item span="11">
             <NCard
-              :title="selectCount" class="dragcardStyle" :segmented="{ content: true, footer: true }" size="small"
+              :title="selectCount"
+              class="dragcardStyle"
+              :segmented="{ content: true, footer: true }"
+              size="small"
               :bordered="false"
             >
               <template #header-extra>
@@ -402,14 +436,31 @@ onMounted(() => {
                     <SvgIcon size="14px" name="magnifying-1-color999" />
                   </template>
                 </n-input>
-                <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
-                  <VueDraggable v-model="onList" class="draggable-ul" :animation="150" group="shared">
-                    <div v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="true" class="cursor-move draggable-li">
+                <n-scrollbar
+                  style="max-height: 500px; border: 1px solid #cad2dd; border-radius: 2px"
+                  class="scroll"
+                >
+                  <VueDraggable
+                    v-model="onList"
+                    class="draggable-ul"
+                    :animation="150"
+                    group="shared"
+                  >
+                    <div
+                      v-for="item in onList"
+                      v-show="item.name.includes(onKeyword)"
+                      :key="item.id"
+                      :draggable="true"
+                      class="cursor-move draggable-li"
+                    >
                       <SvgIcon name="drag" size="24" />
                       <span class="ml-2">{{ item.name }}</span>
                       <SvgIcon
-                        v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
-                        name="clear" @click="removeHandler(item.id)"
+                        v-if="!item.fix"
+                        size="16px"
+                        style="display: block; margin-left: auto; cursor: pointer"
+                        name="clear"
+                        @click="removeHandler(item.id)"
                       />
                     </div>
                   </VueDraggable>
@@ -424,7 +475,11 @@ onMounted(() => {
           <n-button type="info" @click="handleSumbit">
             确定
           </n-button>
-          <n-button secondary style="margin-left:15px; border: 1px solid #CAD2DD;" @click="closeModal">
+          <n-button
+            secondary
+            style="margin-left: 15px; border: 1px solid #cad2dd"
+            @click="closeModal"
+          >
             取消
           </n-button>
         </div>
@@ -453,10 +508,10 @@ onMounted(() => {
   &-footer {
     display: flex;
     justify-content: flex-end;
-    .n-button--info-type{
-      background: #507AFD !important;
+    .n-button--info-type {
+      background: #507afd !important;
     }
-    .n-button--default-type{
+    .n-button--default-type {
       background: #fff !important;
       color: #333333;
     }
@@ -468,7 +523,7 @@ onMounted(() => {
     font-size: 14px;
 
     &:before {
-      background-color: #1980FF;
+      background-color: #1980ff;
       content: "";
       width: 5px;
       border-radius: 2px;
@@ -498,7 +553,7 @@ onMounted(() => {
 
 .textbtnStyle {
   cursor: pointer;
-  color: #1980FF;
+  color: #1980ff;
 }
 
 .draggable-ul {
@@ -531,33 +586,33 @@ onMounted(() => {
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
-::v-deep(.n-card > .n-card-header .n-card-header__main){
+::v-deep(.n-card > .n-card-header .n-card-header__main) {
   font-weight: lighter !important;
   font-size: 14px;
   color: #666;
 }
-::v-deep(.n-scrollbar){
+::v-deep(.n-scrollbar) {
   border-left: 1px solid #cad2dd !important;
   border-right: 1px solid #cad2dd !important;
-  border-bottom: 1px solid #E8E8E8 !important;
-  border-top: 1px solid #E8E8E8 !important;
+  border-bottom: 1px solid #e8e8e8 !important;
+  border-top: 1px solid #e8e8e8 !important;
 }
-::v-deep(.n-card__content){
-  padding: 20px 24px  0 24px !important;
+::v-deep(.n-card__content) {
+  padding: 20px 24px 0 24px !important;
 }
-::v-deep(.n-card__footer){
+::v-deep(.n-card__footer) {
   padding: 0 24px 16px 24px !important;
 }
-::v-deep(.n-input .n-input-wrapper){
+::v-deep(.n-input .n-input-wrapper) {
   height: 44px !important;
   border: 1px solid #cad2dd !important;
   border-bottom: none !important;
   // margin-bottom: -3px;
-  .n-input__input input{
+  .n-input__input input {
     height: 44px !important;
   }
 }
-::v-deep(.n-button--info-type){
-  background: #507AFD !important;
+::v-deep(.n-button--info-type) {
+  background: #507afd !important;
 }
 </style>

From 6caa3d46bfb86206cfe3ebe3b5c382d3a7b12909 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 13 Apr 2024 15:45:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                      |   3 -
 src/views/final/content/Content.vue  | 110 ++++++++++++++++++++-------
 src/views/home/aside/comp/Search.vue |   6 +-
 3 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 61136d3..11049e1 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -11,7 +11,6 @@ declare module 'vue' {
     BasicModal: typeof import('./src/components/Modal/BasicModal.vue')['default']
     DataHeader: typeof import('./src/components/DataHeader/index.vue')['default']
     NAvatar: typeof import('naive-ui')['NAvatar']
-    NBackTop: typeof import('naive-ui')['NBackTop']
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
@@ -22,7 +21,6 @@ declare module 'vue' {
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDropdown: typeof import('naive-ui')['NDropdown']
-    NEllipsis: typeof import('naive-ui')['NEllipsis']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NGi: typeof import('naive-ui')['NGi']
@@ -34,7 +32,6 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
-    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']
diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue
index 9e38ddf..f53a427 100644
--- a/src/views/final/content/Content.vue
+++ b/src/views/final/content/Content.vue
@@ -41,9 +41,6 @@ import emitter from '@/utils/mitt'
 import { formatToDateHMS } from '@/utils/dateUtil'
 import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
 import DataHeader from '@/components/DataHeader/index.vue'
-import console from 'console'
-
-
 
 const emit = defineEmits(['changeShow'])
 function changeContent() {
@@ -57,6 +54,7 @@ const route = useRoute()
 const reviewType = 0
 const sortorder = ref('asc')
 const sortname = ref('states')
+const searchContent = route.query.searchContent as string
 const actionsColumns = {
   title: '操作',
   key: 'actions',
@@ -201,6 +199,7 @@ async function getColumns() {
           width: 120,
         })
       }
+      return v
     })
   }
   else {
@@ -212,6 +211,7 @@ async function getColumns() {
         fixed: 'left',
         width: 120,
       })
+      return v
     })
     userFieldUnFixed.map((v) => {
       const item = allList.find(v2 => v2.name == v)
@@ -220,6 +220,7 @@ async function getColumns() {
         key: item.name,
         width: 120,
       })
+      return v
     })
   }
   // TODO: 会导致排序问题 废弃
@@ -421,6 +422,7 @@ async function formatColumns() {
 const deviceHeight = ref(600)
 
 onMounted(() => {
+  // query(pagination.page, pagination.pageSize);
   emitter.on('filter-final', refreshHandler)
   getColumns()
 
@@ -481,6 +483,7 @@ const message = useMessage()
 const finalStore = useFinal()
 
 async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
+  console.log('query', taskName)
   const asideParmas = unref(finalStore.getAsideValue)
   // 有过滤配置的时候优先使用过滤配置，不要使用左侧参数
   // let params = filterId ? { userSearchId: filterId } : asideParmas
@@ -586,10 +589,6 @@ const scrollX = computed(() => {
 
   return width
 })
-onMounted(() => {
-  query(pagination.page, pagination.pageSize)
-})
-
 const customTabelRef = ref(null)
 const importExcelRef = ref(null)
 const notPassModalRef = ref(null) // 不通过弹窗
@@ -709,7 +708,7 @@ function resetHandler() {
       // TODO：需要支持重置
       // const result = await resetApproval()
     },
-    onNegativeClick: () => { },
+    onNegativeClick: () => {},
   })
 }
 
@@ -816,7 +815,7 @@ function doAudit(param: any) {
         }
       })
     },
-    onNegativeClick: () => { },
+    onNegativeClick: () => {},
   })
 }
 
@@ -855,15 +854,23 @@ function reset() {
 
 async function refreshHandler(searchId?: any) {
   reset()
-  query(pagination.page, pagination.pageSize, searchId)
+  let searchKeyword = ''
+  if (searchContent) {
+    const id_param = searchContent.match(/-\d+-/)
+    if (id_param)
+      searchKeyword = id_param[0].slice(1, -1)
+  }
+  console.log('refreshHandler', searchKeyword)
+  query(pagination.page, pagination.pageSize, searchId, searchKeyword)
 }
 
 function filterTableData(keyword) {
   pagination.page = 1
   pagination.pageSize = 10
-  if (keyword) {
+  if (keyword)
     query(pagination.page, pagination.pageSize, '', keyword)
-  } else { query(pagination.page, pagination.pageSize) }
+  else
+    query(pagination.page, pagination.pageSize)
 }
 
 defineExpose({
@@ -876,10 +883,20 @@ defineExpose({
     <div class="wrapper-header">
       <div class="wrapper-header-left">
         <span class="wrapper-header-font">任务管理列表</span>
-        <SvgIcon style="cursor: pointer" size="16" name="list-mode" @click="changeContent" />
+        <SvgIcon
+          style="cursor: pointer"
+          size="16"
+          name="list-mode"
+          @click="changeContent"
+        />
       </div>
       <div>
-        <SvgIcon style="margin-right: 6px" size="13" name="summary" @click="showModal(repeatModalRef)" />
+        <SvgIcon
+          style="margin-right: 6px"
+          size="13"
+          name="summary"
+          @click="showModal(repeatModalRef)"
+        />
         <NButton class="xjcc" text @click="showModal(repeatModalRef)">
           小结查重
         </NButton>
@@ -898,14 +915,29 @@ defineExpose({
             取消
           </NButton>
 
-          <img class="btn-approval btn-left" src="@/assets/images/task/btn-not-pass.png" alt=""
-            @click.stop="batchReject">
+          <img
+            class="btn-approval btn-left"
+            src="@/assets/images/task/btn-not-pass.png"
+            alt=""
+            @click.stop="batchReject"
+          >
           <SvgIcon size="24" name="vs" />
-          <img class="btn-approval" src="@/assets/images/task/btn-pass.png" alt="" @click.stop="batchApproval">
+          <img
+            class="btn-approval"
+            src="@/assets/images/task/btn-pass.png"
+            alt=""
+            @click.stop="batchApproval"
+          >
         </div>
 
-        <n-popover ref="popover" :style="{ padding: '0px' }" style="width: 148px" :show-arrow="false"
-          placement="bottom-start" trigger="click">
+        <n-popover
+          ref="popover"
+          :style="{ padding: '0px' }"
+          style="width: 148px"
+          :show-arrow="false"
+          placement="bottom-start"
+          trigger="click"
+        >
           <template #trigger>
             <div class="icon-wrap">
               <SvgIcon size="20" name="more-blue" />
@@ -945,20 +977,46 @@ defineExpose({
       </div>
     </div> -->
     <div class="wrapper-settings">
-      <SvgIcon style="cursor: pointer" size="18" name="column" @click="showModal(customTabelRef)" />
+      <SvgIcon
+        style="cursor: pointer"
+        size="18"
+        name="column"
+        @click="showModal(customTabelRef)"
+      />
     </div>
     <div class="wrapper-content">
-      <NDataTable id="table" ref="tableRef" v-model:checked-row-keys="checkedRowKeys" remote :columns="columnsRef"
-        :scroll-x="scrollX" :max-height="maxHeight" :data="tableData" :loading="loading" :pagination="pagination"
-        :row-key="rowKey" @update:page="handlePageChange" @update-page-size="handlePageSizeChange"
-        @update:checked-row-keys="handleCheck" @update:sorter="handleSorterChange" />
+      <NDataTable
+        id="table"
+        ref="tableRef"
+        v-model:checked-row-keys="checkedRowKeys"
+        remote
+        :columns="columnsRef"
+        :scroll-x="scrollX"
+        :max-height="maxHeight"
+        :data="tableData"
+        :loading="loading"
+        :pagination="pagination"
+        :row-key="rowKey"
+        @update:page="handlePageChange"
+        @update-page-size="handlePageSizeChange"
+        @update:checked-row-keys="handleCheck"
+        @update:sorter="handleSorterChange"
+      />
     </div>
 
     <CustomTabelModal ref="customTabelRef" @commit="commitHandler" />
-    <ImportExcelModal ref="importExcelRef" :on-success="sucessHandler" :header-config="headRules" />
+    <ImportExcelModal
+      ref="importExcelRef"
+      :on-success="sucessHandler"
+      :header-config="headRules"
+    />
     <NotPassed ref="notPassModalRef" @success="reload" />
 
-    <RepeatModal ref="repeatModalRef" @reject="repeatBatchReject" @viewrepeat="showModal(repeatTaskTableModalRef)" />
+    <RepeatModal
+      ref="repeatModalRef"
+      @reject="repeatBatchReject"
+      @viewrepeat="showModal(repeatTaskTableModalRef)"
+    />
     <RepeatTaskTableModal ref="repeatTaskTableModalRef" />
   </div>
 </template>
diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue
index 8f226ac..d017c55 100644
--- a/src/views/home/aside/comp/Search.vue
+++ b/src/views/home/aside/comp/Search.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { nextTick, onMounted, ref, watch } from 'vue'
 import { debounce } from 'lodash-es'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { asideMap } from '@/config/aside'
 import type { SearchEntity } from '/#/home'
 import { useConfig } from '@/store/modules/asideConfig'
@@ -18,6 +18,7 @@ const emit = defineEmits<{
 
 const finalStore = useFinal()
 
+const router = useRouter()
 const route = useRoute()
 const searchContent = route.query.searchContent as string
 const data = ref<SearchEntity[]>([])
@@ -69,6 +70,9 @@ function close() {
   searchKeyword.value = ''
   configStore.setSearchValue(searchKeyword.value)
   finalStore.setSearchValue(searchKeyword.value)
+  if (searchContent)
+    router.push(route.path)
+
   emit('close')
 }
 

From d722e6fc1d8ab11ab4b3c3c70ebeccd28c3175f5 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sat, 13 Apr 2024 16:30:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/UserSettings.vue | 104 +++++++++---------
 src/store/modules/user.ts                     |   8 +-
 2 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index e10429e..f787cb6 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -1,92 +1,92 @@
 <script lang="ts" setup>
-import { computed, inject, onMounted, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { useUser } from "@/store/modules/user";
-import { getImgUrl } from "@/utils/urlUtils";
-import defaultAvatar from '@/assets/icons/avatar.svg';
+import { computed, inject, onMounted, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useUser } from '@/store/modules/user'
+import { getImgUrl } from '@/utils/urlUtils'
+import defaultAvatar from '@/assets/icons/avatar.svg'
 
 const emit = defineEmits<{
-  (e: "logout"): void;
-}>();
+  (e: 'logout'): void
+}>()
 
-const router = useRouter();
+const router = useRouter()
 
-const userStore = useUser();
+const userStore = useUser()
 
-const useInfo = userStore.getUserInfo;
+const useInfo = userStore.getUserInfo
 
-const aiDisabled = ref(false);
+const aiDisabled = ref(false)
 
 function handleSelect(row) {
-  userStore.updateTenantId(row.key);
-  location.reload();
+  userStore.updateTenantId(row.key)
+  location.reload()
 }
 
 function logIt(e) {
-  return false;
+  return false
 }
 
 // 一键查看
 function goHome(e) {
-  router.push({ name: "home" });
+  router.push({ name: 'home' })
 }
 
 // 任务审批
 function goTask(e) {
-  router.push({ name: "task-main" });
+  router.push({ name: 'task-main' })
 }
 
 // AI工单
 function goWorksheet(e) {
-  router.push({ name: "worksheet-main" });
+  router.push({ name: 'worksheet-main' })
 }
 
 // 任务终审
 function goFinal(e) {
-  router.push({ name: "final-main" });
+  router.push({ name: 'final-main' })
 }
 
-const mousetrap = inject("mousetrap") as any;
+const mousetrap = inject('mousetrap') as any
 onMounted(() => {
-  mousetrap.bind("g h", goHome);
-  mousetrap.bind("g t", goTask);
-  mousetrap.bind("g a", goWorksheet);
-  mousetrap.bind("g e", goFinal);
-});
+  mousetrap.bind('g h', goHome)
+  mousetrap.bind('g t', goTask)
+  mousetrap.bind('g a', goWorksheet)
+  mousetrap.bind('g e', goFinal)
+})
 
-const showPopover = ref(false);
-const popRef = ref(null);
-const changeFlag = ref(false);
+const showPopover = ref(false)
+const popRef = ref(null)
+const changeFlag = ref(false)
 
 const iconName = computed(() => {
-  return showPopover.value ? "expand" : "collapse";
-});
+  return showPopover.value ? 'expand' : 'collapse'
+})
 
 function handleUpdateShow(show: boolean) {
-  showPopover.value = show;
+  showPopover.value = show
 }
 
 function logOut() {
-  (popRef.value as any).setShow(false);
-  emit("logout");
+  (popRef.value as any).setShow(false)
+  emit('logout')
 }
 
 const currentCompanyName = computed(() => {
-  const tenantList = useInfo.tenantList;
-  const currentId = userStore.getTenantId;
-  const current = tenantList.find((item) => item.id === currentId);
-  return current.name || "name";
-});
+  const deptlist = useInfo.deptlist
+  const currentId = userStore.getTenantId
+  const current = deptlist.find(item => item.id === currentId)
+  return current.name || 'name'
+})
 
 const options = computed(() => {
-  const tenantList = useInfo.tenantList;
-  return tenantList.map((item) => {
+  const deptlist = useInfo.deptlist
+  return deptlist.map((item) => {
     return {
-      label: item.name,
-      key: item.id,
-    };
-  });
-});
+      label: item.departname,
+      key: item.deptno,
+    }
+  })
+})
 </script>
 
 <template>
@@ -101,7 +101,7 @@ const options = computed(() => {
   >
     <template #trigger>
       <div class="setting">
-        <span style="color:#333333">{{ useInfo.username }}</span>
+        <span style="color: #333333">{{ useInfo.username }}</span>
         <SvgIcon style="margin-left: 6px" :name="iconName" size="16" />
       </div>
     </template>
@@ -119,24 +119,28 @@ const options = computed(() => {
       </div>
       <div class="trigger">
         <span>{{ currentCompanyName }}</span>
-        <span @click="changeFlag = !changeFlag" style="cursor: pointer"><SvgIcon name="switchCompany" size="24" /></span>
+        <span style="cursor: pointer" @click="changeFlag = !changeFlag"><SvgIcon name="switchCompany" size="24" /></span>
       </div>
       <div class="item">
         <span>AI设置开关</span>
         <n-switch v-model:value="aiDisabled" />
       </div>
-      <div class="trigger">联系我们</div>
+      <div class="trigger">
+        联系我们
+      </div>
       <n-divider style="margin-top: 0px; margin-bottom: 10px; padding: 0 22px" />
-      <div class="trigger" @click="logOut">退出登录</div>
+      <div class="trigger" @click="logOut">
+        退出登录
+      </div>
       <div
-        class="container sub-container"
         v-show="changeFlag"
+        class="container sub-container"
         style="position: absolute; right: 17vw; width: 11.5vw; padding: 24px 0"
       >
         <div
-          class="trigger"
           v-for="option in options"
           :key="option.key"
+          class="trigger"
           @click="handleSelect(option)"
         >
           {{ option.label }}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index ab16fb7..1c0613d 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -15,7 +15,7 @@ const TOKEN_REFRESH_SECONDS = 20 * 60
 
 export interface UserInfoType {
   token: string
-  tenantList: any[]
+  deptlist: any[]
   userInfo: any
 }
 
@@ -122,8 +122,8 @@ export const useUserStore = defineStore({
       if (code === ResultEnum.SUCCESS) {
         const ex = 7 * 24 * 60 * 60
         // 默认设置为第一个租户
-        const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
-        const tenantId = firstTenant ? firstTenant.id : ''
+        const firstTenant = data.deptlist.length > 0 ? data.deptlist[0] : null
+        const tenantId = firstTenant ? firstTenant.deptno : ''
         data.frontmenuTList.forEach((ele) => {
           if (ele.description === 'AI工单')
             ele.description = '图审审批'
@@ -175,7 +175,7 @@ export const useUserStore = defineStore({
     // 登出
     async logout() {
       this.setPermissions([])
-      this.setUserInfo({ tenantList: [], userInfo: {}, token: '' })
+      this.setUserInfo({ deptlist: [], userInfo: {}, token: '' })
       this.setTenantId('')
       storage.remove(USER_ACCESS_TOKEN)
       storage.remove(CURRENT_USER)