@nocobase/client 0.9.4-alpha.1 → 0.10.0-alpha.2

package/es/schema-component/antd/date-picker/DatePicker.js

@@ -28,7 +28,8 @@ export var DatePicker = function DatePicker(props) {
   }, props);
   return /*#__PURE__*/React.createElement(_DatePicker, _objectSpread({}, props));
 };
-DatePicker.RangePicker = function (props) {
+DatePicker.ReadPretty = ReadPretty.DatePicker;
+DatePicker.RangePicker = function RangePicker(props) {
   var _ranges;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;

package/es/schema-component/antd/date-picker/ReadPretty.d.ts

@@ -1,4 +1,4 @@
-import type { DatePickerProps as AntdDatePickerProps, RangePickerProps as AntdRangePickerProps } from 'antd/lib/date-picker';
+import type { DatePickerProps as AntdDatePickerProps, RangePickerProps as AntdRangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
 declare type Composed = {
     DatePicker: React.FC<AntdDatePickerProps>;

package/es/schema-component/antd/date-picker/ReadPretty.js

@@ -1,4 +1,4 @@
-import { usePrefixCls } from '@formily/antd/lib/__builtins__';
+import { usePrefixCls } from '@formily/antd/esm/__builtins__';
 import { isArr } from '@formily/shared';
 import { getDefaultFormat, str2moment } from '@nocobase/utils/client';
 import cls from 'classnames';

package/es/schema-component/antd/error-fallback/ErrorFallback.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export declare const ErrorFallback: ({ error }: {
     error: any;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/es/schema-component/antd/expand-action/Expand.Action.Design.d.ts

@@ -1 +1,2 @@
-export declare const ExpandActionDesign: (props: any) => JSX.Element;
+import React from 'react';
+export declare const ExpandActionDesign: (props: any) => React.JSX.Element;

package/es/schema-component/antd/expand-action/Expand.Action.Design.js

@@ -4,11 +4,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
-import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useTranslation } from 'react-i18next';
-import { useFieldSchema, useField } from '@formily/react';
 import { useDesignable } from '../..';
+import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 export var ExpandActionDesign = function ExpandActionDesign(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2;
   var _useTranslation = useTranslation(),

package/es/schema-component/antd/expand-action/Expand.Action.d.ts

@@ -1 +1,2 @@
-export declare const ExpandAction: (props: any) => JSX.Element;
+import React from 'react';
+export declare const ExpandAction: (props: any) => React.JSX.Element;

package/es/schema-component/antd/expand-action/Expand.Action.js

@@ -1,17 +1,14 @@
 var _templateObject;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-import React from 'react';
+import { css } from '@emotion/css';
 import { useFieldSchema } from '@formily/react';
-import { useTranslation } from 'react-i18next';
-import { useTableBlockContext, useTableSelectorContext } from '../../../block-provider';
 import { Button } from 'antd';
-import { css } from '@emotion/css';
+import React from 'react';
+import { useTableBlockContext, useTableSelectorContext } from '../../../block-provider';
 import { Icon } from '../../../icon';
 var actionDesignerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  &:hover {\n    .general-schema-designer {\n      display: block;\n    }\n  }\n  .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
 export var ExpandAction = function ExpandAction(props) {
   var _schema$parent, _schema$parent$parent;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
   var schema = useFieldSchema();
   var ctxSelector = useTableSelectorContext();
   var ctxBlock = useTableBlockContext();

package/es/schema-component/antd/filter/DynamicComponent.d.ts

@@ -1 +1,2 @@
-export declare const DynamicComponent: (props: any) => JSX.Element;
+import React from 'react';
+export declare const DynamicComponent: (props: any) => React.JSX.Element;

package/es/schema-component/antd/filter/Filter.Action.Designer.d.ts

@@ -1,2 +1,3 @@
+import React from 'react';
 export declare const useFilterableFields: (collectionName: string) => import("../../../collection-manager").CollectionFieldOptions[];
-export declare const FilterActionDesigner: (props: any) => JSX.Element;
+export declare const FilterActionDesigner: (props: any) => React.JSX.Element;

package/es/schema-component/antd/filter/Filter.js

@@ -9,11 +9,11 @@ import React from 'react';
 import { useRequest } from '../../../api-client';
 import { useProps } from '../../hooks/useProps';
 import { DatePickerProvider } from '../date-picker';
-import { FilterContext } from './context';
 import { FilterActionDesigner } from './Filter.Action.Designer';
 import { FilterAction } from './FilterAction';
 import { FilterGroup } from './FilterGroup';
 import { SaveDefaultValue } from './SaveDefaultValue';
+import { FilterContext } from './context';
 var useDef = function useDef(options) {
   var field = useField();
   return useRequest(function () {
@@ -53,6 +53,8 @@ export var Filter = observer(function (props) {
   }, /*#__PURE__*/React.createElement(FilterGroup, _objectSpread(_objectSpread({}, props), {}, {
     bordered: false
   })))));
+}, {
+  displayName: 'Filter'
 });
 Filter.SaveDefaultValue = SaveDefaultValue;
 Filter.Action = FilterAction;

package/es/schema-component/antd/filter/FilterAction.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 export declare const FilterActionContext: React.Context<any>;
-export declare const FilterAction: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const FilterAction: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/schema-component/antd/filter/FilterAction.js

@@ -59,8 +59,8 @@ export var FilterAction = observer(function (props) {
   }, /*#__PURE__*/React.createElement(Popover, {
     destroyTooltipOnHide: true,
     placement: 'bottomLeft',
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     trigger: 'click',
@@ -80,7 +80,7 @@ export var FilterAction = observer(function (props) {
         }
       }
     }), /*#__PURE__*/React.createElement("div", {
-      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                  display: flex;\n                  justify-content: flex-end;\n                  width: 100%;\n                "])))
+      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                    display: flex;\n                    justify-content: flex-end;\n                    width: 100%;\n                  "])))
     }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(SaveConditions, null), /*#__PURE__*/React.createElement(Button, {
       onClick: function () {
         var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -117,6 +117,8 @@ export var FilterAction = observer(function (props) {
   }, /*#__PURE__*/React.createElement(Action, _objectSpread(_objectSpread({}, others), {}, {
     title: field.title
   }))));
+}, {
+  displayName: 'FilterAction'
 });
 var SaveConditions = function SaveConditions() {
   var _useContext = useContext(FilterActionContext),

package/es/schema-component/antd/filter/FilterItem.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FilterItem: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const FilterItem: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/schema-component/antd/filter/FilterItem.js

@@ -7,8 +7,8 @@ import { Cascader, Select, Space } from 'antd';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCompile } from '../..';
-import { RemoveConditionContext } from './context';
 import { DynamicComponent } from './DynamicComponent';
+import { RemoveConditionContext } from './context';
 import { useValues } from './useValues';
 export var FilterItem = observer(function (props) {
   var _useTranslation = useTranslation(),
@@ -25,44 +25,49 @@ export var FilterItem = observer(function (props) {
     setOperator = _useValues.setOperator,
     value = _useValues.value,
     setValue = _useValues.setValue;
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      marginBottom: 8
-    }
-  }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Cascader, {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            width: 160px;\n          "]))),
-    fieldNames: {
-      label: 'title',
-      value: 'name',
-      children: 'children'
-    },
-    changeOnSelect: false,
-    value: dataIndex,
-    options: compile(fields),
-    onChange: function onChange(value) {
-      setDataIndex(value);
-    },
-    placeholder: t('Select Field')
-  }), /*#__PURE__*/React.createElement(Select, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            min-width: 110px;\n          "]))),
-    value: operator === null || operator === void 0 ? void 0 : operator.value,
-    options: compile(operators),
-    onChange: function onChange(value) {
-      setOperator(value);
-    },
-    placeholder: t('Comparision')
-  }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) && /*#__PURE__*/React.createElement(DynamicComponent, {
-    value: value ? value : undefined,
-    schema: schema,
-    onChange: function onChange(value) {
-      setValue(value);
-    }
-  }), !props.disabled && /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
-    onClick: function onClick() {
-      return remove();
-    },
-    style: {
-      color: '#bfbfbf'
-    }
-  }))));
+  return (
+    /*#__PURE__*/
+    // 添加 nc-filter-item 类名是为了帮助编写测试时更容易选中该元素
+    React.createElement("div", {
+      style: {
+        marginBottom: 8
+      },
+      className: "nc-filter-item"
+    }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Cascader, {
+      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              width: 160px;\n            "]))),
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+        children: 'children'
+      },
+      changeOnSelect: false,
+      value: dataIndex,
+      options: compile(fields),
+      onChange: function onChange(value) {
+        setDataIndex(value);
+      },
+      placeholder: t('Select field')
+    }), /*#__PURE__*/React.createElement(Select, {
+      className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              min-width: 110px;\n            "]))),
+      value: operator === null || operator === void 0 ? void 0 : operator.value,
+      options: compile(operators),
+      onChange: function onChange(value) {
+        setOperator(value);
+      },
+      placeholder: t('Comparision')
+    }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) ? /*#__PURE__*/React.createElement(DynamicComponent, {
+      value: value,
+      schema: schema,
+      onChange: setValue
+    }) : null, !props.disabled && /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+      onClick: function onClick() {
+        return remove();
+      },
+      style: {
+        color: '#bfbfbf'
+      }
+    }))))
+  );
+}, {
+  displayName: 'FilterItem'
 });

package/es/schema-component/antd/filter/FilterItems.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FilterItems: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const FilterItems: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/es/schema-component/antd/filter/FilterItems.js

@@ -17,4 +17,6 @@ export var FilterItems = observer(function (props) {
       component: [item.$and || item.$or ? FilterGroup : FilterItem]
     }));
   }));
+}, {
+  displayName: 'FilterItems'
 });

package/es/schema-component/antd/filter/SaveDefaultValue.d.ts

@@ -1 +1,2 @@
-export declare const SaveDefaultValue: (props: any) => JSX.Element;
+import React from 'react';
+export declare const SaveDefaultValue: (props: any) => React.JSX.Element;

package/es/schema-component/antd/filter/index.d.ts

@@ -1,2 +1,3 @@
 export * from './Filter';
+export * from './FilterAction';
 export * from './useFilterActionProps';

package/es/schema-component/antd/filter/index.js

@@ -1,2 +1,3 @@
 export * from './Filter';
+export * from './FilterAction';
 export * from './useFilterActionProps';

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

@@ -12,7 +12,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { useField } from '@formily/react';
 import { merge } from '@formily/shared';
-import flat from 'flat';
+import flat, { unflatten } from 'flat';
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import { useContext, useEffect } from 'react';
@@ -46,7 +46,7 @@ export var useValues = function useValues() {
   var value2data = function value2data() {
     var _operators$find;
     field.data = field.data || {};
-    var values = flat(field.value);
+    var values = flat(field.value || {});
     var path = Object.keys(values).shift() || '';
     if (!path || !options) {
       return;
@@ -70,7 +70,7 @@ export var useValues = function useValues() {
     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, "".concat(fieldPath, ".$").concat(operatorValue));
+    field.data.value = get(unflatten(field.value), "".concat(fieldPath, ".$").concat(operatorValue));
   };
   useEffect(value2data, [field.path.entire]);
   return _objectSpread(_objectSpread({

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

@@ -1 +1,2 @@
-export declare const FormDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FormDesigner: () => React.JSX.Element;

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

@@ -1,4 +1,4 @@
-import { Options, Result } from 'ahooks/lib/useRequest/src/types';
+import { Options, Result } from 'ahooks/es/useRequest/src/types';
 import React from 'react';
 declare type Opts = Options<any, any> & {
     uid?: string;

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

@@ -145,6 +145,8 @@ export var Form = observer(function (props) {
   }, others)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({
     form: form
   }, others))));
+}, {
+  displayName: 'Form'
 });
 Form.Designer = function () {
   var _useCollection = useCollection(),

package/es/schema-component/antd/form-item/FormItem.FilterFormDesigner.d.ts

@@ -1 +1,2 @@
-export declare const FilterFormDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FilterFormDesigner: () => React.JSX.Element;