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

package/es/schema-component/hooks/useFieldModeOptions.js

@@ -1,4 +1,4 @@
-import { useFieldSchema, useField } from '@formily/react';
+import { useField, useFieldSchema } from '@formily/react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '../../collection-manager';
@@ -31,14 +31,14 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         label: t('File manager'),
         value: 'FileManager'
       }] : [{
-        label: t('File manager'),
-        value: 'FileManager'
+        label: t('Select'),
+        value: 'Select'
       }, {
         label: t('Record picker'),
         value: 'Picker'
       }, {
-        label: t('Select'),
-        value: 'Select'
+        label: t('File manager'),
+        value: 'FileManager'
       }];
     }
     switch (collectionField.interface) {
@@ -46,43 +46,50 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         return isReadPretty ? [{
           label: t('Title'),
           value: 'Select'
-        },
-        // { label: t('Subtable'), value: 'SubTable' },
-        {
+        }, {
+          label: t('Sub-table'),
+          value: 'SubTable'
+        }, {
           label: t('Sub-details'),
           value: 'Nester'
         }] : [{
-          label: t('Record picker'),
-          value: 'Picker'
-        },
-        // { label: t('Subtable'), value: 'SubTable' },
-        {
           label: t('Select'),
           value: 'Select'
         }, {
-          label: t('Subform'),
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Sub-form'),
           value: 'Nester'
+        }, {
+          label: t('Sub-table'),
+          value: 'SubTable'
         }];
-      case 'm2o':
       case 'm2m':
-      case 'linkTo':
         return isReadPretty ? [{
           label: t('Title'),
           value: 'Select'
         }, {
           label: t('Sub-details'),
           value: 'Nester'
+        }, {
+          label: t('Sub-table'),
+          value: 'SubTable'
         }] : [{
+          label: t('Select'),
+          value: 'Select'
+        }, {
           label: t('Record picker'),
           value: 'Picker'
         }, {
-          label: t('Select'),
-          value: 'Select'
+          label: t('Sub-table'),
+          value: 'SubTable'
         }, {
-          label: t('Subform'),
+          label: t('Sub-form'),
           value: 'Nester'
         }];
-      default:
+      case 'm2o':
+      case 'linkTo':
         return isReadPretty ? [{
           label: t('Title'),
           value: 'Select'
@@ -90,13 +97,30 @@ export var useFieldModeOptions = function useFieldModeOptions() {
           label: t('Sub-details'),
           value: 'Nester'
         }] : [{
+          label: t('Select'),
+          value: 'Select'
+        }, {
           label: t('Record picker'),
           value: 'Picker'
         }, {
+          label: t('Sub-form'),
+          value: 'Nester'
+        }];
+      default:
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
           label: t('Select'),
           value: 'Select'
         }, {
-          label: t('Subform'),
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Sub-form'),
           value: 'Nester'
         }];
     }

package/es/schema-component/hooks/useProps.d.ts

@@ -1,10 +1 @@
-interface Options {
-    arrayMerge?(target: any[], source: any[], options?: Options): any[];
-    clone?: boolean;
-    assign?: boolean;
-    customMerge?: (key: string, options?: Options) => ((x: any, y: any) => any) | undefined;
-    isMergeableObject?(value: object): boolean;
-    cloneUnlessOtherwiseSpecified?: (value: any, options: Options) => any;
-}
-export declare const useProps: (props: any, options?: Options) => any;
-export {};
+export declare const useProps: (originalProps?: any) => any;

package/es/schema-component/hooks/useProps.js

@@ -1,10 +1,24 @@
+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 _excluded = ["useProps"];
+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; }
+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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { merge } from '@formily/shared';
-export var useProps = function useProps(props, options) {
-  var useProps = props.useProps,
-    props1 = _objectWithoutProperties(props, _excluded);
-  var props2 = typeof useProps === 'function' ? useProps() : {};
-  return merge(props1 || {}, props2, options);
+var useDef = function useDef() {
+  return {};
+};
+export var useProps = function useProps() {
+  var originalProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _originalProps$usePro = originalProps.useProps,
+    useDynamicHook = _originalProps$usePro === void 0 ? useDef : _originalProps$usePro,
+    others = _objectWithoutProperties(originalProps, _excluded);
+  var useDynamicProps = useDynamicHook;
+  if (typeof useDynamicHook !== 'function') {
+    useDynamicProps = useDef;
+  }
+  var dynamicProps = useDynamicProps();
+  return _objectSpread(_objectSpread({}, others), dynamicProps);
 };

package/es/schema-initializer/SchemaInitializer.d.ts

@@ -2,11 +2,25 @@ import React from 'react';
 import './style.less';
 import { SchemaInitializerButtonProps, SchemaInitializerItemComponent, SchemaInitializerItemProps } from './types';
 export declare const SchemaInitializerItemContext: React.Context<any>;
-export declare const SchemaInitializerButtonContext: React.Context<any>;
+export declare const SchemaInitializerButtonContext: React.Context<{
+    visible?: boolean;
+    setVisible?: (v: boolean) => void;
+    searchValue?: string;
+    setSearchValue?: (v: string) => void;
+}>;
 export declare const SchemaInitializer: {
     (): any;
-    Button: React.MemoExoticComponent<React.FunctionComponent<SchemaInitializerButtonProps>>;
-    Item(props: SchemaInitializerItemProps): JSX.Element;
+    Button: React.MemoExoticComponent<import("@formily/react").ReactFC<SchemaInitializerButtonProps>>;
+    Item(props: SchemaInitializerItemProps): any;
     itemWrap(component?: SchemaInitializerItemComponent): SchemaInitializerItemComponent;
-    SwitchItem(props: any): JSX.Element;
+    ActionModal(props: SchemaInitializerActionModalProps): React.JSX.Element;
+    SwitchItem(props: any): React.JSX.Element;
 };
+interface SchemaInitializerActionModalProps {
+    title: string;
+    schema: any;
+    onCancel?: () => void;
+    onSubmit?: (values: any) => void;
+    buttonText?: any;
+}
+export {};