NEZ-1631 fix：列表页面 默认排序字段 初始化状态修复

nezha-fronted/src/App.vue

@@ -15,9 +15,6 @@ export default {
     browserWindowZoom
   },
   async created () {
-    if (window.outerWidth <= 1024) { // outerWidth 获取设备宽度
-      document.querySelector('meta[name=viewport]').setAttribute('content', `width=device-width, initial-scale=${window.outerWidth / (1024 * window.devicePixelRatio)}, maximum-scale=1.0, user-scalable=0`)
-    }
     const herfSpiltArr = window.location.href.split('/')
     if (herfSpiltArr[3] !== '#') {
       herfSpiltArr[3] = '#'
@@ -28,6 +25,7 @@ export default {
     const result = await this.$http.get(url)
     this.$axios.defaults.baseURL = result.body.baseUrl
     const version = result.body.version
+    const defaultWindowWidth = result.body.width || 1024
     if (version !== localStorage.getItem('nz-version')) {
       localStorage.clear()
       localStorage.clear()
@@ -35,6 +33,9 @@ export default {
       herfSpiltArr[2] = herfSpiltArr[2] + '?t=' + new Date().getTime()
       window.location.href = herfSpiltArr[0] + '//' + herfSpiltArr[2]
     }
+    if (window.outerWidth <= defaultWindowWidth) { // outerWidth 获取设备宽度
+      document.querySelector('meta[name=viewport]').setAttribute('content', `width=device-width, initial-scale=${window.outerWidth / (defaultWindowWidth * window.devicePixelRatio)}, maximum-scale=1.0, user-scalable=0`)
+    }
   }
 }
 </script>

nezha-fronted/src/components/common/mixin/dataList.js

@@ -105,9 +105,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
+              item.left = 0
-              item.top= 0
+              item.top = 0
-              item.alertNumtooltipShow= false
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -337,6 +337,10 @@ export default {
   },
   created () {
     const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
+    if (this.$route.query.orderBy) {
+      this.orderBy = this.$route.query.orderBy
+      console.log('asdasdadsadsa')
+    }
     let searchKeys = {}
     if (path === 'dc') {
       searchKeys = {

nezha-fronted/src/components/common/mixin/table.js

@@ -26,7 +26,7 @@ export default {
   data () {
     return {
       operationWidth: '165', // 操作列宽
-      orderBy: {},
+      orderBy: null,
       severityDataWeight: this.$store.getters.severityDataWeight
     }
   },
@@ -131,10 +131,12 @@ export default {
         if (n) {
           const index = n.indexOf('-')
           if (index !== -1) {
-            this.orderBy[n.slice(index + 1)] = 'descending'
+            this.orderBy = { prop: n.slice(index + 1), order: 'descending' }
           } else {
-            this.orderBy[n] = 'descending'
+            this.orderBy = { prop: n, order: 'ascending' }
           }
+          // this.orderBy = JSON.parse(JSON.stringify(this.orderBy))
+          console.log(n, this.orderBy)
         }
       }
     },

nezha-fronted/src/components/common/table/alert/alertMessageTable.vue

@@ -8,6 +8,7 @@
       :data="tableData"
       :height="height"
       border
+      :default-sort="orderBy"
       @header-dragend="dragend"
       @sort-change="tableDataSort"
       @selection-change="selectionChange"

nezha-fronted/src/components/common/table/alert/alertRuleTable.vue

@@ -6,6 +6,7 @@
     :height="height"
     tooltip-effect="light"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/asset/assetMetaTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/agentTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/chartTmplTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/dcTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/endpointTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/exprTmplTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/modelTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/moduleTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/operationLogTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     class="no-operation"
     @header-dragend="dragend"
     @sort-change="tableDataSort"

nezha-fronted/src/components/common/table/settings/projectTable.vue

@@ -6,6 +6,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/roleTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/terminalLogTable.vue

@@ -5,6 +5,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/common/table/settings/userTable.vue

@@ -6,6 +6,7 @@
     :data="tableData"
     :height="height"
     border
+    :default-sort="orderBy"
     @header-dragend="dragend"
     @sort-change="tableDataSort"
     @selection-change="selectionChange"

nezha-fronted/src/components/page/alert/alertMessage.vue

@@ -31,6 +31,7 @@
       <template v-slot:default="slotProps">
         <alert-message-table
           ref="dataTable"
+          :orderByFa="orderBy"
           :api="url"
           :custom-table-title="tools.customTableTitle"
           :height="mainTableHeight"

nezha-fronted/src/components/page/alert/alertRule.vue

@@ -109,6 +109,7 @@
       <template v-slot:default="slotProps">
         <alert-rule-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/alert/alertSilence.vue

@@ -19,6 +19,7 @@
       <template v-slot:default="slotProps">
         <alert-silence-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/asset/asset.vue

@@ -719,9 +719,9 @@ export default {
           if (this.needAlertDaysData) {
             response.data.list.forEach(item => {
               item.trendLoading = true
-              item.left= 0
+              item.left = 0
-              item.top= 0
+              item.top = 0
-              item.alertNumtooltipShow= false
+              item.alertNumtooltipShow = false
               item.alertDaysData = [
                 {
                   metric: { priority: 'P1' },
@@ -739,6 +739,7 @@ export default {
             })
           }
           this.tableData = response.data.list
+          console.log(this.$refs.dataTable.$refs.dataTable)
           const globalSearchId = this.$store.getters.getGlobalSearchId
           let detailViewRightObj = ''
           if (globalSearchId) {
@@ -749,7 +750,7 @@ export default {
           this.detailViewRightObj = detailViewRightObj
           this.pageObj.total = response.data.total
           this.pageObj.pages = response.data.pages
-          if (!this.scrollbarWrap && this.$refs.dataTable&& this.$refs.dataTable.$refs.dataTable) {
+          if (!this.scrollbarWrap && this.$refs.dataTable && this.$refs.dataTable.$refs.dataTable) {
             this.$nextTick(() => {
               this.scrollbarWrap = this.$refs.dataTable.$refs.dataTable.bodyWrapper
               this.toTopBtnHandler(this.scrollbarWrap)

nezha-fronted/src/components/page/config/agent.vue

@@ -22,6 +22,7 @@
       <template v-slot:default="slotProps">
         <agent-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/assetMeta.vue

@@ -40,6 +40,7 @@
       <template v-slot:default="slotProps">
         <asset-meta-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/assetType.vue

@@ -19,6 +19,7 @@
       <template v-slot="slotProps">
         <asset-type-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/dc.vue

@@ -115,6 +115,7 @@
       <template v-slot:default="slotProps">
         <dc-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/model.vue

@@ -41,6 +41,7 @@
       <template v-slot="slotProps">
         <model-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/operationLog.vue

@@ -11,6 +11,7 @@
       <template v-slot:default="slotProps">
         <operation-log-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/roles.vue

@@ -19,6 +19,7 @@
       <template v-slot:default="slotProps">
         <role-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/template/chartTemp.vue

@@ -46,6 +46,7 @@
       <template  v-slot="slotProps">
         <chartTmplTable
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/template/exprTemp.vue

@@ -38,6 +38,7 @@
       <template v-slot:default="slotProps">
         <expr-tmpl-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/terminalLog.vue

@@ -67,6 +67,7 @@
       <template v-slot:default="slotProps">
         <terminal-log-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/config/user.vue

@@ -73,6 +73,7 @@
       <template v-slot="slotProps">
         <user-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"

nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue

@@ -127,6 +127,7 @@
         <endpoint-table
           ref="dataTable"
            v-loading="tools.loading"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :api="url"
           :custom-table-title="tools.customTableTitle"

nezha-fronted/src/components/page/monitor/module/moduleList.vue

@@ -112,6 +112,7 @@
         <module-table
           ref="dataTable"
           v-loading="tools.loading"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :api="url"
           :tableId="tableId"

nezha-fronted/src/components/page/monitor/project/projectList.vue

@@ -20,6 +20,7 @@
       <template v-slot="slotProps">
         <project-table
           ref="dataTable"
+          :orderByFa="orderBy"
           v-loading="tools.loading"
           :loading="tools.loading"
           :api="url"