@nocobase/plugin-data-source-main 1.6.0-alpha.9 → 1.6.0-beta.10

package/dist/client/index.d.ts

@@ -7,7 +7,29 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Plugin } from '@nocobase/client';
+type PresetFieldConfig = {
+    order: number;
+    description: string;
+    value: {
+        name: string;
+        interface: string;
+        type: string;
+        uiSchema: Record<string, any>;
+        field?: string;
+        [T: string]: any;
+    };
+};
 declare class PluginDataSourceMainClient extends Plugin {
+    collectionPresetFields: {
+        order: number;
+        value: any;
+    }[];
+    addCollectionPresetField(config: PresetFieldConfig): void;
+    removeCollectionPresetField(fieldName: string): void;
+    getCollectionPresetFields(): {
+        order: number;
+        value: any;
+    }[];
     load(): Promise<void>;
 }
 export default PluginDataSourceMainClient;

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-data-source-main",["@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-data-source-main"]=t(require("@nocobase/client")):e["@nocobase/plugin-data-source-main"]=t(e["@nocobase/client"])}(self,function(e){return function(){"use strict";var t={772:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var u=n[e]={exports:{}};return t[e](u,u.exports,r),u.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};r.r(o);var u=r(772);function i(e,t,n,r,o,u,i){try{var c=e[u](i),a=c.value}catch(e){n(e);return}c.done?t(a):Promise.resolve(a).then(r,o)}function c(e,t,n){return(c=s()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var o=new(Function.bind.apply(e,r));return n&&l(o,n.prototype),o}).apply(null,arguments)}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function f(e){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function l(e,t){return(l=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function p(e){var t="function"==typeof Map?new Map:void 0;return(p=function(e){var n;if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return c(e,arguments,f(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),l(r,e)})(e)}function s(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(s=function(){return!!e})()}var b=function(e){var t,n,r;function o(){var e,t,n;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,o),e=this,t=o,n=arguments,t=f(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,s()?Reflect.construct(t,n||[],f(e).constructor):t.apply(e,n))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&l(e,t)}(o,e),t=o,n=[{key:"load",value:function(){var e;return(e=function(){return function(e,t){var n,r,o,u,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return u={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(u[Symbol.iterator]=function(){return this}),u;function c(u){return function(c){return function(u){if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&u[0]?r.return:u[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,u[1])).done)return o;switch(r=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,r=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){i.label=u[1];break}if(6===u[0]&&i.label<o[1]){i.label=o[1],o=u;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(u);break}o[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],r=0}finally{n=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}([u,c])}}}(this,function(e){return[2]})},function(){var t=this,n=arguments;return new Promise(function(r,o){var u=e.apply(t,n);function c(e){i(u,r,o,c,a,"next",e)}function a(e){i(u,r,o,c,a,"throw",e)}c(void 0)})})()}}],a(t.prototype,n),o}(p(u.Plugin));return o.default=b,o}()});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client"),require("lodash")):"function"==typeof define&&define.amd?define("@nocobase/plugin-data-source-main",["@nocobase/client","lodash"],t):"object"==typeof exports?exports["@nocobase/plugin-data-source-main"]=t(require("@nocobase/client"),require("lodash")):e["@nocobase/plugin-data-source-main"]=t(e["@nocobase/client"],e.lodash)}(self,function(e,t){return function(){"use strict";var r={772:function(t){t.exports=e},467:function(e){e.exports=t}},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e](i,i.exports,o),i.exports}o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,{a:t}),t},o.d=function(e,t){for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var i={};o.r(i);var a=o(772),c=o(467);function u(e,t,r,n,o,i,a){try{var c=e[i](a),u=c.value}catch(e){r(e);return}c.done?t(u):Promise.resolve(u).then(n,o)}function l(e,t,r){return(l=y()?Reflect.construct:function(e,t,r){var n=[null];n.push.apply(n,t);var o=new(Function.bind.apply(e,n));return r&&f(o,r.prototype),o}).apply(null,arguments)}function s(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}function p(e){return(p=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function f(e,t){return(f=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function d(e){var t="function"==typeof Map?new Map:void 0;return(d=function(e){var r;if(null===e||(r=e,-1===Function.toString.call(r).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return l(e,arguments,p(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),f(n,e)})(e)}function y(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(y=function(){return!!e})()}var b=function(e){var t,r,n;function o(){var e,t,r,n,i,a,c;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,o),t=this,r=o,n=arguments,r=p(r),e=function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(t,y()?Reflect.construct(r,n||[],p(t).constructor):r.apply(t,n)),c=[],(a="collectionPresetFields")in(i=e)?Object.defineProperty(i,a,{value:c,enumerable:!0,configurable:!0,writable:!0}):i[a]=c,e}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&f(e,t)}(o,e),t=o,r=[{key:"addCollectionPresetField",value:function(e){this.collectionPresetFields.push(e)}},{key:"removeCollectionPresetField",value:function(e){this.collectionPresetFields=(0,c.reject)(this.collectionPresetFields,function(t){return t.value.name===e})}},{key:"getCollectionPresetFields",value:function(){return(0,c.orderBy)(this.collectionPresetFields,["order"],["asc"])}},{key:"load",value:function(){var e,t=this;return(e=function(){return function(e,t){var r,n,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){return function(i){if(r)throw TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(o=2&i[0]?n.return:i[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,i[1])).done)return o;switch(n=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,n=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],n=0}finally{r=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,c])}}}(this,function(e){return t.addCollectionPresetField({order:100,description:'{{t("Primary key, unique identifier, self growth") }}',value:{name:"id",type:"bigInt",autoIncrement:!0,primaryKey:!0,allowNull:!1,uiSchema:{type:"number",title:'{{t("ID")}}',"x-component":"InputNumber","x-read-pretty":!0},interface:"integer"}}),t.addCollectionPresetField({order:200,description:'{{t("Store the creation time of each record")}}',value:{name:"createdAt",interface:"createdAt",type:"date",field:"createdAt",uiSchema:{type:"datetime",title:'{{t("Created at")}}',"x-component":"DatePicker","x-component-props":{},"x-read-pretty":!0}}}),t.addCollectionPresetField({order:300,description:'{{t("Store the creation user of each record") }}',value:{name:"createdBy",interface:"createdBy",type:"belongsTo",target:"users",foreignKey:"createdById",uiSchema:{type:"object",title:'{{t("Created by")}}',"x-component":"AssociationField","x-component-props":{fieldNames:{value:"id",label:"nickname"}},"x-read-pretty":!0}}}),t.addCollectionPresetField({order:400,description:'{{t("Store the last update time of each record")}}',value:{type:"date",field:"updatedAt",name:"updatedAt",interface:"updatedAt",uiSchema:{type:"datetime",title:'{{t("Last updated at")}}',"x-component":"DatePicker","x-component-props":{},"x-read-pretty":!0}}}),t.addCollectionPresetField({order:500,description:'{{t("Store the last update user of each record")}}',value:{type:"belongsTo",target:"users",foreignKey:"updatedById",name:"updatedBy",interface:"updatedBy",uiSchema:{type:"object",title:'{{t("Last updated by")}}',"x-component":"AssociationField","x-component-props":{fieldNames:{value:"id",label:"nickname"}},"x-read-pretty":!0}}}),[2]})},function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function a(e){u(i,n,o,a,c,"next",e)}function c(e){u(i,n,o,a,c,"throw",e)}a(void 0)})})()}}],s(t.prototype,r),o}(d(a.Plugin));return i.default=b,i}()});

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.9",
-  "@nocobase/database": "1.6.0-alpha.9",
-  "@nocobase/plugin-error-handler": "1.6.0-alpha.9",
-  "@nocobase/server": "1.6.0-alpha.9",
+  "@nocobase/client": "1.6.0-beta.10",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.6.0-alpha.9",
-  "@nocobase/utils": "1.6.0-alpha.9",
+  "@nocobase/database": "1.6.0-beta.10",
+  "@nocobase/plugin-error-handler": "1.6.0-beta.10",
+  "@nocobase/server": "1.6.0-beta.10",
+  "@nocobase/test": "1.6.0-beta.10",
+  "@nocobase/utils": "1.6.0-beta.10",
   "sequelize": "6.35.2",
   "dayjs": "1.11.10"
 };

package/dist/server/collections/collectionCategories.js

@@ -33,6 +33,7 @@ var collectionCategories_default = {
   dumpRules: {
     group: "required"
   },
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "collectionCategories",
   autoGenId: true,

package/dist/server/collections/collections.js

@@ -31,6 +31,7 @@ __export(collections_exports, {
 module.exports = __toCommonJS(collections_exports);
 var collections_default = {
   dumpRules: "required",
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "collections",
   sortable: "sort",

package/dist/server/collections/fields.js

@@ -31,6 +31,7 @@ __export(fields_exports, {
 module.exports = __toCommonJS(fields_exports);
 var fields_default = {
   dumpRules: "required",
+  migrationRules: ["overwrite", "schema-only"],
   shared: true,
   name: "fields",
   autoGenId: false,

package/dist/server/migrations/20250123000001-remove-schema-options.d.ts

@@ -0,0 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20250123000001-remove-schema-options.js

@@ -0,0 +1,52 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var remove_schema_options_exports = {};
+__export(remove_schema_options_exports, {
+  default: () => remove_schema_options_default
+});
+module.exports = __toCommonJS(remove_schema_options_exports);
+var import_server = require("@nocobase/server");
+/* istanbul ignore file -- @preserve */
+class remove_schema_options_default extends import_server.Migration {
+  on = "afterLoad";
+  async up() {
+    const CollectionRepository = this.context.db.getRepository("collections");
+    const collections = await CollectionRepository.find({
+      filter: {
+        "options.from": "db2cm"
+      }
+    });
+    for (const collection of collections) {
+      const collectionSchema = collection.get("schema");
+      const dbSchema = this.context.db.options.schema || "public";
+      if (collectionSchema && collectionSchema == dbSchema) {
+        collection.set("schema", void 0);
+        await collection.save();
+      }
+    }
+  }
+}

package/dist/server/models/field.js

@@ -62,7 +62,10 @@ class FieldModel extends import_database.MagicAttributeModel {
     const options = this.toJSON();
     const field = await (async () => {
       await new Promise((resolve) => setTimeout(resolve, 0));
-      return collection.setField(name, options);
+      return collection.setField(name, {
+        ...options,
+        __sort: this.get("sort")
+      });
     })();
     await this.db.emitAsync("field:loaded", {
       fieldKey: this.get("key"),

package/dist/server/repositories/collection-repository.js

@@ -153,9 +153,13 @@ class CollectionRepository extends import_database.Repository {
         ...field.options
       });
     }
+    const collectionOptions = options;
+    if (collectionOptions.schema && collectionOptions.schema == (this.database.options.schema || "public")) {
+      delete collectionOptions.schema;
+    }
     await this.create({
       values: {
-        ...options,
+        ...collectionOptions,
         fields,
         from: "db2cm"
       }

package/dist/server/resourcers/collections.js

@@ -61,7 +61,7 @@ var collections_default = {
             ...field.options
           };
         }),
-        "sort"
+        "__sort"
       );
       results.push(obj);
     });

package/dist/server/server.js

@@ -45,16 +45,16 @@ var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
 var import__ = require(".");
+var import_field_is_depended_on_by_other = require("./errors/field-is-depended-on-by-other");
+var import_field_name_exists_error = require("./errors/field-name-exists-error");
 var import_hooks = require("./hooks");
+var import_beforeCreateCheckFieldInMySQL = require("./hooks/beforeCreateCheckFieldInMySQL");
 var import_beforeCreateForValidateField = require("./hooks/beforeCreateForValidateField");
 var import_beforeCreateForViewCollection = require("./hooks/beforeCreateForViewCollection");
+var import_beforeDestoryField = require("./hooks/beforeDestoryField");
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
-var import_field_name_exists_error = require("./errors/field-name-exists-error");
-var import_beforeDestoryField = require("./hooks/beforeDestoryField");
-var import_field_is_depended_on_by_other = require("./errors/field-is-depended-on-by-other");
-var import_beforeCreateCheckFieldInMySQL = require("./hooks/beforeCreateCheckFieldInMySQL");
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
   setLoadFilter(filter) {
@@ -329,6 +329,25 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
       await next();
     });
+    this.app.resourceManager.use(async function pushUISchemaWhenUpdateCollectionField(ctx, next) {
+      var _a;
+      const { resourceName, actionName } = ctx.action;
+      if (resourceName === "collections" && actionName === "create") {
+        const { values } = ctx.action.params;
+        const keys = Object.keys(values);
+        const presetKeys = ["createdAt", "createdBy", "updatedAt", "updatedBy"];
+        for (const presetKey of presetKeys) {
+          if (keys.includes(presetKey)) {
+            continue;
+          }
+          values[presetKey] = !!((_a = values.fields) == null ? void 0 : _a.find((v) => v.name === presetKey));
+        }
+        ctx.action.mergeParams({
+          values
+        });
+      }
+      await next();
+    });
     this.app.acl.allow("collections", "list", "loggedIn");
     this.app.acl.allow("collections", "listMeta", "loggedIn");
     this.app.acl.allow("collectionCategories", "list", "loggedIn");
@@ -342,7 +361,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     });
   }
   async load() {
-    await this.importCollections(import_path.default.resolve(__dirname, "./collections"));
     this.db.getRepository("collections").setApp(this.app);
     const errorHandlerPlugin = this.app.getPlugin("error-handler");
     errorHandlerPlugin.errorHandler.register(

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as PostgreSQL, MySQL, MariaDB and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 PostgreSQL、MySQL、MariaDB 等关系型数据库。",
-  "version": "1.6.0-alpha.9",
+  "version": "1.6.0-beta.10",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -22,7 +22,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f",
+  "gitHead": "72684ad7261e46b67969ecc4db0f1bcbea545a8d",
   "keywords": [
     "Data sources"
   ]