Revert "fix: 刷新页面搜索条件丢失的问题"

This reverts commit 99f83a6bc4.
2025-10-22 16:23:28 +00:00 · 2024-03-11 18:18:08 +08:00
parent 99f83a6bc4
commit 64d2854e49
21 changed files with 52 additions and 51 deletions
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@@ -410,7 +410,7 @@ export default {
        ],
        canBulkDelete: vm.$hasPerm('accounts.delete_account'),
        searchConfig: {
-          getUrlQuery: true,
+          getUrlQuery: false,
          exclude: ['asset']
        },
        hasSearch: true
--- a/src/components/Apps/AssetSelect/dialog.vue
+++ b/src/components/Apps/AssetSelect/dialog.vue
@@ -112,7 +112,7 @@ export default {
        hasRightActions: false,
        hasLabelSearch: true,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        }
      }
    }
--- a/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/Table/DataTable/compenents/el-data-table/el-data-table.vue
@@ -838,7 +838,7 @@ export default {
        if (!val) return
        this.page = defaultFirstPage
        // mounted处有updateForm的行为，所以至少在初始执行时要等到nextTick
-        // this.$nextTick(this.getList)
+        this.$nextTick(this.getList)
      },
      immediate: true
    },
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -41,6 +41,7 @@

 <script>
 import Page from '../Page/'
+import merge from 'webpack-merge'

 const ACTIVE_TAB_KEY = 'activeTab'

@@ -61,8 +62,7 @@ export default {
  },
  data() {
    return {
-      loading: true,
-      tabRouterQuery: {}
+      loading: true
    }
  },
  computed: {
@@ -112,24 +112,15 @@ export default {
  },
  methods: {
    handleTabClick(tab) {
-      const name = tab.name
      this.$emit('tab-click', tab)
-      this.$emit('update:activeMenu', name)
+      this.$emit('update:activeMenu', tab.name)
      this.$cookie.set(ACTIVE_TAB_KEY, tab.name, 1)
-      let newQuery = {}
-      if (name in this.tabRouterQuery) {
-        newQuery = this.tabRouterQuery[name]
-      } else {
-        const query = _.cloneDeep(this.$route.query)
-        this.tabRouterQuery[this.iActiveMenu] = {
-          ...query,
-          activeTab: this.iActiveMenu
-        }
-        newQuery = { activeTab: name }
-      }
-      this.$nextTick(() => {
-        this.$router.replace({ query: newQuery })
+
+      if (this.$router.currentRoute.query[ACTIVE_TAB_KEY]) {
+        this.$router.push({
+          query: merge(this.$route.query, { [ACTIVE_TAB_KEY]: '' })
        })
+      }
    },
    getPropActiveTab() {
      let activeTab = ''
--- a/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue
+++ b/src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretAsset/index.vue
@@ -83,7 +83,7 @@ export default {
        hasImport: false,
        hasCreate: false,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        hasMoreActions: false
      },
--- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue
+++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue
@@ -104,7 +104,7 @@ export default {
        hasMoreActions: false,
        createRoute: 'AccountGatherTaskCreate',
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        }
      }
    }
--- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue
@@ -135,7 +135,7 @@ export default {
        hasImport: false,
        hasCreate: false,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        hasMoreActions: false
      }
--- a/src/views/acl/CommandAcl/index.vue
+++ b/src/views/acl/CommandAcl/index.vue
@@ -39,7 +39,14 @@ export default {
  },
  methods: {
    handleTabClick(tab) {
-      this.$log.debug('Current nav is: ', tab.name)
+      const query = _.cloneDeep(this.$route.query)
+      const newQuery = {
+        ...query,
+        activeTab: tab.name
+      }
+      this.$nextTick(() => {
+        this.$router.replace({ query: newQuery })
+      })
    }
  }
 }
--- a/src/views/assets/Asset/AssetDetail/PermUser.vue
+++ b/src/views/assets/Asset/AssetDetail/PermUser.vue
@@ -29,8 +29,7 @@ export default {
  props: {
    object: {
      type: Object,
-      default: () => {
-      }
+      default: () => {}
    }
  },
  data() {
@@ -202,7 +201,7 @@ export default {
          hasLeftActions: false,
          hasColumnSetting: false,
          searchConfig: {
-            getUrlQuery: true
+            getUrlQuery: false
          }
        }
      }
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -214,7 +214,7 @@ export default {
        },
        hasLabelSearch: true,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        extraMoreActions: [
          {
--- a/src/views/assets/Asset/AssetList/index.vue
+++ b/src/views/assets/Asset/AssetList/index.vue
@@ -89,7 +89,14 @@ export default {
  },
  methods: {
    handleTabClick(tab) {
-      this.$log.debug('Current nav is: ', tab.name)
+      const query = _.cloneDeep(this.$route.query)
+      const newQuery = {
+        ...query,
+        activeTab: tab.name
+      }
+      this.$nextTick(() => {
+        this.$router.replace({ query: newQuery })
+      })
    }
  }
 }
--- a/src/views/assets/Cloud/Account/AccountList.vue
+++ b/src/views/assets/Cloud/Account/AccountList.vue
@@ -68,7 +68,7 @@ export default {
        hasImport: false,
        hasMoreActions: false,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        moreCreates: {
          callback: (option) => {
@@ -184,9 +184,7 @@ export default {
  },
  methods: {
    createAccount(provider) {
-      return () => {
-        this.$router.push({ name: 'AccountCreate', query: { provider: provider }})
-      }
+      return () => { this.$router.push({ name: 'AccountCreate', query: { provider: provider }}) }
    }
  }

--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue
@@ -12,8 +12,7 @@ export default {
  props: {
    object: {
      type: Object,
-      default: () => {
-      }
+      default: () => {}
    }
  },
  data() {
@@ -28,7 +27,7 @@ export default {
        moreActionsTitle: this.$t('common.MoreActions'),
        moreActionsType: 'primary',
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        extraMoreActions: [
          {
--- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
+++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/HistoryList.vue
@@ -13,8 +13,7 @@ export default {
  props: {
    object: {
      type: Object,
-      default: () => {
-      }
+      default: () => {}
    }
  },
  data() {
@@ -26,7 +25,7 @@ export default {
        hasExport: false,
        hasSearch: true,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        }
      },
      tableConfig: {
--- a/src/views/labels/LabelResourcesDialog.vue
+++ b/src/views/labels/LabelResourcesDialog.vue
@@ -45,7 +45,7 @@ export default {
          this.$emit('addResource')
        },
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        }
      }
    }
--- a/src/views/ops/Job/AdhocOpenDialog.vue
+++ b/src/views/ops/Job/AdhocOpenDialog.vue
@@ -70,7 +70,7 @@ export default {
        hasColumnSetting: false,
        hasSearch: false,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        }
      }
    }
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -50,7 +50,7 @@ export default {
            formatter: function(row, column, cellValue, index) {
              const label = index + 1
              const route = { to: { name: 'SessionDetail', params: { id: row.id }}}
-              return <router-link {...{ attrs: route }} class='link'>{label}</router-link>
+              return <router-link {...{ attrs: route }} class='link'>{ label }</router-link>
            }
          },
          user: {
@@ -162,18 +162,19 @@ export default {
        hasImport: false,
        hasDatePicker: true,
        searchConfig: {
-          getUrlQuery: true,
+          getUrlQuery: false,
          exclude: ['is_finished']
        }
      }
    }
  },
-  methods: {}
+  methods: {
+  }
 }
 </script>

 <style scoped>
-.link {
+  .link {
    color: var(--color-info);
-}
+  }
 </style>
--- a/src/views/settings/Applet/Applet/AppletList.vue
+++ b/src/views/settings/Applet/Applet/AppletList.vue
@@ -35,7 +35,7 @@ export default {
        },
        createTitle: this.$t('common.Upload'),
        searchConfig: {
-          getUrlQuery: true,
+          getUrlQuery: false,
          exclude: ['version']
        },
        extraActions: [
--- a/src/views/settings/Applet/VirtualApp/VirtualAppList.vue
+++ b/src/views/settings/Applet/VirtualApp/VirtualAppList.vue
@@ -28,7 +28,7 @@ export default {
        },
        createTitle: this.$t('common.Upload'),
        searchConfig: {
-          getUrlQuery: true,
+          getUrlQuery: false,
          exclude: ['version']
        },
        detailRoute: 'VirtualAppDetail',
--- a/src/views/users/Group/UserGroupDetail/GroupUser.vue
+++ b/src/views/users/Group/UserGroupDetail/GroupUser.vue
@@ -122,7 +122,7 @@ export default {
        hasImport: false,
        hasCreate: false,
        searchConfig: {
-          getUrlQuery: true
+          getUrlQuery: false
        },
        hasMoreActions: false
      },
--- a/src/views/users/User/UserDetail/index.vue
+++ b/src/views/users/User/UserDetail/index.vue
@@ -72,7 +72,7 @@ export default {
  },
  methods: {
    handleTabClick(tab) {
-      this.$log.debug('Current nav is: ', tab.name)
+      this.$log.debug('Current nav is: ', this.config.activeMenu)
    }
  }
 }