Merge branch 'main' of https://github.com/dataease/SQLBot

Author: dataeaseShu

.typos.toml

@@ -1,4 +1,5 @@
 [default.extend-words]
+sibing = "sibing"
 [default.extend-identifiers]
 maintain_column_froms = "maintain_column_froms"
 [files]

backend/apps/system/api/user.py

@@ -33,7 +33,7 @@ async def pager(
     paginator = Paginator(session)
     filters = {}
 
-    origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid).where(UserModel.id != 1).distinct()
+    origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid, isouter=True).where(UserModel.id != 1).distinct()
     if oidlist:
         origin_stmt = origin_stmt.where(UserWsModel.oid.in_(oidlist))
     if status is not None:
@@ -75,7 +75,7 @@ async def pager(
 
     # 组合结果
     result = [
-        {**extra_attrs[user_id], "oid_list": oid_list} 
+        {**extra_attrs[user_id], "oid_list": list(filter(None, oid_list))} 
         for user_id, oid_list in merged.items()
     ]
     user_page.items = result

frontend/src/views/dashboard/common/AddViewDashboard.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, reactive, ref, h } from 'vue'
+import { reactive, ref, h } from 'vue'
 import { ElButton, ElMessage } from 'element-plus-secondary'
 import {
   findNextComponentIndex,
@@ -16,6 +16,7 @@ const { t } = useI18n()
 const resource = ref(null)
 
 const optInit = (viewInfo: any) => {
+  initDashboardList()
   resourceDialogShow.value = true
   state.viewInfo = viewInfo
 }
@@ -181,10 +182,6 @@ const initDashboardList = () => {
   })
 }
 
-onMounted(() => {
-  initDashboardList()
-})
-
 defineExpose({
   optInit,
 })