@gadmin2n/schematics 0.0.144 → 0.0.145

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/SchemaField.tsx

@@ -13,6 +13,7 @@ interface SchemaFieldProps {
   name: FieldPath;
   registry: WidgetRegistry;
   disabled?: boolean;
+  validate?: boolean;
   required?: boolean;
   label?: string;
   root?: boolean;
@@ -32,6 +33,14 @@ function ObjectPresenceControl() {
   return null;
 }
 
+function RegisteredWidget({
+  Widget,
+  ...props
+}: WidgetProps & { Widget: React.ComponentType<WidgetProps> }) {
+  const { errors } = Form.Item.useStatus();
+  return <Widget {...props} validationErrors={errors} />;
+}
+
 function defaultValue(schema: JsonSchema): unknown {
   if (schema.default !== undefined) return schema.default;
   if (schema.type === 'object') return {};
@@ -50,6 +59,8 @@ function inferredWidget(schema: JsonSchema): string {
 function requiredPropertiesRule(
   schema: JsonSchema,
   requiredMessage: (label: string) => string,
+  propertyLabel: (key: string) => string,
+  separator: string,
 ) {
   const requiredKeys = schema.required ?? [];
   if (requiredKeys.length === 0) return undefined;
@@ -70,10 +81,9 @@ function requiredPropertiesRule(
       });
       if (missing.length === 0) return;
 
-      const labels = missing.map(
-        (key) => schema.properties?.[key]?.title ?? key,
+      throw new Error(
+        requiredMessage(missing.map(propertyLabel).join(separator)),
       );
-      throw new Error(requiredMessage(labels.join(', ')));
     },
   };
 }
@@ -84,6 +94,7 @@ export function SchemaField({
   name,
   registry,
   disabled,
+  validate = true,
   required,
   label,
   root,
@@ -109,17 +120,28 @@ export function SchemaField({
       );
     }
     const Widget = registry.get(uiSchema.widget);
-    const propertiesRule = requiredPropertiesRule(schema, (requiredLabel) =>
-      t('schema.required', { label: requiredLabel }),
-    );
+    const propertiesRule = validate
+      ? requiredPropertiesRule(
+          schema,
+          (requiredLabel) => t('schema.required', { label: requiredLabel }),
+          (key) =>
+            t(`schema.fields.${key}`, {
+              defaultValue: schema.properties?.[key]?.title ?? key,
+            }),
+          i18n.resolvedLanguage === 'zh_CN' ? '、' : ', ',
+        )
+      : undefined;
+    const rendersValidationErrors =
+      uiSchema.options?.validationErrors === 'widget';
     return (
       <Form.Item
         name={name}
         label={root ? undefined : fieldLabel}
         tooltip={schema.description}
         initialValue={schema.default}
+        help={rendersValidationErrors ? null : undefined}
         rules={[
-          ...(required
+          ...(validate && required
             ? [
                 {
                   required: true,
@@ -130,7 +152,8 @@ export function SchemaField({
           ...(propertiesRule ? [propertiesRule] : []),
         ]}
       >
-        <Widget
+        <RegisteredWidget
+          Widget={Widget}
           {...({
             disabled,
             schema,
@@ -151,6 +174,7 @@ export function SchemaField({
           name={[...name, key]}
           registry={registry}
           disabled={disabled}
+          validate={validate}
           required={schema.required?.includes(key)}
         />
       ),
@@ -159,7 +183,7 @@ export function SchemaField({
     if (root) return <>{fields}</>;
     return (
       <section style={{ marginBottom: 20 }}>
-        {required && (
+        {validate && required && (
           <Form.Item
             name={name}
             hidden
@@ -178,7 +202,9 @@ export function SchemaField({
             <ObjectPresenceControl />
           </Form.Item>
         )}
-        <Typography.Text strong>{fieldLabel}</Typography.Text>
+        <Typography.Text className="workflow-node-config__field-label">
+          {fieldLabel}
+        </Typography.Text>
         {schema.description && (
           <Typography.Paragraph type="secondary" style={{ marginBottom: 12 }}>
             {schema.description}
@@ -204,12 +230,12 @@ export function SchemaField({
       <Form.Item
         label={fieldLabel}
         tooltip={schema.description}
-        required={required}
+        required={validate && required}
       >
         <Form.List
           name={name}
           rules={
-            required
+            validate && required
               ? [
                   {
                     validator: async (_, value) => {
@@ -238,6 +264,7 @@ export function SchemaField({
                       name={[field.name]}
                       registry={registry}
                       disabled={disabled}
+                      validate={validate}
                       label={`${singularLabel} ${index + 1}`}
                     />
                   </div>
@@ -262,7 +289,7 @@ export function SchemaField({
               >
                 {t('schema.add', { label: fieldLabel })}
               </Button>
-              <Form.ErrorList errors={errors} />
+              {validate && <Form.ErrorList errors={errors} />}
             </Space>
           )}
         </Form.List>
@@ -289,7 +316,7 @@ export function SchemaField({
       tooltip={schema.description}
       initialValue={schema.default}
       rules={
-        required
+        validate && required
           ? [
               {
                 required: true,

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/SchemaForm.test.tsx

@@ -119,6 +119,81 @@ describe('SchemaForm', () => {
     expect(receivedValues).toContainEqual(['group:ops']);
   });
 
+  it('lets a custom widget render its validation error beside the matching control', async () => {
+    const registry = new WidgetRegistry();
+    let form!: FormInstance;
+    function SqlEditor({ validationErrors }: WidgetProps) {
+      return (
+        <div>
+          <label htmlFor="sql-editor">SQL statement</label>
+          <input id="sql-editor" />
+          {validationErrors?.map((error, index) => (
+            <div key={index}>{error}</div>
+          ))}
+        </div>
+      );
+    }
+    registry.register('sql-editor', SqlEditor);
+
+    function TestForm() {
+      [form] = Form.useForm();
+      return (
+        <Form form={form} initialValues={{ config: { allowWrite: false } }}>
+          <SchemaForm
+            registry={registry}
+            schema={{
+              type: 'object',
+              required: ['allowWrite', 'sql'],
+              properties: {
+                allowWrite: { type: 'boolean' },
+                sql: { type: 'string' },
+              },
+            }}
+            uiSchema={{
+              widget: 'sql-editor',
+              options: { validationErrors: 'widget' },
+            }}
+          />
+        </Form>
+      );
+    }
+    render(<TestForm />);
+
+    await expect(form.validateFields()).rejects.toBeDefined();
+    await waitFor(() =>
+      expect(screen.getAllByText('SQL statement is required')).toHaveLength(1),
+    );
+    expect(
+      screen.getByText('SQL statement is required').parentElement,
+    ).toContainElement(screen.getByLabelText('SQL statement'));
+  });
+
+  it('can disable schema validation for a Workflow draft panel', async () => {
+    let form!: FormInstance;
+    function TestForm() {
+      [form] = Form.useForm();
+      return (
+        <Form form={form}>
+          <SchemaForm
+            validate={false}
+            schema={{
+              type: 'object',
+              required: ['name'],
+              properties: { name: { type: 'string', title: 'Name' } },
+            }}
+          />
+        </Form>
+      );
+    }
+    render(<TestForm />);
+
+    await expect(form.validateFields()).resolves.toBeDefined();
+    expect(screen.getByLabelText('Name')).not.toHaveAttribute(
+      'aria-invalid',
+      'true',
+    );
+  });
+
   it('reports and renders an unknown widget, then clears the error', async () => {
     const onSchemaError = vi.fn();
     const schema = {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/SchemaForm.tsx

@@ -11,6 +11,7 @@ interface SchemaFormProps {
   schema: JsonSchema | null;
   uiSchema?: UiSchema | null;
   disabled?: boolean;
+  validate?: boolean;
   registry?: WidgetRegistry;
   onSchemaError?: (error: Error | null) => void;
 }
@@ -49,6 +50,7 @@ export function SchemaForm({
   schema,
   uiSchema,
   disabled,
+  validate = true,
   registry = defaultWidgetRegistry,
   onSchemaError,
 }: SchemaFormProps) {
@@ -77,6 +79,7 @@ export function SchemaForm({
       name={['config']}
       registry={registry}
       disabled={disabled}
+      validate={validate}
       root
     />
   );

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/default-widgets.tsx

@@ -2,11 +2,20 @@ import { Input, InputNumber, Select, Switch } from 'antd';
 import { ApprovalRuleEditor } from '../widgets/ApprovalRuleEditor';
 import { CallableInputParametersEditor } from '../widgets/CallableInputParametersEditor';
 import { CodeConfigEditor } from '../widgets/CodeConfigEditor';
+import { CronTriggerConfigEditor } from '../widgets/CronTriggerConfigEditor';
+import { DbExecuteConfigEditor } from '../widgets/DbExecuteConfigEditor';
+import { DelayConfigEditor } from '../widgets/DelayConfigEditor';
+import { EventTriggerConfigEditor } from '../widgets/EventTriggerConfigEditor';
 import { ExternalRequestConfigEditor } from '../widgets/ExternalRequestConfigEditor';
 import { ExternalWaitConfigEditor } from '../widgets/ExternalWaitConfigEditor';
+import { ForEachConfigEditor } from '../widgets/ForEachConfigEditor';
 import { HttpRequestConfigEditor } from '../widgets/HttpRequestConfigEditor';
 import { HumanApprovalConfigEditor } from '../widgets/HumanApprovalConfigEditor';
-import { ReturnResultConfigEditor } from '../widgets/ReturnResultConfigEditor';
+import { IfElseConfigEditor } from '../widgets/IfElseConfigEditor';
+import { ManualTriggerConfigEditor } from '../widgets/ManualTriggerConfigEditor';
+import { ParallelConfigEditor } from '../widgets/ParallelConfigEditor';
+import { SubWorkflowConfigEditor } from '../widgets/SubWorkflowConfigEditor';
+import { SwitchConfigEditor } from '../widgets/SwitchConfigEditor';
 import { SubjectPicker } from '../widgets/SubjectPicker';
 import {
   widgetRegistry,
@@ -112,10 +121,19 @@ const DEFAULT_WIDGETS = {
   'human-approval-config': HumanApprovalConfigEditor,
   'http-request-config': HttpRequestConfigEditor,
   'code-config': CodeConfigEditor,
+  'cron-trigger-config': CronTriggerConfigEditor,
   'callable-input-parameters': CallableInputParametersEditor,
-  'return-result-config': ReturnResultConfigEditor,
   'external-request-config': ExternalRequestConfigEditor,
   'external-wait-config': ExternalWaitConfigEditor,
+  'for-each-config': ForEachConfigEditor,
+  'delay-config': DelayConfigEditor,
+  'parallel-config': ParallelConfigEditor,
+  'sub-workflow-config': SubWorkflowConfigEditor,
+  'db-execute-config': DbExecuteConfigEditor,
+  'event-trigger-config': EventTriggerConfigEditor,
+  'if-else-config': IfElseConfigEditor,
+  'manual-trigger-config': ManualTriggerConfigEditor,
+  'switch-config': SwitchConfigEditor,
 } as const;
 
 export function registerDefaultWidgets(

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/schema-form/widget-registry.tsx

@@ -1,4 +1,4 @@
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 import type { JsonSchema, UiOptions } from './schema.types';
 
 export interface WidgetProps<T = unknown> {
@@ -8,6 +8,7 @@ export interface WidgetProps<T = unknown> {
   disabled?: boolean;
   schema: JsonSchema;
   uiOptions?: UiOptions;
+  validationErrors?: ReactNode[];
 }
 
 export type WidgetComponent<T = unknown> = ComponentType<WidgetProps<T>>;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/show.tsx

@@ -9,19 +9,16 @@ import {
   Switch,
   Table,
   Tag,
-  Typography,
   message,
 } from 'antd';
-import {
-  ArrowLeftOutlined,
-  DeleteOutlined,
-  EditOutlined,
-  LinkOutlined,
-} from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined, LinkOutlined } from '@ant-design/icons';
 import { useNavigate, useParams } from 'react-router-dom';
 import { customRequest } from 'helpers/http';
-
-const { Title } = Typography;
+import { PageHeader } from 'components';
+import { PAGE_WRAPPER_STYLE } from 'constants/layout';
+import { useTranslation } from 'react-i18next';
+import { formatWorkflowUtcDateTime } from '../utils/workflowDateTime';
+import '../workflow-ui.css';
 
 interface NodeInstance {
   id: string;
@@ -41,6 +38,7 @@ interface NodeInstance {
 }
 
 export default function NodeInstanceShowPage() {
+  const { t } = useTranslation('workflow');
   const { id } = useParams<{ id: string }>();
   const navigate = useNavigate();
   const [record, setRecord] = useState<NodeInstance | null>(null);
@@ -79,11 +77,11 @@ export default function NodeInstanceShowPage() {
       );
       setRecord(res);
     } catch (e: any) {
-      message.error(e?.message ?? 'Failed to load');
+      message.error(e?.message ?? t('nodeInstance.loadFailed'));
     } finally {
       setLoading(false);
     }
-  }, [id]);
+  }, [id, t]);
 
   useEffect(() => {
     fetchRecord();
@@ -94,17 +92,20 @@ export default function NodeInstanceShowPage() {
     setRefsLoading(true);
     customRequest<any[]>(`workflowNodeInstance/${id}/references`, 'POST')
       .then((res) => setReferences(Array.isArray(res) ? res : []))
-      .catch(() => setReferences([]))
+      .catch(() => {
+        setReferences([]);
+        message.error(t('nodeInstance.referencesLoadFailed'));
+      })
       .finally(() => setRefsLoading(false));
-  }, [id]);
+  }, [id, t]);
 
   async function handleDelete() {
     try {
       await customRequest(`workflowNodeInstance/deleteUnique/${id}`, 'DELETE');
-      message.success('Deleted');
+      message.success(t('nodeInstance.deleted'));
       navigate('/admin/workflow/node-instances');
     } catch (e: any) {
-      message.error(e?.message ?? 'Delete failed');
+      message.error(e?.message ?? t('nodeInstance.deleteFailed'));
     }
   }
 
@@ -119,7 +120,9 @@ export default function NodeInstanceShowPage() {
   }
 
   if (!record) {
-    return <div style={{ padding: 24 }}>Record not found</div>;
+    return (
+      <div style={{ padding: 24 }}>{t('nodeInstance.recordNotFound')}</div>
+    );
   }
 
   const configSchema = record.nodeType?.configSchema as any;
@@ -127,89 +130,79 @@ export default function NodeInstanceShowPage() {
   const configData = record.config;
 
   return (
-    <div
-      style={{
-        background: 'var(--ant-color-bg-layout)',
-        minHeight: 'calc(100vh - 64px)',
-      }}
-    >
-      <Card style={{ marginBottom: 16 }}>
-        <div
-          style={{
-            display: 'flex',
-            justifyContent: 'space-between',
-            alignItems: 'center',
-          }}
-        >
+    <div className="workflow-page-stack" style={PAGE_WRAPPER_STYLE}>
+      <PageHeader
+        title={record.name}
+        subtitle={t('nodeInstance.detailDescription')}
+        extra={
           <Space>
-            <Button
-              type="text"
-              icon={<ArrowLeftOutlined />}
-              onClick={() => navigate('/admin/workflow/node-instances')}
-            >
-              Back
+            <Button onClick={() => navigate('/admin/workflow/node-instances')}>
+              {t('common.back')}
             </Button>
-            <Title level={4} style={{ margin: 0 }}>
-              {record.name}
-            </Title>
-          </Space>
-          <Space>
             <Button
               icon={<EditOutlined />}
               onClick={() =>
                 navigate(`/admin/workflow/node-instances/edit/${id}`)
               }
             >
-              Edit
+              {t('common.edit')}
             </Button>
             <Popconfirm
-              title="Delete this instance?"
-              description="This action cannot be undone."
-              okText="Delete"
-              cancelText="Cancel"
+              title={t('nodeInstance.deleteConfirm')}
+              description={t('nodeInstance.deleteWarning')}
+              okText={t('common.delete')}
+              cancelText={t('common.cancel')}
               okButtonProps={{ danger: true }}
               onConfirm={handleDelete}
             >
               <Button danger icon={<DeleteOutlined />}>
-                Delete
+                {t('common.delete')}
               </Button>
             </Popconfirm>
           </Space>
-        </div>
-      </Card>
+        }
+      />
 
-      <Card title="Basic Info" style={{ marginBottom: 16 }}>
+      <Card title={t('nodeInstance.basicInfo')}>
         <Descriptions column={2}>
-          <Descriptions.Item label="Name">{record.name}</Descriptions.Item>
-          <Descriptions.Item label="Node Type">
+          <Descriptions.Item label={t('common.name')}>
+            {record.name}
+          </Descriptions.Item>
+          <Descriptions.Item label={t('nodeInstance.nodeType')}>
             <Space>
               <span>{record.nodeType?.label ?? '—'}</span>
               {record.nodeType?.category && (
-                <Tag color="blue">{record.nodeType.category}</Tag>
+                <Tag color="blue">
+                  {t(`nodeCategories.${record.nodeType.category}`, {
+                    defaultValue: record.nodeType.category,
+                  })}
+                </Tag>
               )}
             </Space>
           </Descriptions.Item>
-          <Descriptions.Item label="Description">
+          <Descriptions.Item label={t('common.description')}>
             {record.description || '—'}
           </Descriptions.Item>
-          <Descriptions.Item label="Enabled">
+          <Descriptions.Item label={t('common.enabled')}>
             <Switch size="small" checked={record.isEnabled} disabled />
           </Descriptions.Item>
-          <Descriptions.Item label="Creator">
+          <Descriptions.Item label={t('instances.creator')}>
             {record.creator || '—'}
           </Descriptions.Item>
-          <Descriptions.Item label="Created">
-            {new Date(record.createdAt).toLocaleString()}
+          <Descriptions.Item label={t('nodeInstance.createdAt')}>
+            {formatWorkflowUtcDateTime(record.createdAt)}
           </Descriptions.Item>
-          <Descriptions.Item label="Updated">
-            {new Date(record.updatedAt).toLocaleString()}
+          <Descriptions.Item label={t('list.updatedAt')}>
+            {formatWorkflowUtcDateTime(record.updatedAt)}
           </Descriptions.Item>
         </Descriptions>
       </Card>
 
-      <Card title="Configuration">
+      <Card title={t('common.configuration')}>
         {Object.keys(configData).length === 0 ? (
-          <span style={{ color: '#999' }}>No configuration</span>
+          <span style={{ color: '#999' }}>
+            {t('nodeInstance.noConfiguration')}
+          </span>
         ) : (
           <Descriptions column={1} bordered size="small">
             {Object.entries(configData).map(([key, value]) => {
@@ -233,11 +226,13 @@ export default function NodeInstanceShowPage() {
         )}
       </Card>
 
-      <Card title="Referenced By" style={{ marginTop: 16 }}>
+      <Card title={t('nodeInstance.referencedBy')}>
         {refsLoading ? (
           <Spin size="small" />
         ) : references.length === 0 ? (
-          <span style={{ color: '#999' }}>暂无工作流引用此实例</span>
+          <span style={{ color: '#999' }}>
+            {t('nodeInstance.noReferences')}
+          </span>
         ) : (
           <Table
             dataSource={references}
@@ -260,13 +255,13 @@ export default function NodeInstanceShowPage() {
                 ),
               },
               {
-                title: 'Version',
+                title: t('list.version'),
                 dataIndex: 'version',
                 width: 80,
                 render: (v: number) => `v${v}`,
               },
               {
-                title: 'Node',
+                title: t('nodeInstance.node'),
                 dataIndex: 'nodeLabel',
               },
             ]}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/ApprovalRuleEditor.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { render, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
+import i18n from '../../../../i18n';
 import { ApprovalRuleEditor } from './ApprovalRuleEditor';
 
 describe('ApprovalRuleEditor', () => {
@@ -17,4 +18,35 @@ describe('ApprovalRuleEditor', () => {
 
     await waitFor(() => expect(onChange).toHaveBeenCalledWith({ mode: 'ANY' }));
   });
+
+  it('materializes thresholds when switching to a threshold rule', async () => {
+    await i18n.changeLanguage('zh_CN');
+    const onChange = vi.fn();
+    render(
+      <ApprovalRuleEditor
+        value={{ mode: 'ANY' }}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    fireEvent.mouseDown(screen.getByRole('combobox'));
+    fireEvent.click(await screen.findByText('指定人数通过'));
+
+    expect(onChange).toHaveBeenCalledWith({ mode: 'COUNT', count: 1 });
+  });
+
+  it('uses rejection wording for rejection rules', async () => {
+    await i18n.changeLanguage('zh_CN');
+    render(
+      <ApprovalRuleEditor
+        value={{ mode: 'ANY' }}
+        onChange={vi.fn()}
+        schema={{ type: 'object' }}
+        decision="REJECT"
+      />,
+    );
+
+    expect(screen.getByText('任一人拒绝')).toBeInTheDocument();
+  });
 });