From 92c28f697198b073e9028f230676a477c7d7730c Mon Sep 17 00:00:00 2001 From: Luo Fan <44999219+luofann@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20(#1347)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge pull request #1337 from benero/bugfix_user_profile minor: 移除用户敏感信息 , # Reviewed, transaction id: 9596 * fix: 默认项目无法编辑修复 --bug=125474537 # Reviewed, transaction id: 9612 * fix: 连续点击创建服务按钮会创建多个相同服务问题修复 --bug=125474587 # Reviewed, transaction id: 9663 * fix: 服务列表页按照类型搜索参数key不正确问题修复 --bug=125474563 # Reviewed, transaction id: 9666 * fix: 关单、挂起单据操作弹窗原因表单增加最大字符长度为1000限制 # Reviewed, transaction id: 9668 * refactor: 更新版本发布信息 # Reviewed, transaction id: 9671 --- app.yml | 2 +- app_desc.yaml | 2 +- docs/RELEASE.md | 8 ++++++- docs/RELEASE_EN.md | 8 ++++++- .../src/views/project/editProjectDialog.vue | 4 ++-- .../service/editService/ServiceFormStep.vue | 24 ++++++++++++------- frontend/pc/src/views/service/serviceList.vue | 2 +- .../views/ticket/details/StepSubmitDialog.vue | 2 ++ 8 files changed, 36 insertions(+), 16 deletions(-) diff --git a/app.yml b/app.yml index f9ecd5b0d..6d8342c9e 100644 --- a/app.yml +++ b/app.yml @@ -5,7 +5,7 @@ author: 蓝鲸智云 category: 办公应用 introduction: 流程服务是蓝鲸推出的轻量级ITSM，通过可自定义设计的流程模块，覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程，提升沟通及管理效率。 introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency. -version: 2.6.20 +version: 2.6.21 language: python is_use_celery: True is_use_celery_with_gevent: False diff --git a/app_desc.yaml b/app_desc.yaml index 0a9fd8a35..80700c0ec 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "2.6.20" +app_version: "2.6.21" app: region: default bk_app_code: bk_itsm diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 48dc57389..59bd5b27b 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -1,5 +1,11 @@ # Changelog -## [Version: 2.6.20] - 2024-06-6 +## [Version: 2.6.21] - 2024-06-12 +【修复】默认项目无法编辑修复 +【修复】连续点击创建服务按钮会创建多个相同服务问题修复 +【修复】服务列表页按照类型搜索参数key不正确问题修复 +【修复】关单、挂起单据操作弹窗原因表单增加最大字符长度为1000限制 + +## [Version: 2.6.20] - 2024-06-06 【修复】运营分析页面时间控件位置计算不准确修复 【修复】单据评论编辑弹窗去掉评论类型切换icon 【修复】移除工单接口人员信息 diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md index 177ffdd72..4843b0fb7 100644 --- a/docs/RELEASE_EN.md +++ b/docs/RELEASE_EN.md @@ -1,5 +1,11 @@ # Changelog -## [Version: 2.6.20] - 2024-06-6 +## [Version: 2.6.21] - 2024-06-12 +【Fixed】Fixed the issue where the default project could not be edited. +【Fixed】Fixed the issue where multiple identical services could be created by repeatedly clicking the Create Service button. +【Fixed】Fixed the issue where the search parameter key was incorrect when filtering the service list by type. +【Fixed】Added a maximum character limit of 1000 to the reason form in the close and suspend document operation pop-ups. + +## [Version: 2.6.20] - 2024-06-06 【Fixed】Fixed the issue where the time control position on the Operations Analysis page was calculated inaccurately. 【Fixed】Removed the comment type switch icon from the document comment edit popup. 【Fix】Remove personnel information from the work order interface. diff --git a/frontend/pc/src/views/project/editProjectDialog.vue b/frontend/pc/src/views/project/editProjectDialog.vue index a31d37d89..9d5a590f4 100644 --- a/frontend/pc/src/views/project/editProjectDialog.vue +++ b/frontend/pc/src/views/project/editProjectDialog.vue @@ -120,8 +120,8 @@ trigger: 'blur', }, { - regex: /^[a-z][a-z0-9-_]+$/, - message: '由小写字母，数字，下划线，横线组成，必须以英文字母开头', + regex: /^[a-z0-9-_]+$/, + message: '由小写字母，数字，下划线，横线组成', trigger: 'blur', }, { diff --git a/frontend/pc/src/views/service/editService/ServiceFormStep.vue b/frontend/pc/src/views/service/editService/ServiceFormStep.vue index 655678b21..e84b98968 100644 --- a/frontend/pc/src/views/service/editService/ServiceFormStep.vue +++ b/frontend/pc/src/views/service/editService/ServiceFormStep.vue @@ -119,6 +119,7 @@ :mask-close="false" :title="$t(`m['创建服务']`)" :auto-close="false" + :loading="isSubmitting" @confirm="onBasicFormSubmit" @cancel="onBasicFormCancel"> { + async onBasicFormSubmit() { + try { + if (this.isSubmitting) { + return; + } + this.isSubmitting = true; + console.log(this.isSubmitting); + await this.$refs.basicForm.validate(); const params = JSON.parse(JSON.stringify(this.formData)); params.id = this.serviceId || undefined; params.project_key = this.$store.state.project.id; - this.isSubmitting = true; if (this.type === 'edit') { await this.updateServiceInfo(params); } else { await this.createService(params); } + } catch (e) { + console.error(e); + } finally { this.isSubmitting = false; - }); + } }, onBasicFormCancel() { if (this.type === 'new') { @@ -518,7 +524,7 @@ }, // 创建服务 createService(params) { - this.$store.dispatch('serviceEntry/createService', params).then(res => { + return this.$store.dispatch('serviceEntry/createService', params).then(res => { this.$bkMessage({ message: this.$t('m.deployPage["保存成功"]'), theme: 'success', @@ -542,7 +548,7 @@ }, // 修改服务 updateServiceInfo(params) { - this.$store.dispatch('serviceEntry/updateService', params).then(res => { + return this.$store.dispatch('serviceEntry/updateService', params).then(res => { this.$bkMessage({ message: this.$t('m.serviceConfig["修改成功"]'), theme: 'success', diff --git a/frontend/pc/src/views/service/serviceList.vue b/frontend/pc/src/views/service/serviceList.vue index 311a836a0..b56d02b2c 100644 --- a/frontend/pc/src/views/service/serviceList.vue +++ b/frontend/pc/src/views/service/serviceList.vue @@ -521,7 +521,7 @@ { name: this.$t('m.serviceConfig["类型"]'), type: 'select', - typeKey: 'key', + typeKey: 'service_key', value: '', list: [], }, diff --git a/frontend/pc/src/views/ticket/details/StepSubmitDialog.vue b/frontend/pc/src/views/ticket/details/StepSubmitDialog.vue index cb9962b96..8aa725493 100644 --- a/frontend/pc/src/views/ticket/details/StepSubmitDialog.vue +++ b/frontend/pc/src/views/ticket/details/StepSubmitDialog.vue @@ -56,6 +56,7 @@ :placeholder="$t(`m.newCommon['请输入挂起原因']`)" :type="'textarea'" :rows="3" + :maxlength="1000" v-model="formInfo.suspend_message" > @@ -91,6 +92,7 @@ :placeholder="$t(`m.newCommon['请输入关闭原因']`)" :type="'textarea'" :rows="3" + :maxlength="1000" v-model="formInfo.close_message" >