@nocobase/plugin-data-source-main 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/externalVersion.js

@@ -8,15 +8,15 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-beta.2",
+  "@nocobase/client": "2.0.0-beta.3",
   "lodash": "4.17.21",
-  "@nocobase/database": "2.0.0-beta.2",
-  "@nocobase/plugin-error-handler": "2.0.0-beta.2",
-  "@nocobase/server": "2.0.0-beta.2",
+  "@nocobase/database": "2.0.0-beta.3",
+  "@nocobase/plugin-error-handler": "2.0.0-beta.3",
+  "@nocobase/server": "2.0.0-beta.3",
   "sequelize": "6.35.2",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/test": "2.0.0-beta.2",
-  "@nocobase/utils": "2.0.0-beta.2",
-  "@nocobase/actions": "2.0.0-beta.2",
+  "@nocobase/test": "2.0.0-beta.3",
+  "@nocobase/utils": "2.0.0-beta.3",
+  "@nocobase/actions": "2.0.0-beta.3",
   "dayjs": "1.11.13"
 };

package/dist/server/server.js

@@ -416,40 +416,66 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     this.app.resourceManager.registerActionHandlers(import_collections.default);
     this.app.resourceManager.define(import_main_data_source.default);
     const handleFieldSource = (fields, rawFields) => {
-      var _a;
-      for (const field of import_lodash.default.castArray(fields)) {
-        if (field.get("source")) {
-          const [collectionSource, fieldSource] = field.get("source").split(".");
-          const collectionField = (_a = this.app.db.getCollection(collectionSource)) == null ? void 0 : _a.getField(fieldSource);
-          if (!collectionField) {
-            continue;
+      import_lodash.default.castArray(fields).forEach((field, index) => {
+        var _a;
+        let source;
+        if (field && typeof field.get === "function") {
+          source = field.get("source");
+        } else {
+          source = field == null ? void 0 : field.source;
+        }
+        if (!source) {
+          return;
+        }
+        const [collectionSource, fieldSource] = source.split(".");
+        const collectionField = (_a = this.app.db.getCollection(collectionSource)) == null ? void 0 : _a.getField(fieldSource);
+        if (!collectionField) {
+          return;
+        }
+        const newOptions = {};
+        import_lodash.default.merge(newOptions, import_lodash.default.omit(collectionField.options, "name"));
+        const currentValues = field && typeof field.get === "function" ? field.get() : field;
+        import_lodash.default.mergeWith(newOptions, currentValues, (objValue, srcValue) => {
+          if (srcValue === null) {
+            return objValue;
           }
-          const newOptions = {};
-          import_lodash.default.merge(newOptions, import_lodash.default.omit(collectionField.options, "name"));
-          import_lodash.default.mergeWith(newOptions, field.get(), (objValue, srcValue) => {
-            if (srcValue === null) {
-              return objValue;
-            }
-          });
+        });
+        if (field && typeof field.set === "function") {
           field.set("options", newOptions);
+        } else {
+          fields[index] = {
+            ...field,
+            ...newOptions
+          };
         }
         const fieldTypes = import_database.fieldTypeMap[this.db.options.dialect];
         if (rawFields && fieldTypes) {
-          const rawField = rawFields[field.get("name")];
-          if (rawField && !import_constants.PRESET_FIELDS_INTERFACES.includes(field.get("interface"))) {
-            const mappedType = (0, import_database.extractTypeFromDefinition)(rawField.type);
-            const possibleTypes = fieldTypes[mappedType];
-            field.set("possibleTypes", possibleTypes);
+          const fieldName = field && typeof field.get === "function" ? field.get("name") : field == null ? void 0 : field.name;
+          const rawField = rawFields[fieldName];
+          if (rawField) {
+            const interfaceValue = field && typeof field.get === "function" ? field.get("interface") : field == null ? void 0 : field.interface;
+            if (!import_constants.PRESET_FIELDS_INTERFACES.includes(interfaceValue)) {
+              const mappedType = (0, import_database.extractTypeFromDefinition)(rawField.type);
+              const possibleTypes = fieldTypes[mappedType];
+              if (field && typeof field.set === "function") {
+                field.set("possibleTypes", possibleTypes);
+              } else {
+                fields[index] = {
+                  ...fields[index],
+                  possibleTypes
+                };
+              }
+            }
           }
         }
-      }
+      });
     };
     this.app.resourceManager.use(async function handleFieldSourceMiddleware(ctx, next) {
-      var _a, _b;
+      var _a;
       await next();
-      if (ctx.action.resourceName === "collections" && ctx.action.actionName == "list" && ((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false") {
+      if (ctx.action.resourceName === "collections" && ctx.action.actionName == "listMeta") {
         for (const collection of ctx.body) {
-          if (collection.get("view")) {
+          if (collection.view === true) {
             const fields = collection.fields;
             handleFieldSource(fields);
           }
@@ -467,7 +493,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           } catch (err) {
           }
         }
-        handleFieldSource(((_b = ctx.action.params) == null ? void 0 : _b.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields);
+        handleFieldSource(((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields);
       }
       if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "get") {
         handleFieldSource(ctx.body);

package/package.json

@@ -6,7 +6,7 @@
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.ru-RU": "Основная база данных NocoBase: поддерживает реляционные СУБД, включая PostgreSQL, MySQL, MariaDB и другие.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/data-source-main",
@@ -25,7 +25,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b",
+  "gitHead": "6c178de2050651bcfcc0b2708de0246977eac510",
   "keywords": [
     "Data sources"
   ]