@nocobase/plugin-data-source-manager 2.2.0-beta.17 → 2.2.0-beta.18

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.2.0-beta.17",
+  "@nocobase/client": "2.2.0-beta.18",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "2.2.0-beta.17",
-  "@nocobase/utils": "2.2.0-beta.17",
-  "@nocobase/flow-engine": "2.2.0-beta.17",
-  "@nocobase/client-v2": "2.2.0-beta.17",
-  "@nocobase/ai": "2.2.0-beta.17",
-  "@nocobase/server": "2.2.0-beta.17",
-  "@nocobase/data-source-manager": "2.2.0-beta.17",
+  "@nocobase/plugin-acl": "2.2.0-beta.18",
+  "@nocobase/utils": "2.2.0-beta.18",
+  "@nocobase/flow-engine": "2.2.0-beta.18",
+  "@nocobase/client-v2": "2.2.0-beta.18",
+  "@nocobase/ai": "2.2.0-beta.18",
+  "@nocobase/server": "2.2.0-beta.18",
+  "@nocobase/data-source-manager": "2.2.0-beta.18",
   "lodash": "4.18.1",
-  "@nocobase/acl": "2.2.0-beta.17",
-  "@nocobase/database": "2.2.0-beta.17",
+  "@nocobase/acl": "2.2.0-beta.18",
+  "@nocobase/database": "2.2.0-beta.18",
   "@ant-design/icons": "5.6.1",
   "antd": "5.24.2",
   "react-router-dom": "6.30.1",
@@ -28,9 +28,9 @@ module.exports = {
   "react-i18next": "11.18.6",
   "@emotion/css": "11.13.0",
   "ahooks": "3.7.8",
-  "@nocobase/actions": "2.2.0-beta.17",
+  "@nocobase/actions": "2.2.0-beta.18",
   "sequelize": "6.35.2",
-  "@nocobase/test": "2.2.0-beta.17",
+  "@nocobase/test": "2.2.0-beta.18",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.7",
   "@formily/reactive": "2.3.7",

package/dist/node_modules/zod/package.json

@@ -1 +1 @@
-{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-08-10T16:50:24.153Z"}
+{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-08-20T12:47:03.401Z"}

package/dist/server/middlewares/load-tables.js

@@ -47,10 +47,11 @@ async function loadDataSourceTablesIntoCollections(ctx, next) {
   if (resourceName === "dataSources" && (actionName === "create" || actionName === "update")) {
     const dataSourcesRepo = ctx.app.db.getRepository("dataSources");
     const { options, type, collections, key } = params.values || {};
+    let model;
     const dataSourceProvider = actionName === "update" ? {
       get: async () => {
         const { filterByTk } = params;
-        const model = await dataSourcesRepo.findByTargetKey(filterByTk);
+        model = await dataSourcesRepo.findByTargetKey(filterByTk);
         if (import_lodash.default.isEqual(model.get("options"), options)) {
           return ctx.app.dataSourceManager.get(filterByTk);
         } else {
@@ -78,6 +79,10 @@ async function loadDataSourceTablesIntoCollections(ctx, next) {
           `The number of collections exceeds the limit of ${import_constants.ALLOW_MAX_COLLECTIONS_COUNT}. Please remove some collections before adding new ones.`
         );
       }
+    } else if (model && (collections == null ? void 0 : collections.length)) {
+      await dataSource.loadTables(ctx, collections, {
+        localData: await model.loadLocalData()
+      });
     } else {
       await dataSource.loadTables(ctx, collections);
     }

package/dist/server/models/data-source.d.ts

@@ -8,6 +8,7 @@
  */
 import { ACL } from '@nocobase/acl';
 import { Model, Transaction } from '@nocobase/database';
+import { LoadedCollections } from '@nocobase/data-source-manager';
 import { Application } from '@nocobase/server';
 export declare class DataSourceModel extends Model {
     isMainRecord(): boolean;
@@ -23,5 +24,5 @@ export declare class DataSourceModel extends Model {
         refresh?: boolean;
         reuseDB?: boolean;
     }): Promise<void>;
-    private loadLocalData;
+    loadLocalData(): Promise<LoadedCollections>;
 }

package/dist/server/models/data-source.js

@@ -166,16 +166,17 @@ class DataSourceModel extends import_database.Model {
     for (const remoteField of remoteFields) {
       const remoteFieldOptions = remoteField.toJSON();
       const collectionName = remoteFieldOptions.collectionName;
-      if (!localData[collectionName]) {
-        localData[collectionName] = {
+      let localCollection = localData[collectionName];
+      if (!localCollection) {
+        localCollection = {
           name: collectionName,
           fields: []
         };
+        localData[collectionName] = localCollection;
       }
-      if (!localData[collectionName].fields) {
-        localData[collectionName].fields = [];
-      }
-      localData[collectionName].fields.push(remoteFieldOptions);
+      const fields = localCollection.fields || [];
+      fields.push(remoteFieldOptions);
+      localCollection.fields = fields;
     }
     return localData;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "2.2.0-beta.17",
+  "version": "2.2.0-beta.18",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.ru-RU": "Менеджер управления источниками данных",
@@ -22,6 +22,6 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "d7a69c4f47fe38b17a2ce1408258902cf64f6c83",
+  "gitHead": "b74c962f7d35aa12012d908d16bd74fe6ac20a3d",
   "license": "Apache-2.0"
 }