@nocobase/client 0.7.5-alpha.1 → 0.7.6-alpha.2

package/lib/schema-component/antd/filter/useFilterActionProps.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useFilterOptions = exports.useFilterActionProps = exports.mergeFilter = void 0;
+exports.useFilterOptions = exports.useFilterFieldProps = exports.useFilterFieldOptions = exports.useFilterActionProps = exports.removeNullCondition = exports.mergeFilter = void 0;
 
 var _react = require("@formily/react");
 
@@ -36,16 +36,24 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 
 var useFilterOptions = function useFilterOptions(collectionName) {
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var fields = getCollectionFields(collectionName);
+  return useFilterFieldOptions(fields);
+};
+
+exports.useFilterOptions = useFilterOptions;
+
+var useFilterFieldOptions = function useFilterFieldOptions(fields) {
   var _fieldSchema$xCompon;
 
   var fieldSchema = (0, _react.useFieldSchema)();
   var nonfilterable = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.nonfilterable) || [];
 
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-      getCollectionFields = _useCollectionManager.getCollectionFields,
-      getInterface = _useCollectionManager.getInterface;
-
-  var fields = getCollectionFields(collectionName);
+  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
+      getCollectionFields = _useCollectionManager2.getCollectionFields,
+      getInterface = _useCollectionManager2.getInterface;
 
   var field2option = function field2option(field, depth) {
     var _field$uiSchema, _operators$filter;
@@ -119,7 +127,7 @@ var useFilterOptions = function useFilterOptions(collectionName) {
   return getOptions(fields, 1);
 };
 
-exports.useFilterOptions = useFilterOptions;
+exports.useFilterFieldOptions = useFilterFieldOptions;
 
 var isEmpty = function isEmpty(obj) {
   return obj && Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype;
@@ -140,6 +148,8 @@ var removeNullCondition = function removeNullCondition(filter) {
   return _flat.default.unflatten(values);
 };
 
+exports.removeNullCondition = removeNullCondition;
+
 var mergeFilter = function mergeFilter(filter1, filter2) {
   if (filter1 && filter2) {
     return {
@@ -170,18 +180,31 @@ var useFilterActionProps = function useFilterActionProps() {
       service = _useBlockRequestConte.service,
       props = _useBlockRequestConte.props;
 
-  var field = (0, _react.useField)();
+  return useFilterFieldProps({
+    options: options,
+    service: service,
+    params: props.params
+  });
+};
+
+exports.useFilterActionProps = useFilterActionProps;
+
+var useFilterFieldProps = function useFilterFieldProps(_ref) {
+  var options = _ref.options,
+      service = _ref.service,
+      params = _ref.params;
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
+  var field = (0, _react.useField)();
   return {
     options: options,
     onSubmit: function onSubmit(values) {
       var _service$params;
 
       // filter parameter for the block
-      var defaultFilter = removeNullCondition(props.params.filter); // filter parameter for the filter action
+      var defaultFilter = removeNullCondition(params.filter); // filter parameter for the filter action
 
       var filter = removeNullCondition(values === null || values === void 0 ? void 0 : values.filter);
       service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
@@ -201,7 +224,7 @@ var useFilterActionProps = function useFilterActionProps() {
     onReset: function onReset() {
       var _service$params2;
 
-      var filter = removeNullCondition(props.params.filter);
+      var filter = removeNullCondition(params.filter);
       service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
         filter: filter,
         page: 1
@@ -211,4 +234,4 @@ var useFilterActionProps = function useFilterActionProps() {
   };
 };
 
-exports.useFilterActionProps = useFilterActionProps;
+exports.useFilterFieldProps = useFilterFieldProps;

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

@@ -103,7 +103,6 @@ var useValues = function useValues() {
     field.data.operator = operator;
     field.data.schema = (0, _shared.merge)(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
     field.data.value = (0, _get.default)(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
-    console.log('option', operator, field.data.value);
   };
 
   (0, _react2.useEffect)(function () {

package/lib/user/SignupPage.d.ts

@@ -1,5 +1,10 @@
 import { ISchema } from '@formily/react';
-export declare const useSignup: () => {
+export interface UseSignupProps {
+    message?: {
+        success?: string;
+    };
+}
+export declare const useSignup: (props?: UseSignupProps) => {
     run(): Promise<void>;
 };
 export interface SignupPageProps {

package/lib/user/SignupPage.js

@@ -146,7 +146,7 @@ var signupPageSchema = {
   }
 };
 
-var useSignup = function useSignup() {
+var useSignup = function useSignup(props) {
   var history = (0, _reactRouterDom.useHistory)();
   var form = (0, _react.useForm)();
   var api = (0, _.useAPIClient)();
@@ -157,6 +157,8 @@ var useSignup = function useSignup() {
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var _props$message;
+
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -171,7 +173,7 @@ var useSignup = function useSignup() {
                 });
 
               case 4:
-                _antd.message.success('Sign up successfully, and automatically jump to the sign in page');
+                _antd.message.success((props === null || props === void 0 ? void 0 : (_props$message = props.message) === null || _props$message === void 0 ? void 0 : _props$message.success) || t('Sign up successfully, and automatically jump to the sign in page'));
 
                 setTimeout(function () {
                   history.push('/signin');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.5-alpha.1",
+  "version": "0.7.6-alpha.2",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,8 +19,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.5-alpha.1",
-    "@nocobase/utils": "0.7.5-alpha.1",
+    "@nocobase/sdk": "0.7.6-alpha.2",
+    "@nocobase/utils": "0.7.6-alpha.2",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -57,5 +57,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
+  "gitHead": "2cfccff9d3ff14c521bf317fa7ee4efa18444c92"
 }

package/es/file-manager/FileStorageShortcut.d.ts

@@ -1 +0,0 @@
-export declare const FileStorageShortcut: () => JSX.Element;

package/es/file-manager/FileStorageShortcut.js

@@ -1,61 +0,0 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { FileOutlined } from '@ant-design/icons';
-import { uid } from '@formily/shared';
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { PluginManager } from '..';
-import { ActionContext, SchemaComponent } from '../schema-component';
-import { storageSchema } from './schemas/storage';
-import { StorageOptions } from './StorageOptions';
-var schema = {
-  type: 'object',
-  properties: _defineProperty({}, uid(), {
-    'x-component': 'Action.Drawer',
-    type: 'void',
-    title: '{{t("File storages")}}',
-    properties: {
-      storageSchema: storageSchema
-    }
-  })
-};
-export var FileStorageShortcut = function FileStorageShortcut() {
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
-  return /*#__PURE__*/React.createElement(ActionContext.Provider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
-    eventKey: 'FileStorage',
-    onClick: function onClick() {
-      setVisible(true);
-    },
-    icon: /*#__PURE__*/React.createElement(FileOutlined, null),
-    title: t('File storages')
-  }), /*#__PURE__*/React.createElement(SchemaComponent, {
-    components: {
-      StorageOptions: StorageOptions
-    },
-    schema: schema
-  }));
-};

package/es/file-manager/StorageOptions.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare const StorageOptions: React.MemoExoticComponent<React.FunctionComponent<unknown>>;

package/es/file-manager/StorageOptions.js

@@ -1,121 +0,0 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import { FormLayout } from '@formily/antd';
-import { observer, RecursionField, Schema, useField, useForm } from '@formily/react';
-import React, { useEffect, useState } from 'react';
-var schema = {
-  local: {
-    properties: {
-      documentRoot: {
-        title: '{{t("Destination")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        default: 'uploads'
-      },
-      serve: {
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Checkbox',
-        'x-content': '{{t("Use the built-in static file server")}}',
-        default: true
-      }
-    }
-  },
-  'ali-oss': {
-    properties: {
-      region: {
-        title: '{{t("Region")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      },
-      accessKeyId: {
-        title: '{{t("AccessKey ID")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      },
-      accessKeySecret: {
-        title: '{{t("AccessKey Secret")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Password',
-        required: true
-      },
-      bucket: {
-        title: '{{t("Bucket")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      }
-    }
-  },
-  s3: {
-    properties: {
-      region: {
-        title: '{{t("Region")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      },
-      accessKeyId: {
-        title: '{{t("AccessKey ID")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      },
-      secretAccessKey: {
-        title: '{{t("AccessKey Secret")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Password',
-        required: true
-      },
-      bucket: {
-        title: '{{t("Bucket")}}',
-        type: 'string',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        required: true
-      }
-    }
-  }
-};
-export var StorageOptions = observer(function (props) {
-  var form = useForm();
-  var field = useField();
-
-  var _useState = useState(new Schema({})),
-      _useState2 = _slicedToArray(_useState, 2),
-      s = _useState2[0],
-      setSchema = _useState2[1];
-
-  useEffect(function () {
-    form.clearFormGraph('options.*');
-    setSchema(new Schema(schema[form.values.type] || {}));
-  }, [form.values.type]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormLayout, {
-    layout: 'vertical'
-  }, /*#__PURE__*/React.createElement(RecursionField, {
-    key: form.values.type || 'local',
-    basePath: field.address,
-    onlyRenderProperties: true,
-    schema: s
-  })));
-});

package/es/file-manager/index.d.ts

@@ -1 +0,0 @@
-export * from './FileStorageShortcut';

package/es/file-manager/index.js

@@ -1 +0,0 @@
-export * from './FileStorageShortcut';

package/es/file-manager/schemas/storage.d.ts

@@ -1,2 +0,0 @@
-import { ISchema } from '@formily/react';
-export declare const storageSchema: ISchema;