From b141493dd39d60cf3a5af351ed091599110b5831 Mon Sep 17 00:00:00 2001 From: luofann Date: Fri, 12 Apr 2024 17:16:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=90=E5=8D=95?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=AD=97=E6=AE=B5=E8=81=94=E5=8A=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pc/src/views/commonMix/field.js | 1 - frontend/pc/src/views/ticket/details/index.vue | 1 - frontend/pc/src/views/ticket/detailsIframe/index.vue | 1 - 3 files changed, 3 deletions(-) diff --git a/frontend/pc/src/views/commonMix/field.js b/frontend/pc/src/views/commonMix/field.js index 2b9453956..14e92bf55 100644 --- a/frontend/pc/src/views/commonMix/field.js +++ b/frontend/pc/src/views/commonMix/field.js @@ -152,7 +152,6 @@ export default { list[i].showFeild = statusList.some(status => !!status); } } - list[i].showFeild = !list[i].showFeild; } } } diff --git a/frontend/pc/src/views/ticket/details/index.vue b/frontend/pc/src/views/ticket/details/index.vue index 3dbed0654..cc6a3c310 100644 --- a/frontend/pc/src/views/ticket/details/index.vue +++ b/frontend/pc/src/views/ticket/details/index.vue @@ -589,7 +589,6 @@ if (this.openFunction.FIRST_STATE_SWITCH) { this.firstStateFields = copyList.find(item => item.state_id === Number(this.ticketInfo.first_state_id)).fields; this.firstStateFields.forEach(item => { - this.$set(item, 'showFeild', !!item.show_type); this.$set(item, 'val', (item.value || '')); this.conditionField(item, this.firstStateFields); }); diff --git a/frontend/pc/src/views/ticket/detailsIframe/index.vue b/frontend/pc/src/views/ticket/detailsIframe/index.vue index aee4d57a8..8172ff88e 100644 --- a/frontend/pc/src/views/ticket/detailsIframe/index.vue +++ b/frontend/pc/src/views/ticket/detailsIframe/index.vue @@ -226,7 +226,6 @@ if (this.openFunction.FIRST_STATE_SWITCH) { this.firstStateFields = copyList.find(item => item.state_id === Number(this.ticketInfo.first_state_id)).fields; this.firstStateFields.forEach(item => { - this.$set(item, 'showFeild', !!item.show_type); this.$set(item, 'val', (item.value || '')); this.conditionField(item, this.firstStateFields); }); From 2d4feeff294835406608ee2de9556896dcd3d08e Mon Sep 17 00:00:00 2001 From: luofann Date: Tue, 16 Apr 2024 20:29:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=B6=E6=9C=AA=E6=A0=A1=E9=AA=8C=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E7=9B=AE=E5=BD=95=E5=AD=97=E6=AE=B5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#=20Reviewed,=20transaction=20id:=206078?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/pc/src/views/service/editService/ServiceFormStep.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/pc/src/views/service/editService/ServiceFormStep.vue b/frontend/pc/src/views/service/editService/ServiceFormStep.vue index f4152a462..655678b21 100644 --- a/frontend/pc/src/views/service/editService/ServiceFormStep.vue +++ b/frontend/pc/src/views/service/editService/ServiceFormStep.vue @@ -322,7 +322,7 @@ }, ]; this.rules.name = nameRules; - this.rules.directory_id = this.checkCommonRules('required').required; + this.rules.catalog_id = this.checkCommonRules('required').required; this.rules.key = this.checkCommonRules('required').required; this.showFieldOption = this.type === 'edit' && !!this.serviceInfo.source; this.isBasicFormEditting = this.type === 'new'; From 72ef8f1bf8855615abaad405904b0bad326ad267 Mon Sep 17 00:00:00 2001 From: luofann Date: Wed, 17 Apr 2024 14:58:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?minor:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B02.6.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.yml | 2 +- app_desc.yaml | 2 +- docs/RELEASE.md | 4 ++++ docs/RELEASE_EN.md | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app.yml b/app.yml index 7e7974e7a..b404da8cd 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.12 +version: 2.6.13 language: python is_use_celery: True is_use_celery_with_gevent: False diff --git a/app_desc.yaml b/app_desc.yaml index dad406589..0c66b0a49 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "2.6.12" +app_version: "2.6.13" app: region: default bk_app_code: bk_itsm diff --git a/docs/RELEASE.md b/docs/RELEASE.md index d41bfe35b..7f9b92099 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -1,4 +1,8 @@ # Changelog +## [Version: 2.6.13] - 2024-04-17 +【修复】修复单据详情页单据信息字段显示不全的问题 +【修复】修复创建服务时未校验所属目录字段的问题 + ## [Version: 2.6.12] - 2024-04-08 【修复】修复并行网关下，SOPS 任务失败时，处理人无权限的问题 diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md index e129d4948..1c6863d46 100644 --- a/docs/RELEASE_EN.md +++ b/docs/RELEASE_EN.md @@ -1,4 +1,8 @@ # Changelog +## [Version: 2.6.13] - 2024-04-17 +[Fixed] Fixed the issue where the document information fields on the detail page of the repair order were not fully displayed. +[Fixed] Fixed the issue where the directory field was not validated when creating a service. + ## [Version: 2.6.12] - 2024-04-08 【Fixed】Fixed the issue of insufficient permissions for the assignee when SOPS tasks fail in parallel gateways.