@gadmin2n/schematics 0.0.142 → 0.0.144

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

@@ -1,33 +1,18 @@
-import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
-import {
-  Alert,
-  Button,
-  Card,
-  Input,
-  InputNumber,
-  Select,
-  Space,
-  Switch,
-  Typography,
-  message,
-} from 'antd';
-import { customRequest } from 'helpers/http';
-import { useEffect, useState } from 'react';
+import { Alert, Card, InputNumber, Radio, Space, Typography } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { ParameterBindingEditor } from '../../components/ParameterBindingEditor';
 import type { ParameterBinding } from '../../types/parameter-binding';
 import type { WidgetProps } from '../schema-form/widget-registry';
 
-type Outcome = { code: string; label: string };
+type TimeoutConfig =
+  | { mode: 'DEADLINE'; deadlineBinding: ParameterBinding }
+  | { mode: 'DURATION'; durationSeconds: number }
+  | { mode: 'NONE' };
+
 type ExternalWaitConfig = {
-  dispatchWorkflowId?: string;
-  callbackWorkflowId?: string;
-  outcomes?: Outcome[];
-  timeout?: { durationSeconds?: number; outcome?: string };
-  businessDataBinding?: ParameterBinding;
-  participantsBinding?: ParameterBinding;
+  callbackTokenBinding?: ParameterBinding;
+  timeout?: TimeoutConfig;
 };
-type WorkflowOption = { id: string; name: string };
 
 export function ExternalWaitConfigEditor({
   value,
@@ -36,41 +21,32 @@ export function ExternalWaitConfigEditor({
 }: WidgetProps<ExternalWaitConfig>) {
   const { t } = useTranslation('workflow');
   const config = value ?? {};
-  const outcomes = config.outcomes ?? [];
-  const [options, setOptions] = useState<{
-    dispatchWorkflows: WorkflowOption[];
-    callbackWorkflows: WorkflowOption[];
-  }>({ dispatchWorkflows: [], callbackWorkflows: [] });
-
-  useEffect(() => {
-    customRequest<{
-      dispatchWorkflows: WorkflowOption[];
-      callbackWorkflows: WorkflowOption[];
-    }>('workflow/external-interaction-options', 'GET')
-      .then(setOptions)
-      .catch((error: any) =>
-        message.error(error?.message ?? t('externalWait.workflowLoadFailed')),
-      );
-  }, [t]);
+  const timeout = config.timeout ?? {
+    mode: 'DEADLINE' as const,
+    deadlineBinding: { source: 'WORKFLOW' as const, path: 'expiresAt' },
+  };
 
   function update(patch: Partial<ExternalWaitConfig>) {
-    const next = { ...config, ...patch };
-    for (const [key, item] of Object.entries(patch)) {
-      if (item === undefined) delete (next as Record<string, unknown>)[key];
-    }
-    onChange(next);
+    onChange({ ...config, ...patch });
   }
 
-  function updateOutcome(index: number, patch: Partial<Outcome>) {
-    update({
-      outcomes: outcomes.map((item, itemIndex) =>
-        itemIndex === index ? { ...item, ...patch } : item,
-      ),
-    });
+  function changeTimeoutMode(mode: TimeoutConfig['mode']) {
+    if (mode === 'DEADLINE') {
+      update({
+        timeout: {
+          mode,
+          deadlineBinding: { source: 'WORKFLOW', path: 'expiresAt' },
+        },
+      });
+    } else if (mode === 'DURATION') {
+      update({ timeout: { mode, durationSeconds: 86400 } });
+    } else {
+      update({ timeout: { mode } });
+    }
   }
 
   return (
-    <Space direction="vertical" size={16} style={{ width: '100%' }}>
+    <Space direction="vertical" size={12} style={{ width: '100%' }}>
       <Alert
         type="info"
         showIcon
@@ -78,215 +54,69 @@ export function ExternalWaitConfigEditor({
         description={t('externalWait.hint')}
       />
 
-      <Card size="small" title={t('externalWait.workflows')}>
-        <Space direction="vertical" size={12} style={{ width: '100%' }}>
-          <div>
-            <Typography.Text strong>
-              {t('externalWait.dispatchWorkflow')} *
-            </Typography.Text>
-            <Select
-              value={config.dispatchWorkflowId || undefined}
+      <Card size="small" title={t('externalWait.callbackToken')}>
+        <ParameterBindingEditor
+          name={t('externalWait.callbackToken')}
+          defaultPath="callbackToken"
+          value={
+            config.callbackTokenBinding ?? {
+              source: 'WORKFLOW',
+              path: 'callbackToken',
+            }
+          }
+          disabled={disabled}
+          onChange={(callbackTokenBinding) => update({ callbackTokenBinding })}
+        />
+      </Card>
+
+      <Card size="small" title={t('externalWait.timeout')}>
+        <Radio.Group
+          value={timeout.mode}
+          disabled={disabled}
+          onChange={(event) => changeTimeoutMode(event.target.value)}
+        >
+          <Space direction="vertical">
+            <Radio value="DEADLINE">{t('externalWait.deadline')}</Radio>
+            <Radio value="DURATION">{t('externalWait.duration')}</Radio>
+            <Radio value="NONE">{t('externalWait.noTimeout')}</Radio>
+          </Space>
+        </Radio.Group>
+
+        {timeout.mode === 'DEADLINE' && (
+          <div style={{ marginTop: 12 }}>
+            <ParameterBindingEditor
+              name={t('externalWait.deadlineField')}
+              defaultPath="expiresAt"
+              value={timeout.deadlineBinding}
               disabled={disabled}
-              options={options.dispatchWorkflows.map((workflow) => ({
-                value: workflow.id,
-                label: workflow.name,
-              }))}
-              placeholder={t('externalWait.selectDispatchWorkflow')}
-              onChange={(dispatchWorkflowId) => update({ dispatchWorkflowId })}
-              showSearch
-              optionFilterProp="label"
-              style={{ width: '100%', marginTop: 6 }}
+              onChange={(deadlineBinding) =>
+                update({ timeout: { mode: 'DEADLINE', deadlineBinding } })
+              }
             />
-            <Typography.Text type="secondary">
-              {t('externalWait.dispatchHint')}
-            </Typography.Text>
           </div>
+        )}
 
-          <div>
-            <Typography.Text strong>
-              {t('externalWait.callbackWorkflow')}
-            </Typography.Text>
-            <Select
-              value={config.callbackWorkflowId || undefined}
+        {timeout.mode === 'DURATION' && (
+          <div style={{ marginTop: 12 }}>
+            <InputNumber
+              min={1}
+              precision={0}
+              value={timeout.durationSeconds}
               disabled={disabled}
-              allowClear
-              options={options.callbackWorkflows.map((workflow) => ({
-                value: workflow.id,
-                label: workflow.name,
-              }))}
-              placeholder={t('externalWait.selectCallbackWorkflow')}
-              onChange={(callbackWorkflowId) => update({ callbackWorkflowId })}
-              showSearch
-              optionFilterProp="label"
-              style={{ width: '100%', marginTop: 6 }}
+              addonAfter={t('externalWait.seconds')}
+              onChange={(durationSeconds) =>
+                update({
+                  timeout: {
+                    mode: 'DURATION',
+                    durationSeconds: durationSeconds ?? 86400,
+                  },
+                })
+              }
+              style={{ width: '100%' }}
             />
-            <Typography.Text type="secondary">
-              {t('externalWait.callbackHint')}
-            </Typography.Text>
-          </div>
-        </Space>
-      </Card>
-
-      <Card size="small" title={t('externalWait.data')}>
-        <Space direction="vertical" size={14} style={{ width: '100%' }}>
-          <div>
-            <Space>
-              <Switch
-                size="small"
-                checked={Boolean(config.businessDataBinding)}
-                disabled={disabled}
-                onChange={(checked) =>
-                  update({
-                    businessDataBinding: checked
-                      ? { source: 'INPUT', path: 'data' }
-                      : undefined,
-                  })
-                }
-              />
-              <Typography.Text>
-                {t('externalWait.customBusinessData')}
-              </Typography.Text>
-            </Space>
-            {!config.businessDataBinding && (
-              <Typography.Paragraph
-                type="secondary"
-                style={{ margin: '6px 0 0' }}
-              >
-                {t('externalWait.defaultBusinessData')}
-              </Typography.Paragraph>
-            )}
-            {config.businessDataBinding && (
-              <div style={{ marginTop: 8 }}>
-                <ParameterBindingEditor
-                  name={t('externalWait.businessData')}
-                  defaultPath="data"
-                  value={config.businessDataBinding}
-                  disabled={disabled}
-                  onChange={(businessDataBinding) =>
-                    update({ businessDataBinding })
-                  }
-                />
-              </div>
-            )}
-          </div>
-
-          <div>
-            <Space>
-              <Switch
-                size="small"
-                checked={Boolean(config.participantsBinding)}
-                disabled={disabled}
-                onChange={(checked) =>
-                  update({
-                    participantsBinding: checked
-                      ? { source: 'WORKFLOW', path: 'participants' }
-                      : undefined,
-                  })
-                }
-              />
-              <Typography.Text>
-                {t('externalWait.sendParticipants')}
-              </Typography.Text>
-            </Space>
-            {config.participantsBinding && (
-              <div style={{ marginTop: 8 }}>
-                <ParameterBindingEditor
-                  name={t('externalWait.participants')}
-                  defaultPath="participants"
-                  value={config.participantsBinding}
-                  disabled={disabled}
-                  onChange={(participantsBinding) =>
-                    update({ participantsBinding })
-                  }
-                />
-              </div>
-            )}
           </div>
-        </Space>
-      </Card>
-
-      <Card
-        size="small"
-        title={t('externalWait.outcomes')}
-        extra={
-          <Button
-            type="link"
-            size="small"
-            icon={<PlusOutlined />}
-            disabled={disabled}
-            onClick={() =>
-              update({
-                outcomes: [
-                  ...outcomes,
-                  { code: `RESULT_${outcomes.length + 1}`, label: '' },
-                ],
-              })
-            }
-          >
-            {t('externalWait.addOutcome')}
-          </Button>
-        }
-      >
-        <Space direction="vertical" size={10} style={{ width: '100%' }}>
-          {outcomes.map((outcome, index) => (
-            <Space.Compact key={index} style={{ width: '100%' }}>
-              <Input
-                aria-label={t('externalWait.outcomeLabel')}
-                value={outcome.label}
-                disabled={disabled}
-                placeholder={t('externalWait.outcomeLabel')}
-                onChange={(event) =>
-                  updateOutcome(index, { label: event.target.value })
-                }
-              />
-              <Input
-                aria-label={t('externalWait.outcomeCode')}
-                value={outcome.code}
-                disabled={disabled}
-                placeholder="COMPLETED"
-                onChange={(event) =>
-                  updateOutcome(index, {
-                    code: normalizeOutcomeCode(event.target.value),
-                  })
-                }
-              />
-              <Button
-                aria-label={t('externalWait.removeOutcome')}
-                icon={<DeleteOutlined />}
-                disabled={disabled || outcomes.length <= 1}
-                onClick={() =>
-                  update({
-                    outcomes: outcomes.filter(
-                      (_item, itemIndex) => itemIndex !== index,
-                    ),
-                  })
-                }
-              />
-            </Space.Compact>
-          ))}
-          <Typography.Text type="secondary">
-            {t('externalWait.outcomeHint')}
-          </Typography.Text>
-        </Space>
-      </Card>
+        )}
 
-      <Card size="small" title={t('externalWait.timeout')}>
-        <InputNumber
-          min={1}
-          precision={0}
-          value={config.timeout?.durationSeconds ?? 86400}
-          disabled={disabled}
-          addonAfter={t('externalWait.seconds')}
-          onChange={(durationSeconds) =>
-            update({
-              timeout: {
-                durationSeconds: durationSeconds ?? 86400,
-                outcome: 'TIMEOUT',
-              },
-            })
-          }
-          style={{ width: '100%' }}
-        />
         <Typography.Paragraph type="secondary" style={{ margin: '8px 0 0' }}>
           {t('externalWait.timeoutHint')}
         </Typography.Paragraph>
@@ -294,10 +124,3 @@ export function ExternalWaitConfigEditor({
     </Space>
   );
 }
-
-function normalizeOutcomeCode(value: string): string {
-  return value
-    .toUpperCase()
-    .replace(/[^A-Z0-9_]/g, '_')
-    .replace(/_+/g, '_');
-}

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

@@ -83,7 +83,6 @@ export function HttpRequestConfigEditor({
       value: 'approval.requestId',
       label: t('systemData.approvalRequestId'),
     },
-    { value: 'approval.channel', label: t('systemData.approvalChannel') },
     {
       value: 'approval.candidates',
       label: t('systemData.approvalCandidates'),
@@ -121,7 +120,7 @@ export function HttpRequestConfigEditor({
   }
 
   return (
-    <Space direction="vertical" size={16} style={{ width: '100%' }}>
+    <Space direction="vertical" size={12} style={{ width: '100%' }}>
       <Card
         size="small"
         title={

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

@@ -29,7 +29,7 @@ describe('HumanApprovalConfigEditor', () => {
     await i18n.changeLanguage('zh_CN');
     vi.mocked(customRequest).mockResolvedValue([
       {
-        code: 'myoa',
+        id: '11',
         name: 'MyOA',
         isEnabled: true,
         inputParameters: [
@@ -40,14 +40,14 @@ describe('HumanApprovalConfigEditor', () => {
     ] as never);
   });
 
-  it('shows the selected channel contract and stores AP argument bindings', async () => {
+  it('shows the selected Workflow contract and stores input bindings', async () => {
     const onChange = vi.fn();
 
     render(
       <HumanApprovalConfigEditor
         value={{
-          channelRef: 'myoa',
-          channelInputBindings: {
+          approvalWorkflowId: '11',
+          approvalWorkflowInputBindings: {
             title: { source: 'WORKFLOW', path: 'requestTitle' },
             content: { source: 'INPUT', path: 'description' },
           },
@@ -63,7 +63,7 @@ describe('HumanApprovalConfigEditor', () => {
     );
 
     await waitFor(() =>
-      expect(screen.getByText('单据信息')).toBeInTheDocument(),
+      expect(screen.getByText('传给审批 Workflow 的数据')).toBeInTheDocument(),
     );
     expect(screen.getByText('单据标题')).toBeInTheDocument();
     expect(screen.getByText('审批内容')).toBeInTheDocument();
@@ -77,10 +77,11 @@ describe('HumanApprovalConfigEditor', () => {
 
     expect(onChange).toHaveBeenLastCalledWith(
       expect.objectContaining({
-        channelInputBindings: expect.objectContaining({
+        approvalWorkflowInputBindings: expect.objectContaining({
           title: { source: 'WORKFLOW', path: 'approval.title' },
         }),
       }),
     );
+    expect(customRequest).toHaveBeenCalledWith('workflow/callable', 'GET');
   });
 });

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

@@ -32,8 +32,8 @@ type Rule = {
   percentage?: number;
 };
 type ApprovalConfig = {
-  channelRef?: string;
-  channelInputBindings?: Record<string, ParameterBinding>;
+  approvalWorkflowId?: string;
+  approvalWorkflowInputBindings?: Record<string, ParameterBinding>;
   approverSources?: ApproverSourceConfig[];
   subjects: SubjectSource[];
   approvalRule: Rule;
@@ -41,10 +41,9 @@ type ApprovalConfig = {
   timeout: { durationSeconds: number; action: 'APPROVED' | 'REJECTED' };
 };
 
-type ApprovalChannelOption = {
-  code: string;
+type ApprovalWorkflowOption = {
+  id: string;
   name: string;
-  isEnabled: boolean;
   inputParameters: Array<{
     key: string;
     label?: string;
@@ -64,10 +63,12 @@ export function HumanApprovalConfigEditor({
   schema,
 }: WidgetProps<ApprovalConfig | undefined>) {
   const { t } = useTranslation('workflow');
-  const [channels, setChannels] = useState<ApprovalChannelOption[]>([]);
+  const [approvalWorkflows, setApprovalWorkflows] = useState<
+    ApprovalWorkflowOption[]
+  >([]);
   const config: ApprovalConfig = {
-    channelRef: value?.channelRef,
-    channelInputBindings: value?.channelInputBindings ?? {},
+    approvalWorkflowId: value?.approvalWorkflowId,
+    approvalWorkflowInputBindings: value?.approvalWorkflowInputBindings ?? {},
     approverSources: value?.approverSources ?? [],
     subjects: value?.subjects ?? [],
     approvalRule: value?.approvalRule ?? { mode: 'ANY' },
@@ -75,9 +76,9 @@ export function HumanApprovalConfigEditor({
     timeout: value?.timeout ?? { durationSeconds: 0, action: 'REJECTED' },
   };
   useEffect(() => {
-    customRequest<ApprovalChannelOption[]>('approval-channels', 'GET')
-      .then((items) => setChannels(items.filter((item) => item.isEnabled)))
-      .catch(() => setChannels([]));
+    customRequest<ApprovalWorkflowOption[]>('workflow/callable', 'GET')
+      .then(setApprovalWorkflows)
+      .catch(() => setApprovalWorkflows([]));
   }, []);
   const staticSelections = useMemo<SubjectSelection[]>(() => {
     const grouped = new Map<string, string[]>();
@@ -93,8 +94,8 @@ export function HumanApprovalConfigEditor({
     (subject): subject is Extract<SubjectSource, { source: 'DYNAMIC' }> =>
       subject.source === 'DYNAMIC',
   );
-  const selectedChannel = channels.find(
-    (channel) => channel.code === config.channelRef,
+  const selectedApprovalWorkflow = approvalWorkflows.find(
+    (workflow) => workflow.id === config.approvalWorkflowId,
   );
 
   function update(patch: Partial<ApprovalConfig>) {
@@ -124,7 +125,7 @@ export function HumanApprovalConfigEditor({
   }
 
   return (
-    <Space direction="vertical" size={16} style={{ width: '100%' }}>
+    <Space direction="vertical" size={12} style={{ width: '100%' }}>
       <Card
         size="small"
         title={
@@ -252,33 +253,35 @@ export function HumanApprovalConfigEditor({
         title={
           <Space>
             <ApiOutlined />
-            <span>{t('approval.channel')}</span>
+            <span>{t('approval.workflow')}</span>
           </Space>
         }
       >
         <Typography.Paragraph type="secondary">
-          {t('approval.channelDescription')}
+          {t('approval.workflowDescription')}
         </Typography.Paragraph>
         <Select
           allowClear
           showSearch
           optionFilterProp="label"
           disabled={disabled}
-          value={config.channelRef}
+          value={config.approvalWorkflowId}
           placeholder={t('approval.builtInInbox')}
-          options={channels.map((channel) => ({
-            value: channel.code,
-            label: channel.name,
+          options={approvalWorkflows.map((workflow) => ({
+            value: workflow.id,
+            label: workflow.name,
           }))}
-          onChange={(channelRef) => {
-            const channel = channels.find((item) => item.code === channelRef);
+          onChange={(approvalWorkflowId) => {
+            const workflow = approvalWorkflows.find(
+              (item) => item.id === approvalWorkflowId,
+            );
             update({
-              channelRef,
-              channelInputBindings: channel
+              approvalWorkflowId,
+              approvalWorkflowInputBindings: workflow
                 ? Object.fromEntries(
-                    channel.inputParameters.map((parameter) => [
+                    workflow.inputParameters.map((parameter) => [
                       parameter.key,
-                      config.channelInputBindings?.[parameter.key] ?? {
+                      config.approvalWorkflowInputBindings?.[parameter.key] ?? {
                         source: 'WORKFLOW',
                         path: parameter.key,
                       },
@@ -293,53 +296,56 @@ export function HumanApprovalConfigEditor({
           type="secondary"
           style={{ display: 'block', fontSize: 12, marginTop: 8 }}
         >
-          {config.channelRef
-            ? t('approval.externalChannelHint')
+          {config.approvalWorkflowId
+            ? t('approval.workflowHint')
             : t('approval.builtInInboxHint')}
         </Typography.Text>
-        {selectedChannel && selectedChannel.inputParameters.length > 0 && (
-          <>
-            <Divider />
-            <Typography.Text strong>
-              {t('approval.channelInputs')}
-            </Typography.Text>
-            <Typography.Paragraph
-              type="secondary"
-              style={{ marginTop: 4, marginBottom: 12 }}
-            >
-              {t('approval.channelInputsDescription')}
-            </Typography.Paragraph>
-            <Space direction="vertical" size={14} style={{ width: '100%' }}>
-              {selectedChannel.inputParameters.map((parameter) => {
-                const name = parameter.label?.trim() || parameter.key;
-                return (
-                  <div key={parameter.key}>
-                    <Space size={6} style={{ marginBottom: 6 }}>
-                      <Typography.Text strong>{name}</Typography.Text>
-                      {parameter.required && (
-                        <Tag color="blue">{t('approval.required')}</Tag>
-                      )}
-                    </Space>
-                    <ParameterBindingEditor
-                      name={name}
-                      defaultPath={parameter.key}
-                      value={config.channelInputBindings?.[parameter.key]}
-                      disabled={disabled}
-                      onChange={(binding) =>
-                        update({
-                          channelInputBindings: {
-                            ...config.channelInputBindings,
-                            [parameter.key]: binding,
-                          },
-                        })
-                      }
-                    />
-                  </div>
-                );
-              })}
-            </Space>
-          </>
-        )}
+        {selectedApprovalWorkflow &&
+          selectedApprovalWorkflow.inputParameters.length > 0 && (
+            <>
+              <Divider />
+              <Typography.Text strong>
+                {t('approval.workflowInputs')}
+              </Typography.Text>
+              <Typography.Paragraph
+                type="secondary"
+                style={{ marginTop: 4, marginBottom: 12 }}
+              >
+                {t('approval.workflowInputsDescription')}
+              </Typography.Paragraph>
+              <Space direction="vertical" size={14} style={{ width: '100%' }}>
+                {selectedApprovalWorkflow.inputParameters.map((parameter) => {
+                  const name = parameter.label?.trim() || parameter.key;
+                  return (
+                    <div key={parameter.key}>
+                      <Space size={6} style={{ marginBottom: 6 }}>
+                        <Typography.Text strong>{name}</Typography.Text>
+                        {parameter.required && (
+                          <Tag color="blue">{t('approval.required')}</Tag>
+                        )}
+                      </Space>
+                      <ParameterBindingEditor
+                        name={name}
+                        defaultPath={parameter.key}
+                        value={
+                          config.approvalWorkflowInputBindings?.[parameter.key]
+                        }
+                        disabled={disabled}
+                        onChange={(binding) =>
+                          update({
+                            approvalWorkflowInputBindings: {
+                              ...config.approvalWorkflowInputBindings,
+                              [parameter.key]: binding,
+                            },
+                          })
+                        }
+                      />
+                    </div>
+                  );
+                })}
+              </Space>
+            </>
+          )}
       </Card>
 
       <TimeoutSection