@nocobase/client 0.5.0-alpha.36 → 0.7.0-alpha.0

package/esm/schema-component/antd/filter/useFilterActionProps.js

@@ -0,0 +1,156 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { useField, useFieldSchema } from '@formily/react';
+import flat from 'flat';
+import { useTranslation } from 'react-i18next';
+import { useBlockRequestContext } from '../../../block-provider';
+import { useCollection, useCollectionManager } from '../../../collection-manager';
+export var useFilterOptions = function (collectionName) {
+    var _a;
+    var fieldSchema = useFieldSchema();
+    var nonfilterable = ((_a = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) === null || _a === void 0 ? void 0 : _a.nonfilterable) || [];
+    var _b = useCollectionManager(), getCollectionFields = _b.getCollectionFields, getInterface = _b.getInterface;
+    var fields = getCollectionFields(collectionName);
+    var field2option = function (field, depth) {
+        var _a;
+        var _b, _c;
+        if (nonfilterable.length && depth === 1 && nonfilterable.includes(field.name)) {
+            return;
+        }
+        if (!field.interface) {
+            return;
+        }
+        var fieldInterface = getInterface(field.interface);
+        if (!fieldInterface.filterable) {
+            return;
+        }
+        var _d = fieldInterface.filterable, nested = _d.nested, children = _d.children, operators = _d.operators;
+        var option = {
+            name: field.name,
+            title: ((_b = field === null || field === void 0 ? void 0 : field.uiSchema) === null || _b === void 0 ? void 0 : _b.title) || field.name,
+            schema: field === null || field === void 0 ? void 0 : field.uiSchema,
+            operators: ((_c = operators === null || operators === void 0 ? void 0 : operators.filter) === null || _c === void 0 ? void 0 : _c.call(operators, function (operator) {
+                return !(operator === null || operator === void 0 ? void 0 : operator.visible) || operator.visible(field);
+            })) || [],
+        };
+        if (field.target && depth > 2) {
+            return;
+        }
+        if (depth > 2) {
+            return option;
+        }
+        if (children === null || children === void 0 ? void 0 : children.length) {
+            option['children'] = children;
+        }
+        if (nested) {
+            var targetFields = getCollectionFields(field.target);
+            var options = getOptions(targetFields, depth + 1).filter(Boolean);
+            option['children'] = option['children'] || [];
+            (_a = option['children']).push.apply(_a, __spreadArray([], __read(options), false));
+        }
+        return option;
+    };
+    var getOptions = function (fields, depth) {
+        var options = [];
+        fields.forEach(function (field) {
+            var option = field2option(field, depth);
+            if (option) {
+                options.push(option);
+            }
+        });
+        return options;
+    };
+    return getOptions(fields, 1);
+};
+var isEmpty = function (obj) {
+    return obj && Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype;
+};
+var removeNullCondition = function (filter) {
+    var items = flat(filter || {});
+    var values = {};
+    for (var key in items) {
+        var value = items[key];
+        if (value !== null && !isEmpty(value)) {
+            values[key] = value;
+        }
+    }
+    return flat.unflatten(values);
+};
+export var mergeFilter = function (filter1, filter2) {
+    if (filter1 && filter2) {
+        return { $and: [filter1, filter2] };
+    }
+    if (!filter1 && filter2) {
+        return filter2;
+    }
+    if (filter1 && !filter2) {
+        return filter1;
+    }
+    return {};
+};
+export var useFilterActionProps = function () {
+    var name = useCollection().name;
+    var options = useFilterOptions(name);
+    var _a = useBlockRequestContext(), service = _a.service, props = _a.props;
+    var field = useField();
+    var t = useTranslation().t;
+    return {
+        options: options,
+        onSubmit: function (values) {
+            var _a;
+            // filter parameter for the block
+            var defaultFilter = removeNullCondition(props.params.filter);
+            // filter parameter for the filter action
+            var filter = removeNullCondition(values === null || values === void 0 ? void 0 : values.filter);
+            service.run(__assign(__assign({}, (_a = service.params) === null || _a === void 0 ? void 0 : _a[0]), { filter: mergeFilter(defaultFilter, filter) }));
+            var items = (filter === null || filter === void 0 ? void 0 : filter.$and) || (filter === null || filter === void 0 ? void 0 : filter.$or);
+            if (items === null || items === void 0 ? void 0 : items.length) {
+                field.title = t('{{count}} filter items', { count: (items === null || items === void 0 ? void 0 : items.length) || 0 });
+            }
+            else {
+                field.title = t('Filter');
+            }
+        },
+        onReset: function () {
+            var _a;
+            var filter = removeNullCondition(props.params.filter);
+            service.run(__assign(__assign({}, (_a = service.params) === null || _a === void 0 ? void 0 : _a[0]), { filter: filter }));
+            field.title = t('Filter');
+        },
+    };
+};
+//# sourceMappingURL=useFilterActionProps.js.map

package/esm/schema-component/antd/filter/useFilterActionProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFilterActionProps.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/filter/useFilterActionProps.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field } from '@formily/core';\nimport { useField, useFieldSchema } from '@formily/react';\nimport flat from 'flat';\nimport { useTranslation } from 'react-i18next';\nimport { useBlockRequestContext } from '../../../block-provider';\nimport { useCollection, useCollectionManager } from '../../../collection-manager';\n\nexport const useFilterOptions = (collectionName: string) => {\n  const fieldSchema = useFieldSchema();\n  const nonfilterable = fieldSchema?.['x-component-props']?.nonfilterable || [];\n  const { getCollectionFields, getInterface } = useCollectionManager();\n  const fields = getCollectionFields(collectionName);\n  const field2option = (field, depth) => {\n    if (nonfilterable.length && depth === 1 && nonfilterable.includes(field.name)) {\n      return;\n    }\n    if (!field.interface) {\n      return;\n    }\n    const fieldInterface = getInterface(field.interface);\n    if (!fieldInterface.filterable) {\n      return;\n    }\n    const { nested, children, operators } = fieldInterface.filterable;\n    const option = {\n      name: field.name,\n      title: field?.uiSchema?.title || field.name,\n      schema: field?.uiSchema,\n      operators:\n        operators?.filter?.((operator) => {\n          return !operator?.visible || operator.visible(field);\n        }) || [],\n    };\n    if (field.target && depth > 2) {\n      return;\n    }\n    if (depth > 2) {\n      return option;\n    }\n    if (children?.length) {\n      option['children'] = children;\n    }\n    if (nested) {\n      const targetFields = getCollectionFields(field.target);\n      const options = getOptions(targetFields, depth+1).filter(Boolean);\n      option['children'] = option['children'] || [];\n      option['children'].push(...options);\n    }\n    return option;\n  };\n  const getOptions = (fields, depth) => {\n    const options = [];\n    fields.forEach((field) => {\n      const option = field2option(field, depth);\n      if (option) {\n        options.push(option);\n      }\n    });\n    return options;\n  };\n  return getOptions(fields, 1);\n};\n\nconst isEmpty = (obj) => {\n  return obj && Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype;\n};\n\nconst removeNullCondition = (filter) => {\n  const items = flat(filter || {});\n  const values = {};\n  for (const key in items) {\n    const value = items[key];\n    if (value !== null && !isEmpty(value)) {\n      values[key] = value;\n    }\n  }\n  return flat.unflatten(values);\n};\n\nexport const mergeFilter = (filter1, filter2) => {\n  if (filter1 && filter2) {\n    return { $and: [filter1, filter2] };\n  }\n  if (!filter1 && filter2) {\n    return filter2;\n  }\n  if (filter1 && !filter2) {\n    return filter1;\n  }\n  return {};\n};\n\nexport const useFilterActionProps = () => {\n  const { name } = useCollection();\n  const options = useFilterOptions(name);\n  const { service, props } = useBlockRequestContext();\n  const field = useField<Field>();\n  const { t } = useTranslation();\n  return {\n    options,\n    onSubmit(values) {\n      // filter parameter for the block\n      const defaultFilter = removeNullCondition(props.params.filter);\n      // filter parameter for the filter action\n      const filter = removeNullCondition(values?.filter);\n      service.run({ ...service.params?.[0], filter: mergeFilter(defaultFilter, filter) });\n      const items = filter?.$and || filter?.$or;\n      if (items?.length) {\n        field.title = t('{{count}} filter items', { count: items?.length || 0 });\n      } else {\n        field.title = t('Filter');\n      }\n    },\n    onReset() {\n      const filter = removeNullCondition(props.params.filter);\n      service.run({ ...service.params?.[0], filter });\n      field.title = t('Filter');\n    },\n  };\n};\n"]}

package/esm/schema-component/antd/filter/useValues.d.ts

@@ -0,0 +1 @@
+export declare const useValues: () => any;

package/esm/schema-component/antd/filter/useValues.js

@@ -0,0 +1,110 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+import { useField } from '@formily/react';
+import { merge } from '@formily/shared';
+import flat from 'flat';
+import get from 'lodash/get';
+import { useContext, useEffect } from 'react';
+import { FilterContext, FilterLogicContext } from './context';
+// import { useValues } from './useValues';
+var findOption = function (dataIndex, options) {
+    var _a;
+    if (dataIndex === void 0) { dataIndex = []; }
+    var items = options;
+    var option;
+    (_a = dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.forEach) === null || _a === void 0 ? void 0 : _a.call(dataIndex, function (name, index) {
+        var item = items.find(function (item) { return item.name === name; });
+        if (item) {
+            option = item;
+        }
+        items = (item === null || item === void 0 ? void 0 : item.children) || [];
+    });
+    return option;
+};
+export var useValues = function () {
+    var field = useField();
+    var logic = useContext(FilterLogicContext);
+    var options = useContext(FilterContext).options;
+    var data2value = function () {
+        var _a;
+        var _b, _c, _d, _e;
+        field.value = flat.unflatten((_a = {},
+            _a[((_b = field.data.dataIndex) === null || _b === void 0 ? void 0 : _b.join('.')) + "." + ((_d = (_c = field.data) === null || _c === void 0 ? void 0 : _c.operator) === null || _d === void 0 ? void 0 : _d.value)] = (_e = field.data) === null || _e === void 0 ? void 0 : _e.value,
+            _a));
+    };
+    var value2data = function () {
+        var _a;
+        var values = flat(field.value);
+        var path = Object.keys(values).shift() || '';
+        if (!path) {
+            return;
+        }
+        var _b = __read(path.split('.$'), 2), fieldPath = _b[0], otherPath = _b[1];
+        var _c = __read(otherPath.split('.', 2), 1), operatorValue = _c[0];
+        var dataIndex = fieldPath.split('.');
+        var option = findOption(dataIndex, options);
+        var operators = option === null || option === void 0 ? void 0 : option.operators;
+        var operator = (_a = operators === null || operators === void 0 ? void 0 : operators.find) === null || _a === void 0 ? void 0 : _a.call(operators, function (item) { return item.value === "$" + operatorValue; });
+        field.data = field.data || {};
+        field.data.dataIndex = dataIndex;
+        field.data.operators = operators;
+        field.data.operator = operator;
+        field.data.schema = merge(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
+        field.data.value = get(field.value, fieldPath + ".$" + operatorValue);
+        console.log('option', operator, field.data.value);
+    };
+    useEffect(function () {
+        value2data();
+    }, [logic]);
+    return __assign(__assign({ fields: options }, field.data), { setDataIndex: function (dataIndex) {
+            var _a;
+            var option = findOption(dataIndex, options);
+            var operator = (_a = option === null || option === void 0 ? void 0 : option.operators) === null || _a === void 0 ? void 0 : _a[0];
+            field.data = field.data || {};
+            field.data.operators = option === null || option === void 0 ? void 0 : option.operators;
+            field.data.operator = operator;
+            field.data.schema = merge(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
+            field.data.dataIndex = dataIndex;
+            field.data.value = null;
+            data2value();
+            console.log('setDataIndex', field.data);
+        }, setOperator: function (operatorValue) {
+            var _a, _b, _c;
+            var operator = (_c = (_b = (_a = field.data) === null || _a === void 0 ? void 0 : _a.operators) === null || _b === void 0 ? void 0 : _b.find) === null || _c === void 0 ? void 0 : _c.call(_b, function (item) { return item.value === operatorValue; });
+            field.data.operator = operator;
+            field.data.schema = merge(field.data.schema, operator.schema);
+            field.data.value = operator.noValue ? operator.default || true : null;
+            data2value();
+            console.log('setOperator', field.data);
+        }, setValue: function (value) {
+            field.data.value = value;
+            data2value();
+            console.log('setValue', field.data);
+        } });
+};
+//# sourceMappingURL=useValues.js.map

package/esm/schema-component/antd/filter/useValues.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useValues.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/filter/useValues.ts"],"names":[],"mappings":"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","sourcesContent":["import { useField } from '@formily/react';\nimport { merge } from '@formily/shared';\nimport flat from 'flat';\nimport get from 'lodash/get';\nimport { useContext, useEffect } from 'react';\nimport { FilterContext, FilterLogicContext } from './context';\n\n// import { useValues } from './useValues';\nconst findOption = (dataIndex = [], options) => {\n  let items = options;\n  let option;\n  dataIndex?.forEach?.((name, index) => {\n    const item = items.find((item) => item.name === name);\n    if (item) {\n      option = item;\n    }\n    items = item?.children || [];\n  });\n  return option;\n};\n\nexport const useValues = () => {\n  const field = useField<any>();\n  const logic = useContext(FilterLogicContext);\n  const { options } = useContext(FilterContext);\n  const data2value = () => {\n    field.value = flat.unflatten({\n      [`${field.data.dataIndex?.join('.')}.${field.data?.operator?.value}`]: field.data?.value,\n    });\n  };\n  const value2data = () => {\n    const values = flat(field.value);\n    const path = Object.keys(values).shift() || '';\n    if (!path) {\n      return;\n    }\n    const [fieldPath, otherPath] = path.split('.$');\n    const [operatorValue] = otherPath.split('.', 2);\n    const dataIndex = fieldPath.split('.');\n    const option = findOption(dataIndex, options);\n    const operators = option?.operators;\n    const operator = operators?.find?.((item) => item.value === `$${operatorValue}`);\n    field.data = field.data || {};\n    field.data.dataIndex = dataIndex;\n    field.data.operators = operators;\n    field.data.operator = operator;\n    field.data.schema = merge(option?.schema, operator?.schema);\n    field.data.value = get(field.value, `${fieldPath}.$${operatorValue}`);\n    console.log('option', operator, field.data.value);\n  };\n  useEffect(() => {\n    value2data();\n  }, [logic]);\n  return {\n    fields: options,\n    ...field.data,\n    setDataIndex(dataIndex) {\n      const option = findOption(dataIndex, options);\n      const operator = option?.operators?.[0];\n      field.data = field.data || {};\n      field.data.operators = option?.operators;\n      field.data.operator = operator;\n      field.data.schema = merge(option?.schema, operator?.schema);\n      field.data.dataIndex = dataIndex;\n      field.data.value = null;\n      data2value();\n      console.log('setDataIndex', field.data);\n    },\n    setOperator(operatorValue) {\n      const operator = field.data?.operators?.find?.((item) => item.value === operatorValue);\n      field.data.operator = operator;\n      field.data.schema = merge(field.data.schema, operator.schema);\n      field.data.value = operator.noValue ? operator.default || true : null;\n      data2value();\n      console.log('setOperator', field.data);\n    },\n    setValue(value) {\n      field.data.value = value;\n      data2value();\n      console.log('setValue', field.data);\n    },\n  };\n};\n"]}

package/esm/schema-component/antd/form/Form.Designer.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const FormDesigner: () => JSX.Element;

package/esm/schema-component/antd/form/Form.Designer.js

@@ -0,0 +1,21 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useCollection } from '../../../collection-manager';
+import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
+export var FormDesigner = function () {
+    var _a = useCollection(), name = _a.name, title = _a.title;
+    return (_jsxs(GeneralSchemaDesigner, __assign({ title: title || name }, { children: [_jsx(SchemaSettings.Template, { componentName: 'Form', collectionName: name }, void 0), _jsx(SchemaSettings.Divider, {}, void 0), _jsx(SchemaSettings.Remove, { removeParentsIfNoChildren: true, breakRemoveOn: {
+                    'x-component': 'Grid',
+                } }, void 0)] }), void 0));
+};
+//# sourceMappingURL=Form.Designer.js.map

package/esm/schema-component/antd/form/Form.Designer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Form.Designer.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/form/Form.Designer.tsx"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAEjF,MAAM,CAAC,IAAM,YAAY,GAAG;IACpB,IAAA,KAAkB,aAAa,EAAE,EAA/B,IAAI,UAAA,EAAE,KAAK,WAAoB,CAAC;IACxC,OAAO,CACL,MAAC,qBAAqB,aAAC,KAAK,EAAE,KAAK,IAAI,IAAI,iBACzC,KAAC,cAAc,CAAC,QAAQ,IAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,WAAI,EACxE,KAAC,cAAc,CAAC,OAAO,aAAG,EAC1B,KAAC,cAAc,CAAC,MAAM,IACpB,yBAAyB,QACzB,aAAa,EAAE;oBACb,aAAa,EAAE,MAAM;iBACtB,WACD,aACoB,CACzB,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import React from 'react';\nimport { useCollection } from '../../../collection-manager';\nimport { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';\n\nexport const FormDesigner = () => {\n  const { name, title } = useCollection();\n  return (\n    <GeneralSchemaDesigner title={title || name}>\n      <SchemaSettings.Template componentName={'Form'} collectionName={name} />\n      <SchemaSettings.Divider />\n      <SchemaSettings.Remove\n        removeParentsIfNoChildren\n        breakRemoveOn={{\n          'x-component': 'Grid',\n        }}\n      />\n    </GeneralSchemaDesigner>\n  );\n};\n"]}

package/esm/schema-component/antd/form/Form.d.ts

@@ -0,0 +1,13 @@
+import { Options, Result } from 'ahooks/lib/useRequest/src/types';
+import React from 'react';
+declare type Opts = Options<any, any> & {
+    uid?: string;
+};
+export interface FormProps {
+    [key: string]: any;
+}
+export declare type FormUseValues = (opts?: Opts, props?: FormProps) => Result<any, any>;
+export declare const Form: React.FC<FormProps> & {
+    Designer?: any;
+};
+export {};

package/esm/schema-component/antd/form/Form.js

@@ -0,0 +1,136 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { FormLayout } from '@formily/antd';
+import { createForm } from '@formily/core';
+import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
+import { Spin } from 'antd';
+import { createContext, useContext, useMemo } from 'react';
+import { useAttach, useComponent } from '../..';
+import { useRequest } from '../../../api-client';
+import { useCollection } from '../../../collection-manager';
+import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
+import { useSchemaTemplate } from '../../../schema-templates';
+var FormComponent = function (props) {
+    var form = props.form, children = props.children, others = __rest(props, ["form", "children"]);
+    var field = useField();
+    var fieldSchema = useFieldSchema();
+    // TODO: component 里 useField 会与当前 field 存在偏差
+    var f = useAttach(form.createVoidField(__assign(__assign({}, field.props), { basePath: '' })));
+    return (_jsx(FieldContext.Provider, __assign({ value: undefined }, { children: _jsx(FormContext.Provider, __assign({ value: form }, { children: _jsx(FormLayout, __assign({ layout: 'vertical' }, others, { children: _jsx(RecursionField, { basePath: f.address, schema: fieldSchema, onlyRenderProperties: true }, void 0) }), void 0) }), void 0) }), void 0));
+};
+var Def = function (props) { return props.children; };
+var FormDecorator = function (props) {
+    var form = props.form, children = props.children, others = __rest(props, ["form", "children"]);
+    var field = useField();
+    var fieldSchema = useFieldSchema();
+    // TODO: component 里 useField 会与当前 field 存在偏差
+    var f = useAttach(form.createVoidField(__assign(__assign({}, field.props), { basePath: '' })));
+    var Component = useComponent(fieldSchema['x-component'], Def);
+    return (_jsx(FieldContext.Provider, __assign({ value: undefined }, { children: _jsx(FormContext.Provider, __assign({ value: form }, { children: _jsx(FormLayout, __assign({ layout: 'vertical' }, others, { children: _jsx(FieldContext.Provider, __assign({ value: f }, { children: _jsx(Component, __assign({}, field.componentProps, { children: _jsx(RecursionField, { basePath: f.address, schema: fieldSchema, onlyRenderProperties: true }, void 0) }), void 0) }), void 0) }), void 0) }), void 0) }), void 0));
+};
+var useRequestProps = function (props) {
+    var request = props.request, initialValue = props.initialValue;
+    if (request) {
+        return request;
+    }
+    return function () {
+        return Promise.resolve({
+            data: initialValue,
+        });
+    };
+};
+var useDef = function (opts, props) {
+    if (opts === void 0) { opts = {}; }
+    if (props === void 0) { props = {}; }
+    return useRequest(useRequestProps(props), opts);
+};
+var FormBlockContext = createContext(null);
+export var Form = observer(function (props) {
+    var request = props.request, effects = props.effects, initialValue = props.initialValue, _a = props.useValues, useValues = _a === void 0 ? useDef : _a, others = __rest(props, ["request", "effects", "initialValue", "useValues"]);
+    var fieldSchema = useFieldSchema();
+    var field = useField();
+    var form = useMemo(function () { return createForm({ effects: effects }); }, []);
+    var result = useValues({
+        uid: fieldSchema['x-uid'],
+        onSuccess: function (data) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, form.reset()];
+                        case 1:
+                            _a.sent();
+                            form.setValues(data === null || data === void 0 ? void 0 : data.data);
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        },
+    }, props);
+    var parent = useContext(FormBlockContext);
+    return (_jsx(FormBlockContext.Provider, __assign({ value: { parent: parent, form: form, result: result, field: field, fieldSchema: fieldSchema } }, { children: _jsx(Spin, __assign({ spinning: (result === null || result === void 0 ? void 0 : result.loading) || false }, { children: fieldSchema['x-decorator'] === 'Form' ? (_jsx(FormDecorator, __assign({ form: form }, others), void 0)) : (_jsx(FormComponent, __assign({ form: form }, others), void 0)) }), void 0) }), void 0));
+});
+Form.Designer = function () {
+    var _a = useCollection(), name = _a.name, title = _a.title;
+    var template = useSchemaTemplate();
+    return (_jsxs(GeneralSchemaDesigner, __assign({ template: template, title: title || name }, { children: [_jsx(SchemaSettings.Template, { componentName: 'Form', collectionName: name }, void 0), _jsx(SchemaSettings.Divider, {}, void 0), _jsx(SchemaSettings.Remove, { removeParentsIfNoChildren: true, breakRemoveOn: {
+                    'x-component': 'Grid',
+                } }, void 0)] }), void 0));
+};
+//# sourceMappingURL=Form.js.map

package/esm/schema-component/antd/form/Form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Form.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/form/Form.tsx"],"names":[],"mappings":"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","sourcesContent":["import { FormLayout } from '@formily/antd';\nimport { createForm } from '@formily/core';\nimport { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';\nimport { Options, Result } from 'ahooks/lib/useRequest/src/types';\nimport { Spin } from 'antd';\nimport React, { createContext, useContext, useMemo } from 'react';\nimport { useAttach, useComponent } from '../..';\nimport { useRequest } from '../../../api-client';\nimport { useCollection } from '../../../collection-manager';\nimport { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';\nimport { useSchemaTemplate } from '../../../schema-templates';\n\ntype Opts = Options<any, any> & { uid?: string };\n\nexport interface FormProps {\n  [key: string]: any;\n}\n\nexport type FormUseValues = (opts?: Opts, props?: FormProps) => Result<any, any>;\n\nconst FormComponent: React.FC<FormProps> = (props) => {\n  const { form, children, ...others } = props;\n  const field = useField();\n  const fieldSchema = useFieldSchema();\n  // TODO: component 里 useField 会与当前 field 存在偏差\n  const f = useAttach(form.createVoidField({ ...field.props, basePath: '' }));\n  return (\n    <FieldContext.Provider value={undefined}>\n      <FormContext.Provider value={form}>\n        <FormLayout layout={'vertical'} {...others}>\n          <RecursionField basePath={f.address} schema={fieldSchema} onlyRenderProperties />\n        </FormLayout>\n      </FormContext.Provider>\n    </FieldContext.Provider>\n  );\n};\n\nconst Def = (props: any) => props.children;\n\nconst FormDecorator: React.FC<FormProps> = (props) => {\n  const { form, children, ...others } = props;\n  const field = useField();\n  const fieldSchema = useFieldSchema();\n  // TODO: component 里 useField 会与当前 field 存在偏差\n  const f = useAttach(form.createVoidField({ ...field.props, basePath: '' }));\n  const Component = useComponent(fieldSchema['x-component'], Def);\n  return (\n    <FieldContext.Provider value={undefined}>\n      <FormContext.Provider value={form}>\n        <FormLayout layout={'vertical'} {...others}>\n          <FieldContext.Provider value={f}>\n            <Component {...field.componentProps}>\n              <RecursionField basePath={f.address} schema={fieldSchema} onlyRenderProperties />\n            </Component>\n          </FieldContext.Provider>\n          {/* <FieldContext.Provider value={f}>{children}</FieldContext.Provider> */}\n        </FormLayout>\n      </FormContext.Provider>\n    </FieldContext.Provider>\n  );\n};\n\nconst useRequestProps = (props: any) => {\n  const { request, initialValue } = props;\n  if (request) {\n    return request;\n  }\n  return () => {\n    return Promise.resolve({\n      data: initialValue,\n    });\n  };\n};\n\nconst useDef = (opts: any = {}, props: FormProps = {}) => {\n  return useRequest(useRequestProps(props), opts);\n};\n\nconst FormBlockContext = createContext<any>(null);\n\nexport const Form: React.FC<FormProps> & { Designer?: any } = observer((props) => {\n  const { request, effects, initialValue, useValues = useDef, ...others } = props;\n  const fieldSchema = useFieldSchema();\n  const field = useField();\n  const form = useMemo(() => createForm({ effects }), []);\n  const result = useValues(\n    {\n      uid: fieldSchema['x-uid'],\n      async onSuccess(data) {\n        await form.reset();\n        form.setValues(data?.data);\n      },\n    },\n    props,\n  );\n  const parent = useContext(FormBlockContext);\n  return (\n    <FormBlockContext.Provider value={{ parent, form, result, field, fieldSchema }}>\n      <Spin spinning={result?.loading || false}>\n        {fieldSchema['x-decorator'] === 'Form' ? (\n          <FormDecorator form={form} {...others} />\n        ) : (\n          <FormComponent form={form} {...others} />\n        )}\n      </Spin>\n    </FormBlockContext.Provider>\n  );\n});\n\nForm.Designer = () => {\n  const { name, title } = useCollection();\n  const template = useSchemaTemplate();\n  return (\n    <GeneralSchemaDesigner template={template} title={title || name}>\n      <SchemaSettings.Template componentName={'Form'} collectionName={name} />\n      <SchemaSettings.Divider />\n      <SchemaSettings.Remove\n        removeParentsIfNoChildren\n        breakRemoveOn={{\n          'x-component': 'Grid',\n        }}\n      />\n    </GeneralSchemaDesigner>\n  );\n};\n"]}

package/esm/schema-component/antd/form/index.d.ts

@@ -0,0 +1 @@
+export * from './Form';

package/esm/schema-component/antd/form/index.js

@@ -0,0 +1,2 @@
+export * from './Form';
+//# sourceMappingURL=index.js.map

package/esm/schema-component/antd/form/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/schema-component/antd/form/index.tsx"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC","sourcesContent":["export * from './Form';\n"]}