@nocobase/plugin-workflow 0.8.0-alpha.9 → 0.8.1-alpha.3

package/lib/client/calculators.js

@@ -8,7 +8,8 @@ exports.Calculation = Calculation;
 exports.Operand = Operand;
 exports.VariableComponent = VariableComponent;
 exports.calculators = exports.VariableTypesContext = exports.VariableTypes = void 0;
-exports.parseStringValue = parseStringValue;
+exports.parseValue = parseValue;
+exports.useOperandContext = useOperandContext;
 exports.useVariableTypes = useVariableTypes;
 
 function _react() {
@@ -77,6 +78,8 @@ function _client2() {
   return data;
 }
 
+var _locale = require("./locale");
+
 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; }
@@ -189,22 +192,22 @@ calculators.register('notEndsWith', {
   group: 'string'
 });
 calculators.register('concat', {
-  name: '{{t("concat")}}',
+  name: `{{t("concat", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'string',
   group: 'string'
 });
 const calculatorGroups = [{
   value: 'boolean',
-  title: '{{t("Comparison")}}'
+  title: '{{t("Comparision")}}'
 }, {
   value: 'number',
-  title: '{{t("Arithmetic calculation")}}'
+  title: `{{t("Arithmetic calculation", { ns: "${_locale.NAMESPACE}" })}}`
 }, {
   value: 'string',
-  title: '{{t("String operation")}}'
+  title: `{{t("String operation", { ns: "${_locale.NAMESPACE}" })}}`
 }, {
   value: 'date',
-  title: '{{t("Date")}}'
+  title: `{{t("Date", { ns: "${_locale.NAMESPACE}" })}}`
 }];
 
 function getGroupCalculators(group) {
@@ -213,9 +216,48 @@ function getGroupCalculators(group) {
 
 const JT_VALUE_RE = /^\s*\{\{([\s\S]*)\}\}\s*$/;
 
-function parseStringValue(value, Types) {
+function getType(value) {
+  if (value == null) {
+    return 'null';
+  }
+
+  const type = typeof value;
+
+  switch (type) {
+    case 'object':
+      break;
+
+    default:
+      // 'boolean'
+      // 'number'
+      // 'bigint'
+      // 'string'
+      // 'symbol'
+      return type;
+  }
+
+  if (value instanceof Date) {
+    return 'date';
+  }
+
+  return 'object';
+}
+
+function parseValue(value, Types) {
   var _type;
 
+  const valueType = getType(value);
+
+  if (valueType !== 'string') {
+    return {
+      type: 'constant',
+      value,
+      options: {
+        type: valueType
+      }
+    };
+  }
+
   const matcher = value.match(JT_VALUE_RE);
 
   if (!matcher) {
@@ -242,23 +284,23 @@ function parseStringValue(value, Types) {
 const BaseTypeSet = new Set(['boolean', 'number', 'string', 'date']);
 exports.BaseTypeSet = BaseTypeSet;
 const ConstantTypes = {
+  null: {
+    title: `{{t("Null", { ns: "${_locale.NAMESPACE}" })}}`,
+    value: 'null',
+    default: null,
+    component: NullRender
+  },
   string: {
-    title: '{{t("String")}}',
+    title: `{{t("String", { ns: "${_locale.NAMESPACE}" })}}`,
     value: 'string',
 
     component({
       onChange: _onChange,
-      type,
-      options,
       value
     }) {
       return _react().default.createElement(_antd().Input, {
         value: value,
-        onChange: ev => _onChange({
-          value: ev.target.value,
-          type,
-          options
-        })
+        onChange: ev => _onChange(ev.target.value)
       });
     },
 
@@ -269,31 +311,23 @@ const ConstantTypes = {
     value: 'number',
 
     component({
-      onChange: _onChange2,
-      type,
-      options,
+      onChange,
       value
     }) {
       return _react().default.createElement(_antd().InputNumber, {
         value: value,
-        onChange: v => _onChange2({
-          value: v,
-          type,
-          options
-        })
+        onChange: onChange
       });
     },
 
     default: 0
   },
   boolean: {
-    title: '{{t("Boolean")}}',
+    title: `{{t("Boolean", { ns: "${_locale.NAMESPACE}" })}}`,
     value: 'boolean',
 
     component({
-      onChange: _onChange3,
-      type,
-      options,
+      onChange,
       value
     }) {
       const _useTranslation = (0, _reactI18next().useTranslation)(),
@@ -301,17 +335,13 @@ const ConstantTypes = {
 
       return _react().default.createElement(_antd().Select, {
         value: value,
-        onChange: v => _onChange3({
-          value: v,
-          type,
-          options
-        }),
+        onChange: onChange,
         placeholder: t('Select')
       }, _react().default.createElement(_antd().Select.Option, {
         value: true
-      }, t('True')), _react().default.createElement(_antd().Select.Option, {
+      }, (0, _locale.lang)('True')), _react().default.createElement(_antd().Select.Option, {
         value: false
-      }, t('False')));
+      }, (0, _locale.lang)('False')));
     },
 
     default: false
@@ -327,21 +357,23 @@ const ConstantTypes = {
 };
 const VariableTypes = {
   constant: {
-    title: '{{t("Constant")}}',
+    title: `{{t("Constant", { ns: "${_locale.NAMESPACE}" })}}`,
     value: 'constant',
     options: Object.values(ConstantTypes).map(item => ({
       value: item.value,
       label: item.title
     })),
 
-    component({
-      options = {
+    component(props) {
+      var _ConstantTypes$option;
+
+      const _useOperandContext = useOperandContext(),
+            _useOperandContext$op = _useOperandContext.options,
+            options = _useOperandContext$op === void 0 ? {
         type: 'string'
-      }
-    }) {
-      var _ConstantTypes$option, _ConstantTypes$option2;
+      } : _useOperandContext$op;
 
-      return (_ConstantTypes$option = (_ConstantTypes$option2 = ConstantTypes[options.type]) === null || _ConstantTypes$option2 === void 0 ? void 0 : _ConstantTypes$option2.component) !== null && _ConstantTypes$option !== void 0 ? _ConstantTypes$option : NullRender;
+      return (_ConstantTypes$option = ConstantTypes[options.type]) === null || _ConstantTypes$option === void 0 ? void 0 : _ConstantTypes$option.component(props);
     },
 
     appendTypeValue({
@@ -352,21 +384,9 @@ const VariableTypes = {
       return (options === null || options === void 0 ? void 0 : options.type) ? [options.type] : [];
     },
 
-    onTypeChange(old, [type, optionsType], onChange) {
-      var _old$options;
-
-      if ((old === null || old === void 0 ? void 0 : (_old$options = old.options) === null || _old$options === void 0 ? void 0 : _old$options.type) === optionsType) {
-        return;
-      }
-
+    onTypeChange([type, optionsType], onChange) {
       const value = ConstantTypes[optionsType].default;
-      onChange({
-        value,
-        type,
-        options: _objectSpread(_objectSpread({}, old.options), {}, {
-          type: optionsType
-        })
-      });
+      onChange(value);
     },
 
     parse(path) {
@@ -377,7 +397,7 @@ const VariableTypes = {
 
   },
   $jobsMapByNodeId: {
-    title: '{{t("Node result")}}',
+    title: `{{t("Node result", { ns: "${_locale.NAMESPACE}" })}}`,
     value: '$jobsMapByNodeId',
 
     options() {
@@ -402,27 +422,26 @@ const VariableTypes = {
       return stack;
     },
 
-    component({
-      options
-    }) {
-      var _instruction$getter;
-
+    component(props) {
       const _useFlowContext = (0, _FlowContext.useFlowContext)(),
             nodes = _useFlowContext.nodes;
 
+      const _useOperandContext2 = useOperandContext(),
+            options = _useOperandContext2.options;
+
       if (!(options === null || options === void 0 ? void 0 : options.nodeId)) {
-        return NullRender;
+        return null;
       }
 
       const node = nodes.find(n => n.id == options.nodeId);
 
       if (!node) {
-        return NullRender;
+        return null;
       }
 
       const instruction = _nodes.instructions.get(node.type);
 
-      return (_instruction$getter = instruction === null || instruction === void 0 ? void 0 : instruction.getter) !== null && _instruction$getter !== void 0 ? _instruction$getter : NullRender;
+      return instruction === null || instruction === void 0 ? void 0 : instruction.getter(props);
     },
 
     appendTypeValue({
@@ -431,14 +450,8 @@ const VariableTypes = {
       return options.nodeId ? [Number.parseInt(options.nodeId, 10)] : [];
     },
 
-    onTypeChange(old, [type, nodeId], onChange) {
-      onChange({
-        // ...old,
-        type,
-        options: {
-          nodeId
-        }
-      });
+    onTypeChange([type, nodeId], onChange) {
+      onChange(`{{${type}.${nodeId}}}`);
     },
 
     parse([nodeId, ...path]) {
@@ -448,54 +461,55 @@ const VariableTypes = {
       };
     },
 
-    stringify({
-      options
-    }) {
-      const stack = ['$jobsMapByNodeId'];
-
-      if (options.nodeId) {
-        stack.push(options.nodeId);
-
-        if (options.path) {
-          stack.push(options.path);
-        }
-      }
-
-      return `{{${stack.join('.')}}}`;
+    stringify(next) {
+      return `{{${next.join('.')}}}`;
     }
 
   },
   $context: {
-    title: '{{t("Trigger context")}}',
+    title: `{{t("Trigger variables", { ns: "${_locale.NAMESPACE}" })}}`,
     value: '$context',
 
-    component() {
-      var _trigger$getter;
+    options() {
+      var _trigger$getOptions, _trigger$getOptions2;
 
       const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
             workflow = _useFlowContext2.workflow;
 
       const trigger = _triggers.triggers.get(workflow.type);
 
-      return (_trigger$getter = trigger === null || trigger === void 0 ? void 0 : trigger.getter) !== null && _trigger$getter !== void 0 ? _trigger$getter : NullRender;
+      return (_trigger$getOptions = trigger === null || trigger === void 0 ? void 0 : (_trigger$getOptions2 = trigger.getOptions) === null || _trigger$getOptions2 === void 0 ? void 0 : _trigger$getOptions2.call(trigger, workflow.config)) !== null && _trigger$getOptions !== void 0 ? _trigger$getOptions : null;
     },
 
-    parse([prefix, ...path]) {
-      return {
-        path: path.join('.')
-      };
+    component(props) {
+      const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
+            workflow = _useFlowContext3.workflow;
+
+      const trigger = _triggers.triggers.get(workflow.type);
+
+      return trigger === null || trigger === void 0 ? void 0 : trigger.getter(props);
     },
 
-    stringify({
+    appendTypeValue({
       options
     }) {
-      const stack = ['$context'];
+      return options.type ? [options.type] : [];
+    },
 
-      if (options === null || options === void 0 ? void 0 : options.path) {
-        stack.push(options.path);
-      }
+    onTypeChange([type, optionType], onChange) {
+      onChange(`{{${type}.${optionType}}}`);
+    },
 
-      return `{{${stack.join('.')}}}`;
+    parse([type, ...path]) {
+      return _objectSpread({
+        type
+      }, (path === null || path === void 0 ? void 0 : path.length) ? {
+        path: path.join('.')
+      } : {});
+    },
+
+    stringify(next) {
+      return `{{${next.join('.')}}}`;
     }
 
   } // calculation: Calculation
@@ -503,7 +517,7 @@ const VariableTypes = {
 };
 exports.VariableTypes = VariableTypes;
 
-const VariableTypesContext = _react().default.createContext(null);
+const VariableTypesContext = _react().default.createContext({});
 
 exports.VariableTypesContext = VariableTypesContext;
 
@@ -511,26 +525,27 @@ function useVariableTypes() {
   return _react().default.useContext(VariableTypesContext);
 }
 
+const OperandContext = _react().default.createContext(null);
+
+function useOperandContext() {
+  return _react().default.useContext(OperandContext);
+}
+
 function Operand({
-  value: operand = {
-    type: 'constant',
-    value: '',
-    options: {
-      type: 'string'
-    }
-  },
-  onChange: _onChange4,
+  value = null,
+  onChange: _onChange2,
   children
 }) {
   const compile = (0, _client().useCompile)();
   const Types = useVariableTypes();
+  const operand = parseValue(value, Types);
   const type = operand.type;
 
   const _ref = Types[type] || {},
-        component = _ref.component,
+        _ref$component = _ref.component,
+        Variable = _ref$component === void 0 ? NullRender : _ref$component,
         appendTypeValue = _ref.appendTypeValue;
 
-  const VariableComponent = typeof component === 'function' ? component(operand) : NullRender;
   return _react().default.createElement("div", {
     className: (0, _css().css)`
       display: flex;
@@ -539,7 +554,7 @@ function Operand({
     `
   }, _react().default.createElement(_antd().Cascader, {
     allowClear: false,
-    value: [type, ...(appendTypeValue ? appendTypeValue(operand) : [])],
+    value: [Types[type] ? type : '', ...(appendTypeValue ? appendTypeValue(operand) : [])],
     options: Object.values(Types).map(item => {
       const options = typeof item.options === 'function' ? item.options() : item.options;
       return {
@@ -551,31 +566,44 @@ function Operand({
       };
     }),
     onChange: next => {
-      const onTypeChange = Types[next[0]].onTypeChange;
+      // 类型变化，包括主类型和子类型
+      const _Types$next$ = Types[next[0]],
+            onTypeChange = _Types$next$.onTypeChange,
+            stringify = _Types$next$.stringify; // 自定义处理
 
       if (typeof onTypeChange === 'function') {
-        onTypeChange(operand, next, _onChange4);
-      } else {
-        if (next[0] !== type) {
-          _onChange4({
-            type: next[0],
-            value: null
-          });
+        return onTypeChange(next, _onChange2);
+      } // 主类型变化
+
+
+      if (next[0] !== type) {
+        if (next[0] === 'constant') {
+          return _onChange2(null);
+        } else if (stringify) {
+          return _onChange2(stringify(next));
         }
+
+        return _onChange2({
+          type: next[0],
+          value: null
+        });
       }
     }
-  }), children !== null && children !== void 0 ? children : _react().default.createElement(VariableComponent, _objectSpread(_objectSpread({}, operand), {}, {
-    onChange: op => _onChange4(_objectSpread({}, op))
+  }), _react().default.createElement(OperandContext.Provider, {
+    value: operand
+  }, children !== null && children !== void 0 ? children : _react().default.createElement(Variable, {
+    value: operand.value,
+    onChange: _onChange2
   })));
 }
 
 function Calculation({
   calculator,
-  operands = [],
-  onChange: _onChange5
+  operands = [null],
+  onChange: _onChange3
 }) {
-  const _useTranslation2 = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation2.t;
+  const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
+        t = _useWorkflowTranslati.t;
 
   const compile = (0, _client().useCompile)();
   return _react().default.createElement(VariableTypesContext.Provider, {
@@ -588,18 +616,18 @@ function Calculation({
       `
   }, _react().default.createElement(Operand, {
     value: operands[0],
-    onChange: v => _onChange5({
+    onChange: v => _onChange3({
       calculator,
       operands: [v, operands[1]]
     })
-  }), operands[0] ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_antd().Select, {
+  }), typeof operands[0] !== 'undefined' ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_antd().Select, {
     value: calculator,
-    onChange: v => _onChange5({
+    onChange: v => _onChange3({
       operands,
       calculator: v
     }),
     placeholder: t('Calculator')
-  }, calculatorGroups.map(group => _react().default.createElement(_antd().Select.OptGroup, {
+  }, calculatorGroups.filter(group => Boolean(getGroupCalculators(group.value).length)).map(group => _react().default.createElement(_antd().Select.OptGroup, {
     key: group.value,
     label: compile(group.title)
   }, getGroupCalculators(group.value).map(([value, {
@@ -609,7 +637,7 @@ function Calculation({
     value: value
   }, compile(name)))))), _react().default.createElement(Operand, {
     value: operands[1],
-    onChange: v => _onChange5({
+    onChange: v => _onChange3({
       calculator,
       operands: [operands[0], v]
     })
@@ -618,33 +646,23 @@ function Calculation({
 
 function VariableComponent({
   value,
-  onChange: _onChange6,
+  onChange,
   renderSchemaComponent
 }) {
   const VTypes = _objectSpread(_objectSpread({}, VariableTypes), {}, {
     constant: {
-      title: '{{t("Constant")}}',
-      value: 'constant',
-      options: undefined
+      title: `{{t("Constant", { ns: "${_locale.NAMESPACE}" })}}`,
+      value: 'constant'
     }
   });
 
-  const operand = typeof value === 'string' ? parseStringValue(value, VTypes) : {
-    type: 'constant',
-    value
-  };
+  const _parseValue = parseValue(value, VTypes),
+        type = _parseValue.type;
+
   return _react().default.createElement(VariableTypesContext.Provider, {
     value: VTypes
   }, _react().default.createElement(Operand, {
-    value: operand,
-    onChange: next => {
-      if (next.type !== operand.type && next.type === 'constant') {
-        _onChange6(null);
-      } else {
-        const stringify = VTypes[next.type].stringify;
-
-        _onChange6(stringify(next));
-      }
-    }
-  }, operand.type === 'constant' ? renderSchemaComponent() : null));
+    value: value,
+    onChange: onChange
+  }, type === 'constant' ? renderSchemaComponent() : null));
 }

package/lib/client/components/CollectionFieldset.js

@@ -77,6 +77,8 @@ function _client() {
 
 var _calculators = require("../calculators");
 
+var _locale = require("../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -167,16 +169,12 @@ var _default = (0, _react2().observer)(({
 
     const VTypes = _objectSpread(_objectSpread({}, ['linkTo', 'hasMany', 'belongsToMany'].includes(field.type) ? {} : _calculators.VariableTypes), {}, {
       constant: {
-        title: '{{t("Constant")}}',
-        value: 'constant',
-        options: undefined
+        title: `{{t("Constant", { ns: "${_locale.NAMESPACE}" })}}`,
+        value: 'constant'
       }
     });
 
-    const operand = typeof value[field.name] === 'string' ? (0, _calculators.parseStringValue)(value[field.name], VTypes) : {
-      type: 'constant',
-      value: value[field.name]
-    }; // constant for associations to use Input, others to use CollectionField
+    const operand = (0, _calculators.parseValue)(value[field.name], VTypes); // constant for associations to use Input, others to use CollectionField
     // dynamic values only support belongsTo/hasOne association, other association type should disable
     // TODO: try to use <ObjectField> to replace this map
 
@@ -192,19 +190,11 @@ var _default = (0, _react2().observer)(({
     }, _react().default.createElement(_calculators.VariableTypesContext.Provider, {
       value: VTypes
     }, _react().default.createElement(_calculators.Operand, {
-      value: operand,
+      value: value[field.name],
       onChange: next => {
-        if (next.type !== operand.type && next.type === 'constant') {
-          _onChange(_objectSpread(_objectSpread({}, value), {}, {
-            [field.name]: null
-          }));
-        } else {
-          const stringify = VTypes[next.type].stringify;
-
-          _onChange(_objectSpread(_objectSpread({}, value), {}, {
-            [field.name]: stringify(next)
-          }));
-        }
+        _onChange(_objectSpread(_objectSpread({}, value), {}, {
+          [field.name]: next
+        }));
       }
     }, operand.type === 'constant' ? _react().default.createElement(_client().SchemaComponent, {
       schema: {
@@ -251,7 +241,7 @@ var _default = (0, _react2().observer)(({
     }))
   }, _react().default.createElement(_antd().Button, {
     icon: _react().default.createElement(_icons().PlusOutlined, null)
-  }, t('Add field'))) : null) : _react().default.createElement("p", null, t('Please select collection first')));
+  }, t('Add field'))) : null) : _react().default.createElement("p", null, (0, _locale.lang)('Please select collection first')));
 });
 
 exports.default = _default;

package/lib/client/components/Duration.js

@@ -25,16 +25,6 @@ function _antd() {
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 function _css() {
   const data = require("@emotion/css");
 
@@ -45,6 +35,8 @@ function _css() {
   return data;
 }
 
+var _locale = require("../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const UnitOptions = [{
@@ -72,9 +64,6 @@ function _default({
   value = 60000,
   onChange: _onChange
 }) {
-  const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
   const option = getNumberOption(value);
   const quantity = Math.round(value / option.value);
   return _react().default.createElement("fieldset", {
@@ -92,5 +81,5 @@ function _default({
   }, UnitOptions.map(item => _react().default.createElement(_antd().Select.Option, {
     key: item.value,
     value: item.value
-  }, t(item.label)))));
+  }, (0, _locale.lang)(item.label)))));
 }

package/lib/client/components/EjsTextArea.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function (props: any): JSX.Element;