@nocobase/client 0.9.2-alpha.4 → 0.9.3-alpha.1

package/lib/schema-settings/LinkageRules/FilterDynamicComponent.js

@@ -13,7 +13,7 @@ function FilterDynamicComponent(props) {
     onChange = props.onChange,
     renderSchemaComponent = props.renderSchemaComponent,
     collectionName = props.collectionName;
-  var scope = (0, _Variables.useVariableOptions)(collectionName);
+  var scope = (0, _Variables.useVariableOptions)(collectionName, ['o2m', 'm2m']);
   return /*#__PURE__*/_react.default.createElement(_schemaComponent.Variable.Input, {
     value: value,
     onChange: onChange,

package/lib/schema-settings/LinkageRules/Variables.d.ts

@@ -1,4 +1,4 @@
-export declare function useVariableOptions(collectionName: any): {
+export declare function useVariableOptions(collectionName: any, excludes?: any): {
     label: any;
     value: any;
     key: any;

package/lib/schema-settings/LinkageRules/Variables.js

@@ -12,8 +12,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var supportsType = ['checkbox', 'number', 'percent', 'integer', 'input', 'textarea', 'email', 'phone', 'datetime', 'createdAt', 'updatedAt', 'radioGroup', 'checkboxGroup', 'select', 'multipleSelect', 'formula', 'oho', 'obo', 'm2o', 'o2m', 'm2m'];
+var supportsType = ['id', 'checkbox', 'number', 'percent', 'integer', 'input', 'textarea', 'email', 'phone', 'datetime', 'createdAt', 'updatedAt', 'radioGroup', 'checkboxGroup', 'select', 'multipleSelect', 'formula', 'oho', 'obo', 'm2o', 'o2m', 'm2m'];
 var useVariableTypes = function useVariableTypes(currentCollection) {
+  var excludes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -26,7 +27,9 @@ var useVariableTypes = function useVariableTypes(currentCollection) {
     options: function options() {
       var field2option = function field2option(field, depth) {
         var _field$uiSchema;
-        if (!field.interface || !supportsType.includes(field.interface)) {
+        if (!field.interface || !supportsType.filter(function (v) {
+          return !excludes.includes(v);
+        }).includes(field.interface)) {
           return;
         }
         var fieldInterface = getInterface(field.interface);
@@ -82,9 +85,9 @@ var useVariableTypes = function useVariableTypes(currentCollection) {
     }]
   }];
 };
-function useVariableOptions(collectionName) {
+function useVariableOptions(collectionName, excludes) {
   var compile = (0, _schemaComponent.useCompile)();
-  var options = useVariableTypes(collectionName).map(function (item) {
+  var options = useVariableTypes(collectionName, excludes).map(function (item) {
     var options = typeof item.options === 'function' ? item.options() : item.options;
     return {
       label: compile(item.title),

package/lib/schema-settings/SchemaSettings.js

@@ -25,6 +25,7 @@ var _BlockTemplate = require("../schema-templates/BlockTemplate");
 var _DataTemplates = require("./DataTemplates");
 var _LinkageRules = require("./LinkageRules");
 var _actionHooks = require("./LinkageRules/action-hooks");
+var _EnableChildCollections = require("./EnableChildCollections");
 var _templateObject;
 var _excluded = ["children", "fieldSchema"],
   _excluded2 = ["title", "dn"],
@@ -1213,7 +1214,7 @@ SchemaSettings.DataTemplates = function DataTemplates(props) {
     }
   });
 };
-SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
+SchemaSettings.EnableChildCollections = function EnableChildCollectionsItem(props) {
   var collectionName = props.collectionName;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useDesignable5 = (0, _2.useDesignable)(),
@@ -1233,7 +1234,7 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       title: t('Enable child collections'),
       properties: {
         enableChildren: {
-          'x-component': EnableChildCollections,
+          'x-component': _EnableChildCollections.EnableChildCollections,
           'x-component-props': {
             useProps: function useProps() {
               return {
@@ -1253,7 +1254,6 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       }
     },
     onSubmit: function onSubmit(v) {
-      console.log(v);
       var enableChildren = [];
       var _iterator2 = _createForOfIteratorHelper(v.enableChildren.childrenCollections),
         _step2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.3-alpha.1",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -13,9 +13,9 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/evaluators": "0.9.2-alpha.4",
-    "@nocobase/sdk": "0.9.2-alpha.4",
-    "@nocobase/utils": "0.9.2-alpha.4",
+    "@nocobase/evaluators": "0.9.3-alpha.1",
+    "@nocobase/sdk": "0.9.3-alpha.1",
+    "@nocobase/utils": "0.9.3-alpha.1",
     "ahooks": "^3.7.2",
     "antd": "^4.24.8",
     "axios": "^0.26.1",
@@ -25,7 +25,6 @@
     "file-saver": "^2.0.5",
     "i18next": "^22.4.9",
     "i18next-http-backend": "^2.1.1",
-    "json-templates": "^4.2.0",
     "markdown-it": "13.0.1",
     "markdown-it-highlightjs": "3.3.1",
     "mathjs": "^10.6.0",
@@ -60,5 +59,5 @@
     "@types/markdown-it-highlightjs": "3.3.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
 }