fix: 前端用户列表控制台报错
This commit is contained in:
parent
8a35e802cf
commit
5b8863b900
@ -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}`)()
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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 = []
|
||||
|
||||
Loading…
Reference in New Issue
Block a user