diff --git a/frontend/src/components/gridTable/tableBody.vue b/frontend/src/components/gridTable/tableBody.vue index f34a63a077..cc07576985 100644 --- a/frontend/src/components/gridTable/tableBody.vue +++ b/frontend/src/components/gridTable/tableBody.vue @@ -14,7 +14,7 @@ export default { const { children = [] } = context; if (!columns?.length) return children; children.forEach(ele => { - if (columns.includes(ele.componentOptions.propsData.prop)) { + if (columns.includes(ele.componentOptions?.propsData?.prop)) { nodes.push(ele) } }) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 8b8c47ef42..a677aa3a4f 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -378,8 +378,9 @@ export default { pluginLoaded() .then((res) => { this.isPluginLoaded = res.success && res.data; - if (this.isPluginLoaded) { - // this.searchConfig.components.push(...this.extraFilterComponents); + if (!this.isPluginLoaded) { + this.checkedColumnNames = this.checkedColumnNames.filter(ele => !['dept', 'roles'].includes(ele)) + this.columnNames = this.columnNames.filter(ele => !['dept', 'roles'].includes(ele.props)) } this.canLoadDom = true; }) @@ -448,6 +449,9 @@ export default { this.checkedColumnNames = val ? columnOptions.map((ele) => ele.props) : []; + if (!this.isPluginLoaded) { + this.checkedColumnNames = this.checkedColumnNames.filter(ele => !['dept', 'roles'].includes(ele)) + } this.isIndeterminate = false; }, handleCheckedColumnNamesChange(value) {