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

package/lib/schemas/filter/FilterItem.js

@@ -1,285 +0,0 @@
-"use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function get() {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __setModuleDefault = void 0 && (void 0).__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-
-var __importStar = void 0 && (void 0).__importStar || function (mod) {
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-
-  __setModuleDefault(result, mod);
-
-  return result;
-};
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FilterItem = void 0;
-
-const react_1 = __importStar(require("react"));
-
-const __1 = require("..");
-
-const core_1 = require("@formily/core");
-
-const react_2 = require("@formily/react");
-
-const antd_1 = require("@formily/antd");
-
-const icons_1 = require("@ant-design/icons");
-
-const lodash_1 = require("lodash");
-
-const shared_1 = require("@formily/shared");
-
-function useFilterColumns() {
-  const schema = (0, react_2.useFieldSchema)();
-  const columns = schema.reduceProperties((columns, current) => {
-    if (current['x-component'] === 'Filter.Column') {
-      const fieldName = Object.keys(current.properties).shift();
-      columns.set(fieldName, current);
-      return columns;
-    }
-
-    return columns;
-  }, new Map());
-  return columns;
-}
-
-const FilterItem = props => {
-  const value = props.value,
-        _props$initialValues = props.initialValues,
-        initialValues = _props$initialValues === void 0 ? {} : _props$initialValues,
-        onRemove = props.onRemove,
-        onChange = props.onChange;
-  const options = (0, react_1.useContext)(react_2.SchemaOptionsContext);
-  const columns = useFilterColumns();
-
-  const toValues = value => {
-    var _a;
-
-    if (!value) {
-      return {};
-    }
-
-    if (Object.keys(value).length === 0) {
-      return {};
-    }
-
-    const fieldName = Object.keys(value).shift();
-    const nested = value[fieldName];
-    const column = columns.get(fieldName).toJSON();
-    const operations = ((_a = column === null || column === void 0 ? void 0 : column['x-component-props']) === null || _a === void 0 ? void 0 : _a['operations']) || [];
-
-    if (!nested) {
-      return {
-        column,
-        operations
-      };
-    }
-
-    if (Object.keys(nested).length === 0) {
-      return {
-        column,
-        operations
-      };
-    }
-
-    const operationValue = Object.keys(nested).shift();
-    console.log('toValues', {
-      operationValue
-    });
-    const operation = operations.find(operation => operation.value === operationValue);
-    console.log('toValues', {
-      operation
-    });
-
-    if (!operation) {
-      return {
-        operations,
-        column
-      };
-    }
-
-    if (operation.noValue) {
-      return {
-        column,
-        operations,
-        operation
-      };
-    }
-
-    return {
-      column,
-      operation,
-      operations,
-      value: nested[operationValue]
-    };
-  };
-
-  const values = toValues(value);
-  console.log('toValues', values, value);
-
-  const Remove = props => {
-    return onRemove && react_1.default.createElement("a", {
-      onClick: () => onRemove()
-    }, react_1.default.createElement(icons_1.CloseCircleOutlined, null));
-  };
-
-  const form = (0, react_1.useMemo)(() => (0, core_1.createForm)({
-    initialValues: values,
-    effects: form => {
-      (0, core_1.onFieldChange)('column', (field, form) => {
-        var _a;
-
-        const column = field.value || {};
-        const operations = ((_a = column === null || column === void 0 ? void 0 : column['x-component-props']) === null || _a === void 0 ? void 0 : _a['operations']) || [];
-        field.query('operation').take(f => {
-          f.setDataSource(operations);
-          f.value = (0, lodash_1.get)(operations, [0]);
-        });
-        field.query('value').take(f => {
-          f.value = undefined;
-          f.componentProps.schema = column;
-        });
-      });
-      (0, core_1.onFieldReact)('operation', field => {
-        console.log('operation', field.value);
-        const operation = field.value || {};
-        field.query('value').take(f => {
-          f.visible = !operation.noValue;
-
-          if (operation.noValue) {
-            f.value = undefined;
-          }
-
-          f.componentProps.operation = operation;
-        });
-      });
-      (0, core_1.onFormValuesChange)(form => {
-        const _form$values = form.values,
-              column = _form$values.column,
-              operation = _form$values.operation,
-              value = _form$values.value;
-
-        if (!(operation === null || operation === void 0 ? void 0 : operation.value)) {
-          return;
-        }
-
-        const fieldName = Object.keys(column.properties).shift();
-
-        if (operation === null || operation === void 0 ? void 0 : operation.noValue) {
-          onChange({
-            [fieldName]: {
-              [operation.value]: true
-            }
-          });
-        } else {
-          onChange((0, shared_1.isValid)(value) ? {
-            [fieldName]: {
-              [operation.value]: value
-            }
-          } : {});
-        }
-
-        console.log('form.values', form.values);
-      });
-    }
-  }), []);
-  const columnEnum = [...columns.values()].map(column => column.toJSON());
-  return react_1.default.createElement(react_2.FormProvider, {
-    form: form
-  }, react_1.default.createElement(antd_1.FormLayout, {
-    layout: 'inline'
-  }, react_1.default.createElement(__1.SchemaField, {
-    components: {
-      Remove
-    }
-  }, react_1.default.createElement(__1.SchemaField.Void, {
-    "x-component": "Space"
-  }, react_1.default.createElement(__1.SchemaField.String, {
-    name: "column",
-    "x-decorator": "FormilyFormItem",
-    "x-decorator-props": {
-      asterisk: true,
-      feedbackLayout: 'none'
-    },
-    "x-component": "Select.Object",
-    "x-reactions": [],
-    "x-component-props": {
-      style: {
-        width: 100
-      },
-      fieldNames: {
-        label: 'title',
-        value: 'name'
-      }
-    },
-    enum: columnEnum
-  }), react_1.default.createElement(__1.SchemaField.String, {
-    name: "operation",
-    "x-decorator": "FormilyFormItem",
-    "x-decorator-props": {
-      asterisk: true,
-      feedbackLayout: 'none'
-    },
-    "x-component": "Select.Object",
-    "x-component-props": {
-      style: {
-        width: 100
-      }
-    },
-    enum: values.operations
-  }), react_1.default.createElement(__1.SchemaField.Object, {
-    name: "value",
-    "x-decorator": "FormilyFormItem",
-    "x-decorator-props": {
-      asterisk: true,
-      feedbackLayout: 'none'
-    },
-    "x-component": "Filter.DynamicValue",
-    "x-component-props": {
-      schema: values.column,
-      operation: values.operation
-    }
-  }), react_1.default.createElement(__1.SchemaField.Void, {
-    "x-component": "Remove"
-  })))));
-};
-
-exports.FilterItem = FilterItem;
-exports.default = exports.FilterItem;
-//# sourceMappingURL=FilterItem.js.map

package/lib/schemas/filter/FilterItem.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/schemas/filter/FilterItem.tsx"],"names":[],"mappings":"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","file":"FilterItem.js","sourcesContent":["import React, { useContext, useMemo, useState } from 'react';\nimport { ISchema, SchemaField } from '..';\nimport { createForm, onFieldChange, onFieldReact, onFormValuesChange, onFormReset } from '@formily/core';\nimport {\n  FormProvider,\n  FormConsumer,\n  useFieldSchema,\n  Schema,\n  SchemaOptionsContext,\n  SchemaKey,\n  RecursionField,\n  useForm,\n} from '@formily/react';\nimport { Field } from '@formily/core/esm/models/Field';\nimport { Form } from '@formily/core/esm/models/Form';\nimport { Input, FormItem, FormLayout, FormButtonGroup, Submit, Space } from '@formily/antd';\nimport { CloseCircleOutlined } from '@ant-design/icons';\nimport { get } from 'lodash';\nimport { isValid, uid } from '@formily/shared';\nimport { useEffect } from 'react';\n\nfunction useFilterColumns(): Map<SchemaKey, Schema> {\n  const schema = useFieldSchema();\n  const columns = schema.reduceProperties((columns, current) => {\n    if (current['x-component'] === 'Filter.Column') {\n      const fieldName = Object.keys(current.properties).shift();\n      columns.set(fieldName, current);\n      return columns;\n    }\n    return columns;\n  }, new Map<SchemaKey, Schema>());\n  return columns;\n}\n\nexport const FilterItem = (props) => {\n  const { value, initialValues = {}, onRemove, onChange } = props;\n  const options = useContext(SchemaOptionsContext);\n  const columns = useFilterColumns();\n\n  const toValues = (value) => {\n    if (!value) {\n      return {};\n    }\n    if (Object.keys(value).length === 0) {\n      return {};\n    }\n    const fieldName = Object.keys(value).shift();\n    const nested = value[fieldName];\n    const column = columns.get(fieldName).toJSON();\n    const operations = column?.['x-component-props']?.['operations'] || [];\n    if (!nested) {\n      return {\n        column,\n        operations,\n      };\n    }\n    if (Object.keys(nested).length === 0) {\n      return {\n        column,\n        operations,\n      };\n    }\n    const operationValue = Object.keys(nested).shift();\n    console.log('toValues', { operationValue });\n    const operation = operations.find((operation) => operation.value === operationValue);\n    console.log('toValues', { operation });\n    if (!operation) {\n      return {\n        operations,\n        column,\n      };\n    }\n    if (operation.noValue) {\n      return {\n        column,\n        operations,\n        operation,\n      };\n    }\n    return {\n      column,\n      operation,\n      operations,\n      value: nested[operationValue],\n    };\n  };\n\n  const values = toValues(value);\n\n  console.log('toValues', values, value);\n\n  const Remove = (props) => {\n    return (\n      onRemove && (\n        <a onClick={() => onRemove()}>\n          <CloseCircleOutlined />\n        </a>\n      )\n    );\n  };\n\n  const form = useMemo(\n    () =>\n      createForm({\n        initialValues: values,\n        effects: (form) => {\n          onFieldChange('column', (field: Field, form: Form) => {\n            const column = (field.value || {}) as ISchema;\n            const operations = column?.['x-component-props']?.['operations'] || [];\n            field.query('operation').take((f: Field) => {\n              f.setDataSource(operations);\n              f.value = get(operations, [0]);\n            });\n            field.query('value').take((f: Field) => {\n              f.value = undefined;\n              f.componentProps.schema = column;\n            });\n          });\n          onFieldReact('operation', (field: Field) => {\n            console.log('operation', field.value);\n            const operation = field.value || {};\n            field.query('value').take((f: Field) => {\n              f.visible = !operation.noValue;\n              if (operation.noValue) {\n                f.value = undefined;\n              }\n              f.componentProps.operation = operation;\n            });\n          });\n          onFormValuesChange((form) => {\n            const { column, operation, value } = form.values;\n            if (!operation?.value) {\n              return;\n            }\n            const fieldName = Object.keys(column.properties).shift();\n            if (operation?.noValue) {\n              onChange({\n                [fieldName]: {\n                  [operation.value]: true,\n                },\n              });\n            } else {\n              onChange(\n                isValid(value)\n                  ? {\n                      [fieldName]: {\n                        [operation.value]: value,\n                      },\n                    }\n                  : {},\n              );\n            }\n            console.log('form.values', form.values);\n          });\n        },\n      }),\n    [],\n  );\n\n  const columnEnum: any = [...columns.values()].map((column) => column.toJSON());\n\n  return (\n    <FormProvider form={form}>\n      <FormLayout layout={'inline'}>\n        <SchemaField components={{ Remove }}>\n          <SchemaField.Void x-component=\"Space\">\n            <SchemaField.String\n              name=\"column\"\n              x-decorator=\"FormilyFormItem\"\n              x-decorator-props={{\n                asterisk: true,\n                feedbackLayout: 'none',\n              }}\n              x-component=\"Select.Object\"\n              x-reactions={[]}\n              x-component-props={{\n                style: {\n                  width: 100,\n                },\n                fieldNames: {\n                  label: 'title',\n                  value: 'name',\n                },\n              }}\n              enum={columnEnum}\n            />\n            <SchemaField.String\n              name=\"operation\"\n              x-decorator=\"FormilyFormItem\"\n              x-decorator-props={{\n                asterisk: true,\n                feedbackLayout: 'none',\n              }}\n              x-component=\"Select.Object\"\n              x-component-props={{\n                style: {\n                  width: 100,\n                },\n              }}\n              enum={values.operations}\n            />\n            <SchemaField.Object\n              name=\"value\"\n              x-decorator=\"FormilyFormItem\"\n              x-decorator-props={{\n                asterisk: true,\n                feedbackLayout: 'none',\n              }}\n              x-component=\"Filter.DynamicValue\"\n              x-component-props={{\n                schema: values.column,\n                operation: values.operation,\n              }}\n            />\n            <SchemaField.Void x-component=\"Remove\" />\n          </SchemaField.Void>\n        </SchemaField>\n      </FormLayout>\n      {/* <FormConsumer>\n        {(form) => {\n          return (\n            <pre>{JSON.stringify(form.values, null, 2)}</pre>\n          )\n        }}\n      </FormConsumer> */}\n    </FormProvider>\n  );\n};\n\nexport default FilterItem;\n"]}

package/lib/schemas/filter/index.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-import './style.less';
-export declare function FilterGroup(props: any): JSX.Element;
-export declare function FilterList(props: any): JSX.Element;
-export declare const Filter: any;
-export default Filter;

package/lib/schemas/filter/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/schemas/filter/index.tsx"],"names":[],"mappings":";AAoBA,OAAO,cAAc,CAAC;AAkCtB,wBAAgB,WAAW,CAAC,KAAK,KAAA,eA8ChC;AAED,wBAAgB,UAAU,CAAC,KAAK,KAAA,eAyE/B;AAED,eAAO,MAAM,MAAM,EAAE,GA0BpB,CAAC;AA8DF,eAAe,MAAM,CAAC","file":"index.d.ts","sourcesContent":["import React, { useEffect } from 'react';\nimport {\n  connect,\n  mapProps,\n  mapReadPretty,\n  observer,\n  RecursionField,\n  ISchema,\n  Schema,\n  ArrayField,\n  useField,\n  FormProvider,\n  useForm,\n} from '@formily/react';\nimport { LoadingOutlined } from '@ant-design/icons';\nimport { useDynamicList, useMap, useMount, useUnmount } from 'ahooks';\nimport { Select } from 'antd';\nimport { CloseCircleOutlined } from '@ant-design/icons';\nimport { FilterItem } from './FilterItem';\nimport cls from 'classnames';\nimport './style.less';\nimport { cloneDeep } from 'lodash';\nimport { uid, isValid } from '@formily/shared';\nimport { SchemaField, SchemaRenderer } from '../../components/schema-renderer';\nimport { useMemo } from 'react';\nimport { createForm, LifeCycleTypes, onFormReset } from '@formily/core';\nimport deepmerge from 'deepmerge';\nimport { Trans, useTranslation } from 'react-i18next';\n\nconst toValue = (value) => {\n  if (!value) {\n    return {\n      logical: 'and',\n      list: [{}],\n    };\n  }\n  if (value.and) {\n    return {\n      logical: 'and',\n      list: value.and,\n    };\n  }\n  if (value.or) {\n    return {\n      logical: 'and',\n      list: value.or,\n    };\n  }\n  return {\n    logical: 'and',\n    list: [{}],\n  };\n};\n\nexport function FilterGroup(props) {\n  const { bordered = true, onRemove, onChange } = props;\n  const value = toValue(props.value);\n  const form = useForm();\n  console.log('list', value);\n\n  return (\n    <div className={cls('nb-filter-group', { bordered })}>\n      {onRemove && (\n        <a className={'nb-filter-group-close'} onClick={() => onRemove()}>\n          <CloseCircleOutlined />\n        </a>\n      )}\n      <div style={{ marginBottom: 14 }}>\n        <Trans>\n          {'Meet '}\n          <Select\n            style={{ width: 80 }}\n            onChange={(logical) => {\n              onChange &&\n                onChange({\n                  [logical]: value.list,\n                });\n            }}\n            defaultValue={value.logical}\n          >\n            <Select.Option value={'and'}>All</Select.Option>\n            <Select.Option value={'or'}>Any</Select.Option>\n          </Select>\n          {' conditions in the group'}\n        </Trans>\n      </div>\n      <FilterList\n        initialValue={value.list}\n        onChange={(list: any[]) => {\n          console.log('list9999', list);\n          onChange &&\n            onChange({\n              [value.logical]: list.filter(\n                (item) => isValid(item) && Object.keys(item).length,\n              ),\n            });\n        }}\n      />\n    </div>\n  );\n}\n\nexport function FilterList(props) {\n  const { initialValue = [] } = props;\n  const form = useForm();\n  const { t } = useTranslation();\n\n  const [map, { set, setAll, remove, reset, get }] = useMap<string, any>(\n    initialValue.map((item, index) => {\n      return [`index-${index}`, item];\n    }),\n  );\n  useEffect(() => {\n    const id = uid();\n    form.addEffects(id, () => {\n      onFormReset((form) => {\n        setAll([]);\n        setTimeout(() => {\n          reset();\n        },0);\n      });\n      return () => {\n        form.removeEffects(id);\n      };\n    });\n  }, []);\n  useEffect(() => {\n    props.onChange && props.onChange([...map.values()]);\n  }, [map]);\n\n  return (\n    <div className={'nb-filter-list'}>\n      <div>\n        {[...map.entries()].map(([index, item]) => {\n          if (item.and || item.or) {\n            return (\n              <FilterGroup\n                key={index}\n                value={item}\n                onChange={(value: any) => set(index, value)}\n                onRemove={() => remove(index)}\n              />\n            );\n          }\n          return (\n            <FilterItem\n              key={index}\n              value={item}\n              onChange={(value: any) => set(index, value)}\n              onRemove={() => remove(index)}\n            />\n          );\n        })}\n      </div>\n      <div style={{ marginTop: 16 }}>\n        <a\n          onClick={() => {\n            set(uid(), {});\n          }}\n        >\n          {t('Add filter')}\n        </a>\n        <a\n          style={{ marginLeft: 16 }}\n          onClick={() => {\n            set(uid(), {\n              and: [{}],\n            });\n          }}\n        >\n          {t('Add filter group')}\n        </a>\n      </div>\n    </div>\n  );\n}\n\nexport const Filter: any = connect(\n  (props) => {\n    // console.log('Filter.props', { props });\n    return (\n      <div>\n        <FilterGroup bordered={false} {...props} />\n      </div>\n    );\n  },\n  mapProps((props, field) => {\n    return {\n      ...props,\n      suffix: (\n        <span>\n          {field?.['loading'] || field?.['validating'] ? (\n            <LoadingOutlined />\n          ) : (\n            props.suffix\n          )}\n        </span>\n      ),\n    };\n  }),\n  mapReadPretty((props) => {\n    return null;\n  }),\n);\n\ninterface DynamicValuePorps {\n  value?: any;\n  onChange?: any;\n  schema?: Schema;\n  operation?: any;\n}\n\nFilter.DynamicValue = connect((props: DynamicValuePorps) => {\n  const { onChange, value, operation } = props;\n  const fieldName = Object.keys(props?.schema?.properties || {}).shift();\n  const fieldSchema = Object.values(props?.schema?.properties || {}).shift();\n  console.log('Filter.DynamicValue', fieldSchema, { operation });\n  const form = useMemo(\n    () =>\n      createForm({\n        initialValues: {\n          [fieldName || 'value']: value,\n        },\n        // effects() {\n        //   onFormValuesChange((form) => {\n        //     onChange(form.values[fieldName]);\n        //   });\n        // },\n      }),\n    [value],\n  );\n  const extra: ISchema = deepmerge(\n    {\n      required: false,\n      'x-read-pretty': false,\n      'x-decorator': 'FormilyFormItem',\n      'x-decorator-props': {\n        asterisk: true,\n        feedbackLayout: 'none',\n      },\n      'x-component-props': {\n        onChange,\n        style: {\n          minWidth: '150px',\n        },\n      },\n    },\n    operation?.schema || {},\n  );\n  return (\n    <FormProvider form={form}>\n      <SchemaField\n        schema={{\n          type: 'object',\n          properties: {\n            [fieldName]: deepmerge(fieldSchema, extra, {\n              arrayMerge: (target, source) => source,\n            }) as any,\n          },\n        }}\n      />\n    </FormProvider>\n  );\n});\n\nexport default Filter;\n"]}

package/lib/schemas/filter/index.js

@@ -1,306 +0,0 @@
-"use strict";
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function get() {
-      return m[k];
-    }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-
-var __setModuleDefault = void 0 && (void 0).__setModuleDefault || (Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-});
-
-var __importStar = void 0 && (void 0).__importStar || function (mod) {
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-
-  __setModuleDefault(result, mod);
-
-  return result;
-};
-
-var __importDefault = void 0 && (void 0).__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
-};
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Filter = exports.FilterList = exports.FilterGroup = void 0;
-
-const react_1 = __importStar(require("react"));
-
-const react_2 = require("@formily/react");
-
-const icons_1 = require("@ant-design/icons");
-
-const ahooks_1 = require("ahooks");
-
-const antd_1 = require("antd");
-
-const icons_2 = require("@ant-design/icons");
-
-const FilterItem_1 = require("./FilterItem");
-
-const classnames_1 = __importDefault(require("classnames"));
-
-require("./style.less");
-
-const shared_1 = require("@formily/shared");
-
-const schema_renderer_1 = require("../../components/schema-renderer");
-
-const react_3 = require("react");
-
-const core_1 = require("@formily/core");
-
-const deepmerge_1 = __importDefault(require("deepmerge"));
-
-const react_i18next_1 = require("react-i18next");
-
-const toValue = value => {
-  if (!value) {
-    return {
-      logical: 'and',
-      list: [{}]
-    };
-  }
-
-  if (value.and) {
-    return {
-      logical: 'and',
-      list: value.and
-    };
-  }
-
-  if (value.or) {
-    return {
-      logical: 'and',
-      list: value.or
-    };
-  }
-
-  return {
-    logical: 'and',
-    list: [{}]
-  };
-};
-
-function FilterGroup(props) {
-  const _props$bordered = props.bordered,
-        bordered = _props$bordered === void 0 ? true : _props$bordered,
-        onRemove = props.onRemove,
-        _onChange = props.onChange;
-  const value = toValue(props.value);
-  const form = (0, react_2.useForm)();
-  console.log('list', value);
-  return react_1.default.createElement("div", {
-    className: (0, classnames_1.default)('nb-filter-group', {
-      bordered
-    })
-  }, onRemove && react_1.default.createElement("a", {
-    className: 'nb-filter-group-close',
-    onClick: () => onRemove()
-  }, react_1.default.createElement(icons_2.CloseCircleOutlined, null)), react_1.default.createElement("div", {
-    style: {
-      marginBottom: 14
-    }
-  }, react_1.default.createElement(react_i18next_1.Trans, null, 'Meet ', react_1.default.createElement(antd_1.Select, {
-    style: {
-      width: 80
-    },
-    onChange: logical => {
-      _onChange && _onChange({
-        [logical]: value.list
-      });
-    },
-    defaultValue: value.logical
-  }, react_1.default.createElement(antd_1.Select.Option, {
-    value: 'and'
-  }, "All"), react_1.default.createElement(antd_1.Select.Option, {
-    value: 'or'
-  }, "Any")), ' conditions in the group')), react_1.default.createElement(FilterList, {
-    initialValue: value.list,
-    onChange: list => {
-      console.log('list9999', list);
-      _onChange && _onChange({
-        [value.logical]: list.filter(item => (0, shared_1.isValid)(item) && Object.keys(item).length)
-      });
-    }
-  }));
-}
-
-exports.FilterGroup = FilterGroup;
-
-function FilterList(props) {
-  const _props$initialValue = props.initialValue,
-        initialValue = _props$initialValue === void 0 ? [] : _props$initialValue;
-  const form = (0, react_2.useForm)();
-
-  const _ref = (0, react_i18next_1.useTranslation)(),
-        t = _ref.t;
-
-  const _ref2 = (0, ahooks_1.useMap)(initialValue.map((item, index) => {
-    return [`index-${index}`, item];
-  })),
-        _ref3 = _slicedToArray(_ref2, 2),
-        map = _ref3[0],
-        _ref3$ = _ref3[1],
-        set = _ref3$.set,
-        setAll = _ref3$.setAll,
-        remove = _ref3$.remove,
-        reset = _ref3$.reset,
-        get = _ref3$.get;
-
-  (0, react_1.useEffect)(() => {
-    const id = (0, shared_1.uid)();
-    form.addEffects(id, () => {
-      (0, core_1.onFormReset)(form => {
-        setAll([]);
-        setTimeout(() => {
-          reset();
-        }, 0);
-      });
-      return () => {
-        form.removeEffects(id);
-      };
-    });
-  }, []);
-  (0, react_1.useEffect)(() => {
-    props.onChange && props.onChange([...map.values()]);
-  }, [map]);
-  return react_1.default.createElement("div", {
-    className: 'nb-filter-list'
-  }, react_1.default.createElement("div", null, [...map.entries()].map(([index, item]) => {
-    if (item.and || item.or) {
-      return react_1.default.createElement(FilterGroup, {
-        key: index,
-        value: item,
-        onChange: value => set(index, value),
-        onRemove: () => remove(index)
-      });
-    }
-
-    return react_1.default.createElement(FilterItem_1.FilterItem, {
-      key: index,
-      value: item,
-      onChange: value => set(index, value),
-      onRemove: () => remove(index)
-    });
-  })), react_1.default.createElement("div", {
-    style: {
-      marginTop: 16
-    }
-  }, react_1.default.createElement("a", {
-    onClick: () => {
-      set((0, shared_1.uid)(), {});
-    }
-  }, t('Add filter')), react_1.default.createElement("a", {
-    style: {
-      marginLeft: 16
-    },
-    onClick: () => {
-      set((0, shared_1.uid)(), {
-        and: [{}]
-      });
-    }
-  }, t('Add filter group'))));
-}
-
-exports.FilterList = FilterList;
-exports.Filter = (0, react_2.connect)(props => {
-  return react_1.default.createElement("div", null, react_1.default.createElement(FilterGroup, Object.assign({
-    bordered: false
-  }, props)));
-}, (0, react_2.mapProps)((props, field) => {
-  return Object.assign(Object.assign({}, props), {
-    suffix: react_1.default.createElement("span", null, (field === null || field === void 0 ? void 0 : field['loading']) || (field === null || field === void 0 ? void 0 : field['validating']) ? react_1.default.createElement(icons_1.LoadingOutlined, null) : props.suffix)
-  });
-}), (0, react_2.mapReadPretty)(props => {
-  return null;
-}));
-exports.Filter.DynamicValue = (0, react_2.connect)(props => {
-  var _a, _b;
-
-  const onChange = props.onChange,
-        value = props.value,
-        operation = props.operation;
-  const fieldName = Object.keys(((_a = props === null || props === void 0 ? void 0 : props.schema) === null || _a === void 0 ? void 0 : _a.properties) || {}).shift();
-  const fieldSchema = Object.values(((_b = props === null || props === void 0 ? void 0 : props.schema) === null || _b === void 0 ? void 0 : _b.properties) || {}).shift();
-  console.log('Filter.DynamicValue', fieldSchema, {
-    operation
-  });
-  const form = (0, react_3.useMemo)(() => (0, core_1.createForm)({
-    initialValues: {
-      [fieldName || 'value']: value
-    }
-  }), [value]);
-  const extra = (0, deepmerge_1.default)({
-    required: false,
-    'x-read-pretty': false,
-    'x-decorator': 'FormilyFormItem',
-    'x-decorator-props': {
-      asterisk: true,
-      feedbackLayout: 'none'
-    },
-    'x-component-props': {
-      onChange,
-      style: {
-        minWidth: '150px'
-      }
-    }
-  }, (operation === null || operation === void 0 ? void 0 : operation.schema) || {});
-  return react_1.default.createElement(react_2.FormProvider, {
-    form: form
-  }, react_1.default.createElement(schema_renderer_1.SchemaField, {
-    schema: {
-      type: 'object',
-      properties: {
-        [fieldName]: (0, deepmerge_1.default)(fieldSchema, extra, {
-          arrayMerge: (target, source) => source
-        })
-      }
-    }
-  }));
-});
-exports.default = exports.Filter;
-//# sourceMappingURL=index.js.map

package/lib/schemas/filter/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/schemas/filter/index.tsx"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import React, { useEffect } from 'react';\nimport {\n  connect,\n  mapProps,\n  mapReadPretty,\n  observer,\n  RecursionField,\n  ISchema,\n  Schema,\n  ArrayField,\n  useField,\n  FormProvider,\n  useForm,\n} from '@formily/react';\nimport { LoadingOutlined } from '@ant-design/icons';\nimport { useDynamicList, useMap, useMount, useUnmount } from 'ahooks';\nimport { Select } from 'antd';\nimport { CloseCircleOutlined } from '@ant-design/icons';\nimport { FilterItem } from './FilterItem';\nimport cls from 'classnames';\nimport './style.less';\nimport { cloneDeep } from 'lodash';\nimport { uid, isValid } from '@formily/shared';\nimport { SchemaField, SchemaRenderer } from '../../components/schema-renderer';\nimport { useMemo } from 'react';\nimport { createForm, LifeCycleTypes, onFormReset } from '@formily/core';\nimport deepmerge from 'deepmerge';\nimport { Trans, useTranslation } from 'react-i18next';\n\nconst toValue = (value) => {\n  if (!value) {\n    return {\n      logical: 'and',\n      list: [{}],\n    };\n  }\n  if (value.and) {\n    return {\n      logical: 'and',\n      list: value.and,\n    };\n  }\n  if (value.or) {\n    return {\n      logical: 'and',\n      list: value.or,\n    };\n  }\n  return {\n    logical: 'and',\n    list: [{}],\n  };\n};\n\nexport function FilterGroup(props) {\n  const { bordered = true, onRemove, onChange } = props;\n  const value = toValue(props.value);\n  const form = useForm();\n  console.log('list', value);\n\n  return (\n    <div className={cls('nb-filter-group', { bordered })}>\n      {onRemove && (\n        <a className={'nb-filter-group-close'} onClick={() => onRemove()}>\n          <CloseCircleOutlined />\n        </a>\n      )}\n      <div style={{ marginBottom: 14 }}>\n        <Trans>\n          {'Meet '}\n          <Select\n            style={{ width: 80 }}\n            onChange={(logical) => {\n              onChange &&\n                onChange({\n                  [logical]: value.list,\n                });\n            }}\n            defaultValue={value.logical}\n          >\n            <Select.Option value={'and'}>All</Select.Option>\n            <Select.Option value={'or'}>Any</Select.Option>\n          </Select>\n          {' conditions in the group'}\n        </Trans>\n      </div>\n      <FilterList\n        initialValue={value.list}\n        onChange={(list: any[]) => {\n          console.log('list9999', list);\n          onChange &&\n            onChange({\n              [value.logical]: list.filter(\n                (item) => isValid(item) && Object.keys(item).length,\n              ),\n            });\n        }}\n      />\n    </div>\n  );\n}\n\nexport function FilterList(props) {\n  const { initialValue = [] } = props;\n  const form = useForm();\n  const { t } = useTranslation();\n\n  const [map, { set, setAll, remove, reset, get }] = useMap<string, any>(\n    initialValue.map((item, index) => {\n      return [`index-${index}`, item];\n    }),\n  );\n  useEffect(() => {\n    const id = uid();\n    form.addEffects(id, () => {\n      onFormReset((form) => {\n        setAll([]);\n        setTimeout(() => {\n          reset();\n        },0);\n      });\n      return () => {\n        form.removeEffects(id);\n      };\n    });\n  }, []);\n  useEffect(() => {\n    props.onChange && props.onChange([...map.values()]);\n  }, [map]);\n\n  return (\n    <div className={'nb-filter-list'}>\n      <div>\n        {[...map.entries()].map(([index, item]) => {\n          if (item.and || item.or) {\n            return (\n              <FilterGroup\n                key={index}\n                value={item}\n                onChange={(value: any) => set(index, value)}\n                onRemove={() => remove(index)}\n              />\n            );\n          }\n          return (\n            <FilterItem\n              key={index}\n              value={item}\n              onChange={(value: any) => set(index, value)}\n              onRemove={() => remove(index)}\n            />\n          );\n        })}\n      </div>\n      <div style={{ marginTop: 16 }}>\n        <a\n          onClick={() => {\n            set(uid(), {});\n          }}\n        >\n          {t('Add filter')}\n        </a>\n        <a\n          style={{ marginLeft: 16 }}\n          onClick={() => {\n            set(uid(), {\n              and: [{}],\n            });\n          }}\n        >\n          {t('Add filter group')}\n        </a>\n      </div>\n    </div>\n  );\n}\n\nexport const Filter: any = connect(\n  (props) => {\n    // console.log('Filter.props', { props });\n    return (\n      <div>\n        <FilterGroup bordered={false} {...props} />\n      </div>\n    );\n  },\n  mapProps((props, field) => {\n    return {\n      ...props,\n      suffix: (\n        <span>\n          {field?.['loading'] || field?.['validating'] ? (\n            <LoadingOutlined />\n          ) : (\n            props.suffix\n          )}\n        </span>\n      ),\n    };\n  }),\n  mapReadPretty((props) => {\n    return null;\n  }),\n);\n\ninterface DynamicValuePorps {\n  value?: any;\n  onChange?: any;\n  schema?: Schema;\n  operation?: any;\n}\n\nFilter.DynamicValue = connect((props: DynamicValuePorps) => {\n  const { onChange, value, operation } = props;\n  const fieldName = Object.keys(props?.schema?.properties || {}).shift();\n  const fieldSchema = Object.values(props?.schema?.properties || {}).shift();\n  console.log('Filter.DynamicValue', fieldSchema, { operation });\n  const form = useMemo(\n    () =>\n      createForm({\n        initialValues: {\n          [fieldName || 'value']: value,\n        },\n        // effects() {\n        //   onFormValuesChange((form) => {\n        //     onChange(form.values[fieldName]);\n        //   });\n        // },\n      }),\n    [value],\n  );\n  const extra: ISchema = deepmerge(\n    {\n      required: false,\n      'x-read-pretty': false,\n      'x-decorator': 'FormilyFormItem',\n      'x-decorator-props': {\n        asterisk: true,\n        feedbackLayout: 'none',\n      },\n      'x-component-props': {\n        onChange,\n        style: {\n          minWidth: '150px',\n        },\n      },\n    },\n    operation?.schema || {},\n  );\n  return (\n    <FormProvider form={form}>\n      <SchemaField\n        schema={{\n          type: 'object',\n          properties: {\n            [fieldName]: deepmerge(fieldSchema, extra, {\n              arrayMerge: (target, source) => source,\n            }) as any,\n          },\n        }}\n      />\n    </FormProvider>\n  );\n});\n\nexport default Filter;\n"]}

package/lib/schemas/filter/style.less.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"mappings":"","sources":["schemas/filter/style.less"],"sourcesContent":[".nb-filter-group {\n  position: relative;\n  margin-bottom: 14px;\n  min-width: 400px;\n  &-close {\n    position: absolute;\n    right: 10px;\n  }\n  &.bordered {\n    border: 1px dashed rgb(222, 222, 222);\n    padding: 14px;\n  }\n}\n.nb-filter-list {\n  .ant-form-inline {\n    margin-bottom: 8px;\n  }\n}\n"],"file":"style.less"}

package/lib/schemas/form/DesignableBar.d.ts

@@ -1,3 +0,0 @@
-import React from 'react';
-import './style.less';
-export declare const DesignableBar: React.MemoExoticComponent<React.FunctionComponent<unknown>>;