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

release: 2.6.26 发布

VERSION

@@ -1 +1 @@
-2.6.22
+2.6.26

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.22
+version: 2.6.26
 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.22"
+app_version: "2.6.26"
 app:
     region: default
     bk_app_code: bk_itsm

docs/RELEASE.md

@@ -1,34 +1,64 @@
 # Changelog
+## [Version: 2.6.26] - 2024-07-22
+【修复】修复接口数值为 0 导致流程异常的问题  
+【修复】修复apigw初始化异常的问题  
+
+## [Version: 2.6.25] - 2024-07-19
+【修复】修复消息通知在部分环境接口请求地址不正确的问题  
+【修复】修复 API 节点手动重试取值异常的问题
+
+## [Version: 2.6.24] - 2024-07-18
+【优化】通知模板列表搜索优化  
+【修复】新建服务校验失败信息收敛  
+【修复】引用公共触发器弹窗增加非空校验  
+【修复】服务列表搜索去掉sla筛选项  
+【修复】编辑数据字典侧滑面板挂载到body  
+【修复】修复全局配置favicon不生效的问题  
+【修复】修复获取 role 信息时， desc 为空导致的异常问题  
+
+## [Version: 2.6.23] - 2024-07-03
+【优化】服务表单左侧字段控件搜索支持清空操作  
+【优化】任务模板触发器去掉引用公共触发器方式  
+【优化】关单操作移除提单人、节点处理人权限  
+【修复】修复消息通知中心前端不显示的问题  
+【修复】修复服务列表左侧菜单栏展开/收起icon显示不正确问题  
+【修复】数据字典编辑后未保存点击阴影增加二次弹窗确认  
+【修复】服务表格行高不生效问题修复  
+【修复】首页常用服务和全部服务卡片收藏状态切换后不同步问题修复  
+【修复】修复api编辑后回到列表页数据未更新的问题  
+【修复】修复服务导入后左侧目录树未更新的问题  
+
+
 ## [Version: 2.6.22] - 2024-06-24
 【优化】项目全局配置可修改
 
 ## [Version: 2.6.21] - 2024-06-12
-【修复】默认项目无法编辑修复
-【修复】连续点击创建服务按钮会创建多个相同服务问题修复
-【修复】服务列表页按照类型搜索参数key不正确问题修复
-【修复】关单、挂起单据操作弹窗原因表单增加最大字符长度为1000限制
+【修复】默认项目无法编辑修复  
+【修复】连续点击创建服务按钮会创建多个相同服务问题修复  
+【修复】服务列表页按照类型搜索参数key不正确问题修复  
+【修复】关单、挂起单据操作弹窗原因表单增加最大字符长度为1000限制  
 
 ## [Version: 2.6.20] - 2024-06-06
-【修复】运营分析页面时间控件位置计算不准确修复
-【修复】单据评论编辑弹窗去掉评论类型切换icon
-【修复】移除工单接口人员信息
-【优化】流水日志超长字符样式优化
-【优化】人员选择器placehoder文案优化
-【优化】单据表格字段增加最大高度
+【修复】运营分析页面时间控件位置计算不准确修复  
+【修复】单据评论编辑弹窗去掉评论类型切换icon  
+【修复】移除工单接口人员信息  
+【优化】流水日志超长字符样式优化  
+【优化】人员选择器placehoder文案优化  
+【优化】单据表格字段增加最大高度  
 
 ## [Version: 2.6.19] - 2024-05-29
-【修复】修复退出登录不生效的问题
-【优化】支持iframe加载模式方案
+【修复】修复退出登录不生效的问题  
+【优化】支持iframe加载模式方案  
 
 ## [Version: 2.6.18] - 2024-05-15
-【修复】修复联合校验未处理节点字段的问题
-【修复】修复登录后未跳转的问题
-【修复】修复打印页部分变量不存在导致接口异常的问
-【优化】新增工单关闭原因长度限制
-【优化】工单数据表索引优化
+【修复】修复联合校验未处理节点字段的问题  
+【修复】修复登录后未跳转的问题  
+【修复】修复打印页部分变量不存在导致接口异常的问  
+【优化】新增工单关闭原因长度限制  
+【优化】工单数据表索引优化  
 
 ## [Version: 2.6.17] - 2024-05-11
-【修复】修复工单富文本 xss 问题
+【修复】修复工单富文本 xss 问题  
 【优化】统一登录窗口交互
 
 ## [Version: 2.6.16] - 2024-05-08
@@ -41,15 +71,15 @@
 【优化】升级部分pip依赖版本以提升安全性
 
 ## [Version: 2.6.13] - 2024-04-17
-【修复】修复单据详情页单据信息字段显示不全的问题
+【修复】修复单据详情页单据信息字段显示不全的问题  
 【修复】修复创建服务时未校验所属目录字段的问题
 
 ## [Version: 2.6.12] - 2024-04-08
-【修复】修复并行网关下，SOPS 任务失败时，处理人无权限的问题
+【修复】修复并行网关下，SOPS 任务失败时，处理人无权限的问题  
 
 ## [Version: 2.6.11] - 2024-02-29
 【优化】修复附件存储为制品库时上传异常的问题  
-【修复】修复容器化环境通知中心未注册的问题
+【修复】修复容器化环境通知中心未注册的问题  
 【修复】修复初始化导入权限中心的角色为空不正常的问题
 
 ## [Version: 2.6.10] - 2024-02-04

docs/RELEASE_EN.md

@@ -1,34 +1,64 @@
 # Changelog
+## [Version: 2.6.26] - 2024-07-22
+【Fixed】Fix the issue where an interface value of 0 causes process abnormalities.  
+【Fixed】Fix the initialization exception of apigw.  
+
+## [Version: 2.6.25] - 2024-07-19
+【Fixed】Fixed the issue where the API request URL for message notifications was incorrect in certain environments.
+
+## [Version: 2.6.24] - 2024-07-18
+【Improved】Optimized the search functionality for the notification template list.  
+【Fixed】Consolidated validation failure messages when creating a new service.  
+【Fixed】Added non-empty validation to the pop-up for referencing common triggers.  
+【Fixed】Removed the SLA filter option from the service list search.  
+【Fixed】Mounted the data dictionary edit side panel to the body.  
+【Fixed】Fixed the issue where the global configuration favicon was not being applied.  
+【Fixed】Resolved the issue causing an exception when desc is empty while fetching role information.  
+【Fixed】Fix the issue with the abnormal value retrieval during manual retry of the API node.  
+
+
+## [Version: 2.6.23] - 2024-07-03
+【Improved】Enabled support for clearing the search operation on the left-side field controls of the service form.  
+【Improved】Removed the method of referencing common triggers from the task template triggers.  
+【Improved】Remove the permissions of the submitter and node handler in the close order operation.  
+【Fixed】Fixed the issue where the Message Notification Center was not displayed on the frontend.  
+【Fixed】Fixed the issue where the expand/collapse icon on the left-side menu of the service list was displayed incorrectly.  
+【Fixed】Added a secondary confirmation pop-up when clicking on the shadow area after editing the data dictionary without saving.  
+【Fixed】Fixed the issue where the row height in the service table was not being applied.  
+【Fixed】Fixed the issue where the favorite status of the frequently used services and all services cards on the homepage did not synchronize after toggling.  
+【Fixed】Fixed the issue where data in the list page was not updated after editing the API.  
+【Fixed】Fixed the issue where the left-side directory tree was not updated after service import.  
+
 ## [Version: 2.6.22] - 2024-06-24
 【Improved】Global project settings are editable.
 
 ## [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.
+【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.
-【Improved】Optimized the style for long characters in the transaction log.
-【Improved】Optimized the placeholder text for the personnel selector.
-【Improved】Added maximum height to the ticket detail table fields.
+【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.  
+【Improved】Optimized the style for long characters in the transaction log.  
+【Improved】Optimized the placeholder text for the personnel selector.  
+【Improved】Added maximum height to the ticket detail table fields.  
 
 ## [Version: 2.6.19] - 2024-05-29
-【Fixed】Fixed the issue where logout was not effective
+【Fixed】Fixed the issue where logout was not effective  
 【Improved】Support for iframe loading mode implemented
 
 ## [Version: 2.6.18] - 2024-05-15
-[Fixed] Resolved the issue with unprocessed node fields during joint validation
-[Fixed] Fixed the issue where there was no redirection after login
-[Fixed] Fixed the interface anomaly caused by non-existent variables on the print page
-[Improved] Added length restriction for work order closure reasons
-[Improved] Optimized indexes in the ticket table
+[Fixed] Resolved the issue with unprocessed node fields during joint validation  
+[Fixed] Fixed the issue where there was no redirection after login  
+[Fixed] Fixed the interface anomaly caused by non-existent variables on the print page  
+[Improved] Added length restriction for work order closure reasons  
+[Improved] Optimized indexes in the ticket table  
 
 ## [Version: 2.6.17] - 2024-05-11
-[Fixed] Resolved XSS vulnerability in work order rich text
+[Fixed] Resolved XSS vulnerability in work order rich text  
 [Improved] Unified login window interactions
 
 ## [Version: 2.6.16] - 2024-05-08
@@ -41,19 +71,19 @@
 [Improved] Upgraded select pip dependencies for improved security
 
 ## [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 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.
 
 ## [Version: 2.6.11] - 2024-02-29
- [Improved] Fix the problem of uploading abnormality when the attachment is stored as a product library  
+ [Improved] Fix the problem of uploading abnormality when the attachment is stored as a product library    
  [Fixed] Repair the problem of unregistered the notification center of the containerization environment  
  [Fixed] Repair the role of the initialization of the introduction authority center is an issue of abnormal emptiness  
 
 ## [Version: 2.6.10] - 2024-02-04
- [Improved] Allow to configure the timeout of permission center sdk & skip auto-authorization for resources created by admin.    
+ [Improved] Allow to configure the timeout of permission center sdk & skip auto-authorization for resources created by admin.   
  [Fixed] Fix the problem that the import process is abnormal when it is a user group.  
  [Improved] Front-end access to message notification center
 

frontend/pc/.eslintrc.js

@@ -56,8 +56,7 @@ module.exports = {
     LEGACY_APP_MIGRATION_ENABLED: true,
     AJAX_URL_PIRFIX: true,
     GRAFANA_IFRAME_URL: true,
-    gettext: true,
-    Aegis: true
+    gettext: true
   },
   // add your custom rules here
   rules: {

frontend/pc/index-dev.html

@@ -25,7 +25,6 @@
         window.is_vip = true;
         window.use_log = true;
         window.log_name = '流程服务';
-        window.TAM_PROJECT_ID = ""
         window.DEFAULT_PROJECT = '0'
     </script>
     <script>

frontend/pc/index.html

@@ -3,7 +3,6 @@
     <head>
         <meta charset="UTF-8">
         <title>{{CUSTOM_TITLE}}</title>
-        <link rel="icon" href="{{BK_STATIC_URL}}/favicon.ico" type="image/x-icon">
         <link rel="shortcut icon" href="{{BK_STATIC_URL}}/favicon.ico" type="image/x-icon">
         <link rel="stylesheet" type="text/css" href="{{BK_STATIC_URL}}/js/renderform/index.css">
         <script type="text/javascript" src="{{BK_STATIC_URL}}/js/renderform/index.js"></script>
@@ -32,7 +31,6 @@
             window.log_name = '{{LOG_NAME}}';
             window.use_log = {{USE_LOG}};
             window.iam_code = "{{ BK_IAM_APP_CODE }}";
-            window.TAM_PROJECT_ID = "{{TAM_PROJECT_ID}}";
             window.DEFAULT_PROJECT = "{{DEFAULT_PROJECT}}";
             window.BK_PAAS_ESB_HOST = "{{BK_PAAS_ESB_HOST}}";
             window.NOTICE_CENTER_SWITCH = "{{NOTICE_CENTER_SWITCH}}";
@@ -65,9 +63,6 @@
                 }
             }
         </script>
-        {% if TAM_PROJECT_ID != '' %}
-            <script src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js?_bid=3977"></script>
-        {% endif %}
     </head>
     <body>
         <div id="app"></div>

frontend/pc/src/App.vue

@@ -22,7 +22,7 @@
 
 <template>
   <div id="app" class="bk-app" @click="hiddenTree" v-bkloading="{ isLoading: loading }">
-    <notice-component v-if="showNotice && !isSubNav && !$route.meta.iframe" :api-url="apiUrl" @show-alert-change="handleNoticeChange" />
+    <notice-component v-if="enableNoticeCenter && !isSubNav && !$route.meta.iframe" :api-url="apiUrl" @show-alert-change="handleNoticeChange" />
     <template v-if="isShowView">
       <!-- has navigation-->
       <navigation v-if="!isSubNav && !$route.meta.iframe" :class="{ 'show-notice': showNotice }">
@@ -96,7 +96,7 @@
         isRouterAlive: true,
         permissinApplyShow: false,
         routerKey: +new Date(),
-        apiUrl: `//${window.location.host}/notice/announcements/`,
+        apiUrl: `//${window.location.host}${window.SITE_URL}notice/announcements/`,
         permissionData: {
           type: 'project', // 无权限类型: project、other
           permission: [],

frontend/pc/src/i18n/lang/en.js

@@ -253,6 +253,7 @@ export const m = {
     '暂无服务，': 'No service available, ',
   },
   deployPage: {
+    标题: 'Title',
     编辑字段: 'Edit Field',
     字段名称: 'Filed Name',
     字段类型: 'Field Type',
@@ -2478,7 +2479,7 @@ export const m = {
   通知模板: 'Notice template',
   删除成功: 'Deleted',
   暂未开放: 'Not Available',
-  请输入模板内容: 'Enter the template content',
+  请输入标题内容: 'Enter the title content',
   '确认要删除？': 'Are you sure you want to delete?',
   导入: 'Import',
   导出: 'Export',

frontend/pc/src/i18n/lang/zh.js

@@ -251,6 +251,7 @@ export const m = {
     '暂无服务，': '暂无服务，',
   },
   deployPage: {
+    标题: '标题',
     编辑字段: '编辑字段',
     字段名称: '字段名称',
     字段类型: '字段类型',
@@ -2545,7 +2546,7 @@ export const m = {
   通知模板: '通知模板',
   删除成功: '删除成功',
   暂未开放: '暂未开放',
-  请输入模板内容: '请输入模板内容',
+  请输入标题内容: '请输入标题内容',
   '确认要删除？': '确认要删除？',
   导入: '导入',
   导出: '导出',

frontend/pc/src/main.js

@@ -151,15 +151,6 @@ Vue.use(bkMagic, {
 
 locale.i18n((key, value) => i18n.t(key, value));
 
-if (window.TAM_PROJECT_ID) {
-  /* eslint-disable-next-line */
-  new Aegis({
-    id: window.TAM_PROJECT_ID,
-    uin: window.USERNAME,
-    reportApiSpeed: true,
-    reportAssetSpeed: true,
-  });
-}
 store.dispatch('getPlatformPreData').then(()=> {
   const app = new Vue({
     el: "#app",

frontend/pc/src/views/home/serviceList.vue

@@ -41,7 +41,7 @@
                 placement: 'top',
                 delay: [300, 0]
               }"
-              @click.stop="onCollectClick(service)">
+              @click.stop="onCollectClick(service, 'latest')">
             </i>
           </li>
         </ul>
@@ -87,7 +87,7 @@
                   placement: 'top',
                   delay: [300, 0]
                 }"
-                @click.stop="onCollectClick(service)">
+                @click.stop="onCollectClick(service, 'all')">
               </i>
               <div class="name" v-html="service.highlightName"></div>
               <div class="category">{{ service.serviceTypeName }}</div>
@@ -260,16 +260,19 @@
           this.isSearchResultShow = false;
         }
       },
-      onCollectClick(service) {
+      onCollectClick(service, type) {
         const curStatus = service.favorite;
         this.$store.dispatch('service/toggleServiceFavorite', {
           id: service.id,
           favorite: !curStatus,
         }).then((res) => {
           if (res.result) {
-            const serviceItem = this.allList.find(item => item.id === service.id);
             service.favorite = !curStatus; // 修改当前数据的收藏状态
-            this.$set(serviceItem, 'favorite', !curStatus); // 修改当前数据对应的源数据收藏状态
+            const list = type === 'latest' ? this.allList : this.latestList;
+            const serviceItem = list.find(item => item.id === service.id);
+            if (serviceItem) {
+              this.$set(serviceItem, 'favorite', !curStatus); // 修改当前数据对应的源数据收藏状态
+            }
           }
         })
           .catch((res) => {

frontend/pc/src/views/processManagement/apiConfigure/apiContent.vue

@@ -23,7 +23,7 @@
 <template>
   <div class="bk-api-content">
     <div class="is-title-back">
-      <p class="bk-come-back" @click="backTab">
+      <p class="bk-come-back" @click="$emit('back')">
         <arrows-left-icon></arrows-left-icon>
         <template>{{ backName }}</template>
       </p>
@@ -131,9 +131,6 @@
       this.initData();
     },
     methods: {
-      backTab() {
-        this.$parent.displayInfo.level_1 = {};
-      },
       changTitle(item, index) {
         this.checkIndex = index;
       },