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

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

@@ -22,16 +22,21 @@ import { useTranslation } from 'react-i18next';
 import { useBlockRequestContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 export var useFilterOptions = function useFilterOptions(collectionName) {
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var fields = getCollectionFields(collectionName);
+  return useFilterFieldOptions(fields);
+};
+export var useFilterFieldOptions = function useFilterFieldOptions(fields) {
   var _fieldSchema$xCompon;
 
   var fieldSchema = 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 = useCollectionManager(),
-      getCollectionFields = _useCollectionManager.getCollectionFields,
-      getInterface = _useCollectionManager.getInterface;
-
-  var fields = getCollectionFields(collectionName);
+  var _useCollectionManager2 = useCollectionManager(),
+      getCollectionFields = _useCollectionManager2.getCollectionFields,
+      getInterface = _useCollectionManager2.getInterface;
 
   var field2option = function field2option(field, depth) {
     var _field$uiSchema, _operators$filter;
@@ -109,7 +114,7 @@ var isEmpty = function isEmpty(obj) {
   return obj && Object.keys(obj).length === 0 && Object.getPrototypeOf(obj) === Object.prototype;
 };
 
-var removeNullCondition = function removeNullCondition(filter) {
+export var removeNullCondition = function removeNullCondition(filter) {
   var items = flat(filter || {});
   var values = {};
 
@@ -123,7 +128,6 @@ var removeNullCondition = function removeNullCondition(filter) {
 
   return flat.unflatten(values);
 };
-
 export var mergeFilter = function mergeFilter(filter1, filter2) {
   if (filter1 && filter2) {
     return {
@@ -151,18 +155,28 @@ export var useFilterActionProps = function useFilterActionProps() {
       service = _useBlockRequestConte.service,
       props = _useBlockRequestConte.props;
 
-  var field = useField();
+  return useFilterFieldProps({
+    options: options,
+    service: service,
+    params: props.params
+  });
+};
+export var useFilterFieldProps = function useFilterFieldProps(_ref) {
+  var options = _ref.options,
+      service = _ref.service,
+      params = _ref.params;
 
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
+  var field = 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]), {}, {
@@ -182,7 +196,7 @@ export 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

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

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

package/es/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/es/user/SignupPage.js

@@ -128,7 +128,7 @@ var signupPageSchema = {
     }
   }
 };
-export var useSignup = function useSignup() {
+export var useSignup = function useSignup(props) {
   var history = useHistory();
   var form = useForm();
   var api = useAPIClient();
@@ -139,6 +139,8 @@ export 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) {
@@ -153,7 +155,7 @@ export var useSignup = function useSignup() {
                 });
 
               case 4:
-                message.success('Sign up successfully, and automatically jump to the sign in page');
+                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');
                 }, 2000);

package/lib/application/Application.js

@@ -23,8 +23,6 @@ var _collectionManager = require("../collection-manager");
 
 var _documentTitle = require("../document-title");
 
-var _fileManager = require("../file-manager");
-
 var _i18n = require("../i18n");
 
 var _pluginManager = require("../plugin-manager");
@@ -133,8 +131,7 @@ var Application = /*#__PURE__*/function () {
         DesignableSwitch: _schemaComponent.DesignableSwitch,
         CollectionManagerShortcut: _collectionManager.CollectionManagerShortcut,
         SystemSettingsShortcut: _systemSettings.SystemSettingsShortcut,
-        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut,
-        FileStorageShortcut: _fileManager.FileStorageShortcut
+        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut
       }
     });
     this.use(_schemaComponent.SchemaComponentProvider, {

package/lib/collection-manager/Configuration/ConfigurationTable.js

@@ -277,7 +277,12 @@ var ConfigurationTable = function ConfigurationTable() {
     };
   }();
 
-  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
+  var ctx = (0, _react2.useContext)(_schemaComponent.SchemaComponentContext);
+  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponentContext.Provider, {
+    value: _objectSpread(_objectSpread({}, ctx), {}, {
+      designable: false
+    })
+  }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
     schema: _collections.collectionSchema,
     components: {
       AddSubFieldAction: _AddSubFieldAction.AddSubFieldAction,
@@ -294,7 +299,7 @@ var ConfigurationTable = function ConfigurationTable() {
       useCurrentFields: useCurrentFields,
       useNewId: useNewId
     }
-  }));
+  })));
 };
 
 exports.ConfigurationTable = ConfigurationTable;

package/lib/collection-manager/Configuration/schemas/collections.d.ts

@@ -1,2 +1,4 @@
 import { ISchema } from '@formily/react';
+import { CollectionOptions } from '../../types';
+export declare const collection: CollectionOptions;
 export declare const collectionSchema: ISchema;

package/lib/collection-manager/Configuration/schemas/collections.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.collectionSchema = void 0;
+exports.collectionSchema = exports.collection = void 0;
 
 var _react = require("@formily/react");
 
@@ -51,6 +51,7 @@ var collection = {
     uiSchema: {}
   }]
 };
+exports.collection = collection;
 var collectionSchema = {
   type: 'object',
   properties: {
@@ -87,6 +88,28 @@ var collectionSchema = {
             }
           },
           properties: {
+            filter: {
+              type: 'void',
+              title: '{{ t("Filter") }}',
+              default: {
+                $and: [{
+                  title: {
+                    $includes: ''
+                  }
+                }, {
+                  name: {
+                    $includes: ''
+                  }
+                }]
+              },
+              'x-action': 'filter',
+              'x-component': 'Filter.Action',
+              'x-component-props': {
+                icon: 'FilterOutlined',
+                useProps: '{{ cm.useFilterActionProps }}'
+              },
+              'x-align': 'left'
+            },
             delete: {
               type: 'void',
               title: '{{ t("Delete") }}',

package/lib/collection-manager/action-hooks.d.ts

@@ -99,3 +99,8 @@ export declare const useDestroyActionAndRefreshCM: () => {
 export declare const useBulkDestroyActionAndRefreshCM: () => {
     run(): Promise<void>;
 };
+export declare const useFilterActionProps: () => {
+    options: any;
+    onSubmit(values: any): void;
+    onReset(): void;
+};

package/lib/collection-manager/action-hooks.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useValuesFromRecord = exports.useValuesFromRA = exports.useUpdateViewAction = exports.useUpdateCollectionActionAndRefreshCM = exports.useUpdateActionAndRefreshCM = exports.useUpdateAction = exports.useSortFields = exports.useResetFilterAction = exports.useMoveAction = exports.useKanbanEvents = exports.useFilterDataSource = exports.useFilterAction = exports.useDestroyActionAndRefreshCM = exports.useDestroyAction = exports.useCreateActionWithoutRefresh = exports.useCreateActionAndRefreshCM = exports.useCreateAction = exports.useCollectionFilterOptions = exports.useCancelAction = exports.useBulkDestroyActionAndRefreshCM = exports.useBulkDestroyAction = void 0;
-
-var _react = require("@formily/react");
+exports.useValuesFromRecord = exports.useValuesFromRA = exports.useUpdateViewAction = exports.useUpdateCollectionActionAndRefreshCM = exports.useUpdateActionAndRefreshCM = exports.useUpdateAction = exports.useSortFields = exports.useResetFilterAction = exports.useMoveAction = exports.useKanbanEvents = exports.useFilterDataSource = exports.useFilterActionProps = exports.useFilterAction = exports.useDestroyActionAndRefreshCM = exports.useDestroyAction = exports.useCreateActionWithoutRefresh = exports.useCreateActionAndRefreshCM = exports.useCreateAction = exports.useCollectionFilterOptions = exports.useCancelAction = exports.useBulkDestroyActionAndRefreshCM = exports.useBulkDestroyAction = void 0;
 
 var _antd = require("antd");
 
 var _omit = _interopRequireDefault(require("lodash/omit"));
 
-var _react2 = require("react");
+var _react = require("react");
+
+var _react2 = require("@formily/react");
 
 var _ = require(".");
 
@@ -23,6 +23,8 @@ var _schemaComponent = require("../schema-component");
 
 var _ResourceActionProvider = require("./ResourceActionProvider");
 
+var _useFilterActionProps = require("../schema-component/antd/filter/useFilterActionProps");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -54,7 +56,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 var useCancelAction = function useCancelAction() {
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
   return {
     run: function run() {
@@ -83,7 +85,7 @@ var useResetFilterAction = function useResetFilterAction() {
   var _useResourceActionCon = (0, _ResourceActionProvider.useResourceActionContext)(),
       _run = _useResourceActionCon.run;
 
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
   return {
     run: function run() {
@@ -288,7 +290,7 @@ var useFilterAction = function useFilterAction() {
       params = _useResourceActionCon2.params,
       defaultRequest = _useResourceActionCon2.defaultRequest;
 
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
 
   var _params = _toArray(params),
@@ -330,7 +332,7 @@ var useFilterAction = function useFilterAction() {
 exports.useFilterAction = useFilterAction;
 
 var useCreateAction = function useCreateAction() {
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
 
   var _useResourceActionCon3 = (0, _ResourceActionProvider.useResourceActionContext)(),
@@ -377,7 +379,7 @@ var useCreateAction = function useCreateAction() {
 exports.useCreateAction = useCreateAction;
 
 var useCreateActionWithoutRefresh = function useCreateActionWithoutRefresh() {
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
 
   var _useResourceContext2 = (0, _ResourceActionProvider.useResourceContext)(),
       resource = _useResourceContext2.resource;
@@ -416,7 +418,7 @@ var useCreateActionWithoutRefresh = function useCreateActionWithoutRefresh() {
 exports.useCreateActionWithoutRefresh = useCreateActionWithoutRefresh;
 
 var useUpdateViewAction = function useUpdateViewAction() {
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)(); // const { refresh } = useResourceActionContext();
 
   var _useResourceContext3 = (0, _ResourceActionProvider.useResourceContext)(),
@@ -497,7 +499,7 @@ var useMoveAction = function useMoveAction() {
 exports.useMoveAction = useMoveAction;
 
 var useUpdateAction = function useUpdateAction() {
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
 
   var _useResourceActionCon5 = (0, _ResourceActionProvider.useResourceActionContext)(),
@@ -632,7 +634,7 @@ var useUpdateCollectionActionAndRefreshCM = function useUpdateCollectionActionAn
   var _useCollectionManager3 = (0, _.useCollectionManager)(),
       refreshCM = _useCollectionManager3.refreshCM;
 
-  var form = (0, _react.useForm)();
+  var form = (0, _react2.useForm)();
   var ctx = (0, _schemaComponent.useActionContext)();
 
   var _useResourceActionCon8 = (0, _ResourceActionProvider.useResourceActionContext)(),
@@ -695,7 +697,7 @@ var useValuesFromRecord = function useValuesFromRecord(options) {
     manual: true
   }));
   var ctx = (0, _schemaComponent.useActionContext)();
-  (0, _react2.useEffect)(function () {
+  (0, _react.useEffect)(function () {
     if (ctx.visible) {
       result.run();
     }
@@ -850,4 +852,19 @@ var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRefreshCM
   };
 };
 
-exports.useBulkDestroyActionAndRefreshCM = useBulkDestroyActionAndRefreshCM;
+exports.useBulkDestroyActionAndRefreshCM = useBulkDestroyActionAndRefreshCM;
+
+var useFilterActionProps = function useFilterActionProps() {
+  var _useResourceContext9 = (0, _ResourceActionProvider.useResourceContext)(),
+      collection = _useResourceContext9.collection;
+
+  var options = (0, _useFilterActionProps.useFilterFieldOptions)(collection.fields);
+  var service = (0, _ResourceActionProvider.useResourceActionContext)();
+  return (0, _useFilterActionProps.useFilterFieldProps)({
+    options: options,
+    params: service.params,
+    service: service
+  });
+};
+
+exports.useFilterActionProps = useFilterActionProps;

package/lib/index.d.ts

@@ -10,7 +10,6 @@ export * from './board';
 export * from './china-region';
 export * from './collection-manager';
 export * from './document-title';
-export * from './file-manager';
 export * from './i18n';
 export * from './icon';
 export * from './plugin-manager';

package/lib/index.js

@@ -138,19 +138,6 @@ Object.keys(_documentTitle).forEach(function (key) {
   });
 });
 
-var _fileManager = require("./file-manager");
-
-Object.keys(_fileManager).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fileManager[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _fileManager[key];
-    }
-  });
-});
-
 var _i18n = require("./i18n");
 
 Object.keys(_i18n).forEach(function (key) {

package/lib/locale/index.js

@@ -9,18 +9,22 @@ var _en_US = _interopRequireDefault(require("antd/lib/locale/en_US"));
 
 var _ja_JP = _interopRequireDefault(require("antd/lib/locale/ja_JP"));
 
-var _zh_CN = _interopRequireDefault(require("antd/lib/locale/zh_CN"));
-
 var _ru_RU = _interopRequireDefault(require("antd/lib/locale/ru_RU"));
 
+var _tr_TR = _interopRequireDefault(require("antd/lib/locale/tr_TR"));
+
+var _zh_CN = _interopRequireDefault(require("antd/lib/locale/zh_CN"));
+
 var _en_US2 = _interopRequireDefault(require("./en_US"));
 
 var _ja_JP2 = _interopRequireDefault(require("./ja_JP"));
 
-var _zh_CN2 = _interopRequireDefault(require("./zh_CN"));
-
 var _ru_RU2 = _interopRequireDefault(require("./ru_RU"));
 
+var _tr_TR2 = _interopRequireDefault(require("./tr_TR"));
+
+var _zh_CN2 = _interopRequireDefault(require("./zh_CN"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -70,6 +74,16 @@ var _default = {
     resources: {
       client: _objectSpread({}, _ru_RU2.default)
     }
+  },
+  'tr-TR': {
+    label: 'Türkçe',
+    // https://github.com/moment/moment/blob/develop/locale/tr.js
+    moment: 'tr',
+    // https://github.com/ant-design/ant-design/tree/master/components/locale/tr_TR
+    antd: _tr_TR.default,
+    resources: {
+      client: _objectSpread({}, _tr_TR2.default)
+    }
   }
 };
 exports.default = _default;