From 6ccdaf71e4f0136289ee941bfc94586893331da0 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 16 Jun 2020 17:39:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9table=20config?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=98=E5=8C=96=E6=97=B6=E8=87=AA=E5=8A=A8reload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataTable/index.vue | 11 ++++++-----
 src/components/ListTable/index.vue     |  9 ++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 27b1ffa65..1b90b172d 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <DataTable ref="dataTable" v-loading="loading" :config="iConfig" v-bind="$attrs" v-on="$listeners" />
+  <DataTable v-if="!loading" ref="dataTable" v-loading="loading" :config="iConfig" v-bind="$attrs" v-on="$listeners" />
 </template>
 
 <script type="text/jsx">
@@ -21,12 +21,14 @@ export default {
     return {
       loading: true,
       method: 'get',
-      iConfig: {},
       autoConfig: {},
       meta: {}
     }
   },
   computed: {
+    iConfig() {
+      return Object.assign(this.config, this.autoConfig)
+    }
   },
   watch: {
     config: {
@@ -36,11 +38,11 @@ export default {
       deep: true
     }
   },
-  mounted() {
+  created() {
     this.optionUrlMetaAndGenCols()
   },
   methods: {
-    optionUrlMetaAndGenCols() {
+    async optionUrlMetaAndGenCols() {
       const url = (this.config.url.indexOf('?') === -1) ? `${this.config.url}?draw=1&display=1` : `${this.config.url}&draw=1&display=1`
       this.$store.dispatch('common/getUrlMeta', { url: url }).then(data => {
         this.meta = data.actions[this.method.toUpperCase()] || {}
@@ -141,7 +143,6 @@ export default {
         }
       }
       this.autoConfig.columns = columns
-      this.iConfig = Object.assign(this.config, this.autoConfig)
     }
   }
 }
diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index 69e7c39ef..b80c57134 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -68,7 +68,9 @@ export default {
       this.dataTable.getList()
     },
     search(attrs) {
-      return this.dataTable.search(attrs, true)
+      if (Object.keys(attrs).length > 0) {
+        return this.dataTable.search(attrs, true)
+      }
     },
     handleDateChange(attrs) {
       this.$set(this.extraQuery, 'date_from', attrs[0].toISOString())
@@ -77,10 +79,11 @@ export default {
       //   date_from: attrs[0].toISOString(),
       //   date_to: attrs[1].toISOString()
       // }
-      return this.dataTable.searchDate({
+      const query = {
         date_from: attrs[0].toISOString(),
         date_to: attrs[1].toISOString()
-      })
+      }
+      return this.dataTable.searchDate(query)
     },
     toggleRowSelection(row, isSelected) {
       return this.dataTable.toggleRowSelection(row, isSelected)

From 86306c7bc94a4cda3bd68dba06a4ffbe910b25d0 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 16 Jun 2020 18:05:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataTable/compenents/el-data-table/el-data-table.vue         | 1 -
 src/views/assets/Domain/DomainCreateUpdate.vue                   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 26821c8ea..1cccff302 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -739,7 +739,6 @@ export default {
   },
   computed: {
     hasSelect() {
-      console.log(this.columns.length && this.columns[0].type === 'selection')
       return this.columns.length && this.columns[0].type === 'selection'
     },
     selectable() {
diff --git a/src/views/assets/Domain/DomainCreateUpdate.vue b/src/views/assets/Domain/DomainCreateUpdate.vue
index 2ac1854b6..3a460763b 100644
--- a/src/views/assets/Domain/DomainCreateUpdate.vue
+++ b/src/views/assets/Domain/DomainCreateUpdate.vue
@@ -13,7 +13,6 @@ export default {
   data() {
     return {
       initial: {
-
       },
       fields: [
         [this.$t('common.Basic'), ['name', 'assets', 'comment']]

From f16d1162347fabbae7fd77e662c5919ad47eb20b Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 16 Jun 2020 18:07:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E8=B5=84=E4=BA=A7=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=A7=84=E5=88=99is=5Fvalid=E5=AD=97=E6=AE=B5=E3=80=81?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=9A=84=E8=B5=84=E4=BA=A7=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=88=B7=E6=96=B0table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GrantedAssets/index.vue                      | 5 +++--
 src/views/perms/AssetPermission/AssetPermissionList.vue     | 4 ++--
 .../users/User/UserDetail/UserAssetPermissionRules.vue      | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/GrantedAssets/index.vue b/src/components/GrantedAssets/index.vue
index e4df42ba1..4f97b638c 100644
--- a/src/components/GrantedAssets/index.vue
+++ b/src/components/GrantedAssets/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <TreeTable :table-config="tableConfig" :header-actions="headerActions" :tree-setting="treeSetting" />
+  <TreeTable ref="TreeTable" :table-config="tableConfig" :header-actions="headerActions" :tree-setting="treeSetting" />
 </template>
 
 <script type="text/jsx">
@@ -29,7 +29,8 @@ export default {
         const initialUrl = vm.tableConfig.initialUrl
         const nodeId = node.meta.node.id
         const url = initialUrl.replace('/assets/', `/nodes/${nodeId}/assets/`)
-        vm.tableConfig.url = url
+        // vm.tableConfig.url = url
+        vm.$refs.TreeTable.handleUrlChange(url)
       }
     },
     getShowUrl: {
diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index 2c3f25d7a..626870d29 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -99,11 +99,11 @@ export default {
               children: [
                 {
                   value: '1',
-                  label: this.$t('common.Validity')
+                  label: this.$t('common.Yes')
                 },
                 {
                   value: '0',
-                  label: this.$t('common.Invalidity')
+                  label: this.$t('common.No')
                 }
               ]
             },
diff --git a/src/views/users/User/UserDetail/UserAssetPermissionRules.vue b/src/views/users/User/UserDetail/UserAssetPermissionRules.vue
index 1cfadb9ef..08c9c5143 100644
--- a/src/views/users/User/UserDetail/UserAssetPermissionRules.vue
+++ b/src/views/users/User/UserDetail/UserAssetPermissionRules.vue
@@ -24,7 +24,7 @@ export default {
         hasTree: true,
         columns: [
           'name', 'users_amount', 'user_groups_amount', 'assets_amount',
-          'nodes_amount', 'system_users_amount', 'is_active', 'actions'
+          'nodes_amount', 'system_users_amount', 'is_valid', 'actions'
         ],
         columnsMeta: {
           name: {
@@ -82,11 +82,11 @@ export default {
               children: [
                 {
                   value: '1',
-                  label: this.$t('common.Validity')
+                  label: this.$t('common.Yes')
                 },
                 {
                   value: '0',
-                  label: this.$t('common.Invalidity')
+                  label: this.$t('common.No')
                 }
               ]
             },