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

package/dist/externalVersion.js

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

package/dist/server/server.js

@@ -415,15 +415,14 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     this.app.resourceManager.define(import_views.default);
     this.app.resourceManager.registerActionHandlers(import_collections.default);
     this.app.resourceManager.define(import_main_data_source.default);
-    const handleFieldSource = (fields, rawFields) => {
+    const handleFieldSource = ({
+      fields,
+      isRawValue,
+      rawFields
+    }) => {
       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;
-        }
+        const source = isRawValue ? field.source : field.get("source");
         if (!source) {
           return;
         }
@@ -434,38 +433,27 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         }
         const newOptions = {};
         import_lodash.default.merge(newOptions, import_lodash.default.omit(collectionField.options, "name"));
-        const currentValues = field && typeof field.get === "function" ? field.get() : field;
+        const currentValues = isRawValue ? field : field.get();
         import_lodash.default.mergeWith(newOptions, currentValues, (objValue, srcValue) => {
           if (srcValue === null) {
             return objValue;
           }
         });
-        if (field && typeof field.set === "function") {
-          field.set("options", newOptions);
-        } else {
+        if (isRawValue) {
           fields[index] = {
             ...field,
             ...newOptions
           };
+        } else {
+          field.set("options", newOptions);
         }
         const fieldTypes = import_database.fieldTypeMap[this.db.options.dialect];
         if (rawFields && fieldTypes) {
-          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
-                };
-              }
-            }
+          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);
           }
         }
       });
@@ -477,7 +465,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         for (const collection of ctx.body) {
           if (collection.view === true) {
             const fields = collection.fields;
-            handleFieldSource(fields);
+            handleFieldSource({ fields, isRawValue: true });
           }
         }
       }
@@ -493,10 +481,10 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           } catch (err) {
           }
         }
-        handleFieldSource(((_a = ctx.action.params) == null ? void 0 : _a.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields);
+        handleFieldSource({ fields: ((_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);
+        handleFieldSource({ fields: ctx.body });
       }
     });
     this.app.db.extendCollection({

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.3",
+  "version": "2.0.0-beta.5",
   "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": "6c178de2050651bcfcc0b2708de0246977eac510",
+  "gitHead": "ea028f41293607ac0a20d054107e2ba772d639b2",
   "keywords": [
     "Data sources"
   ]