7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(cmdb-ui): CI update password

This commit is contained in:
pycook 2023-10-28 23:07:01 +08:00
parent b090a88b76
commit 1aeb9a2702
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/src/modules/cmdb/views/ci/index.vue
View File

@ -526,7 +526,7 @@ export default {
const $table = this.$refs['xTable'].getVxetableRef() const $table = this.$refs['xTable'].getVxetableRef()
const data = {} const data = {}
this.columns.forEach((item) => { 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 data[item.field] = row[item.field] ?? null
} }
}) })

2
cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
View File

@ -1130,7 +1130,7 @@ export default {
const $table = this.$refs['xTable'] const $table = this.$refs['xTable']
const data = {} const data = {}
this.columns.forEach((item) => { 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 data[item.field] = row[item.field] ?? null
} }
}) })

2
cmdb-ui/src/modules/cmdb/views/tree_views/index.vue
View File

@ -972,7 +972,7 @@ export default {
const $table = this.$refs['xTable'].getVxetableRef() const $table = this.$refs['xTable'].getVxetableRef()
const data = {} const data = {}
this.columns.forEach((item) => { 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 data[item.field] = row[item.field] ?? null
} }
}) })

8
cmdb-ui/src/store/global/logo.js
View File

@ -17,9 +17,11 @@ const logo = {
getCompanyInfo({ commit }) { getCompanyInfo({ commit }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getCompanyInfo().then(res => { getCompanyInfo().then(res => {
commit('SET_FILENAME', res.info.logoName) if (res.info) {
commit('SET_SMALL_FILENAME', res.info.smallLogoName) commit('SET_FILENAME', res.info.logoName)
resolve(res.info) commit('SET_SMALL_FILENAME', res.info.smallLogoName)
resolve(res.info)
}
}).catch(err => { }).catch(err => {
console.log('获取失败', err) console.log('获取失败', err)
reject(err) reject(err)