@nocobase/client 0.7.0-alpha.23 → 0.7.0-alpha.26

package/src/workflow/schemas/collection.ts

@@ -5,7 +5,7 @@ import { useCollectionFilterOptions } from "../../collection-manager/action-hook
 
 export const collection = {
   type: 'string',
-  title: '数据表',
+  title: '{{t("Collection")}}',
   name: 'config.collection',
   required: true,
   'x-reactions': ['{{useCollectionDataSource()}}'],
@@ -15,7 +15,7 @@ export const collection = {
 
 export const values = {
   type: 'object',
-  title: '数据内容',
+  title: '{{t("Form values")}}',
   name: 'config.params.values',
   'x-decorator': 'FormItem',
   'x-decorator-props': {
@@ -24,24 +24,12 @@ export const values = {
       flex-direction: column;
     `
   },
-  'x-component': 'CollectionFieldset',
-  'x-component-props': {
-    useProps() {
-      const { getCollectionFields } = useCollectionManager();
-      const { values: form } = useForm();
-      const fields = getCollectionFields(form?.config?.collection)
-        .filter(field => (
-          !field.hidden
-          && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false)
-        ));
-      return { fields };
-    }
-  }
+  'x-component': 'CollectionFieldset'
 };
 
 export const filter = {
   type: 'object',
-  title: '筛选条件',
+  title: '{{t("Filter")}}',
   name: 'config.params.filter',
   'x-decorator': 'FormItem',
   'x-decorator-props': {

package/src/workflow/schemas/executions.ts

@@ -4,12 +4,16 @@ const collection = {
   name: 'executions',
   fields: [
     {
-      type: 'number',
-      name: 'workflow',
-      interface: 'linkTo',
+      interface: 'createdAt',
+      type: 'datetime',
+      // field: 'createdAt',
+      name: 'createdAt',
       uiSchema: {
-        title: '所属工作流',
-        type: 'string',
+        type: 'datetime',
+        title: '{{t("Created at")}}',
+        'x-component': 'DatePicker',
+        'x-component-props': {},
+        'x-read-pretty': true,
       } as ISchema,
     },
     {
@@ -17,15 +21,15 @@ const collection = {
       name: 'status',
       interface: 'select',
       uiSchema: {
-        title: '执行状态',
+        title: '{{t("Status")}}',
         type: 'string',
         'x-component': 'Select',
         'x-decorator': 'FormItem',
         enum: [
-          { value: 0, label: '进行中' },
-          { value: 1, label: '已完成' },
-          { value: -1, label: '已失败' },
-          { value: -2, label: '已取消' },
+          { value: 0, label: '{{t("On going")}}' },
+          { value: 1, label: '{{t("Success")}}' },
+          { value: -1, label: '{{t("Failed")}}' },
+          { value: -2, label: '{{t("Canceled")}}' },
         ],
       } as ISchema,
     }
@@ -76,13 +80,13 @@ export const executionSchema = {
           useDataSource: '{{ cm.useDataSourceFromRAC }}',
         },
         properties: {
-          workflow: {
+          createdAt: {
             type: 'void',
             'x-decorator': 'Table.Column.Decorator',
             'x-component': 'Table.Column',
             properties: {
-              workflow: {
-                type: 'string',
+              createdAt: {
+                type: 'datetime',
                 'x-component': 'CollectionField',
                 'x-read-pretty': true,
               },
@@ -100,27 +104,27 @@ export const executionSchema = {
               },
             }
           },
-          actions: {
-            type: 'void',
-            title: '{{ t("Actions") }}',
-            'x-component': 'Table.Column',
-            properties: {
-              actions: {
-                type: 'void',
-                'x-component': 'Space',
-                'x-component-props': {
-                  split: '|',
-                },
-                properties: {
-                  config: {
-                    type: 'void',
-                    title: '查看',
-                    'x-component': 'ExecutionLink'
-                  },
-                }
-              }
-            }
-          }
+          // actions: {
+          //   type: 'void',
+          //   title: '{{ t("Actions") }}',
+          //   'x-component': 'Table.Column',
+          //   properties: {
+          //     actions: {
+          //       type: 'void',
+          //       'x-component': 'Space',
+          //       'x-component-props': {
+          //         split: '|',
+          //       },
+          //       properties: {
+          //         config: {
+          //           type: 'void',
+          //           title: '查看',
+          //           'x-component': 'ExecutionLink'
+          //         },
+          //       }
+          //     }
+          //   }
+          // }
         }
       }
     }

package/src/workflow/schemas/workflows.ts

@@ -1,4 +1,5 @@
 import { ISchema } from '@formily/react';
+import { triggers } from '../triggers';
 import { executionSchema } from './executions';
 
 const collection = {
@@ -9,7 +10,7 @@ const collection = {
       name: 'title',
       interface: 'input',
       uiSchema: {
-        title: '流程名称',
+        title: '{{t("Name")}}',
         type: 'string',
         'x-component': 'Input',
         required: true,
@@ -20,13 +21,14 @@ const collection = {
       name: 'type',
       interface: 'select',
       uiSchema: {
-        title: '触发方式',
+        title: '{{t("Trigger type")}}',
         type: 'string',
         'x-component': 'Select',
         'x-decorator': 'FormItem',
-        enum: [
-          { value: 'model', label: '数据变动' }
-        ],
+        enum: Array.from(triggers.getEntities()).map(([value, { title }]) => ({
+          value,
+          label: title,
+        })),
         required: true,
       } as ISchema,
     },
@@ -35,7 +37,7 @@ const collection = {
       name: 'description',
       interface: 'textarea',
       uiSchema: {
-        title: '描述',
+        title: '{{t("Description")}}',
         type: 'string',
         'x-component': 'Input.TextArea',
       } as ISchema,
@@ -45,11 +47,11 @@ const collection = {
       name: 'enabled',
       interface: 'radio',
       uiSchema: {
-        title: '状态',
+        title: '{{t("Status")}}',
         type: 'string',
         enum: [
-          { label: '启用', value: true },
-          { label: '禁用', value: false },
+          { label: '{{t("Enabled")}}', value: true },
+          { label: '{{t("Disabled")}}', value: false },
         ],
         'x-component': 'Radio.Group',
         'x-decorator': 'FormItem',
@@ -94,7 +96,7 @@ export const workflowSchema: ISchema = {
           properties: {
             delete: {
               type: 'void',
-              title: '删除',
+              title: '{{t("Delete")}}',
               'x-component': 'Action',
               'x-component-props': {
                 useAction: '{{ cm.useBulkDestroyAction }}',
@@ -106,7 +108,7 @@ export const workflowSchema: ISchema = {
             },
             create: {
               type: 'void',
-              title: '添加工作流',
+              title: '{{t("Add new")}}',
               'x-component': 'Action',
               'x-component-props': {
                 type: 'primary',
@@ -116,7 +118,7 @@ export const workflowSchema: ISchema = {
                   type: 'void',
                   'x-component': 'Action.Drawer',
                   'x-decorator': 'Form',
-                  title: '添加工作流',
+                  title: '{{t("Add new")}}',
                   properties: {
                     title: {
                       'x-component': 'CollectionField',
@@ -219,25 +221,24 @@ export const workflowSchema: ISchema = {
                   properties: {
                     config: {
                       type: 'void',
-                      title: '配置流程',
                       'x-component': 'WorkflowLink'
                     },
-                    // executions: {
-                    //   type: 'void',
-                    //   title: '执行历史',
-                    //   'x-component': 'Action.Link',
-                    //   'x-component-props': {
-                    //     type: 'primary',
-                    //   },
-                    //   properties: {
-                    //     drawer: {
-                    //       type: 'void',
-                    //       title: '执行历史',
-                    //       'x-component': 'Action.Drawer',
-                    //       properties: executionSchema
-                    //     }
-                    //   }
-                    // },
+                    executions: {
+                      type: 'void',
+                      title: '{{t("Executions")}}',
+                      'x-component': 'Action.Link',
+                      'x-component-props': {
+                        type: 'primary',
+                      },
+                      properties: {
+                        drawer: {
+                          type: 'void',
+                          title: '{{t("Executions")}}',
+                          'x-component': 'Action.Drawer',
+                          properties: executionSchema
+                        }
+                      }
+                    },
                     update: {
                       type: 'void',
                       title: '{{ t("Edit") }}',
@@ -253,7 +254,7 @@ export const workflowSchema: ISchema = {
                           'x-decorator-props': {
                             useValues: '{{ cm.useValuesFromRecord }}',
                           },
-                          title: '编辑工作流',
+                          title: '{{ t("Edit") }}',
                           properties: {
                             title: {
                               'x-component': 'CollectionField',

package/src/workflow/triggers/index.tsx

@@ -3,7 +3,7 @@ import { ISchema, useForm } from "@formily/react";
 import { cx } from "@emotion/css";
 import { Registry } from "@nocobase/utils";
 
-import { SchemaComponent, useActionContext, useAPIClient, useRecord, useRequest, useResourceActionContext } from '../../';
+import { SchemaComponent, useActionContext, useAPIClient, useCompile, useRecord, useRequest, useResourceActionContext } from '../../';
 import model from './model';
 import { nodeCardClass } from "../style";
 
@@ -42,9 +42,10 @@ export interface Trigger {
 
 export const triggers = new Registry<Trigger>();
 
-triggers.register('model', model);
+triggers.register(model.type, model);
 
 export const TriggerConfig = () => {
+  const compile = useCompile();
   const { data } = useResourceActionContext();
   if (!data) {
     return null;
@@ -53,17 +54,17 @@ export const TriggerConfig = () => {
   const { title, fieldset, scope } = triggers.get(type);
   return (
     <div className={cx(nodeCardClass)}>
-      <h4>{title}</h4>
+      <h4>{compile(title)}</h4>
       <SchemaComponent
         schema={{
           type: 'void',
-          title: '触发器配置',
+          title: '{{t("Trigger configuration")}}',
           'x-component': 'Action.Link',
           name: 'drawer',
           properties: {
             drawer: {
               type: 'void',
-              title: '触发器配置',
+              title: '{{t("Trigger configuration")}}',
               'x-component': 'Action.Drawer',
               'x-decorator': 'Form',
               'x-decorator-props': {

package/src/workflow/triggers/model.tsx

@@ -9,6 +9,7 @@ import { useCompile } from '../../schema-component';
 import { useFlowContext } from '../WorkflowCanvas';
 import { BaseTypeSet } from '../calculators';
 import { collection, filter } from '../schemas/collection';
+import { useTranslation } from 'react-i18next';
 
 function useCollectionFieldsDataSource() {
   const compile = useCompile();
@@ -32,30 +33,30 @@ function useCollectionFieldsDataSource() {
 }
 
 export default {
-  title: '数据表事件',
+  title: '{{t("Model event")}}',
   type: 'model',
   fieldset: {
     'config.collection': collection,
     'config.mode': {
       type: 'number',
-      title: '触发时机',
+      title: '{{t("Trigger on")}}',
       name: 'config.mode',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
         options: [
-          { value: 1, label: '新增数据后' },
-          { value: 2, label: '更新数据后' },
-          { value: 3, label: '新增或更新数据后' },
-          { value: 4, label: '删除数据后' }
+          { value: 1, label: '{{t("After record added")}}' },
+          { value: 2, label: '{{t("After record updated")}}' },
+          { value: 3, label: '{{t("After record added or updated")}}' },
+          { value: 4, label: '{{t("After record deleted")}}' }
         ]
       }
     },
     'config.changed': {
       type: 'array',
       name: 'changed',
-      title: '发生变动的字段',
-      description: '只有被选中的某个字段发生变动时才会触发。如果不选择，则表示任何字段变动时都会触发。新增或删除数据时，任意字段都被认为发生变动。',
+      title: '{{t("Changed fields")}}',
+      description: '{{t("Select the fields which changed will trigger the event only")}}',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
@@ -68,7 +69,7 @@ export default {
     'config.condition': {
       ...filter,
       name: 'config.condition',
-      title: '满足条件'
+      title: '{{t("Match condition")}}',
     }
   },
   scope: {
@@ -76,6 +77,7 @@ export default {
     useCollectionFieldsDataSource
   },
   getter({ type, options, onChange }) {
+    const { t } = useTranslation();
     const compile = useCompile();
     const { collections = [] } = useCollectionManager();
     const { workflow } = useFlowContext();
@@ -83,7 +85,7 @@ export default {
 
     return (
       <Select
-        placeholder="选择字段"
+        placeholder={t('Fields')}
         value={options?.path?.replace(/^data\./, '')}
         onChange={(path) => {
           onChange({ type, options: { ...options, path: `data.${path}` } });