@nocobase/plugin-data-source-manager 1.9.31 → 1.9.33

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.9.31",
+  "@nocobase/client": "1.9.33",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "1.9.31",
-  "@nocobase/utils": "1.9.31",
-  "@nocobase/server": "1.9.31",
-  "@nocobase/data-source-manager": "1.9.31",
+  "@nocobase/plugin-acl": "1.9.33",
+  "@nocobase/utils": "1.9.33",
+  "@nocobase/server": "1.9.33",
+  "@nocobase/data-source-manager": "1.9.33",
   "lodash": "4.17.21",
-  "@nocobase/acl": "1.9.31",
+  "@nocobase/acl": "1.9.33",
   "@ant-design/icons": "5.6.1",
   "antd": "5.24.2",
   "react-router-dom": "6.28.1",
@@ -23,9 +23,9 @@ module.exports = {
   "@formily/shared": "2.3.2",
   "react-i18next": "11.18.6",
   "@emotion/css": "11.13.0",
-  "@nocobase/database": "1.9.31",
+  "@nocobase/database": "1.9.33",
   "sequelize": "6.35.2",
-  "@nocobase/test": "1.9.31",
+  "@nocobase/test": "1.9.33",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.0",
   "@formily/reactive": "2.3.0",

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

@@ -21,6 +21,7 @@ export declare class DataSourceModel extends Model {
         transaction?: Transaction;
         loadAtAfterStart?: boolean;
         refresh?: boolean;
+        reuseDB?: boolean;
     }): Promise<void>;
     private loadLocalData;
 }

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

@@ -98,7 +98,7 @@ class DataSourceModel extends import_database.Model {
     }
   }
   async loadIntoApplication(options) {
-    const { app, loadAtAfterStart, refresh } = options;
+    const { app, loadAtAfterStart, refresh, reuseDB } = options;
     const dataSourceKey = this.get("key");
     const pluginDataSourceManagerServer = app.pm.get("data-source-manager");
     if (pluginDataSourceManagerServer.dataSourceStatus[dataSourceKey] === "loaded") {
@@ -109,13 +109,16 @@ class DataSourceModel extends import_database.Model {
     const type = this.get("type");
     const createOptions = this.get("options");
     try {
+      const oldDataSource = app.dataSourceManager.get(dataSourceKey);
+      const { db: databaseInstance = void 0 } = reuseDB === true ? (oldDataSource == null ? void 0 : oldDataSource.collectionManager) ?? {} : {};
       const dataSource = app.dataSourceManager.factory.create(type, {
         ...createOptions,
         name: dataSourceKey,
         logger: app.logger.child({ dataSourceKey }),
         sqlLogger: app.sqlLogger.child({ dataSourceKey }),
         cache: app.cache,
-        storagePath: import_path.default.join(process.cwd(), "storage", "cache", "apps", app.name)
+        storagePath: import_path.default.join(process.cwd(), "storage", "cache", "apps", app.name),
+        databaseInstance
       });
       dataSource.on("loadingProgress", (progress) => {
         pluginDataSourceManagerServer.dataSourceLoadingProgress[dataSourceKey] = progress;
@@ -137,7 +140,8 @@ class DataSourceModel extends import_database.Model {
       await this.loadIntoACL({ app, acl, transaction: options.transaction });
       await app.dataSourceManager.add(dataSource, {
         localData: await this.loadLocalData(),
-        refresh
+        refresh,
+        reuseDB
       });
     } catch (e) {
       app.logger.error(`load data source failed`, { cause: e });

package/dist/server/plugin.js

@@ -397,7 +397,8 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         if (canRefreshStatus.includes(currentStatus) && (clientStatus ? clientStatus && canRefreshStatus.includes(clientStatus) : true)) {
           dataSourceModel.loadIntoApplication({
             app: ctx.app,
-            refresh: true
+            refresh: true,
+            reuseDB: true
           });
           ctx.app.syncMessageManager.publish(self.name, {
             type: "loadDataSource",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.9.31",
+  "version": "1.9.33",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.ru-RU": "Менеджер управления источниками данных",
@@ -20,5 +20,5 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "c148b30b66f88ff14fb44bab78998ffe55c92ca0"
+  "gitHead": "705580251f0deffaf2a8c7c85006c770741941d3"
 }