@nocobase/client 0.7.0-alpha.80 → 0.7.0-alpha.83

package/lib/schema-initializer/buttons/FormActionInitializers.d.ts

@@ -91,6 +91,7 @@ export declare const FormActionInitializers: {
                         redirecting: boolean;
                         successMessage: string;
                     };
+                    requestSettings?: undefined;
                 };
                 'x-component-props': {
                     useProps: string;
@@ -99,6 +100,33 @@ export declare const FormActionInitializers: {
                 type?: undefined;
                 properties?: undefined;
             };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    requestSettings: {};
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    assignedValues?: undefined;
+                    skipValidator?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+                'x-designer-props'?: undefined;
+            };
         })[];
     })[];
 };
@@ -195,6 +223,33 @@ export declare const CreateFormActionInitializers: {
                         redirecting: boolean;
                         successMessage: string;
                     };
+                    requestSettings?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    requestSettings: {};
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    assignedValues?: undefined;
+                    skipValidator?: undefined;
                 };
                 'x-component-props': {
                     useProps: string;
@@ -202,6 +257,7 @@ export declare const CreateFormActionInitializers: {
                 };
                 type?: undefined;
                 properties?: undefined;
+                'x-designer-props'?: undefined;
             };
         })[];
     })[];
@@ -299,6 +355,33 @@ export declare const UpdateFormActionInitializers: {
                         redirecting: boolean;
                         successMessage: string;
                     };
+                    requestSettings?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    requestSettings: {};
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    assignedValues?: undefined;
+                    skipValidator?: undefined;
                 };
                 'x-component-props': {
                     useProps: string;
@@ -306,6 +389,7 @@ export declare const UpdateFormActionInitializers: {
                 };
                 type?: undefined;
                 properties?: undefined;
+                'x-designer-props'?: undefined;
             };
         })[];
     })[];

package/lib/schema-initializer/buttons/FormActionInitializers.js

@@ -98,6 +98,27 @@ var FormActionInitializers = {
           useProps: '{{ useCreateActionProps }}'
         }
       }
+    }, {
+      type: 'item',
+      title: '{{t("Custom request")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Custom request") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:form:request',
+        'x-designer': 'Action.Designer',
+        'x-action-settings': {
+          requestSettings: {},
+          onSuccess: {
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Request success")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useCustomizeRequestActionProps }}'
+        }
+      }
     }]
   }]
 };
@@ -195,6 +216,27 @@ var CreateFormActionInitializers = {
           useProps: '{{ useCreateActionProps }}'
         }
       }
+    }, {
+      type: 'item',
+      title: '{{t("Custom request")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Custom request") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:form:request',
+        'x-designer': 'Action.Designer',
+        'x-action-settings': {
+          requestSettings: {},
+          onSuccess: {
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Request success")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useCustomizeRequestActionProps }}'
+        }
+      }
     }]
   }]
 };
@@ -292,6 +334,27 @@ var UpdateFormActionInitializers = {
           useProps: '{{ useUpdateActionProps }}'
         }
       }
+    }, {
+      type: 'item',
+      title: '{{t("Custom request")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Custom request") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:form:request',
+        'x-designer': 'Action.Designer',
+        'x-action-settings': {
+          requestSettings: {},
+          onSuccess: {
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Request success")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useCustomizeRequestActionProps }}'
+        }
+      }
     }]
   }]
 };

package/lib/schema-initializer/buttons/ReadPrettyFormActionInitializers.d.ts

@@ -102,6 +102,32 @@ export declare const ReadPrettyFormActionInitializers: {
                         redirecting: boolean;
                         successMessage: string;
                     };
+                    requestSettings?: undefined;
+                };
+                'x-component-props': {
+                    useProps: string;
+                    openMode?: undefined;
+                };
+                type?: undefined;
+                properties?: undefined;
+            };
+        } | {
+            type: string;
+            title: string;
+            component: string;
+            schema: {
+                title: string;
+                'x-component': string;
+                'x-action': string;
+                'x-designer': string;
+                'x-action-settings': {
+                    requestSettings: {};
+                    onSuccess: {
+                        manualClose: boolean;
+                        redirecting: boolean;
+                        successMessage: string;
+                    };
+                    assignedValues?: undefined;
                 };
                 'x-component-props': {
                     useProps: string;

package/lib/schema-initializer/buttons/ReadPrettyFormActionInitializers.js

@@ -109,6 +109,27 @@ var ReadPrettyFormActionInitializers = {
           useProps: '{{ useCustomizeUpdateActionProps }}'
         }
       }
+    }, {
+      type: 'item',
+      title: '{{t("Custom request")}}',
+      component: 'CustomizeActionInitializer',
+      schema: {
+        title: '{{ t("Custom request") }}',
+        'x-component': 'Action',
+        'x-action': 'customize:form:request',
+        'x-designer': 'Action.Designer',
+        'x-action-settings': {
+          requestSettings: {},
+          onSuccess: {
+            manualClose: false,
+            redirecting: false,
+            successMessage: '{{t("Request success")}}'
+          }
+        },
+        'x-component-props': {
+          useProps: '{{ useCustomizeRequestActionProps }}'
+        }
+      }
     }]
   }]
 };

package/lib/schema-initializer/buttons/TableActionColumnInitializers.js

@@ -161,6 +161,27 @@ var TableActionColumnInitializers = function TableActionColumnInitializers(props
             useProps: '{{ useCustomizeUpdateActionProps }}'
           }
         }
+      }, {
+        type: 'item',
+        title: '{{t("Custom request")}}',
+        component: 'CustomizeActionInitializer',
+        schema: {
+          title: '{{ t("Custom request") }}',
+          'x-component': 'Action.Link',
+          'x-action': 'customize:table:request',
+          'x-designer': 'Action.Designer',
+          'x-action-settings': {
+            requestSettings: {},
+            onSuccess: {
+              manualClose: false,
+              redirecting: false,
+              successMessage: '{{t("Request success")}}'
+            }
+          },
+          'x-component-props': {
+            useProps: '{{ useCustomizeRequestActionProps }}'
+          }
+        }
       }]
     }],
     component: /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, {

package/lib/schema-settings/SchemaSettings.js

@@ -25,6 +25,8 @@ var _lodash = require("lodash");
 
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _reactDom = require("react-dom");
+
 var _reactI18next = require("react-i18next");
 
 var _ = require("..");
@@ -40,7 +42,7 @@ var _excluded = ["children", "fieldSchema"],
     _excluded3 = ["title", "options", "value", "onChange"],
     _excluded4 = ["title", "onChange"],
     _excluded5 = ["schema"],
-    _excluded6 = ["title", "onSubmit", "initialValues", "initialSchema", "modalTip"],
+    _excluded6 = ["title", "onSubmit", "initialValues", "initialSchema", "schema", "modalTip", "components"],
     _excluded7 = ["hidden", "title", "components", "scope", "effects", "schema", "onSubmit", "initialValues"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -686,7 +688,9 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
       onSubmit = props.onSubmit,
       initialValues = props.initialValues,
       initialSchema = props.initialSchema,
+      schema = props.schema,
       modalTip = props.modalTip,
+      components = props.components,
       others = _objectWithoutProperties(props, _excluded6);
 
   var _useState7 = (0, _react2.useState)(false),
@@ -720,19 +724,40 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     setVisible(false);
   };
 
-  var submitHandler = function submitHandler() {
-    onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit((0, _lodash.cloneDeep)(form.values));
-    setVisible(false);
-  };
-
-  var openAssignedFieldValueHandler = /*#__PURE__*/function () {
+  var submitHandler = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
       return regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(!schemaUid && initialSchema['x-uid'])) {
-                _context7.next = 6;
+              _context7.next = 2;
+              return form.submit();
+
+            case 2:
+              onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit((0, _lodash.cloneDeep)(form.values));
+              setVisible(false);
+
+            case 4:
+            case "end":
+              return _context7.stop();
+          }
+        }
+      }, _callee7);
+    }));
+
+    return function submitHandler() {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
+  var openAssignedFieldValueHandler = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+      return regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              if (!(!schemaUid && (initialSchema === null || initialSchema === void 0 ? void 0 : initialSchema['x-uid']))) {
+                _context8.next = 6;
                 break;
               }
 
@@ -740,7 +765,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
               dn.emit('patch', {
                 schema: fieldSchema
               });
-              _context7.next = 5;
+              _context8.next = 5;
               return api.resource('uiSchemas').insert({
                 values: initialSchema
               });
@@ -754,20 +779,24 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
 
             case 8:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7);
+      }, _callee8);
     }));
 
     return function openAssignedFieldValueHandler() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
   return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: openAssignedFieldValueHandler
-  }), props.children || props.title), /*#__PURE__*/_react2.default.createElement(_antd2.Modal, _objectSpread(_objectSpread({
+  }), props.children || props.title), /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react2.default.createElement("div", {
+    onClick: function onClick(e) {
+      e.stopPropagation();
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_antd2.Modal, _objectSpread(_objectSpread({
     width: '50%',
     title: compile(title)
   }, others), {}, {
@@ -786,10 +815,14 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     layout: 'vertical'
   }, modalTip && /*#__PURE__*/_react2.default.createElement(_antd2.Alert, {
     message: modalTip
-  }), modalTip && /*#__PURE__*/_react2.default.createElement("br", null), visible && /*#__PURE__*/_react2.default.createElement(_.RemoteSchemaComponent, {
+  }), modalTip && /*#__PURE__*/_react2.default.createElement("br", null), visible && schemaUid && /*#__PURE__*/_react2.default.createElement(_.RemoteSchemaComponent, {
     noForm: true,
+    components: components,
     uid: schemaUid
-  })))));
+  }), visible && schema && /*#__PURE__*/_react2.default.createElement(_.SchemaComponent, {
+    components: components,
+    schema: schema
+  }))))), document.body));
 });
 
 SchemaSettings.ModalItem = function (props) {

package/lib/user/CurrentUser.js

@@ -93,7 +93,7 @@ var CurrentUser = function CurrentUser() {
                   return api.resource('users').signout();
 
                 case 2:
-                  api.setBearerToken(null);
+                  api.auth.setToken(null);
                   history.push('/signin');
 
                 case 4:

package/lib/user/LanguageSettings.js

@@ -83,13 +83,14 @@ var LanguageSettings = function LanguageSettings() {
                 });
 
               case 2:
-                _context.next = 4;
+                api.auth.setLocale(lang);
+                _context.next = 5;
                 return i18n.changeLanguage(lang);
 
-              case 4:
+              case 5:
                 window.location.reload();
 
-              case 5:
+              case 6:
               case "end":
                 return _context.stop();
             }

package/lib/user/SigninPage.js

@@ -97,10 +97,6 @@ var useSignin = function useSignin() {
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var _response$data, _response$data$data;
-
-        var response, _response$data2, _response$data2$data;
-
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -110,19 +106,12 @@ var useSignin = function useSignin() {
 
               case 2:
                 _context.next = 4;
-                return api.resource('users').signin({
-                  values: form.values
-                });
+                return api.auth.signIn(form.values);
 
               case 4:
-                response = _context.sent;
-
-                if (response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$data = _response$data.data) === null || _response$data$data === void 0 ? void 0 : _response$data$data.token) {
-                  api.setBearerToken(response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$data = _response$data2.data) === null || _response$data2$data === void 0 ? void 0 : _response$data2$data.token);
-                  history.push(redirect || '/admin');
-                }
+                history.push(redirect || '/admin');
 
-              case 6:
+              case 5:
               case "end":
                 return _context.stop();
             }

package/lib/user/SwitchRole.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SwitchRole = void 0;
 
-var _ahooks = require("ahooks");
-
 var _antd = require("antd");
 
 var _react = _interopRequireDefault(require("react"));
@@ -27,18 +25,6 @@ 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); }); }; }
 
-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; }
-
 var useCurrentRoles = function useCurrentRoles() {
   var _data$data;
 
@@ -67,23 +53,12 @@ var useCurrentRoles = function useCurrentRoles() {
 };
 
 var SwitchRole = function SwitchRole() {
-  var _roles$find;
-
   var api = (0, _apiClient.useAPIClient)();
   var roles = useCurrentRoles();
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
-  var _useCookieState = (0, _ahooks.useCookieState)('currentRoleName', {
-    defaultValue: roles === null || roles === void 0 ? void 0 : (_roles$find = roles.find(function (role) {
-      return role.default;
-    })) === null || _roles$find === void 0 ? void 0 : _roles$find.name
-  }),
-      _useCookieState2 = _slicedToArray(_useCookieState, 2),
-      roleName = _useCookieState2[0],
-      setRoleName = _useCookieState2[1];
-
   if (roles.length <= 1) {
     return null;
   }
@@ -100,14 +75,14 @@ var SwitchRole = function SwitchRole() {
       value: 'name'
     },
     options: roles,
-    value: roleName,
+    value: api.auth.role,
     onChange: function () {
       var _onChange = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(roleName) {
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                setRoleName(roleName);
+                api.auth.setRole(roleName);
                 _context.next = 3;
                 return api.resource('users').setDefaultRole({
                   values: {

package/lib/workflow/triggers/collection.js

@@ -49,6 +49,7 @@ var FieldsSelect = (0, _react2.observer)(function (props) {
     var _field$uiSchema;
 
     return /*#__PURE__*/_react.default.createElement(_antd.Select.Option, {
+      key: field.name,
       value: field.name
     }, compile((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title));
   }));

package/lib/workflow/triggers/index.js

@@ -23,6 +23,8 @@ var _collection = _interopRequireDefault(require("./collection"));
 
 var _style = require("../style");
 
+var _schedule = _interopRequireDefault(require("./schedule"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -88,6 +90,7 @@ function useUpdateConfigAction() {
 var triggers = new _utils.Registry();
 exports.triggers = triggers;
 triggers.register(_collection.default.type, _collection.default);
+triggers.register(_schedule.default.type, _schedule.default);
 
 var TriggerConfig = function TriggerConfig() {
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),

package/lib/workflow/triggers/schedule.d.ts

@@ -0,0 +1,25 @@
+import { useCollectionDataSource } from '../../collection-manager';
+declare const _default: {
+    title: string;
+    type: string;
+    fieldset: {
+        config: {
+            type: string;
+            name: string;
+            'x-component': string;
+            'x-component-props': {};
+        };
+    };
+    scope: {
+        useCollectionDataSource: typeof useCollectionDataSource;
+    };
+    components: {
+        ScheduleConfig: () => JSX.Element;
+    };
+    getter({ type, options, onChange }: {
+        type: any;
+        options: any;
+        onChange: any;
+    }): JSX.Element;
+};
+export default _default;