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

package/es/schema-settings/DataTemplates/components/DataTemplateTitle.js

@@ -213,6 +213,8 @@ export var ArrayCollapse = observer(function (props) {
       setActiveKeys(insertActiveKeys(activeKeys, index));
     }
   }, renderEmpty(), renderItems(), renderAddition());
+}, {
+  displayName: 'ArrayCollapse'
 });
 var CollapsePanel = function CollapsePanel(_ref) {
   var children = _ref.children;

package/es/schema-settings/DataTemplates/components/Designer.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const Designer: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const Designer: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
 export declare function getSelectedIdFilter(selectedId: any): {
     id: {
         $eq: any;

package/es/schema-settings/DataTemplates/components/Designer.js

@@ -146,6 +146,8 @@ export var Designer = observer(function () {
       dn.refresh();
     }
   }));
+}, {
+  displayName: 'Designer'
 });
 export function getSelectedIdFilter(selectedId) {
   return selectedId ? {

package/es/schema-settings/DataTemplates/hooks/useCollectionState.d.ts

@@ -5,7 +5,7 @@ export declare const useCollectionState: (currentCollectionName: string) => {
         label: any;
         value: string;
     }[];
-    getEnableFieldTree: (collectionName: string, fields: ArrayField) => {
+    getEnableFieldTree: (collectionName: string) => {
         title: React.FunctionComponentElement<any>;
         key: any;
         isLeaf: boolean;
@@ -13,6 +13,6 @@ export declare const useCollectionState: (currentCollectionName: string) => {
         type: string;
         tag: any;
     }[];
-    onLoadData: (node: any) => Promise<unknown>;
-    onCheck: (checkedKeys: any, { node, checked }: any) => void;
+    getOnLoadData: (fields: ArrayField) => (node: any) => Promise<unknown>;
+    getOnCheck: (fields: ArrayField) => (checkedKeys: any) => void;
 };

package/es/schema-settings/DataTemplates/hooks/useCollectionState.js

@@ -14,8 +14,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { error } from '@nocobase/utils/client';
-import _ from 'lodash';
 import React, { useCallback, useState } from 'react';
 import { useCollectionManager } from '../../../collection-manager';
 import { useCompile } from '../../../schema-component';
@@ -24,13 +22,11 @@ export var useCollectionState = function useCollectionState(currentCollectionNam
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getAllCollectionsInheritChain = _useCollectionManager.getAllCollectionsInheritChain,
-    getCollection = _useCollectionManager.getCollection,
-    getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
+    getCollection = _useCollectionManager.getCollection;
   var _useState = useState(getCollectionList),
     _useState2 = _slicedToArray(_useState, 1),
     collectionList = _useState2[0];
   var compile = useCompile();
-  var dataFields = {};
   function getCollectionList() {
     var collections = getAllCollectionsInheritChain(currentCollectionName);
     return collections.map(function (name) {
@@ -143,11 +139,7 @@ export var useCollectionState = function useCollectionState(currentCollectionNam
       };
     }).filter(Boolean);
   };
-  /**
-   * fields: 通过在 x-reactions 字段中传递 $self 得到的，相当于 useField 的返回值，目的是修改其中的状态页面会更新
-   */
-  var getEnableFieldTree = useCallback(function (collectionName, fields) {
-    dataFields = fields;
+  var getEnableFieldTree = useCallback(function (collectionName) {
     if (!collectionName) {
       return [];
     }
@@ -161,57 +153,46 @@ export var useCollectionState = function useCollectionState(currentCollectionNam
       return [];
     }
   }, []);
-  var onLoadData = useCallback(function (node) {
-    return new Promise(function (resolve) {
-      if (node.children.length) {
-        node.children.forEach(function (child) {
-          loadChildren({
-            node: child,
-            traverseAssociations: traverseAssociations,
-            traverseFields: traverseFields,
-            systemKeys: systemKeys,
-            dataFields: dataFields
+  var getOnLoadData = useCallback(function (fields) {
+    return function (node) {
+      return new Promise(function (resolve) {
+        if (node.children.length) {
+          node.children.forEach(function (child) {
+            loadChildren({
+              node: child,
+              traverseAssociations: traverseAssociations,
+              traverseFields: traverseFields,
+              systemKeys: systemKeys,
+              fields: fields
+            });
           });
+          return resolve(void 0);
+        }
+        loadChildren({
+          node: node,
+          traverseAssociations: traverseAssociations,
+          traverseFields: traverseFields,
+          systemKeys: systemKeys,
+          fields: fields
         });
-        return resolve(void 0);
-      }
-      loadChildren({
-        node: node,
-        traverseAssociations: traverseAssociations,
-        traverseFields: traverseFields,
-        systemKeys: systemKeys,
-        dataFields: dataFields
+        resolve(void 0);
       });
-      resolve(void 0);
-    });
+    };
   }, []);
-  var onCheck = useCallback(function (checkedKeys, _ref3) {
-    var node = _ref3.node,
-      checked = _ref3.checked;
-    if (checked) {
-      var parentKey = node.key.split('.').slice(0, -1).join('.');
-      try {
-        // 当子节点被选中时，也选中所有祖先节点，提高用户辨识度
-        while (parentKey) {
-          if (parentKey) {
-            checkedKeys.checked = _.uniq([].concat(_toConsumableArray(checkedKeys.checked), [parentKey]));
-          }
-          parentKey = parentKey.split('.').slice(0, -1).join('.');
-        }
-      } catch (err) {
-        error(err);
-      }
-    }
-    dataFields.value = checkedKeys;
+  var getOnCheck = useCallback(function (fields) {
+    return function (checkedKeys) {
+      fields.value = checkedKeys;
+    };
   }, []);
   return {
     collectionList: collectionList,
     getEnableFieldTree: getEnableFieldTree,
-    onLoadData: onLoadData,
-    onCheck: onCheck
+    getOnLoadData: getOnLoadData,
+    getOnCheck: getOnCheck
   };
 };
 // 广度优先遍历查找一个 key 相等的节点并返回
+// 注意：返回的 node 是一个响应式对象，修改它的属性会触发页面更新
 function findNode(treeData, item) {
   var queue = _toConsumableArray(treeData);
   while (queue.length) {
@@ -224,13 +205,13 @@ function findNode(treeData, item) {
     }
   }
 }
-function loadChildren(_ref4) {
-  var node = _ref4.node,
-    traverseAssociations = _ref4.traverseAssociations,
-    traverseFields = _ref4.traverseFields,
-    systemKeys = _ref4.systemKeys,
-    dataFields = _ref4.dataFields;
-  var activeNode = findNode(dataFields.componentProps.treeData, node);
+function loadChildren(_ref3) {
+  var node = _ref3.node,
+    traverseAssociations = _ref3.traverseAssociations,
+    traverseFields = _ref3.traverseFields,
+    systemKeys = _ref3.systemKeys,
+    fields = _ref3.fields;
+  var activeNode = findNode(fields.componentProps.treeData, node);
   var children = [];
   // 多对多和多对一只展示关系字段
   if (['belongsTo', 'belongsToMany'].includes(node.field.type)) {

package/es/schema-settings/EnableChildCollections/index.d.ts

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

package/es/schema-settings/EnableChildCollections/index.js

@@ -128,4 +128,6 @@ export var EnableChildCollections = observer(function (props) {
       loadData: loadData
     }
   });
+}, {
+  displayName: 'EnableChildCollections'
 });

package/es/schema-settings/GeneralSchemaDesigner.d.ts

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

package/es/schema-settings/GeneralSchemaDesigner.js

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _templateObject;
+var _templateObject, _templateObject2;
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -17,6 +17,7 @@ import { DragHandler, useCompile, useDesignable, useGridContext, useGridRowConte
 import { gridRowColWrap } from '../schema-initializer/utils';
 import { SchemaSettings } from './SchemaSettings';
 var titleCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  pointer-events: none;\n  position: absolute;\n  font-size: 12px;\n  /* background: #f18b62;\n  color: #fff; */\n  padding: 0;\n  line-height: 16px;\n  height: 16px;\n  border-bottom-right-radius: 2px;\n  border-radius: 2px;\n  top: 2px;\n  left: 2px;\n  .title-tag {\n    padding: 0 3px;\n    border-radius: 2px;\n    background: #f18b62;\n    color: #fff;\n    display: block;\n  }\n"])));
+var overrideAntdCSS = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  & .ant-space-item .anticon {\n    margin: 0;\n  }\n"])));
 export var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
   var _rowCtx$cols2, _ctx$renderSchemaInit;
   var disableInitializer = props.disableInitializer,
@@ -57,7 +58,7 @@ export var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: 'general-schema-designer'
+    className: classNames('general-schema-designer', overrideAntdCSS)
   }, title && /*#__PURE__*/React.createElement("div", {
     className: classNames('general-schema-designer-title', titleCss)
   }, /*#__PURE__*/React.createElement(Space, {

package/es/schema-settings/LinkageRules/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-settings/LinkageRules/FilterDynamicComponent.d.ts

@@ -5,5 +5,5 @@ declare type Props = {
     renderSchemaComponent: () => React.ReactNode;
     collectionName: string;
 };
-export declare function FilterDynamicComponent(props: Props): JSX.Element;
+export declare function FilterDynamicComponent(props: Props): React.JSX.Element;
 export {};

package/es/schema-settings/LinkageRules/LinkageRuleAction.d.ts

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

package/es/schema-settings/LinkageRules/LinkageRuleAction.js

@@ -8,18 +8,18 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { CloseCircleOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
-import { observer } from '@formily/react';
 import { TreeSelect } from '@formily/antd';
+import { observer } from '@formily/react';
+import { uid } from '@formily/shared';
 import { Select, Space } from 'antd';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { uid } from '@formily/shared';
 import { useCompile } from '../..';
-import { RemoveActionContext, LinkageLogicContext } from './context';
 import { DynamicComponent } from './DynamicComponent';
-import { useValues } from './useValues';
-import { ActionType } from './type';
 import { ValueDynamicComponent } from './ValueDynamicComponent';
+import { LinkageLogicContext, RemoveActionContext } from './context';
+import { ActionType } from './type';
+import { useValues } from './useValues';
 export var FormFieldLinkageRuleAction = observer(function (props) {
   var value = props.value,
     options = props.options,
@@ -43,11 +43,11 @@ export var FormFieldLinkageRuleAction = observer(function (props) {
     style: {
       marginBottom: 8
     },
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-space {\n            display: inline-block;\n          }\n        "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            .ant-space {\n              display: inline-block;\n            }\n          "])))
   }, /*#__PURE__*/React.createElement(Space, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-space {\n              display: inline-block;\n            }\n            .ant-space-item {\n              max-width: 95%;\n              display: inline-block;\n              margin: 2px;\n              vertical-align: top;\n            }\n          "])))
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              .ant-space {\n                display: inline-block;\n              }\n              .ant-space-item {\n                max-width: 95%;\n                display: inline-block;\n                margin: 2px;\n                vertical-align: top;\n              }\n            "])))
   }, /*#__PURE__*/React.createElement(TreeSelect, {
-    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              min-width: 160px;\n            "]))),
+    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                min-width: 160px;\n              "]))),
     fieldNames: {
       label: 'title',
       value: 'name',
@@ -61,10 +61,10 @@ export var FormFieldLinkageRuleAction = observer(function (props) {
     onChange: function onChange(value) {
       setDataIndex(value);
     },
-    placeholder: t('Select Field')
+    placeholder: t('Select field')
   }), /*#__PURE__*/React.createElement(Select, {
     value: operator,
-    className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              min-width: 120px;\n            "]))),
+    className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                min-width: 120px;\n              "]))),
     options: compile(operators),
     onChange: function onChange(value) {
       setOperator(value);
@@ -83,6 +83,8 @@ export var FormFieldLinkageRuleAction = observer(function (props) {
       color: '#bfbfbf'
     }
   })))));
+}, {
+  displayName: 'FormFieldLinkageRuleAction'
 });
 export var FormButtonLinkageRuleAction = observer(function (props) {
   var value = props.value,
@@ -144,4 +146,6 @@ export var FormButtonLinkageRuleAction = observer(function (props) {
       color: '#bfbfbf'
     }
   }))));
+}, {
+  displayName: 'FormButtonLinkageRuleAction'
 });

package/es/schema-settings/LinkageRules/LinkageRuleActionGroup.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const LinkageRuleActions: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
-export declare const LinkageRuleActionGroup: (props: any) => JSX.Element;
+export declare const LinkageRuleActions: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+export declare const LinkageRuleActionGroup: (props: any) => React.JSX.Element;

package/es/schema-settings/LinkageRules/LinkageRuleActionGroup.js

@@ -28,6 +28,8 @@ export var LinkageRuleActions = observer(function (props) {
       })]
     }));
   });
+}, {
+  displayName: 'LinkageRuleActions'
 });
 export var LinkageRuleActionGroup = function LinkageRuleActionGroup(props) {
   var _useTranslation = useTranslation(),

package/es/schema-settings/LinkageRules/ValueDynamicComponent.d.ts

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

package/es/schema-settings/LinkageRules/components/LinkageHeader.js

@@ -208,6 +208,8 @@ export var ArrayCollapse = observer(function (props) {
       setActiveKeys(insertActiveKeys(activeKeys, index));
     }
   }, renderEmpty(), renderItems(), renderAddition());
+}, {
+  displayName: 'ArrayCollapse'
 });
 var CollapsePanel = function CollapsePanel(_ref) {
   var children = _ref.children;

package/es/schema-settings/LinkageRules/index.d.ts

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

package/es/schema-settings/LinkageRules/index.js

@@ -73,7 +73,7 @@ export var FormLinkageRules = observer(function (props) {
                       useProps: function useProps() {
                         return {
                           options: options,
-                          className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                                position: relative;\n                                width: 100%;\n                                margin-left: 10px;\n                              "])))
+                          className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                                  position: relative;\n                                  width: 100%;\n                                  margin-left: 10px;\n                                "])))
                         };
                       },
                       dynamicComponent: function dynamicComponent(props) {
@@ -131,4 +131,6 @@ export var FormLinkageRules = observer(function (props) {
       }
     }
   }));
+}, {
+  displayName: 'FormLinkageRules'
 });

package/es/schema-settings/SchemaSettings.d.ts

@@ -1,13 +1,14 @@
 import { GeneralField } from '@formily/core';
 import { ISchema, Schema } from '@formily/react';
 import { CascaderProps, MenuItemProps } from 'antd';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { CollectionFieldOptions, Designable } from '..';
 interface SchemaSettingsProps {
     title?: any;
     dn?: Designable;
     field?: GeneralField;
     fieldSchema?: Schema;
+    children?: ReactNode;
 }
 interface SchemaSettingsContextProps {
     dn?: Designable;