@nocobase/plugin-data-source-main 2.0.0-alpha.4 → 2.0.0-alpha.40

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("lodash"),require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-data-source-main",["lodash","@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-data-source-main"]=t(require("lodash"),require("@nocobase/client")):e["@nocobase/plugin-data-source-main"]=t(e.lodash,e["@nocobase/client"])}(self,function(e,t){return function(){"use strict";var r={772:function(e){e.exports=t},467:function(t){t.exports=e}},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={};return!function(){o.r(i);var e=o(772),t=o(467);function r(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 n(e,t,r){return(n=l()?Reflect.construct:function(e,t,r){var n=[null];n.push.apply(n,t);var o=new(Function.bind.apply(e,n));return r&&c(o,r.prototype),o}).apply(null,arguments)}function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function c(e,t){return(c=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function u(e){var t="function"==typeof Map?new Map:void 0;return(u=function(e){if(null===e||-1===Function.toString.call(e).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 n(e,arguments,a(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),c(r,e)})(e)}function l(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(l=function(){return!!e})()}i.default=function(e){var n;if("function"!=typeof e&&null!==e)throw TypeError("Super expression must either be null or a function");function o(){var e,t,r,n,i;if(!(this instanceof o))throw TypeError("Cannot call a class as a function");return t=o,r=arguments,t=a(t),e=function(e,t){var r;if(t&&("object"==((r=t)&&"undefined"!=typeof Symbol&&r.constructor===Symbol?"symbol":typeof r)||"function"==typeof t))return t;if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(this,l()?Reflect.construct(t,r||[],a(this).constructor):t.apply(this,r)),i=[],(n="collectionPresetFields")in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i,e}return o.prototype=Object.create(e&&e.prototype,{constructor:{value:o,writable:!0,configurable:!0}}),e&&c(o,e),n=[{key:"addCollectionPresetField",value:function(e){this.collectionPresetFields.push(e)}},{key:"removeCollectionPresetField",value:function(e){this.collectionPresetFields=(0,t.reject)(this.collectionPresetFields,function(t){return t.value.name===e})}},{key:"getCollectionPresetFields",value:function(){return(0,t.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){var u=[i,c];if(r)throw TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(o=2&u[0]?n.return:u[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,u[1])).done)return o;switch(n=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return a.label++,{value:u[1],done:!1};case 5:a.label++,n=u[1],u=[0];continue;case 7:u=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){a=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){a.label=u[1];break}if(6===u[0]&&a.label<o[1]){a.label=o[1],o=u;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(u);break}o[2]&&a.ops.pop(),a.trys.pop();continue}u=t.call(e,a)}catch(e){u=[6,e],n=0}finally{r=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}}}(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,n=arguments;return new Promise(function(o,i){var a=e.apply(t,n);function c(e){r(a,o,i,c,u,"next",e)}function u(e){r(a,o,i,c,u,"throw",e)}c(void 0)})})()}}],function(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)}}(o.prototype,n),o}(u(e.Plugin))}(),i}()});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("lodash"),require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-data-source-main",["lodash","@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-data-source-main"]=t(require("lodash"),require("@nocobase/client")):e["@nocobase/plugin-data-source-main"]=t(e.lodash,e["@nocobase/client"])}(self,function(e,t){return function(){"use strict";var r={772:function(e){e.exports=t},467:function(t){t.exports=e}},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={};return!function(){o.r(i);var e=o(772),t=o(467);function r(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 n(e,t,r){return(n=l()?Reflect.construct:function(e,t,r){var n=[null];n.push.apply(n,t);var o=new(Function.bind.apply(e,n));return r&&c(o,r.prototype),o}).apply(null,arguments)}function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function c(e,t){return(c=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function u(e){var t="function"==typeof Map?new Map:void 0;return(u=function(e){if(null===e||-1===Function.toString.call(e).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 n(e,arguments,a(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),c(r,e)})(e)}function l(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(l=function(){return!!e})()}i.default=function(e){var n;if("function"!=typeof e&&null!==e)throw TypeError("Super expression must either be null or a function");function o(){var e,t,r,n,i;if(!(this instanceof o))throw TypeError("Cannot call a class as a function");return t=o,r=arguments,t=a(t),e=function(e,t){var r;if(t&&("object"==((r=t)&&"undefined"!=typeof Symbol&&r.constructor===Symbol?"symbol":typeof r)||"function"==typeof t))return t;if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(this,l()?Reflect.construct(t,r||[],a(this).constructor):t.apply(this,r)),i=[],(n="collectionPresetFields")in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i,e}return o.prototype=Object.create(e&&e.prototype,{constructor:{value:o,writable:!0,configurable:!0}}),e&&c(o,e),n=[{key:"addCollectionPresetField",value:function(e){this.collectionPresetFields.push(e)}},{key:"removeCollectionPresetField",value:function(e){this.collectionPresetFields=(0,t.reject)(this.collectionPresetFields,function(t){return t.value.name===e})}},{key:"getCollectionPresetFields",value:function(){return(0,t.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){var u=[i,c];if(r)throw TypeError("Generator is already executing.");for(;a;)try{if(r=1,n&&(o=2&u[0]?n.return:u[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,u[1])).done)return o;switch(n=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return a.label++,{value:u[1],done:!1};case 5:a.label++,n=u[1],u=[0];continue;case 7:u=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){a=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){a.label=u[1];break}if(6===u[0]&&a.label<o[1]){a.label=o[1],o=u;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(u);break}o[2]&&a.ops.pop(),a.trys.pop();continue}u=t.call(e,a)}catch(e){u=[6,e],n=0}finally{r=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}}}(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:"id"}}),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,n=arguments;return new Promise(function(o,i){var a=e.apply(t,n);function c(e){r(a,o,i,c,u,"next",e)}function u(e){r(a,o,i,c,u,"throw",e)}c(void 0)})})()}}],function(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)}}(o.prototype,n),o}(u(e.Plugin))}(),i}()});

package/dist/externalVersion.js

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

package/dist/locale/en-US.json

@@ -1,4 +1,48 @@
 {
   "field-name-exists": "Field name \"{{name}}\" already exists in collection \"{{collectionName}}\"",
-  "field-is-depended-on-by-other": "Can not delete field \"{{fieldName}}\" in \"{{fieldCollectionName}}\", it is used by field \"{{dependedFieldName}}\" in \"{{dependedFieldCollectionName}}\" as \"{{dependedFieldAs}}\""
+  "field-is-depended-on-by-other": "Can not delete field \"{{fieldName}}\" in \"{{fieldCollectionName}}\", it is used by field \"{{dependedFieldName}}\" in \"{{dependedFieldCollectionName}}\" as \"{{dependedFieldAs}}\"",
+  "string.base": "{{label}} must be a string",
+  "string.empty": "{{label}} is not allowed to be empty",
+  "string.min": "{{label}} length must be at least {{limit}} characters long",
+  "string.max": "{{label}} length must be less than or equal to {{limit}} characters long",
+  "string.length": "{{label}} length must be {{limit}} characters long",
+  "string.alphanum": "{{label}} must only contain alpha-numeric characters",
+  "string.token": "{{label}} must only contain alpha-numeric and underscore characters",
+  "string.regex": "{{label}} with value {{value}} fails to match the required pattern",
+  "string.email": "{{label}} email address doesn’t meet the required format",
+  "string.uri": "{{label}} must be a valid uri",
+  "string.uriCustomScheme": "{{label}} must be a valid uri with a scheme matching the {{scheme}} pattern",
+  "string.uriRelativeOnly": "{{label}} must be a valid relative uri",
+  "string.isoDate": "{{label}} must be a valid ISO 8601 date",
+  "string.guid": "{{label}} must be a valid UUID",
+  "string.hex": "{{label}} must only contain hexadecimal characters",
+  "string.hostname": "{{label}} must be a valid hostname",
+  "string.lowercase": "{{label}} must only contain lowercase characters",
+  "string.uppercase": "{{label}} must only contain uppercase characters",
+  "string.trim": "{{label}} must not have leading or trailing whitespace",
+  "string.creditCard": "{{label}} must be a credit card",
+  "string.pattern.base": "{{label}} with value \"{{value}}\" fails to match the required pattern: {{regex}}",
+  "string.pattern.name": "{{label}} with value \"{{value}}\" fails to match the {{name}} pattern",
+  "string.pattern.invert.base": "{{label}} with value \"{{value}}\" matches the inverted pattern",
+  "string.pattern.invert.name": "{{label}} with value \"{{value}}\" matches the inverted {{name}} pattern",
+  "any.required": "{{label}} is required",
+  "number.base": "{{label}} must be a number",
+  "number.min": "{{label}} must be greater than or equal to {{limit}}",
+  "number.max": "{{label}} must be less than or equal to {{limit}}",
+  "number.less": "{{label}} must be less than {{limit}}",
+  "number.greater": "{{label}} must be greater than {{limit}}",
+  "number.float": "{{label}} must be a float or double",
+  "number.integer": "{{label}} must be an integer",
+  "number.negative": "{{label}} must be a negative number",
+  "number.positive": "{{label}} must be a positive number",
+  "number.precision": "{{label}} must not have more than {{limit}} decimal places",
+  "number.multiple": "{{label}} must be a multiple of {{multiple}}",
+  "number.port": "{{label}} must be a valid port",
+  "number.unsafe": "{{label}} must be a safe number",
+  "date.base": "{{label}} must be a valid date",
+  "date.format": "{{label}} must be in {{format}} format",
+  "date.greater": "{{label}} must be greater than {{limit}}",
+  "date.less": "{{label}} must be less than {{limit}}",
+  "date.max": "{{label}} must be less than or equal to {{limit}}",
+  "date.min": "{{label}} must be greater than or equal to {{limit}}"
 }

package/dist/locale/zh-CN.json

@@ -1,4 +1,48 @@
 {
   "field-name-exists": "字段标识 \"{{name}}\" 已存在",
-  "field-is-depended-on-by-other": "无法删除 \"{{fieldCollectionName}}\" 中的 \"{{fieldName}}\" 字段，它被 \"{{dependedFieldCollectionName}}\" 中的 \"{{dependedFieldName}}\" 字段用作 \"{{dependedFieldAs}}\""
+  "field-is-depended-on-by-other": "无法删除 \"{{fieldCollectionName}}\" 中的 \"{{fieldName}}\" 字段，它被 \"{{dependedFieldCollectionName}}\" 中的 \"{{dependedFieldName}}\" 字段用作 \"{{dependedFieldAs}}\"",
+  "string.base": "{{label}} 必须是字符串",
+  "string.empty": "{{label}} 不能为空字符串",
+  "string.min": "{{label}} 长度不能少于 {{limit}} 个字符",
+  "string.max": "{{label}} 长度不能超过 {{limit}} 个字符",
+  "string.length": "{{label}} 长度必须为 {{limit}} 个字符",
+  "string.alphanum": "{{label}} 只能包含字母和数字",
+  "string.token": "{{label}} 只能包含字母、数字和下划线",
+  "string.regex": "{{label}} 值 {{value}} 格式不正确",
+  "string.email": "{{label}} 邮箱地址不符合要求的格式",
+  "string.uri": "{{label}} 必须是有效的URI",
+  "string.uriRelativeOnly": "{{label}} 必须是有效的相对路径",
+  "string.uriCustomScheme": "{{label}} 必须是符合 {{scheme}} 模式的有效URI",
+  "string.isoDate": "{{label}} 必须是有效的ISO日期",
+  "string.guid": "{{label}} 必须是有效的UUID",
+  "string.hex": "{{label}} 必须是有效的十六进制字符串",
+  "string.hostname": "{{label}} 必须是有效的主机名",
+  "string.lowercase": "{{label}} 必须是小写",
+  "string.uppercase": "{{label}} 必须是大写",
+  "string.trim": "{{label}} 不能包含前后空白字符",
+  "string.creditCard": "{{label}} 必须是有效的信用卡号",
+  "string.pattern.base": "{{label}} 值 \"{{value}}\" 格式不符合要求：{{regex}}",
+  "string.pattern.name": "{{label}} 值 \"{{value}}\" 不符合 {{name}} 格式",
+  "string.pattern.invert.base": "{{label}} 值 \"{{value}}\" 包含不允许的字符",
+  "string.pattern.invert.name": "{{label}} 值 \"{{value}}\" 不能符合 {{name}} 格式",
+  "any.required": "{{label}} 是必填项",
+  "number.base": "{{label}} 必须是数字",
+  "number.min": "{{label}} 必须大于或等于 {{limit}}",
+  "number.max": "{{label}} 必须小于或等于 {{limit}}",
+  "number.less": "{{label}} 必须小于 {{limit}}",
+  "number.greater": "{{label}} 必须大于 {{limit}}",
+  "number.float": "{{label}} 必须是浮点数",
+  "number.integer": "{{label}} 必须是整数",
+  "number.negative": "{{label}} 必须是负数",
+  "number.positive": "{{label}} 必须是正数",
+  "number.precision": "{{label}} 精度不能超过 {{limit}} 位小数",
+  "number.multiple": "{{label}} 必须是 {{multiple}} 的倍数",
+  "number.port": "{{label}} 必须是有效的端口号",
+  "number.unsafe": "{{label}} 必须是安全整数",
+  "date.base": "{{label}} 必须是有效日期",
+  "date.format": "{{label}} 必须是 {{format}} 格式",
+  "date.greater": "{{label}} 必须大于 {{limit}}",
+  "date.less": "{{label}} 必须小于 {{limit}}",
+  "date.max": "{{label}} 必须小于或等于 {{limit}}",
+  "date.min": "{{label}} 必须大于或等于 {{limit}}"
 }

package/dist/server/{hooks/afterCreateForReverseField.d.ts → constants.d.ts}

@@ -6,7 +6,4 @@
  * 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 Database from '@nocobase/database';
-export declare function afterCreateForReverseField(db: Database): (model: any, { transaction }: {
-    transaction: any;
-}) => Promise<void>;
+export declare const PRESET_FIELDS_INTERFACES: string[];

package/dist/server/{hooks/afterCreateForReverseField.js → constants.js}

@@ -24,23 +24,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var afterCreateForReverseField_exports = {};
-__export(afterCreateForReverseField_exports, {
-  afterCreateForReverseField: () => afterCreateForReverseField
+var constants_exports = {};
+__export(constants_exports, {
+  PRESET_FIELDS_INTERFACES: () => PRESET_FIELDS_INTERFACES
 });
-module.exports = __toCommonJS(afterCreateForReverseField_exports);
-function afterCreateForReverseField(db) {
-  return async (model, { transaction }) => {
-    const Field = db.getCollection("fields");
-    const reverseKey = model.get("reverseKey");
-    if (!reverseKey) {
-      return;
-    }
-    const reverse = await Field.model.findByPk(reverseKey, { transaction });
-    await reverse.update({ reverseKey: model.get("key") }, { hooks: false, transaction });
-  };
-}
+module.exports = __toCommonJS(constants_exports);
+const PRESET_FIELDS_INTERFACES = ["id", "createdAt", "updatedAt", "createdBy", "updatedBy"];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  afterCreateForReverseField
+  PRESET_FIELDS_INTERFACES
 });

package/dist/server/hooks/index.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export * from './afterCreateForForeignKeyField';
-export * from './afterCreateForReverseField';
 export * from './beforeCreateForReverseField';
 export * from './beforeDestroyForeignKey';
 export * from './beforeInitOptions';

package/dist/server/hooks/index.js

@@ -24,14 +24,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var hooks_exports = {};
 module.exports = __toCommonJS(hooks_exports);
 __reExport(hooks_exports, require("./afterCreateForForeignKeyField"), module.exports);
-__reExport(hooks_exports, require("./afterCreateForReverseField"), module.exports);
 __reExport(hooks_exports, require("./beforeCreateForReverseField"), module.exports);
 __reExport(hooks_exports, require("./beforeDestroyForeignKey"), module.exports);
 __reExport(hooks_exports, require("./beforeInitOptions"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./afterCreateForForeignKeyField"),
-  ...require("./afterCreateForReverseField"),
   ...require("./beforeCreateForReverseField"),
   ...require("./beforeDestroyForeignKey"),
   ...require("./beforeInitOptions")

package/dist/server/models/collection.js

@@ -134,6 +134,9 @@ class CollectionModel extends import_database.MagicAttributeModel {
       return 0;
     });
     for (const instance of instances) {
+      if (!instance.get("collectionName")) {
+        instance.set("collectionName", this.get("name"));
+      }
       await instance.load(options);
     }
   }

package/dist/server/resourcers/main-data-source.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { Context, Next } from '@nocobase/actions';
+declare const _default: {
+    name: string;
+    actions: {
+        refresh(ctx: Context, next: Next): Promise<void>;
+        syncFields(ctx: Context, next: Next): Promise<void>;
+    };
+};
+export default _default;

package/dist/server/resourcers/main-data-source.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 main_data_source_exports = {};
+__export(main_data_source_exports, {
+  default: () => main_data_source_default
+});
+module.exports = __toCommonJS(main_data_source_exports);
+var main_data_source_default = {
+  name: "mainDataSource",
+  actions: {
+    async refresh(ctx, next) {
+      const plugin = ctx.app.pm.get("data-source-main");
+      const mainDataSource = ctx.app.dataSourceManager.get("main");
+      if (mainDataSource.status === "loaded") {
+        await plugin.loadCollections();
+      }
+      await next();
+    },
+    async syncFields(ctx, next) {
+      const { collections } = ctx.action.params.values || {};
+      const mainDataSource = ctx.app.dataSourceManager.get("main");
+      if (mainDataSource.status === "loaded") {
+        await mainDataSource.syncFieldsFromDatabase(ctx, collections);
+      }
+      await next();
+    }
+  }
+};

package/dist/server/server.d.ts

@@ -16,6 +16,7 @@ export declare class PluginDataSourceMainServer extends Plugin {
     beforeLoad(): Promise<void>;
     private db2cm;
     load(): Promise<void>;
+    registerErrorHandler(): void;
     install(): Promise<void>;
 }
 export default PluginDataSourceMainServer;

package/dist/server/server.js

@@ -55,6 +55,10 @@ 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_main_data_source = __toESM(require("./resourcers/main-data-source"));
+var import_constants = require("./constants");
+var import_json_schema = require("@formily/json-schema");
+var import_lodash2 = __toESM(require("lodash"));
 class PluginDataSourceMainServer extends import_server.Plugin {
   loadFilter = {};
   db2cmCollections = [];
@@ -178,7 +182,24 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
     });
     this.app.db.on("fields.beforeCreate", (0, import_beforeCreateForValidateField.beforeCreateForValidateField)(this.app.db));
-    this.app.db.on("fields.afterCreate", (0, import_hooks.afterCreateForReverseField)(this.app.db));
+    this.app.db.on("fields.afterCreate", async (model, { transaction }) => {
+      const Field = this.app.db.getCollection("fields");
+      const reverseKey = model.get("reverseKey");
+      if (!reverseKey) {
+        return;
+      }
+      const reverse = await Field.model.findByPk(reverseKey, { transaction });
+      await reverse.update({ reverseKey: model.get("key") }, { hooks: false, transaction });
+      this.sendSyncMessage(
+        {
+          type: "syncCollection",
+          collectionName: model.get("collectionName")
+        },
+        {
+          transaction
+        }
+      );
+    });
     this.app.db.on("fields.beforeCreate", async (model, options) => {
       const { transaction } = options;
       const collectionName = model.get("collectionName");
@@ -357,7 +378,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     this.app.acl.allow("collectionCategories", "list", "loggedIn");
     this.app.acl.registerSnippet({
       name: `pm.data-source-manager.data-source-main`,
-      actions: ["collections:*", "collections.fields:*", "collectionCategories:*"]
+      actions: ["collections:*", "collections.fields:*", "collectionCategories:*", "mainDataSource:*"]
     });
     this.app.acl.registerSnippet({
       name: `pm.data-source-manager.collection-view `,
@@ -382,52 +403,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
   }
   async load() {
     this.db.getRepository("collections").setApp(this.app);
-    const errorHandlerPlugin = this.app.getPlugin("error-handler");
-    errorHandlerPlugin.errorHandler.register(
-      (err) => {
-        return err instanceof import_database.UniqueConstraintError;
-      },
-      (err, ctx) => {
-        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-is-depended-on-by-other", {
-                fieldName: err.options.fieldName,
-                fieldCollectionName: err.options.fieldCollectionName,
-                dependedFieldName: err.options.dependedFieldName,
-                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
-                dependedFieldAs: err.options.dependedFieldAs,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
-    errorHandlerPlugin.errorHandler.register(
-      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
-      (err, ctx) => {
-        ctx.status = 400;
-        ctx.body = {
-          errors: [
-            {
-              message: ctx.i18n.t("field-name-exists", {
-                name: err.value,
-                collectionName: err.collectionName,
-                ns: "data-source-main"
-              })
-            }
-          ]
-        };
-      }
-    );
+    this.registerErrorHandler();
     this.app.resourceManager.use(async function mergeReverseFieldWhenSaveCollectionField(ctx, next) {
       if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
         ctx.action.mergeParams({
@@ -436,9 +412,10 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       }
       await next();
     });
-    this.app.resource(import_views.default);
-    this.app.actions(import_collections.default);
-    const handleFieldSource = (fields) => {
+    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) => {
       var _a;
       for (const field of import_lodash.default.castArray(fields)) {
         if (field.get("source")) {
@@ -456,6 +433,15 @@ class PluginDataSourceMainServer extends import_server.Plugin {
           });
           field.set("options", 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);
+          }
+        }
       }
     };
     this.app.resourceManager.use(async function handleFieldSourceMiddleware(ctx, next) {
@@ -470,7 +456,18 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         }
       }
       if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "list") {
-        handleFieldSource(((_b = ctx.action.params) == null ? void 0 : _b.paginate) == "false" ? ctx.body : ctx.body.rows);
+        const collectionName = ctx.action.sourceId;
+        const collection = ctx.db.getCollection(collectionName);
+        let rawFields = {};
+        if (collection) {
+          try {
+            rawFields = await ctx.app.db.queryInterface.sequelizeQueryInterface.describeTable(
+              collection.getTableNameWithSchema()
+            );
+          } catch (err) {
+          }
+        }
+        handleFieldSource(((_b = ctx.action.params) == null ? void 0 : _b.paginate) == "false" ? ctx.body : ctx.body.rows, rawFields);
       }
       if (ctx.action.resourceName == "collections.fields" && ctx.action.actionName == "get") {
         handleFieldSource(ctx.body);
@@ -482,6 +479,95 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       origin: this.options.packageName
     });
   }
+  registerErrorHandler() {
+    const errorHandlerPlugin = this.app.pm.get("error-handler");
+    errorHandlerPlugin.errorHandler.register(
+      (err) => {
+        return err instanceof import_database.UniqueConstraintError;
+      },
+      (err, ctx) => {
+        return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-is-depended-on-by-other", {
+                fieldName: err.options.fieldName,
+                fieldCollectionName: err.options.fieldCollectionName,
+                dependedFieldName: err.options.dependedFieldName,
+                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
+                dependedFieldAs: err.options.dependedFieldAs,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-name-exists", {
+                name: err.value,
+                collectionName: err.collectionName,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_database.JoiValidationError,
+      (err, ctx) => {
+        const t = ctx.i18n.t;
+        ctx.status = 400;
+        ctx.body = {
+          errors: err.details.map((detail) => {
+            const context = detail.context;
+            const label = context.label;
+            if (label) {
+              const [collectionName, fieldName] = label.split(".");
+              const collection = this.db.getCollection(collectionName);
+              if (collection) {
+                const collectionTitle = import_json_schema.Schema.compile(collection.options.title, { t });
+                const field = collection.getField(fieldName);
+                const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t });
+                const fieldTitle = import_lodash2.default.get(fieldOptions, "uiSchema.title", fieldName);
+                context.label = `${t(collectionTitle, {
+                  ns: ["lm-collections", "client"]
+                })}: ${t(fieldTitle, {
+                  ns: ["lm-collections", "client"]
+                })}`;
+              }
+            }
+            if (context.regex) {
+              context.regex = context.regex.source;
+            }
+            let message = ctx.i18n.t(detail.type, {
+              ...context,
+              ns: "data-source-main"
+            });
+            if (message === detail.type) {
+              message = err.message.replace(`"${label}"`, context.label);
+            }
+            return {
+              message
+            };
+          })
+        };
+      }
+    );
+  }
   async install() {
     const dataSourcesCollection = this.app.db.getCollection("dataSources");
     if (dataSourcesCollection) {

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": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.40",
   "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": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "54f3cab47e7efbdc73377014d05f5fc66a4affbb",
+  "gitHead": "dfb9fd33f43e91e676ae7b1f1a595bc38b7c20d2",
   "keywords": [
     "Data sources"
   ]