@nocobase/plugin-workflow 0.11.0-alpha.1 → 0.11.1-alpha.2

package/src/client/nodes/manual/index.tsx

@@ -1,7 +1,7 @@
 import { BlockInitializers, SchemaInitializerItemOptions, useCollectionManager, useCompile } from '@nocobase/client';
 
 import { CollectionBlockInitializer } from '../../components/CollectionBlockInitializer';
-import { getCollectionFieldOptions } from '../../variable';
+import { defaultFieldNames, getCollectionFieldOptions } from '../../variable';
 import { NAMESPACE } from '../../locale';
 import { SchemaConfig, SchemaConfigButton } from './SchemaConfig';
 import { ModeConfig } from './ModeConfig';
@@ -85,7 +85,7 @@ export default {
     ModeConfig,
     AssigneesSelect,
   },
-  useVariables({ id, title, config }, { types }) {
+  useVariables({ id, title, config }, { types, fieldNames = defaultFieldNames }) {
     const compile = useCompile();
     const { getCollectionFields } = useCollectionManager();
     const formKeys = Object.keys(config.forms ?? {});
@@ -119,9 +119,9 @@ export default {
 
     return options.length
       ? {
-          value: `${id}`,
-          label: title,
-          children: options,
+          [fieldNames.value]: `${id}`,
+          [fieldNames.label]: title,
+          [fieldNames.children]: options,
         }
       : null;
   },

package/src/client/nodes/parallel.tsx

@@ -4,10 +4,10 @@ import { Button, Tooltip } from 'antd';
 import React, { useState } from 'react';
 import { NodeDefaultView } from '.';
 import { Branch } from '../Branch';
-import { RadioWithTooltip } from '../components/RadioWithTooltip';
 import { useFlowContext } from '../FlowContext';
-import { lang, NAMESPACE } from '../locale';
-import { branchBlockClass, nodeSubtreeClass } from '../style';
+import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { NAMESPACE, lang } from '../locale';
+import useStyles from '../style';
 
 export default {
   title: `{{t("Parallel branch", { ns: "${NAMESPACE}" })}}`,
@@ -44,6 +44,7 @@ export default {
   },
   view: {},
   component: function Component({ data }) {
+    const { styles } = useStyles();
     const {
       id,
       config: { mode },
@@ -64,8 +65,8 @@ export default {
 
     return (
       <NodeDefaultView data={data}>
-        <div className={cx(nodeSubtreeClass)}>
-          <div className={cx(branchBlockClass)}>
+        <div className={cx(styles.nodeSubtreeClass)}>
+          <div className={cx(styles.branchBlockClass)}>
             {branches.map((branch) => (
               <Branch key={branch.id} from={data} entry={branch} branchIndex={branch.branchIndex} />
             ))}

package/src/client/nodes/query.tsx

@@ -41,7 +41,6 @@ export default {
   },
   components: {
     FilterDynamicComponent,
-    FieldsSelect,
   },
   useVariables({ id, title, config }, options) {
     const compile = useCompile();

package/src/client/nodes/sql.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+
+import { Variable, css } from '@nocobase/client';
+
+import { NAMESPACE } from '../locale';
+import { useWorkflowVariableOptions } from '../variable';
+
+export default {
+  title: `{{t("SQL action", { ns: "${NAMESPACE}" })}}`,
+  type: 'sql',
+  group: 'extended',
+  description: `{{t("Execute a SQL statement in database.", { ns: "${NAMESPACE}" })}}`,
+  fieldset: {
+    sql: {
+      type: 'string',
+      required: true,
+      title: 'SQL',
+      description: `{{t("Usage of SQL query result is not supported yet.", { ns: "${NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'SQLInput',
+      'x-component-props': {
+        rows: 20,
+        className: css`
+          font-size: 80%;
+          font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+        `,
+      },
+    },
+  },
+  scope: {},
+  components: {
+    SQLInput(props) {
+      const scope = useWorkflowVariableOptions();
+      return <Variable.RawTextArea scope={scope} {...props} />;
+    },
+  },
+};

package/src/client/schemas/collection.ts

@@ -52,15 +52,15 @@ export const filter = {
 export const appends = {
   type: 'array',
   title: `{{t("Preload associations", { ns: "${NAMESPACE}" })}}`,
-  description: `{{t("Please select the associated fields that need to be accessed in subsequent nodes", { ns: "${NAMESPACE}" })}}`,
+  description: `{{t("Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.", { ns: "${NAMESPACE}" })}}`,
   'x-decorator': 'FormItem',
-  'x-component': 'FieldsSelect',
+  'x-component': 'AppendsTreeSelect',
   'x-component-props': {
-    mode: 'multiple',
-    placeholder: '{{t("Select field")}}',
-    filter(field) {
-      return ['linkTo', 'belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
+    useCollection() {
+      const { values } = useForm();
+      return values?.collection;
     },
+    className: 'full-width',
   },
   'x-reactions': [
     {