fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 10:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into feat/data-time-variables

Browse Source
This commit is contained in:
katherinehhh 2025-04-22 11:19:26 +08:00
commit e84f94f143
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/cli/src/commands/start.js
View File

@ -48,6 +48,7 @@ module.exports = (cli) => {
.option('-i, --instances [instances]') .option('-i, --instances [instances]')
.option('--db-sync') .option('--db-sync')
.option('--quickstart') .option('--quickstart')
.option('--launch-mode [launchMode]')
.allowUnknownOption() .allowUnknownOption()
.action(async (opts) => { .action(async (opts) => {
checkDBDialect(); checkDBDialect();
@ -119,6 +120,8 @@ module.exports = (cli) => {
]); ]);
process.exit(); process.exit();
} else { } else {
const launchMode = opts.launchMode || process.env.APP_LAUNCH_MODE || 'pm2';
if (launchMode === 'pm2') {
run( run(
'pm2-runtime', 'pm2-runtime',
[ [
@ -130,6 +133,14 @@ module.exports = (cli) => {
...process.argv.slice(2), ...process.argv.slice(2),
].filter(Boolean), ].filter(Boolean),
); );
} else {
run(
'node',
[`${APP_PACKAGE_ROOT}/lib/index.js`, ...(NODE_ARGS || '').split(' '), ...process.argv.slice(2)].filter(
Boolean,
),
);
}
} }
}); });
}; };

10
packages/core/client/src/schema-component/common/utils/uitls.tsx
View File

@ -145,15 +145,7 @@ const processCondition = async (
const processAdvancedCondition = async (condition, variables, localVariables, jsonLogic) => { const processAdvancedCondition = async (condition, variables, localVariables, jsonLogic) => {
const operator = condition.op; const operator = condition.op;
const rightValue = await parseVariableValue(condition.rightVar, variables, localVariables); const rightValue = await parseVariableValue(condition.rightVar, variables, localVariables);
let leftValue = await parseVariableValue(condition.leftVar, variables, localVariables); const 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);
}
if (operator) { if (operator) {
return jsonLogic.apply({ [operator]: [leftValue, rightValue] }); return jsonLogic.apply({ [operator]: [leftValue, rightValue] });
} }