Merge pull request #7097 from normal-wls/release_horse_alpha_2

release V3.31.0-alpha2
TencentBlueKing · Sep 21, 2023 · 6476007 · 6476007
2 parents 6a56d6b + 6ebb443
commit 6476007
Show file tree

Hide file tree

Showing 16 changed files with 155 additions and 18 deletions.
diff --git a/app.yml b/app.yml
@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.31.0-alpha
+version: 3.31.0-alpha2
 category: 运维工具
 language_support: 中文
 desktop:

diff --git a/app_desc.yaml b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.31.0-alpha"
+app_version: "3.31.0-alpha2"
 app:
     region: default
     bk_app_code: bk_sops

diff --git a/config/default.py b/config/default.py
@@ -211,7 +211,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.31.0-alpha"
+STATIC_VERSION = "3.31.0-alpha2"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]

diff --git a/frontend/desktop/src/components/common/RenderForm/FormGroup.vue b/frontend/desktop/src/components/common/RenderForm/FormGroup.vue
@@ -40,7 +40,7 @@
                 {{ scheme.attrs.used_tip }}
             </span> -->
         </div>
-        
+
         <!-- 参数被使用占位popover -->
         <bk-popover
             v-if="scheme.attrs.html_used_tip"
@@ -94,8 +94,8 @@
                 :option="groupOption"
                 :value="value[form.tag_code]"
                 :parent-value="value"
-                @blur="$emit('blur')"
                 @init="$emit('init', $event)"
+                @blur="$emit('blur', $event)"
                 @change="updateForm">
             </component>
         </div>

diff --git a/frontend/desktop/src/components/common/RenderForm/FormItem.vue b/frontend/desktop/src/components/common/RenderForm/FormItem.vue
@@ -123,6 +123,7 @@
                 :value="formValue"
                 :parent-value="parentValue"
                 @init="$emit('init', $event)"
+                @blur="$emit('blur', $event)"
                 @change="updateForm"
                 @onShow="onShowForm"
                 @onHide="onHideForm">

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagDatatable.vue
@@ -80,7 +80,8 @@
                                 :value="scope.row[item.tag_code]"
                                 :parent-value="scope.row"
                                 @init="onInitColumn(scope.$index, cIndex, ...arguments)"
-                                @change="onEditColumn(scope.$index, cIndex, ...arguments)">
+                                @change="onEditColumn(scope.$index, cIndex, ...arguments)"
+                                @blur="onColumnInputBlur(scope.$index, ...arguments)">
                             </component>
                         </template>
                     </el-table-column>
@@ -569,6 +570,9 @@
                 this.$set(this.tableValue[this.editRowNumber], field, val)
                 this.triggerSameRowEvent('change', row, col, val)
             },
+            onColumnInputBlur (scope, val) {
+                this.triggerSameRowEvent('blur', scope.$index, scope.column.index, val)
+            },
             onDelete (index, row) {
                 if (this.pagination) {
                     index = (this.currentPage - 1) * this.page_size + index

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInput.vue
@@ -20,8 +20,8 @@
                     :disabled="isDisabled"
                     :show-password="showPassword"
                     :placeholder="placeholder"
-                    @blur="$emit('blur')"
-                    @input="handleInputChange">
+                    @input="handleInputChange"
+                    @blur="handleBlur">
                 </el-input>
                 <div v-else class="rf-form-wrap" :class="{ 'input-focus': input.focus, 'input-disable': isDisabled }">
                     <div
@@ -466,6 +466,10 @@
                         }
                     }
                 }
+            },
+            handleBlur () {
+                this.emit_event(this.tagCode, 'blur', this.value)
+                this.$emit('blur', this.value)
             }
         }
     }

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagInt.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagInt.vue
@@ -18,7 +18,8 @@
                 :controls="false"
                 :disabled="!editable || disabled"
                 :placeholder="placeholder"
-                v-model="intValue">
+                v-model="intValue"
+                @blur="handleBlur">
             </el-input-number>
             <span v-show="!validateInfo.valid" class="common-error-tip error-info">{{validateInfo.message}}</span>
         </div>
@@ -74,6 +75,12 @@
                     this.updateForm(val)
                 }
             }
+        },
+        methods: {
+            handleBlur () {
+                this.emit_event(this.tagCode, 'blur', this.value)
+                this.$emit('blur', this.value)
+            }
         }
     }
 </script>

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTextarea.vue
@@ -25,7 +25,8 @@
                     @mouseup="handleInputMouseUp"
                     @focus="handleInputFocus"
                     @keydown="handleInputKeyDown"
-                    @input="handleInputChange">
+                    @input="handleInputChange"
+                    @blur="handleBlur">
                 </div>
             </div>
             <transition>
@@ -452,7 +453,11 @@
                 }
             },
             handleDocumentBackspace (event) {
-                
+
+            },
+            handleBlur () {
+                this.emit_event(this.tagCode, 'blur', this.value)
+                this.$emit('blur', this.value)
             }
         }
     }

diff --git a/frontend/desktop/src/components/common/RenderForm/tags/TagTree.vue b/frontend/desktop/src/components/common/RenderForm/tags/TagTree.vue
@@ -21,6 +21,7 @@
                 :default-expand-all="default_expand_all"
                 :default-checked-nodes="value"
                 :default-expanded-nodes="expanded_keys"
+                :check-strictly="check_strictly"
                 :height="570"
                 :data="items"
                 @check-change="nodeCheckChange">
@@ -69,6 +70,11 @@
             default: true,
             desc: 'whether to expand all nodes by default'
         },
+        check_strictly: {
+            type: Boolean,
+            required: false,
+            default: true
+        },
         remote: {
             type: Boolean,
             required: false,

diff --git a/frontend/desktop/src/store/modules/atomForm.js b/frontend/desktop/src/store/modules/atomForm.js
@@ -206,7 +206,7 @@ const atomForm = {
          * 加载第三方插件日志
          */
         loadPluginServiceLog ({ commit }, params) {
-            return axios.get('/plugin_service/logs/', { params }).then(response => response.data)
+            return axios.post('/plugin_service/logs/', params).then(response => response.data)
         },
         /**
          * 加载第三方插件元信息

diff --git a/locale/en/LC_MESSAGES/djangojs.mo b/locale/en/LC_MESSAGES/djangojs.mo
diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po
@@ -2919,7 +2919,13 @@ msgstr "Remove"
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js:230
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v4_0.js:254
 msgid "升级"
-msgstr "Upgrate"
+msgstr "Upgrade"
+
+msgid "配置重载"
+msgstr "Reload"
+
+msgid "重启"
+msgstr "Restart"
 
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/legacy.js:103
 #: pipeline_plugins/components/static/components/atoms/nodeman/create_task/v2_0.js:330

diff --git a/plugin_service/plugin_client.py b/plugin_service/plugin_client.py
@@ -18,11 +18,7 @@
 from django.core.files.uploadedfile import UploadedFile
 
 from . import env
-from .client_decorators import (
-    check_use_plugin_service,
-    data_parser,
-    json_response_decoder,
-)
+from .client_decorators import check_use_plugin_service, data_parser, json_response_decoder
 from .conf import PLUGIN_CLIENT_LOGGER
 from .exceptions import PluginServiceException, PluginServiceNotUse
 
@@ -234,6 +230,10 @@ def get_paas_logs(plugin_code, trace_id, scroll_id=None, environment=None):
         url, data = PluginServiceApiClient._prepare_paas_api_request(
             path_params=["system/bk_plugins", plugin_code, "logs"], environment=environment
         )
+
+        if env.PAASV3_APIGW_API_TOKEN:
+            url = "{}?private_token={}".format(url, env.PAASV3_APIGW_API_TOKEN)
+
         data.update({"trace_id": trace_id})
         if scroll_id:
             data.update({"scroll_id": scroll_id})
@@ -278,6 +278,7 @@ def _prepare_paas_api_request(path_params: list, environment=None, force_add_app
             environment or env.APIGW_ENVIRONMENT,
             *path_params,
         )
+
         params = (
             {"private_token": env.PAASV3_APIGW_API_TOKEN}
             if env.PAASV3_APIGW_API_TOKEN

diff --git a/version_logs_md/V3.31.0_2023-09-21.md b/version_logs_md/V3.31.0_2023-09-21.md
@@ -0,0 +1,52 @@
+# V3.31.0 版本更新说明
+
+### 新增
+
+- [ 新增 ] 编辑流程时，输入$可快速引用已创建的变量，并以标签形式展示，方便快速引用和识别。
+
+
+### 优化
+
+- [ 优化 ] 移除变量免渲染功能，同时限制全局变量的生效范围。不再支持脚本中引用全局变量，请使用脚本参数传入。
+
+- [ 优化 ] 调整节点的失败处理选项逻辑，自动跳过和手动跳过不再支持同时勾选。
+
+- [ 优化 ] 节点输入、输出变量型变量，当所有来源取消使用变量时，自动删除变量。
+
+- [ 优化 ] 优化了子流程节点详情，在一个界面中同时展示子流程节点的输入参数和内部详情。
+
+- [ 优化 ] 任务状态支持筛选失败、执行中、暂停等细分状态。
+
+- [ 优化 ] 任务记录默认只显示最近半年记录，节省存储空间（管理员可通过环境变量设置）。
+
+- [ 优化 ] 优化「节点管理(Nodeman)-新建任务」插件，安装、重装操作移除不必要的选项；增加配置重载、重启操作。
+
+- [ 优化 ] 优化文本输入的交互，增加长度限制和提示。
+
+### 修复
+
+- [修复] 修复修改周期任务配置时，修改时间未刷新问题。
+
+- [修复] 修复执行方案重命名报错问题。
+
+- [修复] 修复任务执行前，执行代理人错误问题。
+
+- [修复] 修复重新执行时，没有记住上次选择节点的问题。
+
+- [修复] 修复子流程暂停时，任务无法终止的问题。
+
+- [修复] 修复子流程节点输入型变量不显示参数名问题。
+
+- [修复] 修复“集群资源筛选”变量，集群个数输入非数字显示 NaN 问题。
+
+- [修复] 修复“集群模块 IP 选择器”变量使用不存在服务模版也可筛选出 IP 列表问题。
+
+- [修复] 修复“IP 选择器”变量已选的集群/模块在 CMDB 被移除时输出结果不正确问题。
+
+- [修复] 修复“配置平台(CMDB) - 批量更新集群属性”插件传参错误导致不可用问题。
+
+- [修复] 修复“监控平台(Monitor) - 蓝鲸监控告警屏蔽(按策略)”插件执行失败时异常不显示问题。
+
+- [修复] 修复调用 "create_task" 接口时权限不足时，接口返回错误信息不友好的问题。
+
+- [修复] 修复在切换动作需要进行二次确认时，如果用户取消切换，选项仍然被切换的问题。
diff --git a/version_logs_md_en/V3.31.0_2023-09-21.md b/version_logs_md_en/V3.31.0_2023-09-21.md
@@ -0,0 +1,51 @@
+# V3.31.0 Release Note
+
+### Feature
+
+- [Feature] When editing a flow, entering "$" can quickly reference a created variable, and display it as tags for easy reference and identification.
+
+### Improved
+
+- [Improved] Remove the feature "Variable Rendering-free"  and limit the scope of global variables. No longer support referencing global variables in scripts, please use script parameters to pass them in.
+
+- [Improved] Adjusted the logic of the Failure Processing options for nodes, Auto Skip and Manual Skip are no longer supported to be selected at the same time.
+
+- [Improved] For node input and output variables, when all sources cancel use the variable, the variable is automatically deleted.
+
+- [Improved] Optimized the sub-flow node details, allowing the input parameters and internal details of the sub-flow node to be displayed simultaneously in a single interface.
+
+- [Improved] Task status can be filter by Failed, Running, and Paused.
+
+- [Improved] Tasks only display history from the past half-year to save storage(admin can set it by change environment variables).
+
+- [Improved] Optimized the "NodeMan New Task" plugin, removing unnecessary options for install and reinstall operations; added configuration reload and restart operations.
+
+- [Improved] Optimized text input interaction, adding length limitations and prompts.
+
+### Fixed
+
+- [Fixed] Fixed the issue that the "Modified At" column do not refresh when modify cron tasks.
+
+- [Fixed] Fixed the issue when renaming a node-group resulted in an error.
+
+- [Fixed] Fixed the issue that the agent of task was incorrect.
+
+- [Fixed] Fixed the issue that the last selected node was not remembered when redo task.
+
+- [Fixed] Fixed the issue that tasks could not be terminated when sub-flow were paused.
+
+- [Fixed] Fixed the issue that the node input variables of sub-flow nodes do not display.
+
+- [Fixed] Fixed the issue that the "Set Resource Filter" variable displayed "NaN" when the number of clusters entered was not a number.
+
+- [Fixed] Fixed the issue that the "Set Module IP Selector" variable could display IP lists even if the service template did not exist.
+
+- [Fixed] Fixed the issue that the results of the "IP Selector" variable were not correct when the selected cluster/module was removed from CMDB.
+
+- [Fixed] Fixed the issue that the "CMDB UPdate Set Attribute" plugin was not available due to parameter passing errors.
+
+- [Fixed] Fixed the issue that the "BKMonitor BlueKing Monitor Alarm Shield (Based on Strategy)" plugin do not display exceptions when run failed.
+
+- [Fixed] Fixed the issue that the error message was not user-friendly when calling the "create_task" API with insufficient permissions.
+
+- [Fixed] Fixed the issue that the option was still switched even when the user cancelled the switch .