From c9f0de98382d6f1a0d2a70a02217a50a2788b943 Mon Sep 17 00:00:00 2001 From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com> Date: Mon, 30 Oct 2023 12:38:05 +0800 Subject: [PATCH] Dev UI 231030 (#247) * config(ui):useEncryption default false * fix(cmdb-ui):ident 4 * fix(cmdb-ui):relation views --- cmdb-ui/src/config/app.js | 2 +- cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue | 4 ++-- cmdb-ui/src/modules/cmdb/views/relation_views/index.vue | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmdb-ui/src/config/app.js b/cmdb-ui/src/config/app.js index 59161c7..a8f6223 100644 --- a/cmdb-ui/src/config/app.js +++ b/cmdb-ui/src/config/app.js @@ -4,7 +4,7 @@ const appConfig = { buildAclToModules: true, // 是否在各个应用下 内联权限管理 ssoLogoutURL: '/api/sso/logout', showDocs: false, - useEncryption: true, + useEncryption: false, } export default appConfig diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue index c48a14c..483a599 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/computedArea.vue @@ -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', @@ -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 { 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 8c918ec..4be72b0 100644 --- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue @@ -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 () => { @@ -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) }) }) }