diff --git a/frontend/src/store/modules/ms-table/index.ts b/frontend/src/store/modules/ms-table/index.ts index 502ba71687..73d9464d54 100644 --- a/frontend/src/store/modules/ms-table/index.ts +++ b/frontend/src/store/modules/ms-table/index.ts @@ -19,9 +19,6 @@ const msTableStore = defineStore('msTable', { if (!this.selectorColumnMap.has(tableKey)) { const tmpMap = this.selectorColumnMap; column.forEach((item) => { - if (item.showInTable === undefined) { - item.showInTable = true; - } if (item.showDrag === undefined) { item.showDrag = false; } @@ -48,7 +45,7 @@ const msTableStore = defineStore('msTable', { if (this.selectorColumnMap.has(key)) { const tmpArr = this.selectorColumnMap.get(key)?.column || []; const nonSortableColumns = tmpArr.filter((item) => !item.showDrag); - const couldSortableColumns = tmpArr.filter((item) => item.showDrag); + const couldSortableColumns = tmpArr.filter((item) => !!item.showDrag); return { nonSort: nonSortableColumns, couldSort: couldSortableColumns }; } return { nonSort: [], couldSort: [] }; @@ -59,7 +56,7 @@ const msTableStore = defineStore('msTable', { getShowInTableColumns(key: string): MsTableColumn { if (this.selectorColumnMap.has(key)) { const tmpArr = this.selectorColumnMap.get(key)?.column; - return tmpArr?.filter((item) => item.showInTable) || []; + return tmpArr?.filter((item) => !!item.showInTable) || []; } return []; }, diff --git a/frontend/src/views/setting/system/usergroup/components/addUserModal.vue b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue index fafbac49c5..7057602462 100644 --- a/frontend/src/views/setting/system/usergroup/components/addUserModal.vue +++ b/frontend/src/views/setting/system/usergroup/components/addUserModal.vue @@ -16,7 +16,7 @@ :label="t('system.userGroup.user')" :rules="[{ required: true, message: t('system.userGroup.pleaseSelectUser') }]" > - +