@nocobase/plugin-workflow 0.10.0-alpha.5 → 0.11.0-alpha.1

package/lib/client/triggers/collection.js

@@ -61,6 +61,14 @@ var _default = {
             value: null
           }
         }
+      }, {
+        target: 'appends',
+        effects: ['onFieldValueChange'],
+        fulfill: {
+          state: {
+            value: []
+          }
+        }
       }]
     }),
     mode: {
@@ -69,7 +77,7 @@ var _default = {
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
-        dropdownMatchSelectWidth: false,
+        popupMatchSelectWidth: false,
         options: collectionModeOptions,
         placeholder: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`
       },
@@ -134,21 +142,27 @@ var _default = {
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
   useVariables(config, options) {
-    var _options$depth, _config$appends;
-    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-      t = _useWorkflowTranslati.t;
+    var _config$appends;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
     const rootFields = [{
       collectionName: config.collection,
       name: 'data',
       type: 'hasOne',
       target: config.collection,
       uiSchema: {
-        title: t('Trigger data')
+        title: (0, _locale.lang)('Trigger data')
       }
     }];
-    const result = (0, _variable.useCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
+    // const depth = config.appends?.length
+    //   ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1
+    //   : 1;
+    const result = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, options), {}, {
       fields: rootFields,
-      depth: (_options$depth = options === null || options === void 0 ? void 0 : options.depth) !== null && _options$depth !== void 0 ? _options$depth : ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? 2 : 1
+      appends: ['data', ...(((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.map(item => `data.${item}`)) || [])],
+      compile,
+      getCollectionFields
     }));
     return result;
   },

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

@@ -1,7 +1,7 @@
-import React from 'react';
 import { ISchema } from '@formily/react';
-import { Registry } from '@nocobase/utils/client';
 import { SchemaInitializerItemOptions } from '@nocobase/client';
+import { Registry } from '@nocobase/utils/client';
+import React from 'react';
 import { VariableOptions } from '../variable';
 export interface Trigger {
     title: string;

package/lib/client/triggers/index.js

@@ -5,16 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.triggers = exports.TriggerConfig = void 0;
 exports.useTrigger = useTrigger;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
@@ -26,46 +19,46 @@ function _core() {
   };
   return data;
 }
-function _react2() {
+function _react() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
+  _react = function _react() {
     return data;
   };
   return data;
 }
 function _client() {
-  const data = require("@nocobase/utils/client");
+  const data = require("@nocobase/client");
   _client = function _client() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _client2() {
-  const data = require("@nocobase/client");
-  _client2 = function _client2() {
+function _react2() {
+  const data = _interopRequireWildcard(require("react"));
+  _react2 = function _react2() {
     return data;
   };
   return data;
 }
-var _style = require("../style");
 var _FlowContext = require("../FlowContext");
+var _locale = require("../locale");
+var _style = require("../style");
 var _collection = _interopRequireDefault(require("./collection"));
 var _schedule = _interopRequireDefault(require("./schedule/"));
-var _locale = require("../locale");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -84,12 +77,12 @@ 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 useUpdateConfigAction() {
   var _useFlowContext;
-  const form = (0, _react2().useForm)();
-  const api = (0, _client2().useAPIClient)();
+  const form = (0, _react().useForm)();
+  const api = (0, _client().useAPIClient)();
   const _ref = (_useFlowContext = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext !== void 0 ? _useFlowContext : {},
     workflow = _ref.workflow;
-  const ctx = (0, _client2().useActionContext)();
-  const _useResourceActionCon = (0, _client2().useResourceActionContext)(),
+  const ctx = (0, _client().useActionContext)();
+  const _useResourceActionCon = (0, _client().useResourceActionContext)(),
     refresh = _useResourceActionCon.refresh;
   return {
     run() {
@@ -112,12 +105,12 @@ function useUpdateConfigAction() {
     }
   };
 }
-const triggers = new (_client().Registry)();
+const triggers = new (_client2().Registry)();
 exports.triggers = triggers;
 triggers.register(_collection.default.type, _collection.default);
 triggers.register(_schedule.default.type, _schedule.default);
 function TriggerExecution() {
-  const compile = (0, _client2().useCompile)();
+  const compile = (0, _client().useCompile)();
   const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
     workflow = _useFlowContext2.workflow,
     execution = _useFlowContext2.execution;
@@ -125,13 +118,13 @@ function TriggerExecution() {
     return null;
   }
   const trigger = triggers.get(workflow.type);
-  return _react().default.createElement(_client2().SchemaComponent, {
+  return _react2().default.createElement(_client().SchemaComponent, {
     schema: {
       type: 'void',
       name: 'execution',
       'x-component': 'Action',
       'x-component-props': {
-        title: _react().default.createElement(_icons().InfoOutlined, null),
+        title: _react2().default.createElement(_icons().InfoOutlined, null),
         shape: 'circle',
         className: _style.nodeJobButtonClass,
         type: 'primary'
@@ -144,9 +137,9 @@ function TriggerExecution() {
             initialValue: execution
           },
           'x-component': 'Action.Modal',
-          title: _react().default.createElement("div", {
-            className: (0, _css().cx)(_style.nodeTitleClass)
-          }, _react().default.createElement(_antd().Tag, null, compile(trigger.title)), _react().default.createElement("strong", null, workflow.title), _react().default.createElement("span", {
+          title: _react2().default.createElement("div", {
+            className: (0, _client().cx)(_style.nodeTitleClass)
+          }, _react2().default.createElement(_antd().Tag, null, compile(trigger.title)), _react2().default.createElement("strong", null, workflow.title), _react2().default.createElement("span", {
             className: "workflow-node-id"
           }, "#", execution.id)),
           properties: {
@@ -166,7 +159,7 @@ function TriggerExecution() {
               'x-decorator': 'FormItem',
               'x-component': 'Input.JSON',
               'x-component-props': {
-                className: (0, _css().css)`
+                className: (0, _client().css)`
                     padding: 1em;
                     background-color: #eee;
                   `
@@ -180,27 +173,28 @@ function TriggerExecution() {
   });
 }
 const TriggerConfig = () => {
-  const api = (0, _client2().useAPIClient)();
-  const compile = (0, _client2().useCompile)();
+  const api = (0, _client().useAPIClient)();
+  const compile = (0, _client().useCompile)();
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
     workflow = _useFlowContext3.workflow,
     refresh = _useFlowContext3.refresh;
-  const _useState = (0, _react().useState)(''),
+  const _useState = (0, _react2().useState)(''),
     _useState2 = _slicedToArray(_useState, 2),
     editingTitle = _useState2[0],
     setEditingTitle = _useState2[1];
-  const _useState3 = (0, _react().useState)(false),
+  const _useState3 = (0, _react2().useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
     editingConfig = _useState4[0],
     setEditingConfig = _useState4[1];
   let typeTitle = '';
-  (0, _react().useEffect)(() => {
+  (0, _react2().useEffect)(() => {
     if (workflow) {
       var _workflow$title;
       setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
     }
   }, [workflow]);
-  const form = (0, _react().useMemo)(() => (0, _core().createForm)({
+  const form = (0, _react2().useMemo)(() => (0, _core().createForm)({
+    initialValues: workflow === null || workflow === void 0 ? void 0 : workflow.config,
     values: workflow === null || workflow === void 0 ? void 0 : workflow.config,
     disabled: workflow === null || workflow === void 0 ? void 0 : workflow.executed
   }), [workflow]);
@@ -253,24 +247,24 @@ const TriggerConfig = () => {
       }
     }
   }
-  return _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeCardClass),
+  return _react2().default.createElement("div", {
+    className: (0, _client().cx)(_style.nodeCardClass),
     onClick: onOpenDrawer
-  }, _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeMetaClass, 'workflow-node-meta')
-  }, _react().default.createElement(_antd().Tag, {
+  }, _react2().default.createElement("div", {
+    className: (0, _client().cx)(_style.nodeMetaClass, 'workflow-node-meta')
+  }, _react2().default.createElement(_antd().Tag, {
     color: "gold"
-  }, titleText)), _react().default.createElement("div", null, _react().default.createElement(_antd().Input.TextArea, {
+  }, titleText)), _react2().default.createElement("div", null, _react2().default.createElement(_antd().Input.TextArea, {
     value: editingTitle,
     onChange: ev => setEditingTitle(ev.target.value),
     onBlur: ev => onChangeTitle(ev.target.value),
     autoSize: true
-  })), _react().default.createElement(TriggerExecution, null), _react().default.createElement(_client2().ActionContextProvider, {
+  })), _react2().default.createElement(TriggerExecution, null), _react2().default.createElement(_client().ActionContextProvider, {
     value: {
       visible: editingConfig,
       setVisible: setEditingConfig
     }
-  }, _react().default.createElement(_client2().SchemaComponent, {
+  }, _react2().default.createElement(_client().SchemaComponent, {
     schema: {
       name: `workflow-trigger-${workflow.id}`,
       type: 'void',
@@ -299,7 +293,7 @@ const TriggerConfig = () => {
                 type: 'warning',
                 showIcon: true,
                 message: `{{t("Trigger in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
-                className: (0, _css().css)`
+                className: (0, _client().css)`
                               width: 100%;
                               font-size: 85%;
                               margin-bottom: 2em;
@@ -311,7 +305,7 @@ const TriggerConfig = () => {
               type: 'void',
               'x-component': 'fieldset',
               'x-component-props': {
-                className: (0, _css().css)`
+                className: (0, _client().css)`
                         .ant-select:not(.full-width) {
                           width: auto;
                           min-width: 6em;

package/lib/client/triggers/schedule/DateFieldsSelect.js

@@ -55,7 +55,7 @@ const DateFieldsSelect = (0, _react().observer)(props => {
     values = _useForm.values;
   const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
   return _react2().default.createElement(_antd().Select, _objectSpread({
-    dropdownMatchSelectWidth: false,
+    popupMatchSelectWidth: false,
     placeholder: t('Select field')
   }, props), fields.filter(field => !field.hidden && (field.uiSchema ? field.type === 'date' : false)).map(field => {
     var _field$uiSchema;

package/lib/client/triggers/schedule/EndsByField.js

@@ -4,23 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EndsByField = EndsByField;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
 }
-function _moment() {
-  const data = _interopRequireDefault(require("moment"));
-  _moment = function _moment() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
@@ -43,7 +43,7 @@ function EndsByField({
     t = _useWorkflowTranslati.t;
   const type = value != null ? typeof value === 'object' && !(value instanceof Date) ? 'field' : 'date' : null;
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         gap: 0.5em;
       `
@@ -63,7 +63,7 @@ function EndsByField({
     onChange: _onChange
   }) : null, type === 'date' ? _react().default.createElement(_antd().DatePicker, {
     showTime: true,
-    value: (0, _moment().default)(value),
+    value: (0, _client2().dayjs)(value),
     onChange: v => {
       _onChange(v ? v.toDate() : null);
     }

package/lib/client/triggers/schedule/OnField.js

@@ -4,23 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OnField = OnField;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
@@ -32,8 +32,8 @@ function _reactI18next() {
   };
   return data;
 }
-var _DateFieldsSelect = require("./DateFieldsSelect");
 var _locale = require("../../locale");
+var _DateFieldsSelect = require("./DateFieldsSelect");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -60,7 +60,7 @@ function OnField({
     dir = _useState2[0],
     setDir = _useState2[1];
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         gap: 0.5em;
       `

package/lib/client/triggers/schedule/RepeatField.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RepeatField = RepeatField;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -114,7 +114,7 @@ function RepeatField({
   }
   const locale = languages[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
   return _react().default.createElement("fieldset", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         display: flex;
         flex-direction: ${typeValue === 'cron' ? 'column' : 'row'};
         align-items: flex-start;

package/lib/client/triggers/schedule/ScheduleConfig.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ScheduleConfig = void 0;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
 function _core() {
   const data = require("@formily/core");
   _core = function _core() {
@@ -18,33 +11,33 @@ function _core() {
   };
   return data;
 }
-function _react2() {
+function _react() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react2() {
+  const data = _interopRequireWildcard(require("react"));
+  _react2 = function _react2() {
     return data;
   };
   return data;
 }
+var _locale = require("../../locale");
 var _collection = require("../../schemas/collection");
-var _OnField = require("./OnField");
+var _constants = require("./constants");
 var _EndsByField = require("./EndsByField");
+var _OnField = require("./OnField");
 var _RepeatField = require("./RepeatField");
-var _constants = require("./constants");
-var _locale = require("../../locale");
 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); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -195,15 +188,15 @@ const scheduleModeOptions = [{
   label: `{{t("Based on date field of collection", { ns: "${_locale.NAMESPACE}" })}}`
 }];
 const ScheduleConfig = () => {
-  const _useForm = (0, _react2().useForm)(),
+  const _useForm = (0, _react().useForm)(),
     _useForm$values = _useForm.values,
     values = _useForm$values === void 0 ? {} : _useForm$values,
     clearFormGraph = _useForm.clearFormGraph;
-  const _useState = (0, _react().useState)(values.mode),
+  const _useState = (0, _react2().useState)(values.mode),
     _useState2 = _slicedToArray(_useState, 2),
     mode = _useState2[0],
     setMode = _useState2[1];
-  (0, _react2().useFormEffects)(() => {
+  (0, _react().useFormEffects)(() => {
     (0, _core().onFieldValueChange)('mode', field => {
       setMode(field.value);
       clearFormGraph('collection');
@@ -213,7 +206,7 @@ const ScheduleConfig = () => {
       clearFormGraph('limit');
     });
   });
-  return _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_client().SchemaComponent, {
+  return _react2().default.createElement(_react2().default.Fragment, null, _react2().default.createElement(_client().SchemaComponent, {
     schema: {
       type: 'number',
       title: `{{t("Trigger mode", { ns: "${_locale.NAMESPACE}" })}}`,
@@ -226,7 +219,7 @@ const ScheduleConfig = () => {
       required: true,
       default: _constants.SCHEDULE_MODE.STATIC
     }
-  }), _react().default.createElement(_client().SchemaComponent, {
+  }), _react2().default.createElement(_client().SchemaComponent, {
     schema: {
       type: 'void',
       properties: {
@@ -234,7 +227,7 @@ const ScheduleConfig = () => {
           type: 'void',
           'x-component': 'fieldset',
           'x-component-props': {
-            className: (0, _css().css)`
+            className: (0, _client().css)`
                   .ant-input-number {
                     width: 4em;
                   }

package/lib/client/triggers/schedule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { useCollectionDataSource, SchemaInitializerItemOptions } from '@nocobase/client';
 declare const _default: {
     title: string;
@@ -14,11 +15,9 @@ declare const _default: {
     };
     components: {
         ScheduleConfig: () => import("react").JSX.Element;
-        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Pick<any, string | number | symbol>>>;
+        FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
     };
-    useVariables(config: any, { types }: {
-        types: any;
-    }): any[];
+    useVariables(config: any, opts: any): any[];
     useInitializers(config: any): SchemaInitializerItemOptions | null;
     initializers: {};
 };

package/lib/client/triggers/schedule/index.js

@@ -17,6 +17,11 @@ var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
 var _FieldsSelect = require("../../components/FieldsSelect");
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var _default = {
   title: `{{t("Schedule event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'schedule',
@@ -34,28 +39,33 @@ var _default = {
     ScheduleConfig: _ScheduleConfig.ScheduleConfig,
     FieldsSelect: _FieldsSelect.FieldsSelect
   },
-  useVariables(config, {
-    types
-  }) {
-    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-      t = _useWorkflowTranslati.t;
+  useVariables(config, opts) {
+    var _config$appends;
+    const compile = (0, _client().useCompile)();
+    const _useCollectionManager = (0, _client().useCollectionManager)(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
     const options = [];
-    if (!types || types.includes('date')) {
+    if (!(opts !== null && opts !== void 0 && opts.types) || opts.types.includes('date')) {
       options.push({
         key: 'date',
         value: 'date',
-        label: t('Trigger time')
+        label: (0, _locale.lang)('Trigger time')
       });
     }
-    const fieldOptions = (0, _variable.useCollectionFieldOptions)({
-      collection: config.collection
-    });
+    const depth = (_config$appends = config.appends) !== null && _config$appends !== void 0 && _config$appends.length ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1 : 1;
+    const fieldOptions = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({
+      depth
+    }, opts), {}, {
+      collection: config.collection,
+      compile,
+      getCollectionFields
+    }));
     if (config.mode === _constants.SCHEDULE_MODE.COLLECTION_FIELD) {
       if (fieldOptions.length) {
         options.push({
           key: 'data',
           value: 'data',
-          label: t('Trigger data'),
+          label: (0, _locale.lang)('Trigger data'),
           children: fieldOptions
         });
       }

package/lib/client/variable.d.ts

@@ -1,10 +1,10 @@
-export declare type VariableOption = {
+export type VariableOption = {
     key?: string;
     value: string;
     label: string;
     children?: VariableOptions;
 };
-export declare type VariableOptions = VariableOption[] | null;
+export type VariableOptions = VariableOption[] | null;
 export declare const nodesOptions: {
     label: string;
     value: string;
@@ -37,7 +37,6 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function filterTypedFields(fields: any, types: any, depth?: number): any;
 export declare function useWorkflowVariableOptions(options?: {}): {
     label: any;
     value: any;
@@ -45,4 +44,4 @@ export declare function useWorkflowVariableOptions(options?: {}): {
     children: any;
     disabled: boolean;
 }[];
-export declare function useCollectionFieldOptions(options: any): VariableOption[];
+export declare function getCollectionFieldOptions(options: any): VariableOption[];