@nocobase/plugin-workflow 0.10.1-alpha.1 → 0.11.1-alpha.1

package/lib/client/nodes/aggregate.d.ts

@@ -67,7 +67,7 @@ declare const _default: {
                                     title: string;
                                     'x-component-props': {
                                         className: string;
-                                        dropdownMatchSelectWidth: boolean;
+                                        popupMatchSelectWidth: boolean;
                                     };
                                     'x-reactions': any[];
                                     type: string;
@@ -171,7 +171,7 @@ declare const _default: {
     components: {
         SchemaComponentContext: React.Context<import("@nocobase/client").ISchemaComponentContext>;
         FilterDynamicComponent: typeof FilterDynamicComponent;
-        FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+        FieldsSelect: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;
         ValueBlock: (() => JSX.Element) & {
             Initializer: (props: any) => JSX.Element;
             Result: (props: any) => JSX.Element;
@@ -181,8 +181,13 @@ declare const _default: {
     useVariables({ id, title }: {
         id: any;
         title: any;
-    }, { types }: {
+    }, { types, fieldNames }: {
         types: any;
+        fieldNames?: {
+            readonly label: "label";
+            readonly value: "value";
+            readonly children: "children";
+        };
     }): {
         value: string;
         label: any;

package/lib/client/nodes/aggregate.js

@@ -84,7 +84,7 @@ function AssociatedConfig(_ref) {
     p = [...matched[1].trim().split('.').slice(0, -1), fieldName];
   }
   const onSelectChange = (0, _react().useCallback)((path, option) => {
-    if (!(path === null || path === void 0 ? void 0 : path.length)) {
+    if (!(path !== null && path !== void 0 && path.length)) {
       setValuesIn('collection', null);
       onChange({});
       return;
@@ -325,14 +325,15 @@ var _default = {
     id,
     title
   }, {
-    types
+    types,
+    fieldNames = _variable.defaultFieldNames
   }) {
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
     return {
-      value: `${id}`,
-      label: title
+      [fieldNames.value]: `${id}`,
+      [fieldNames.label]: title
     };
   },
   useInitializers(node) {

package/lib/client/nodes/calculation.d.ts

@@ -18,7 +18,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                options: any[];
+                options: any;
             };
             required: boolean;
             default: string;
@@ -95,9 +95,11 @@ declare const _default: {
     useVariables({ id, title }: {
         id: any;
         title: any;
-    }, options: any): {
-        value: any;
-        label: any;
+    }, { types, fieldNames }: {
+        types: any;
+        fieldNames?: import("@nocobase/client").FieldNames;
+    }): {
+        [x: string]: any;
     };
     useInitializers(node: any): SchemaInitializerItemOptions;
 };

package/lib/client/nodes/calculation.js

@@ -4,16 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
-function _antd() {
-  const data = require("@formily/antd");
-  _antd = function _antd() {
+function _antdV() {
+  const data = require("@formily/antd-v5");
+  _antdV = function _antdV() {
     return data;
   };
   return data;
@@ -39,9 +32,9 @@ function _client3() {
   };
   return data;
 }
-function _antd2() {
+function _antd() {
   const data = require("antd");
-  _antd2 = function _antd2() {
+  _antd = function _antd() {
     return data;
   };
   return data;
@@ -62,10 +55,10 @@ function _reactI18next() {
 }
 var _FlowContext = require("../FlowContext");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
+var _ValueBlock = require("../components/ValueBlock");
 var _renderEngineReference = require("../components/renderEngineReference");
 var _locale = require("../locale");
 var _variable = require("../variable");
-var _ValueBlock = require("../components/ValueBlock");
 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; }
 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; }
@@ -98,27 +91,27 @@ const DynamicConfig = ({
       getCollection
     })]
   });
-  return _react().default.createElement(_antd().FormLayout, {
+  return _react().default.createElement(_antdV().FormLayout, {
     layout: "vertical"
-  }, _react().default.createElement(_antd().FormItem, {
+  }, _react().default.createElement(_antdV().FormItem, {
     colon: true,
     label: t('Expression type', {
       ns: _locale.NAMESPACE
     })
-  }, _react().default.createElement(_antd2().Radio.Group, {
-    value: value === false ? false : value || null,
+  }, _react().default.createElement(_antd().Radio.Group, {
+    value: value === false ? false : value || '',
     onChange: ev => {
       _onChange(ev.target.value);
     }
-  }, _react().default.createElement(_antd2().Radio, {
+  }, _react().default.createElement(_antd().Radio, {
     value: false
   }, t('Static', {
     ns: _locale.NAMESPACE
-  })), _react().default.createElement(_antd2().Radio, {
-    value: value || null
+  })), _react().default.createElement(_antd().Radio, {
+    value: value || ''
   }, t('Dynamic', {
     ns: _locale.NAMESPACE
-  })))), value !== false ? _react().default.createElement(_antd().FormItem, {
+  })))), value !== false ? _react().default.createElement(_antdV().FormItem, {
     label: t('Select dynamic expression', {
       ns: _locale.NAMESPACE
     }),
@@ -126,7 +119,7 @@ const DynamicConfig = ({
       ns: _locale.NAMESPACE
     })
   }, _react().default.createElement(_client().Variable.Input, {
-    value: value || null,
+    value: value || '',
     onChange: v => _onChange(v),
     scope: scope
   })) : null);
@@ -262,7 +255,7 @@ var _default = {
         }), {})
       });
       return _react().default.createElement("pre", {
-        className: (0, _css().css)`
+        className: (0, _client().css)`
             margin: 0;
           `
       }, JSON.stringify(result, null, 2));
@@ -273,15 +266,16 @@ var _default = {
   useVariables({
     id,
     title
-  }, options) {
-    const _ref = options !== null && options !== void 0 ? options : {},
-      types = _ref.types;
+  }, {
+    types,
+    fieldNames = _client().defaultFieldNames
+  }) {
     if (types && !types.some(type => type in _variable.BaseTypeSets || Object.values(_variable.BaseTypeSets).some(set => set.has(type)))) {
       return null;
     }
     return {
-      value: id,
-      label: title
+      [fieldNames.value]: `${id}`,
+      [fieldNames.label]: title
     };
   },
   useInitializers(node) {

package/lib/client/nodes/condition.d.ts

@@ -1,13 +1,7 @@
-import { Registry } from '@nocobase/utils/client';
 import React from 'react';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
 import { useWorkflowVariableOptions } from '../variable';
-interface Calculator {
-    name: string;
-    type: 'boolean' | 'number' | 'string' | 'date' | 'unknown' | 'null' | 'array';
-    group: string;
-}
-export declare const calculators: Registry<Calculator>;
+export declare const calculators: any;
 declare function CalculationConfig({ value, onChange }: {
     value: any;
     onChange: any;
@@ -37,9 +31,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                options: [string, import("@nocobase/evaluators/client").Evaluator] | (string | {
-                    label: string;
-                })[];
+                options: unknown;
             };
             required: boolean;
             default: string;

package/lib/client/nodes/condition.js

@@ -11,13 +11,6 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -62,11 +55,11 @@ function _reactI18next() {
 }
 var _ = require(".");
 var _Branch = require("../Branch");
-var _FlowContext = require("../FlowContext");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _renderEngineReference = require("../components/renderEngineReference");
+var _FlowContext = require("../FlowContext");
 var _locale = require("../locale");
-var _style = require("../style");
+var _style = _interopRequireDefault(require("../style"));
 var _variable = require("../variable");
 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; }
@@ -190,7 +183,7 @@ function Calculation({
   const compile = (0, _client().useCompile)();
   const options = (0, _variable.useWorkflowVariableOptions)();
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         gap: 0.5em;
         align-items: center;
@@ -211,7 +204,7 @@ function Calculation({
       calculator: v
     }),
     placeholder: (0, _locale.lang)('Calculator'),
-    dropdownMatchSelectWidth: false
+    popupMatchSelectWidth: false
   }, calculatorGroups.filter(group => Boolean(getGroupCalculators(group.value).length)).map(group => _react().default.createElement(_antd().Select.OptGroup, {
     key: group.value,
     label: compile(group.title)
@@ -242,7 +235,7 @@ function CalculationItem({
     _value$operands = value.operands,
     operands = _value$operands === void 0 ? [] : _value$operands;
   return _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         position: relative;
         margin: 0.5em 0;
@@ -304,7 +297,7 @@ function CalculationGroup({
     }));
   }
   return _react().default.createElement("div", {
-    className: (0, _css().cx)('node-type-condition-group', (0, _css().css)`
+    className: (0, _client().cx)('node-type-condition-group', (0, _client().css)`
           position: relative;
           width: 100%;
           .node-type-condition-group {
@@ -317,7 +310,7 @@ function CalculationGroup({
           }
         `)
   }, _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           display: flex;
           align-items: center;
           gap: 0.5em;
@@ -343,7 +336,7 @@ function CalculationGroup({
     onChange: onItemChange.bind(this, i),
     onRemove: () => _onRemove(i)
   }))), _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           button {
             padding: 0;
             &:not(:last-child) {
@@ -482,6 +475,8 @@ var _default = {
       t = _useTranslation2.t;
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
       nodes = _useFlowContext.nodes;
+    const _useStyles = (0, _style.default)(),
+      styles = _useStyles.styles;
     const id = data.id,
       rejectOnFalse = data.config.rejectOnFalse;
     const trueEntry = nodes.find(item => item.upstreamId === id && item.branchIndex === 1);
@@ -489,9 +484,9 @@ var _default = {
     return _react().default.createElement(_.NodeDefaultView, {
       data: data
     }, rejectOnFalse ? null : _react().default.createElement("div", {
-      className: (0, _css().cx)(_style.nodeSubtreeClass)
+      className: (0, _client().cx)(styles.nodeSubtreeClass)
     }, _react().default.createElement("div", {
-      className: (0, _css().cx)(_style.branchBlockClass, (0, _css().css)`
+      className: (0, _client().cx)(styles.branchBlockClass, (0, _client().css)`
                   > * > .workflow-branch-lines {
                     > button {
                       display: none;
@@ -507,28 +502,15 @@ var _default = {
       entry: trueEntry,
       branchIndex: 1
     })), _react().default.createElement("div", {
-      className: (0, _css().css)`
-                position: relative;
-                height: 2em;
-                overflow: visible;
-
-                > span {
-                  position: absolute;
-                  top: calc(1.5em - 1px);
-                  line-height: 1em;
-                  color: #999;
-                  background-color: #f0f2f5;
-                  padding: 1px;
-                }
-              `
+      className: styles.conditionClass
     }, _react().default.createElement("span", {
-      className: (0, _css().css)`
-                  right: 4em;
-                `
+      style: {
+        right: '4em'
+      }
     }, t('No')), _react().default.createElement("span", {
-      className: (0, _css().css)`
-                  left: 4em;
-                `
+      style: {
+        left: '4em'
+      }
     }, t('Yes')))));
   },
   scope: {

package/lib/client/nodes/create.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SchemaInitializerItemOptions, useCollectionDataSource } from '@nocobase/client';
 declare const _default: {
     title: string;
@@ -13,7 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                dropdownMatchSelectWidth: boolean;
+                popupMatchSelectWidth: boolean;
             };
         };
         params: {
@@ -37,9 +38,8 @@ declare const _default: {
                     'x-decorator': string;
                     'x-component': string;
                     'x-component-props': {
-                        mode: string;
-                        placeholder: string;
-                        filter(field: any): boolean;
+                        useCollection(): any;
+                        className: string;
                     };
                     'x-reactions': {
                         dependencies: string[];
@@ -58,8 +58,7 @@ declare const _default: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
-        CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
-        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
+        CollectionFieldset: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     };
     useVariables({ id, title, config }: {
         id: any;

package/lib/client/nodes/create.js

@@ -16,7 +16,6 @@ var _CollectionFieldset = _interopRequireDefault(require("../components/Collecti
 var _locale = require("../locale");
 var _CollectionBlockInitializer = require("../components/CollectionBlockInitializer");
 var _variable = require("../variable");
-var _FieldsSelect = require("../components/FieldsSelect");
 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; }
 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; }
@@ -59,8 +58,7 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    CollectionFieldset: _CollectionFieldset.default,
-    FieldsSelect: _FieldsSelect.FieldsSelect
+    CollectionFieldset: _CollectionFieldset.default
   },
   useVariables({
     id,

package/lib/client/nodes/destroy.d.ts

@@ -14,7 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
-                dropdownMatchSelectWidth: boolean;
+                popupMatchSelectWidth: boolean;
             };
         };
         params: {

package/lib/client/nodes/index.d.ts

@@ -1,7 +1,6 @@
-import React from 'react';
 import { ISchema } from '@formily/react';
-import { Registry } from '@nocobase/utils/client';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
+import React from 'react';
 import { VariableOption, VariableOptions } from '../variable';
 export interface Instruction {
     title: string;
@@ -32,7 +31,7 @@ export interface Instruction {
         [key: string]: any;
     };
 }
-export declare const instructions: Registry<Instruction>;
+export declare const instructions: any;
 export declare const NodeContext: React.Context<any>;
 export declare function useNodeContext(): any;
 export declare function useAvailableUpstreams(node: any): any[];