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

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/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;