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

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/index.d.ts

@@ -1,4 +1,4 @@
-export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions } from './action-hooks';
+export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions, useCollectionFieldsOptions } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

package/es/collection-manager/index.js

@@ -1,4 +1,4 @@
-export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions } from './action-hooks';
+export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions, useCollectionFieldsOptions } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

package/es/collection-manager/interfaces/components/index.d.ts

@@ -1,6 +1,7 @@
-export declare const TargetKey: () => JSX.Element;
-export declare const ThroughCollection: () => JSX.Element;
-export declare const SourceKey: () => JSX.Element;
-export declare const ForeignKey: () => JSX.Element;
-export declare const ForeignKey1: () => JSX.Element;
-export declare const ForeignKey2: () => JSX.Element;
+import React from 'react';
+export declare const TargetKey: () => React.JSX.Element;
+export declare const ThroughCollection: () => React.JSX.Element;
+export declare const SourceKey: () => React.JSX.Element;
+export declare const ForeignKey: () => React.JSX.Element;
+export declare const ForeignKey1: () => React.JSX.Element;
+export declare const ForeignKey2: () => React.JSX.Element;

package/es/collection-manager/interfaces/index.d.ts

@@ -1,4 +1,3 @@
-export * from './attachment';
 export * from './checkbox';
 export * from './checkboxGroup';
 export * from './chinaRegion';

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

@@ -1,4 +1,3 @@
-export * from './attachment';
 export * from './checkbox';
 export * from './checkboxGroup';
 export * from './chinaRegion';

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',

package/es/collection-manager/interfaces/properties/index.d.ts

@@ -47,7 +47,6 @@ export declare const defaultProps: {
         description: string;
     };
 };
-export declare const recordPickerSelector: ISchema;
 export declare const recordPickerViewer: {
     type: string;
     title: string;

package/es/collection-manager/interfaces/properties/index.js

@@ -373,46 +373,6 @@ export var defaultProps = {
     description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
   }
 };
-export var recordPickerSelector = {
-  type: 'void',
-  title: '{{ t("Select record") }}',
-  'x-component': 'RecordPicker.Selector',
-  'x-component-props': {
-    className: 'nb-record-picker-selector'
-  },
-  properties: {
-    grid: {
-      type: 'void',
-      'x-component': 'Grid',
-      'x-initializer': 'TableSelectorInitializers',
-      properties: {}
-    },
-    footer: {
-      'x-component': 'Action.Container.Footer',
-      'x-component-props': {},
-      properties: {
-        actions: {
-          type: 'void',
-          'x-component': 'ActionBar',
-          'x-component-props': {},
-          properties: {
-            submit: {
-              title: '{{ t("Submit") }}',
-              'x-action': 'submit',
-              'x-component': 'Action',
-              'x-designer': 'Action.Designer',
-              'x-component-props': {
-                type: 'primary',
-                htmlType: 'submit',
-                useProps: '{{ usePickActionProps }}'
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
 export var recordPickerViewer = {
   type: 'void',
   title: '{{ t("View record") }}',

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

@@ -15,16 +15,11 @@ export var url = {
     type: 'string',
     uiSchema: {
       type: 'string',
-      title: '{{t("URL")}}',
       'x-component': 'Input.URL'
     }
   },
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['size'] = 'small';
-    }
   },
   properties: _objectSpread({}, defaultProps)
 };

package/es/collection-manager/sub-table.d.ts

@@ -16,5 +16,5 @@ export declare const ds: {
         run(): Promise<void>;
     };
 };
-export declare const SubFieldDataSourceProvider: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const DataSourceProvider: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const SubFieldDataSourceProvider: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const DataSourceProvider: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/sub-table.js

@@ -251,6 +251,8 @@ export var SubFieldDataSourceProvider = observer(function (props) {
       setSelectedRowKeys: setSelectedRowKeys
     }
   }, props.children));
+}, {
+  displayName: 'SubFieldDataSourceProvider'
 });
 export var DataSourceProvider = observer(function (props) {
   var rowKey = props.rowKey,
@@ -308,4 +310,6 @@ export var DataSourceProvider = observer(function (props) {
       setSelectedRowKeys: setSelectedRowKeys
     }
   }, props.children));
+}, {
+  displayName: 'DataSourceProvider'
 });

package/es/collection-manager/templates/components/PreviewFields.d.ts

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

package/es/collection-manager/templates/components/PreviewFields.js

@@ -253,4 +253,5 @@ var PreviewCom = function PreviewCom(props) {
 function areEqual(prevProps, nextProps) {
   return nextProps.name === prevProps.name && nextProps.sources === prevProps.sources;
 }
-export var PreviewFields = /*#__PURE__*/React.memo(PreviewCom, areEqual);
+export var PreviewFields = /*#__PURE__*/React.memo(PreviewCom, areEqual);
+PreviewFields.displayName = 'PreviewFields';

package/es/collection-manager/templates/components/PreviewTable.d.ts

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

package/es/collection-manager/types.d.ts

@@ -1,10 +1,12 @@
 import { ISchema } from '@formily/react';
+import { ReactNode } from 'react';
 export interface CollectionManagerOptions {
     service?: any;
     interfaces?: any;
     collections?: any[];
     templates?: any;
     refreshCM?: () => Promise<void>;
+    children?: ReactNode;
     updateCollection?: (collection: any) => void;
 }
 export interface FieldOptions {

package/es/filter-provider/FilterProvider.d.ts

@@ -32,7 +32,7 @@ export declare const FilterBlockRecord: ({ children, params, }: {
     params?: {
         filter: SharedFilter;
     };
-}) => JSX.Element;
+}) => React.JSX.Element;
 /**
  * 返回一些方法用于收集和获取当前页面中的数据区块的信息
  * @returns
@@ -41,5 +41,9 @@ export declare const useFilterBlock: () => {
     recordDataBlocks: (block: DataBlock) => void;
     getDataBlocks: () => DataBlock[];
     removeDataBlock: (uid: string) => void;
+    /**
+     * running in FilterBlockProvider
+     */
+    inProvider: boolean;
 };
 export {};

package/es/filter-provider/FilterProvider.js

@@ -15,13 +15,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useField, useFieldSchema } from '@formily/react';
+import { uniqBy } from 'lodash';
 import React, { createContext, useEffect, useRef } from 'react';
-import { useBlockRequestContext } from '../block-provider';
+import { useBlockRequestContext } from '../block-provider/BlockProvider';
 import { mergeFilter } from '../block-provider/SharedFilterProvider';
 import { useCollection } from '../collection-manager';
 import { removeNullCondition } from '../schema-component';
 import { useAssociatedFields } from './utils';
-import { uniqBy } from 'lodash';
 var FilterContext = /*#__PURE__*/createContext(null);
 /**
  * 主要用于记录当前页面中的数据区块的信息，用于在过滤区块中使用
@@ -103,6 +103,7 @@ export var useFilterBlock = function useFilterBlock() {
   // 有可能存在页面没有提供 FilterBlockProvider 的情况，比如内部使用的数据表管理页面
   if (!ctx) {
     return {
+      inProvider: false,
       recordDataBlocks: function recordDataBlocks() {},
       getDataBlocks: function getDataBlocks() {
         return [];
@@ -140,6 +141,10 @@ export var useFilterBlock = function useFilterBlock() {
   return {
     recordDataBlocks: recordDataBlocks,
     getDataBlocks: getDataBlocks,
-    removeDataBlock: removeDataBlock
+    removeDataBlock: removeDataBlock,
+    /**
+     * running in FilterBlockProvider
+     */
+    inProvider: true
   };
 };

package/es/formula/Expression.d.ts

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

package/es/formula/Expression.js

@@ -14,8 +14,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { css } from '@emotion/css';
 import { onFormSubmitValidateStart } from '@formily/core';
 import { useField, useFormEffects } from '@formily/react';
-import { Dropdown, Menu } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
+import { Dropdown } from 'antd';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 function pasteHtml(html) {
   var selectPastedContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -97,18 +97,26 @@ export var Expression = function Expression(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changed = _useState2[0],
     setChanged = _useState2[1];
-  var onChange = function onChange(value) {
+  var onChange = useCallback(function (value) {
     setChanged(true);
     props.onChange(value);
-  };
-  var numColumns = new Map();
-  var scope = {};
-  fields.filter(function (field) {
-    return supports.includes(field.interface);
-  }).forEach(function (field) {
-    numColumns.set(field.name, field.uiSchema.title);
-    scope[field.name] = 1;
-  });
+  }, [props.onChange]);
+  var _useMemo = useMemo(function () {
+      var numColumns = new Map();
+      var scope = {};
+      fields.filter(function (field) {
+        return supports.includes(field.interface);
+      }).forEach(function (field) {
+        numColumns.set(field.name, field.uiSchema.title);
+        scope[field.name] = 1;
+      });
+      return {
+        numColumns: numColumns,
+        scope: scope
+      };
+    }, [fields, supports]),
+    numColumns = _useMemo.numColumns,
+    scope = _useMemo.scope;
   var keys = Array.from(numColumns.keys());
   var _useState3 = useState(function () {
       var scope = {};
@@ -135,39 +143,51 @@ export var Expression = function Expression(props) {
     var val = renderExp(value || '', scope);
     setHtml(val);
   }, [value]);
-  var menu = /*#__PURE__*/React.createElement(Menu, null, keys.length > 0 ? keys.map(function (key) {
-    return /*#__PURE__*/React.createElement(Menu.Item, {
-      disabled: true,
-      key: key
-    }, /*#__PURE__*/React.createElement("button", {
-      onClick: function () {
-        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(args) {
-          var val, text;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                inputRef.current.focus();
-                val = numColumns.get(key);
-                pasteHtml("  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  "));
-                text = getValue(inputRef.current);
-                onChange(text);
-                console.log('onChange', text);
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function onClick(_x2) {
-          return _onClick.apply(this, arguments);
-        }
-        return onClick;
-      }()
-    }, numColumns.get(key)));
-  }) : /*#__PURE__*/React.createElement(Menu.Item, {
-    disabled: true,
-    key: 0
-  }, t('No available fields')));
+  var menuItems = useMemo(function () {
+    if (keys.length > 0) {
+      return keys.map(function (key) {
+        return {
+          key: key,
+          disabled: true,
+          label: /*#__PURE__*/React.createElement("button", {
+            onClick: function () {
+              var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(args) {
+                var val, text;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      inputRef.current.focus();
+                      val = numColumns.get(key);
+                      pasteHtml("  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  "));
+                      text = getValue(inputRef.current);
+                      onChange(text);
+                    case 5:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              function onClick(_x2) {
+                return _onClick.apply(this, arguments);
+              }
+              return onClick;
+            }()
+          }, numColumns.get(key))
+        };
+      });
+    } else {
+      return [{
+        key: 0,
+        disabled: true,
+        label: t('No available fields')
+      }];
+    }
+  }, [keys, numColumns, onChange]);
+  var menu = useMemo(function () {
+    return {
+      items: menuItems
+    };
+  }, [menuItems]);
   useFormEffects(function () {
     onFormSubmitValidateStart(function () {
       try {
@@ -185,7 +205,7 @@ export var Expression = function Expression(props) {
   });
   return /*#__PURE__*/React.createElement(Dropdown, {
     trigger: ['click'],
-    overlay: menu,
+    menu: menu,
     overlayClassName: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .ant-dropdown-menu-item {\n          padding: 0;\n        }\n        button {\n          cursor: pointer;\n          padding: 5px 12px;\n          text-align: left;\n          color: rgba(0, 0, 0, 0.85);\n          width: 100%;\n          line-height: inherit;\n          height: auto;\n          border: 0px;\n          background-color: transparent;\n          &:hover {\n            background-color: #f5f5f5;\n          }\n        }\n      "])))
   }, /*#__PURE__*/React.createElement("div", {
     onKeyDown: function onKeyDown(e) {

package/es/formula/Result.d.ts

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

package/es/formula/index.d.ts

@@ -1,6 +1,6 @@
 export declare const Formula: {
     (): any;
-    Result: (props: any) => JSX.Element;
-    Expression: (props: any) => JSX.Element;
+    Result: (props: any) => import("react").JSX.Element;
+    Expression: (props: any) => import("react").JSX.Element;
 };
 export default Formula;

package/es/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export * from './useAdminSchemaUid';
+export * from './useViewport';

package/es/hooks/index.js

@@ -0,0 +1,2 @@
+export * from './useAdminSchemaUid';
+export * from './useViewport';

package/es/hooks/useAdminSchemaUid.d.ts

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

package/es/hooks/useAdminSchemaUid.js

@@ -0,0 +1,6 @@
+import { useSystemSettings } from '../system-settings';
+export var useAdminSchemaUid = function useAdminSchemaUid() {
+  var _ctx$data, _ctx$data$data, _ctx$data$data$option;
+  var ctx = useSystemSettings();
+  return ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : (_ctx$data$data = _ctx$data.data) === null || _ctx$data$data === void 0 ? void 0 : (_ctx$data$data$option = _ctx$data$data.options) === null || _ctx$data$data$option === void 0 ? void 0 : _ctx$data$data$option.adminSchemaUid;
+};

package/es/hooks/useMenuItem.d.ts

@@ -0,0 +1,37 @@
+import { MenuProps } from 'antd';
+import React, { ReactNode } from 'react';
+declare type Item = MenuProps['items'][0] & {
+    /** 在清空数组时，如果该字段为 true 则保留该选项 */
+    notdelete?: boolean;
+    /** 用于给列表排序 */
+    order?: number;
+};
+export declare const GetMenuItemContext: React.Context<{
+    collectMenuItem?(item: Item): void;
+    onChange?: () => void;
+}>;
+export declare const GetMenuItemsContext: React.Context<{
+    pushMenuItem?(item: Item): void;
+}>;
+/**
+ * 用于为 SchemaInitializer.Item 组件提供一些方法，比如收集菜单项数据
+ * @returns
+ */
+export declare const useCollectMenuItem: () => {
+    collectMenuItem?(item: Item): void;
+    onChange?: () => void;
+};
+export declare const useCollectMenuItems: () => {
+    pushMenuItem?(item: Item): void;
+};
+/**
+ * 用于在 antd 从 4.x 升级到 5.x 中，用于把 SchemaInitializer.Item 组件这种写法转换成 Menu 组件的 items 写法
+ * @returns
+ */
+export declare const useMenuItem: () => {
+    Component: () => React.JSX.Element;
+    getMenuItems: (Com: () => ReactNode) => Item[];
+    getMenuItem: (Com: () => JSX.Element) => Item;
+    clean: () => void;
+};
+export {};