@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/es/user/SwitchRole.js

@@ -49,6 +49,7 @@ export var SwitchRole = function SwitchRole() {
   }
 
   return /*#__PURE__*/React.createElement(Menu.Item, {
+    key: "role",
     eventKey: 'SwitchRole'
   }, t('Switch role'), ' ', /*#__PURE__*/React.createElement(Select, {
     style: {

package/es/workflow/ExecutionResourceProvider.js

@@ -24,7 +24,7 @@ export var ExecutionResourceProvider = function ExecutionResourceProvider(_ref)
     request: _objectSpread(_objectSpread({}, request), {}, {
       params: _objectSpread(_objectSpread({}, request === null || request === void 0 ? void 0 : request.params), {}, {
         filter: _objectSpread(_objectSpread({}, request === null || request === void 0 ? void 0 : (_request$params = request.params) === null || _request$params === void 0 ? void 0 : _request$params.filter), {}, {
-          workflowId: workflow.id
+          key: workflow.key
         })
       })
     }),

package/es/workflow/WorkflowCanvas.js

@@ -23,7 +23,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 
 import React, { useContext, useEffect } from 'react';
-import { Dropdown, Menu, Button, Tag, Switch } from 'antd';
+import { Dropdown, Menu, Button, Tag, Switch, message } from 'antd';
 import { PlusOutlined, DownOutlined, RightOutlined } from '@ant-design/icons';
 import { cx } from '@emotion/css';
 import { useTranslation } from 'react-i18next';
@@ -151,36 +151,37 @@ export function WorkflowCanvas() {
     return _onToggle.apply(this, arguments);
   }
 
-  function onDuplicate() {
-    return _onDuplicate.apply(this, arguments);
+  function onRevision() {
+    return _onRevision.apply(this, arguments);
   }
 
-  function _onDuplicate() {
-    _onDuplicate = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-      var _yield$resource$dupli, duplicated;
+  function _onRevision() {
+    _onRevision = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      var _yield$resource$revis, revision;
 
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return resource.duplicate({
+              return resource.revision({
                 filterByTk: workflow[targetKey]
               });
 
             case 2:
-              _yield$resource$dupli = _context2.sent;
-              duplicated = _yield$resource$dupli.data.data;
-              history.push(duplicated.id);
+              _yield$resource$revis = _context2.sent;
+              revision = _yield$resource$revis.data.data;
+              message.success(t('Operation succeeded'));
+              history.push("".concat(revision.id));
 
-            case 5:
+            case 6:
             case "end":
               return _context2.stop();
           }
         }
       }, _callee2);
     }));
-    return _onDuplicate.apply(this, arguments);
+    return _onRevision.apply(this, arguments);
   }
 
   return /*#__PURE__*/React.createElement(FlowContext.Provider, {
@@ -214,12 +215,12 @@ export function WorkflowCanvas() {
   }, (workflow === null || workflow === void 0 ? void 0 : workflow.id) ? "#".concat(workflow.id) : null, /*#__PURE__*/React.createElement(DownOutlined, null)))), /*#__PURE__*/React.createElement(Switch, {
     checked: workflow.enabled,
     onChange: onToggle,
-    checkedChildren: t('Started'),
-    unCheckedChildren: t('Stopped')
+    checkedChildren: t('On'),
+    unCheckedChildren: t('Off')
   }), workflow.executed && !revisions.find(function (item) {
     return !item.executed && new Date(item.createdAt) > new Date(workflow.createdAt);
   }) ? /*#__PURE__*/React.createElement(Button, {
-    onClick: onDuplicate
+    onClick: onRevision
   }, t('Copy to new version')) : null)), /*#__PURE__*/React.createElement("div", {
     className: "workflow-canvas"
   }, /*#__PURE__*/React.createElement(TriggerConfig, null), /*#__PURE__*/React.createElement("div", {

package/es/workflow/calculators.js

@@ -213,7 +213,8 @@ var ConstantTypes = {
             type: type,
             options: options
           });
-        }
+        },
+        placeholder: t('Select')
       }, /*#__PURE__*/React.createElement(Select.Option, {
         value: true
       }, t('True')), /*#__PURE__*/React.createElement(Select.Option, {
@@ -432,7 +433,7 @@ export function Operand(_ref18) {
 
   var VariableComponent = typeof component === 'function' ? component(operand) : NullRender;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n      align-items: center;\n\n      .ant-select,\n      .ant-cascader-picker,\n      .ant-picker,\n      .ant-input-number,\n      .ant-input-affix-wrapper{\n        width: auto;\n      }\n    "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n      align-items: center;\n    "])))
   }, /*#__PURE__*/React.createElement(Cascader, {
     allowClear: false,
     value: [type].concat(_toConsumableArray(appendTypeValue ? appendTypeValue(operand) : [])),
@@ -471,11 +472,15 @@ export function Calculation(_ref20) {
       _ref20$operands = _ref20.operands,
       operands = _ref20$operands === void 0 ? [] : _ref20$operands,
       _onChange5 = _ref20.onChange;
+
+  var _useTranslation2 = useTranslation(),
+      t = _useTranslation2.t;
+
   var compile = useCompile();
   return /*#__PURE__*/React.createElement(VariableTypesContext.Provider, {
     value: VariableTypes
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        display: flex;\n        gap: .5em;\n        align-items: center;\n\n        .ant-select{\n          width: auto;\n          min-width: 6em;\n        }\n      "])))
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n        display: flex;\n        gap: .5em;\n        align-items: center;\n\n        .ant-select{\n          width: auto;\n        }\n      "])))
   }, /*#__PURE__*/React.createElement(Operand, {
     value: operands[0],
     onChange: function onChange(v) {
@@ -491,7 +496,8 @@ export function Calculation(_ref20) {
         operands: operands,
         calculator: v
       });
-    }
+    },
+    placeholder: t('Calculator')
   }, calculators.map(function (group) {
     return /*#__PURE__*/React.createElement(Select.OptGroup, {
       key: group.value,
@@ -551,8 +557,8 @@ export var CollectionFieldset = observer(function (_ref22) {
   var value = _ref22.value,
       _onChange7 = _ref22.onChange;
 
-  var _useTranslation2 = useTranslation(),
-      t = _useTranslation2.t;
+  var _useTranslation3 = useTranslation(),
+      t = _useTranslation3.t;
 
   var compile = useCompile();
 

package/es/workflow/components/Duration.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export default function ({ value, onChange }: {
+    value?: number;
+    onChange: any;
+}): JSX.Element;

package/es/workflow/components/Duration.js

@@ -0,0 +1,61 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+import React from "react";
+import { InputNumber, Select } from "antd";
+import { useTranslation } from "react-i18next";
+import { css } from "@emotion/css";
+var UnitOptions = [{
+  value: 1000,
+  label: 'Seconds'
+}, {
+  value: 60000,
+  label: 'Minutes'
+}, {
+  value: 3600000,
+  label: 'Hours'
+}, {
+  value: 86400000,
+  label: 'Days'
+}, {
+  value: 604800000,
+  label: 'Weeks'
+}];
+
+function getNumberOption(v) {
+  return UnitOptions.slice().reverse().find(function (item) {
+    return !(v % item.value);
+  });
+}
+
+export default function (_ref) {
+  var _ref$value = _ref.value,
+      value = _ref$value === void 0 ? 60000 : _ref$value,
+      _onChange = _ref.onChange;
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var option = getNumberOption(value);
+  var quantity = Math.round(value / option.value);
+  return /*#__PURE__*/React.createElement("fieldset", {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n    "])))
+  }, /*#__PURE__*/React.createElement(InputNumber, {
+    min: 1,
+    value: quantity,
+    onChange: function onChange(v) {
+      return _onChange(Math.round(v * option.value));
+    }
+  }), /*#__PURE__*/React.createElement(Select, {
+    value: option.value,
+    onChange: function onChange(unit) {
+      return _onChange(Math.round(quantity * unit));
+    }
+  }, UnitOptions.map(function (item) {
+    return /*#__PURE__*/React.createElement(Select.Option, {
+      key: item.value,
+      value: item.value
+    }, t(item.label));
+  })));
+}

package/es/workflow/nodes/condition.js

@@ -117,7 +117,7 @@ function CalculationGroup(_ref2) {
   return /*#__PURE__*/React.createElement("div", {
     className: cx('node-type-condition-group', css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      position: relative;\n      width: 100%;\n\n      .node-type-condition-group{\n        padding: .5em 1em;\n        border: 1px dashed #ddd;\n      }\n\n      + button{\n        position: absolute;\n        right: 0;\n      }\n    "]))))
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        display: flex;\n        align-items: center;\n        gap: .5em;\n\n        .ant-select{\n          width: auto;\n        }\n      "])))
+    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        display: flex;\n        align-items: center;\n        gap: .5em;\n\n        .ant-select{\n          width: auto;\n          min-width: 6em;\n        }\n      "])))
   }, /*#__PURE__*/React.createElement(Trans, null, 'Meet ', /*#__PURE__*/React.createElement(Select, {
     value: type,
     onChange: function onChange(t) {

package/es/workflow/nodes/create.d.ts

@@ -13,6 +13,9 @@ declare const _default: {
             'x-reactions': string[];
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
         };
         'config.params.values': {
             type: string;

package/es/workflow/nodes/delay.d.ts

@@ -0,0 +1,35 @@
+import Duration from "../components/Duration";
+declare const _default: {
+    title: string;
+    type: string;
+    group: string;
+    fieldset: {
+        'config.duration': {
+            type: string;
+            name: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+        };
+        'config.endStatus': {
+            type: string;
+            name: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
+            enum: {
+                label: string;
+                value: number;
+            }[];
+        };
+    };
+    view: {};
+    scope: {};
+    components: {
+        Duration: typeof Duration;
+    };
+};
+export default _default;

package/es/workflow/nodes/delay.js

@@ -0,0 +1,37 @@
+import Duration from "../components/Duration";
+export default {
+  title: '{{t("Delay")}}',
+  type: 'delay',
+  group: 'control',
+  fieldset: {
+    'config.duration': {
+      type: 'number',
+      name: 'config.duration',
+      title: '{{t("Duration")}}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Duration'
+    },
+    'config.endStatus': {
+      type: 'number',
+      name: 'config.endStatus',
+      title: '{{t("End Status")}}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Select',
+      'x-component-props': {
+        placeholder: '{{t("Select status")}}'
+      },
+      enum: [{
+        label: '{{t("Succeed and continue")}}',
+        value: 1
+      }, {
+        label: '{{t("Fail and exit")}}',
+        value: -1
+      }]
+    }
+  },
+  view: {},
+  scope: {},
+  components: {
+    Duration: Duration
+  }
+};

package/es/workflow/nodes/destroy.d.ts

@@ -13,6 +13,9 @@ declare const _default: {
             'x-reactions': string[];
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
         };
         'config.params': {
             type: string;

package/es/workflow/nodes/index.d.ts

@@ -1,5 +1,5 @@
 import { ISchema } from '@formily/react';
-import { Registry } from '@nocobase/utils';
+import { Registry } from '@nocobase/utils/client';
 import React from 'react';
 export interface Instruction {
     title: string;

package/es/workflow/nodes/index.js

@@ -1,4 +1,4 @@
-var _templateObject;
+var _templateObject, _templateObject2;
 
 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; }
 
@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { CloseOutlined, DeleteOutlined } from '@ant-design/icons';
 import { css, cx } from '@emotion/css';
 import { useForm } from '@formily/react';
-import { Registry } from '@nocobase/utils';
+import { Registry } from '@nocobase/utils/client';
 import { Button, message, Modal, Tag } from 'antd';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -20,20 +20,22 @@ import { nodeBlockClass, nodeCardClass, nodeClass, nodeHeaderClass, nodeMetaClas
 import { AddButton, useFlowContext } from '../WorkflowCanvas';
 import calculation from './calculation';
 import condition from './condition';
-import create from './create';
-import destroy from './destroy';
 import parallel from './parallel';
+import delay from './delay';
 import query from './query';
+import create from './create';
 import update from './update';
+import destroy from './destroy';
 ;
 export var instructions = new Registry();
+instructions.register('condition', condition);
+instructions.register('parallel', parallel);
+instructions.register('calculation', calculation);
+instructions.register('delay', delay);
 instructions.register('query', query);
 instructions.register('create', create);
 instructions.register('update', update);
 instructions.register('destroy', destroy);
-instructions.register('condition', condition);
-instructions.register('parallel', parallel);
-instructions.register('calculation', calculation);
 
 function useUpdateAction() {
   var _useTranslation = useTranslation(),
@@ -267,7 +269,8 @@ export function NodeDefaultView(props) {
                 name: 'config',
                 'x-component': 'fieldset',
                 'x-component-props': {
-                  disabled: workflow.executed
+                  disabled: workflow.executed,
+                  className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                            .ant-select,\n                            .ant-cascader-picker,\n                            .ant-picker,\n                            .ant-input-number,\n                            .ant-input-affix-wrapper{\n                              width: auto;\n                            }\n                          "])))
                 },
                 properties: instruction.fieldset
               },

package/es/workflow/nodes/query.d.ts

@@ -13,6 +13,9 @@ declare const _default: {
             'x-reactions': string[];
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
         };
         'config.multiple': {
             type: string;

package/es/workflow/nodes/update.d.ts

@@ -13,6 +13,9 @@ declare const _default: {
             'x-reactions': string[];
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
         };
         'config.params.filter': {
             title: string;

package/es/workflow/schemas/collection.d.ts

@@ -6,6 +6,9 @@ export declare const collection: {
     'x-reactions': string[];
     'x-decorator': string;
     'x-component': string;
+    'x-component-props': {
+        placeholder: string;
+    };
 };
 export declare const values: {
     type: string;

package/es/workflow/schemas/collection.js

@@ -12,7 +12,10 @@ export var collection = {
   required: true,
   'x-reactions': ['{{useCollectionDataSource()}}'],
   'x-decorator': 'FormItem',
-  'x-component': 'Select'
+  'x-component': 'Select',
+  'x-component-props': {
+    placeholder: '{{t("Select collection")}}'
+  }
 };
 export var values = {
   type: 'object',

package/es/workflow/schemas/executions.d.ts

@@ -169,6 +169,21 @@ export declare const executionSchema: {
                         'x-component': string;
                         properties: {
                             createdAt: {
+                                type: string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    showTime: boolean;
+                                };
+                                'x-read-pretty': boolean;
+                            };
+                        };
+                    };
+                    workflowId: {
+                        type: string;
+                        'x-decorator': string;
+                        'x-component': string;
+                        properties: {
+                            workflowId: {
                                 type: string;
                                 'x-component': string;
                                 'x-read-pretty': boolean;

package/es/workflow/schemas/executions.js

@@ -12,6 +12,16 @@ var collection = {
       'x-component-props': {},
       'x-read-pretty': true
     }
+  }, {
+    interface: 'number',
+    type: 'number',
+    name: 'workflowId',
+    uiSchema: {
+      type: 'number',
+      title: '{{t("Version")}}',
+      'x-component': 'InputNumber',
+      'x-read-pretty': true
+    }
   }, {
     type: 'number',
     name: 'status',
@@ -26,7 +36,7 @@ var collection = {
         label: '{{t("On going")}}'
       }, {
         value: 1,
-        label: '{{t("Success")}}'
+        label: '{{t("Succeeded")}}'
       }, {
         value: -1,
         label: '{{t("Failed")}}'
@@ -88,6 +98,21 @@ export var executionSchema = {
               createdAt: {
                 type: 'datetime',
                 'x-component': 'CollectionField',
+                'x-component-props': {
+                  showTime: true
+                },
+                'x-read-pretty': true
+              }
+            }
+          },
+          workflowId: {
+            type: 'void',
+            'x-decorator': 'Table.Column.Decorator',
+            'x-component': 'Table.Column',
+            properties: {
+              workflowId: {
+                type: 'number',
+                'x-component': 'CollectionField',
                 'x-read-pretty': true
               }
             }

package/es/workflow/schemas/workflows.js

@@ -62,10 +62,10 @@ var collection = {
       title: '{{t("Status")}}',
       type: 'string',
       enum: [{
-        label: '{{t("Started")}}',
+        label: '{{t("On")}}',
         value: true
       }, {
-        label: '{{t("Stopped")}}',
+        label: '{{t("Off")}}',
         value: false
       }],
       'x-component': 'Radio.Group',

package/es/workflow/triggers/collection.d.ts

@@ -12,6 +12,9 @@ declare const _default: {
             'x-reactions': string[];
             'x-decorator': string;
             'x-component': string;
+            'x-component-props': {
+                placeholder: string;
+            };
         };
         'config.mode': {
             type: string;
@@ -24,6 +27,7 @@ declare const _default: {
                     value: number;
                     label: string;
                 }[];
+                placeholder: string;
             };
             required: boolean;
         };
@@ -36,6 +40,7 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {
                 mode: string;
+                placeholder: string;
             };
         };
         'config.condition': {

package/es/workflow/triggers/collection.js

@@ -1,3 +1,7 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 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; }
@@ -13,6 +17,7 @@ import { useFlowContext } from '../WorkflowCanvas';
 import { BaseTypeSet } from '../calculators';
 import { collection, filter } from '../schemas/collection';
 import { useTranslation } from 'react-i18next';
+import { css } from '@emotion/css';
 var FieldsSelect = observer(function (props) {
   var _values$config;
 
@@ -25,12 +30,15 @@ var FieldsSelect = observer(function (props) {
       values = _useForm.values;
 
   var fields = getCollectionFields(values === null || values === void 0 ? void 0 : (_values$config = values.config) === null || _values$config === void 0 ? void 0 : _values$config.collection);
-  return /*#__PURE__*/React.createElement(Select, _objectSpread({}, props), fields.filter(function (field) {
+  return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({}, props), {}, {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        min-width: 6em;\n      "])))
+  }), fields.filter(function (field) {
     return !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true);
   }).map(function (field) {
     var _field$uiSchema;
 
     return /*#__PURE__*/React.createElement(Select.Option, {
+      key: field.name,
       value: field.name
     }, compile((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title));
   }));
@@ -59,7 +67,8 @@ export default {
         }, {
           value: 4,
           label: '{{t("After record deleted")}}'
-        }]
+        }],
+        placeholder: '{{t("Trigger on")}}'
       },
       required: true
     },
@@ -71,7 +80,8 @@ export default {
       'x-decorator': 'FormItem',
       'x-component': 'FieldsSelect',
       'x-component-props': {
-        mode: 'multiple'
+        mode: 'multiple',
+        placeholder: '{{t("Select Field")}}'
       }
     },
     'config.condition': _objectSpread(_objectSpread({}, filter), {}, {

package/es/workflow/triggers/index.d.ts

@@ -1,6 +1,6 @@
-import React from "react";
 import { ISchema } from "@formily/react";
-import { Registry } from "@nocobase/utils";
+import { Registry } from "@nocobase/utils/client";
+import React from "react";
 export interface Trigger {
     title: string;
     type: string;