@nocobase/plugin-workflow-dynamic-calculation 0.19.0-alpha.9 → 0.20.0-alpha.2

package/dist/client/expression.d.ts

@@ -1,3 +1,35 @@
-import { IField } from '@nocobase/client';
-declare const _default: IField;
-export default _default;
+import { CollectionFieldInterface } from '@nocobase/client';
+export declare class ExpressionFieldInterface extends CollectionFieldInterface {
+    name: string;
+    type: string;
+    group: string;
+    order: number;
+    title: string;
+    description: string;
+    sortable: boolean;
+    default: {
+        type: string;
+        uiSchema: {
+            'x-component': string;
+        };
+    };
+    properties: {
+        'uiSchema.title': {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-decorator': string;
+            'x-component': string;
+        };
+        name: {
+            type: string;
+            title: string;
+            required: boolean;
+            'x-disabled': string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-validator': string;
+            description: string;
+        };
+    };
+}

package/dist/client/index.js

@@ -1 +1 @@
-(function(o,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("react-i18next"),require("@nocobase/plugin-workflow/client"),require("@formily/core"),require("@formily/react"),require("antd"),require("react")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","react-i18next","@nocobase/plugin-workflow/client","@formily/core","@formily/react","antd","react"],e):(o=typeof globalThis!="undefined"?globalThis:o||self,e(o["@nocobase/plugin-workflow-dynamic-calculation"]={},o["@nocobase/client"],o.jsxRuntime,o["react-i18next"],o["@nocobase/plugin-workflow"],o["@formily/core"],o["@formily/react"],o.antd,o.react))})(this,function(o,e,n,C,r,g,u,x,c){"use strict";var z=Object.defineProperty,L=Object.defineProperties;var U=Object.getOwnPropertyDescriptors;var k=Object.getOwnPropertySymbols;var _=Object.prototype.hasOwnProperty,G=Object.prototype.propertyIsEnumerable;var v=(o,e,n)=>e in o?z(o,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):o[e]=n,m=(o,e)=>{for(var n in e||(e={}))_.call(e,n)&&v(o,n,e[n]);if(k)for(var n of k(e))G.call(e,n)&&v(o,n,e[n]);return o},y=(o,e)=>L(o,U(e));var f=(o,e,n)=>(v(o,typeof e!="symbol"?e+"":e,n),n);var w=(o,e,n)=>new Promise((C,r)=>{var g=c=>{try{x(n.next(c))}catch(a){r(a)}},u=c=>{try{x(n.throw(c))}catch(a){r(a)}},x=c=>c.done?C(c.value):Promise.resolve(c.value).then(g,u);x((n=n.apply(o,e)).next())});const a="workflow-dynamic-calculation";function F(s,i={}){const{t}=I(i);return t(s)}function I(s){return C.useTranslation(a,s)}const{defaultProps:T}=e.interfacesProperties,P={name:"expression",type:"string",group:"advanced",order:1,title:`{{t("Expression", { ns: "${a}" })}}`,description:`{{t("Used to store expressions for use in workflows so that different expressions can be called for different data.", { ns: "${a}" })}}`,sortable:!0,default:{type:"text",uiSchema:{"x-component":"DynamicExpression"}},properties:m({},T)};function E(s){const i=e.useCollectionManager();return n.jsx(e.CollectionManagerContext.Provider,{value:y(m({},i),{interfaces:y(m({},i.interfaces),{expression:P})}),children:s.children})}function M(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(l=>l.interface==="expression"):!1}function q({value:s,onChange:i}){const{getCollectionFields:t,getCollection:l}=e.useCollectionManager(),d=r.useWorkflowVariableOptions({types:[M.bind({getCollectionFields:t,getCollection:l})]});return n.jsx(e.Variable.Input,{value:s,onChange:i,scope:d})}class j extends r.Instruction{constructor(){super(...arguments);f(this,"title",`{{t("Dynamic Calculation", { ns: "${a}" })}}`);f(this,"type","dynamic-calculation");f(this,"group","extended");f(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}" })}}`);f(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]}}"}}}}});f(this,"components",{DynamicExpression:q,WorkflowVariableInput:r.WorkflowVariableInput,ValueBlock:r.ValueBlock})}useVariables({key:t,title:l},{types:d,fieldNames:p=r.defaultFieldNames}){return d&&!d.some(h=>h in r.BaseTypeSets||Object.values(r.BaseTypeSets).some(b=>b.has(h)))?null:{[p.value]:t,[p.label]:l}}useInitializers(t){var l;return{name:`#${t.id}`,type:"item",title:(l=t.title)!=null?l:`#${t.id}`,Component:r.ValueBlock.Initializer,node:t,resultTitle:F("Calculation result")}}}const D=u.observer(s=>{const{onChange:i}=s,t=u.useField(),l=u.useForm(),p=[...t.path.segments.slice(0,-1),"sourceCollection"].join("."),[h,b]=c.useState(l.getValuesIn(p)),B=e.useCompile(),{getCollectionFields:W}=e.useCollectionManager();u.useFormEffects(()=>{g.onFormInitialValuesChange(V=>{b(V.getValuesIn(p))}),g.onFieldInputValueChange(p,V=>{b(V.value),i(null)})});const N=r.getCollectionFieldOptions({collection:h,compile:B,getCollectionFields:W});return n.jsx(e.Variable.TextArea,y(m({},s),{scope:N}))},{displayName:"InternalExpression"});function O(s){const{t:i}=C.useTranslation(),t=e.useRecord(),l=e.useCompile(),{getCollectionFields:d}=e.useCollectionManager(),p=c.useMemo(()=>r.getCollectionFieldOptions({collection:t.sourceCollection,compile:l,getCollectionFields:d}),[t.sourceCollection,t.sourceCollection]);return s.value?n.jsx(e.Variable.TextArea,y(m({},s),{scope:p})):n.jsx(x.Tag,{children:i("Unconfigured",{ns:a})})}const S=u.connect(D,u.mapReadPretty(O));class A extends e.Plugin{afterAdd(){return w(this,null,function*(){})}beforeLoad(){return w(this,null,function*(){})}load(){return w(this,null,function*(){this.app.addProvider(E),this.app.addComponents({DynamicExpression:S});const i=this.app.pm.get("workflow"),t=new j;i.instructions.register(t.type,t)})}}o.default=A,Object.defineProperties(o,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(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,13 @@
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "0.19.0-alpha.9",
-  "@nocobase/plugin-workflow": "0.19.0-alpha.9",
+  "@nocobase/client": "0.20.0-alpha.2",
+  "@nocobase/plugin-workflow": "0.20.0-alpha.2",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
   "antd": "5.12.8",
   "react-i18next": "11.18.6",
-  "@nocobase/utils": "0.19.0-alpha.9",
-  "@nocobase/evaluators": "0.19.0-alpha.9",
-  "@nocobase/server": "0.19.0-alpha.9",
-  "@nocobase/database": "0.19.0-alpha.9"
+  "@nocobase/utils": "0.20.0-alpha.2",
+  "@nocobase/evaluators": "0.20.0-alpha.2",
+  "@nocobase/server": "0.20.0-alpha.2",
+  "@nocobase/database": "0.20.0-alpha.2"
 };

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": "0.19.0-alpha.9",
+  "version": "0.20.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/workflow-dynamic-calculation",
@@ -30,8 +30,9 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "975f9c58a1995df6a8d7a4d191a0dc4a9769ebc5",
+  "gitHead": "6fb885dfc3554e4b0f29e9a7a1eecbbe85d0eebb",
   "keywords": [
-    "Workflow"
+    "Workflow",
+    "Collections"
   ]
 }

package/src/client/DynamicCalculation.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SchemaInitializerItemType, Variable, useCollectionManager } from '@nocobase/client';
+import { SchemaInitializerItemType, Variable, useCollectionManager_deprecated } from '@nocobase/client';
 import {
   BaseTypeSets,
   Instruction,
@@ -25,7 +25,7 @@ function useDynamicExpressionCollectionFieldMatcher(field): boolean {
 }
 
 function DynamicExpression({ value, onChange }) {
-  const { getCollectionFields, getCollection } = useCollectionManager();
+  const { getCollectionFields, getCollection } = useCollectionManager_deprecated();
   const scope = useWorkflowVariableOptions({
     types: [useDynamicExpressionCollectionFieldMatcher.bind({ getCollectionFields, getCollection })],
   });

package/src/client/DynamicExpression.tsx

@@ -4,7 +4,7 @@ import { Tag } from 'antd';
 import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useCollectionManager, useCompile, useRecord, Variable } from '@nocobase/client';
+import { useCollectionManager_deprecated, useCompile, useRecord, Variable } from '@nocobase/client';
 import { getCollectionFieldOptions } from '@nocobase/plugin-workflow/client';
 
 import { NAMESPACE } from '../locale';
@@ -19,7 +19,7 @@ const InternalExpression = observer(
     const collectionPath = [...basePath, 'sourceCollection'].join('.');
     const [collection, setCollection] = useState(form.getValuesIn(collectionPath));
     const compile = useCompile();
-    const { getCollectionFields } = useCollectionManager();
+    const { getCollectionFields } = useCollectionManager_deprecated();
 
     useFormEffects(() => {
       onFormInitialValuesChange((form) => {
@@ -42,7 +42,7 @@ function Result(props) {
   const { t } = useTranslation();
   const values = useRecord();
   const compile = useCompile();
-  const { getCollectionFields } = useCollectionManager();
+  const { getCollectionFields } = useCollectionManager_deprecated();
   const options = useMemo(
     () => getCollectionFieldOptions({ collection: values.sourceCollection, compile, getCollectionFields }),
     [values.sourceCollection, values.sourceCollection],

package/src/client/expression.tsx

@@ -1,24 +1,24 @@
-import { IField, interfacesProperties } from '@nocobase/client';
+import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
 
 import { NAMESPACE } from '../locale';
 
 const { defaultProps } = interfacesProperties;
 
-export default {
-  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: {
+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: {
+  };
+  properties = {
     ...defaultProps,
-  },
-} as IField;
+  };
+}

package/src/client/index.ts

@@ -1,9 +1,9 @@
 import { Plugin } from '@nocobase/client';
 import WorkflowPlugin from '@nocobase/plugin-workflow/client';
 
-import { Provider } from './Provider';
 import DynamicCalculation from './DynamicCalculation';
 import { DynamicExpression } from './DynamicExpression';
+import { ExpressionFieldInterface } from './expression';
 
 export default class extends Plugin {
   async afterAdd() {
@@ -14,7 +14,7 @@ export default class extends Plugin {
 
   // You can get and modify the app instance here
   async load() {
-    this.app.addProvider(Provider);
+    this.app.dataSourceManager.addFieldInterfaces([ExpressionFieldInterface]);
     this.app.addComponents({
       DynamicExpression,
     });

package/dist/client/Provider.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare function Provider(props: any): React.JSX.Element;

package/src/client/Provider.tsx

@@ -1,22 +0,0 @@
-import React from 'react';
-
-import { CollectionManagerContext, useCollectionManager } from '@nocobase/client';
-
-import expression from './expression';
-
-export function Provider(props) {
-  const cmCtx = useCollectionManager();
-  return (
-    <CollectionManagerContext.Provider
-      value={{
-        ...cmCtx,
-        interfaces: {
-          ...cmCtx.interfaces,
-          expression,
-        },
-      }}
-    >
-      {props.children}
-    </CollectionManagerContext.Provider>
-  );
-}