Merge current v2.11 into v3.0

webui/src/pages/tcp/Services.vue

@@ -1,28 +1,29 @@
 <template>
   <page-default>
-
     <section class="app-section">
       <div class="app-section-wrap app-boxed app-boxed-xl q-pl-md q-pr-md q-pt-xl q-pb-xl">
         <div class="row no-wrap items-center q-mb-lg">
-          <tool-bar-table :status.sync="status" :filter.sync="filter"/>
+          <tool-bar-table
+            v-model:status="status"
+            v-model:filter="filter"
+          />
         </div>
         <div class="row items-center q-col-gutter-lg">
           <div class="col-12">
             <main-table
               ref="mainTable"
               v-bind="getTableProps({ type: 'tcp-services' })"
+              v-model:current-sort="sortBy"
+              v-model:current-sort-dir="sortDir"
               :data="allServices.items"
-              :onLoadMore="handleLoadMore"
-              :endReached="allServices.endReached"
+              :on-load-more="handleLoadMore"
+              :end-reached="allServices.endReached"
               :loading="allServices.loading"
-              :currentSort.sync="sortBy"
-              :currentSortDir.sync="sortDir"
             />
           </div>
         </div>
       </div>
     </section>
-
   </page-default>
 </template>
 
@@ -30,12 +31,17 @@
 import { mapActions, mapGetters } from 'vuex'
 import GetTablePropsMixin from '../../_mixins/GetTableProps'
 import PaginationMixin from '../../_mixins/Pagination'
-import PageDefault from '../../components/_commons/PageDefault'
-import ToolBarTable from '../../components/_commons/ToolBarTable'
-import MainTable from '../../components/_commons/MainTable'
+import PageDefault from '../../components/_commons/PageDefault.vue'
+import ToolBarTable from '../../components/_commons/ToolBarTable.vue'
+import MainTable from '../../components/_commons/MainTable.vue'
 
 export default {
   name: 'PageTCPServices',
+  components: {
+    PageDefault,
+    ToolBarTable,
+    MainTable
+  },
   mixins: [
     GetTablePropsMixin,
     PaginationMixin({
@@ -44,11 +50,6 @@ export default {
       pollingIntervalTime: 5000
     })
   ],
-  components: {
-    PageDefault,
-    ToolBarTable,
-    MainTable
-  },
   data () {
     return {
       filter: '',
@@ -60,6 +61,23 @@ export default {
   computed: {
     ...mapGetters('tcp', { allServices: 'allServices' })
   },
+  watch: {
+    'status' () {
+      this.refreshAll()
+    },
+    'filter' () {
+      this.refreshAll()
+    },
+    'sortBy' () {
+      this.refreshAll()
+    },
+    'sortDir' () {
+      this.refreshAll()
+    }
+  },
+  beforeUnmount () {
+    this.$store.commit('tcp/getAllServicesClear')
+  },
   methods: {
     ...mapActions('tcp', { getAllServices: 'getAllServices' }),
     getAllServicesWithParams (params) {
@@ -81,23 +99,6 @@ export default {
     handleLoadMore ({ page = 1 } = {}) {
       return this.fetchMore({ page })
     }
-  },
-  watch: {
-    'status' () {
-      this.refreshAll()
-    },
-    'filter' () {
-      this.refreshAll()
-    },
-    'sortBy' () {
-      this.refreshAll()
-    },
-    'sortDir' () {
-      this.refreshAll()
-    }
-  },
-  beforeDestroy () {
-    this.$store.commit('tcp/getAllServicesClear')
   }
 }
 </script>