Merge remote-tracking branch 'upstream/next' into next

ldq1220 · Dec 24, 2024 · 8cdec03 · 8cdec03
2 parents 1362ccd + 0485db6
commit 8cdec03
Show file tree

Hide file tree

Showing 95 changed files with 239 additions and 216 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "npmClientArgs": ["--ignore-engines"],

diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.5.0-beta.15",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/resourcer": "1.5.0-beta.16",
+    "@nocobase/utils": "1.5.0-beta.16",
     "minimatch": "^5.1.1"
   },
   "repository": {

diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/actions",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cache": "1.5.0-beta.15",
-    "@nocobase/database": "1.5.0-beta.15",
-    "@nocobase/resourcer": "1.5.0-beta.15"
+    "@nocobase/cache": "1.5.0-beta.16",
+    "@nocobase/database": "1.5.0-beta.16",
+    "@nocobase/resourcer": "1.5.0-beta.16"
   },
   "repository": {
     "type": "git",

diff --git a/packages/core/app/package.json b/packages/core/app/package.json
@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/app",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/database": "1.5.0-beta.15",
-    "@nocobase/preset-nocobase": "1.5.0-beta.15",
-    "@nocobase/server": "1.5.0-beta.15"
+    "@nocobase/database": "1.5.0-beta.16",
+    "@nocobase/preset-nocobase": "1.5.0-beta.16",
+    "@nocobase/server": "1.5.0-beta.16"
   },
   "devDependencies": {
-    "@nocobase/client": "1.5.0-beta.15"
+    "@nocobase/client": "1.5.0-beta.16"
   },
   "repository": {
     "type": "git",

diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/auth",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.5.0-beta.15",
-    "@nocobase/cache": "1.5.0-beta.15",
-    "@nocobase/database": "1.5.0-beta.15",
-    "@nocobase/resourcer": "1.5.0-beta.15",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/actions": "1.5.0-beta.16",
+    "@nocobase/cache": "1.5.0-beta.16",
+    "@nocobase/database": "1.5.0-beta.16",
+    "@nocobase/resourcer": "1.5.0-beta.16",
+    "@nocobase/utils": "1.5.0-beta.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },

diff --git a/packages/core/build/package.json b/packages/core/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",

diff --git a/packages/core/build/src/buildPlugin.ts b/packages/core/build/src/buildPlugin.ts
@@ -339,7 +339,7 @@ export async function buildPluginClient(cwd: string, userConfig: UserConfig, sou
       path: outDir,
       filename: outputFileName,
       chunkFilename: '[chunkhash].js',
-      publicPath: `/static/plugins/${packageJson.name}/dist/client/`,
+      publicPath: `auto`, // will be generated by the custom plugin
       clean: true,
       library: {
         name: packageJson.name,
@@ -467,14 +467,36 @@ export async function buildPluginClient(cwd: string, userConfig: UserConfig, sou
       new rspack.DefinePlugin({
         'process.env.NODE_ENV': JSON.stringify('production'),
       }),
+      {
+        apply(compiler) {
+          compiler.hooks.compilation.tap('CustomPublicPathPlugin', (compilation) => {
+            compilation.hooks.runtimeModule.tap('CustomPublicPathPlugin', (module) => {
+              if (module.name === 'auto_public_path') {
+                // 处理所有可能的情况
+                module.source = {
+                  source: `
+__webpack_require__.p = (function() {
+  var publicPath = window['__nocobase_public_path__'] || '/';
+  // 确保路径以 / 结尾
+  if (!publicPath.endsWith('/')) {
+    publicPath += '/';
+  }
+  return publicPath + 'static/plugins/${packageJson.name}/dist/client/';
+})();`
+                };
+              }
+            });
+          });
+        }
+      },
       process.env.BUILD_ANALYZE === 'true' &&
-        new RsdoctorRspackPlugin({
-          // plugin options
-          // supports: {
-          //   generateTileGraph: true,
-          // },
-          mode: 'brief',
-        }),
+      new RsdoctorRspackPlugin({
+        // plugin options
+        // supports: {
+        //   generateTileGraph: true,
+        // },
+        mode: 'brief',
+      }),
     ].filter(Boolean),
     node: {
       global: true,

diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cache",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",

diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/cli",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "bin": {
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "1.5.0-beta.15",
+    "@nocobase/app": "1.5.0-beta.16",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,7 +25,7 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "1.5.0-beta.15"
+    "@nocobase/devtools": "1.5.0-beta.16"
   },
   "repository": {
     "type": "git",

diff --git a/packages/core/client/package.json b/packages/core/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,9 +27,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "1.5.0-beta.15",
-    "@nocobase/sdk": "1.5.0-beta.15",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/evaluators": "1.5.0-beta.16",
+    "@nocobase/sdk": "1.5.0-beta.16",
+    "@nocobase/utils": "1.5.0-beta.16",
     "ahooks": "^3.7.2",
     "antd": "5.12.8",
     "antd-style": "3.7.1",

diff --git a/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx b/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx
@@ -82,6 +82,7 @@ export const FormFieldLinkageRuleAction = observer(
                 setDataIndex(value);
               }}
               placeholder={t('Select field')}
+              treeNodeFilterProp="title"
             />
             <Select
               // @ts-ignore

diff --git 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": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "main": "src/index.js",
   "license": "AGPL-3.0",
   "dependencies": {

diff --git a/packages/core/data-source-manager/package.json b/packages/core/data-source-manager/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.5.0-beta.15",
-    "@nocobase/cache": "1.5.0-beta.15",
-    "@nocobase/database": "1.5.0-beta.15",
-    "@nocobase/resourcer": "1.5.0-beta.15",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/actions": "1.5.0-beta.16",
+    "@nocobase/cache": "1.5.0-beta.16",
+    "@nocobase/database": "1.5.0-beta.16",
+    "@nocobase/resourcer": "1.5.0-beta.16",
+    "@nocobase/utils": "1.5.0-beta.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },

diff --git a/packages/core/database/package.json b/packages/core/database/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.5.0-beta.15",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/logger": "1.5.0-beta.16",
+    "@nocobase/utils": "1.5.0-beta.16",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",

diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/devtools",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "1.5.0-beta.15",
-    "@nocobase/client": "1.5.0-beta.15",
-    "@nocobase/test": "1.5.0-beta.15",
+    "@nocobase/build": "1.5.0-beta.16",
+    "@nocobase/client": "1.5.0-beta.16",
+    "@nocobase/test": "1.5.0-beta.16",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",

diff --git a/packages/core/evaluators/package.json b/packages/core/evaluators/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
     "@formulajs/formulajs": "4.2.0",
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/utils": "1.5.0-beta.16",
     "mathjs": "^10.6.0"
   },
   "repository": {

diff --git a/packages/core/lock-manager/package.json b/packages/core/lock-manager/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nocobase/lock-manager",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "main": "lib/index.js",
   "license": "AGPL-3.0",
   "devDependencies": {
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/utils": "1.5.0-beta.16",
     "async-mutex": "^0.5.0"
   }
 }
diff --git a/packages/core/logger/package.json b/packages/core/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/logger",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "nocobase logging library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",

diff --git a/packages/core/resourcer/package.json b/packages/core/resourcer/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/utils": "1.5.0-beta.16",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",

diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/sdk",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "license": "AGPL-3.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/packages/core/server/package.json b/packages/core/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.5.0-beta.15",
+    "version": "1.5.0-beta.16",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.5.0-beta.15",
-        "@nocobase/actions": "1.5.0-beta.15",
-        "@nocobase/auth": "1.5.0-beta.15",
-        "@nocobase/cache": "1.5.0-beta.15",
-        "@nocobase/data-source-manager": "1.5.0-beta.15",
-        "@nocobase/database": "1.5.0-beta.15",
-        "@nocobase/evaluators": "1.5.0-beta.15",
-        "@nocobase/lock-manager": "1.5.0-beta.15",
-        "@nocobase/logger": "1.5.0-beta.15",
-        "@nocobase/resourcer": "1.5.0-beta.15",
-        "@nocobase/sdk": "1.5.0-beta.15",
-        "@nocobase/telemetry": "1.5.0-beta.15",
-        "@nocobase/utils": "1.5.0-beta.15",
+        "@nocobase/acl": "1.5.0-beta.16",
+        "@nocobase/actions": "1.5.0-beta.16",
+        "@nocobase/auth": "1.5.0-beta.16",
+        "@nocobase/cache": "1.5.0-beta.16",
+        "@nocobase/data-source-manager": "1.5.0-beta.16",
+        "@nocobase/database": "1.5.0-beta.16",
+        "@nocobase/evaluators": "1.5.0-beta.16",
+        "@nocobase/lock-manager": "1.5.0-beta.16",
+        "@nocobase/logger": "1.5.0-beta.16",
+        "@nocobase/resourcer": "1.5.0-beta.16",
+        "@nocobase/sdk": "1.5.0-beta.16",
+        "@nocobase/telemetry": "1.5.0-beta.16",
+        "@nocobase/utils": "1.5.0-beta.16",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",

diff --git a/packages/core/telemetry/package.json b/packages/core/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/telemetry",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.16",
   "description": "nocobase telemetry library",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
@@ -11,7 +11,7 @@
     "directory": "packages/telemetry"
   },
   "dependencies": {
-    "@nocobase/utils": "1.5.0-beta.15",
+    "@nocobase/utils": "1.5.0-beta.16",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/instrumentation": "^0.46.0",
     "@opentelemetry/resources": "^1.19.0",