diff --git a/packages/plugins/@nocobase/plugin-block-template/src/client/utils/template.ts b/packages/plugins/@nocobase/plugin-block-template/src/client/utils/template.ts
index a7b7b88873..f32009378a 100644
--- a/packages/plugins/@nocobase/plugin-block-template/src/client/utils/template.ts
+++ b/packages/plugins/@nocobase/plugin-block-template/src/client/utils/template.ts
@@ -180,14 +180,14 @@ function shouldDeleteNoComponentSchema(schema: ISchema) {
return true;
}
const properties = schema?.properties;
- return properties && Object.values(properties).some((s) => s['x-component'] === undefined);
+ return properties && Object.values(properties).some((s) => s['x-component'] == null);
}
function cleanSchema(schema?: any) {
const properties = schema?.properties || {};
for (const key of Object.keys(properties)) {
- // 如果x-component是undefined
- if (schema.properties[key]['x-component'] === undefined && shouldDeleteNoComponentSchema(schema.properties[key])) {
+ // 如果x-component是undefined/null
+ if (schema.properties[key]['x-component'] == null && shouldDeleteNoComponentSchema(schema.properties[key])) {
delete schema.properties[key];
}
// 如果x-component是Grid.Row，且内部无任何内容，则删除
@@ -337,7 +337,7 @@ export function getFullSchema(
for (const key in schema.properties) {
const property = schema.properties[key];
schema.properties[key] = getFullSchema(property, templateschemacache, templateInfos, savedSchemaUids);
- if (schema.properties[key]['x-component'] === undefined) {
+ if (schema.properties[key]['x-component'] == null) {
delete schema.properties[key]; // 说明已经从模板中删除了
}
}
diff --git a/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplateLinks.ts b/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplateLinks.ts
index 7288070417..bd31cdea82 100644
--- a/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplateLinks.ts
+++ b/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplateLinks.ts
@@ -1,8 +1,18 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
import { defineCollection } from '@nocobase/database';
export default defineCollection({
dumpRules: 'required',
name: 'blockTemplateLinks',
+ migrationRules: ['overwrite', 'schema-only'],
fields: [
{
type: 'string',
diff --git a/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplates.ts b/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplates.ts
index 29ef81780a..38b0fe74c9 100644
--- a/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplates.ts
+++ b/packages/plugins/@nocobase/plugin-block-template/src/server/collections/blockTemplates.ts
@@ -13,6 +13,7 @@ export default defineCollection({
dumpRules: 'required',
name: 'blockTemplates',
autoGenId: false,
+ migrationRules: ['overwrite', 'schema-only'],
fields: [
{
type: 'uid',
diff --git a/packages/plugins/@nocobase/plugin-block-template/src/server/utils/template.ts b/packages/plugins/@nocobase/plugin-block-template/src/server/utils/template.ts
index e93f6a62f6..f4e16061ce 100644
--- a/packages/plugins/@nocobase/plugin-block-template/src/server/utils/template.ts
+++ b/packages/plugins/@nocobase/plugin-block-template/src/server/utils/template.ts
@@ -376,7 +376,7 @@ function shouldDeleteNoComponentSchema(schema: Schema) {
return true;
}
const properties = schema?.properties;
- return properties && Object.values(properties).some((s) => s['x-component'] === undefined);
+ return properties && Object.values(properties).some((s) => s['x-component'] == null);
}
export function cleanSchema(schema?: Schema, templateId?: string) {
@@ -390,7 +390,7 @@ export function cleanSchema(schema?: Schema, templateId?: string) {
}
for (const key of Object.keys(properties)) {
if (
- schema.properties[key]['x-component'] === undefined &&
+ schema.properties[key]['x-component'] == null &&
!schema.properties[key]['x-template-root-uid'] &&
shouldDeleteNoComponentSchema(schema.properties[key])
) {
diff --git a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
index 15c46eb4ec..9365c8ee67 100644
--- a/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
+++ b/packages/plugins/@nocobase/plugin-block-workbench/src/client/components/qrcode-scanner/index.tsx
@@ -9,13 +9,13 @@
import { FileImageOutlined, LeftOutlined } from '@ant-design/icons';
import { useActionContext } from '@nocobase/client';
import { Html5Qrcode } from 'html5-qrcode';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ScanBox } from './ScanBox';
import { useScanner } from './useScanner';
const qrcodeEleId = 'qrcode';
-export const QRCodeScannerInner = (props) => {
+export const QRCodeScannerInner = ({ setVisible }) => {
const containerRef = useRef
();
const imgUploaderRef = useRef();
const { t } = useTranslation('block-workbench');
@@ -23,9 +23,17 @@ export const QRCodeScannerInner = (props) => {
const vw = Math.max(document.documentElement.clientWidth || 0, window.innerWidth || 0);
const vh = Math.max(document.documentElement.clientHeight || 0, window.innerHeight || 0);
+ const onScanSuccess = useCallback(
+ (text) => {
+ setVisible(false);
+ },
+ [setVisible],
+ );
+
const { startScanFile } = useScanner({
onScannerSizeChanged: setOriginVideoSize,
elementId: qrcodeEleId,
+ onScanSuccess,
});
const getBoxStyle = (): React.CSSProperties => {
@@ -174,7 +182,7 @@ export const QRCodeScanner = (props) => {
return visible && cameraAvaliable ? (
-
+
setVisible(false)} />
{t('Scan QR code')}
(
() => import('cron-parser'),
@@ -132,8 +132,8 @@ const useEvents = (
const intervalTime = end.diff(start, 'millisecond', true);
const dateM = dayjs(date);
- const startDate = dateM.clone().startOf('month');
- const endDate = startDate.clone().endOf('month');
+ const startDate = dateM.clone().startOf(view);
+ const endDate = startDate.clone().endOf(view);
/**
* view === month 时，会显示当月日程
@@ -425,7 +425,6 @@ export const Calendar: any = withDynamicSchemaProps(
};
};
const BigCalendar = reactBigCalendar?.BigCalendar;
-
return wrapSSR(
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
index 2d57e70cec..cddc03e9db 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/desktopRoutes-union-role.test.ts
@@ -55,6 +55,12 @@ describe('Web client desktopRoutes', async () => {
},
});
+ await rootAgent.resource('roles').setSystemRoleMode({
+ values: {
+ roleMode: SystemRoleMode.allowUseUnion,
+ },
+ });
+
agent = await app.agent().login(user, UNION_ROLE_KEY);
});
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts b/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
index 45d27d7a05..0cf3286bbf 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/server/error-handler.ts
@@ -26,13 +26,16 @@ export class ErrorHandler {
message += `: ${err.cause.message}`;
}
+ const errorData: { message: string; code: string; title?: string } = {
+ message,
+ code: err.code,
+ };
+
+ if (err?.title) {
+ errorData.title = err.title;
+ }
ctx.body = {
- errors: [
- {
- message,
- code: err.code,
- },
- ],
+ errors: [errorData],
};
}
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
index 536d72d1a5..94b2f559b3 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/issues.test.ts
@@ -324,4 +324,100 @@ describe('issues', () => {
}
expect(res.status).toBe(200);
});
+
+ test('filtering by fields of a relation collection with m2m array field', async () => {
+ await db.getRepository('collections').create({
+ values: {
+ name: 'tags',
+ fields: [
+ {
+ name: 'id',
+ type: 'bigInt',
+ autoIncrement: true,
+ primaryKey: true,
+ allowNull: false,
+ },
+ {
+ name: 'title',
+ type: 'string',
+ },
+ ],
+ },
+ });
+ await db.getRepository('collections').create({
+ values: {
+ name: 'users',
+ fields: [
+ {
+ name: 'id',
+ type: 'bigInt',
+ autoIncrement: true,
+ primaryKey: true,
+ allowNull: false,
+ },
+ {
+ name: 'username',
+ type: 'string',
+ },
+ {
+ name: 'tags',
+ type: 'belongsToArray',
+ foreignKey: 'tag_ids',
+ target: 'tags',
+ targetKey: 'id',
+ },
+ ],
+ },
+ });
+ await db.getRepository('collections').create({
+ values: {
+ name: 'projects',
+ fields: [
+ {
+ name: 'id',
+ type: 'bigInt',
+ autoIncrement: true,
+ primaryKey: true,
+ allowNull: false,
+ },
+ {
+ name: 'title',
+ type: 'string',
+ },
+ {
+ name: 'users',
+ type: 'belongsTo',
+ foreignKey: 'user_id',
+ target: 'users',
+ },
+ ],
+ },
+ });
+ // @ts-ignore
+ await db.getRepository('collections').load();
+ await db.sync();
+ await db.getRepository('tags').create({
+ values: [{ title: 'a' }, { title: 'b' }, { title: 'c' }],
+ });
+ await db.getRepository('users').create({
+ values: { id: 1, username: 'a' },
+ });
+ await db.getRepository('projects').create({
+ values: { id: 1, title: 'p1', user_id: 1 },
+ });
+ await expect(
+ db.getRepository('projects').findOne({
+ appends: ['users', 'users.tags'],
+ filter: {
+ $and: [
+ {
+ users: {
+ username: 'a',
+ },
+ },
+ ],
+ },
+ }),
+ ).resolves.toBeTruthy();
+ });
});
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
index e20b709e05..778c196582 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-bigint-api.test.ts
@@ -207,15 +207,8 @@ describe('m2m array api, bigInt targetKey', () => {
},
},
});
- if (db.sequelize.getDialect() === 'postgres') {
- const res = await search;
- expect(res.length).toBe(1);
- } else {
- expect(search).rejects.toThrowError();
- }
- if (db.sequelize.getDialect() !== 'postgres') {
- return;
- }
+ const res1 = await search;
+ expect(res1.length).toBe(1);
const search2 = db.getRepository('users').find({
filter: {
'tags.title': {
@@ -223,12 +216,8 @@ describe('m2m array api, bigInt targetKey', () => {
},
},
});
- if (db.sequelize.getDialect() === 'postgres') {
- const res = await search2;
- expect(res.length).toBe(2);
- } else {
- expect(search2).rejects.toThrowError();
- }
+ const res2 = await search2;
+ expect(res2.length).toBe(2);
});
it('should create with belongsToArray', async () => {
diff --git a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
index 3d1f1d8265..2c0cf26e4b 100644
--- a/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
+++ b/packages/plugins/@nocobase/plugin-field-m2m-array/src/server/__tests__/m2m-array-string-api.test.ts
@@ -186,15 +186,8 @@ describe('m2m array api, string targetKey', () => {
},
},
});
- if (db.sequelize.getDialect() === 'postgres') {
- const res = await search;
- expect(res.length).toBe(1);
- } else {
- expect(search).rejects.toThrowError();
- }
- if (db.sequelize.getDialect() !== 'postgres') {
- return;
- }
+ const res1 = await search;
+ expect(res1.length).toBe(1);
const search2 = db.getRepository('users').find({
filter: {
'tags.title': {
@@ -202,12 +195,8 @@ describe('m2m array api, string targetKey', () => {
},
},
});
- if (db.sequelize.getDialect() === 'postgres') {
- const res = await search2;
- expect(res.length).toBe(2);
- } else {
- expect(search2).rejects.toThrowError();
- }
+ const res2 = await search2;
+ expect(res2.length).toBe(2);
});
it('should create with belongsToArray', async () => {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
index bf66f7624a..20e248f469 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
@@ -21,6 +21,7 @@ export default defineCollection({
type: 'string',
name: 'title',
translation: true,
+ trim: true,
},
{
title: '英文标识',
@@ -28,6 +29,7 @@ export default defineCollection({
type: 'uid',
name: 'name',
unique: true,
+ trim: true,
},
{
comment: '类型标识，如 local/ali-oss 等',
@@ -51,12 +53,14 @@ export default defineCollection({
type: 'text',
name: 'path',
defaultValue: '',
+ trim: true,
},
{
comment: '访问地址前缀',
type: 'string',
name: 'baseUrl',
defaultValue: '',
+ trim: true,
},
// TODO(feature): 需要使用一个实现了可设置默认值的字段
{
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
index 64e413d2b7..d0fabdab40 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
@@ -104,10 +104,6 @@ export const GanttBlockProvider = (props) => {
const collection = cm.getCollection(props.collection, props.dataSource);
const params = { filter: props.params?.filter, paginate: false, sort: [collection?.primaryKey || 'id'] };
- if (collection?.tree) {
- params['tree'] = true;
- }
-
return (
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/.npmignore b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
new file mode 100644
index 0000000000..65f5e8779f
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/README.md b/packages/plugins/@nocobase/plugin-locale-tester/README.md
new file mode 100644
index 0000000000..cfac872027
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/README.md
@@ -0,0 +1 @@
+# @nocobase/plugin-locale-tester
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
new file mode 100644
index 0000000000..6c459cbac4
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/client.js b/packages/plugins/@nocobase/plugin-locale-tester/client.js
new file mode 100644
index 0000000000..b6e3be70e6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/package.json b/packages/plugins/@nocobase/plugin-locale-tester/package.json
new file mode 100644
index 0000000000..01cff607f5
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "@nocobase/plugin-locale-tester",
+ "displayName": "Locale tester",
+ "displayName.zh-CN": "翻译测试工具",
+ "version": "1.7.0-alpha.10",
+ "homepage": "https://github.com/nocobase/locales",
+ "main": "dist/server/index.js",
+ "peerDependencies": {
+ "@nocobase/client": "1.x",
+ "@nocobase/server": "1.x",
+ "@nocobase/test": "1.x"
+ }
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
new file mode 100644
index 0000000000..c41081ddc6
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.d.ts
@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/server.js b/packages/plugins/@nocobase/plugin-locale-tester/server.js
new file mode 100644
index 0000000000..972842039a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/server.js
@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
new file mode 100644
index 0000000000..4e96f83fa1
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/client.d.ts
@@ -0,0 +1,249 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// CSS modules
+type CSSModuleClasses = { readonly [key: string]: string };
+
+declare module '*.module.css' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.scss' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.sass' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.less' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.styl' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.stylus' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.pcss' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+declare module '*.module.sss' {
+ const classes: CSSModuleClasses;
+ export default classes;
+}
+
+// CSS
+declare module '*.css' { }
+declare module '*.scss' { }
+declare module '*.sass' { }
+declare module '*.less' { }
+declare module '*.styl' { }
+declare module '*.stylus' { }
+declare module '*.pcss' { }
+declare module '*.sss' { }
+
+// Built-in asset types
+// see `src/node/constants.ts`
+
+// images
+declare module '*.apng' {
+ const src: string;
+ export default src;
+}
+declare module '*.png' {
+ const src: string;
+ export default src;
+}
+declare module '*.jpg' {
+ const src: string;
+ export default src;
+}
+declare module '*.jpeg' {
+ const src: string;
+ export default src;
+}
+declare module '*.jfif' {
+ const src: string;
+ export default src;
+}
+declare module '*.pjpeg' {
+ const src: string;
+ export default src;
+}
+declare module '*.pjp' {
+ const src: string;
+ export default src;
+}
+declare module '*.gif' {
+ const src: string;
+ export default src;
+}
+declare module '*.svg' {
+ const src: string;
+ export default src;
+}
+declare module '*.ico' {
+ const src: string;
+ export default src;
+}
+declare module '*.webp' {
+ const src: string;
+ export default src;
+}
+declare module '*.avif' {
+ const src: string;
+ export default src;
+}
+
+// media
+declare module '*.mp4' {
+ const src: string;
+ export default src;
+}
+declare module '*.webm' {
+ const src: string;
+ export default src;
+}
+declare module '*.ogg' {
+ const src: string;
+ export default src;
+}
+declare module '*.mp3' {
+ const src: string;
+ export default src;
+}
+declare module '*.wav' {
+ const src: string;
+ export default src;
+}
+declare module '*.flac' {
+ const src: string;
+ export default src;
+}
+declare module '*.aac' {
+ const src: string;
+ export default src;
+}
+declare module '*.opus' {
+ const src: string;
+ export default src;
+}
+declare module '*.mov' {
+ const src: string;
+ export default src;
+}
+declare module '*.m4a' {
+ const src: string;
+ export default src;
+}
+declare module '*.vtt' {
+ const src: string;
+ export default src;
+}
+
+// fonts
+declare module '*.woff' {
+ const src: string;
+ export default src;
+}
+declare module '*.woff2' {
+ const src: string;
+ export default src;
+}
+declare module '*.eot' {
+ const src: string;
+ export default src;
+}
+declare module '*.ttf' {
+ const src: string;
+ export default src;
+}
+declare module '*.otf' {
+ const src: string;
+ export default src;
+}
+
+// other
+declare module '*.webmanifest' {
+ const src: string;
+ export default src;
+}
+declare module '*.pdf' {
+ const src: string;
+ export default src;
+}
+declare module '*.txt' {
+ const src: string;
+ export default src;
+}
+
+// wasm?init
+declare module '*.wasm?init' {
+ const initWasm: (options?: WebAssembly.Imports) => Promise;
+ export default initWasm;
+}
+
+// web worker
+declare module '*?worker' {
+ const workerConstructor: {
+ new(options?: { name?: string }): Worker;
+ };
+ export default workerConstructor;
+}
+
+declare module '*?worker&inline' {
+ const workerConstructor: {
+ new(options?: { name?: string }): Worker;
+ };
+ export default workerConstructor;
+}
+
+declare module '*?worker&url' {
+ const src: string;
+ export default src;
+}
+
+declare module '*?sharedworker' {
+ const sharedWorkerConstructor: {
+ new(options?: { name?: string }): SharedWorker;
+ };
+ export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&inline' {
+ const sharedWorkerConstructor: {
+ new(options?: { name?: string }): SharedWorker;
+ };
+ export default sharedWorkerConstructor;
+}
+
+declare module '*?sharedworker&url' {
+ const src: string;
+ export default src;
+}
+
+declare module '*?raw' {
+ const src: string;
+ export default src;
+}
+
+declare module '*?url' {
+ const src: string;
+ export default src;
+}
+
+declare module '*?inline' {
+ const src: string;
+ export default src;
+}
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
new file mode 100644
index 0000000000..7ecfc9a69d
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/client/index.tsx
@@ -0,0 +1,124 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { useForm } from '@formily/react';
+import { ActionProps, ISchema, Plugin, SchemaComponent, useAPIClient, useApp, useRequest } from '@nocobase/client';
+import { Alert, App as AntdApp, Card, Spin } from 'antd';
+import React from 'react';
+import { useT } from './locale';
+
+function LocaleTester() {
+ const { data, loading } = useRequest({
+ url: 'localeTester:get',
+ });
+ const t = useT();
+
+ const schema: ISchema = {
+ type: 'void',
+ name: 'root',
+ properties: {
+ test: {
+ type: 'void',
+ 'x-component': 'FormV2',
+ properties: {
+ locale: {
+ type: 'string',
+ 'x-decorator': 'FormItem',
+ 'x-component': 'Input.JSON',
+ 'x-component-props': {
+ autoSize: { minRows: 20, maxRows: 30 },
+ },
+ default: data?.data?.locale,
+ title: t('Translations'),
+ },
+ button: {
+ type: 'void',
+ 'x-component': 'Action',
+ title: t('Submit'),
+ 'x-use-component-props': 'useSubmitActionProps',
+ },
+ },
+ },
+ },
+ };
+
+ const useSubmitActionProps = () => {
+ const form = useForm();
+ const api = useAPIClient();
+ const { message } = AntdApp.useApp();
+ const app = useApp();
+
+ return {
+ type: 'primary',
+ htmlType: 'submit',
+ async onClick() {
+ await form.submit();
+ const values = form.values;
+ await api.request({
+ url: 'localeTester:updateOrCreate',
+ method: 'post',
+ params: {
+ filterKeys: ['id'],
+ },
+ data: {
+ id: data?.data?.id,
+ locale: values.locale,
+ },
+ });
+ message.success(app.i18n.t('Saved successfully!'));
+ window.location.reload();
+ },
+ };
+ };
+
+ if (loading) {
+ return
+ nocobase/locales to get the language file that needs translation, then paste it below and provide the translation.`,
+ ),
+ }}
+ >
+ }
+ />
+ nocobase/locales to get the language file that needs translation, then paste it below and provide the translation.": "Please go to nocobase/locales to get the language file that needs translation, then paste it below and provide the translation."
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
new file mode 100644
index 0000000000..d4074a2ae0
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/locale/zh-CN.json
@@ -0,0 +1,5 @@
+{
+ "Translations": "翻译",
+ "Locale tester": "翻译测试工具",
+ "Please go to nocobase/locales to get the language file that needs translation, then paste it below and provide the translation.": "请前往 nocobase/locales 获取需要翻译的语言文件，粘贴到下方并进行翻译。"
+}
\ No newline at end of file
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
new file mode 100644
index 0000000000..eceb54bbbc
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/collections/localeTester.ts
@@ -0,0 +1,21 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { defineCollection } from '@nocobase/database';
+
+export default defineCollection({
+ name: 'localeTester',
+ autoGenId: true,
+ fields: [
+ {
+ type: 'json',
+ name: 'locale',
+ },
+ ],
+});
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
new file mode 100644
index 0000000000..be989de7c3
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/index.ts
@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export { default } from './plugin';
diff --git a/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
new file mode 100644
index 0000000000..7c9367961a
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-locale-tester/src/server/plugin.ts
@@ -0,0 +1,59 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Plugin } from '@nocobase/server';
+import _ from 'lodash';
+
+export class PluginLocaleTesterServer extends Plugin {
+ async afterAdd() {}
+
+ async beforeLoad() {
+ this.app.acl.registerSnippet({
+ name: `pm.${this.name}`,
+ actions: ['localeTester:*'],
+ });
+ }
+
+ async load() {
+ this.app.resourceManager.use(async (ctx, next) => {
+ await next();
+ const { resourceName, actionName } = ctx.action;
+ if (resourceName === 'app' && actionName === 'getLang') {
+ const repository = this.db.getRepository('localeTester');
+ const record = await repository.findOne();
+ const locale = record?.locale || {};
+ if (locale['cronstrue']) {
+ _.set(ctx.body, 'cronstrue', locale['cronstrue']);
+ }
+ if (locale['react-js-cron']) {
+ _.set(ctx.body, 'cron', locale['react-js-cron']);
+ }
+ Object.keys(locale).forEach((key) => {
+ if (key === 'cronstrue' || key === 'react-js-cron') {
+ return;
+ }
+ const value = locale[key];
+ _.set(ctx.body, ['resources', key], value);
+ const k = key.replace('@nocobase/', '').replace('@nocobase/plugin-', '');
+ _.set(ctx.body, ['resources', k], value);
+ });
+ }
+ });
+ }
+
+ async install() {}
+
+ async afterEnable() {}
+
+ async afterDisable() {}
+
+ async remove() {}
+}
+
+export default PluginLocaleTesterServer;
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
index ab8af6f8bb..168cdb220c 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
@@ -32,15 +32,26 @@ const BaseConfiguration: React.FC = ({ type, children })
return apiClient.resource(MapConfigurationResourceKey);
}, [apiClient]);
- function removeInvisibleCharsFromObject(obj: Record): Record {
- const cleanObj: Record = {};
+ function removeInvisibleCharsFromObject(obj: Record): Record {
+ const cleanObj: Record = {};
for (const [key, value] of Object.entries(obj)) {
- cleanObj[key] = typeof value === 'string' ? value.replace(/[\p{C}\p{Z}\p{Zl}\p{Zp}]+/gu, '') : value;
+ if (typeof value === 'string') {
+ // 去除不可见字符
+ const cleanedValue = value.replace(/[\p{C}\p{Z}\p{Zl}\p{Zp}]+/gu, '');
+ // 如果清理后为空字符串，则赋值为 null
+ cleanObj[key] = cleanedValue || null;
+ }
}
+
return cleanObj;
}
-
const onSubmit = async (values) => {
+ // 移除不可见字符并更新表单值
+ const result = removeInvisibleCharsFromObject(values);
+ form.setFieldsValue(result);
+
+ // 等待表单值更新完成后再校验
+ await new Promise((resolve) => setTimeout(resolve, 0));
await form.validateFields();
resource
.set({
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
index 2ff9153b2c..4a3f4a43fb 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
+++ b/packages/plugins/@nocobase/plugin-mobile/src/client/pages/dynamic-page/components/MobilePicker.tsx
@@ -16,6 +16,7 @@ import { useTranslation } from 'react-i18next';
const MobilePicker = connect(
(props) => {
const { value, onChange, disabled, options = [], mode } = props;
+ console.log(props);
const { t } = useTranslation();
const [visible, setVisible] = useState(false);
const [selected, setSelected] = useState(value || []);
@@ -42,7 +43,7 @@ const MobilePicker = connect(
disabled={disabled}
value={value}
dropdownStyle={{ display: 'none' }}
- multiple={mode === 'multiple'}
+ multiple={['multiple', 'tags'].includes(mode)}
onClear={() => {
setVisible(false);
onChange(null);
@@ -77,10 +78,10 @@ const MobilePicker = connect(
}}
>
{
- if (mode === 'multiple') {
+ if (['multiple', 'tags'].includes(mode)) {
setSelected(val);
} else {
setSelected(val[0]);
@@ -96,7 +97,7 @@ const MobilePicker = connect(
))}
- {mode === 'multiple' && (
+ {['multiple', 'tags'].includes(mode) && (
{t('Confirm')}
diff --git a/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts b/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
index b1930b8629..a66cbc73a4 100644
--- a/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
+++ b/packages/plugins/@nocobase/plugin-mobile/src/server/__tests__/union-role-mobileRoutes.test.ts
@@ -54,7 +54,11 @@ describe('union role mobileRoutes', async () => {
roles: [role1.name, role2.name],
},
});
-
+ await rootAgent.resource('roles').setSystemRoleMode({
+ values: {
+ roleMode: SystemRoleMode.allowUseUnion,
+ },
+ });
agent = await app.agent().login(user, UNION_ROLE_KEY);
});
diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/mobile/MessagePage.tsx b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/mobile/MessagePage.tsx
index d5926115a9..f6c6cec992 100644
--- a/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/mobile/MessagePage.tsx
+++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/src/client/components/mobile/MessagePage.tsx
@@ -30,8 +30,16 @@ import {
} from '../../observables';
import InfiniteScrollContent from './InfiniteScrollContent';
+function removeStringIfStartsWith(text: string, prefix: string): string {
+ if (text.startsWith(prefix)) {
+ return text.slice(prefix.length);
+ }
+ return text;
+}
+
const MobileMessagePageInner = (props: { displayPageHeader?: boolean }) => {
const app = useApp();
+ const basename = app.router.basename.replace(/\/+$/, '');
const { t } = useLocalTranslation();
const navigate = useNavigate();
const ctx = useCurrentUserContext();
@@ -57,7 +65,7 @@ const MobileMessagePageInner = (props: { displayPageHeader?: boolean }) => {
if (url) {
if (url.startsWith('/m/')) navigate(url.substring(2));
else if (url.startsWith('/')) {
- navigate(url);
+ navigate(removeStringIfStartsWith(url, basename));
inboxVisible.value = false;
} else {
window.location.href = url;
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
index a9fe6f7ee5..b62b6e8b29 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx
@@ -147,6 +147,7 @@ export function AdminPublicFormPage() {
}}
>
{t('Public forms', { ns: NAMESPACE })},
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
index 3e8635b3dd..f9af7fba98 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/PublicFormPage.tsx
@@ -33,7 +33,7 @@ import {
import { Input, Modal, Spin } from 'antd';
import { useTranslation } from 'react-i18next';
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
-import { isDesktop } from 'react-device-detect';
+import { isDesktop, isMobile } from 'react-device-detect';
import { useParams } from 'react-router';
import { usePublicSubmitActionProps } from '../hooks';
import { UnEnabledFormPlaceholder, UnFoundFormPlaceholder } from './UnEnabledFormPlaceholder';
@@ -129,9 +129,6 @@ const PublicFormMessageProvider = ({ children }) => {
);
};
-function isMobile() {
- return window.matchMedia('(max-width: 768px)').matches;
-}
const AssociationFieldMobile = (props) => {
return (
{
url: `publicForms:getMeta/${params.name}`,
@@ -243,7 +239,7 @@ function InternalPublicForm() {
if (!data?.data) {
return
diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
index 54bf5bcff4..c5611799f3 100644
--- a/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
@@ -172,7 +172,7 @@ export class PluginPublicFormsServer extends Plugin {
skip: true,
};
} else if (
- (actionName === 'list' && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
+ (['list', 'get'].includes(actionName) && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
(collection?.options.template === 'file' && actionName === 'create') ||
(resourceName === 'storages' && ['getBasicInfo', 'createPresignedUrl'].includes(actionName)) ||
(resourceName === 'vditor' && ['check'].includes(actionName)) ||
diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
index a4d476a6a2..46e3d2a3ea 100644
--- a/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-delay/src/server/DelayInstruction.ts
@@ -108,7 +108,7 @@ export default class extends Instruction {
// add to schedule
this.schedule(job);
- return processor.exit();
+ return null;
}
async resume(node, prevJob, processor: Processor) {
diff --git a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
index 07a2a20e4f..dfe589300b 100644
--- a/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
+++ b/packages/plugins/@nocobase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
@@ -189,7 +189,7 @@ export class ApprovalPassthroughModeNode {
this.detailsConfigureFieldsButton = page.getByLabel(
`schema-initializer-Grid-details:configureFields-${collectionName}`,
);
- this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+ this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
this.actionsConfigureActionsButton = page.getByLabel(
'schema-initializer-ActionBar-ApprovalProcessAddActionButton-',
@@ -262,7 +262,7 @@ export class ApprovalBranchModeNode {
this.detailsConfigureFieldsButton = page.getByLabel(
`schema-initializer-Grid-details:configureFields-${collectionName}`,
);
- this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' }).getByRole('switch');
+ this.addActionsMenu = page.getByRole('menuitem', { name: 'Process form' });
this.actionsConfigureFieldsButton = page.getByLabel('schema-initializer-Grid-FormItemInitializers-approvalRecords');
this.actionsConfigureActionsButton = page.getByLabel('schema-initializer-ActionBar-');
this.addApproveButton = page.getByRole('menuitem', { name: 'Approve' }).getByRole('switch');
diff --git a/packages/plugins/@nocobase/plugin-workflow/package.json b/packages/plugins/@nocobase/plugin-workflow/package.json
index f18984030b..67f52f5d8d 100644
--- a/packages/plugins/@nocobase/plugin-workflow/package.json
+++ b/packages/plugins/@nocobase/plugin-workflow/package.json
@@ -24,6 +24,7 @@
"dayjs": "^1.11.8",
"lodash": "4.17.21",
"lru-cache": "8.0.5",
+ "nodejs-snowflake": "2.0.1",
"react": "18.x",
"react-i18next": "^11.15.1",
"react-js-cron": "^3.1.0",
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
index 8bbec984af..df95f309b5 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx
@@ -63,11 +63,10 @@ function SyncOptionSelect(props) {
if (trigger.sync != null) {
field.setValue(trigger.sync);
} else {
- field.setInitialValue(false);
+ field.setInitialValue(props.value ?? false);
}
}
- }, [record.id, field, workflowPlugin.triggers]);
-
+ }, [record.id, field, workflowPlugin.triggers, record.type, props.value]);
return
+
{RepeatOptions.map((item) => (
{t(item.text)}
))}
- {typeof typeValue === 'number' ? onChange(`0 ${v}`)}
clearButton={false}
locale={window['cronLocale']}
+ disabled={disabled}
/>
) : null}
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Dispatcher.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Dispatcher.ts
new file mode 100644
index 0000000000..bd93f359c9
--- /dev/null
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Dispatcher.ts
@@ -0,0 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export default class Dispatcher {
+ constructor() {}
+}
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
index d45449c56a..f15008b422 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
@@ -10,6 +10,7 @@
import path from 'path';
import { randomUUID } from 'crypto';
+import { Snowflake } from 'nodejs-snowflake';
import { Transaction, Transactionable } from 'sequelize';
import LRUCache from 'lru-cache';
@@ -61,6 +62,7 @@ export default class PluginWorkflowServer extends Plugin {
triggers: Registry = new Registry();
functions: Registry = new Registry();
enabledCache: Map = new Map();
+ snowflake: Snowflake;
private ready = false;
private executing: Promise | null = null;
@@ -219,6 +221,14 @@ export default class PluginWorkflowServer extends Plugin {
WorkflowRepository,
WorkflowTasksRepository,
});
+
+ const PluginRepo = this.db.getRepository('applicationPlugins');
+ const pluginRecord = await PluginRepo.findOne({
+ filter: { name: this.name },
+ });
+ this.snowflake = new Snowflake({
+ custom_epoch: pluginRecord?.createdAt.getTime(),
+ });
}
/**
@@ -376,11 +386,16 @@ export default class PluginWorkflowServer extends Plugin {
const prev = workflow.previous();
if (prev.config) {
trigger.off({ ...workflow.get(), ...prev });
+ this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id} based on configuration before updated`);
}
trigger.on(workflow);
+ this.getLogger(workflow.id).info(`toggle ON workflow ${workflow.id}`);
+
this.enabledCache.set(workflow.id, workflow);
} else {
trigger.off(workflow);
+ this.getLogger(workflow.id).info(`toggle OFF workflow ${workflow.id}`);
+
this.enabledCache.delete(workflow.id);
}
if (!silent) {
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts
index 1a6d20dd79..ebb510e863 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Processor.ts
@@ -56,15 +56,9 @@ export default class Processor {
*/
nodesMap = new Map();
- /**
- * @experimental
- */
- jobsMap = new Map();
-
- /**
- * @experimental
- */
- jobsMapByNodeKey: { [key: string]: any } = {};
+ private jobsMapByNodeKey: { [key: string]: JobModel } = {};
+ private jobResultsMapByNodeKey: { [key: string]: any } = {};
+ private jobsToSave: Map = new Map();
/**
* @experimental
@@ -100,10 +94,9 @@ export default class Processor {
private makeJobs(jobs: Array) {
jobs.forEach((job) => {
- this.jobsMap.set(job.id, job);
-
const node = this.nodesMap.get(job.nodeId);
- this.jobsMapByNodeKey[node.key] = job.result;
+ this.jobsMapByNodeKey[node.key] = job;
+ this.jobResultsMapByNodeKey[node.key] = job.result;
});
}
@@ -192,11 +185,11 @@ export default class Processor {
}
if (!(job instanceof Model)) {
- job.upstreamId = prevJob instanceof Model ? prevJob.get('id') : null;
+ // job.upstreamId = prevJob instanceof Model ? prevJob.get('id') : null;
job.nodeId = node.id;
job.nodeKey = node.key;
}
- const savedJob = await this.saveJob(job);
+ const savedJob = this.saveJob(job);
this.logger.info(
`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id}) finished as status: ${savedJob.status}`,
@@ -258,6 +251,27 @@ export default class Processor {
}
public async exit(s?: number) {
+ if (this.jobsToSave.size) {
+ const newJobs = [];
+ for (const job of this.jobsToSave.values()) {
+ if (job.isNewRecord) {
+ newJobs.push(job);
+ } else {
+ await job.save({ transaction: this.mainTransaction });
+ }
+ }
+ if (newJobs.length) {
+ const JobsModel = this.options.plugin.db.getModel('jobs');
+ await JobsModel.bulkCreate(
+ newJobs.map((job) => job.toJSON()),
+ { transaction: this.mainTransaction },
+ );
+ for (const job of newJobs) {
+ job.isNewRecord = false;
+ }
+ }
+ this.jobsToSave.clear();
+ }
if (typeof s === 'number') {
const status = (this.constructor).StatusMap[s] ?? Math.sign(s);
await this.execution.update({ status }, { transaction: this.mainTransaction });
@@ -269,33 +283,30 @@ export default class Processor {
return null;
}
- // TODO(optimize)
/**
* @experimental
*/
- async saveJob(payload: JobModel | Record): Promise {
+ saveJob(payload: JobModel | Record): JobModel {
const { database } = this.execution.constructor;
- const { mainTransaction: transaction } = this;
const { model } = database.getCollection('jobs');
let job;
if (payload instanceof model) {
- job = await payload.save({ transaction });
- } else if (payload.id) {
- job = await model.findByPk(payload.id, { transaction });
- await job.update(payload, { transaction });
+ job = payload;
+ job.set('updatedAt', new Date());
} else {
- job = await model.create(
- {
- ...payload,
- executionId: this.execution.id,
- },
- { transaction },
- );
+ job = model.build({
+ ...payload,
+ id: this.options.plugin.snowflake.getUniqueID().toString(),
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ executionId: this.execution.id,
+ });
}
- this.jobsMap.set(job.id, job);
+ this.jobsToSave.set(job.id, job);
this.lastSavedJob = job;
- this.jobsMapByNodeKey[job.nodeKey] = job.result;
+ this.jobsMapByNodeKey[job.nodeKey] = job;
+ this.jobResultsMapByNodeKey[job.nodeKey] = job.result;
return job;
}
@@ -357,32 +368,20 @@ export default class Processor {
* @experimental
*/
findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null {
- for (let j: JobModel | undefined = job; j; j = this.jobsMap.get(j.upstreamId)) {
- if (j.nodeId === node.id) {
- return j;
- }
- }
- return null;
+ return this.jobsMapByNodeKey[node.key];
}
/**
* @experimental
*/
findBranchLastJob(node: FlowNodeModel, job: JobModel): JobModel | null {
- const allJobs = Array.from(this.jobsMap.values());
+ const allJobs = Object.values(this.jobsMapByNodeKey);
const branchJobs = [];
for (let n = this.findBranchEndNode(node); n && n !== node.upstream; n = n.upstream) {
branchJobs.push(...allJobs.filter((item) => item.nodeId === n.id));
}
- branchJobs.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
- for (let i = branchJobs.length - 1; i >= 0; i -= 1) {
- for (let j = branchJobs[i]; j && j.id !== job.id; j = this.jobsMap.get(j.upstreamId)) {
- if (j.upstreamId === job.id) {
- return branchJobs[i];
- }
- }
- }
- return null;
+ branchJobs.sort((a, b) => a.updatedAt.getTime() - b.updatedAt.getTime());
+ return branchJobs[branchJobs.length - 1] || null;
}
/**
@@ -403,13 +402,13 @@ export default class Processor {
for (let n = includeSelfScope ? node : this.findBranchParentNode(node); n; n = this.findBranchParentNode(n)) {
const instruction = this.options.plugin.instructions.get(n.type);
if (typeof instruction?.getScope === 'function') {
- $scopes[n.id] = $scopes[n.key] = instruction.getScope(n, this.jobsMapByNodeKey[n.key], this);
+ $scopes[n.id] = $scopes[n.key] = instruction.getScope(n, this.jobResultsMapByNodeKey[n.key], this);
}
}
return {
$context: this.execution.context,
- $jobsMapByNodeKey: this.jobsMapByNodeKey,
+ $jobsMapByNodeKey: this.jobResultsMapByNodeKey,
$system: systemFns,
$scopes,
$env: this.options.plugin.app.environment.getVariables(),
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
index f67b7a84e4..cff13e5d64 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
@@ -359,6 +359,50 @@ describe('workflow > triggers > collection', () => {
const executions = await workflow.getExecutions();
expect(executions.length).toBe(1);
});
+
+ it('datetime field not changed', async () => {
+ const workflow = await WorkflowModel.create({
+ enabled: true,
+ sync: true,
+ type: 'collection',
+ config: {
+ mode: 2,
+ collection: 'posts',
+ changed: ['createdAt'],
+ },
+ });
+
+ const post = await PostRepo.create({ values: { title: 't1' } });
+ await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+ const executions = await workflow.getExecutions();
+ expect(executions.length).toBe(0);
+ });
+
+ it('datetimeNoTz field not changed', async () => {
+ db.getCollection('posts').addField('dateOnly', {
+ type: 'datetimeNoTz',
+ });
+
+ await db.sync();
+
+ const workflow = await WorkflowModel.create({
+ enabled: true,
+ sync: true,
+ type: 'collection',
+ config: {
+ mode: 2,
+ collection: 'posts',
+ changed: ['dateOnly'],
+ },
+ });
+
+ const post = await PostRepo.create({ values: { title: 't1', dateOnly: '2020-01-01 00:00:00' } });
+ await PostRepo.update({ filterByTk: post.id, values: { ...post.get(), title: 't2' } });
+
+ const executions = await workflow.getExecutions();
+ expect(executions.length).toBe(0);
+ });
});
describe('config.condition', () => {
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
index 8e7d6eba9d..3fe7020538 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
@@ -104,50 +104,54 @@ export default class DateFieldScheduleTrigger {
// caching workflows in range, default to 5min
cacheCycle = 300_000;
+ onAfterStart = () => {
+ if (this.timer) {
+ return;
+ }
+
+ this.timer = setInterval(() => this.reload(), this.cacheCycle);
+
+ this.reload();
+ };
+
+ onBeforeStop = () => {
+ if (this.timer) {
+ clearInterval(this.timer);
+ }
+
+ for (const [key, timer] of this.cache.entries()) {
+ clearTimeout(timer);
+ this.cache.delete(key);
+ }
+ };
+
constructor(public workflow: Plugin) {
- workflow.app.on('afterStart', async () => {
- if (this.timer) {
- return;
- }
-
- this.timer = setInterval(() => this.reload(), this.cacheCycle);
-
- this.reload();
- });
-
- workflow.app.on('beforeStop', () => {
- if (this.timer) {
- clearInterval(this.timer);
- }
-
- for (const [key, timer] of this.cache.entries()) {
- clearTimeout(timer);
- this.cache.delete(key);
- }
- });
+ workflow.app.on('afterStart', this.onAfterStart);
+ workflow.app.on('beforeStop', this.onBeforeStop);
}
- async reload() {
+ reload() {
+ for (const [key, timer] of this.cache.entries()) {
+ clearTimeout(timer);
+ this.cache.delete(key);
+ }
+
const workflows = Array.from(this.workflow.enabledCache.values()).filter(
(item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.DATE_FIELD,
);
- // NOTE: clear cached jobs in last cycle
- this.cache = new Map();
-
- this.inspect(workflows);
+ workflows.forEach((workflow) => {
+ this.inspect(workflow);
+ });
}
- inspect(workflows: WorkflowModel[]) {
+ async inspect(workflow: WorkflowModel) {
const now = new Date();
-
- workflows.forEach(async (workflow) => {
- const records = await this.loadRecordsToSchedule(workflow, now);
- this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
- records.forEach((record) => {
- const nextTime = this.getRecordNextTime(workflow, record);
- this.schedule(workflow, record, nextTime, Boolean(nextTime));
- });
+ const records = await this.loadRecordsToSchedule(workflow, now);
+ this.workflow.getLogger(workflow.id).info(`[Schedule on date field] ${records.length} records to schedule`);
+ records.forEach((record) => {
+ const nextTime = this.getRecordNextTime(workflow, record);
+ this.schedule(workflow, record, nextTime, Boolean(nextTime));
});
}
@@ -233,8 +237,6 @@ export default class DateFieldScheduleTrigger {
[Op.gte]: new Date(endTimestamp),
},
});
- } else {
- this.workflow.getLogger(id).warn(`[Schedule on date field] "endsOn.field" is not configured`);
}
}
}
@@ -367,7 +369,7 @@ export default class DateFieldScheduleTrigger {
}
on(workflow: WorkflowModel) {
- this.inspect([workflow]);
+ this.inspect(workflow);
const { collection } = workflow.config;
const [dataSourceName, collectionName] = parseCollectionName(collection);
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
index 542746ed9a..61d8a56d58 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/triggers/ScheduleTrigger/StaticScheduleTrigger.ts
@@ -18,36 +18,39 @@ const MAX_SAFE_INTERVAL = 2147483647;
export default class StaticScheduleTrigger {
private timers: Map = new Map();
- constructor(public workflow: Plugin) {
- workflow.app.on('afterStart', async () => {
- const workflows = Array.from(this.workflow.enabledCache.values()).filter(
- (item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.STATIC,
- );
-
- this.inspect(workflows);
- });
-
- workflow.app.on('beforeStop', () => {
- for (const timer of this.timers.values()) {
- clearInterval(timer);
- }
- });
- }
-
- inspect(workflows: WorkflowModel[]) {
- const now = new Date();
+ onAfterStart = () => {
+ const workflows = Array.from(this.workflow.enabledCache.values()).filter(
+ (item) => item.type === 'schedule' && item.config.mode === SCHEDULE_MODE.STATIC,
+ );
workflows.forEach((workflow) => {
- const nextTime = this.getNextTime(workflow, now);
- if (nextTime) {
- this.workflow
- .getLogger(workflow.id)
- .info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
- } else {
- this.workflow.getLogger(workflow.id).info('workflow will not be scheduled');
- }
- this.schedule(workflow, nextTime, nextTime >= now.getTime());
+ this.inspect(workflow);
});
+ };
+
+ onBeforeStop = () => {
+ for (const timer of this.timers.values()) {
+ clearInterval(timer);
+ }
+ };
+
+ constructor(public workflow: Plugin) {
+ workflow.app.on('afterStart', this.onAfterStart);
+ workflow.app.on('beforeStop', this.onBeforeStop);
+ }
+
+ inspect(workflow: WorkflowModel) {
+ const now = new Date();
+
+ const nextTime = this.getNextTime(workflow, now);
+ if (nextTime) {
+ this.workflow
+ .getLogger(workflow.id)
+ .info(`caching scheduled workflow will run at: ${new Date(nextTime).toISOString()}`);
+ } else {
+ this.workflow.getLogger(workflow.id).info('workflow will not be scheduled');
+ }
+ this.schedule(workflow, nextTime, nextTime >= now.getTime());
}
getNextTime({ config, stats }: WorkflowModel, currentDate: Date, nextSecond = false) {
@@ -130,7 +133,7 @@ export default class StaticScheduleTrigger {
}
on(workflow) {
- this.inspect([workflow]);
+ this.inspect(workflow);
}
off(workflow) {
diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json
index 478fb8fde1..7240fe7b63 100644
--- a/packages/presets/nocobase/package.json
+++ b/packages/presets/nocobase/package.json
@@ -45,6 +45,7 @@
"@nocobase/plugin-gantt": "1.7.0-alpha.10",
"@nocobase/plugin-graph-collection-manager": "1.7.0-alpha.10",
"@nocobase/plugin-kanban": "1.7.0-alpha.10",
+ "@nocobase/plugin-locale-tester": "1.7.0-alpha.10",
"@nocobase/plugin-localization": "1.7.0-alpha.10",
"@nocobase/plugin-logger": "1.7.0-alpha.10",
"@nocobase/plugin-map": "1.7.0-alpha.10",
-
-## リリースノート
-
-リリースノートは[ブログ](https://www.nocobase.com/ja/blog/timeline)で随時更新され、週ごとにまとめて公開しています。
+