diff --git a/lerna.json b/lerna.json index 6cda57912..b3ffa6725 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": [ diff --git a/packages/app/client/package.json b/packages/app/client/package.json index 8d4d5b7e0..df518e546 100644 --- a/packages/app/client/package.json +++ b/packages/app/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/app-client", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "license": "MIT", "scripts": { "start": "umi dev", @@ -10,7 +10,7 @@ "test:coverage": "umi-test --coverage" }, "devDependencies": { - "@nocobase/client": "0.7.0-alpha.30", + "@nocobase/client": "0.7.0-alpha.32", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@umijs/test": "^3.5.20", diff --git a/packages/app/server/package.json b/packages/app/server/package.json index 9762b3def..267b97407 100644 --- a/packages/app/server/package.json +++ b/packages/app/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/app-server", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "license": "MIT", "main": "./lib/index.js", @@ -11,19 +11,19 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/database": "0.7.0-alpha.30", - "@nocobase/plugin-acl": "0.7.0-alpha.30", - "@nocobase/plugin-china-region": "0.7.0-alpha.30", - "@nocobase/plugin-client": "0.7.0-alpha.30", - "@nocobase/plugin-collection-manager": "0.7.0-alpha.30", - "@nocobase/plugin-error-handler": "0.7.0-alpha.30", - "@nocobase/plugin-file-manager": "0.7.0-alpha.30", - "@nocobase/plugin-system-settings": "0.7.0-alpha.30", - "@nocobase/plugin-ui-routes-storage": "0.7.0-alpha.30", - "@nocobase/plugin-ui-schema-storage": "0.7.0-alpha.30", - "@nocobase/plugin-users": "0.7.0-alpha.30", - "@nocobase/plugin-workflow": "0.7.0-alpha.30", - "@nocobase/server": "0.7.0-alpha.30" + "@nocobase/database": "0.7.0-alpha.32", + "@nocobase/plugin-acl": "0.7.0-alpha.32", + "@nocobase/plugin-china-region": "0.7.0-alpha.32", + "@nocobase/plugin-client": "0.7.0-alpha.32", + "@nocobase/plugin-collection-manager": "0.7.0-alpha.32", + "@nocobase/plugin-error-handler": "0.7.0-alpha.32", + "@nocobase/plugin-file-manager": "0.7.0-alpha.32", + "@nocobase/plugin-system-settings": "0.7.0-alpha.32", + "@nocobase/plugin-ui-routes-storage": "0.7.0-alpha.32", + "@nocobase/plugin-ui-schema-storage": "0.7.0-alpha.32", + "@nocobase/plugin-users": "0.7.0-alpha.32", + "@nocobase/plugin-workflow": "0.7.0-alpha.32", + "@nocobase/server": "0.7.0-alpha.32" }, "repository": { "type": "git", diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index e308b1c7d..af870a84e 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/acl", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "license": "Apache-2.0", "licenses": [ @@ -17,7 +17,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/resourcer": "0.7.0-alpha.30", + "@nocobase/resourcer": "0.7.0-alpha.32", "json-templates": "^4.2.0" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index a131cc273..e084ecb17 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/actions", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "license": "Apache-2.0", "licenses": [ @@ -17,8 +17,8 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/database": "0.7.0-alpha.30", - "@nocobase/resourcer": "0.7.0-alpha.30" + "@nocobase/database": "0.7.0-alpha.32", + "@nocobase/resourcer": "0.7.0-alpha.32" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 74e6f8788..0337aa04a 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "license": "Apache-2.0", "licenses": [ { @@ -29,7 +29,7 @@ "@formily/antd": "2.0.20", "@formily/core": "2.0.20", "@formily/react": "2.0.20", - "@nocobase/utils": "0.7.0-alpha.30", + "@nocobase/utils": "0.7.0-alpha.32", "ahooks": "^3.0.5", "antd": "~4.19.5", "axios": "^0.24.0", diff --git a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx index f571ebf34..b61df2203 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx @@ -20,10 +20,6 @@ export const ActionDrawer: ComposedActionDrawer = observer((props) => { } return buf; }); - - const closeHandler = () => { - setVisible(false); - }; return ( <> {createPortal( @@ -38,7 +34,7 @@ export const ActionDrawer: ComposedActionDrawer = observer((props) => { {...others} destroyOnClose visible={visible} - onClose={closeHandler} + onClose={() => setVisible(false, true)} className={classNames( others.className, css` diff --git a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx index 5d8b4c160..d8f12bb4d 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx @@ -32,7 +32,7 @@ export const ActionModal: ComposedActionDrawer = observer((props) => { {...others} destroyOnClose visible={visible} - onCancel={() => setVisible(false)} + onCancel={() => setVisible(false, true)} className={classNames( others.className, css` diff --git a/packages/core/client/src/schema-component/antd/action/hooks.ts b/packages/core/client/src/schema-component/antd/action/hooks.ts index 173dd37eb..0df389ca7 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks.ts @@ -16,10 +16,10 @@ export const useActionContext = () => { return { ...ctx, - setVisible(visible: boolean) { + setVisible(visible: boolean, confirm = false) { if (ctx?.openMode !== 'page') { if (!visible) { - if (ctx.formValueChanged) { + if (confirm && ctx.formValueChanged) { AntdModal.confirm({ title: t('Unsaved changes'), content: t("Are you sure you don't want to save?"), diff --git a/packages/core/create-nocobase-app/package.json b/packages/core/create-nocobase-app/package.json index 4514d59c8..aac5d6876 100755 --- a/packages/core/create-nocobase-app/package.json +++ b/packages/core/create-nocobase-app/package.json @@ -1,6 +1,6 @@ { "name": "create-nocobase-app", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "src/index.js", "license": "Apache-2.0", "licenses": [ diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 39e09440e..c19b323a6 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/database", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -17,7 +17,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/utils": "0.7.0-alpha.30", + "@nocobase/utils": "0.7.0-alpha.32", "async-mutex": "^0.3.2", "deepmerge": "^4.2.2", "flat": "^5.0.2", diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json index 7f388bf4e..519781b53 100644 --- a/packages/core/resourcer/package.json +++ b/packages/core/resourcer/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/resourcer", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "main": "./lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/core/server/package.json b/packages/core/server/package.json index 912afa219..72d3e0e8d 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/server", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -18,10 +18,10 @@ "dependencies": { "@koa/cors": "^3.1.0", "@koa/router": "^9.4.0", - "@nocobase/acl": "0.7.0-alpha.30", - "@nocobase/actions": "0.7.0-alpha.30", - "@nocobase/database": "0.7.0-alpha.30", - "@nocobase/resourcer": "0.7.0-alpha.30", + "@nocobase/acl": "0.7.0-alpha.32", + "@nocobase/actions": "0.7.0-alpha.32", + "@nocobase/database": "0.7.0-alpha.32", + "@nocobase/resourcer": "0.7.0-alpha.32", "chalk": "^4.1.1", "commander": "^8.1.0", "dotenv": "^8.2.0", diff --git a/packages/core/test/package.json b/packages/core/test/package.json index 66e626653..5ca58a477 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/test", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", @@ -16,7 +16,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "0.7.0-alpha.30", + "@nocobase/server": "0.7.0-alpha.32", "@types/supertest": "^2.0.11", "mockjs": "^1.1.0", "mysql2": "^2.1.0", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 58e8c4f14..119c47222 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/utils", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "types": "./lib/index.d.ts", "license": "Apache-2.0", diff --git a/packages/plugins/acl/package.json b/packages/plugins/acl/package.json index 7dddf8348..34ffcf3a5 100644 --- a/packages/plugins/acl/package.json +++ b/packages/plugins/acl/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-acl", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "license": "Apache-2.0", "licenses": [ @@ -17,9 +17,9 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/acl": "0.7.0-alpha.30", - "@nocobase/database": "0.7.0-alpha.30", - "@nocobase/server": "0.7.0-alpha.30" + "@nocobase/acl": "0.7.0-alpha.32", + "@nocobase/database": "0.7.0-alpha.32", + "@nocobase/server": "0.7.0-alpha.32" }, "repository": { "type": "git", diff --git a/packages/plugins/action-logs/package.json b/packages/plugins/action-logs/package.json index 1bd7a4ce0..35a175dbb 100644 --- a/packages/plugins/action-logs/package.json +++ b/packages/plugins/action-logs/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-action-logs", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,7 +15,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/china-region/package.json b/packages/plugins/china-region/package.json index 116f1faaa..aee9282b5 100644 --- a/packages/plugins/china-region/package.json +++ b/packages/plugins/china-region/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-china-region", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -18,7 +18,7 @@ "china-division": "^2.4.0" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/client/package.json b/packages/plugins/client/package.json index 7e72f9515..92c1da4f0 100644 --- a/packages/plugins/client/package.json +++ b/packages/plugins/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-client", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,10 +15,10 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "0.7.0-alpha.30" + "@nocobase/server": "0.7.0-alpha.32" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/collection-manager/package.json b/packages/plugins/collection-manager/package.json index 1b2c2c453..867dd8148 100644 --- a/packages/plugins/collection-manager/package.json +++ b/packages/plugins/collection-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-collection-manager", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,7 +15,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/error-handler/package.json b/packages/plugins/error-handler/package.json index 397119c9d..2103fee27 100644 --- a/packages/plugins/error-handler/package.json +++ b/packages/plugins/error-handler/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-error-handler", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "description": "", "license": "Apache-2.0", "licenses": [ @@ -18,7 +18,7 @@ }, "dependencies": { "@formily/json-schema": "^2.0.15", - "@nocobase/server": "0.7.0-alpha.30" + "@nocobase/server": "0.7.0-alpha.32" }, "repository": { "type": "git", diff --git a/packages/plugins/file-manager/package.json b/packages/plugins/file-manager/package.json index 5a4832054..f268e05be 100644 --- a/packages/plugins/file-manager/package.json +++ b/packages/plugins/file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -16,7 +16,7 @@ }, "dependencies": { "@koa/multer": "^3.0.0", - "@nocobase/server": "0.7.0-alpha.30", + "@nocobase/server": "0.7.0-alpha.32", "aws-sdk": "^2.2.32", "koa-static": "^5.0.0", "mime-match": "^1.0.2", @@ -26,7 +26,7 @@ "multer-s3": "^2.10.0" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30", + "@nocobase/test": "0.7.0-alpha.32", "@types/koa-multer": "^1.0.1", "@types/multer": "^1.4.5" }, diff --git a/packages/plugins/multi-app-manager/package.json b/packages/plugins/multi-app-manager/package.json index a01214aaa..2c8d57090 100644 --- a/packages/plugins/multi-app-manager/package.json +++ b/packages/plugins/multi-app-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-multi-app-manager", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,7 +15,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/server": "0.7.0-alpha.30" + "@nocobase/server": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/notifications/package.json b/packages/plugins/notifications/package.json index ca172dfdf..72be3af46 100644 --- a/packages/plugins/notifications/package.json +++ b/packages/plugins/notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -18,7 +18,7 @@ "nodemailer": "^6.6.1" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30", + "@nocobase/test": "0.7.0-alpha.32", "@types/nodemailer": "6.4.4", "nodemailer-mock": "^1.5.11" }, diff --git a/packages/plugins/system-settings/package.json b/packages/plugins/system-settings/package.json index 51eef8224..efe5868e5 100644 --- a/packages/plugins/system-settings/package.json +++ b/packages/plugins/system-settings/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-system-settings", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,7 +15,7 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/ui-routes-storage/package.json b/packages/plugins/ui-routes-storage/package.json index f0b22ab12..caa11836d 100644 --- a/packages/plugins/ui-routes-storage/package.json +++ b/packages/plugins/ui-routes-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-routes-storage", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -18,7 +18,7 @@ "flat-to-nested": "^1.1.1" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/ui-schema-storage/package.json b/packages/plugins/ui-schema-storage/package.json index 21d9ab13e..ed61ffaf2 100644 --- a/packages/plugins/ui-schema-storage/package.json +++ b/packages/plugins/ui-schema-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-ui-schema-storage", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -16,7 +16,7 @@ }, "devDependencies": { "@formily/json-schema": "2.0.20", - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" } diff --git a/packages/plugins/users/package.json b/packages/plugins/users/package.json index 7fc1e70ec..44a849d89 100644 --- a/packages/plugins/users/package.json +++ b/packages/plugins/users/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-users", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -18,7 +18,7 @@ "jsonwebtoken": "^8.5.1" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30", + "@nocobase/test": "0.7.0-alpha.32", "@types/jsonwebtoken": "^8.5.8" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" diff --git a/packages/plugins/workflow/package.json b/packages/plugins/workflow/package.json index 4bfc0caa6..5b59e07f5 100644 --- a/packages/plugins/workflow/package.json +++ b/packages/plugins/workflow/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-workflow", - "version": "0.7.0-alpha.30", + "version": "0.7.0-alpha.32", "main": "lib/index.js", "license": "Apache-2.0", "licenses": [ @@ -15,14 +15,14 @@ "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm" }, "dependencies": { - "@nocobase/actions": "0.7.0-alpha.30", - "@nocobase/database": "0.7.0-alpha.30", - "@nocobase/server": "0.7.0-alpha.30", - "@nocobase/utils": "0.7.0-alpha.30", + "@nocobase/actions": "0.7.0-alpha.32", + "@nocobase/database": "0.7.0-alpha.32", + "@nocobase/server": "0.7.0-alpha.32", + "@nocobase/utils": "0.7.0-alpha.32", "json-templates": "^4.2.0" }, "devDependencies": { - "@nocobase/test": "0.7.0-alpha.30" + "@nocobase/test": "0.7.0-alpha.32" }, "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a" }