@gadmin2n/schematics 0.0.144 → 0.0.146

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

@@ -1,19 +1,20 @@
 import React, { useState } from 'react';
-import { Button, Input, message, Modal, Typography } from 'antd';
+import { Button, message, Modal, Typography } from 'antd';
 import { PlayCircleOutlined } from '@ant-design/icons';
 import { customRequest } from 'helpers/http';
 import { useTranslation } from 'react-i18next';
+import { WorkflowCodeEditor } from './WorkflowCodeEditor';
 
 const { Text } = Typography;
 
 interface RunWorkflowModalProps {
-  workflowId: string;
+  workflowCode: string;
   workflowName: string;
   onSuccess?: (instanceId: string) => void;
 }
 
 export function RunWorkflowModal({
-  workflowId,
+  workflowCode,
   workflowName,
   onSuccess,
 }: RunWorkflowModalProps) {
@@ -22,11 +23,13 @@ export function RunWorkflowModal({
   const [workflowJson, setWorkflowJson] = useState('{}');
   const [loading, setLoading] = useState(false);
   const [jsonError, setJsonError] = useState<string | null>(null);
+  const [idempotencyKey, setIdempotencyKey] = useState('');
 
   const handleOpen = () => {
     setOpen(true);
     setWorkflowJson('{}');
     setJsonError(null);
+    setIdempotencyKey(globalThis.crypto.randomUUID());
   };
 
   const handleWorkflowChange = (value: string) => {
@@ -51,9 +54,10 @@ export function RunWorkflowModal({
     setLoading(true);
     try {
       const res = await customRequest<{ instanceId: string }>(
-        `workflow/${workflowId}/execute`,
+        `workflow/actions/${encodeURIComponent(workflowCode)}/execute`,
         'POST',
         { workflow },
+        { headers: { 'Idempotency-Key': idempotencyKey } },
       );
       message.success(t('run.started'));
       setOpen(false);
@@ -82,12 +86,13 @@ export function RunWorkflowModal({
         <Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
           {t('run.workflowData')}
         </Text>
-        <Input.TextArea
-          rows={8}
+        <WorkflowCodeEditor
+          language="json"
           value={workflowJson}
-          onChange={(e) => handleWorkflowChange(e.target.value)}
-          style={{ fontFamily: 'monospace', fontSize: 13 }}
-          status={jsonError ? 'error' : undefined}
+          onChange={handleWorkflowChange}
+          height={240}
+          invalid={Boolean(jsonError)}
+          ariaLabel={t('run.workflowData')}
         />
         {jsonError && (
           <Text

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

@@ -35,7 +35,8 @@ export function StatusCards({ overview, activeFilter, onFilter }: Props) {
   });
 
   return (
-    <Row gutter={12} style={{ marginBottom: 16 }}>
+    // 纵向间距由外层 .workflow-page-stack 的 flex gap 提供，这里不再加 marginBottom
+    <Row gutter={12}>
       {/* Total Runs */}
       <Col flex="1">
         <Card size="small" style={cardStyle()}>

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

@@ -3,6 +3,7 @@ import { Button, Card, Space, Tag, Timeline, Tooltip, Typography } from 'antd';
 import { RollbackOutlined } from '@ant-design/icons';
 import type { WorkflowVersion } from '../types';
 import { useTranslation } from 'react-i18next';
+import { formatWorkflowUtcDateTime } from '../utils/workflowDateTime';
 
 const { Text } = Typography;
 
@@ -71,7 +72,7 @@ export function VersionPanel({
                   {v.changeSummary || v.prompt.slice(0, 50)}
                 </Text>
                 <Text type="secondary" style={{ fontSize: 11 }}>
-                  {new Date(v.createdAt).toLocaleString()}
+                  {formatWorkflowUtcDateTime(v.createdAt)}
                 </Text>
               </Space>
             </div>

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

@@ -0,0 +1,42 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import i18n from '../../../i18n';
+import { WorkflowCodeEditor } from './WorkflowCodeEditor';
+
+vi.mock('@monaco-editor/react', () => ({
+  default: ({
+    value,
+    onChange,
+  }: {
+    value?: string;
+    onChange?(value: string): void;
+  }) => (
+    <textarea
+      aria-label="shared editor"
+      value={value}
+      onChange={(event) => onChange?.(event.target.value)}
+    />
+  ),
+}));
+
+describe('WorkflowCodeEditor', () => {
+  beforeEach(async () => {
+    await i18n.changeLanguage('zh_CN');
+  });
+
+  it('uses the shared language status and forwards edits', () => {
+    const onChange = vi.fn();
+    render(
+      <WorkflowCodeEditor language="json" value="{}" onChange={onChange} />,
+    );
+
+    expect(screen.getByText('JSON')).toBeInTheDocument();
+    expect(screen.getByText('UTF-8')).toBeInTheDocument();
+    expect(screen.getByText('空格: 2')).toBeInTheDocument();
+
+    fireEvent.change(screen.getByLabelText('shared editor'), {
+      target: { value: '{"ok":true}' },
+    });
+    expect(onChange).toHaveBeenCalledWith('{"ok":true}');
+  });
+});

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

@@ -0,0 +1,76 @@
+import Editor from '@monaco-editor/react';
+import { useTranslation } from 'react-i18next';
+import './workflow-code-editor.css';
+
+type WorkflowEditorLanguage = 'json' | 'javascript';
+
+export function WorkflowCodeEditor({
+  language,
+  value = '',
+  onChange,
+  readOnly,
+  height = 300,
+  invalid,
+  ariaLabel,
+  variant = 'bordered',
+  wordWrap = 'on',
+}: {
+  language: WorkflowEditorLanguage;
+  value?: string;
+  onChange?(value: string): void;
+  readOnly?: boolean;
+  height?: number | string;
+  invalid?: boolean;
+  ariaLabel?: string;
+  variant?: 'bordered' | 'plain';
+  wordWrap?: 'on' | 'off';
+}) {
+  const { t } = useTranslation('workflow');
+  const fillsParent = height === '100%';
+
+  return (
+    <div
+      className={`workflow-code-editor workflow-code-editor--${variant}${fillsParent ? ' workflow-code-editor--fill' : ''}${invalid ? ' workflow-code-editor--invalid' : ''}`}
+      style={fillsParent ? { height: '100%' } : undefined}
+    >
+      <Editor
+        height={fillsParent ? 'calc(100% - 28px)' : height}
+        language={language}
+        value={value}
+        onChange={(next) => onChange?.(next ?? '')}
+        options={{
+          readOnly,
+          ariaLabel,
+          minimap: { enabled: false },
+          fontFamily:
+            '"SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace',
+          fontSize: 13,
+          lineHeight: 21,
+          lineNumbers: 'on',
+          lineNumbersMinChars: 3,
+          folding: true,
+          glyphMargin: false,
+          renderLineHighlight: readOnly ? 'none' : 'line',
+          scrollBeyondLastLine: false,
+          automaticLayout: true,
+          tabSize: 2,
+          insertSpaces: true,
+          wordWrap,
+          formatOnPaste: true,
+          formatOnType: language === 'json',
+          padding: { top: 12, bottom: 12 },
+          bracketPairColorization: { enabled: true },
+          guides: { bracketPairs: true, indentation: true },
+          overviewRulerBorder: false,
+          overviewRulerLanes: 0,
+          stickyScroll: { enabled: false },
+        }}
+      />
+      <div className="workflow-code-editor__status" aria-hidden="true">
+        <span>{language === 'json' ? 'JSON' : 'JavaScript'}</span>
+        <span>UTF-8</span>
+        <span>{t('editor.indentSpaces')}: 2</span>
+      </div>
+    </div>
+  );
+}

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

@@ -0,0 +1,56 @@
+import { ArrowLeftOutlined } from '@ant-design/icons';
+import { Button, Typography } from 'antd';
+import type { ReactNode } from 'react';
+
+interface WorkflowWorkspaceHeaderProps {
+  eyebrow: ReactNode;
+  title: ReactNode;
+  status?: ReactNode;
+  actions?: ReactNode;
+  onBack: () => void;
+  backLabel: string;
+}
+
+export function WorkflowWorkspaceHeader({
+  eyebrow,
+  title,
+  status,
+  actions,
+  onBack,
+  backLabel,
+}: WorkflowWorkspaceHeaderProps) {
+  return (
+    <header className="workflow-workspace__header">
+      <div className="workflow-workspace__header-inner">
+        <div className="workflow-workspace__identity">
+          <Button
+            type="text"
+            icon={<ArrowLeftOutlined />}
+            aria-label={backLabel}
+            onClick={onBack}
+          />
+          <div className="workflow-workspace__heading">
+            <span className="workflow-workspace__eyebrow">{eyebrow}</span>
+            <div className="workflow-workspace__title-row">
+              {typeof title === 'string' ? (
+                <Typography.Title
+                  level={4}
+                  className="workflow-workspace__title"
+                  title={title}
+                >
+                  {title}
+                </Typography.Title>
+              ) : (
+                title
+              )}
+              {status}
+            </div>
+          </div>
+        </div>
+        {actions ? (
+          <div className="workflow-workspace__actions">{actions}</div>
+        ) : null}
+      </div>
+    </header>
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/parameter-binding-editor.css

@@ -0,0 +1,46 @@
+.workflow-parameter-binding {
+  width: 100%;
+}
+
+.workflow-parameter-binding__controls {
+  display: grid;
+  width: 100%;
+  min-width: 0;
+  align-items: start;
+  grid-template-columns: minmax(115px, 160px) minmax(0, 1fr);
+  gap: 8px;
+}
+
+.workflow-parameter-binding__controls--fixed {
+  grid-template-columns:
+    minmax(105px, 150px) minmax(72px, 100px)
+    minmax(0, 1fr);
+}
+
+.workflow-parameter-binding__controls--json {
+  grid-template-columns: minmax(105px, 150px) minmax(72px, 100px);
+}
+
+.workflow-parameter-binding__source,
+.workflow-parameter-binding__type,
+.workflow-parameter-binding__value,
+.workflow-parameter-binding__path {
+  width: 100%;
+  min-width: 0;
+}
+
+.workflow-parameter-binding__path-prefix {
+  color: var(--ant-color-text-tertiary);
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+  font-size: 12px;
+}
+
+.workflow-parameter-binding__json,
+.workflow-parameter-binding__error {
+  display: block;
+  margin-top: 6px;
+}
+
+.workflow-parameter-binding__error {
+  font-size: 12px;
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/components/workflow-code-editor.css

@@ -0,0 +1,34 @@
+.workflow-code-editor {
+  min-width: 0;
+  overflow: hidden;
+  background: var(--ant-color-bg-container);
+}
+
+.workflow-code-editor--bordered {
+  border: 1px solid var(--ant-color-border);
+  border-radius: 6px;
+}
+
+.workflow-code-editor--fill {
+  min-height: 0;
+  flex: 1 1 0;
+}
+
+.workflow-code-editor--invalid {
+  border-color: var(--ant-color-error);
+}
+
+.workflow-code-editor__status {
+  min-height: 28px;
+  padding: 0 10px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 14px;
+  border-top: 1px solid var(--ant-color-border-secondary);
+  background: var(--ant-color-fill-quaternary);
+  color: var(--ant-color-text-tertiary);
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+  font-size: 11px;
+  font-variant-numeric: tabular-nums;
+}

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

@@ -1,11 +1,14 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { customRequest } from 'helpers/http';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import i18n from '../../../i18n';
 import { ConnectionModal } from './ConnectionModal';
+import { fetchConnectionSecrets, saveConnection } from './connectionsApi';
 
-vi.mock('helpers/http', () => ({ customRequest: vi.fn() }));
+vi.mock('./connectionsApi', () => ({
+  fetchConnectionSecrets: vi.fn(),
+  saveConnection: vi.fn(),
+}));
 
 Object.defineProperty(window, 'matchMedia', {
   writable: true,
@@ -22,7 +25,8 @@ Object.defineProperty(window, 'matchMedia', {
 describe('ConnectionModal', () => {
   beforeEach(async () => {
     await i18n.changeLanguage('zh_CN');
-    vi.mocked(customRequest).mockResolvedValue({} as never);
+    vi.mocked(saveConnection).mockResolvedValue({} as never);
+    vi.mocked(fetchConnectionSecrets).mockResolvedValue({});
     const getComputedStyle = window.getComputedStyle.bind(window);
     vi.spyOn(window, 'getComputedStyle').mockImplementation((element) =>
       getComputedStyle(element),
@@ -47,12 +51,11 @@ describe('ConnectionModal', () => {
     const tokenInput = screen.getByLabelText('PAAS Token');
     expect(tokenInput).toHaveAttribute('type', 'password');
     await user.type(tokenInput, 'paas-token');
-    await user.click(screen.getByRole('button', { name: '创建并使用' }));
+    await user.click(screen.getByRole('button', { name: '创建连接' }));
 
     await waitFor(() =>
-      expect(customRequest).toHaveBeenCalledWith(
-        'integration-connections',
-        'POST',
+      expect(saveConnection).toHaveBeenCalledWith(
+        undefined,
         expect.objectContaining({
           authType: 'API_KEY',
           publicConfig: {
@@ -65,4 +68,47 @@ describe('ConnectionModal', () => {
       ),
     );
   });
+
+  it('loads a saved secret only after the user asks to view it', async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchConnectionSecrets).mockResolvedValue({
+      token: 'saved-bearer-token',
+    });
+
+    render(
+      <ConnectionModal
+        open
+        connection={{
+          id: '1',
+          code: 'ticket-system',
+          name: '工单系统',
+          baseUrl: 'https://tickets.example.com',
+          authType: 'BEARER',
+          publicConfig: { defaultHeaders: {} },
+          hasSecret: true,
+          isEnabled: true,
+          revision: 1,
+          updatedAt: '2026-08-13T00:00:00.000Z',
+        }}
+        onCancel={vi.fn()}
+        onSaved={vi.fn()}
+      />,
+    );
+
+    expect(screen.getByLabelText('Bearer Token')).toHaveValue('');
+    expect(fetchConnectionSecrets).not.toHaveBeenCalled();
+
+    await user.click(screen.getByRole('button', { name: '显示已保存凭据' }));
+
+    await waitFor(() =>
+      expect(fetchConnectionSecrets).toHaveBeenCalledWith('ticket-system'),
+    );
+    expect(screen.getByLabelText('Bearer Token')).toHaveValue(
+      'saved-bearer-token',
+    );
+    expect(screen.getByLabelText('Bearer Token')).toHaveAttribute(
+      'type',
+      'password',
+    );
+  });
 });