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

package/es/acl/Configuration/MenuItemsProvider.js

@@ -1,7 +1,7 @@
 import { Spin } from 'antd';
 import React, { createContext, useContext } from 'react';
 import { useRequest } from '../../api-client';
-import { useRoute } from '../../route-switch';
+import { useAdminSchemaUid } from '../../hooks';
 var MenuItemsContext = /*#__PURE__*/createContext(null);
 export var toItems = function toItems() {
   var properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -26,9 +26,9 @@ export var useMenuItems = function useMenuItems() {
 };
 export var MenuItemsProvider = function MenuItemsProvider(props) {
   var _service$data, _service$data$data;
-  var route = useRoute();
+  var adminSchemaUid = useAdminSchemaUid();
   var options = {
-    url: "uiSchemas:getProperties/".concat(route.uiSchemaUid)
+    url: "uiSchemas:getProperties/".concat(adminSchemaUid)
   };
   var service = useRequest(options);
   if (service.loading) {

package/es/application/Application.js

@@ -29,6 +29,8 @@ import { Link, NavLink } from 'react-router-dom';
 import { ACLProvider } from '../acl';
 import { AntdConfigProvider } from '../antd-config-provider';
 import { APIClient, APIClientProvider } from '../api-client';
+import { SigninPage, SignupPage } from '../auth';
+import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
 import { BlockSchemaComponentProvider } from '../block-provider';
 import { RemoteDocumentTitleProvider } from '../document-title';
 import { i18n } from '../i18n';
@@ -40,8 +42,6 @@ import { ErrorFallback } from '../schema-component/antd/error-fallback';
 import { SchemaInitializerProvider } from '../schema-initializer';
 import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates';
 import { SystemSettingsProvider } from '../system-settings';
-import { SigninPage, SignupPage } from '../auth';
-import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
 import { compose } from './compose';
 export var getCurrentTimezone = function getCurrentTimezone() {
   var timezoneOffset = new Date().getTimezoneOffset() / -60;

package/es/auth/SigninPage.js

@@ -15,14 +15,14 @@ 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 { Space, Tabs } from 'antd';
-import React, { useCallback, useContext, createContext, createElement, useState } from 'react';
 import { css } from '@emotion/css';
+import { useForm } from '@formily/react';
+import { Space, Tabs } from 'antd';
+import React, { createContext, createElement, useCallback, useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useAPIClient, useCurrentDocumentTitle, useRequest, useViewport } from '..';
 import { useSigninPageExtension } from './SigninPageExtension';
-import { useForm } from '@formily/react';
 var SigninPageContext = /*#__PURE__*/createContext({});
 export var SigninPageProvider = function SigninPageProvider(props) {
   var components = useContext(SigninPageContext);
@@ -129,12 +129,15 @@ export var SigninPage = function SigninPage() {
   }, /*#__PURE__*/React.createElement(Space, {
     direction: "vertical",
     className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          display: flex;\n        "])))
-  }, tabs.length > 1 ? /*#__PURE__*/React.createElement(Tabs, null, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: tab.tabTitle,
-      key: tab.name
-    }, tab.component);
-  })) : tabs.length ? /*#__PURE__*/React.createElement("div", null, tabs[0].component) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(Space, {
+  }, tabs.length > 1 ? /*#__PURE__*/React.createElement(Tabs, {
+    items: tabs.map(function (tab) {
+      return {
+        label: tab.tabTitle,
+        key: tab.name,
+        children: tab.component
+      };
+    })
+  }) : tabs.length ? /*#__PURE__*/React.createElement("div", null, tabs[0].component) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(Space, {
     direction: "vertical",
     className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            display: flex;\n          "])))
   }, signinExtension)));

package/es/collection-manager/Configuration/AddCollectionAction.js

@@ -21,9 +21,9 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
@@ -308,21 +308,38 @@ export var AddCollectionAction = function AddCollectionAction(props) {
   var compile = useCompile();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var collectionTemplates = templateOptions();
-  var items = [];
-  collectionTemplates.forEach(function (item) {
-    if (item.divider) {
-      items.push({
-        type: 'divider'
+  var collectionTemplates = useMemo(templateOptions, []);
+  var items = useMemo(function () {
+    var result = [];
+    collectionTemplates.forEach(function (item) {
+      if (item.divider) {
+        result.push({
+          type: 'divider'
+        });
+      }
+      result.push({
+        label: compile(item.title),
+        key: item.name
       });
-    }
-    items.push({
-      label: compile(item.title),
-      key: item.name
     });
-  });
+    return result;
+  }, [collectionTemplates]);
   var _useResourceActionCon2 = useResourceActionContext(),
     category = _useResourceActionCon2.state.category;
+  var menu = useMemo(function () {
+    return {
+      style: {
+        maxHeight: '60vh',
+        overflow: 'auto'
+      },
+      onClick: function onClick(info) {
+        var schema = getSchema(getTemplate(info.key), category, compile);
+        setSchema(schema);
+        setVisible(true);
+      },
+      items: items
+    };
+  }, [category, items]);
   return /*#__PURE__*/React.createElement(RecordProvider, {
     record: record
   }, /*#__PURE__*/React.createElement(ActionContextProvider, {
@@ -334,18 +351,7 @@ export var AddCollectionAction = function AddCollectionAction(props) {
     getPopupContainer: getContainer,
     trigger: trigger,
     align: align,
-    overlay: /*#__PURE__*/React.createElement(Menu, {
-      style: {
-        maxHeight: '60vh',
-        overflow: 'auto'
-      },
-      onClick: function onClick(info) {
-        var schema = getSchema(getTemplate(info.key), category, compile);
-        setSchema(schema);
-        setVisible(true);
-      },
-      items: items
-    })
+    menu: menu
   }, children || /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'

package/es/collection-manager/Configuration/AddFieldAction.js

@@ -17,9 +17,9 @@ import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
@@ -27,7 +27,6 @@ import { ActionContextProvider, SchemaComponent, useActionContext, useCompile }
 import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
-import { useOptions } from '../hooks/useOptions';
 import * as components from './components';
 import { getOptions } from './interfaces';
 var getSchema = function getSchema(schema, record, compile) {
@@ -217,8 +216,7 @@ export var AddFieldAction = function AddFieldAction(props) {
   var compile = useCompile();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var options = useOptions();
-  var getFieldOptions = function getFieldOptions() {
+  var getFieldOptions = useCallback(function () {
     var _ref = getTemplate(record.template) || {},
       availableFieldInterfaces = _ref.availableFieldInterfaces;
     var _ref2 = availableFieldInterfaces || {},
@@ -260,19 +258,32 @@ export var AddFieldAction = function AddFieldAction(props) {
       }
     });
     return optionArr;
-  };
-  return record.template !== 'view' && /*#__PURE__*/React.createElement(RecordProvider, {
-    record: record
-  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    getPopupContainer: getContainer,
-    trigger: trigger,
-    align: align,
-    overlay: /*#__PURE__*/React.createElement(Menu, {
+  }, [getTemplate, record]);
+  var items = useMemo(function () {
+    return getFieldOptions().map(function (option) {
+      if (option.children.length === 0) {
+        return null;
+      }
+      return {
+        type: 'group',
+        label: compile(option.label),
+        title: compile(option.label),
+        key: option.label,
+        children: option.children.filter(function (child) {
+          return !['o2o', 'subTable', 'linkTo'].includes(child.name);
+        }).map(function (child) {
+          return {
+            label: compile(child.title),
+            title: compile(child.title),
+            key: child.name,
+            dataTargetScope: child.targetScope
+          };
+        })
+      };
+    });
+  }, [getFieldOptions]);
+  var menu = useMemo(function () {
+    return {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -286,20 +297,22 @@ export var AddFieldAction = function AddFieldAction(props) {
           setSchema(schema);
           setVisible(true);
         }
-      }
-    }, getFieldOptions().map(function (option) {
-      return option.children.length > 0 && /*#__PURE__*/React.createElement(Menu.ItemGroup, {
-        key: option.label,
-        title: compile(option.label)
-      }, option.children.filter(function (child) {
-        return !['o2o', 'subTable', 'linkTo'].includes(child.name);
-      }).map(function (child) {
-        return /*#__PURE__*/React.createElement(Menu.Item, {
-          key: child.name,
-          "data-targetScope": child.targetScope
-        }, compile(child.title));
-      }));
-    }))
+      },
+      items: items
+    };
+  }, [getInterface, items, record]);
+  return record.template !== 'view' && /*#__PURE__*/React.createElement(RecordProvider, {
+    record: record
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    getPopupContainer: getContainer,
+    trigger: trigger,
+    align: align,
+    menu: menu
   }, children || /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'

package/es/collection-manager/Configuration/AddSubFieldAction.js

@@ -16,9 +16,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider } from '../../record-provider';
@@ -122,26 +122,23 @@ export var AddSubFieldAction = function AddSubFieldAction() {
   var options = useOptions();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var items = options.map(function (option) {
-    var children = option.children.map(function (child) {
+  var items = useMemo(function () {
+    return options.map(function (option) {
+      var children = option.children.map(function (child) {
+        return {
+          label: compile(child.title),
+          key: child.name
+        };
+      });
       return {
-        label: compile(child.title),
-        key: child.name
+        label: compile(option.label),
+        key: option.key,
+        children: children
       };
     });
+  }, [options]);
+  var menu = useMemo(function () {
     return {
-      label: compile(option.label),
-      key: option.key,
-      children: children
-    };
-  });
-  return /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(Menu, {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -152,7 +149,15 @@ export var AddSubFieldAction = function AddSubFieldAction() {
         setVisible(true);
       },
       items: items
-    })
+    };
+  }, [items]);
+  return /*#__PURE__*/React.createElement(ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    menu: menu
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'

package/es/collection-manager/Configuration/ConfigurationTabs.js

@@ -17,7 +17,8 @@ import { MenuOutlined } from '@ant-design/icons';
 import { DndContext, DragOverlay, MouseSensor, useDraggable, useDroppable, useSensor, useSensors } from '@dnd-kit/core';
 import { RecursionField, observer } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Badge, Card, Dropdown, Menu, Modal, Tabs } from 'antd';
+import { Badge, Card, Dropdown, Modal, Tabs } from 'antd';
+import _ from 'lodash';
 import React, { useContext, useState } from 'react';
 import { useAPIClient } from '../../api-client';
 import { SchemaComponent, SchemaComponentOptions, useCompile } from '../../schema-component';
@@ -262,26 +263,30 @@ export var ConfigurationTabs = function ConfigurationTabs() {
       return _ref4.apply(this, arguments);
     };
   }();
-  var menu = function menu(item) {
-    return /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(Menu.Item, {
-      key: 'edit'
-    }, /*#__PURE__*/React.createElement(SchemaComponent, {
-      schema: {
-        type: 'void',
-        properties: _defineProperty({}, uid(), {
-          'x-component': 'EditCategory',
-          'x-component-props': {
-            item: item
+  var menu = _.memoize(function (item) {
+    return {
+      items: [{
+        key: 'edit',
+        label: /*#__PURE__*/React.createElement(SchemaComponent, {
+          schema: {
+            type: 'void',
+            properties: _defineProperty({}, uid(), {
+              'x-component': 'EditCategory',
+              'x-component-props': {
+                item: item
+              }
+            })
           }
         })
-      }
-    })), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "delete",
-      onClick: function onClick() {
-        return remove(item.id);
-      }
-    }, compile("{{t('Delete category')}}")));
-  };
+      }, {
+        key: 'delete',
+        label: compile("{{t('Delete category')}}"),
+        onClick: function onClick() {
+          return remove(item.id);
+        }
+      }]
+    };
+  });
   return /*#__PURE__*/React.createElement(DndProvider, null, /*#__PURE__*/React.createElement(Tabs, {
     addIcon: /*#__PURE__*/React.createElement(SchemaComponent, {
       schema: {
@@ -304,35 +309,37 @@ export var ConfigurationTabs = function ConfigurationTabs() {
     destroyInactiveTabPane: true,
     tabBarStyle: {
       marginBottom: '0px'
-    }
-  }, tabsItems.map(function (item) {
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: item.id !== 'all' ? /*#__PURE__*/React.createElement("div", {
-        "data-no-dnd": "true"
-      }, /*#__PURE__*/React.createElement(TabTitle, {
-        item: item
-      })) : compile(item.name),
-      key: item.id,
-      closable: item.closable,
-      closeIcon: /*#__PURE__*/React.createElement(Dropdown, {
-        overlay: menu(item)
-      }, /*#__PURE__*/React.createElement(MenuOutlined, null))
-    }, /*#__PURE__*/React.createElement(Card, {
-      bordered: false
-    }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
-      components: {
-        CollectionFields: CollectionFields
-      },
-      inherit: true,
-      scope: {
-        loadCategories: loadCategories,
-        categoryVisible: item.id === 'all',
-        categoryId: item.id
-      }
-    }, /*#__PURE__*/React.createElement(RecursionField, {
-      name: key,
-      schema: item.schema,
-      onlyRenderProperties: true
-    }))));
-  })));
+    },
+    items: tabsItems.map(function (item) {
+      return {
+        label: item.id !== 'all' ? /*#__PURE__*/React.createElement("div", {
+          "data-no-dnd": "true"
+        }, /*#__PURE__*/React.createElement(TabTitle, {
+          item: item
+        })) : compile(item.name),
+        key: item.id,
+        closable: item.closable,
+        closeIcon: /*#__PURE__*/React.createElement(Dropdown, {
+          menu: menu(item)
+        }, /*#__PURE__*/React.createElement(MenuOutlined, null)),
+        children: /*#__PURE__*/React.createElement(Card, {
+          bordered: false
+        }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
+          components: {
+            CollectionFields: CollectionFields
+          },
+          inherit: true,
+          scope: {
+            loadCategories: loadCategories,
+            categoryVisible: item.id === 'all',
+            categoryId: item.id
+          }
+        }, /*#__PURE__*/React.createElement(RecursionField, {
+          name: key,
+          schema: item.schema,
+          onlyRenderProperties: true
+        })))
+      };
+    })
+  }));
 };

package/es/collection-manager/hooks/useOptions.js

@@ -5,45 +5,48 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 set from 'lodash/set';
+import { useMemo } from 'react';
 import { useCollectionManager } from './useCollectionManager';
 export var useOptions = function useOptions() {
   var _useCollectionManager = useCollectionManager(),
     interfaces = _useCollectionManager.interfaces;
-  var fields = {};
-  Object.keys(interfaces).forEach(function (type) {
-    var schema = interfaces[type];
-    registerField(schema.group || 'others', type, _objectSpread({
-      order: 0
-    }, schema));
-  });
-  function registerField(group, type, schema) {
-    fields[group] = fields[group] || {};
-    set(fields, [group, type], schema);
-  }
-  var groupLabels = {
-    basic: '{{t("Basic")}}',
-    choices: '{{t("Choices")}}',
-    media: '{{t("Media")}}',
-    datetime: '{{t("Date & Time")}}',
-    relation: '{{t("Relation")}}',
-    advanced: '{{t("Advanced type")}}',
-    systemInfo: '{{t("System info")}}',
-    others: '{{t("Others")}}'
-  };
-  return Object.keys(groupLabels).map(function (groupName) {
-    return {
-      label: groupLabels[groupName],
-      key: groupName,
-      children: Object.keys(fields[groupName] || {}).map(function (type) {
-        var field = fields[groupName][type];
-        return _objectSpread({
-          value: type,
-          label: field.title,
-          name: type
-        }, fields[groupName][type]);
-      }).sort(function (a, b) {
-        return a.order - b.order;
-      })
+  return useMemo(function () {
+    var fields = {};
+    Object.keys(interfaces).forEach(function (type) {
+      var schema = interfaces[type];
+      registerField(schema.group || 'others', type, _objectSpread({
+        order: 0
+      }, schema));
+    });
+    function registerField(group, type, schema) {
+      fields[group] = fields[group] || {};
+      set(fields, [group, type], schema);
+    }
+    var groupLabels = {
+      basic: '{{t("Basic")}}',
+      choices: '{{t("Choices")}}',
+      media: '{{t("Media")}}',
+      datetime: '{{t("Date & Time")}}',
+      relation: '{{t("Relation")}}',
+      advanced: '{{t("Advanced type")}}',
+      systemInfo: '{{t("System info")}}',
+      others: '{{t("Others")}}'
     };
-  });
+    return Object.keys(groupLabels).map(function (groupName) {
+      return {
+        label: groupLabels[groupName],
+        key: groupName,
+        children: Object.keys(fields[groupName] || {}).map(function (type) {
+          var field = fields[groupName][type];
+          return _objectSpread({
+            value: type,
+            label: field.title,
+            name: type
+          }, fields[groupName][type]);
+        }).sort(function (a, b) {
+          return a.order - b.order;
+        })
+      };
+    });
+  }, [interfaces]);
 };

package/es/collection-manager/interfaces/integer.js

@@ -27,7 +27,7 @@ export var integer = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       },
       'x-validator': 'integer'
     }

package/es/collection-manager/interfaces/number.js

@@ -22,7 +22,7 @@ export var number = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       }
     }
   },
@@ -35,9 +35,9 @@ export var number = {
       title: '{{t("Precision")}}',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      default: '0',
+      default: '1',
       enum: [{
-        value: '0',
+        value: '1',
         label: '1'
       }, {
         value: '0.1',

package/es/collection-manager/interfaces/percent.js

@@ -59,7 +59,7 @@ export var percent = {
       'x-component': 'Percent',
       'x-component-props': {
         stringMode: true,
-        step: '0',
+        step: '1',
         addonAfter: '%'
       }
     }
@@ -83,9 +83,9 @@ export var percent = {
       title: '{{t("Precision")}}',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      default: '0',
+      default: '1',
       enum: [{
-        value: '0',
+        value: '1',
         label: '1%'
       }, {
         value: '0.1',