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

package/lib/schema-initializer/utils.js

@@ -280,12 +280,15 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
     var _field$uiSchema3, _field$uiSchema4;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
-    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+    // const component =
+    //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+    //     ? 'TableField'
+    //     : 'CollectionField';
     var schema = {
       type: 'string',
       name: field.name,
       'x-designer': 'FormItem.Designer',
-      'x-component': component,
+      'x-component': 'CollectionField',
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {},
@@ -345,13 +348,16 @@ var useFilterFormItemInitializerFields = function useFilterFormItemInitializerFi
     var _field$uiSchema6;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
-    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+    // const component =
+    //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+    //     ? 'TableField'
+    //     : 'CollectionField';
     var schema = {
       type: 'string',
       name: field.name,
       required: false,
       'x-designer': 'FormItem.FilterFormDesigner',
-      'x-component': component,
+      'x-component': 'CollectionField',
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {}
@@ -539,13 +545,16 @@ var useInheritsFormItemInitializerFields = function useInheritsFormItemInitializ
       var _field$uiSchema10, _field$uiSchema11, _field$uiSchema12;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
-      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+      // const component =
+      //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+      //     ? 'TableField'
+      //     : 'CollectionField';
       var schema = {
         type: 'string',
         name: field.name,
         title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
         'x-designer': 'FormItem.Designer',
-        'x-component': component,
+        'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
@@ -600,14 +609,17 @@ var useFilterInheritsFormItemInitializerFields = function useFilterInheritsFormI
       var _field$uiSchema13, _field$uiSchema14, _field$uiSchema15;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
-      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+      // const component =
+      //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+      //     ? 'TableField'
+      //     : 'CollectionField';
       var schema = {
         type: 'string',
         name: field.name,
         title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
         required: false,
         'x-designer': 'FormItem.FilterFormDesigner',
-        'x-component': component,
+        'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
@@ -650,7 +662,7 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
   var remove = useRemoveGridFormItem();
   return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter3 = currentFields.filter(function (field) {
     var _field$uiSchema16;
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema16 = field.uiSchema) === null || _field$uiSchema16 === void 0 ? void 0 : _field$uiSchema16['x-read-pretty']) && field.interface !== 'snapshot';
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema16 = field.uiSchema) === null || _field$uiSchema16 === void 0 ? void 0 : _field$uiSchema16['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
   })) === null || _currentFields$filter3 === void 0 ? void 0 : _currentFields$filter3.map(function (field) {
     var _field$uiSchema17, _field$uiSchema18;
     var interfaceConfig = getInterface(field.interface);
@@ -683,7 +695,6 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
 };
 exports.useCustomFormItemInitializerFields = useCustomFormItemInitializerFields;
 var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEditFormItemInitializerFields(options) {
-  var _fields$filter6;
   var _useCollection11 = (0, _collectionManager.useCollection)(),
     name = _useCollection11.name,
     fields = _useCollection11.fields;
@@ -697,38 +708,41 @@ var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEditFormI
     _ref10$block = _ref10.block,
     block = _ref10$block === void 0 ? 'Form' : _ref10$block;
   var remove = useRemoveGridFormItem();
-  return fields === null || fields === void 0 ? void 0 : (_fields$filter6 = fields.filter(function (field) {
-    var _field$uiSchema19;
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema19 = field.uiSchema) === null || _field$uiSchema19 === void 0 ? void 0 : _field$uiSchema19['x-read-pretty']) && field.interface !== 'snapshot';
-  })) === null || _fields$filter6 === void 0 ? void 0 : _fields$filter6.map(function (field) {
-    var _field$uiSchema20, _field$uiSchema21;
-    var interfaceConfig = getInterface(field.interface);
-    var schema = {
-      type: 'string',
-      name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema20 = field.uiSchema) === null || _field$uiSchema20 === void 0 ? void 0 : _field$uiSchema20.title) || field.name,
-      'x-designer': 'FormItem.Designer',
-      'x-component': 'BulkEditField',
-      'x-decorator': 'FormItem',
-      'x-collection-field': "".concat(name, ".").concat(field.name)
-    };
-    return {
-      type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema21 = field.uiSchema) === null || _field$uiSchema21 === void 0 ? void 0 : _field$uiSchema21.title) || field.name,
-      component: 'CollectionFieldInitializer',
-      remove: remove,
-      schemaInitialize: function schemaInitialize(s) {
-        var _interfaceConfig$sche10;
-        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche10 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche10 === void 0 ? void 0 : _interfaceConfig$sche10.call(interfaceConfig, s, {
-          field: field,
-          block: block,
-          readPretty: readPretty,
-          targetCollection: getCollection(field.target)
-        });
-      },
-      schema: schema
-    };
-  });
+  var filterFields = (0, _react2.useMemo)(function () {
+    return fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
+      var _field$uiSchema19;
+      return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema19 = field.uiSchema) === null || _field$uiSchema19 === void 0 ? void 0 : _field$uiSchema19['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
+    }).map(function (field) {
+      var _field$uiSchema20, _field$uiSchema21;
+      var interfaceConfig = getInterface(field.interface);
+      var schema = {
+        type: 'string',
+        name: field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema20 = field.uiSchema) === null || _field$uiSchema20 === void 0 ? void 0 : _field$uiSchema20.title) || field.name,
+        'x-designer': 'FormItem.Designer',
+        'x-component': 'BulkEditField',
+        'x-decorator': 'FormItem',
+        'x-collection-field': "".concat(name, ".").concat(field.name)
+      };
+      return {
+        type: 'item',
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema21 = field.uiSchema) === null || _field$uiSchema21 === void 0 ? void 0 : _field$uiSchema21.title) || field.name,
+        component: 'CollectionFieldInitializer',
+        remove: remove,
+        schemaInitialize: function schemaInitialize(s) {
+          var _interfaceConfig$sche10;
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche10 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche10 === void 0 ? void 0 : _interfaceConfig$sche10.call(interfaceConfig, s, {
+            field: field,
+            block: block,
+            readPretty: readPretty,
+            targetCollection: getCollection(field.target)
+          });
+        },
+        schema: schema
+      };
+    });
+  }, [fields]);
+  return filterFields;
 };
 exports.useCustomBulkEditFormItemInitializerFields = useCustomBulkEditFormItemInitializerFields;
 var findSchema = function findSchema(schema, key, action) {

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;
@@ -1290,7 +1290,7 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
 };
 // 是否显示默认值配置项
 var isShowDefaultValue = function isShowDefaultValue(collectionField, getInterface) {
-  return !['o2o', 'oho', 'obo', 'o2m', 'attachment'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
+  return !['o2o', 'oho', 'obo', 'o2m', 'attachment', 'expression'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
 };
 // 是否是系统字段
 exports.isShowDefaultValue = isShowDefaultValue;

package/lib/schema-settings/VariableInput/VariableInput.d.ts

@@ -4,10 +4,11 @@ declare type Props = {
     onChange: (value: any) => void;
     collectionName: string;
     renderSchemaComponent?: (props: any) => any;
-    style: React.CSSProperties;
     schema: any;
     operator: any;
-    children: any;
+    children?: any;
+    className?: string;
+    style?: React.CSSProperties;
 };
 export declare const VariableInput: (props: Props) => JSX.Element;
 export {};

package/lib/schema-settings/VariableInput/VariableInput.js

@@ -15,7 +15,8 @@ var VariableInput = function VariableInput(props) {
     onChange = props.onChange,
     RenderSchemaComponent = props.renderSchemaComponent,
     style = props.style,
-    schema = props.schema;
+    schema = props.schema,
+    className = props.className;
   var compile = (0, _schemaComponent.useCompile)();
   var userVariable = (0, _useUserVariable.useUserVariable)({
     schema: schema,
@@ -35,6 +36,7 @@ var VariableInput = function VariableInput(props) {
     })];
   }, []);
   return /*#__PURE__*/_react.default.createElement(_schemaComponent.Variable.Input, {
+    className: className,
     value: value,
     onChange: onChange,
     scope: scope,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.9.2-alpha.3",
+  "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.3",
-    "@nocobase/sdk": "0.9.2-alpha.3",
-    "@nocobase/utils": "0.9.2-alpha.3",
+    "@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": "b6b5f9372202d942c97d2d90a4197e060db05124"
+  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
 }