@nocobase/plugin-workflow-dynamic-calculation 1.0.0-alpha.2 → 1.0.0-alpha.3

package/dist/client/DynamicCalculation.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import React from 'react';
 import { SchemaInitializerItemType } from '@nocobase/client';
 import { Instruction, WorkflowVariableInput } from '@nocobase/plugin-workflow/client';

package/dist/client/DynamicExpression.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import React from 'react';
 export declare const DynamicExpression: React.ForwardRefExoticComponent<Omit<Partial<Omit<{
     children?: React.ReactNode;

package/dist/client/expression.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { CollectionFieldInterface } from '@nocobase/client';
 export declare class ExpressionFieldInterface extends CollectionFieldInterface {
     name: string;

package/dist/client/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { Plugin } from '@nocobase/client';
 export default class extends Plugin {
     afterAdd(): Promise<void>;

package/dist/client/index.js

@@ -1 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 (function(n,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("@nocobase/plugin-workflow/client"),require("react-i18next"),require("@formily/core"),require("@formily/react"),require("antd"),require("react")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","@nocobase/plugin-workflow/client","react-i18next","@formily/core","@formily/react","antd","react"],e):(n=typeof globalThis!="undefined"?globalThis:n||self,e(n["@nocobase/plugin-workflow-dynamic-calculation"]={},n["@nocobase/client"],n.jsxRuntime,n["@nocobase/plugin-workflow"],n["react-i18next"],n["@formily/core"],n["@formily/react"],n.antd,n.react))})(this,function(n,e,o,r,m,y,p,x,u){"use strict";var W=Object.defineProperty,N=Object.defineProperties;var z=Object.getOwnPropertyDescriptors;var V=Object.getOwnPropertySymbols;var L=Object.prototype.hasOwnProperty,U=Object.prototype.propertyIsEnumerable;var F=(n,e,o)=>e in n?W(n,e,{enumerable:!0,configurable:!0,writable:!0,value:o}):n[e]=o,b=(n,e)=>{for(var o in e||(e={}))L.call(e,o)&&F(n,o,e[o]);if(V)for(var o of V(e))U.call(e,o)&&F(n,o,e[o]);return n},I=(n,e)=>N(n,z(e));var i=(n,e,o)=>(F(n,typeof e!="symbol"?e+"":e,o),o);var h=(n,e,o)=>new Promise((r,m)=>{var y=u=>{try{x(o.next(u))}catch(a){m(a)}},p=u=>{try{x(o.throw(u))}catch(a){m(a)}},x=u=>u.done?r(u.value):Promise.resolve(u.value).then(y,p);x((o=o.apply(n,e)).next())});const a="workflow-dynamic-calculation";function k(s,l={}){const{t}=T(l);return t(s)}function T(s){return m.useTranslation(a,s)}function E(s){var t;return["belongsTo","hasOne"].includes(s.type)?((t=this.getCollection(s.collectionName))==null?void 0:t.template)==="expression"?!0:this.getCollectionFields(s.target).some(c=>c.interface==="expression"):!1}function v({value:s,onChange:l}){const{getCollectionFields:t,getCollection:c}=e.useCollectionManager_deprecated(),f=r.useWorkflowVariableOptions({types:[E.bind({getCollectionFields:t,getCollection:c})]});return o.jsx(e.Variable.Input,{value:s,onChange:l,scope:f})}class P extends r.Instruction{constructor(){super(...arguments);i(this,"title",`{{t("Dynamic Calculation", { ns: "${a}" })}}`);i(this,"type","dynamic-calculation");i(this,"group","extended");i(this,"description",`{{t("Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.", { ns: "${a}" })}}`);i(this,"fieldset",{expression:{type:"string",title:`{{t("Calculation expression", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"DynamicExpression",required:!0},scope:{type:"string",title:`{{t("Variable datasource", { ns: "${a}" })}}`,"x-decorator":"FormItem","x-component":"WorkflowVariableInput","x-component-props":{changeOnSelect:!0,variableOptions:{types:[{type:"reference",options:{collection:"*",entity:!0}}]}},"x-reactions":{dependencies:["expression"],fulfill:{state:{visible:"{{$deps[0]}}"}}}}});i(this,"components",{DynamicExpression:v,WorkflowVariableInput:r.WorkflowVariableInput,ValueBlock:r.ValueBlock})}useVariables({key:t,title:c},{types:f,fieldNames:d=r.defaultFieldNames}){return f&&!f.some(g=>g in r.BaseTypeSets||Object.values(r.BaseTypeSets).some(C=>C.has(g)))?null:{[d.value]:t,[d.label]:c}}useInitializers(t){var c;return{name:`#${t.id}`,type:"item",title:(c=t.title)!=null?c:`#${t.id}`,Component:r.ValueBlock.Initializer,node:t,resultTitle:k("Calculation result")}}}const q=p.observer(s=>{const{onChange:l}=s,t=p.useField(),c=p.useForm(),d=[...t.path.segments.slice(0,-1),"sourceCollection"].join("."),[g,C]=u.useState(c.getValuesIn(d)),A=e.useCompile(),{getCollectionFields:B}=e.useCollectionManager_deprecated();p.useFormEffects(()=>{y.onFormInitialValuesChange(w=>{C(w.getValuesIn(d))}),y.onFieldInputValueChange(d,w=>{C(w.value),l(null)})});const _=r.getCollectionFieldOptions({collection:g,compile:A,getCollectionFields:B});return o.jsx(e.Variable.TextArea,I(b({},s),{scope:_}))},{displayName:"InternalExpression"});function M(s){const{t:l}=m.useTranslation(),t=e.useRecord(),c=e.useCompile(),{getCollectionFields:f}=e.useCollectionManager_deprecated(),d=u.useMemo(()=>r.getCollectionFieldOptions({collection:t.sourceCollection,compile:c,getCollectionFields:f}),[t.sourceCollection,t.sourceCollection]);return s.value?o.jsx(e.Variable.TextArea,I(b({},s),{scope:d})):o.jsx(x.Tag,{children:l("Unconfigured",{ns:a})})}const S=p.connect(q,p.mapReadPretty(M)),{defaultProps:j}=e.interfacesProperties;class D extends e.CollectionFieldInterface{constructor(){super(...arguments);i(this,"name","expression");i(this,"type","string");i(this,"group","advanced");i(this,"order",1);i(this,"title",`{{t("Expression", { ns: "${a}" })}}`);i(this,"description",`{{t("Used to store expressions for use in workflows so that different expressions can be called for different data.", { ns: "${a}" })}}`);i(this,"sortable",!0);i(this,"default",{type:"text",uiSchema:{"x-component":"DynamicExpression"}});i(this,"properties",b({},j))}}class O extends e.Plugin{afterAdd(){return h(this,null,function*(){})}beforeLoad(){return h(this,null,function*(){})}load(){return h(this,null,function*(){this.app.dataSourceManager.addFieldInterfaces([D]),this.app.addComponents({DynamicExpression:S});const l=this.app.pm.get("workflow"),t=new P;l.instructions.register(t.type,t)})}}n.default=O,Object.defineProperties(n,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,13 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "1.0.0-alpha.2",
-  "@nocobase/plugin-workflow": "1.0.0-alpha.2",
+  "@nocobase/client": "1.0.0-alpha.3",
+  "@nocobase/plugin-workflow": "1.0.0-alpha.3",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
   "antd": "5.12.8",
   "react-i18next": "11.18.6",
-  "@nocobase/utils": "1.0.0-alpha.2",
-  "@nocobase/evaluators": "1.0.0-alpha.2",
-  "@nocobase/server": "1.0.0-alpha.2",
-  "@nocobase/database": "1.0.0-alpha.2"
+  "@nocobase/utils": "1.0.0-alpha.3",
+  "@nocobase/evaluators": "1.0.0-alpha.3",
+  "@nocobase/server": "1.0.0-alpha.3",
+  "@nocobase/database": "1.0.0-alpha.3"
 };

package/dist/index.d.ts

@@ -1,2 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 export * from './server';
 export { default } from './server';

package/dist/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/locale/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 export declare const NAMESPACE = "workflow-dynamic-calculation";
 export declare function useLang(key: string, options?: {}): string;
 export declare function usePluginTranslation(options: any): import("react-i18next").UseTranslationResponse<"workflow-dynamic-calculation", undefined>;

package/dist/locale/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/server/DynamicCalculation.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { FlowNodeModel, Instruction, Processor } from '@nocobase/plugin-workflow';
 export declare class DynamicCalculation extends Instruction {
     run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<{

package/dist/server/DynamicCalculation.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/Plugin.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { Plugin } from '@nocobase/server';
 export default class extends Plugin {
     load(): Promise<void>;

package/dist/server/Plugin.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/expression-field.d.ts

@@ -1,3 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { BaseFieldOptions, DataTypes, Field } from '@nocobase/database';
 export interface ExpressionFieldOptions extends BaseFieldOptions {
     type: 'expression';

package/dist/server/expression-field.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/server/index.d.ts

@@ -1 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 export { default } from './Plugin';

package/dist/server/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流：动态表达式计算节点",
   "description": "Useful plugin for doing dynamic calculation based on expression collection records in workflow.",
   "description.zh-CN": "用于在工作流中进行基于数据行的动态表达式计算。",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow-dynamic-calculation",
@@ -30,7 +30,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "f89dbc9e67d58404a2e484a5e124f739f340dcf8",
+  "gitHead": "7ccb137c7616cba5d238f87368239640e1d9ace1",
   "keywords": [
     "Workflow",
     "Collections"

package/src/client/DynamicCalculation.tsx

@@ -1,98 +0,0 @@
-import React from 'react';
-
-import { SchemaInitializerItemType, Variable, useCollectionManager_deprecated } from '@nocobase/client';
-import {
-  BaseTypeSets,
-  Instruction,
-  ValueBlock,
-  WorkflowVariableInput,
-  defaultFieldNames,
-  useWorkflowVariableOptions,
-} from '@nocobase/plugin-workflow/client';
-import { NAMESPACE, useLang } from '../locale';
-
-function useDynamicExpressionCollectionFieldMatcher(field): boolean {
-  if (!['belongsTo', 'hasOne'].includes(field.type)) {
-    return false;
-  }
-
-  if (this.getCollection(field.collectionName)?.template === 'expression') {
-    return true;
-  }
-
-  const fields = this.getCollectionFields(field.target);
-  return fields.some((f) => f.interface === 'expression');
-}
-
-function DynamicExpression({ value, onChange }) {
-  const { getCollectionFields, getCollection } = useCollectionManager_deprecated();
-  const scope = useWorkflowVariableOptions({
-    types: [useDynamicExpressionCollectionFieldMatcher.bind({ getCollectionFields, getCollection })],
-  });
-
-  return <Variable.Input value={value} onChange={onChange} scope={scope} />;
-}
-
-export default class extends Instruction {
-  title = `{{t("Dynamic Calculation", { ns: "${NAMESPACE}" })}}`;
-  type = 'dynamic-calculation';
-  group = 'extended';
-  description = `{{t("Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.", { ns: "${NAMESPACE}" })}}`;
-  fieldset = {
-    expression: {
-      type: 'string',
-      title: `{{t("Calculation expression", { ns: "${NAMESPACE}" })}}`,
-      'x-decorator': 'FormItem',
-      'x-component': 'DynamicExpression',
-      required: true,
-    },
-    scope: {
-      type: 'string',
-      title: `{{t("Variable datasource", { ns: "${NAMESPACE}" })}}`,
-      'x-decorator': 'FormItem',
-      'x-component': 'WorkflowVariableInput',
-      'x-component-props': {
-        changeOnSelect: true,
-        variableOptions: {
-          types: [{ type: 'reference', options: { collection: '*', entity: true } }],
-        },
-      },
-      'x-reactions': {
-        dependencies: ['expression'],
-        fulfill: {
-          state: {
-            visible: '{{$deps[0]}}',
-          },
-        },
-      },
-    },
-  };
-  components = {
-    DynamicExpression,
-    WorkflowVariableInput,
-    ValueBlock,
-  };
-  useVariables({ key, title }, { types, fieldNames = defaultFieldNames }) {
-    if (
-      types &&
-      !types.some((type) => type in BaseTypeSets || Object.values(BaseTypeSets).some((set) => set.has(type)))
-    ) {
-      return null;
-    }
-    return {
-      [fieldNames.value]: key,
-      [fieldNames.label]: title,
-    };
-  }
-  useInitializers(node): SchemaInitializerItemType {
-    return {
-      name: `#${node.id}`,
-      type: 'item',
-      title: node.title ?? `#${node.id}`,
-      Component: ValueBlock.Initializer,
-      node,
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      resultTitle: useLang('Calculation result'),
-    };
-  }
-}

package/src/client/DynamicExpression.tsx

@@ -1,57 +0,0 @@
-import { onFieldInputValueChange, onFormInitialValuesChange } from '@formily/core';
-import { connect, mapReadPretty, observer, useField, useForm, useFormEffects } from '@formily/react';
-import { Tag } from 'antd';
-import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useCollectionManager_deprecated, useCompile, useRecord, Variable } from '@nocobase/client';
-import { getCollectionFieldOptions } from '@nocobase/plugin-workflow/client';
-
-import { NAMESPACE } from '../locale';
-
-const InternalExpression = observer(
-  (props: any) => {
-    const { onChange } = props;
-    const field = useField<any>();
-    // TODO(refactor): better to provide another context like useFieldset()
-    const form = useForm();
-    const basePath = field.path.segments.slice(0, -1);
-    const collectionPath = [...basePath, 'sourceCollection'].join('.');
-    const [collection, setCollection] = useState(form.getValuesIn(collectionPath));
-    const compile = useCompile();
-    const { getCollectionFields } = useCollectionManager_deprecated();
-
-    useFormEffects(() => {
-      onFormInitialValuesChange((form) => {
-        setCollection(form.getValuesIn(collectionPath));
-      });
-      onFieldInputValueChange(collectionPath, (f) => {
-        setCollection(f.value);
-        onChange(null);
-      });
-    });
-
-    const options = getCollectionFieldOptions({ collection, compile, getCollectionFields });
-
-    return <Variable.TextArea {...props} scope={options} />;
-  },
-  { displayName: 'InternalExpression' },
-);
-
-function Result(props) {
-  const { t } = useTranslation();
-  const values = useRecord();
-  const compile = useCompile();
-  const { getCollectionFields } = useCollectionManager_deprecated();
-  const options = useMemo(
-    () => getCollectionFieldOptions({ collection: values.sourceCollection, compile, getCollectionFields }),
-    [values.sourceCollection, values.sourceCollection],
-  );
-  return props.value ? (
-    <Variable.TextArea {...props} scope={options} />
-  ) : (
-    <Tag>{t('Unconfigured', { ns: NAMESPACE })}</Tag>
-  );
-}
-
-export const DynamicExpression = connect(InternalExpression, mapReadPretty(Result));

package/src/client/expression.tsx

@@ -1,24 +0,0 @@
-import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
-
-import { NAMESPACE } from '../locale';
-
-const { defaultProps } = interfacesProperties;
-
-export class ExpressionFieldInterface extends CollectionFieldInterface {
-  name = 'expression';
-  type = 'string';
-  group = 'advanced';
-  order = 1;
-  title = `{{t("Expression", { ns: "${NAMESPACE}" })}}`;
-  description = `{{t("Used to store expressions for use in workflows so that different expressions can be called for different data.", { ns: "${NAMESPACE}" })}}`;
-  sortable = true;
-  default = {
-    type: 'text',
-    uiSchema: {
-      'x-component': 'DynamicExpression',
-    },
-  };
-  properties = {
-    ...defaultProps,
-  };
-}

package/src/client/index.ts

@@ -1,25 +0,0 @@
-import { Plugin } from '@nocobase/client';
-import WorkflowPlugin from '@nocobase/plugin-workflow/client';
-
-import DynamicCalculation from './DynamicCalculation';
-import { DynamicExpression } from './DynamicExpression';
-import { ExpressionFieldInterface } from './expression';
-
-export default class extends Plugin {
-  async afterAdd() {
-    // await this.app.pm.add()
-  }
-
-  async beforeLoad() {}
-
-  // You can get and modify the app instance here
-  async load() {
-    this.app.dataSourceManager.addFieldInterfaces([ExpressionFieldInterface]);
-    this.app.addComponents({
-      DynamicExpression,
-    });
-    const workflow = this.app.pm.get('workflow') as WorkflowPlugin;
-    const dynamicCalculation = new DynamicCalculation();
-    workflow.instructions.register(dynamicCalculation.type, dynamicCalculation);
-  }
-}

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './server';
-export { default } from './server';

package/src/locale/en-US.json

@@ -1,11 +0,0 @@
-{
-  "Dynamic Calculation": "Dynamic Calculation",
-  "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.": "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.",
-  "Select dynamic expression": "Select dynamic expression",
-  "Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.": "Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.",
-  "Variable datasource": "Variable datasource",
-  "Dynamic expression": "Dynamic expression",
-  "An expression for calculation in each rows": "An expression for calculation in each rows",
-  "Unconfigured": "Unconfigured",
-  "Calculation result": "Calculation result"
-}

package/src/locale/index.ts

@@ -1,12 +0,0 @@
-import { useTranslation } from 'react-i18next';
-
-export const NAMESPACE = 'workflow-dynamic-calculation';
-
-export function useLang(key: string, options = {}) {
-  const { t } = usePluginTranslation(options);
-  return t(key);
-}
-
-export function usePluginTranslation(options) {
-  return useTranslation(NAMESPACE, options);
-}

package/src/locale/ko_KR.json

@@ -1,13 +0,0 @@
-{
-  "Dynamic Calculation": "동적 표현식 계산",
-  "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.":
-    "계산 엔진을 기반으로 한 식을 계산하고 결과값을 얻습니다. 상류 노드의 변수를 식에 사용할 수 있습니다. 식은 표현식 컬렉션에서 동적으로 가져온 것입니다.",
-  "Select dynamic expression": "동적 표현식 선택",
-  "Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.":
-    "상류 노드에서 조회한 동적 표현식을 선택하세요. 표현식 컬렉션에서 조회해야 합니다.",
-  "Variable datasource": "변수 데이터 소스",
-  "Dynamic expression": "동적 표현식",
-  "An expression for calculation in each rows": "각 행의 계산을 위한 식",
-  "Unconfigured": "구성되지 않음",
-  "Calculation result": "계산 결과"  
-}

package/src/locale/zh-CN.json

@@ -1,12 +0,0 @@
-{
-  "Expression": "表达式",
-  "Dynamic Calculation": "动态表达式计算",
-  "Calculate an expression based on a calculation engine and obtain a value as the result. Variables in the upstream nodes can be used in the expression. The expression is dynamic one from an expression collections.": "基于计算引擎计算表达式并获取值作为结果。可以在表达式中使用上游节点的变量。表达式是从表达式表中动态获取的。",
-  "Select dynamic expression": "选择动态表达式",
-  "Select the dynamic expression queried from the upstream node. You need to query it from an expression collection.": "从上游节点中选择查询出来的动态表达式。你需要从动态表达式类型的数据表中查询。",
-  "Variable datasource": "变量数据源",
-  "Dynamic expression": "动态表达式",
-  "Used to store expressions for use in workflows so that different expressions can be called for different data.": "用于存储表达式，在工作流中使用，以便针对不同的数据调用不同的表达式。",
-  "Unconfigured": "未配置",
-  "Calculation result": "运算结果"
-}

package/src/server/DynamicCalculation.ts

@@ -1,29 +0,0 @@
-import { parse } from '@nocobase/utils';
-import { FlowNodeModel, Instruction, JOB_STATUS, Processor } from '@nocobase/plugin-workflow';
-import evaluators, { Evaluator } from '@nocobase/evaluators';
-
-export class DynamicCalculation extends Instruction {
-  async run(node: FlowNodeModel, prevJob, processor: Processor) {
-    let { engine = 'math.js', expression = '' } = node.config;
-    let scope = processor.getScope(node.id);
-    const parsed = parse(expression)(scope) ?? {};
-    engine = parsed.engine;
-    expression = parsed.expression;
-    scope = parse(node.config.scope ?? '')(scope) ?? {};
-
-    const evaluator = <Evaluator | undefined>evaluators.get(engine);
-
-    try {
-      const result = evaluator && expression ? evaluator(expression, scope) : null;
-      return {
-        result,
-        status: JOB_STATUS.RESOLVED,
-      };
-    } catch (e) {
-      return {
-        result: e.toString(),
-        status: JOB_STATUS.ERROR,
-      };
-    }
-  }
-}

package/src/server/Plugin.ts

@@ -1,16 +0,0 @@
-import { Plugin } from '@nocobase/server';
-import WorkflowPlugin from '@nocobase/plugin-workflow';
-
-import { ExpressionField } from './expression-field';
-import { DynamicCalculation } from './DynamicCalculation';
-
-export default class extends Plugin {
-  async load() {
-    this.db.registerFieldTypes({
-      expression: ExpressionField,
-    });
-
-    const workflowPlugin = this.app.getPlugin<WorkflowPlugin>(WorkflowPlugin);
-    workflowPlugin.registerInstruction('dynamic-calculation', DynamicCalculation);
-  }
-}

package/src/server/__tests__/collections/categories.ts

@@ -1,19 +0,0 @@
-import { extendCollection } from '@nocobase/database';
-
-export default extendCollection({
-  name: 'categories',
-  fields: [
-    {
-      type: 'string',
-      name: 'engine',
-    },
-    {
-      type: 'string',
-      name: 'collection',
-    },
-    {
-      type: 'text',
-      name: 'expression',
-    },
-  ],
-});

package/src/server/__tests__/instruction.test.ts

@@ -1,115 +0,0 @@
-import path from 'path';
-
-import { MockDatabase } from '@nocobase/database';
-import { getApp, sleep } from '@nocobase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
-
-import Plugin from '..';
-
-describe('workflow > instructions > calculation', () => {
-  let app: MockServer;
-  let db: MockDatabase;
-  let PostRepo;
-  let CategoryRepo;
-  let WorkflowModel;
-  let workflow;
-
-  beforeEach(async () => {
-    app = await getApp({
-      plugins: [Plugin],
-      collectionsPath: path.join(__dirname, 'collections'),
-    });
-
-    db = app.db;
-    WorkflowModel = db.getCollection('workflows').model;
-    PostRepo = db.getCollection('posts').repository;
-    CategoryRepo = db.getCollection('categories').repository;
-
-    workflow = await WorkflowModel.create({
-      title: 'test workflow',
-      enabled: true,
-      type: 'collection',
-      config: {
-        mode: 1,
-        collection: 'posts',
-      },
-    });
-  });
-
-  afterEach(() => app.destroy());
-
-  describe('dynamic expression', () => {
-    it('dynamic expression field in current table', async () => {
-      const n1 = await workflow.createNode({
-        type: 'dynamic-calculation',
-        config: {
-          expression: '{{$context.data.category}}',
-          scope: '{{$context.data}}',
-        },
-      });
-
-      const post = await PostRepo.create({
-        values: {
-          title: 't1',
-          category: {
-            engine: 'math.js',
-            expression: '1 + {{read}}',
-          },
-        },
-      });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      const [job] = await execution.getJobs();
-      expect(job.result).toBe(1);
-    });
-
-    it('dynamic expression field in association table', async () => {
-      const n1 = await workflow.createNode({
-        type: 'query',
-        config: {
-          collection: 'categories',
-          params: {
-            filter: {
-              $and: [{ id: '{{$context.data.categoryId}}' }],
-            },
-          },
-        },
-      });
-
-      const n2 = await workflow.createNode({
-        type: 'dynamic-calculation',
-        config: {
-          expression: `{{$jobsMapByNodeKey.${n1.key}}}`,
-          scope: '{{$context.data}}',
-        },
-        upstreamId: n1.id,
-      });
-
-      await n1.setDownstream(n2);
-
-      const category = await CategoryRepo.create({
-        values: {
-          title: 'c1',
-          engine: 'math.js',
-          expression: '1 + {{read}}',
-        },
-      });
-
-      const post = await PostRepo.create({
-        values: {
-          title: 't1',
-          categoryId: category.id,
-        },
-      });
-
-      await sleep(500);
-
-      const [execution] = await workflow.getExecutions();
-      const jobs = await execution.getJobs({ order: [['id', 'ASC']] });
-      expect(jobs.length).toBe(2);
-      expect(jobs[1].result).toBe(1);
-    });
-  });
-});

package/src/server/expression-field.ts

@@ -1,11 +0,0 @@
-import { BaseFieldOptions, DataTypes, Field } from '@nocobase/database';
-
-export interface ExpressionFieldOptions extends BaseFieldOptions {
-  type: 'expression';
-}
-
-export class ExpressionField extends Field {
-  get dataType() {
-    return DataTypes.TEXT;
-  }
-}

package/src/server/index.ts

@@ -1 +0,0 @@
-export { default } from './Plugin';