@nocobase/plugin-workflow 0.10.0-alpha.3 → 0.10.0-alpha.4

package/lib/client/WorkflowCanvas.js

@@ -129,8 +129,8 @@ function WorkflowCanvas() {
       title = _ref2.title;
     setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${(0, _locale.lang)('Workflow')}${title ? `: ${title}` : ''}`);
   }, [data === null || data === void 0 ? void 0 : data.data]);
-  if (!(data === null || data === void 0 ? void 0 : data.data) && !loading) {
-    return _react().default.createElement("div", null, (0, _locale.lang)('Load failed'));
+  if (!(data === null || data === void 0 ? void 0 : data.data)) {
+    return _react().default.createElement("div", null, loading ? (0, _locale.lang)('Loading') : (0, _locale.lang)('Load failed'));
   }
   const _ref3 = (_data$data2 = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data2 !== void 0 ? _data$data2 : {},
     _ref3$nodes = _ref3.nodes,

package/lib/client/triggers/index.js

@@ -19,6 +19,13 @@ function _css() {
   };
   return data;
 }
+function _core() {
+  const data = require("@formily/core");
+  _core = function _core() {
+    return data;
+  };
+  return data;
+}
 function _react2() {
   const data = require("@formily/react");
   _react2 = function _react2() {
@@ -193,12 +200,15 @@ const TriggerConfig = () => {
       setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
     }
   }, [workflow]);
+  const form = (0, _react().useMemo)(() => (0, _core().createForm)({
+    values: workflow === null || workflow === void 0 ? void 0 : workflow.config,
+    disabled: workflow === null || workflow === void 0 ? void 0 : workflow.executed
+  }), [workflow]);
   if (!workflow || !workflow.type) {
     return null;
   }
   const title = workflow.title,
     type = workflow.type,
-    config = workflow.config,
     executed = workflow.executed;
   const trigger = triggers.get(type);
   const fieldset = trigger.fieldset,
@@ -262,6 +272,7 @@ const TriggerConfig = () => {
     }
   }, _react().default.createElement(_client2().SchemaComponent, {
     schema: {
+      name: `workflow-trigger-${workflow.id}`,
       type: 'void',
       properties: {
         config: {
@@ -277,14 +288,9 @@ const TriggerConfig = () => {
           type: 'void',
           title: titleText,
           'x-component': 'Action.Drawer',
-          'x-decorator': 'Form',
+          'x-decorator': 'FormV2',
           'x-decorator-props': {
-            disabled: workflow.executed,
-            useValues(options) {
-              return (0, _client2().useRequest)(() => Promise.resolve({
-                data: config
-              }), options);
-            }
+            form
           },
           properties: _objectSpread(_objectSpread({}, executed ? {
             alert: {

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

@@ -174,7 +174,17 @@ const ModeFieldsets = {
         placeholder: `{{t("No limit", { ns: "${_locale.NAMESPACE}" })}}`,
         min: 0
       }
-    }
+    },
+    appends: _objectSpread(_objectSpread({}, _collection.appends), {}, {
+      'x-reactions': [{
+        dependencies: ['mode', 'collection'],
+        fulfill: {
+          state: {
+            visible: `{{$deps[0] === ${_constants.SCHEDULE_MODE.COLLECTION_FIELD} && $deps[1]}}`
+          }
+        }
+      }]
+    })
   }
 };
 const scheduleModeOptions = [{

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

@@ -8,26 +8,6 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {};
         };
-        appends: {
-            'x-reactions': {
-                dependencies: string[];
-                fulfill: {
-                    state: {
-                        visible: string;
-                    };
-                };
-            }[];
-            type: string;
-            title: string;
-            description: string;
-            'x-decorator': string;
-            'x-component': string;
-            'x-component-props': {
-                mode: string;
-                placeholder: string;
-                filter(field: any): boolean;
-            };
-        };
     };
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;

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

@@ -16,13 +16,7 @@ var _constants = require("./constants");
 var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
-var _collection = require("../../schemas/collection");
 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',
@@ -31,17 +25,7 @@ var _default = {
       type: 'void',
       'x-component': 'ScheduleConfig',
       'x-component-props': {}
-    },
-    appends: _objectSpread(_objectSpread({}, _collection.appends), {}, {
-      'x-reactions': [{
-        dependencies: ['mode', 'collection'],
-        fulfill: {
-          state: {
-            visible: `{{$deps[0] === ${_constants.SCHEDULE_MODE.COLLECTION_FIELD} && $deps[1]}}`
-          }
-        }
-      }]
-    })
+    }
   },
   scope: {
     useCollectionDataSource: _client().useCollectionDataSource

package/package.json

@@ -4,19 +4,19 @@
   "displayName.zh-CN": "工作流",
   "description": " a powerful workflow plugin designed to support business process management and automation. .",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.10.0-alpha.3",
+  "version": "0.10.0-alpha.4",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.10.0-alpha.3",
-    "@nocobase/client": "0.10.0-alpha.3",
-    "@nocobase/database": "0.10.0-alpha.3",
-    "@nocobase/evaluators": "0.10.0-alpha.3",
-    "@nocobase/logger": "0.10.0-alpha.3",
-    "@nocobase/resourcer": "0.10.0-alpha.3",
-    "@nocobase/server": "0.10.0-alpha.3",
-    "@nocobase/utils": "0.10.0-alpha.3",
+    "@nocobase/actions": "0.10.0-alpha.4",
+    "@nocobase/client": "0.10.0-alpha.4",
+    "@nocobase/database": "0.10.0-alpha.4",
+    "@nocobase/evaluators": "0.10.0-alpha.4",
+    "@nocobase/logger": "0.10.0-alpha.4",
+    "@nocobase/resourcer": "0.10.0-alpha.4",
+    "@nocobase/server": "0.10.0-alpha.4",
+    "@nocobase/utils": "0.10.0-alpha.4",
     "antd": "^4.24.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -26,9 +26,9 @@
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.10.0-alpha.3",
-    "@nocobase/test": "0.10.0-alpha.3",
+    "@nocobase/plugin-formula-field": "0.10.0-alpha.4",
+    "@nocobase/test": "0.10.0-alpha.4",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "1f0b27fc9ab2398cd41c308a6b01a986e025cd20"
+  "gitHead": "62dacadb2a83d30cb36dda9074f2f3a072a37484"
 }