@gadmin2n/schematics 0.0.147 → 0.0.149

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/detail.tsx

@@ -257,7 +257,8 @@ export default function BusinessEventDetailPage() {
               label={t('eventCatalog.identifier')}
               value={
                 <Typography.Text code>
-                  {event.schemaName}.{event.tableName} · {event.operation}
+                  {event.schemaName}.{event.tableName} ·{' '}
+                  {event.operations.join(' / ')}
                 </Typography.Text>
               }
             />

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/index.test.tsx

@@ -38,7 +38,7 @@ describe('BusinessEventCatalogPage', () => {
         label: 'public.t_hardware_asset · UPDATE',
         schemaName: 'public',
         tableName: 't_hardware_asset',
-        operation: 'UPDATE',
+        operations: ['UPDATE'],
         watchedFields: ['status'],
         primaryKeyFields: ['id'],
         isEnabled: true,

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/business-events/index.tsx

@@ -74,7 +74,7 @@ export default function BusinessEventCatalogPage() {
         event.label,
         event.schemaName,
         event.tableName,
-        event.operation,
+        ...event.operations,
         ...event.fields.flatMap((field) => [
           field.path,
           field.label,
@@ -105,7 +105,7 @@ export default function BusinessEventCatalogPage() {
             {event.label}
           </Typography.Link>
           <Typography.Text code>
-            {event.operation === 'UPDATE'
+            {event.operations.includes('UPDATE')
               ? event.watchedFields.join(', ')
               : t('eventCatalog.registration.allFields')}
           </Typography.Text>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/NodeOutputSummary.test.tsx

@@ -83,6 +83,13 @@ describe('NodeOutputSummary', () => {
         type: 'object',
         properties: {
           operation: { type: 'string' },
+          table: {
+            type: 'object',
+            properties: {
+              schema: { type: 'string' },
+              name: { type: 'string' },
+            },
+          },
           primaryKey: { type: 'object' },
           before: { type: ['object', 'null'] },
           after: { type: ['object', 'null'] },
@@ -90,6 +97,7 @@ describe('NodeOutputSummary', () => {
         },
         required: [
           'operation',
+          'table',
           'primaryKey',
           'before',
           'after',
@@ -102,8 +110,20 @@ describe('NodeOutputSummary', () => {
     render(<NodeOutputSummary node={event} nodeType={nodeType} />);
 
     expect(screen.getByText('input.operation')).toBeInTheDocument();
+    expect(screen.getByText('操作类型')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        '数据库操作类型：INSERT（新增）、UPDATE（更新）或 DELETE（删除）',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.getByText('input.table')).toBeInTheDocument();
+    expect(screen.getByText('数据表')).toBeInTheDocument();
     expect(screen.getByText('input.primaryKey')).toBeInTheDocument();
+    expect(screen.getByText('主键')).toBeInTheDocument();
+    expect(screen.getByText('变更前的数据')).toBeInTheDocument();
+    expect(screen.getByText('变更后的数据')).toBeInTheDocument();
     expect(screen.getByText('input.changedFields')).toBeInTheDocument();
+    expect(screen.getByText('发生变化的字段')).toBeInTheDocument();
     expect(
       screen.queryByText('触发本次运行的事件数据'),
     ).not.toBeInTheDocument();

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/NodePropertyPanel.test.tsx

@@ -188,11 +188,10 @@ describe('NodePropertyPanel instance references', () => {
     expect(
       screen.queryByText('Connection is required'),
     ).not.toBeInTheDocument();
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
-    expect(onSave).toHaveBeenCalledWith(
-      'http-1',
-      expect.objectContaining({ config: expect.any(Object) }),
-    );
+    expect(
+      screen.queryByRole('button', { name: 'Save changes' }),
+    ).not.toBeInTheDocument();
+    expect(onSave).not.toHaveBeenCalled();
     expect(
       screen.queryByText('Connection is required'),
     ).not.toBeInTheDocument();
@@ -307,7 +306,6 @@ describe('NodePropertyPanel instance references', () => {
       />,
     );
 
-    await waitFor(() => expect(customRequest).toHaveBeenCalled());
     await act(async () => {
       await Promise.resolve();
       await Promise.resolve();
@@ -346,8 +344,8 @@ describe('NodePropertyPanel instance references', () => {
       screen.getByText('Includes the approver and completion time'),
     ).toBeInTheDocument();
     expect(
-      screen.getByRole('button', { name: 'Save changes' }),
-    ).toBeInTheDocument();
+      screen.queryByRole('button', { name: 'Save changes' }),
+    ).not.toBeInTheDocument();
     expect(customRequest).not.toHaveBeenCalledWith(
       'workflowNodeInstance/findMany',
       expect.anything(),
@@ -386,13 +384,14 @@ describe('NodePropertyPanel instance references', () => {
       />,
     );
 
-    expect(screen.getByRole('button', { name: 'Save changes' })).toBeEnabled();
     expect(
       screen.getByText('Use a template or configure this node directly'),
     ).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: /New template/ })).toHaveClass(
-      'workflow-panel-action',
-    );
+    expect(
+      screen.getByRole('button', {
+        name: /Save current configuration as template/,
+      }),
+    ).toHaveClass('workflow-panel-action');
     expect(screen.getByText('Who can approve')).toBeInTheDocument();
     expect(screen.queryByText('Parameters')).not.toBeInTheDocument();
     expect(
@@ -419,7 +418,83 @@ describe('NodePropertyPanel instance references', () => {
     );
   });
 
-  it('keeps an inline approval configuration after saving it', async () => {
+  it('saves the current configuration as a template and uses it immediately', async () => {
+    const user = userEvent.setup();
+    const onSave = vi.fn();
+    const inlineNode = {
+      ...node,
+      instanceRef: undefined,
+      config: { subjects: [{ refs: ['alice'] }] },
+    };
+    vi.mocked(customRequest).mockImplementation((path) => {
+      if (path === 'workflowNodeInstance/findMany') {
+        return Promise.resolve({ data: [] }) as never;
+      }
+      if (path === 'workflowNodeInstance/createOne') {
+        return Promise.resolve({
+          id: '21',
+          code: 'FINANCE_APPROVAL_V2',
+          name: 'Finance approval',
+          nodeTypeId: '7',
+          isEnabled: true,
+          config: inlineNode.config,
+        }) as never;
+      }
+      return Promise.resolve([]) as never;
+    });
+
+    render(
+      <NodePropertyPanel
+        node={inlineNode}
+        nodeTypes={[nodeType]}
+        onSave={onSave}
+        onLabelChange={vi.fn()}
+        onAiEdit={vi.fn()}
+        aiLoading={false}
+      />,
+    );
+
+    await user.click(
+      screen.getByRole('button', {
+        name: /Save current configuration as template/,
+      }),
+    );
+    expect(
+      screen.getByText(/Create a template from the current node configuration/),
+    ).toBeInTheDocument();
+    const templateName = screen.getByRole('textbox', {
+      name: 'Template name',
+    });
+    await user.clear(templateName);
+    await user.type(templateName, 'Reusable finance approval');
+    await user.click(
+      screen.getByRole('button', { name: 'Save and use template' }),
+    );
+
+    await waitFor(() =>
+      expect(customRequest).toHaveBeenCalledWith(
+        'workflowNodeInstance/createOne',
+        'POST',
+        expect.objectContaining({
+          name: 'Reusable finance approval',
+          config: inlineNode.config,
+        }),
+      ),
+    );
+    expect(onSave).toHaveBeenCalledWith(
+      'node-1',
+      expect.objectContaining({
+        config: inlineNode.config,
+        configOverride: null,
+        instanceRef: {
+          instanceId: '21',
+          instanceCode: 'FINANCE_APPROVAL_V2',
+        },
+      }),
+    );
+  });
+
+  it('keeps an inline approval configuration in the Workflow draft', async () => {
     const user = userEvent.setup();
     const onSave = vi.fn();
     const onConfigDraftChange = vi.fn();
@@ -531,10 +606,8 @@ describe('NodePropertyPanel instance references', () => {
       },
     });
 
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
-
-    const savedConfig = onSave.mock.lastCall?.[1].config;
-    expect(savedConfig).toMatchObject({
+    const pendingConfig = panelRef.current?.getPendingUpdate()?.updates.config;
+    expect(pendingConfig).toMatchObject({
       external: {
         request: {
           connectionRef: 'ticketing',
@@ -549,6 +622,7 @@ describe('NodePropertyPanel instance references', () => {
       rejectionRule: { mode: 'ANY' },
       timeout: { durationSeconds: 0, action: 'REJECTED' },
     });
+    expect(onSave).not.toHaveBeenCalled();
 
     await waitFor(() =>
       expect(screen.getByLabelText('Task title field path')).toHaveValue(
@@ -616,7 +690,7 @@ describe('NodePropertyPanel instance references', () => {
 
   it('uses nested UI Schema widgets for Callable Trigger parameters', async () => {
     const user = userEvent.setup();
-    const onSave = vi.fn();
+    const onConfigDraftChange = vi.fn();
     const callableNodeType = {
       id: '9',
       type: 'callable_trigger',
@@ -655,7 +729,8 @@ describe('NodePropertyPanel instance references', () => {
       <NodePropertyPanel
         node={callableNode}
         nodeTypes={[callableNodeType]}
-        onSave={onSave}
+        onSave={vi.fn()}
+        onConfigDraftChange={onConfigDraftChange}
         onLabelChange={vi.fn()}
         onAiEdit={vi.fn()}
         aiLoading={false}
@@ -672,16 +747,10 @@ describe('NodePropertyPanel instance references', () => {
       screen.getByRole('textbox', { name: 'Parameter name' }),
       'departmentId',
     );
-    await user.click(screen.getByRole('button', { name: 'Save changes' }));
 
-    expect(onSave).toHaveBeenCalledWith(
-      'callable-1',
-      expect.objectContaining({
-        config: {
-          inputParameters: [{ key: 'departmentId', label: '', required: true }],
-        },
-      }),
-    );
+    expect(onConfigDraftChange).toHaveBeenCalledWith('callable-1', {
+      inputParameters: [{ key: 'departmentId', label: '', required: true }],
+    });
   });
 
   it('filters the node palette by translated name and technical type', async () => {

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/NodePropertyPanel.tsx

@@ -2,6 +2,7 @@ import {
   DisconnectOutlined,
   MinusCircleOutlined,
   PlusOutlined,
+  SaveOutlined,
   SearchOutlined,
   SendOutlined,
 } from '@ant-design/icons';
@@ -9,11 +10,11 @@ import {
   Alert,
   Button,
   Card,
-  Checkbox,
   Form,
   Input,
   InputNumber,
   message,
+  Modal,
   Segmented,
   Select,
   Space,
@@ -44,7 +45,6 @@ import type {
   WorkflowNodeType,
 } from '../types';
 import { NodeOutputSummary } from './NodeOutputSummary';
-import { CreateNodeInstanceDrawer } from './CreateNodeInstanceDrawer';
 import { WorkflowCodeEditor } from './WorkflowCodeEditor';
 import '../node-instances/node-config.css';
 import type { ReferencedConfigStatus } from '../hooks/useReferencedNodeInstanceConfigs';
@@ -186,12 +186,11 @@ function NodePropertyPanelImpl(
   const [instances, setInstances] = useState<WorkflowNodeInstance[]>([]);
   const [instanceLoading, setInstanceLoading] = useState(false);
   const [instanceLoadError, setInstanceLoadError] = useState(false);
-  const [createInstanceOpen, setCreateInstanceOpen] = useState(false);
+  const [saveTemplateOpen, setSaveTemplateOpen] = useState(false);
   const [paletteQuery, setPaletteQuery] = useState('');
-  const [newInstanceName, setNewInstanceName] = useState('');
-  const [newInstanceDesc, setNewInstanceDesc] = useState('');
-  const [saveAsLoading, setSaveAsLoading] = useState(false);
-  const [alsoSaveAsInstance, setAlsoSaveAsInstance] = useState(false);
+  const [templateName, setTemplateName] = useState('');
+  const [templateDescription, setTemplateDescription] = useState('');
+  const [templateSaving, setTemplateSaving] = useState(false);
   const [configForm] = Form.useForm();
 
   // Find configSchema for current node type
@@ -326,7 +325,6 @@ function NodePropertyPanelImpl(
       ]);
       setDirty(false);
       setPrompt('');
-      setAlsoSaveAsInstance(false);
     }
   }, [node?.id, currentNodeType]);
 
@@ -414,8 +412,7 @@ function NodePropertyPanelImpl(
 
   // Reset selection when node changes
   useEffect(() => {
-    setAlsoSaveAsInstance(false);
-    setCreateInstanceOpen(false);
+    setSaveTemplateOpen(false);
   }, [node?.id]);
 
   const buildCurrentUpdates = useCallback((): NodePropertyUpdates | null => {
@@ -590,57 +587,51 @@ function NodePropertyPanelImpl(
     }
   }
 
-  async function handleSave() {
-    if (!node) return;
+  function openSaveTemplate() {
+    if (!node || node.instanceRef) return;
+    setTemplateName(node.label.trim());
+    setTemplateDescription('');
+    setSaveTemplateOpen(true);
+  }
+
+  async function handleSaveAsTemplate() {
+    if (!node || node.instanceRef || !currentNodeType || !templateName.trim())
+      return;
     const updates = buildCurrentUpdates();
     if (!updates?.config) return;
-    const cleanConfig = updates.config;
-    if (
-      !node.instanceRef &&
-      alsoSaveAsInstance &&
-      currentNodeType &&
-      newInstanceName.trim()
-    ) {
-      // Save node AND create a new instance, then reference it
-      setSaveAsLoading(true);
-      try {
-        const res = await customRequest<any>(
-          'workflowNodeInstance/createOne',
-          'POST',
-          {
-            nodeTypeId: Number(currentNodeType.id),
-            name: newInstanceName.trim(),
-            description: newInstanceDesc.trim() || null,
-            config: cleanConfig,
-            isEnabled: true,
-          },
-        );
-        const created = res;
-        const newId = String(created.id);
-        onSave(node.id, {
-          label,
-          config: created.config,
-          configOverride: null,
-          instanceRef: {
-            instanceId: newId,
-            instanceCode: created.code,
-          },
-        });
-        setInstances((prev) => [...prev, created]);
-        setAlsoSaveAsInstance(false);
-        setNewInstanceName('');
-        setNewInstanceDesc('');
-        message.success('已保存并创建新实例');
-      } catch (e: any) {
-        message.error(e?.message ?? '创建实例失败');
-      } finally {
-        setSaveAsLoading(false);
-      }
-    } else {
-      onSave(node.id, updates);
-      message.success('节点已保存');
+    setTemplateSaving(true);
+    try {
+      const created = await customRequest<WorkflowNodeInstance>(
+        'workflowNodeInstance/createOne',
+        'POST',
+        {
+          nodeTypeId: Number(currentNodeType.id),
+          name: templateName.trim(),
+          description: templateDescription.trim() || null,
+          config: updates.config,
+          isEnabled: true,
+        },
+      );
+      onSave(node.id, {
+        label,
+        config: created.config,
+        configOverride: null,
+        instanceRef: {
+          instanceId: String(created.id),
+          instanceCode: created.code,
+        },
+      });
+      setInstances((current) => [
+        created,
+        ...current.filter((item) => item.id !== created.id),
+      ]);
+      setSaveTemplateOpen(false);
+      message.success(t('editor.templateSavedAndApplied'));
+    } catch (error: any) {
+      message.error(error?.message ?? t('editor.templateSaveFailed'));
+    } finally {
+      setTemplateSaving(false);
     }
-    setDirty(false);
   }
 
   function handleAiSubmit() {
@@ -1017,10 +1008,11 @@ function NodePropertyPanelImpl(
                   <Button
                     size="small"
                     className="workflow-panel-action"
-                    icon={<PlusOutlined />}
-                    onClick={() => setCreateInstanceOpen(true)}
+                    icon={<SaveOutlined />}
+                    disabled={referencedConfigUnavailable}
+                    onClick={openSaveTemplate}
                   >
-                    {t('editor.createTemplate')}
+                    {t('editor.saveCurrentAsTemplate')}
                   </Button>
                 </div>
                 <Select
@@ -1225,64 +1217,40 @@ function NodePropertyPanelImpl(
           </Card>
         )}
       </div>
-      {activeTab === 'config' && (
-        <footer className="workflow-node-panel__footer">
-          {!node.instanceRef && (
-            <div className="workflow-node-panel__save-template">
-              <Checkbox
-                checked={alsoSaveAsInstance}
-                onChange={(e) => setAlsoSaveAsInstance(e.target.checked)}
-              >
-                <Text>{t('editor.saveAsInstance')}</Text>
-              </Checkbox>
-              {alsoSaveAsInstance && (
-                <Space direction="vertical" size={6} style={{ width: '100%' }}>
-                  <Input
-                    value={newInstanceName}
-                    onChange={(e) => setNewInstanceName(e.target.value)}
-                    placeholder={t('editor.instanceNamePlaceholder')}
-                    size="small"
-                  />
-                  <Input
-                    value={newInstanceDesc}
-                    onChange={(e) => setNewInstanceDesc(e.target.value)}
-                    placeholder={t('common.optionalDescription')}
-                    size="small"
-                  />
-                </Space>
-              )}
-            </div>
-          )}
-          <Button
-            type="primary"
-            size="large"
-            block
-            loading={saveAsLoading}
-            disabled={
-              referencedConfigUnavailable ||
-              (!node.instanceRef &&
-                alsoSaveAsInstance &&
-                !newInstanceName.trim())
-            }
-            onClick={handleSave}
-          >
-            {t('editor.saveChanges')}
-          </Button>
-        </footer>
-      )}
-      <CreateNodeInstanceDrawer
-        open={createInstanceOpen}
-        nodeType={currentNodeType}
-        onCancel={() => setCreateInstanceOpen(false)}
-        onCreated={(instance) => {
-          setCreateInstanceOpen(false);
-          setInstances((current) => [
-            instance,
-            ...current.filter((item) => item.id !== instance.id),
-          ]);
-          referenceInstance(instance);
-        }}
-      />
+      <Modal
+        open={saveTemplateOpen}
+        title={t('editor.saveCurrentAsTemplate')}
+        okText={t('editor.saveAndUseTemplate')}
+        cancelText={t('common.cancel')}
+        confirmLoading={templateSaving}
+        okButtonProps={{ disabled: !templateName.trim() }}
+        onOk={() => void handleSaveAsTemplate()}
+        onCancel={() => setSaveTemplateOpen(false)}
+        destroyOnHidden
+      >
+        <Typography.Paragraph type="secondary">
+          {t('editor.saveCurrentAsTemplateHint')}
+        </Typography.Paragraph>
+        <Form layout="vertical">
+          <Form.Item label={t('editor.templateName')} required>
+            <Input
+              aria-label={t('editor.templateName')}
+              value={templateName}
+              onChange={(event) => setTemplateName(event.target.value)}
+              autoFocus
+            />
+          </Form.Item>
+          <Form.Item label={t('common.description')}>
+            <Input.TextArea
+              aria-label={t('common.description')}
+              value={templateDescription}
+              onChange={(event) => setTemplateDescription(event.target.value)}
+              placeholder={t('common.optionalDescription')}
+              rows={3}
+            />
+          </Form.Item>
+        </Form>
+      </Modal>
     </div>
   );
 }

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/WorkflowCodeEditor.test.tsx

@@ -5,14 +5,19 @@ import { WorkflowCodeEditor } from './WorkflowCodeEditor';
 
 vi.mock('@monaco-editor/react', () => ({
   default: ({
+    language,
     value,
     onChange,
+    options,
   }: {
+    language?: string;
     value?: string;
     onChange?(value: string): void;
+    options?: { ariaLabel?: string };
   }) => (
     <textarea
-      aria-label="shared editor"
+      aria-label={options?.ariaLabel ?? 'shared editor'}
+      data-language={language}
       value={value}
       onChange={(event) => onChange?.(event.target.value)}
     />
@@ -39,4 +44,20 @@ describe('WorkflowCodeEditor', () => {
     });
     expect(onChange).toHaveBeenCalledWith('{"ok":true}');
   });
+
+  it('enables Monaco SQL mode and labels the status bar', () => {
+    render(
+      <WorkflowCodeEditor
+        language="sql"
+        value="SELECT * FROM users"
+        ariaLabel="SQL 语句"
+      />,
+    );
+
+    expect(screen.getByRole('textbox', { name: 'SQL 语句' })).toHaveAttribute(
+      'data-language',
+      'sql',
+    );
+    expect(screen.getByText('SQL')).toBeInTheDocument();
+  });
 });

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/WorkflowCodeEditor.tsx

@@ -2,7 +2,13 @@ import Editor from '@monaco-editor/react';
 import { useTranslation } from 'react-i18next';
 import './workflow-code-editor.css';
 
-type WorkflowEditorLanguage = 'json' | 'javascript';
+type WorkflowEditorLanguage = 'json' | 'javascript' | 'sql';
+
+const LANGUAGE_LABELS: Record<WorkflowEditorLanguage, string> = {
+  json: 'JSON',
+  javascript: 'JavaScript',
+  sql: 'SQL',
+};
 
 export function WorkflowCodeEditor({
   language,
@@ -67,7 +73,7 @@ export function WorkflowCodeEditor({
         }}
       />
       <div className="workflow-code-editor__status" aria-hidden="true">
-        <span>{language === 'json' ? 'JSON' : 'JavaScript'}</span>
+        <span>{LANGUAGE_LABELS[language]}</span>
         <span>UTF-8</span>
         <span>{t('editor.indentSpaces')}: 2</span>
       </div>