From 34724596c3b53b26e97e4e3c6257b646b78a53eb Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Mon, 1 Apr 2024 23:41:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/asideConfig.ts              |  8 ++
 src/views/home/aside/Aside.vue                | 74 +++++++++++++------
 .../home/aside/comp/items/IzCustomlevel.vue   | 10 ++-
 .../home/aside/comp/items/IzCustomname.vue    | 10 ++-
 .../home/aside/comp/items/IzCustomtype.vue    | 10 ++-
 .../home/aside/comp/items/IzCustomtypes.vue   | 10 ++-
 src/views/home/aside/comp/items/IzProduct.vue | 10 ++-
 src/views/home/aside/comp/items/IzProject.vue | 10 ++-
 .../home/aside/comp/items/IzProjecttype.vue   | 10 ++-
 src/views/home/aside/comp/items/IzSearch.vue  | 10 ++-
 .../home/aside/comp/items/IzSearchManager.vue | 10 ++-
 src/views/home/aside/comp/items/IzShow.vue    | 10 ++-
 src/views/home/aside/comp/items/IzStatus.vue  | 10 ++-
 .../home/aside/comp/items/IzVisitcity.vue     | 10 ++-
 src/views/home/aside/comp/items/Izfiled17.vue | 10 ++-
 src/views/home/aside/comp/items/Izfiled2.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfiled3.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfiled6.vue  | 10 ++-
 src/views/home/aside/comp/items/Izfirm.vue    | 10 ++-
 .../home/aside/comp/items/Iztaskrrom.vue      | 12 ++-
 .../home/aside/comp/items/Iztaskstatus.vue    | 10 ++-
 .../home/aside/comp/items/Izvisitpro.vue      | 10 ++-
 src/views/home/aside/comp/items/Plan.vue      | 10 ++-
 .../home/aside/comp/items/ReportUser.vue      | 10 ++-
 .../home/aside/comp/items/Similarity.vue      |  2 +-
 src/views/home/aside/comp/items/Time.vue      |  2 +-
 .../aside/comp/modals/CustomFilterModal.vue   | 67 +++++++++++++++--
 27 files changed, 278 insertions(+), 97 deletions(-)

diff --git a/src/store/modules/asideConfig.ts b/src/store/modules/asideConfig.ts
index e91108a..81bcf4b 100644
--- a/src/store/modules/asideConfig.ts
+++ b/src/store/modules/asideConfig.ts
@@ -12,6 +12,7 @@ export interface ConfigState {
   searchValue: string
   isAllowDownload: boolean
   timeNum: number
+  filterConfig: string[] // 过滤筛选条件
 }
 
 export const useAsideConfigStore = defineStore({
@@ -23,6 +24,7 @@ export const useAsideConfigStore = defineStore({
     searchValue: "",
     isAllowDownload: true,
     timeNum: 0,
+    filterConfig: [],
   }),
   getters: {
     getConfig(): AsideConfig | null {
@@ -43,6 +45,9 @@ export const useAsideConfigStore = defineStore({
     getTimeNum(): any {
       return this.timeNum
     },
+    getFilterConfig(): any {
+      return this.filterConfig
+    },
   },
   actions: {
     setConfig(config: AsideConfig) {
@@ -64,6 +69,9 @@ export const useAsideConfigStore = defineStore({
     setCustomConfig(value) {
       this.customConfig = value
     },
+    setFilterConfig(value) {
+      this.filterConfig = value
+    },
     // 获取系统配置信息
     async fetchConfig() {
       const response = await getConfig()
diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue
index 38906fa..ef19403 100644
--- a/src/views/home/aside/Aside.vue
+++ b/src/views/home/aside/Aside.vue
@@ -13,12 +13,12 @@ import type { AsideConfig } from '/#/api'
 import emitter from '@/utils/mitt'
 import { getFilterList } from '@/api/home/main'
 import dayjs from 'dayjs'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isEqual } from 'lodash-es'
 
 const configStore = useConfig()
 
 // 所有左侧模块的值
-const asideValue: Record<keyof typeof asideMap, any> = reactive({})
+let asideValue: Record<keyof typeof asideMap, any> = reactive({})
 // 左侧某个模块是否显示: 显示需同时满足系统配置和个人配置
 const asideVisible: Partial<Record<keyof AsideConfig, boolean>> = reactive({})
 // 当前显示的模块，按照数组顺序显示
@@ -28,13 +28,14 @@ Object.keys(asideMap).forEach((key) => {
   const entity = asideMap[key]
   const { defaultValue } = entity
   asideValue[key] = defaultValue
-  console.log("asideMap和asideValue", asideValue);
 })
 
 const filterModalRef = ref(null)
 const newFilterModalRef = ref(null)
 const customModalRef = ref(null)
 const customObjRef = ref<any>(null) // 获取高级筛选获取的值
+const customTempObjRef = ref<any>(null) // 获取高级筛选获取的值(作对比)
+const configFilterRef = ref<any>([]) // 获取排序的值
 
 function showModal(modalRef: any) {
   const modal = unref(modalRef)! as any
@@ -44,6 +45,9 @@ function showModal(modalRef: any) {
 onMounted(() => {
   nextTick(() => {
     computeSlideHeight()
+    let tempAsideValue = cloneDeep(asideValue);
+    // configStore.setAsideValue(tempAsideValue);
+    console.log("asideMap和asideValue", tempAsideValue);
   })
 })
 
@@ -88,7 +92,17 @@ onBeforeMount(async () => {
 configStore.$subscribe(() => {
   const config = configStore.getConfig
   const customConfig = configStore.getCustomConfig
-
+  console.log("config", config);
+  console.log("customConfig", customConfig);
+  console.log("customObjRef.value", customObjRef.value);
+  console.log("customTempObjRef.value", customTempObjRef.value, );
+  console.log("getFilterConfig", configStore.getFilterConfig,);
+  console.log("isEqual(asideValue, configStore.getAsideValue)", isEqual(asideValue, configStore.getAsideValue), );
+  console.log("configStore的getAsideValue", configStore.getAsideValue, );
+  console.log( "getAsideValue", asideValue);
+  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);
@@ -98,7 +112,11 @@ configStore.$subscribe(() => {
   showKeys.unshift(...defaultKeys)
   */
   
-  const showKeys = [...customConfig];
+  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)
@@ -109,16 +127,21 @@ configStore.$subscribe(() => {
       if(asideMap.hasOwnProperty(key)) {
         const str = key.toLowerCase()
         // console.log("customObjRef.value[str]1111111111111", customObjRef.value[str]);
-        if(str == "izsimilarity" && typeof customObjRef.value[str] == "string") {
-          customObjRef.value[str] = customObjRef.value[str].split(',');
+        if(str == "izsimilarity") {
+          if(typeof customObjRef.value[str] == "string") {
+            customObjRef.value[str] = customObjRef.value[str].split(',');
+          }
           asideValue[key] = customObjRef.value[str];// 赋值
-        }else if(str == "izyear" && 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;
+          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;
+          }
           asideValue[key] = customObjRef.value[str];// 赋值
-          console.log("时间2222222222", 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(',');
@@ -130,7 +153,11 @@ configStore.$subscribe(() => {
         // asideMap[str].defaultValue = customObjRef.value[str];// 赋值
       }
     });
-
+    customTempObjRef.value = customObjRef.value;
+    console.log("asideValue直接处理后的结果", asideValue);
+    console.log("customTempObjRef.value", customTempObjRef.value);
+    let tempobj = cloneDeep(asideValue);
+    configStore.setAsideValue(tempobj);
   }
   // console.log("showKeys", showKeys);
   const items = showKeys.reduce((acc, key) => {
@@ -149,8 +176,9 @@ configStore.$subscribe(() => {
       return acc
     }
   }, [])
-  console.log("items", items);
+  console.log("showItems=================================", items);
   showItems.value = items
+  configFilterRef.value = configStore.getFilterConfig;
 })
 
 const asideEnter = ref(false)
@@ -198,16 +226,20 @@ function editFilter(filter: any) {
 
 function updateComponent(key, e) {
   console.log("跟新值", key, e);
+  console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue);
+  // let tempAsideValue = configStore.getAsideValue || asideValue;
   let tempobj = cloneDeep(asideValue);
   tempobj[key] = e;
   customObjRef.value = tempobj;
-  Object.assign(asideValue, tempobj);
+  // asideValue = Object.assign({}, asideValue, tempobj);
+  console.log("asideValue跟新值", tempobj);
+  configStore.setAsideValue(tempobj);
 }
 
-watch(asideValue, (newVal) => {
-  console.log("asideValue处理后", newVal);
-  configStore.setAsideValue(newVal)
-}, { deep: true })
+// watch(asideValue, (newVal) => {
+//   console.log("asideValue处理后", newVal);
+//   configStore.setAsideValue(newVal)
+// }, { deep: true })
 </script>
 
 <template>
@@ -229,7 +261,7 @@ watch(asideValue, (newVal) => {
       </div>
 
       <component
-        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="index" v-model:value="asideValue[item.key]"
+        :is="item.config.component" v-for="(item, index) in showItems" :id="item.key" :key="item.key" v-model:value="asideValue[item.key]"
         :label="item.config.label"  @update:value="e=>updateComponent(item.key, e)"
       />
 
diff --git a/src/views/home/aside/comp/items/IzCustomlevel.vue b/src/views/home/aside/comp/items/IzCustomlevel.vue
index 0c2079f..61313d5 100644
--- a/src/views/home/aside/comp/items/IzCustomlevel.vue
+++ b/src/views/home/aside/comp/items/IzCustomlevel.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomlevel'] && typeof asideValue['izcustomlevel'] == "string") {
-    let list = asideValue['izcustomlevel'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomlevel']) {
+    if(typeof asideValue['izcustomlevel'] == "string") {
+      let list = asideValue['izcustomlevel'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomlevel'];
+    }
     console.log("formValue.value.izcustomlevel", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomname.vue b/src/views/home/aside/comp/items/IzCustomname.vue
index 31123ad..f932cc1 100644
--- a/src/views/home/aside/comp/items/IzCustomname.vue
+++ b/src/views/home/aside/comp/items/IzCustomname.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomname'] && typeof asideValue['izcustomname'] == "string") {
-    let list = asideValue['izcustomname'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomname']) {
+    if(typeof asideValue['izcustomname'] == "string") {
+      let list = asideValue['izcustomname'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomname'];
+    }
     console.log("formValue.value.izcustomname", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomtype.vue b/src/views/home/aside/comp/items/IzCustomtype.vue
index ff54dd2..0648505 100644
--- a/src/views/home/aside/comp/items/IzCustomtype.vue
+++ b/src/views/home/aside/comp/items/IzCustomtype.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtype'] && typeof asideValue['izcustomtype'] == "string") {
-    let list = asideValue['izcustomtype'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomtype']) {
+    if(typeof asideValue['izcustomtype'] == "string") {
+      let list = asideValue['izcustomtype'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomtype'];
+    }
     console.log("formValue.value.izcustomtype", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzCustomtypes.vue b/src/views/home/aside/comp/items/IzCustomtypes.vue
index aac3662..c1f7b43 100644
--- a/src/views/home/aside/comp/items/IzCustomtypes.vue
+++ b/src/views/home/aside/comp/items/IzCustomtypes.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izcustomtypes'] && typeof asideValue['izcustomtypes'] == "string") {
-    let list = asideValue['izcustomtypes'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izcustomtypes']) {
+    if(typeof asideValue['izcustomtypes'] == "string") {
+      let list = asideValue['izcustomtypes'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izcustomtypes'];
+    }
     console.log("formValue.value.izcustomtypes", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProduct.vue b/src/views/home/aside/comp/items/IzProduct.vue
index f925c15..3c34a48 100644
--- a/src/views/home/aside/comp/items/IzProduct.vue
+++ b/src/views/home/aside/comp/items/IzProduct.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproduct'] && typeof asideValue['izproduct'] == "string") {
-    let list = asideValue['izproduct'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izproduct']) {
+    if(typeof asideValue['izproduct'] == "string") {
+      let list = asideValue['izproduct'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izproduct'];
+    }
     console.log("formValue.value.izproduct", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProject.vue b/src/views/home/aside/comp/items/IzProject.vue
index 223e737..0b96368 100644
--- a/src/views/home/aside/comp/items/IzProject.vue
+++ b/src/views/home/aside/comp/items/IzProject.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izproject'] && typeof asideValue['izproject'] == "string") {
-    let list = asideValue['izproject'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izproject']) {
+    if(typeof asideValue['izproject'] == "string") {
+      let list = asideValue['izproject'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izproject'];
+    }
     console.log("formValue.value.izproject", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzProjecttype.vue b/src/views/home/aside/comp/items/IzProjecttype.vue
index e16b3c5..a29b725 100644
--- a/src/views/home/aside/comp/items/IzProjecttype.vue
+++ b/src/views/home/aside/comp/items/IzProjecttype.vue
@@ -13,9 +13,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izprojecttype'] && typeof asideValue['izprojecttype'] == "string") {
-    let list = asideValue['izprojecttype'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izprojecttype']) {
+    if(typeof asideValue['izprojecttype'] == "string") {
+      let list = asideValue['izprojecttype'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izprojecttype'];
+    }
     console.log("formValue.value.izprojecttype", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzSearch.vue b/src/views/home/aside/comp/items/IzSearch.vue
index 6bf0e82..1ffede6 100644
--- a/src/views/home/aside/comp/items/IzSearch.vue
+++ b/src/views/home/aside/comp/items/IzSearch.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearch'] && typeof asideValue['izsearch'] == "string") {
-    let list = asideValue['izsearch'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izsearch']) {
+    if(typeof asideValue['izsearch'] == "string") {
+      let list = asideValue['izsearch'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izsearch'];
+    }
     console.log("formValue.value.izsearch", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzSearchManager.vue b/src/views/home/aside/comp/items/IzSearchManager.vue
index 41e35ac..de6a3f9 100644
--- a/src/views/home/aside/comp/items/IzSearchManager.vue
+++ b/src/views/home/aside/comp/items/IzSearchManager.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsearchmanager'] && typeof asideValue['izsearchmanager'] == "string") {
-    let list = asideValue['izsearchmanager'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izsearchmanager']) {
+    if(typeof asideValue['izsearchmanager'] == "string") {
+      let list = asideValue['izsearchmanager'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izsearchmanager'];
+    }
     console.log("formValue.value.izsearchmanager", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzShow.vue b/src/views/home/aside/comp/items/IzShow.vue
index 48870a4..a034ff3 100644
--- a/src/views/home/aside/comp/items/IzShow.vue
+++ b/src/views/home/aside/comp/items/IzShow.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izshow'] && typeof asideValue['izshow'] == "string") {
-    let list = asideValue['izshow'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izshow']) {
+    if(typeof asideValue['izshow'] == "string") {
+      let list = asideValue['izshow'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izshow'];
+    }
     console.log("formValue.value.izshow", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzStatus.vue b/src/views/home/aside/comp/items/IzStatus.vue
index 6572d33..733a13a 100644
--- a/src/views/home/aside/comp/items/IzStatus.vue
+++ b/src/views/home/aside/comp/items/IzStatus.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izstatus'] && typeof asideValue['izstatus'] == "string") {
-    let list = asideValue['izstatus'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izstatus']) {
+    if(typeof asideValue['izstatus'] == "string") {
+      let list = asideValue['izstatus'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izstatus'];
+    }
     console.log("formValue.value.izstatus", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/IzVisitcity.vue b/src/views/home/aside/comp/items/IzVisitcity.vue
index a5194c9..fc4db74 100644
--- a/src/views/home/aside/comp/items/IzVisitcity.vue
+++ b/src/views/home/aside/comp/items/IzVisitcity.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitcity'] && typeof asideValue['izvisitcity'] == "string") {
-    let list = asideValue['izvisitcity'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izvisitcity']) {
+    if(typeof asideValue['izvisitcity'] == "string") {
+      let list = asideValue['izvisitcity'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izvisitcity'];
+    }
     console.log("formValue.value.izvisitcity", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled17.vue b/src/views/home/aside/comp/items/Izfiled17.vue
index ecc496a..0153d71 100644
--- a/src/views/home/aside/comp/items/Izfiled17.vue
+++ b/src/views/home/aside/comp/items/Izfiled17.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled17'] && typeof asideValue['izfiled17'] == "string") {
-    let list = asideValue['izfiled17'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled17']) {
+    if(typeof asideValue['izfiled17'] == "string") {
+      let list = asideValue['izfiled17'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled17'];
+    }
     console.log("formValue.value.izfiled17", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled2.vue b/src/views/home/aside/comp/items/Izfiled2.vue
index 9d6fb0b..63066be 100644
--- a/src/views/home/aside/comp/items/Izfiled2.vue
+++ b/src/views/home/aside/comp/items/Izfiled2.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled2'] && typeof asideValue['izfiled2'] == "string") {
-    let list = asideValue['izfiled2'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled2']) {
+    if(typeof asideValue['izfiled2'] == "string") {
+      let list = asideValue['izfiled2'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled2'];
+    }
     console.log("formValue.value.izfiled2", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled3.vue b/src/views/home/aside/comp/items/Izfiled3.vue
index ba62f48..cb5ad4a 100644
--- a/src/views/home/aside/comp/items/Izfiled3.vue
+++ b/src/views/home/aside/comp/items/Izfiled3.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled3'] && typeof asideValue['izfiled3'] == "string") {
-    let list = asideValue['izfiled3'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled3']) {
+    if(typeof asideValue['izfiled3'] == "string") {
+      let list = asideValue['izfiled3'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled3'];
+    }
     console.log("formValue.value.izfiled3", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfiled6.vue b/src/views/home/aside/comp/items/Izfiled6.vue
index 3ccbed1..606dda4 100644
--- a/src/views/home/aside/comp/items/Izfiled6.vue
+++ b/src/views/home/aside/comp/items/Izfiled6.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfiled6'] && typeof asideValue['izfiled6'] == "string") {
-    let list = asideValue['izfiled6'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfiled6']) {
+    if(typeof asideValue['izfiled6'] == "string") {
+      let list = asideValue['izfiled6'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfiled6'];
+    }
     console.log("formValue.value.izfiled6", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izfirm.vue b/src/views/home/aside/comp/items/Izfirm.vue
index cbd5284..7ff4fab 100644
--- a/src/views/home/aside/comp/items/Izfirm.vue
+++ b/src/views/home/aside/comp/items/Izfirm.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izfirm'] && typeof asideValue['izfirm'] == "string") {
-    let list = asideValue['izfirm'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izfirm']) {
+    if(typeof asideValue['izfirm'] == "string") {
+      let list = asideValue['izfirm'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izfirm'];
+    }
     console.log("formValue.value.izfirm", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Iztaskrrom.vue b/src/views/home/aside/comp/items/Iztaskrrom.vue
index 2964260..a764d45 100644
--- a/src/views/home/aside/comp/items/Iztaskrrom.vue
+++ b/src/views/home/aside/comp/items/Iztaskrrom.vue
@@ -7,14 +7,20 @@ import { useConfig } from '@/store/modules/asideConfig'
 const configUseStore = useConfig()
 
 configUseStore.$subscribe(() => {
+  console.log("isLoadValue.value", isLoadValue.value,
+  "configUseStore.getAsideValue", configUseStore.getAsideValue);
   if(isLoadValue.value) {
     isLoadValue.value = false;
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskrrom'] && typeof asideValue['iztaskrrom'] == "string") {
-    let list = asideValue['iztaskrrom'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['iztaskrrom']) {
+    if(typeof asideValue['iztaskrrom'] == "string") {
+      let list = asideValue['iztaskrrom'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['iztaskrrom'];
+    }
     console.log("formValue.value.iztaskrrom", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Iztaskstatus.vue b/src/views/home/aside/comp/items/Iztaskstatus.vue
index 4ee0f7b..99859df 100644
--- a/src/views/home/aside/comp/items/Iztaskstatus.vue
+++ b/src/views/home/aside/comp/items/Iztaskstatus.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['iztaskstatus'] && typeof asideValue['iztaskstatus'] == "string") {
-    let list = asideValue['iztaskstatus'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['iztaskstatus']) {
+    if(typeof asideValue['iztaskstatus'] == "string") {
+      let list = asideValue['iztaskstatus'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['iztaskstatus'];
+    }
     console.log("formValue.value.iztaskstatus", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Izvisitpro.vue b/src/views/home/aside/comp/items/Izvisitpro.vue
index 218df02..5481374 100644
--- a/src/views/home/aside/comp/items/Izvisitpro.vue
+++ b/src/views/home/aside/comp/items/Izvisitpro.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izvisitpro'] && typeof asideValue['izvisitpro'] == "string") {
-    let list = asideValue['izvisitpro'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izvisitpro']) {
+    if(typeof asideValue['izvisitpro'] == "string") {
+      let list = asideValue['izvisitpro'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izvisitpro'];
+    }
     console.log("formValue.value.izvisitpro", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/Plan.vue b/src/views/home/aside/comp/items/Plan.vue
index b2fbc1d..76bc5a5 100644
--- a/src/views/home/aside/comp/items/Plan.vue
+++ b/src/views/home/aside/comp/items/Plan.vue
@@ -12,9 +12,13 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izplan'] && typeof asideValue['izplan'] == "string") {
-    let list = asideValue['izplan'].split(',');
-    formValue.value.plans = list;
+  if(asideValue['izplan']) {
+    if(typeof asideValue['izplan'] == "string") {
+      let list = asideValue['izplan'].split(',');
+      formValue.value.plans = list;
+    }else {
+      formValue.value.plans = asideValue['izplan'];
+    }    
     console.log("formValue.value.izplan", formValue.value.plans);
   }else {
     formValue.value.plans = [];
diff --git a/src/views/home/aside/comp/items/ReportUser.vue b/src/views/home/aside/comp/items/ReportUser.vue
index f48d779..a89080a 100644
--- a/src/views/home/aside/comp/items/ReportUser.vue
+++ b/src/views/home/aside/comp/items/ReportUser.vue
@@ -13,9 +13,13 @@ configUseStore.$subscribe(() => {
     isLoadValue.value = false;
     return
   }
-  if(asideValue['izupuser'] && typeof asideValue['izupuser'] == "string") {
-    let list = asideValue['izupuser'].split(',');
-    formValue.value.users = list;
+  if(asideValue['izupuser']) {
+    if(typeof asideValue['izupuser'] == "string") {
+      let list = asideValue['izupuser'].split(',');
+      formValue.value.users = list;
+    }else {
+      formValue.value.users = asideValue['izupuser'];
+    }
     console.log("formValue.value.users1111111111", formValue.value.users);
   }else {
     formValue.value.users = [];
diff --git a/src/views/home/aside/comp/items/Similarity.vue b/src/views/home/aside/comp/items/Similarity.vue
index 874311e..82bdef3 100644
--- a/src/views/home/aside/comp/items/Similarity.vue
+++ b/src/views/home/aside/comp/items/Similarity.vue
@@ -10,7 +10,7 @@ configUseStore.$subscribe(() => {
     return
   }
   let asideValue = configUseStore.getAsideValue;
-  if(asideValue['izsimilarity'] && typeof asideValue['izsimilarity'] == "string") {
+  if(asideValue['izsimilarity']) {
     range.value = asideValue['izsimilarity']
   }else {
     range.value = [0, 100];
diff --git a/src/views/home/aside/comp/items/Time.vue b/src/views/home/aside/comp/items/Time.vue
index 299dc18..c52d678 100644
--- a/src/views/home/aside/comp/items/Time.vue
+++ b/src/views/home/aside/comp/items/Time.vue
@@ -44,7 +44,7 @@ onMounted(() => {
       time.value = [startDate.getTime(), endDate.getTime()];
       console.log('time init', startDate.getTime(), endDate.getTime());
       setTimeout(() => {
-        onChange([startDate.getTime(), endDate.getTime()])
+        emit('update:value', [startDate.getTime(), endDate.getTime()])
       },300)
     }
 })
diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index ed86ae7..95f15cb 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -3,7 +3,7 @@ import { getAllfieldList, getfieldList, setFilter } from '@/api/home/filter'
 import { asideMap } from '@/config/aside'
 import { useConfig } from '@/store/modules/asideConfig'
 import { useUser } from "@/store/modules/user"
-import { debounce, difference, cloneDeep } from 'lodash-es'
+import { debounce, difference, cloneDeep, isEqual } from 'lodash-es'
 import { computed, defineOptions, onMounted, ref, watch } from 'vue'
 import { VueDraggable } from 'vue-draggable-plus'
 
@@ -14,8 +14,10 @@ const show = ref(false)
 const configStore = useConfig()
 const checkAll = ref(false)
 const selectIds = ref<string[]>([])
+const tempList = ref<string[]>([])
 
 function showModal() {
+
   show.value = true
 
   // 重置左右列表数据
@@ -24,8 +26,15 @@ function showModal() {
 
   if (config == null || customConfig == null)
     return
+  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+    return
+  }
+  console.log("开启了啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦筛选条件----------------", customConfig);
   const { showList, hideList } = generatList(config, customConfig)
-  console.log("showList", showList);
+  tempList.value = cloneDeep(showList);
+  if(tempList.value.length > 0) {
+    configStore.setFilterConfig(tempList.value)
+  }
   onList.value = showList
   offList.value = hideList
   // 重置全选状态
@@ -125,13 +134,30 @@ function generatList(config, customConfig) {
   const fixedList = generateDefaultList(config)
   offList.unshift(...fixedList)
   onList.unshift(...fixedList)
+  console.log("原始筛选条件customConfig", customConfig);
   // onList按照customConfig排序
   let tempOnList = cloneDeep(onList);
-  let sortList: any = [];
-  customConfig.map(key => {
-    let tempItem = tempOnList.find(item => item.id == key);
-    sortList.push(tempItem);
+  console.log("原始筛选条件tempOnList", tempOnList);
+  
+  let sortKeyList: any = [];
+  configStore.getFilterConfig.map((item: any) => {
+    sortKeyList.push(item.id);
   });
+  console.log("原始筛选条件sortKeyList", sortKeyList);
+  let sortList: any = [];
+  if(sortKeyList.length > 0) {
+    sortKeyList.map(key => {
+      let tempItem = tempOnList.find(item => item.id == key);
+      sortList.push(tempItem);
+    });
+  }else {
+    customConfig.map(key => {
+      let tempItem = tempOnList.find(item => item.id == key);
+      sortList.push(tempItem);
+    });
+  }
+  console.log("原始筛选条件sortList", sortList );
+  console.log("原始筛选条件configStore.getFilterConfig", configStore.getFilterConfig, );
   // return { showList: onList, hideList: offList }
   return { showList: sortList, hideList: offList }
 }
@@ -142,8 +168,19 @@ configStore.$subscribe(() => {
 
   if (config == null || customConfig == null)
     return
-
+  console.log("tempList.value-----------", tempList.value);
+  console.log("configStore.getFilterConfig-----------", configStore.getFilterConfig);
+  if(tempList.value.length > 0 && isEqual(tempList.value, configStore.getFilterConfig)) {
+    return
+  }
   const { showList, hideList } = generatList(config, customConfig)
+  tempList.value = cloneDeep(showList);
+  console.log("克隆条件", tempList.value);
+  if(tempList.value.length > 0) {
+    configStore.setFilterConfig(tempList.value)
+  }
+  // setTimeout(() => {
+  // }, 500);
   onList.value = showList
   offList.value = hideList
 })
@@ -155,7 +192,21 @@ async function handleSumbit(e: MouseEvent) {
   }).join(',')
 
   await setFilter({ searchcount: param, type: 0 })
-  configStore.fetchCustomConfig()
+  const obj = await configStore.fetchCustomConfig()
+  console.log("obj-------------------------------", obj);
+  let tempOnList = cloneDeep(onList.value);
+  console.log("原始筛选条件tempOnList", tempOnList);
+  let sortList: any = [];
+  obj.map(key => {
+    let tempItem = tempOnList.find(item => item.id == key);
+    sortList.push(tempItem);
+  });
+  console.log("configStore.sortList---------------", sortList);
+  // setTimeout(() => {
+  if(sortList.length > 0) {
+    configStore.setFilterConfig(sortList)
+  }
+  // }, 500);
   closeModal()
 }