From 0aa2f3eb3aa81a0bd055442919b8120d87094003 Mon Sep 17 00:00:00 2001
From: luofann <fannluowork@gmail.com>
Date: Tue, 7 May 2024 21:43:56 +0800
Subject: [PATCH 1/4] =?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' } }">
         </bkui-form>
     </div>
@@ -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 @@
 </script>
 <style lang="scss" scoped>
     .jsonschema-input-params {
-        >>> .bk-form-item {
-            .bk-label {
-                width: 100px !important;
-                font-size: 12px;
-            }
-            .bk-form-content {
-                margin-left: 100px !important;
+        >>> {
+            .bk-schema-form-group-content {
+                grid-auto-columns: 100%;
             }
-            .bk-form-radio {
-                margin-right: 30px;
-                .bk-radio-text {
+            .bk-form-item {
+                .bk-label {
+                    width: 100px !important;
                     font-size: 12px;
                 }
-            }
-            .bk-form-checkbox {
-                margin-right: 30px;
-                .bk-checkbox-text {
-                    font-size: 12px;
+                .bk-form-content {
+                    margin-left: 100px !important;
+                }
+                .bk-form-radio {
+                    margin-right: 30px;
+                    .bk-radio-text {
+                        font-size: 12px;
+                    }
+                }
+                .bk-form-checkbox {
+                    margin-right: 30px;
+                    .bk-checkbox-text {
+                        font-size: 12px;
+                    }
+                }
+                & + .bk-form-item {
+                    margin-top: 0;
                 }
-            }
-            & + .bk-form-item {
-                margin-top: 0;
             }
         }
     }
diff --git a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/JsonschemaInputParams.vue b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/JsonschemaInputParams.vue
index 1a003df87d..af6b41329c 100644
--- a/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/JsonschemaInputParams.vue
+++ b/frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/JsonschemaInputParams.vue
@@ -6,6 +6,7 @@
             :value="inputFormData"
             :schema="inputs"
             :readonly="isViewMode"
+            :context="context"
             :layout="{ group: [], container: { gap: '14px' } }"
             @change="$emit('update', $event)">
         </bkui-form>
@@ -36,7 +37,11 @@
         },
         data () {
             return {
-                inputFormData: tools.deepClone(this.value)
+                inputFormData: tools.deepClone(this.value),
+                context: {
+                    site_url: $.context.site_url,
+                    project_id: $.context.project?.id
+                }
             }
         },
         watch: {
@@ -54,6 +59,9 @@
 <style lang="scss" scoped>
     .jsonschema-input-params {
         >>> {
+            .bk-schema-form-group-content {
+                grid-auto-columns: 100%;
+            }
             .bk-form-item {
                 .bk-label {
                     width: 130px !important;

From ef7b09c63ae2b9c9450f3de8ec2661e7a26a79ad Mon Sep 17 00:00:00 2001
From: liujun <liujun@canway.net>
Date: Tue, 7 May 2024 16:50:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#7364?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/tasks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcloud/core/tasks.py b/gcloud/core/tasks.py
index 81caaa96a4..6097a66d28 100644
--- a/gcloud/core/tasks.py
+++ b/gcloud/core/tasks.py
@@ -170,6 +170,7 @@ def scan_periodic_task(is_send_notify: bool = True):
             "task__creator",
             "project__id",
             "project__name",
+            "create_time",
             "edit_time",
             "task__last_run_at",
             "task__name",
@@ -183,7 +184,8 @@ def scan_periodic_task(is_send_notify: bool = True):
         last_month_time = datetime.datetime.now() + dateutil.relativedelta.relativedelta(
             months=-int(settings.PERIODIC_TASK_REMINDER_TIME)
         )
-        if last_month_time.timestamp() < p_task["edit_time"].timestamp():
+        edit_time = p_task["edit_time"] if p_task["edit_time"] else p_task["create_time"]
+        if last_month_time.timestamp() < edit_time.timestamp():
             continue
         creator = p_task["task__creator"]
         project_name = p_task["project__name"]

From 8b893c85d7588ea33cf7f9357b570d97e66bdf0e Mon Sep 17 00:00:00 2001
From: liujun <liujun@canway.net>
Date: Thu, 9 May 2024 15:39:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=91=A8=E6=9C=9F=E4=BB=BB=E5=8A=A1=E6=97=A0=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=92=8C=E7=BC=96=E8=BE=91=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20#7364?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gcloud/core/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcloud/core/tasks.py b/gcloud/core/tasks.py
index 6097a66d28..8d95f63939 100644
--- a/gcloud/core/tasks.py
+++ b/gcloud/core/tasks.py
@@ -185,7 +185,7 @@ def scan_periodic_task(is_send_notify: bool = True):
             months=-int(settings.PERIODIC_TASK_REMINDER_TIME)
         )
         edit_time = p_task["edit_time"] if p_task["edit_time"] else p_task["create_time"]
-        if last_month_time.timestamp() < edit_time.timestamp():
+        if edit_time and last_month_time.timestamp() < edit_time.timestamp():
             continue
         creator = p_task["task__creator"]
         project_name = p_task["project__name"]

From b10bc59621ba46f07ad67c7c5c978d8a7249dd67 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Mon, 13 May 2024 11:24:25 +0800
Subject: [PATCH 4/4] feat: release V3.32.4 #ignore

---
 app.yml           | 2 +-
 app_desc.yaml     | 2 +-
 config/default.py | 2 +-
 requirements.txt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.yml b/app.yml
index c4b1b1fbc8..77eeb94a44 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.3
+version: 3.32.4
 category: 运维工具
 language_support: 中文
 desktop:
diff --git a/app_desc.yaml b/app_desc.yaml
index 4786afea5d..3aaabc3b01 100644
--- a/app_desc.yaml
+++ b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.32.3"
+app_version: "3.32.4"
 app:
     region: default
     bk_app_code: bk_sops
diff --git a/config/default.py b/config/default.py
index 328fdaec27..0dc141482f 100644
--- a/config/default.py
+++ b/config/default.py
@@ -213,7 +213,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.32.3"
+STATIC_VERSION = "3.32.4"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
diff --git a/requirements.txt b/requirements.txt
index 887cd2201e..e2414f677f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -59,7 +59,7 @@ importlib-metadata==3.7.3
 protobuf==3.19.4
 
 # blueapps
-blueapps[opentelemetry,bkcrypto]==4.11.0
+blueapps[opentelemetry,bkcrypto]==4.12.0
 whitenoise==5.2.0
 raven==6.5.0
 python-json-logger==2.0.1