@nocobase/plugin-workflow 0.11.1-alpha.3 → 0.11.1-alpha.5

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

@@ -1,4 +1,3 @@
 import React from 'react';
-export declare function useCollectionUIFields(collection: any): import("@nocobase/client").CollectionFieldOptions[];
 declare const CollectionFieldSet: React.MemoExoticComponent<import("@formily/react").ReactFC<Omit<any, "ref">>>;
 export default CollectionFieldSet;

package/lib/client/components/CollectionFieldset.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-exports.useCollectionUIFields = useCollectionUIFields;
 function _icons() {
   const data = require("@ant-design/icons");
   _icons = function _icons() {
@@ -79,11 +78,6 @@ function AssociationInput(props) {
     onChange: onChange
   }));
 }
-function useCollectionUIFields(collection) {
-  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
-    getCollectionFields = _useCollectionManager2.getCollectionFields;
-  return getCollectionFields(collection).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false));
-}
 // NOTE: observer for watching useProps
 const CollectionFieldSet = (0, _react().observer)(({
   value,
@@ -97,12 +91,13 @@ const CollectionFieldSet = (0, _react().observer)(({
     t = _useTranslation.t;
   const compile = (0, _client().useCompile)();
   const form = (0, _react().useForm)();
-  const _useCollectionManager3 = (0, _client().useCollectionManager)(),
-    getCollection = _useCollectionManager3.getCollection;
+  const _useCollectionManager2 = (0, _client().useCollectionManager)(),
+    getCollection = _useCollectionManager2.getCollection,
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
   const scope = (0, _variable.useWorkflowVariableOptions)();
   const config = form.values;
   const collectionName = config === null || config === void 0 ? void 0 : config.collection;
-  const collectionFields = useCollectionUIFields(collectionName);
+  const collectionFields = getCollectionFields(collectionName);
   const fields = filter ? collectionFields.filter(filter.bind(config)) : collectionFields;
   const unassignedFields = (0, _react2().useMemo)(() => fields.filter(field => !value || !(field.name in value)), [fields, value]);
   const mergedDisabled = disabled || form.disabled;

package/lib/client/nodes/update.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 function _react() {
-  const data = _interopRequireDefault(require("react"));
+  const data = require("@formily/react");
   _react = function _react() {
     return data;
   };
   return data;
 }
 function _react2() {
-  const data = require("@formily/react");
+  const data = _interopRequireDefault(require("react"));
   _react2 = function _react2() {
     return data;
   };
@@ -25,15 +25,13 @@ function _client() {
   };
   return data;
 }
+var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
 var _FilterDynamicComponent = require("../components/FilterDynamicComponent");
-var _CollectionFieldset = _interopRequireWildcard(require("../components/CollectionFieldset"));
-var _utils = require("../utils");
+var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _locale = require("../locale");
 var _collection = require("../schemas/collection");
-var _RadioWithTooltip = require("../components/RadioWithTooltip");
+var _utils = require("../utils");
 const _excluded = ["onChange"];
-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 _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; }
@@ -45,10 +43,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 function IndividualHooksRadioWithTooltip(_ref) {
   let onChange = _ref.onChange,
     props = _objectWithoutProperties(_ref, _excluded);
-  const form = (0, _react2().useForm)();
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+    getCollectionFields = _useCollectionManager.getCollectionFields;
+  const form = (0, _react().useForm)();
   const collection = form.values.collection;
-  const fields = (0, _CollectionFieldset.useCollectionUIFields)(collection);
-  const field = (0, _react2().useField)();
+  const fields = getCollectionFields(collection);
+  const field = (0, _react().useField)();
   function onValueChange({
     target
   }) {
@@ -65,7 +65,7 @@ function IndividualHooksRadioWithTooltip(_ref) {
     form.setValuesIn('params.values', filteredValues);
     onChange(target.value);
   }
-  return _react().default.createElement(_RadioWithTooltip.RadioWithTooltip, _objectSpread(_objectSpread({}, props), {}, {
+  return _react2().default.createElement(_RadioWithTooltip.RadioWithTooltip, _objectSpread(_objectSpread({}, props), {}, {
     onChange: onValueChange
   }));
 }

package/lib/server/instructions/condition.js

@@ -25,10 +25,10 @@ const calculators = new (_utils().Registry)();
 // built-in functions
 exports.calculators = calculators;
 function equal(a, b) {
-  return a === b;
+  return a == b;
 }
 function notEqual(a, b) {
-  return a !== b;
+  return a != b;
 }
 function gt(a, b) {
   return a > b;
@@ -48,8 +48,8 @@ calculators.register('gt', gt);
 calculators.register('gte', gte);
 calculators.register('lt', lt);
 calculators.register('lte', lte);
-calculators.register('===', equal);
-calculators.register('!==', notEqual);
+calculators.register('==', equal);
+calculators.register('!=', notEqual);
 calculators.register('>', gt);
 calculators.register('>=', gte);
 calculators.register('<', lt);

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.11.1-alpha.3",
+  "version": "0.11.1-alpha.5",
   "license": "AGPL-3.0",
   "main": "./lib/server/index.js",
   "files": [
@@ -27,9 +27,9 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.1.4",
-    "@formily/antd-v5": "1.1.0-beta.4",
-    "@formily/core": "2.2.26",
-    "@formily/react": "2.2.26",
+    "@formily/antd-v5": "^1.1.0",
+    "@formily/core": "^2.2.27",
+    "@formily/react": "^2.2.27",
     "@nocobase/actions": "0.11.0-alpha.1",
     "@nocobase/client": "0.11.0-alpha.1",
     "@nocobase/database": "0.11.0-alpha.1",
@@ -48,8 +48,8 @@
     "winston": "^3.8.2"
   },
   "devDependencies": {
-    "@nocobase/test": "0.11.1-alpha.3",
+    "@nocobase/test": "0.11.1-alpha.5",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "5ed3bd7d5b16bd38d268961b34875d5cd45799ef"
+  "gitHead": "1dcfd15a7d95a40b0a2f60e1de19ec574066fb20"
 }

package/src/client/components/CollectionFieldset.tsx

@@ -32,14 +32,6 @@ function AssociationInput(props) {
   return <Input {...props} value={value} onChange={onChange} />;
 }
 
-export function useCollectionUIFields(collection) {
-  const { getCollectionFields } = useCollectionManager();
-
-  return getCollectionFields(collection).filter(
-    (field) => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false),
-  );
-}
-
 // NOTE: observer for watching useProps
 const CollectionFieldSet = observer(
   ({ value, disabled, onChange, filter }: any) => {
@@ -47,11 +39,11 @@ const CollectionFieldSet = observer(
     const { t } = useTranslation();
     const compile = useCompile();
     const form = useForm();
-    const { getCollection } = useCollectionManager();
+    const { getCollection, getCollectionFields } = useCollectionManager();
     const scope = useWorkflowVariableOptions();
     const { values: config } = form;
     const collectionName = config?.collection;
-    const collectionFields = useCollectionUIFields(collectionName);
+    const collectionFields = getCollectionFields(collectionName);
     const fields = filter ? collectionFields.filter(filter.bind(config)) : collectionFields;
 
     const unassignedFields = useMemo(() => fields.filter((field) => !value || !(field.name in value)), [fields, value]);

package/src/client/nodes/update.tsx

@@ -1,20 +1,21 @@
+import { useField, useForm } from '@formily/react';
 import React from 'react';
-import { useForm, useField } from '@formily/react';
 
-import { useCollectionDataSource } from '@nocobase/client';
+import { useCollectionDataSource, useCollectionManager } from '@nocobase/client';
 
+import CollectionFieldset from '../components/CollectionFieldset';
 import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
-import CollectionFieldset, { useCollectionUIFields } from '../components/CollectionFieldset';
 
-import { isValidFilter } from '../utils';
+import { RadioWithTooltip } from '../components/RadioWithTooltip';
 import { NAMESPACE, lang } from '../locale';
 import { collection, filter, values } from '../schemas/collection';
-import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { isValidFilter } from '../utils';
 
 function IndividualHooksRadioWithTooltip({ onChange, ...props }) {
+  const { getCollectionFields } = useCollectionManager();
   const form = useForm();
   const { collection } = form.values;
-  const fields = useCollectionUIFields(collection);
+  const fields = getCollectionFields(collection);
   const field = useField<any>();
 
   function onValueChange({ target }) {

package/src/server/__tests__/instructions/condition.test.ts

@@ -1,7 +1,7 @@
-import { Application } from '@nocobase/server';
 import Database from '@nocobase/database';
+import { Application } from '@nocobase/server';
 import { getApp, sleep } from '..';
-import { EXECUTION_STATUS, BRANCH_INDEX } from '../../constants';
+import { BRANCH_INDEX, EXECUTION_STATUS } from '../../constants';
 
 describe('workflow > instructions > condition', () => {
   let app: Application;
@@ -243,51 +243,150 @@ describe('workflow > instructions > condition', () => {
   });
 
   describe('engines', () => {
-    it('default as basic', async () => {
-      const n1 = await workflow.createNode({
-        title: 'condition',
-        type: 'condition',
-        config: {
-          calculation: {
-            calculator: 'equal',
-            operands: [1, '{{$context.data.read}}'],
+    describe('basic', () => {
+      it('default as basic', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            calculation: {
+              calculator: 'equal',
+              operands: [1, '{{$context.data.read}}'],
+            },
           },
-        },
+        });
+
+        const post = await PostRepo.create({ values: { read: 1 } });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
       });
 
-      const post = await PostRepo.create({ values: { read: 1 } });
+      it('equal: 0 != null', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [0, '{{$context.data.title}}'],
+            },
+            rejectOnFalse: false,
+          },
+        });
+
+        const post = await PostRepo.create({ values: {} });
 
-      await sleep(500);
+        await sleep(500);
 
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
 
-      const [job] = await execution.getJobs();
-      expect(job.result).toEqual(true);
-    });
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(false);
+      });
 
-    it('basic engine', async () => {
-      const n1 = await workflow.createNode({
-        title: 'condition',
-        type: 'condition',
-        config: {
-          engine: 'basic',
-          calculation: {
-            calculator: 'equal',
-            operands: [1, '{{$context.data.read}}'],
+      it('equal: 0 == false', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [false, '{{$context.data.read}}'],
+            },
           },
-        },
+        });
+
+        const post = await PostRepo.create({ values: {} });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
       });
 
-      const post = await PostRepo.create({ values: { read: 1 } });
+      it('equal: number == number', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: [1, '{{$context.data.read}}'],
+            },
+          },
+        });
 
-      await sleep(500);
+        const post = await PostRepo.create({ values: { read: 1 } });
 
-      const [execution] = await workflow.getExecutions();
-      expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+        await sleep(500);
 
-      const [job] = await execution.getJobs();
-      expect(job.result).toEqual(true);
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
+
+      it('equal: string == number', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: ['1', '{{$context.data.read}}'],
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: { read: 1 } });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
+
+      it('equal: undefined == null', async () => {
+        const n1 = await workflow.createNode({
+          title: 'condition',
+          type: 'condition',
+          config: {
+            engine: 'basic',
+            calculation: {
+              calculator: 'equal',
+              operands: ['{{$context.data.category.id}}', null],
+            },
+          },
+        });
+
+        const post = await PostRepo.create({ values: {} });
+
+        await sleep(500);
+
+        const [execution] = await workflow.getExecutions();
+        expect(execution.status).toEqual(EXECUTION_STATUS.RESOLVED);
+
+        const [job] = await execution.getJobs();
+        expect(job.result).toEqual(true);
+      });
     });
 
     it('math.js', async () => {

package/src/server/instructions/condition.ts

@@ -11,11 +11,11 @@ export const calculators = new Registry<Comparer>();
 
 // built-in functions
 function equal(a, b) {
-  return a === b;
+  return a == b;
 }
 
 function notEqual(a, b) {
-  return a !== b;
+  return a != b;
 }
 
 function gt(a, b) {
@@ -41,8 +41,8 @@ calculators.register('gte', gte);
 calculators.register('lt', lt);
 calculators.register('lte', lte);
 
-calculators.register('===', equal);
-calculators.register('!==', notEqual);
+calculators.register('==', equal);
+calculators.register('!=', notEqual);
 calculators.register('>', gt);
 calculators.register('>=', gte);
 calculators.register('<', lt);