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

package/src/workflow/calculators.tsx

@@ -9,6 +9,7 @@ import { instructions, useNodeContext } from "./nodes";
 import { useFlowContext } from "./WorkflowCanvas";
 import { triggers } from "./triggers";
 import { SchemaComponent, useCollectionManager, useCompile } from "..";
+import { useTranslation } from "react-i18next";
 
 function NullRender() {
   return null;
@@ -17,7 +18,7 @@ function NullRender() {
 export const calculators = [
   {
     value: 'boolean',
-    title: '值比较',
+    title: '{{t("Comparison")}}',
     children: [
       { value: 'equal', name: '=' },
       { value: 'notEqual', name: '≠' },
@@ -29,7 +30,7 @@ export const calculators = [
   },
   {
     value: 'number',
-    title: '算术运算',
+    title: '{{t("Arithmetic calculation")}}',
     children: [
       { value: 'add', name: '+' },
       { value: 'minus', name: '-' },
@@ -40,19 +41,19 @@ export const calculators = [
   },
   {
     value: 'string',
-    title: '字符串',
+    title: '{{t("String operation")}}',
     children: [
-      { value: 'includes', name: '包含' },
-      { value: 'notIncludes', name: '不包含' },
-      { value: 'startsWith', name: '开头是' },
-      { value: 'notStartsWith', name: '开头不是' },
-      { value: 'endsWith', name: '结尾是' },
-      { value: 'notEndsWith', name: '结尾不是' }
+      { value: 'includes', name: '{{t("contains")}}' },
+      { value: 'notIncludes', name: '{{t("does not contain")}}' },
+      { value: 'startsWith', name: '{{t("starts with")}}' },
+      { value: 'notStartsWith', name: '{{t("not starts with")}}' },
+      { value: 'endsWith', name: '{{t("ends with")}}' },
+      { value: 'notEndsWith', name: '{{t("not ends with")}}' }
     ]
   },
   {
     value: 'date',
-    title: '日期',
+    title: '{{t("Date")}}',
     children: []
   }
 ];
@@ -77,7 +78,7 @@ export const BaseTypeSet = new Set(['boolean', 'number', 'string', 'date']);
 
 const ConstantTypes = {
   string: {
-    title: '字符串',
+    title: '{{t("String")}}',
     value: 'string',
     component({ onChange, type, options, value }) {
       return (
@@ -90,7 +91,7 @@ const ConstantTypes = {
     default: ''
   },
   number: {
-    title: '数字',
+    title: '{{t("Number")}}',
     value: 'number',
     component({ onChange, type, options, value }) {
       return (
@@ -103,7 +104,7 @@ const ConstantTypes = {
     default: 0
   },
   boolean: {
-    title: '逻辑值',
+    title: '{{t("Boolean")}}',
     value: 'boolean',
     component({ onChange, type, options, value }) {
       return (
@@ -127,7 +128,7 @@ const ConstantTypes = {
 
 export const VariableTypes = {
   constant: {
-    title: '常量',
+    title: '{{t("Constant")}}',
     value: 'constant',
     options: Object.values(ConstantTypes).map(item => ({
       value: item.value,
@@ -155,7 +156,7 @@ export const VariableTypes = {
     }
   },
   $jobsMapByNodeId: {
-    title: '节点数据',
+    title: '{{t("Node result")}}',
     value: '$jobsMapByNodeId',
     options() {
       const node = useNodeContext();
@@ -210,7 +211,7 @@ export const VariableTypes = {
     }
   },
   $context: {
-    title: '触发数据',
+    title: '{{t("Trigger context")}}',
     value: '$context',
     component() {
       const { workflow } = useFlowContext();
@@ -252,6 +253,7 @@ export function Operand({
   onChange,
   children
 }: OperandProps) {
+  const compile = useCompile();
   const Types = useVariableTypes();
 
   const { type } = operand;
@@ -279,7 +281,7 @@ export function Operand({
         options={Object.values(Types).map((item: any) => {
           const options = typeof item.options === 'function' ? item.options() : item.options;
           return {
-            label: item.title,
+            label: compile(item.title),
             value: item.value,
             children: options,
             disabled: options && !options.length,
@@ -303,6 +305,7 @@ export function Operand({
 }
 
 export function Calculation({ calculator, operands = [], onChange }) {
+  const { t } = useTranslation();
   return (
     <VariableTypesContext.Provider value={VariableTypes}>
       <div className={css`
@@ -321,9 +324,9 @@ export function Calculation({ calculator, operands = [], onChange }) {
             <>
               <Select value={calculator} onChange={v => onChange({ operands, calculator: v })}>
                 {calculators.map(group => (
-                  <Select.OptGroup key={group.value} label={group.title}>
+                  <Select.OptGroup key={group.value} label={t(group.title)}>
                     {group.children.map(item => (
-                      <Select.Option key={item.value} value={item.value}>{item.name}</Select.Option>
+                      <Select.Option key={item.value} value={t(item.value)}>{item.name}</Select.Option>
                     ))}
                   </Select.OptGroup>
                 ))}
@@ -341,7 +344,7 @@ export function Calculation({ calculator, operands = [], onChange }) {
 export function VariableComponent({ value, onChange, renderSchemaComponent }) {
   const VTypes = { ...VariableTypes,
     constant: {
-      title: '常量',
+      title: '{{t("Constant")}}',
       value: 'constant',
       options: undefined
     }
@@ -372,6 +375,7 @@ export function VariableComponent({ value, onChange, renderSchemaComponent }) {
 
 // NOTE: observer for watching useProps
 export const CollectionFieldset = observer(({ value, onChange }: any) => {
+  const { t } = useTranslation();
   const compile = useCompile();
   const { getCollectionFields } = useCollectionManager();
   const { values: data } = useForm();
@@ -384,7 +388,7 @@ export const CollectionFieldset = observer(({ value, onChange }: any) => {
   const VTypes = {
     ...VariableTypes,
     constant: {
-      title: '常量',
+      title: '{{t("Constant")}}',
       value: 'constant',
       options: undefined
     }
@@ -458,14 +462,14 @@ export const CollectionFieldset = observer(({ value, onChange }: any) => {
                       ))}
                   </Menu>
                 }>
-                  <Button icon={<PlusOutlined />}>添加字段</Button>
+                  <Button icon={<PlusOutlined />}>{t('Add field')}</Button>
                 </Dropdown>
               )
               : null
             }
           </>
         )
-        : <p>请先选择数据表</p>
+        : <p>{t('Select collection')}</p>
       }
     </fieldset>
   );

package/src/workflow/nodes/calculation.tsx

@@ -1,15 +1,16 @@
 import { css } from '@emotion/css';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Calculation } from '../calculators';
 
 export default {
-  title: '运算',
+  title: '{{t("Calculation")}}',
   type: 'calculation',
   group: 'control',
   fieldset: {
     'config.calculation': {
       type: 'object',
-      title: '配置计算',
+      title: '{{t("Configure calculation")}}',
       name: 'config.calculation',
       required: true,
       'x-decorator': 'FormItem',
@@ -27,6 +28,7 @@ export default {
     }
   },
   getter() {
-    return <div className={css`flex-shrink: 0`}>计算值</div>;
+    const { t } = useTranslation();
+    return <div className={css`flex-shrink: 0`}>{t('Calculation result')}</div>;
   }
 };

package/src/workflow/nodes/create.tsx

@@ -1,5 +1,6 @@
 import { Select } from 'antd';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { useCollectionDataSource, useCollectionManager, useCompile } from '../..';
 import { BaseTypeSet, CollectionFieldset } from '../calculators';
 import { collection, values } from '../schemas/collection';
@@ -7,9 +8,9 @@ import { useFlowContext } from '../WorkflowCanvas';
 
 
 export default {
-  title: '新增数据',
+  title: '{{t("Create record")}}',
   type: 'create',
-  group: 'model',
+  group: 'collection',
   fieldset: {
     'config.collection': {
       ...collection,
@@ -45,6 +46,7 @@ export default {
     CollectionFieldset
   },
   getter({ type, options, onChange }) {
+    const { t } = useTranslation();
     const compile = useCompile();
     const { collections = [] } = useCollectionManager();
     const { nodes } = useFlowContext();
@@ -52,7 +54,7 @@ export default {
     const collection = collections.find(item => item.name === config.collection) ?? { fields: [] };
 
     return (
-      <Select value={options.path} placeholder="选择字段" onChange={path => {
+      <Select value={options.path} placeholder={t('Fields')} onChange={path => {
         onChange({ type, options: { ...options, path } });
       }}>
         {collection.fields

package/src/workflow/nodes/destroy.tsx

@@ -4,9 +4,9 @@ import { VariableComponent } from '../calculators';
 import { collection, filter } from '../schemas/collection';
 
 export default {
-  title: '删除数据',
+  title: '{{t("Delete record")}}',
   type: 'destroy',
-  group: 'model',
+  group: 'collection',
   fieldset: {
     'config.collection': collection,
     'config.params': {

package/src/workflow/nodes/index.tsx

@@ -4,7 +4,8 @@ import { ISchema, useForm } from '@formily/react';
 import { Registry } from '@nocobase/utils';
 import { Button, Modal, Tag } from 'antd';
 import React, { useContext } from 'react';
-import { SchemaComponent, useActionContext, useAPIClient, useCollection, useRequest, useResourceActionContext } from '../..';
+import { useTranslation } from 'react-i18next';
+import { SchemaComponent, useActionContext, useAPIClient, useCollection, useCompile, useRequest, useResourceActionContext } from '../..';
 import { nodeBlockClass, nodeCardClass, nodeClass, nodeHeaderClass, nodeTitleClass } from '../style';
 import { AddButton, useFlowContext } from '../WorkflowCanvas';
 
@@ -109,6 +110,7 @@ export function Node({ data }) {
 }
 
 export function RemoveButton() {
+  const { t } = useTranslation();
   const { resource } = useCollection();
   const current = useNodeContext();
   const { nodes, onNodeRemoved } = useFlowContext();
@@ -123,11 +125,11 @@ export function RemoveButton() {
 
     const hasBranches = !nodes.find(item => item.upstream === current && item.branchIndex != null);
     const message = hasBranches
-      ? '确定删除该节点吗？'
-      : '节点包含分支，将同时删除其所有分支下的子节点，确定继续？';
+      ? t('Are you sure you want to delete it?')
+      : t('This node contains branches, deleting will also be preformed to them, are you sure?');
 
     Modal.confirm({
-      title: '删除节点',
+      title: t('Delete'),
       content: message,
       onOk
     });
@@ -146,6 +148,7 @@ export function RemoveButton() {
 
 export function NodeDefaultView(props) {
   const { data, children } = props;
+  const compile = useCompile();
   const instruction = instructions.get(data.type);
 
   return (
@@ -154,7 +157,7 @@ export function NodeDefaultView(props) {
         <div className={cx(nodeCardClass)}>
           <div className={cx(nodeHeaderClass)}>
             <h4 className={cx(nodeTitleClass)}>
-              <Tag>{instruction.title}</Tag>
+              <Tag>{compile(instruction.title)}</Tag>
               <strong>{data.title}</strong>
               <span className="workflow-node-id">#{data.id}</span>
             </h4>
@@ -169,7 +172,7 @@ export function NodeDefaultView(props) {
                 view: instruction.view,
                 config: {
                   type: 'void',
-                  title: '配置节点',
+                  title: '{{t("Node configuration")}}',
                   'x-component': 'Action.Link',
                   'x-component-props': {
                     type: 'primary',
@@ -177,7 +180,7 @@ export function NodeDefaultView(props) {
                   properties: {
                     drawer: {
                       type: 'void',
-                      title: '配置节点',
+                      title: '{{t("Node configuration")}}',
                       'x-component': 'Action.Drawer',
                       'x-decorator': 'Form',
                       'x-decorator-props': {
@@ -192,7 +195,7 @@ export function NodeDefaultView(props) {
                         title: {
                           type: 'string',
                           name: 'title',
-                          title: '节点名称',
+                          title: '{{t("Name")}}',
                           'x-decorator': 'FormItem',
                           'x-component': 'Input',
                         },

package/src/workflow/nodes/query.tsx

@@ -6,11 +6,12 @@ import { useCollectionDataSource, useCollectionManager, useCompile } from '../..
 import { useFlowContext } from '../WorkflowCanvas';
 import { BaseTypeSet, VariableComponent } from '../calculators';
 import { collection, filter } from '../schemas/collection';
+import { useTranslation } from 'react-i18next';
 
 export default {
-  title: '查询数据',
+  title: '{{t("Query record")}}',
   type: 'query',
-  group: 'model',
+  group: 'collection',
   fieldset: {
     'config.collection': collection,
     'config.multiple': {
@@ -43,6 +44,7 @@ export default {
     VariableComponent
   },
   getter({ type, options, onChange }) {
+    const { t } = useTranslation();
     const compile = useCompile();
     const { collections = [] } = useCollectionManager();
     const { nodes } = useFlowContext();
@@ -50,7 +52,7 @@ export default {
     const collection = collections.find(item => item.name === config.collection) ?? { fields: [] };
 
     return (
-      <Select value={options.path} placeholder="选择字段" onChange={path => {
+      <Select value={options.path} placeholder={t('Fields')} onChange={path => {
         onChange({ type, options: { ...options, path } });
       }}>
         {collection.fields

package/src/workflow/nodes/update.tsx

@@ -3,9 +3,9 @@ import { CollectionFieldset, VariableComponent } from '../calculators';
 import { collection, filter, values } from '../schemas/collection';
 
 export default {
-  title: '更新数据',
+  title: '{{t("Update record")}}',
   type: 'update',
-  group: 'model',
+  group: 'collection',
   fieldset: {
     'config.collection': collection,
     'config.params': {

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': {
@@ -29,7 +29,7 @@ export const values = {
 
 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',