Merge pull request #1298 from TencentBlueKing/v2.6.x_develop

V2.6.x develop

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

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

docs/RELEASE.md

@@ -1,4 +1,8 @@
 # Changelog
+## [Version: 2.6.13] - 2024-04-17
+【修复】修复单据详情页单据信息字段显示不全的问题
+【修复】修复创建服务时未校验所属目录字段的问题
+
 ## [Version: 2.6.12] - 2024-04-08
 【修复】修复并行网关下，SOPS 任务失败时，处理人无权限的问题
 

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.
 

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;
               }
             }
           }

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';

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);
           });

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);
           });