@gadmin2n/schematics 0.0.146 → 0.0.148

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

@@ -4,7 +4,33 @@ import i18n from '../../../../i18n';
 import { HumanApprovalConfigEditor } from './HumanApprovalConfigEditor';
 
 vi.mock('./SubjectPicker', () => ({
-  SubjectPicker: () => <div data-testid="subject-picker" />,
+  SubjectPicker: (props: any) => {
+    const provider = props.allowedProviders?.[0];
+    const isGroup = provider === 'USER_GROUP';
+    return (
+      <div data-testid={`subject-picker-${provider}`}>
+        <button
+          aria-label={isGroup ? '选择固定人员组' : '选择固定人员'}
+          onClick={() =>
+            props.onChange([
+              {
+                provider,
+                refs: [isGroup ? 'finance' : 'alice'],
+              },
+            ])
+          }
+        />
+        {!isGroup ? (
+          <button
+            aria-label="继续添加固定人员"
+            onClick={() =>
+              props.onChange([{ provider: 'USER', refs: ['alice', 'bob'] }])
+            }
+          />
+        ) : null}
+      </div>
+    );
+  },
 }));
 
 Object.defineProperty(window, 'matchMedia', {
@@ -116,9 +142,9 @@ describe('HumanApprovalConfigEditor', () => {
     );
   });
 
-  it('adds an HTTP and Code lookup inside the approval node', () => {
+  it('can add multiple HTTP and Code lookups inside the approval node', () => {
     const onChange = vi.fn();
-    const { container } = render(
+    const { container, rerender } = render(
       <HumanApprovalConfigEditor
         value={config}
         onChange={onChange}
@@ -126,30 +152,157 @@ describe('HumanApprovalConfigEditor', () => {
       />,
     );
 
-    fireEvent.click(screen.getByRole('button', { name: '添加动态用户' }));
+    fireEvent.click(screen.getByRole('button', { name: '添加动态审批人' }));
 
     expect(onChange).toHaveBeenLastCalledWith(
       expect.objectContaining({
         subjects: [
           {
             source: 'DYNAMIC',
-            provider: 'USER',
             inputKey: 'dynamic_users',
             label: '查询审批人',
             lookup: {
               request: expect.objectContaining({ method: 'GET', path: '/' }),
               result: expect.objectContaining({
                 mode: 'runOnceForAll',
-                script: expect.stringContaining("provider: 'USER'"),
+                script: expect.stringContaining('return approverIds;'),
               }),
             },
           },
         ],
       }),
     );
+    const dynamicConfig = onChange.mock.lastCall?.[0];
+    rerender(
+      <HumanApprovalConfigEditor
+        value={dynamicConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+    fireEvent.click(screen.getByRole('button', { name: '添加动态审批人' }));
+    expect(onChange.mock.lastCall?.[0].subjects).toEqual([
+      dynamicConfig.subjects[0],
+      expect.objectContaining({
+        source: 'DYNAMIC',
+        inputKey: 'dynamic_users_2',
+      }),
+    ]);
     expect(container.querySelector('.human-approval-config__rail')).toBeNull();
   });
 
+  it('can add repeated fixed sources and a separate fixed group source', () => {
+    const onChange = vi.fn();
+    const { rerender } = render(
+      <HumanApprovalConfigEditor
+        value={config}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    expect(screen.queryByTestId('subject-picker-USER')).not.toBeInTheDocument();
+    expect(screen.getByText('暂未添加固定人员或人员组')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: '添加人员' }));
+    const peopleConfig = onChange.mock.lastCall?.[0];
+    expect(peopleConfig).toEqual(
+      expect.objectContaining({
+        subjects: [{ source: 'STATIC', provider: 'USER', refs: [] }],
+      }),
+    );
+
+    rerender(
+      <HumanApprovalConfigEditor
+        value={peopleConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    expect(screen.getByTestId('subject-picker-USER')).toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: '添加人员组' }),
+    ).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: '选择固定人员' }));
+    const selectedPeopleConfig = onChange.mock.lastCall?.[0];
+    expect(selectedPeopleConfig).toEqual(
+      expect.objectContaining({
+        subjects: [{ source: 'STATIC', provider: 'USER', refs: ['alice'] }],
+      }),
+    );
+
+    rerender(
+      <HumanApprovalConfigEditor
+        value={selectedPeopleConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+    fireEvent.click(screen.getByRole('button', { name: '继续添加固定人员' }));
+    const morePeopleConfig = onChange.mock.lastCall?.[0];
+    expect(morePeopleConfig.subjects[0].refs).toEqual(['alice', 'bob']);
+
+    rerender(
+      <HumanApprovalConfigEditor
+        value={morePeopleConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+    expect(
+      screen.getByRole('button', { name: '添加人员' }),
+    ).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: '添加人员' }));
+    const repeatedPeopleConfig = onChange.mock.lastCall?.[0];
+    expect(repeatedPeopleConfig.subjects).toEqual([
+      { source: 'STATIC', provider: 'USER', refs: ['alice', 'bob'] },
+      { source: 'STATIC', provider: 'USER', refs: [] },
+    ]);
+
+    rerender(
+      <HumanApprovalConfigEditor
+        value={repeatedPeopleConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+    expect(screen.getAllByTestId('subject-picker-USER')).toHaveLength(2);
+    fireEvent.click(screen.getAllByRole('button', { name: '选择固定人员' })[1]);
+    const selectedRepeatedPeopleConfig = onChange.mock.lastCall?.[0];
+
+    rerender(
+      <HumanApprovalConfigEditor
+        value={selectedRepeatedPeopleConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+    fireEvent.click(screen.getByRole('button', { name: '添加人员组' }));
+    const bothSourcesConfig = onChange.mock.lastCall?.[0];
+    rerender(
+      <HumanApprovalConfigEditor
+        value={bothSourcesConfig}
+        onChange={onChange}
+        schema={{ type: 'object' }}
+      />,
+    );
+
+    expect(screen.getAllByTestId('subject-picker-USER')).toHaveLength(2);
+    expect(screen.getByTestId('subject-picker-USER_GROUP')).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: '选择固定人员组' }));
+    expect(onChange).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        subjects: expect.arrayContaining([
+          { source: 'STATIC', provider: 'USER', refs: ['alice', 'bob'] },
+          { source: 'STATIC', provider: 'USER', refs: ['alice'] },
+          { source: 'STATIC', provider: 'USER_GROUP', refs: ['finance'] },
+        ]),
+      }),
+    );
+  });
+
   it('uses the collapsible sections without repeating a lookup flow summary', () => {
     const { container } = render(
       <HumanApprovalConfigEditor
@@ -158,7 +311,6 @@ describe('HumanApprovalConfigEditor', () => {
           subjects: [
             {
               source: 'DYNAMIC',
-              provider: 'USER',
               inputKey: 'direct_manager',
               label: '查询直属主管',
               lookup: {
@@ -174,7 +326,7 @@ describe('HumanApprovalConfigEditor', () => {
                 result: {
                   mode: 'runOnceForAll',
                   timeout: 5000,
-                  script: 'return { subjects: [] };',
+                  script: "return ['leader-a'];",
                 },
               },
             },

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

@@ -15,7 +15,7 @@ import {
   Switch,
   Typography,
 } from 'antd';
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ParameterBindingEditor } from '../../components/ParameterBindingEditor';
 import type { ParameterBinding } from '../../types/parameter-binding';
@@ -26,17 +26,19 @@ import { HttpRequestConfigEditor } from './HttpRequestConfigEditor';
 import { SubjectPicker, type SubjectSelection } from './SubjectPicker';
 import './human-approval-config.css';
 
-type Provider = 'USER' | 'USER_GROUP';
 type EmbeddedCodeConfig = {
   script: string;
   mode: 'runOnceForAll';
   timeout: number;
 };
 type SubjectSource =
-  | { source: 'STATIC'; provider: Provider; refs: string[] }
+  | {
+      source: 'STATIC';
+      provider?: 'USER' | 'USER_GROUP';
+      refs: string[];
+    }
   | {
       source: 'DYNAMIC';
-      provider: Provider;
       inputKey: string;
       label: string;
       lookup: {
@@ -49,6 +51,7 @@ type Rule = {
   count?: number | null;
   percentage?: number | null;
 };
+
 type TaskDetail = {
   key: string;
   label: string;
@@ -126,7 +129,7 @@ return {
   },
 };
 
-function defaultDynamicLookup(provider: Provider): {
+function defaultDynamicLookup(): {
   request: Record<string, unknown>;
   result: EmbeddedCodeConfig;
 } {
@@ -145,13 +148,11 @@ function defaultDynamicLookup(provider: Provider): {
       timeout: 5000,
       script: `// response 是查询接口返回的 { status, data, headers }。
 // 从响应中提取审批人 ID，并返回统一格式。
-const refs = response?.data?.refs;
-if (!Array.isArray(refs) || refs.length === 0) {
+const approverIds = response?.data?.approverIds;
+if (!Array.isArray(approverIds) || approverIds.length === 0) {
   throw new Error('未查询到有效的审批人');
 }
-return {
-  subjects: [{ provider: '${provider}', refs }],
-};`,
+return approverIds;`,
     },
   };
 }
@@ -176,16 +177,19 @@ export function HumanApprovalConfigEditor({
     blockCancellationOnResolved: value?.blockCancellationOnResolved ?? false,
     timeout: value?.timeout ?? { durationSeconds: 0, action: 'REJECTED' },
   };
-  const staticSelections = useMemo<SubjectSelection[]>(() => {
-    const grouped = new Map<string, string[]>();
-    for (const subject of config.subjects) {
-      if (subject.source !== 'STATIC') continue;
-      grouped.set(subject.provider, [
-        ...new Set([...(grouped.get(subject.provider) ?? []), ...subject.refs]),
-      ]);
-    }
-    return [...grouped].map(([provider, refs]) => ({ provider, refs }));
-  }, [config.subjects]);
+  const staticSources = config.subjects.flatMap((subject, subjectIndex) =>
+    subject.source === 'STATIC'
+      ? [
+          {
+            subjectIndex,
+            selection: {
+              provider: subject.provider ?? 'USER',
+              refs: subject.refs,
+            } satisfies SubjectSelection,
+          },
+        ]
+      : [],
+  );
   const dynamicSources = config.subjects.filter(
     (subject): subject is Extract<SubjectSource, { source: 'DYNAMIC' }> =>
       subject.source === 'DYNAMIC',
@@ -219,19 +223,38 @@ export function HumanApprovalConfigEditor({
     onChange(gadminOnlyConfig);
   }
 
-  function updateStatic(next: SubjectSelection[]) {
+  function updateStatic(
+    subjectIndex: number,
+    provider: 'USER' | 'USER_GROUP',
+    next: SubjectSelection[],
+  ) {
+    const refs =
+      next.find((subject) => subject.provider === provider)?.refs ?? [];
+    update({
+      subjects: config.subjects.map((subject, index) =>
+        index === subjectIndex
+          ? { source: 'STATIC' as const, provider, refs }
+          : subject,
+      ),
+    });
+  }
+
+  function addStatic(provider: 'USER' | 'USER_GROUP' = 'USER') {
     update({
       subjects: [
-        ...next.map((subject) => ({
-          source: 'STATIC' as const,
-          provider: subject.provider as Provider,
-          refs: subject.refs,
-        })),
+        ...config.subjects.filter((subject) => subject.source === 'STATIC'),
+        { source: 'STATIC', provider, refs: [] },
         ...dynamicSources,
       ],
     });
   }
 
+  function removeStatic(subjectIndex: number) {
+    update({
+      subjects: config.subjects.filter((_, index) => index !== subjectIndex),
+    });
+  }
+
   function updateDetail(index: number, patch: Partial<TaskDetail>) {
     updateTask({
       details: config.task.details.map((detail, current) =>
@@ -253,8 +276,8 @@ export function HumanApprovalConfigEditor({
     });
   }
 
-  function addDynamic(provider: Provider) {
-    const base = provider === 'USER' ? 'dynamic_users' : 'dynamic_user_groups';
+  function addDynamic() {
+    const base = 'dynamic_users';
     const existing = new Set(dynamicSources.map((source) => source.inputKey));
     let inputKey = base;
     let suffix = 2;
@@ -264,13 +287,9 @@ export function HumanApprovalConfigEditor({
         ...config.subjects,
         {
           source: 'DYNAMIC',
-          provider,
           inputKey,
-          label:
-            provider === 'USER'
-              ? t('approval.dynamicUserDefaultName')
-              : t('approval.dynamicGroupDefaultName'),
-          lookup: defaultDynamicLookup(provider),
+          label: t('approval.dynamicUserDefaultName'),
+          lookup: defaultDynamicLookup(),
         },
       ],
     });
@@ -554,13 +573,76 @@ export function HumanApprovalConfigEditor({
         >
           {t('approval.description')}
         </Typography.Paragraph>
-        <Typography.Text strong>{t('approval.fixedApprovers')}</Typography.Text>
-        <SubjectPicker
-          value={staticSelections}
-          onChange={updateStatic}
-          disabled={disabled}
-          schema={schema}
-        />
+        <div className="human-approval-config__fixed-heading">
+          <Typography.Text strong>
+            {t('approval.fixedApprovers')}
+          </Typography.Text>
+          <Space wrap size={8}>
+            <Button
+              size="small"
+              className="workflow-panel-action"
+              icon={<UserAddOutlined />}
+              aria-label={t('approval.addFixedUsers')}
+              disabled={disabled}
+              onClick={() => addStatic('USER')}
+            >
+              {t('approval.addFixedUsers')}
+            </Button>
+            <Button
+              size="small"
+              className="workflow-panel-action"
+              icon={<UsergroupAddOutlined />}
+              aria-label={t('approval.addFixedUserGroups')}
+              disabled={disabled}
+              onClick={() => addStatic('USER_GROUP')}
+            >
+              {t('approval.addFixedUserGroups')}
+            </Button>
+          </Space>
+        </div>
+        {staticSources.length === 0 ? (
+          <div className="human-approval-config__empty">
+            {t('approval.noFixedApprovers')}
+          </div>
+        ) : (
+          staticSources.map(({ subjectIndex, selection }) => {
+            const name =
+              selection.provider === 'USER_GROUP'
+                ? t('approval.fixedUserGroups')
+                : t('approval.fixedUsers');
+            return (
+              <div
+                className="human-approval-config__static-source"
+                key={`${selection.provider}-${subjectIndex}`}
+              >
+                <div className="human-approval-config__static-source-header">
+                  <Typography.Text strong>{name}</Typography.Text>
+                  <Button
+                    type="text"
+                    danger
+                    icon={<DeleteOutlined />}
+                    disabled={disabled}
+                    aria-label={t('approval.removeFixedSource', { name })}
+                    onClick={() => removeStatic(subjectIndex)}
+                  />
+                </div>
+                <SubjectPicker
+                  value={[selection]}
+                  onChange={(next) =>
+                    updateStatic(
+                      subjectIndex,
+                      selection.provider as 'USER' | 'USER_GROUP',
+                      next,
+                    )
+                  }
+                  disabled={disabled}
+                  schema={schema}
+                  allowedProviders={[selection.provider]}
+                />
+              </div>
+            );
+          })
+        )}
         <div className="human-approval-config__dynamic-heading">
           <div>
             <Typography.Text strong>
@@ -574,20 +656,10 @@ export function HumanApprovalConfigEditor({
               icon={<UserAddOutlined />}
               aria-label={t('approval.addUsers')}
               disabled={disabled}
-              onClick={() => addDynamic('USER')}
+              onClick={addDynamic}
             >
               {t('approval.addUsers')}
             </Button>
-            <Button
-              size="small"
-              className="workflow-panel-action"
-              icon={<UsergroupAddOutlined />}
-              aria-label={t('approval.addGroups')}
-              disabled={disabled}
-              onClick={() => addDynamic('USER_GROUP')}
-            >
-              {t('approval.addGroups')}
-            </Button>
           </Space>
         </div>
         {dynamicSources.length === 0 ? (
@@ -603,9 +675,7 @@ export function HumanApprovalConfigEditor({
             <div className="human-approval-config__dynamic-source-header">
               <div>
                 <Typography.Text strong>
-                  {source.provider === 'USER'
-                    ? t('approval.dynamicUsers')
-                    : t('approval.dynamicGroups')}
+                  {t('approval.dynamicUsers')}
                 </Typography.Text>
                 <Typography.Text
                   type="secondary"

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

@@ -9,6 +9,28 @@ import {
 import { EventTriggerConfigEditor } from './EventTriggerConfigEditor';
 import { ParallelConfigEditor } from './ParallelConfigEditor';
 
+vi.mock('@monaco-editor/react', () => ({
+  default: ({
+    language,
+    value,
+    onChange,
+    options,
+  }: {
+    language?: string;
+    value?: string;
+    onChange?(value: string): void;
+    options?: { ariaLabel?: string; readOnly?: boolean };
+  }) => (
+    <textarea
+      aria-label={options?.ariaLabel}
+      data-language={language}
+      readOnly={options?.readOnly}
+      value={value}
+      onChange={(event) => onChange?.(event.target.value)}
+    />
+  ),
+}));
+
 vi.mock('./event-catalog.api', () => ({
   eventCatalogApi: {
     list: vi.fn().mockResolvedValue([
@@ -429,6 +451,27 @@ describe('simplified workflow node editors', () => {
     });
   });
 
+  it('shows only the source table in the selected business event summary', async () => {
+    await i18n.changeLanguage('zh_CN');
+    render(
+      <EventTriggerConfigEditor
+        value={{
+          registrationCode: 'asset-disposal-submitted',
+          processingMode: 'PARALLEL',
+        }}
+        onChange={vi.fn()}
+        schema={schema}
+      />,
+    );
+
+    expect(
+      await screen.findByText('public.t_hardware_asset'),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByText('public.t_hardware_asset · status'),
+    ).not.toBeInTheDocument();
+  });
+
   it('adds a typed start condition for the selected event', async () => {
     await i18n.changeLanguage('zh_CN');
     const onChange = vi.fn();
@@ -477,9 +520,10 @@ describe('simplified workflow node editors', () => {
       />,
     );
 
-    expect(screen.getByRole('textbox', { name: 'SQL 语句' })).toHaveValue(
-      'SELECT * FROM users WHERE id = $1',
-    );
+    const sqlEditor = screen.getByRole('textbox', { name: 'SQL 语句' });
+    expect(sqlEditor).toHaveValue('SELECT * FROM users WHERE id = $1');
+    expect(sqlEditor).toHaveAttribute('data-language', 'sql');
+    expect(screen.getByText('只读 SQL')).toBeInTheDocument();
     expect(screen.getByRole('textbox', { name: '参数 $1' })).toBeDisabled();
     expect(screen.getByRole('textbox', { name: '参数 $1' })).toHaveValue('$1');
     expect(screen.getByText('参数')).toBeInTheDocument();

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

@@ -9,7 +9,6 @@ vi.mock('./subject-provider.api', () => ({
     descriptors: vi.fn(),
     search: vi.fn(),
     preview: vi.fn(),
-    create: vi.fn(),
     userGroupDetail: vi.fn(),
     updateUserGroup: vi.fn(),
     replaceUserGroupMembers: vi.fn(),
@@ -58,4 +57,37 @@ describe('SubjectPicker', () => {
     await waitFor(() => expect(screen.getByText('Users')).toBeInTheDocument());
     expect(screen.queryByText('User groups')).not.toBeInTheDocument();
   });
+
+  it('can expose only the user picker without a provider choice', async () => {
+    render(
+      <SubjectPicker
+        value={[{ provider: 'USER', refs: [] }]}
+        onChange={vi.fn()}
+        schema={{ type: 'array' }}
+        allowedProviders={['USER']}
+      />,
+    );
+
+    expect(
+      (await screen.findAllByLabelText('Users selections')).length,
+    ).toBeGreaterThan(0);
+    expect(screen.queryByLabelText('Provider')).not.toBeInTheDocument();
+    expect(subjectProviderApi.search).toHaveBeenCalledWith('USER', '');
+  });
+
+  it('only selects existing groups and does not create groups inline', async () => {
+    render(
+      <SubjectPicker
+        value={[{ provider: 'USER_GROUP', refs: [] }]}
+        onChange={vi.fn()}
+        schema={{ type: 'array' }}
+        allowedProviders={['USER_GROUP']}
+      />,
+    );
+
+    expect(
+      (await screen.findAllByLabelText('User groups selections')).length,
+    ).toBeGreaterThan(0);
+    expect(screen.queryByRole('button', { name: 'Create' })).toBeNull();
+  });
 });