Merge pull request #852 from WeBankPartners/821_enhance_table_comp

#821 enhance table comp
WeBankPartners · Apr 20, 2020 · 8f4846d · 8f4846d
2 parents b819e2c + 62b4033
commit 8f4846d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmdb-ui/src/main-plugin.js b/cmdb-ui/src/main-plugin.js
@@ -5,6 +5,7 @@ import enUS from './locale/i18n/en-US.json'
 import WeCMDBSelect from '../src/pages/components/select.vue'
 import WeCMDBRefSelect from './pages/components/ref-select.js'
 import WeCMDBTable from './pages/components/table.js'
+import CMDBTable from '../src/pages/components/cmdb-table/index.js'
 import WeCMDBSimpleTable from '../src/pages/components/simple-table.vue'
 import WeCMDBAttrInput from '../src/pages/components/attr-input'
 import WeCMDBSequenceDiagram from '../src/pages/components/sequence-diagram.vue'
@@ -14,6 +15,7 @@ import WeCMDBCIPassword from '../src/pages/components/ci-password.vue'
 window.component('WeCMDBSelect', WeCMDBSelect)
 window.component('WeCMDBRefSelect', WeCMDBRefSelect)
 window.component('WeCMDBTable', WeCMDBTable)
+window.component('CMDBTable', CMDBTable)
 window.component('WeCMDBSimpleTable', WeCMDBSimpleTable)
 window.component('WeCMDBAttrInput', WeCMDBAttrInput)
 window.component('WeCMDBSequenceDiagram', WeCMDBSequenceDiagram)

diff --git a/cmdb-ui/src/pages/designing/ci-data.vue b/cmdb-ui/src/pages/designing/ci-data.vue
@@ -473,8 +473,8 @@ export default {
         }
         this.tabList.push(ci)
         this.currentTab = g.id
-        this.queryCiAttrs(g.id)
         this.$nextTick(() => {
+          this.queryCiAttrs(g.id)
           this.queryCiData(query)
         })
       } else {