diff --git a/app.yml b/app.yml index e1d972db87..6e894ac9e4 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.33.0-beta1 +version: 3.33.0-beta2 category: 运维工具 language_support: 中文 desktop: diff --git a/app_desc.yaml b/app_desc.yaml index 2ac547f214..b5a28cdf8e 100644 --- a/app_desc.yaml +++ b/app_desc.yaml @@ -1,5 +1,5 @@ spec_version: 2 -app_version: "3.33.0-beta1" +app_version: "3.33.0-beta2" app: region: default bk_app_code: bk_sops diff --git a/config/default.py b/config/default.py index e6015d7c27..7be276ef09 100644 --- a/config/default.py +++ b/config/default.py @@ -213,7 +213,7 @@ # mako模板中: # 如果静态资源修改了以后,上线前改这个版本号即可 -STATIC_VERSION = "3.33.0-beta1" +STATIC_VERSION = "3.33.0-beta2" 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/package.json b/frontend/desktop/package.json index 0bcf50cdeb..b30226a59b 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/components/NodeExecuteInfo/components/common/JsonschemaForm.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/common/JsonschemaForm.vue index 63ddd103ed..c4a028d2e5 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/common/JsonschemaForm.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/common/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 @@