Merge remote-tracking branch 'upstream/master' into fix_otel_app_sett…

…ings_V3.32 # Conflicts: # frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/JsonschemaForm.vue # frontend/desktop/src/pages/template/TemplateEdit/NodeConfig/JsonschemaInputParams.vue
TencentBlueKing · May 13, 2024 · 0e965ef · 0e965ef
2 parents 311a5df + 8b893c8
commit 0e965ef
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 23 deletions.
diff --git 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
@@ -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 {
-        /deep/ .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
@@ -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: {
@@ -53,7 +58,10 @@
 </script>
 <style lang="scss" scoped>
     .jsonschema-input-params {
-        /deep/ {
+        >>> {
+            .bk-schema-form-group-content {
+                grid-auto-columns: 100%;
+            }
             .bk-form-item {
                 .bk-label {
                     width: 130px !important;

diff --git 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 edit_time and last_month_time.timestamp() < edit_time.timestamp():
             continue
         creator = p_task["task__creator"]
         project_name = p_task["project__name"]