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

Dev UI 231030 (#247) 

* config(ui):useEncryption default false

* fix(cmdb-ui):ident 4

* fix(cmdb-ui):relation views
This commit is contained in:
wang-liang0615 2023-10-30 12:38:05 +08:00 committed by GitHub
parent 2db41dd992
commit c9f0de9838
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/src/config/app.js
View File

@ -4,7 +4,7 @@ const appConfig = {
buildAclToModules: true, // 是否在各个应用下 内联权限管理 buildAclToModules: true, // 是否在各个应用下 内联权限管理
ssoLogoutURL: '/api/sso/logout', ssoLogoutURL: '/api/sso/logout',
showDocs: false, showDocs: false,
useEncryption: true, useEncryption: false,
} }
export default appConfig export default appConfig

4
cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue
View File

@ -42,7 +42,7 @@ export default {
return { return {
activeKey: 'expr', // expr script activeKey: 'expr', // expr script
compute_expr: '', compute_expr: '',
compute_script: 'def computed(): \n return', compute_script: 'def computed(): \n return',
cmOptions: { cmOptions: {
lineNumbers: true, lineNumbers: true,
mode: 'python', mode: 'python',
@ -66,7 +66,7 @@ export default {
setData(data) { setData(data) {
const { compute_expr, compute_script } = data const { compute_expr, compute_script } = data
this.compute_expr = compute_expr this.compute_expr = compute_expr
this.compute_script = compute_script || 'def computed(): \n return' this.compute_script = compute_script || 'def computed(): \n return'
if (compute_script) { if (compute_script) {
this.activeKey = 'script' this.activeKey = 'script'
} else { } else {

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

@ -1102,7 +1102,7 @@ export default {
handleEditActived() { handleEditActived() {
const passwordCol = this.columns.filter((col) => col.is_password) const passwordCol = this.columns.filter((col) => col.is_password)
this.$nextTick(() => { this.$nextTick(() => {
const editRecord = this.$refs.xTable.getVxetableRef().getEditRecord() const editRecord = this.$refs.xTable.getEditRecord()
const { row, column } = editRecord const { row, column } = editRecord
if (passwordCol.length && this.lastEditCiId !== row._id) { if (passwordCol.length && this.lastEditCiId !== row._id) {
this.$nextTick(async () => { this.$nextTick(async () => {
@ -1113,10 +1113,10 @@ export default {
}) })
} }
this.isContinueCloseEdit = false this.isContinueCloseEdit = false
await this.$refs.xTable.getVxetableRef().clearEdit() await this.$refs.xTable.clearEdit()
this.isContinueCloseEdit = true this.isContinueCloseEdit = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.xTable.getVxetableRef().setEditCell(row, column.field) this.$refs.xTable.setEditCell(row, column.field)
}) })
}) })
} }