From 45bb3867da18eb648fd1ef8f1410ed883aa314d3 Mon Sep 17 00:00:00 2001
From: LH_R <song.lhlh@gmail.com>
Date: Fri, 15 Aug 2025 21:37:07 +0800
Subject: [PATCH] fix(ui): resource views - fix page display during
 initialization

---
 cmdb-ui/src/modules/cmdb/views/ci/index.vue   | 30 ++++++++++++++-----
 .../modules/cmdb/views/ci/instanceList.vue    |  6 +++-
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
index 25822e5..6c08122 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <div v-if="preferenceGroup.length === 0">
+    <div v-if="pageLoading" class="page-loading">
+      <a-spin size="large" />
+    </div>
+
+    <div v-else-if="preferenceGroup.length === 0">
       <a-alert banner>
         <template #message>
           <span>{{ $t('cmdb.preference.tips1') }}</span>
@@ -110,8 +114,8 @@ export default {
       preferenceGroup: [],
       currentTypeId: Number(this.$route?.params?.typeId || localStorage.getItem('ops_ci_typeid') || ''),
       resource_type: {},
-      loading: false,
-      autoSub: {}
+      autoSub: {},
+      pageLoading: false
     }
   },
   computed: {
@@ -152,9 +156,14 @@ export default {
     }
   },
   created() {
-    this.getPreference()
-    this.getResourceType()
-    this.getAutoSubscription()
+    this.pageLoading = true
+    Promise.all([
+      this.getPreference(),
+      this.getResourceType(),
+      this.getAutoSubscription()
+    ]).then(() => {
+      this.pageLoading = false
+    })
   },
   methods: {
     async getPreference() {
@@ -191,8 +200,8 @@ export default {
       }
     },
 
-    getResourceType() {
-      searchResourceType({ page_size: 9999, app_id: 'cmdb' }).then(res => {
+    async getResourceType() {
+      await searchResourceType({ page_size: 9999, app_id: 'cmdb' }).then(res => {
         this.resource_type = { groups: res.groups, id2perms: res.id2perms }
       })
     },
@@ -247,6 +256,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.page-loading {
+  text-align: center;
+  padding-top: 150px;
+}
+
 .ci-left {
   height: calc(100vh - 90px);
   width: 100%;
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/instanceList.vue b/cmdb-ui/src/modules/cmdb/views/ci/instanceList.vue
index ff38641..a5dcf0a 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/instanceList.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/instanceList.vue
@@ -665,7 +665,11 @@ export default {
     },
     columnDrop() {
       this.$nextTick(() => {
-        const xTable = this.$refs.xTable.getVxetableRef()
+        const xTable = this.$refs?.xTable?.getVxetableRef?.()
+        if (!xTable) {
+          return
+        }
+
         this.sortable = Sortable.create(
           xTable.$el.querySelector('.body--wrapper>.vxe-table--header .vxe-header--row'),
           {