@nocobase/plugin-data-source-manager 1.6.0-alpha.7 → 1.6.0-alpha.8

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.7",
+  "@nocobase/client": "1.6.0-alpha.8",
   "react": "18.2.0",
-  "@nocobase/plugin-acl": "1.6.0-alpha.7",
-  "@nocobase/utils": "1.6.0-alpha.7",
-  "@nocobase/server": "1.6.0-alpha.7",
+  "@nocobase/plugin-acl": "1.6.0-alpha.8",
+  "@nocobase/utils": "1.6.0-alpha.8",
+  "@nocobase/server": "1.6.0-alpha.8",
   "lodash": "4.17.21",
-  "@nocobase/data-source-manager": "1.6.0-alpha.7",
+  "@nocobase/data-source-manager": "1.6.0-alpha.8",
   "@ant-design/icons": "5.2.6",
   "antd": "5.12.8",
   "react-router-dom": "6.21.0",
@@ -22,10 +22,10 @@ module.exports = {
   "react-i18next": "11.18.6",
   "@formily/react": "2.3.0",
   "@emotion/css": "11.13.0",
-  "@nocobase/database": "1.6.0-alpha.7",
-  "@nocobase/acl": "1.6.0-alpha.7",
+  "@nocobase/database": "1.6.0-alpha.8",
+  "@nocobase/acl": "1.6.0-alpha.8",
   "sequelize": "6.35.2",
-  "@nocobase/test": "1.6.0-alpha.7",
+  "@nocobase/test": "1.6.0-alpha.8",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
   "@formily/reactive": "2.3.0",

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

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

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

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var data_source_exports = {};
 __export(data_source_exports, {
@@ -31,6 +41,7 @@ __export(data_source_exports, {
 module.exports = __toCommonJS(data_source_exports);
 var import_database = require("@nocobase/database");
 var import_plugin_acl = require("@nocobase/plugin-acl");
+var path = __toESM(require("path"));
 const availableActions = {
   create: {
     displayName: '{{t("Add new")}}',
@@ -87,7 +98,7 @@ class DataSourceModel extends import_database.Model {
     }
   }
   async loadIntoApplication(options) {
-    const { app, loadAtAfterStart } = options;
+    const { app, loadAtAfterStart, refresh } = options;
     const dataSourceKey = this.get("key");
     const pluginDataSourceManagerServer = app.pm.get("data-source-manager");
     if (pluginDataSourceManagerServer.dataSourceStatus[dataSourceKey] === "loaded") {
@@ -102,7 +113,9 @@ class DataSourceModel extends import_database.Model {
         ...createOptions,
         name: dataSourceKey,
         logger: app.logger.child({ dataSourceKey }),
-        sqlLogger: app.sqlLogger.child({ dataSourceKey })
+        sqlLogger: app.sqlLogger.child({ dataSourceKey }),
+        cache: app.cache,
+        storagePath: path.join(process.cwd(), "storage", "cache", "apps", app.name)
       });
       dataSource.on("loadingProgress", (progress) => {
         pluginDataSourceManagerServer.dataSourceLoadingProgress[dataSourceKey] = progress;
@@ -122,7 +135,8 @@ class DataSourceModel extends import_database.Model {
       dataSource.resourceManager.use(import_plugin_acl.setCurrentRole, { tag: "setCurrentRole", before: "acl", after: "auth" });
       await this.loadIntoACL({ app, acl, transaction: options.transaction });
       await app.dataSourceManager.add(dataSource, {
-        localData: await this.loadLocalData()
+        localData: await this.loadLocalData(),
+        refresh
       });
     } catch (e) {
       app.logger.error(`load data source failed`, { cause: e });

package/dist/server/models/data-sources-field-model.d.ts

@@ -14,5 +14,6 @@ type LoadOptions = {
 export declare class DataSourcesFieldModel extends MagicAttributeModel {
     load(loadOptions: LoadOptions): void;
     unload(loadOptions: LoadOptions): void;
+    toJSON(): any;
 }
 export {};

package/dist/server/models/data-sources-field-model.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var data_sources_field_model_exports = {};
 __export(data_sources_field_model_exports, {
@@ -30,11 +40,12 @@ __export(data_sources_field_model_exports, {
 });
 module.exports = __toCommonJS(data_sources_field_model_exports);
 var import_database = require("@nocobase/database");
+var import_lodash = __toESM(require("lodash"));
 var import_utils = require("../utils");
 class DataSourcesFieldModel extends import_database.MagicAttributeModel {
   load(loadOptions) {
     const { app } = loadOptions;
-    const options = this.get();
+    const options = this.toJSON();
     const { collectionName, name, dataSourceKey, field } = options;
     const dataSource = app.dataSourceManager.dataSources.get(dataSourceKey);
     const collection = dataSource.collectionManager.getCollection(collectionName);
@@ -52,7 +63,7 @@ class DataSourcesFieldModel extends import_database.MagicAttributeModel {
   }
   unload(loadOptions) {
     const { app } = loadOptions;
-    const options = this.get();
+    const options = this.toJSON();
     const { collectionName, name, dataSourceKey } = options;
     const dataSource = app.dataSourceManager.dataSources.get(dataSourceKey);
     if (!dataSource) {
@@ -64,6 +75,13 @@ class DataSourcesFieldModel extends import_database.MagicAttributeModel {
     }
     collection.removeField(name);
   }
+  toJSON() {
+    const json = super.toJSON();
+    if (json.interface === "unixTimestamp" && json.accuracy) {
+      import_lodash.default.set(json, "uiSchema.x-component-props.accuracy", json.accuracy);
+    }
+    return json;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server/plugin.js

@@ -363,7 +363,8 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         const currentStatus = plugin.dataSourceStatus[filterByTk];
         if (canRefreshStatus.includes(currentStatus) && (clientStatus ? clientStatus && canRefreshStatus.includes(clientStatus) : true)) {
           dataSourceModel.loadIntoApplication({
-            app: ctx.app
+            app: ctx.app,
+            refresh: true
           });
           ctx.app.syncMessageManager.publish(self.name, {
             type: "loadDataSource",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "1.6.0-alpha.7",
+  "version": "1.6.0-alpha.8",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
@@ -17,5 +17,5 @@
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "d9552440f5e3ce2795c9f2f23a1b04f5376a1550"
+  "gitHead": "f7ab757a5d7fb723c96bc9c1340291e4deec03ea"
 }