From bebb875694ea2c7a75ecdcfc9e1e0e28c6b6cf88 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Tue, 22 Apr 2025 09:53:34 +0800
Subject: [PATCH 1/2] chore: launchMode

---
 packages/core/cli/src/commands/start.js | 33 ++++++++++++++++---------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/core/cli/src/commands/start.js b/packages/core/cli/src/commands/start.js
index 3200b0ffba..e0f0bc905c 100644
--- a/packages/core/cli/src/commands/start.js
+++ b/packages/core/cli/src/commands/start.js
@@ -48,6 +48,7 @@ module.exports = (cli) => {
     .option('-i, --instances [instances]')
     .option('--db-sync')
     .option('--quickstart')
+    .option('--launch-mode [launchMode]')
     .allowUnknownOption()
     .action(async (opts) => {
       checkDBDialect();
@@ -119,17 +120,27 @@ module.exports = (cli) => {
         ]);
         process.exit();
       } else {
-        run(
-          'pm2-runtime',
-          [
-            'start',
-            ...instancesArgs,
-            `${APP_PACKAGE_ROOT}/lib/index.js`,
-            NODE_ARGS ? `--node-args="${NODE_ARGS}"` : undefined,
-            '--',
-            ...process.argv.slice(2),
-          ].filter(Boolean),
-        );
+        const launchMode = opts.launchMode || process.env.APP_LAUNCH_MODE || 'pm2';
+        if (launchMode === 'pm2') {
+          run(
+            'pm2-runtime',
+            [
+              'start',
+              ...instancesArgs,
+              `${APP_PACKAGE_ROOT}/lib/index.js`,
+              NODE_ARGS ? `--node-args="${NODE_ARGS}"` : undefined,
+              '--',
+              ...process.argv.slice(2),
+            ].filter(Boolean),
+          );
+        } else {
+          run(
+            'node',
+            [`${APP_PACKAGE_ROOT}/lib/index.js`, ...(NODE_ARGS || '').split(' '), ...process.argv.slice(2)].filter(
+              Boolean,
+            ),
+          );
+        }
       }
     });
 };

From 3049f35490873c473cfa4b7be1599cae38bb1c91 Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Tue, 22 Apr 2025 11:13:29 +0800
Subject: [PATCH 2/2] fix: issue with time field as condition in linkage rules
 (#6738)

---
 .../client/src/schema-component/common/utils/uitls.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/core/client/src/schema-component/common/utils/uitls.tsx b/packages/core/client/src/schema-component/common/utils/uitls.tsx
index da649cb785..314a50fc42 100644
--- a/packages/core/client/src/schema-component/common/utils/uitls.tsx
+++ b/packages/core/client/src/schema-component/common/utils/uitls.tsx
@@ -145,15 +145,7 @@ const processCondition = async (
 const processAdvancedCondition = async (condition, variables, localVariables, jsonLogic) => {
   const operator = condition.op;
   const rightValue = await parseVariableValue(condition.rightVar, variables, localVariables);
-  let leftValue = await parseVariableValue(condition.leftVar, variables, localVariables);
-  const leftCollectionField = await variables.getCollectionField(condition.leftVar, localVariables);
-  if (
-    leftValue &&
-    ['datetime', 'date', 'datetimeNoTz', 'dateOnly', 'unixTimestamp'].includes(leftCollectionField.type)
-  ) {
-    const format = getFormatFromDateStr(rightValue);
-    leftValue = dayjs.utc(leftValue).local().format(format);
-  }
+  const leftValue = await parseVariableValue(condition.leftVar, variables, localVariables);
   if (operator) {
     return jsonLogic.apply({ [operator]: [leftValue, rightValue] });
   }