[Update] 资产授权列表使用GenericTreeListPage

src/views/perms/AssetPermission/AssetPermissionList.vue

@@ -1,18 +1,14 @@
 <template>
-  <AssetPermissionTree :tree-setting="treeSetting" :table-config="tableConfig">
+  <GenericTreeListPage :table-config="tableConfig" :header-actions="headerActions" :tree-setting="treeSetting" />
-    <AssetPermissionList :table-config="tableConfig" :header-actions="headerActions" />
-  </AssetPermissionTree>
 </template>
 
 <script>
-import AssetPermissionTree from './AssetPermissionTree'
+import GenericTreeListPage from '@/layout/components/GenericTreeListPage'
-import AssetPermissionList from './AssetPermissionList'
 import { ExpandAssetPermissionFormatter } from '@/components/ListTable/formatters/index'
 
 export default {
   components: {
-    AssetPermissionTree,
+    GenericTreeListPage
-    AssetPermissionList
   },
   data() {
     return {
@@ -59,12 +55,12 @@ export default {
           },
           system_users_amount: {
             label: this.$t('perms.SystemUser')
+          }
         },
         actions: {
           updateRoute: 'AssetPermissionUpdate',
           detailRoute: 'AssetPermissionDetail'
         }
-        }
       },
       headerActions: {
         hasExport: false,
@@ -97,6 +93,6 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 
 </style>

src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionList.vue

@@ -1,27 +0,0 @@
-<template>
-  <ListTable :table-config="iTableConfig" :header-actions="iHeaderActions" />
-</template>
-
-<script>
-import ListTable from '@/components/ListTable'
-
-export default {
-  name: 'AssetPermissionList',
-  components: {
-    ListTable
-  },
-  props: {
-    ...ListTable.props
-  },
-  data() {
-    return {
-      iTableConfig: this.tableConfig,
-      iHeaderActions: this.headerActions
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/perms/AssetPermission/AssetPermissionList/AssetPermissionTree.vue

@@ -1,101 +0,0 @@
-<template>
-  <Page>
-    <el-alert v-if="helpMessage" type="success"> {{ helpMessage }} </el-alert>
-    <el-collapse-transition>
-      <div style="display: flex;justify-items: center; flex-wrap: nowrap;justify-content:space-between;">
-        <div v-show="iShowTree" :style="iShowTree?('width:250px;'):('width:0;')" class="transition-box">
-          <component
-            :is="component"
-            :setting="treeSetting"
-            class="auto-data-ztree"
-            @urlChange="handleUrlChange"
-          />
-        </div>
-        <div :style="iShowTree?('display: flex;width: calc(100% - 250px);'):('display: flex;width:100%;')">
-          <div class="mini">
-            <div style="display:block" class="mini-button" @click="iShowTree=!iShowTree">
-              <i v-show="iShowTree" class="fa fa-angle-left fa-x" /><i v-show="!iShowTree" class="fa fa-angle-right fa-x" />
-            </div>
-          </div>
-          <IBox class="transition-box" style="width: calc(100% - 17px);">
-            <slot />
-          </IBox>
-        </div>
-      </div>
-    </el-collapse-transition>
-  </Page>
-</template>
-
-<script>
-import AutoDataZTree from '@/components/AutoDataZTree/index'
-import { Page } from '@/layout/components'
-import IBox from '@/components/IBox'
-import ListTable from '@/components/ListTable'
-
-export default {
-  name: 'AssetPermissionTree',
-  components: {
-    AutoDataZTree,
-    Page,
-    IBox
-  },
-  props: {
-    ...ListTable.props,
-    helpMessage: {
-      type: String,
-      default: null
-    },
-    treeSetting: {
-      type: Object,
-      default: () => AutoDataZTree.props.setting.default()
-    },
-    showTree: {
-      type: Boolean,
-      default: true
-    },
-    // 默认引用的Tree组件
-    component: {
-      type: String,
-      default: () => 'AutoDataZTree'
-    }
-  },
-  data() {
-    return {
-      iTableConfig: this.tableConfig,
-      iShowTree: this.showTree
-    }
-  },
-  methods: {
-    handleUrlChange(_url) {
-      this.$set(this.iTableConfig, 'url', _url)
-      console.log(this.iTableConfig)
-    }
-  }
-}
-
-</script>
-
-<style scoped>
-  .mini-button{
-    width: 12px;
-    float: right;
-    text-align: center;
-    padding: 5px 0;
-    background-color: #1ab394;
-    border-color: #1ab394;
-    color: #FFFFFF;
-    border-radius: 3px;
-  }
-  .el-tree{
-    background-color: inherit !important;
-  }
-  .mini{
-    margin-right: 5px;
-    width: 12px !important;
-  }
-
-  .auto-data-ztree {
-    overflow: auto;
-    /*border-right: solid 1px red;*/
-  }
-</style>

src/views/perms/index.js

@@ -3,7 +3,7 @@ export default [
   {
     path: 'asset-permissions',
     name: 'AssetPermissionList',
-    component: () => import('@/views/perms/AssetPermission/AssetPermissionList/index'),
+    component: () => import('@/views/perms/AssetPermission/AssetPermissionList'),
     meta: { title: 'AssetPermission' }
   },
   {