@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.2

package/es/schema-component/antd/form-v2/Form.Designer.js

@@ -1,9 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { ArrayItems } from '@formily/antd';
 import { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
@@ -15,38 +15,29 @@ import { useCollectionFilterOptions, useSortFields } from '../../../collection-m
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useSchemaTemplate } from '../../../schema-templates';
 import { useDesignable } from '../../hooks';
-import { useActionContext } from '../action';
+import { removeNullCondition } from '../filter';
+import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 export var FormDesigner = function FormDesigner() {
   var _fieldSchema$xDecora;
-
   var _useCollection = useCollection(),
-      name = _useCollection.name,
-      title = _useCollection.title;
-
+    name = _useCollection.name,
+    title = _useCollection.title;
   var template = useSchemaTemplate();
-  var ctx = useFormBlockContext();
-  var field = useField();
   var fieldSchema = useFieldSchema();
-
-  var _useDesignable = useDesignable(),
-      dn = _useDesignable.dn;
-
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
-  var _useActionContext = useActionContext(),
-      visible = _useActionContext.visible;
-
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.resource;
+  var _useFormBlockContext = useFormBlockContext(),
+    action = _useFormBlockContext.action;
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     template: template,
     title: title || name
-  }, /*#__PURE__*/React.createElement(SchemaSettings.BlockTitleItem, null), /*#__PURE__*/React.createElement(SchemaSettings.FormItemTemplate, {
+  }, /*#__PURE__*/React.createElement(SchemaSettings.BlockTitleItem, null), /*#__PURE__*/React.createElement(SchemaSettings.LinkageRules, {
+    collectionName: name
+  }), !action ? /*#__PURE__*/React.createElement(SchemaSettings.DataTemplates, {
+    collectionName: name
+  }) : null, /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.FormItemTemplate, {
     componentName: 'FormItem',
     collectionName: name,
     resourceName: defaultResource
-  }), /*#__PURE__*/React.createElement(SchemaSettings.LinkageRules, {
-    collectionName: name
   }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {
@@ -56,11 +47,9 @@ export var FormDesigner = function FormDesigner() {
 };
 export var ReadPrettyFormDesigner = function ReadPrettyFormDesigner() {
   var _fieldSchema$xDecora2;
-
   var _useCollection2 = useCollection(),
-      name = _useCollection2.name,
-      title = _useCollection2.title;
-
+    name = _useCollection2.name,
+    title = _useCollection2.title;
   var template = useSchemaTemplate();
   var fieldSchema = useFieldSchema();
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2.resource;
@@ -81,26 +70,19 @@ export var ReadPrettyFormDesigner = function ReadPrettyFormDesigner() {
 };
 export var DetailsDesigner = function DetailsDesigner() {
   var _fieldSchema$xDecora3, _fieldSchema$xDecora4, _fieldSchema$xDecora5, _fieldSchema$xDecora6, _fieldSchema$xDecora7;
-
   var _useCollection3 = useCollection(),
-      name = _useCollection3.name,
-      title = _useCollection3.title;
-
+    name = _useCollection3.name,
+    title = _useCollection3.title;
   var template = useSchemaTemplate();
-
-  var _useTranslation2 = useTranslation(),
-      t = _useTranslation2.t;
-
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var fieldSchema = useFieldSchema();
   var field = useField();
   var dataSource = useCollectionFilterOptions(name);
-
   var _useDetailsBlockConte = useDetailsBlockContext(),
-      service = _useDetailsBlockConte.service;
-
-  var _useDesignable2 = useDesignable(),
-      dn = _useDesignable2.dn;
-
+    service = _useDetailsBlockConte.service;
+  var _useDesignable = useDesignable(),
+    dn = _useDesignable.dn;
   var sortFields = useSortFields(name);
   var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : (_fieldSchema$xDecora4 = _fieldSchema$xDecora3.params) === null || _fieldSchema$xDecora4 === void 0 ? void 0 : _fieldSchema$xDecora4.filter) || {};
   var defaultSort = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora5 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora5 === void 0 ? void 0 : (_fieldSchema$xDecora6 = _fieldSchema$xDecora5.params) === null || _fieldSchema$xDecora6 === void 0 ? void 0 : _fieldSchema$xDecora6.sort) || [];
@@ -128,14 +110,18 @@ export var DetailsDesigner = function DetailsDesigner() {
           // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
-          'x-component-props': {}
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return FilterDynamicComponent(_objectSpread({}, props));
+            }
+          }
         }
       }
     },
     onSubmit: function onSubmit(_ref) {
       var _service$params, _schema;
-
       var filter = _ref.filter;
+      filter = removeNullCondition(filter);
       var params = field.decoratorProps.params || {};
       params.filter = filter;
       field.decoratorProps.params = params;
@@ -220,7 +206,6 @@ export var DetailsDesigner = function DetailsDesigner() {
     },
     onSubmit: function onSubmit(_ref2) {
       var _schema2, _service$params2;
-
       var sort = _ref2.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;

package/es/schema-component/antd/form-v2/Form.FilterDesigner.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 筛选区块所使用的表单设计器
+ * @returns
+ */
+export declare const FilterDesigner: () => JSX.Element;

package/es/schema-component/antd/form-v2/Form.FilterDesigner.js

@@ -0,0 +1,40 @@
+import { useFieldSchema } from '@formily/react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useCollection } from '../../../collection-manager';
+import { FilterBlockType } from '../../../filter-provider/utils';
+import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
+import { useSchemaTemplate } from '../../../schema-templates';
+/**
+ * 筛选区块所使用的表单设计器
+ * @returns
+ */
+export var FilterDesigner = function FilterDesigner() {
+  var _fieldSchema$xDecora;
+  var _useCollection = useCollection(),
+    name = _useCollection.name,
+    title = _useCollection.title;
+  var template = useSchemaTemplate();
+  var fieldSchema = useFieldSchema();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.resource;
+  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
+    template: template,
+    title: title || name
+  }, /*#__PURE__*/React.createElement(SchemaSettings.BlockTitleItem, null), /*#__PURE__*/React.createElement(SchemaSettings.FormItemTemplate, {
+    componentName: 'FilterFormItem',
+    collectionName: name,
+    resourceName: defaultResource
+  }), /*#__PURE__*/React.createElement(SchemaSettings.LinkageRules, {
+    collectionName: name
+  }), /*#__PURE__*/React.createElement(SchemaSettings.ConnectDataBlocks, {
+    type: FilterBlockType.FORM,
+    emptyDescription: t('No blocks to connect')
+  }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
+    removeParentsIfNoChildren: true,
+    breakRemoveOn: {
+      'x-component': 'Grid'
+    }
+  }));
+};

package/es/schema-component/antd/form-v2/Form.d.ts

@@ -4,5 +4,7 @@ export interface FormProps {
 }
 export declare const Form: React.FC<FormProps> & {
     Designer?: any;
+    FilterDesigner?: any;
     ReadPrettyDesigner?: any;
+    Templates?: any;
 };

package/es/schema-component/antd/form-v2/Form.js

@@ -1,20 +1,17 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["form", "children"],
-    _excluded2 = ["form", "children", "disabled"],
-    _excluded3 = ["form", "disabled"];
-
+  _excluded2 = ["form", "children", "disabled"],
+  _excluded3 = ["form", "disabled"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import { FormLayout } from '@formily/antd';
-import { createForm, onFormInputChange, onFieldReact, onFieldInit, onFieldChange } from '@formily/core';
-import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
+import { createForm, onFieldChange, onFieldInit, onFieldReact, onFormInputChange } from '@formily/core';
+import { FieldContext, FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import { ConfigProvider, Spin } from 'antd';
 import React, { useEffect, useMemo } from 'react';
@@ -22,15 +19,13 @@ import { useActionContext } from '..';
 import { useAttach, useComponent } from '../..';
 import { useProps } from '../../hooks/useProps';
 import { linkageMergeAction } from './utils';
-
 var FormComponent = function FormComponent(props) {
   var form = props.form,
-      children = props.children,
-      others = _objectWithoutProperties(props, _excluded);
-
+    children = props.children,
+    others = _objectWithoutProperties(props, _excluded);
   var field = useField();
-  var fieldSchema = useFieldSchema(); // TODO: component 里 useField 会与当前 field 存在偏差
-
+  var fieldSchema = useFieldSchema();
+  // TODO: component 里 useField 会与当前 field 存在偏差
   var f = useAttach(form.createVoidField(_objectSpread(_objectSpread({}, field.props), {}, {
     basePath: ''
   })));
@@ -46,20 +41,17 @@ var FormComponent = function FormComponent(props) {
     onlyRenderProperties: true
   }))));
 };
-
 var Def = function Def(props) {
   return props.children;
 };
-
 var FormDecorator = function FormDecorator(props) {
   var form = props.form,
-      children = props.children,
-      disabled = props.disabled,
-      others = _objectWithoutProperties(props, _excluded2);
-
+    children = props.children,
+    disabled = props.disabled,
+    others = _objectWithoutProperties(props, _excluded2);
   var field = useField();
-  var fieldSchema = useFieldSchema(); // TODO: component 里 useField 会与当前 field 存在偏差
-
+  var fieldSchema = useFieldSchema();
+  // TODO: component 里 useField 会与当前 field 存在偏差
   var f = useAttach(form.createVoidField(_objectSpread(_objectSpread({}, field.props), {}, {
     basePath: ''
   })));
@@ -78,7 +70,6 @@ var FormDecorator = function FormDecorator(props) {
     onlyRenderProperties: true
   }))))));
 };
-
 var getLinkageRules = function getLinkageRules(fieldSchema) {
   var linkageRules = null;
   fieldSchema.mapProperties(function (schema) {
@@ -88,17 +79,15 @@ var getLinkageRules = function getLinkageRules(fieldSchema) {
   });
   return linkageRules;
 };
-
 var WithForm = function WithForm(props) {
-  var _fieldSchema$parent;
-
+  var _ref, _fieldSchema$parent;
   var form = props.form;
   var fieldSchema = useFieldSchema();
-
   var _useActionContext = useActionContext(),
-      setFormValueChanged = _useActionContext.setFormValueChanged;
-
-  var linkageRules = getLinkageRules(fieldSchema) || ((_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : _fieldSchema$parent['x-linkage-rules']) || [];
+    setFormValueChanged = _useActionContext.setFormValueChanged;
+  var linkageRules = ((_ref = getLinkageRules(fieldSchema) || ((_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : _fieldSchema$parent['x-linkage-rules'])) === null || _ref === void 0 ? void 0 : _ref.filter(function (k) {
+    return !k.disabled;
+  })) || [];
   useEffect(function () {
     var id = uid();
     form.addEffects(id, function () {
@@ -106,11 +95,9 @@ var WithForm = function WithForm(props) {
         setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
       });
     });
-
     if (props.disabled) {
       form.disabled = props.disabled;
     }
-
     return function () {
       form.removeEffects(id);
     };
@@ -120,7 +107,6 @@ var WithForm = function WithForm(props) {
     form.addEffects(id, function () {
       return linkageRules.map(function (v) {
         var _v$actions;
-
         return (_v$actions = v.actions) === null || _v$actions === void 0 ? void 0 : _v$actions.map(function (h) {
           if (h.targetFields) {
             var fields = h.targetFields.join(',');
@@ -133,7 +119,10 @@ var WithForm = function WithForm(props) {
               };
             });
             onFieldChange("*(".concat(fields, ")"), ['value', 'required', 'pattern', 'display'], function (field) {
-              field.linkageProperty = {};
+              var _field$linkagePropert;
+              field.linkageProperty = {
+                display: (_field$linkagePropert = field.linkageProperty) === null || _field$linkagePropert === void 0 ? void 0 : _field$linkagePropert.display
+              };
             });
           }
         });
@@ -145,18 +134,16 @@ var WithForm = function WithForm(props) {
   }, []);
   useEffect(function () {
     var id = uid();
+    var linkagefields = [];
     form.addEffects(id, function () {
-      var linkagefields = [];
       return linkageRules.map(function (v, index) {
         var _v$actions2;
-
         return (_v$actions2 = v.actions) === null || _v$actions2 === void 0 ? void 0 : _v$actions2.map(function (h) {
           if (h.targetFields) {
             var fields = h.targetFields.join(',');
             return onFieldReact("*(".concat(fields, ")"), function (field, form) {
               linkagefields.push(field);
               linkageMergeAction(h, field, v.condition, form === null || form === void 0 ? void 0 : form.values);
-
               if (index === linkageRules.length - 1) {
                 setTimeout(function () {
                   return linkagefields.map(function (v) {
@@ -175,13 +162,10 @@ var WithForm = function WithForm(props) {
   }, [linkageRules]);
   return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({}, props));
 };
-
 var WithoutForm = function WithoutForm(props) {
   var fieldSchema = useFieldSchema();
-
   var _useActionContext2 = useActionContext(),
-      setFormValueChanged = _useActionContext2.setFormValueChanged;
-
+    setFormValueChanged = _useActionContext2.setFormValueChanged;
   var form = useMemo(function () {
     return createForm({
       disabled: props.disabled,
@@ -198,15 +182,12 @@ var WithoutForm = function WithoutForm(props) {
     form: form
   }, props));
 };
-
 export var Form = observer(function (props) {
   var field = useField();
-
   var _useProps = useProps(props),
-      form = _useProps.form,
-      disabled = _useProps.disabled,
-      others = _objectWithoutProperties(_useProps, _excluded3);
-
+    form = _useProps.form,
+    disabled = _useProps.disabled,
+    others = _objectWithoutProperties(_useProps, _excluded3);
   var formDisabled = disabled || field.disabled;
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     componentDisabled: formDisabled

package/es/schema-component/antd/form-v2/FormField.js

@@ -5,10 +5,8 @@ import { useCollection } from '../../../collection-manager';
 import { useCompile } from '../../hooks';
 export var FormField = observer(function (props) {
   var fieldSchema = useFieldSchema();
-
   var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
+    getField = _useCollection.getField;
   var field = useField();
   var collectionField = getField(fieldSchema.name);
   var compile = useCompile();
@@ -16,10 +14,8 @@ export var FormField = observer(function (props) {
   useEffect(function () {
     if (!field.title) {
       var _collectionField$uiSc;
-
       field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
     }
-
     if (ctx === null || ctx === void 0 ? void 0 : ctx.field) {
       ctx.field.added = ctx.field.added || new Set();
       ctx.field.added.add(fieldSchema.name);

package/es/schema-component/antd/form-v2/Templates.d.ts

@@ -0,0 +1,4 @@
+export declare const Templates: ({ style, form }: {
+    style?: {};
+    form: any;
+}) => JSX.Element;

package/es/schema-component/antd/form-v2/Templates.js

@@ -0,0 +1,168 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { useFieldSchema } from '@formily/react';
+import { Select } from 'antd';
+import _ from 'lodash';
+import React, { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useAPIClient } from '../../../api-client';
+import { findFormBlock } from '../../../block-provider';
+var useDataTemplates = function useDataTemplates() {
+  var fieldSchema = useFieldSchema();
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _findDataTemplates = findDataTemplates(fieldSchema),
+    _findDataTemplates$it = _findDataTemplates.items,
+    items = _findDataTemplates$it === void 0 ? [] : _findDataTemplates$it,
+    _findDataTemplates$di = _findDataTemplates.display,
+    display = _findDataTemplates$di === void 0 ? true : _findDataTemplates$di;
+  var templates = [{
+    key: 'none',
+    title: t('None')
+  }].concat(items.map(function (t, i) {
+    return _objectSpread({
+      key: i
+    }, t);
+  }));
+  var defaultTemplate = items.find(function (item) {
+    return item.default;
+  });
+  return {
+    templates: templates,
+    display: display,
+    defaultTemplate: defaultTemplate,
+    enabled: items.length > 0
+  };
+};
+export var Templates = function Templates(_ref) {
+  var _ref$style = _ref.style,
+    style = _ref$style === void 0 ? {} : _ref$style,
+    form = _ref.form;
+  var _useDataTemplates = useDataTemplates(),
+    templates = _useDataTemplates.templates,
+    display = _useDataTemplates.display,
+    enabled = _useDataTemplates.enabled,
+    defaultTemplate = _useDataTemplates.defaultTemplate;
+  var _React$useState = React.useState((defaultTemplate === null || defaultTemplate === void 0 ? void 0 : defaultTemplate.key) || 'none'),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    value = _React$useState2[0],
+    setValue = _React$useState2[1];
+  var api = useAPIClient();
+  var _useTranslation2 = useTranslation(),
+    t = _useTranslation2.t;
+  useEffect(function () {
+    if (defaultTemplate) {
+      fetchTemplateData(api, defaultTemplate).then(function (data) {
+        if (form) {
+          form.values = data;
+        }
+      });
+    }
+  }, []);
+  var handleChange = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, option) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setValue(value);
+            if (!(option.key !== 'none')) {
+              _context.next = 8;
+              break;
+            }
+            if (!form) {
+              _context.next = 6;
+              break;
+            }
+            _context.next = 5;
+            return fetchTemplateData(api, option);
+          case 5:
+            form.values = _context.sent;
+          case 6:
+            _context.next = 9;
+            break;
+          case 8:
+            form === null || form === void 0 ? void 0 : form.reset();
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x2, _x3) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), []);
+  if (!enabled || !display) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    style: _objectSpread({
+      display: 'flex',
+      alignItems: 'center',
+      backgroundColor: '#f8f8f8',
+      padding: '1em'
+    }, style)
+  }, /*#__PURE__*/React.createElement("label", {
+    style: {
+      fontSize: 14,
+      fontWeight: 'bold',
+      whiteSpace: 'nowrap',
+      marginRight: 8
+    }
+  }, t('Data template'), ":", ' '), /*#__PURE__*/React.createElement(Select
+  // style={{ width: '8em' }}
+  , {
+    // style={{ width: '8em' }}
+    options: templates,
+    fieldNames: {
+      label: 'title',
+      value: 'key'
+    },
+    value: value,
+    onChange: handleChange
+  }));
+};
+function findDataTemplates(fieldSchema) {
+  var formSchema = findFormBlock(fieldSchema);
+  if (formSchema) {
+    return _.cloneDeep(formSchema['x-data-templates']) || {};
+  }
+  return {};
+}
+function fetchTemplateData(_x4, _x5) {
+  return _fetchTemplateData.apply(this, arguments);
+}
+function _fetchTemplateData() {
+  _fetchTemplateData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, template) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", api.resource(template.collection).get({
+            filterByTk: template.dataId,
+            fields: template.fields,
+            isTemplate: true
+          }).then(function (data) {
+            var _data$data;
+            return (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.data;
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _fetchTemplateData.apply(this, arguments);
+}

package/es/schema-component/antd/form-v2/index.d.ts

@@ -1,4 +1,4 @@
 import { Form as FormV2 } from './Form';
 import { DetailsDesigner } from './Form.Designer';
-export { FormV2, DetailsDesigner };
 export * from './FormField';
+export { FormV2, DetailsDesigner };

package/es/schema-component/antd/form-v2/index.js

@@ -1,6 +1,8 @@
 import { Form as FormV2 } from './Form';
 import { DetailsDesigner, FormDesigner, ReadPrettyFormDesigner } from './Form.Designer';
+import { FilterDesigner } from './Form.FilterDesigner';
 FormV2.Designer = FormDesigner;
+FormV2.FilterDesigner = FilterDesigner;
 FormV2.ReadPrettyDesigner = ReadPrettyFormDesigner;
-export { FormV2, DetailsDesigner };
-export * from './FormField';
+export * from './FormField';
+export { FormV2, DetailsDesigner };

package/es/schema-component/antd/form-v2/utils.d.ts

@@ -1,4 +1,3 @@
-export declare function evaluate(expression: string, scope?: {}): any;
 export declare const linkageMergeAction: ({ operator, value }: {
     operator: any;
     value: any;