From 9f025235a2d3f60101d07e9c3ba449cf7dae6f48 Mon Sep 17 00:00:00 2001 From: luofann Date: Tue, 7 May 2024 17:37:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E8=8A=82=E7=82=B9=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=A0=BC=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20--ignore=20#=20Reviewed,=20transaction=20id:=207207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/desktop/src/store/modules/task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/desktop/src/store/modules/task.js b/frontend/desktop/src/store/modules/task.js index a554bf350b..79c8051c96 100644 --- a/frontend/desktop/src/store/modules/task.js +++ b/frontend/desktop/src/store/modules/task.js @@ -461,7 +461,7 @@ const task = { const { project_id } = store.state.project const { node_id, task_id } = data const action = 'forced_fail' - return axios.post(`taskflow/api/v4/node_action/${project_id}/${task_id}/${node_id}/`, { action }, { + return axios.post(`taskflow/api/v4/node_action/${project_id}/${task_id}/${node_id}/`, JSON.stringify({ action }), { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }).then(response => response.data) }, From 311a5df8299f5e380f7db58ea17a90f7d7c779f4 Mon Sep 17 00:00:00 2001 From: waylon <1158341873@qq.com> Date: Tue, 7 May 2024 18:03:18 +0800 Subject: [PATCH 2/6] feat: release V3.32.3 #ignore --- app.yml | 2 +- app_desc.yaml | 2 +- config/default.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.yml b/app.yml index 18cebe0bf1..c4b1b1fbc8 100644 --- 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.32.2 +version: 3.32.3 category: 运维工具 language_support: 中文 desktop: diff --git a/app_desc.yaml b/app_desc.yaml index c5d67be268..4786afea5d 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "3.32.2" +app_version: "3.32.3" app: region: default bk_app_code: bk_sops diff --git a/config/default.py b/config/default.py index 8e8c159336..328fdaec27 100644 --- a/config/default.py +++ b/config/default.py @@ -213,7 +213,7 @@ # mako模板中： # 如果静态资源修改了以后，上线前改这个版本号即可 -STATIC_VERSION = "3.32.2" +STATIC_VERSION = "3.32.3" DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S") STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] From 0aa2f3eb3aa81a0bd055442919b8120d87094003 Mon Sep 17 00:00:00 2001 From: luofann Date: Tue, 7 May 2024 21:43:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0bkui-form?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20#ignore=20#=20Reviewed,=20transaction=20id?= =?UTF-8?q?:=207226?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/desktop/package.json | 2 +- .../ExecuteInfo/JsonschemaForm.vue | 48 +++++++++++-------- .../NodeConfig/JsonschemaInputParams.vue | 10 +++- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/frontend/desktop/package.json b/frontend/desktop/package.json index 5b59286759..2da76621e5 100644 --- a/frontend/desktop/package.json +++ b/frontend/desktop/package.json @@ -11,7 +11,7 @@ "license": "ISC", "dependencies": { "@blueking/bkcharts": "^2.0.11-alpha.5", - "@blueking/bkui-form": "0.0.41", + "@blueking/bkui-form": "0.0.41-beta.1", "@blueking/crypto-js-sdk": "0.0.5", "@blueking/notice-component-vue2": "^2.0.1", "@blueking/user-selector": "^1.0.5-beta.2", diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/JsonschemaForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/JsonschemaForm.vue index b03274472a..c4a028d2e5 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/JsonschemaForm.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/JsonschemaForm.vue @@ -5,6 +5,7 @@ :readonly="true" :value="formData" :schema="schema" + :context="context" :layout="{ group: [], container: { gap: '14px' } }"> @@ -33,7 +34,11 @@ }, data () { return { - formData: tools.deepClone(this.value) + formData: tools.deepClone(this.value), + context: { + site_url: $.context.site_url, + project_id: $.context.project?.id + } } }, watch: { @@ -45,28 +50,33 @@