@gadmin2n/schematics 0.0.144 → 0.0.146

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

@@ -5,8 +5,8 @@ import { useTranslation } from 'react-i18next';
 
 type Rule = {
   mode: 'ANY' | 'ALL' | 'COUNT' | 'PERCENTAGE';
-  count?: number;
-  percentage?: number;
+  count?: number | null;
+  percentage?: number | null;
 };
 
 export function ApprovalRuleEditor({
@@ -14,7 +14,8 @@ export function ApprovalRuleEditor({
   onChange,
   disabled,
   schema,
-}: WidgetProps<Rule>) {
+  decision = 'APPROVE',
+}: WidgetProps<Rule> & { decision?: 'APPROVE' | 'REJECT' }) {
   const { t } = useTranslation('workflow');
   const schemaDefault = schema.default as Rule | undefined;
   const defaultRule: Rule = schemaDefault?.mode
@@ -33,37 +34,68 @@ export function ApprovalRuleEditor({
         value={rule.mode}
         disabled={disabled}
         options={[
-          { label: t('approval.any'), value: 'ANY' },
-          { label: t('approval.all'), value: 'ALL' },
-          { label: t('approval.people'), value: 'COUNT' },
-          { label: t('approval.percentage'), value: 'PERCENTAGE' },
+          {
+            label: t(
+              decision === 'REJECT'
+                ? 'approval.anyReject'
+                : 'approval.anyApprove',
+            ),
+            value: 'ANY',
+          },
+          {
+            label: t(
+              decision === 'REJECT'
+                ? 'approval.allReject'
+                : 'approval.allApprove',
+            ),
+            value: 'ALL',
+          },
+          {
+            label: t(
+              decision === 'REJECT'
+                ? 'approval.countReject'
+                : 'approval.countApprove',
+            ),
+            value: 'COUNT',
+          },
+          {
+            label: t(
+              decision === 'REJECT'
+                ? 'approval.percentageReject'
+                : 'approval.percentageApprove',
+            ),
+            value: 'PERCENTAGE',
+          },
         ]}
-        onChange={(mode) => onChange({ mode })}
+        onChange={(mode) =>
+          onChange(
+            mode === 'COUNT'
+              ? { mode, count: rule.count ?? 1 }
+              : mode === 'PERCENTAGE'
+                ? { mode, percentage: rule.percentage ?? 100 }
+                : { mode },
+          )
+        }
         style={{ minWidth: 150 }}
       />
       {rule.mode === 'COUNT' && (
         <InputNumber
-          min={1}
           precision={0}
           value={rule.count}
           disabled={disabled}
           placeholder={t('approval.people')}
-          onChange={(count) => onChange({ ...rule, count: count ?? undefined })}
+          onChange={(count) => onChange({ ...rule, count })}
           style={{ width: '100%' }}
         />
       )}
       {rule.mode === 'PERCENTAGE' && (
         <InputNumber
-          min={1}
-          max={100}
           precision={0}
           value={rule.percentage}
           disabled={disabled}
           addonAfter="%"
           placeholder={t('approval.percentage')}
-          onChange={(percentage) =>
-            onChange({ ...rule, percentage: percentage ?? undefined })
-          }
+          onChange={(percentage) => onChange({ ...rule, percentage })}
           style={{ width: '100%' }}
         />
       )}

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

@@ -0,0 +1,104 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import i18n from '../../../../i18n';
+import { IfElseConfigEditor } from './IfElseConfigEditor';
+import { ParallelConfigEditor } from './ParallelConfigEditor';
+import { SwitchConfigEditor } from './SwitchConfigEditor';
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: () => ({
+    matches: false,
+    addListener: () => undefined,
+    removeListener: () => undefined,
+    addEventListener: () => undefined,
+    removeEventListener: () => undefined,
+    dispatchEvent: () => false,
+  }),
+});
+
+describe('branch config editors', () => {
+  it('keeps an incomplete condition editable without showing an error', async () => {
+    await i18n.changeLanguage('zh_CN');
+    const onChange = vi.fn();
+    render(
+      <IfElseConfigEditor
+        value={{
+          conditions: [
+            {
+              id: 'condition-1',
+              left: { source: 'INPUT', path: '' },
+              operator: 'EQ',
+              right: { source: 'FIXED', valueType: 'STRING', value: '' },
+            },
+          ],
+          combineOperation: 'AND',
+        }}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    expect(screen.getAllByRole('textbox')[0]).toHaveValue('');
+    expect(
+      screen.queryByText('请填写字段路径或有效的固定值'),
+    ).not.toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: '删除条件 1' }));
+    expect(onChange).toHaveBeenLastCalledWith(
+      expect.objectContaining({ conditions: [] }),
+    );
+  });
+
+  it('keeps a Switch output id when its visible name changes', async () => {
+    await i18n.changeLanguage('zh_CN');
+    const onChange = vi.fn();
+    render(
+      <SwitchConfigEditor
+        value={{
+          valueBinding: { source: 'INPUT', path: 'status' },
+          cases: [
+            {
+              id: 'case-paid',
+              label: '待支付',
+              valueType: 'STRING',
+              value: 'PENDING',
+            },
+          ],
+        }}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    fireEvent.change(screen.getByRole('textbox', { name: '分支名称' }), {
+      target: { value: '等待付款' },
+    });
+
+    expect(onChange).toHaveBeenCalledWith(
+      expect.objectContaining({
+        cases: [
+          expect.objectContaining({ id: 'case-paid', label: '等待付款' }),
+        ],
+      }),
+    );
+    expect(screen.getByText('当判断数据等于')).toBeInTheDocument();
+    expect(screen.getByText('进入分支')).toBeInTheDocument();
+    expect(screen.getByText(/其他情况/)).toBeInTheDocument();
+  });
+
+  it('allows deleting Parallel branches below the publish minimum', async () => {
+    await i18n.changeLanguage('zh_CN');
+    const onChange = vi.fn();
+    render(
+      <ParallelConfigEditor
+        value={{ branches: [{ id: 'only', label: '唯一分支' }] }}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: '删除分支 0' }));
+    expect(onChange).toHaveBeenCalledWith({ branches: [] });
+  });
+});

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

@@ -16,7 +16,6 @@ export function CallableInputParametersEditor({
 }: WidgetProps<CallableInputParameter[] | undefined>) {
   const { t } = useTranslation('workflow');
   const parameters = Array.isArray(value) ? value : [];
-  const normalizedKeys = parameters.map((parameter) => parameter.key?.trim());
 
   function update(index: number, patch: Partial<CallableInputParameter>): void {
     onChange(
@@ -27,7 +26,7 @@ export function CallableInputParametersEditor({
   }
 
   return (
-    <div>
+    <div className="callable-input-parameters">
       <Typography.Paragraph type="secondary" style={{ margin: '0 0 12px' }}>
         {t('callableInputs.description')}
       </Typography.Paragraph>
@@ -38,58 +37,29 @@ export function CallableInputParametersEditor({
       )}
 
       {parameters.map((parameter, index) => {
-        const key = normalizedKeys[index];
-        const duplicate =
-          Boolean(key) &&
-          normalizedKeys.filter((candidate) => candidate === key).length > 1;
         const name =
           parameter.label?.trim() ||
-          key ||
+          parameter.key?.trim() ||
           t('callableInputs.parameterNumber', { number: index + 1 });
 
         return (
-          <div
-            key={index}
-            style={{
-              display: 'grid',
-              gridTemplateColumns:
-                'minmax(150px, 1fr) minmax(150px, 1fr) auto auto',
-              alignItems: 'start',
-              gap: 12,
-              marginBottom: 10,
-              padding: 12,
-              border: '1px solid #e8e8e8',
-              borderRadius: 8,
-              background: '#fafafa',
-            }}
-          >
+          <div key={index} className="callable-input-parameters__row">
             <div>
-              <Typography.Text strong style={{ fontSize: 12 }}>
+              <Typography.Text strong>
                 {t('callableInputs.key')}
               </Typography.Text>
               <Input
                 aria-label={t('callableInputs.key')}
                 value={parameter.key}
                 disabled={disabled}
-                status={!key || duplicate ? 'error' : undefined}
                 placeholder={t('callableInputs.keyPlaceholder')}
                 onChange={(event) => update(index, { key: event.target.value })}
                 style={{ marginTop: 4 }}
               />
-              {(!key || duplicate) && (
-                <Typography.Text
-                  type="danger"
-                  style={{ display: 'block', marginTop: 4, fontSize: 12 }}
-                >
-                  {duplicate
-                    ? t('callableInputs.duplicateKey')
-                    : t('callableInputs.keyRequired')}
-                </Typography.Text>
-              )}
             </div>
 
             <div>
-              <Typography.Text strong style={{ fontSize: 12 }}>
+              <Typography.Text strong>
                 {t('callableInputs.label')}
               </Typography.Text>
               <Input
@@ -104,11 +74,11 @@ export function CallableInputParametersEditor({
               />
             </div>
 
-            <div style={{ minWidth: 88 }}>
-              <Typography.Text strong style={{ fontSize: 12 }}>
-                {t('callableInputs.required')}
-              </Typography.Text>
-              <div style={{ marginTop: 8 }}>
+            <div className="callable-input-parameters__actions">
+              <div className="callable-input-parameters__required">
+                <Typography.Text strong>
+                  {t('callableInputs.required')}
+                </Typography.Text>
                 <Switch
                   aria-label={t('callableInputs.requiredAria', { name })}
                   checked={Boolean(parameter.required)}
@@ -116,19 +86,18 @@ export function CallableInputParametersEditor({
                   onChange={(required) => update(index, { required })}
                 />
               </div>
-            </div>
 
-            <Button
-              type="text"
-              danger
-              aria-label={t('callableInputs.remove', { name })}
-              icon={<DeleteOutlined />}
-              disabled={disabled}
-              onClick={() =>
-                onChange(parameters.filter((_, current) => current !== index))
-              }
-              style={{ marginTop: 20 }}
-            />
+              <Button
+                type="text"
+                danger
+                aria-label={t('callableInputs.remove', { name })}
+                icon={<DeleteOutlined />}
+                disabled={disabled}
+                onClick={() =>
+                  onChange(parameters.filter((_, current) => current !== index))
+                }
+              />
+            </div>
           </div>
         );
       })}
@@ -136,6 +105,7 @@ export function CallableInputParametersEditor({
       <Button
         type="dashed"
         block
+        className="workflow-panel-action"
         aria-label={t('callableInputs.add')}
         icon={<PlusOutlined />}
         disabled={disabled}

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

@@ -0,0 +1,72 @@
+import { render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import i18n from '../../../../i18n';
+import { CodeConfigEditor } from './CodeConfigEditor';
+
+vi.mock('@monaco-editor/react', () => ({
+  default: () => <div data-testid="code-editor" />,
+}));
+
+const schema = {
+  type: 'object' as const,
+  properties: {
+    mode: { type: 'string' as const, enum: ['runOnceForAll'] },
+    timeout: { type: 'integer' as const, minimum: 1, maximum: 5000 },
+  },
+};
+
+describe('CodeConfigEditor context guidance', () => {
+  beforeEach(async () => {
+    await i18n.changeLanguage('zh_CN');
+  });
+
+  it.each([
+    ['node', undefined, '返回值会传给下一个节点。'],
+    [
+      'approverLookup',
+      '查询审批人接口返回的 { status, data, headers }。',
+      '返回 { subjects: [{ provider, refs }] }，用于确定本次审批人。',
+    ],
+    [
+      'approvalCreation',
+      '创建外部审批后，接口返回的 { status, data, headers }。',
+      '用于检查创建结果，不会传给下一个节点；创建失败时请抛出错误。',
+    ],
+    [
+      'approvalCallback',
+      '已通过 callbackToken 定位的本次外部回调。',
+      '返回统一的审批决定，用于计算本次审批结果。',
+    ],
+  ] as const)('shows the %s runtime contract', (context, scoped, output) => {
+    render(
+      <CodeConfigEditor
+        context={context}
+        value={{
+          script: 'return input;',
+          mode: 'runOnceForAll',
+          timeout: 5000,
+        }}
+        onChange={vi.fn()}
+        schema={schema}
+      />,
+    );
+
+    expect(
+      screen.getByText(
+        context === 'node'
+          ? '上一个节点的结果。'
+          : '人工审批节点从上一个节点收到的结果。',
+      ),
+    ).toBeInTheDocument();
+    if (scoped) expect(screen.getByText(scoped)).toBeInTheDocument();
+    expect(screen.getByText(output)).toBeInTheDocument();
+    expect(
+      screen.getByText('Workflow 最初收到的启动数据。'),
+    ).toBeInTheDocument();
+    expect(screen.queryByText('运行模式')).not.toBeInTheDocument();
+    expect(screen.getByRole('spinbutton')).toHaveValue('5000');
+    expect(
+      screen.queryByText(/input\.previous|input\.result/),
+    ).not.toBeInTheDocument();
+  });
+});

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

@@ -1,13 +1,31 @@
-import Editor from '@monaco-editor/react';
-import { Card, InputNumber, Select, Space, Typography } from 'antd';
+import { Card, InputNumber, Space, Typography } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { WorkflowCodeEditor } from '../../components/WorkflowCodeEditor';
 import type { WidgetProps } from '../schema-form/widget-registry';
+import './code-config.css';
 
 type CodeConfig = {
   script?: string;
-  mode?: 'runOnceForAll' | 'runOnceForEach';
-  timeout?: number;
+  mode?: 'runOnceForAll';
+  timeout?: number | null;
+};
+type CodeContext =
+  | 'node'
+  | 'approverLookup'
+  | 'approvalCreation'
+  | 'approvalCallback';
+type ContextVariable =
+  | 'input'
+  | 'workflow'
+  | 'approval'
+  | 'response'
+  | 'callback'
+  | 'return';
+
+type CodeConfigEditorProps = WidgetProps<CodeConfig | undefined> & {
+  context?: CodeContext;
+  embedded?: boolean;
 };
 
 const DEFAULT_SCRIPT = `// input: value returned by the previous node.
@@ -15,89 +33,79 @@ const DEFAULT_SCRIPT = `// input: value returned by the previous node.
 // HTTP Request returns { status, data, headers }.
 return input;`;
 
+const CONTEXT_VARIABLES: Record<CodeContext, ContextVariable[]> = {
+  node: ['input', 'workflow', 'return'],
+  approverLookup: ['input', 'workflow', 'response', 'return'],
+  approvalCreation: ['input', 'workflow', 'approval', 'response', 'return'],
+  approvalCallback: ['input', 'workflow', 'approval', 'callback', 'return'],
+};
+
 export function CodeConfigEditor({
   value,
   onChange,
   disabled,
-}: WidgetProps<CodeConfig | undefined>) {
+  context = 'node',
+  embedded = false,
+}: CodeConfigEditorProps) {
   const { t } = useTranslation('workflow');
   const config: Required<CodeConfig> = {
     script: value?.script ?? DEFAULT_SCRIPT,
-    mode: value?.mode ?? 'runOnceForAll',
-    timeout: value?.timeout ?? 1000,
+    mode: 'runOnceForAll',
+    timeout: value?.timeout === undefined ? 5000 : value.timeout,
   };
-
   function update(patch: Partial<CodeConfig>) {
     onChange({ ...config, ...patch });
   }
 
+  React.useEffect(() => {
+    if (
+      value?.mode !== 'runOnceForAll' ||
+      value?.timeout === undefined ||
+      value?.script === undefined
+    )
+      onChange({
+        script: value?.script ?? DEFAULT_SCRIPT,
+        mode: 'runOnceForAll',
+        timeout: value?.timeout ?? 5000,
+      });
+  }, [onChange, value]);
+
   return (
-    <Space direction="vertical" size={12} style={{ width: '100%' }}>
+    <Space
+      className={`workflow-code-config${embedded ? ' workflow-code-config--embedded' : ''}`}
+      direction="vertical"
+      size={12}
+      style={{ width: '100%' }}
+    >
       <Card size="small" title={t('code.javascript')}>
-        <Typography.Paragraph type="secondary">
-          {t('code.description')}
-        </Typography.Paragraph>
-        <div
-          style={{
-            height: 320,
-            overflow: 'hidden',
-            border: '1px solid #d9d9d9',
-            borderRadius: 6,
-          }}
-        >
-          <Editor
-            height="320px"
-            language="javascript"
-            value={config.script}
-            onChange={(script) => update({ script: script ?? '' })}
-            options={{
-              readOnly: disabled,
-              minimap: { enabled: false },
-              fontSize: 13,
-              lineNumbers: 'on',
-              scrollBeyondLastLine: false,
-              automaticLayout: true,
-              tabSize: 2,
-              wordWrap: 'on',
-            }}
-          />
+        <div className="workflow-code-context">
+          {CONTEXT_VARIABLES[context].map((name) => (
+            <div className="workflow-code-context__row" key={name}>
+              <code>{name}</code>
+              <Typography.Text type="secondary">
+                {t(`code.context.${context}.${name}`)}
+              </Typography.Text>
+            </div>
+          ))}
         </div>
+        <WorkflowCodeEditor
+          language="javascript"
+          value={config.script}
+          onChange={(script) => update({ script })}
+          readOnly={disabled}
+          height={320}
+          ariaLabel={t('code.javascript')}
+        />
       </Card>
 
-      <Card size="small" title={t('code.executionLimits')}>
-        <div
-          style={{
-            display: 'grid',
-            gridTemplateColumns: 'minmax(220px, 1fr) minmax(180px, 1fr)',
-            gap: 16,
-          }}
-        >
-          <div>
-            <Typography.Text>{t('code.runMode')}</Typography.Text>
-            <Select
-              value={config.mode}
-              disabled={disabled}
-              onChange={(mode) => update({ mode })}
-              options={[
-                { value: 'runOnceForAll', label: t('code.runOnceAll') },
-                { value: 'runOnceForEach', label: t('code.runOnceEach') },
-              ]}
-              style={{ width: '100%', marginTop: 6 }}
-            />
-          </div>
-          <div>
-            <Typography.Text>{t('code.timeoutMilliseconds')}</Typography.Text>
-            <InputNumber
-              min={1}
-              max={5000}
-              value={config.timeout}
-              disabled={disabled}
-              onChange={(timeout) => update({ timeout: timeout ?? 1000 })}
-              style={{ width: '100%', marginTop: 6 }}
-            />
-          </div>
-        </div>
-      </Card>
+      <div className="workflow-code-config__timeout">
+        <Typography.Text>{t('code.timeoutMilliseconds')}</Typography.Text>
+        <InputNumber
+          value={config.timeout}
+          disabled={disabled}
+          onChange={(timeout) => update({ timeout })}
+        />
+      </div>
     </Space>
   );
 }