diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue index 8292cd8..afc0f2d 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue @@ -526,7 +526,7 @@ export default { const $table = this.$refs['xTable'].getVxetableRef() const data = {} this.columns.forEach((item) => { - if (!_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { + if (!(item.field in this.initialPasswordValue) && !_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { data[item.field] = row[item.field] ?? null } }) diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue index 99bbb4c..3173f3f 100644 --- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue @@ -1130,7 +1130,7 @@ export default { const $table = this.$refs['xTable'] const data = {} this.columns.forEach((item) => { - if (!_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { + if (!(item.field in this.initialPasswordValue) && !_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { data[item.field] = row[item.field] ?? null } }) diff --git a/cmdb-ui/src/modules/cmdb/views/tree_views/index.vue b/cmdb-ui/src/modules/cmdb/views/tree_views/index.vue index 3510561..e17ded7 100644 --- a/cmdb-ui/src/modules/cmdb/views/tree_views/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/tree_views/index.vue @@ -972,7 +972,7 @@ export default { const $table = this.$refs['xTable'].getVxetableRef() const data = {} this.columns.forEach((item) => { - if (!_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { + if (!(item.field in this.initialPasswordValue) && !_.isEqual(row[item.field], this.initialInstanceList[rowIndex][item.field])) { data[item.field] = row[item.field] ?? null } }) diff --git a/cmdb-ui/src/store/global/logo.js b/cmdb-ui/src/store/global/logo.js index e952533..412a82d 100644 --- a/cmdb-ui/src/store/global/logo.js +++ b/cmdb-ui/src/store/global/logo.js @@ -17,9 +17,11 @@ const logo = { getCompanyInfo({ commit }) { return new Promise((resolve, reject) => { getCompanyInfo().then(res => { - commit('SET_FILENAME', res.info.logoName) - commit('SET_SMALL_FILENAME', res.info.smallLogoName) - resolve(res.info) + if (res.info) { + commit('SET_FILENAME', res.info.logoName) + commit('SET_SMALL_FILENAME', res.info.smallLogoName) + resolve(res.info) + } }).catch(err => { console.log('获取失败', err) reject(err)