From 5b8863b900c7ae5d557eb0ce42033cc016e44131 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 11 Nov 2021 14:06:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/AsyncComponent/index.vue   |  6 +++--
 frontend/src/views/system/user/form.vue       |  2 +-
 frontend/src/views/system/user/index.vue      | 26 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/AsyncComponent/index.vue b/frontend/src/components/AsyncComponent/index.vue
index 114f3c9862..b115381fda 100644
--- a/frontend/src/components/AsyncComponent/index.vue
+++ b/frontend/src/components/AsyncComponent/index.vue
@@ -45,8 +45,10 @@ export default {
         } else {
           res = await window.SyncComponentCache[this.url]
         }
-        const Fn = Function
-        this.mode = new Fn(`return ${res.data || res}`)()
+        if (res && res.data) {
+          const Fn = Function
+          this.mode = new Fn(`return ${res.data || res}`)()
+        }
       }
     }
   },
diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 096608a604..d1659d0e73 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -1,6 +1,6 @@
 <template>
   <layout-content :header="formType=='add' ? $t('user.create') : $t('user.modify')" back-name="system-user">
-    <el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
+    <el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="80px" label-position="right">
       <el-form-item label="ID" prop="username">
         <el-input v-model="form.username" :disabled="formType !== 'add'" />
       </el-form-item>
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 18dbcf08ab..ac3777ec2c 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -1,6 +1,7 @@
 <template>
   <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <complex-table
+      v-if="canLoadDom"
       :data="data"
       :columns="columns"
       local-key="userGrid"
@@ -174,7 +175,8 @@ import { PHONE_REGEX } from '@/utils/validate'
 import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselect'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { ldapStatus, pluginLoaded } from '@/api/user'
+import { pluginLoaded } from '@/api/user'
+/* import { ldapStatus, pluginLoaded } from '@/api/user' */
 import { userLists, addUser, editUser, delUser, editPassword, editStatus, allRoles } from '@/api/system/user'
 import { getDeptTree, treeByDeptId } from '@/api/system/dept'
 
@@ -214,11 +216,14 @@ export default {
               { label: this.$t('commons.disable'), value: '0' }
             ],
             multiple: false
-          },
-          { field: 'd.name', label: this.$t('commons.organization'), component: 'DeComplexInput' },
-          { field: 'r.name', label: this.$t('commons.role'), component: 'DeComplexInput' }
+          }
+
         ]
       },
+      extraFilterComponents: [
+        { field: 'd.name', label: this.$t('commons.organization'), component: 'DeComplexInput' },
+        { field: 'r.name', label: this.$t('commons.role'), component: 'DeComplexInput' }
+      ],
       paginationConfig: {
         currentPage: 1,
         pageSize: 10,
@@ -307,7 +312,8 @@ export default {
       orderConditions: [],
       last_condition: null,
       openLdap: false,
-      isPluginLoaded: false
+      isPluginLoaded: false,
+      canLoadDom: false
     }
   },
   mounted() {
@@ -315,13 +321,17 @@ export default {
     this.search()
   },
   beforeCreate() {
-    ldapStatus().then(res => {
-      this.openLdap = res.success && res.data
-    })
     pluginLoaded().then(res => {
       this.isPluginLoaded = res.success && res.data
+      if (this.isPluginLoaded) {
+        this.searchConfig.components.push(...this.extraFilterComponents)
+      }
+      this.canLoadDom = true
+    }).catch(e => {
+      this.canLoadDom = true
     })
   },
+
   methods: {
     sortChange({ column, prop, order }) {
       this.orderConditions = []