Skip to content

Commit

Permalink
Dev UI 231030 (#247)
Browse files Browse the repository at this point in the history
* config(ui):useEncryption default false

* fix(cmdb-ui):ident 4

* fix(cmdb-ui):relation views
  • Loading branch information
wang-liang0615 authored Oct 30, 2023
1 parent cae65d7 commit e9ae9a0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmdb-ui/src/config/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const appConfig = {
buildAclToModules: true, // 是否在各个应用下 内联权限管理
ssoLogoutURL: '/api/sso/logout',
showDocs: false,
useEncryption: true,
useEncryption: false,
}

export default appConfig
4 changes: 2 additions & 2 deletions cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default {
return {
activeKey: 'expr', // expr script
compute_expr: '',
compute_script: 'def computed(): \n return',
compute_script: 'def computed(): \n return',
cmOptions: {
lineNumbers: true,
mode: 'python',
Expand All @@ -66,7 +66,7 @@ export default {
setData(data) {
const { compute_expr, compute_script } = data
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) {
this.activeKey = 'script'
} else {
Expand Down
6 changes: 3 additions & 3 deletions cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ export default {
handleEditActived() {
const passwordCol = this.columns.filter((col) => col.is_password)
this.$nextTick(() => {
const editRecord = this.$refs.xTable.getVxetableRef().getEditRecord()
const editRecord = this.$refs.xTable.getEditRecord()
const { row, column } = editRecord
if (passwordCol.length && this.lastEditCiId !== row._id) {
this.$nextTick(async () => {
Expand All @@ -1113,10 +1113,10 @@ export default {
})
}
this.isContinueCloseEdit = false
await this.$refs.xTable.getVxetableRef().clearEdit()
await this.$refs.xTable.clearEdit()
this.isContinueCloseEdit = true
this.$nextTick(() => {
this.$refs.xTable.getVxetableRef().setEditCell(row, column.field)
this.$refs.xTable.setEditCell(row, column.field)
})
})
}
Expand Down

0 comments on commit e9ae9a0

Please sign in to comment.