@gadmin2n/schematics 0.0.87 → 0.0.89

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/canvasDefaults.ts

@@ -28,7 +28,6 @@ export const CANVAS_COMPONENTS: string[] = [
   'PieChart',
   'RadarChart',
   'TreemapChart',
-  'MultiChart',
   'Table',
   'WorldMap',
 ];
@@ -51,31 +50,52 @@ export const CANVAS_DEFAULTS: Record<string, CanvasDefault> = {
   },
 
   BarChart: {
-    code: `<BarChart variant="bar" data={[{ name: "A", value: 1 }]} height={300} testId="canvas-barchart" />`,
+    code: `<MultiChart
+  defaultVariant="bar"
+  charts={["bar","line","pie"]}
+  data={{ xData: ["A", "B", "C", "D"], series: [{ name: "数据", data: [420, 580, 310, 670] }] }}
+  showDownload={true}
+  height={300}
+  testId="canvas-barchart"
+/>`,
     layout: { w: 24, h: 20, minW: 8, minH: 8 },
     props: getPropsFor('BarChart'),
     variants: getVariantsFor('BarChart'),
-    imports: `import { BarChart } from "@gadmin2n/charts";`,
+    imports: `import { MultiChart } from "@gadmin2n/charts";`,
   },
 
   LineChart: {
-    code: `<LineChart data={[{ name: "A", value: 1 }]} height={300} legendShow={true} testId="canvas-linechart" />`,
+    code: `<MultiChart
+  defaultVariant="line"
+  charts={["line","bar","pie"]}
+  data={{ xData: ["Jan", "Feb", "Mar", "Apr", "May", "Jun"], series: [{ name: "趋势", data: [65, 72, 78, 85, 82, 91] }] }}
+  showDownload={true}
+  height={300}
+  testId="canvas-linechart"
+/>`,
     layout: { w: 24, h: 20, minW: 10, minH: 8 },
     props: getPropsFor('LineChart'),
     variants: getVariantsFor('LineChart'),
-    imports: `import { LineChart } from "@gadmin2n/charts";`,
+    imports: `import { MultiChart } from "@gadmin2n/charts";`,
   },
 
   PieChart: {
-    code: `<PieChart variant="pie" data={[{ name: "A", value: 1 }]} height={300} legendShow={true} testId="canvas-piechart" />`,
+    code: `<MultiChart
+  defaultVariant="pie"
+  charts={["pie","bar","line"]}
+  data={{ xData: ["类目A", "类目B", "类目C", "类目D", "类目E"], series: [{ name: "分布", data: [1245, 876, 234, 189, 156] }] }}
+  showDownload={true}
+  height={300}
+  testId="canvas-piechart"
+/>`,
     layout: { w: 24, h: 20, minW: 8, minH: 8 },
     props: getPropsFor('PieChart'),
     variants: getVariantsFor('PieChart'),
-    imports: `import { PieChart } from "@gadmin2n/charts";`,
+    imports: `import { MultiChart } from "@gadmin2n/charts";`,
   },
 
   RadarChart: {
-    code: `<RadarChart indicators={[{ name: "A" }]} series={[{ name: "S", data: [1] }]} height={300} testId="canvas-radarchart" />`,
+    code: `<RadarChart indicators={[{ name: "A" }]} series={[{ name: "S", data: [1] }]} height={300} showDownload={true} testId="canvas-radarchart" />`,
     layout: { w: 24, h: 20, minW: 8, minH: 8 },
     props: getPropsFor('RadarChart'),
     variants: getVariantsFor('RadarChart'),
@@ -83,7 +103,7 @@ export const CANVAS_DEFAULTS: Record<string, CanvasDefault> = {
   },
 
   TreemapChart: {
-    code: `<TreemapChart data={[{ name: "A", value: 1 }]} height={300} legendShow={true} testId="canvas-treemap" />`,
+    code: `<TreemapChart data={[{ name: "A", value: 1 }]} height={300} legendShow={true} showDownload={true} testId="canvas-treemap" />`,
     layout: { w: 24, h: 20, minW: 8, minH: 8 },
     props: getPropsFor('TreemapChart'),
     variants: getVariantsFor('TreemapChart'),
@@ -91,7 +111,7 @@ export const CANVAS_DEFAULTS: Record<string, CanvasDefault> = {
   },
 
   Table: {
-    code: `<Table size="small" dataSource={[]} columns={[]} testId="canvas-table" />`,
+    code: `<Table size="small" dataSource={[]} columns={[]} showDownload={true} testId="canvas-table" />`,
     layout: { w: 24, h: 20, minW: 10, minH: 5 },
     props: getPropsFor('Table'),
     variants: getVariantsFor('Table'),
@@ -99,7 +119,7 @@ export const CANVAS_DEFAULTS: Record<string, CanvasDefault> = {
   },
 
   WorldMap: {
-    code: `<WorldMap option={{ geo: {}, series: [] }} style={{ height: 400 }} testId="canvas-worldmap" />`,
+    code: `<WorldMap option={{ geo: {}, series: [] }} style={{ height: 400 }} showDownload={true} testId="canvas-worldmap" />`,
     layout: { w: 32, h: 20, minW: 14, minH: 10 },
     props: getPropsFor('WorldMap'),
     variants: getVariantsFor('WorldMap'),
@@ -108,6 +128,7 @@ export const CANVAS_DEFAULTS: Record<string, CanvasDefault> = {
 
   MultiChart: {
     code: `<MultiChart
+  showDownload={true}
   height={300}
   testId="canvas-multichart"
 />`,

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas/demos.ts

@@ -362,37 +362,26 @@ const barChartDemo: ComponentDemo = {
     {
       name: 'bar',
       label: 'bar',
-      code: `<BarChart
-  variant="bar"
-  data={[
-    { name: "A", value: 420 },
-    { name: "B", value: 580 },
-    { name: "C", value: 310 },
-    { name: "D", value: 670 },
-  ]}
-  unit="件"
-  title="数据对比"
+      code: `<MultiChart
+  defaultVariant="bar"
+  charts={["bar","line","pie"]}
+  data={{ xData: ["A", "B", "C", "D"], series: [{ name: "数据", data: [420, 580, 310, 670] }] }}
+  showDownload={true}
   height={300}
-  testId="canvas-barchart-bar"
+  testId="demo-barchart-bar"
 />`,
     },
     {
       name: 'groupBar',
       label: 'groupBar',
-      code: `<BarChart
-  variant="groupBar"
-  data={{
-    xData: ["Jan", "Feb", "Mar", "Apr", "May", "Jun"],
-    series: [
-      { name: "系列A", data: [120, 132, 101, 134,  90, 150] },
-      { name: "系列B", data: [220, 182, 191, 234, 290, 330] },
-      { name: "系列C", data: [ 80,  72,  85,  90, 110,  95] },
-    ],
-  }}
-  unit="万"
-  title="分组对比"
+      code: `<MultiChart
+  defaultVariant="bar"
+  charts={["bar","line","pie"]}
+  data={{ xData: ["Jan", "Feb", "Mar", "Apr", "May", "Jun"], series: [{ name: "系列A", data: [120, 132, 101, 134, 90, 150] }, { name: "系列B", data: [220, 182, 191, 234, 290, 330] }] }}
+  chartConfig={{"bar":{"variant":"groupBar"}}}
+  showDownload={true}
   height={300}
-  testId="canvas-barchart-group"
+  testId="demo-barchart-group"
 />`,
     },
   ],
@@ -491,18 +480,13 @@ const lineChartDemo: ComponentDemo = {
     {
       name: 'default',
       label: 'default',
-      code: `<LineChart
-  data={{
-    xData: ["Jan", "Feb", "Mar", "Apr", "May", "Jun"],
-    series: [
-      { name: "利用率", data: [65, 72, 78, 85, 82, 91] },
-    ],
-  }}
-  unit="%"
-  title="利用率"
+      code: `<MultiChart
+  defaultVariant="line"
+  charts={["line","bar","pie"]}
+  data={{ xData: ["Jan", "Feb", "Mar", "Apr", "May", "Jun"], series: [{ name: "利用率", data: [65, 72, 78, 85, 82, 91] }] }}
+  showDownload={true}
   height={300}
-  legendShow={true}
-  testId="canvas-linechart-default"
+  testId="demo-linechart-default"
 />`,
     },
   ],
@@ -597,27 +581,25 @@ const pieChartDemo: ComponentDemo = {
     {
       name: 'pie',
       label: 'pie',
-      code: `<PieChart
-  variant="pie"
-  data={[
-    { name: "类目A", value: 1245 },
-    { name: "类目B", value: 876 },
-    { name: "类目C", value: 234 },
-    { name: "类目D", value: 189 },
-    { name: "类目E", value: 156 },
-  ]}
+      code: `<MultiChart
+  defaultVariant="pie"
+  charts={["pie","bar","line"]}
+  data={{ xData: ["类目A", "类目B", "类目C", "类目D", "类目E"], series: [{ name: "分布", data: [1245, 876, 234, 189, 156] }] }}
+  showDownload={true}
   height={300}
-  title="分布"
-  legendShow={true}
-  insideLabelThreshold={15}
-  topN={0}
-  testId="canvas-piechart-pie"
+  testId="demo-piechart-pie"
 />`,
     },
-    {
-      name: 'ring',
-      label: 'ring',
-      code: `<PieChart
+  ],
+};
+
+// PieChart 备用 variants（不在组件库中展示，保留代码供参考）
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const _pieChartUnusedVariants = [
+  {
+    name: 'ring',
+    label: 'ring',
+    code: `<PieChart
   variant="ring"
   data={[
     { name: "正常", value: 820, itemStyle: { color: "#52c41a" } },
@@ -630,11 +612,11 @@ const pieChartDemo: ComponentDemo = {
   topN={0}
   testId="canvas-piechart-ring"
 />`,
-    },
-    {
-      name: 'sunburst',
-      label: 'sunburst',
-      code: `<PieChart
+  },
+  {
+    name: 'sunburst',
+    label: 'sunburst',
+    code: `<PieChart
   variant="sunburst"
   data={[
     {
@@ -666,9 +648,8 @@ const pieChartDemo: ComponentDemo = {
   legendShow={true}
   testId="canvas-piechart-sunburst"
 />`,
-    },
-  ],
-};
+  },
+];
 
 // ─── RadarChart ────────────────────────────────────────────────────────────────
 const radarChartDemo: ComponentDemo = {
@@ -746,6 +727,7 @@ const radarChartDemo: ComponentDemo = {
     { name: "组A", data: [92, 88, 75, 84, 90, 78], color: "#3889f3" },
     { name: "组B", data: [85, 92, 88, 91, 83, 95], color: "#0db46c" },
   ]}
+  showDownload={true}
   height={300}
   testId="canvas-radar-demo"
 />`,
@@ -856,6 +838,7 @@ const treemapChartDemo: ComponentDemo = {
   ]}
   height={400}
   title="矩形树图"
+  showDownload={true}
   testId="canvas-treemap-demo"
 />`,
     },
@@ -933,6 +916,7 @@ const tableDemo: ComponentDemo = {
     { title: "部门", dataIndex: "dept", key: "dept" },
     { title: "状态", dataIndex: "status", key: "status" },
   ]}
+  showDownload={true}
   testId="canvas-table-default"
 />`,
     },
@@ -1014,6 +998,7 @@ const worldMapDemo: ComponentDemo = {
     series: [],
   }}
   style={{ height: 400 }}
+  showDownload={true}
   testId="canvas-worldmap-basic"
 />`,
     },
@@ -1054,6 +1039,7 @@ const worldMapDemo: ComponentDemo = {
     tooltip: { trigger: "item" },
   }}
   style={{ height: 400 }}
+  showDownload={true}
   testId="canvas-worldmap-heatmap"
 />`,
     },
@@ -1089,6 +1075,7 @@ const multiChartDemo: ComponentDemo = {
       name: 'default',
       label: 'default',
       code: `<MultiChart
+  showDownload={true}
   height={300}
   testId="canvas-multichart-default"
 />`,

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/canvas-page/index.tsx

@@ -5,6 +5,7 @@ import { GridLayout, useContainerWidth } from 'react-grid-layout';
 import type { LayoutItem } from 'react-grid-layout';
 import CanvasCell from '../canvas/CanvasCell';
 import type { CanvasItem } from '../canvas/types';
+import { customRequest } from 'helpers/http';
 import 'react-grid-layout/css/styles.css';
 import 'react-resizable/css/styles.css';
 
@@ -27,16 +28,12 @@ export default function CanvasViewPage() {
   useEffect(() => {
     if (!slug) return;
     setLoading(true);
-    fetch(`/api/canvas/by-page-code/${slug}`, { credentials: 'include' })
-      .then((r) => {
-        if (!r.ok) throw new Error(`${r.status}`);
-        return r.json();
-      })
+    customRequest<CanvasData>(`canvas/by-page-code/${slug}`, 'GET')
       .then((d) => {
         setData(d);
         setError(null);
       })
-      .catch((e) => setError(e.message))
+      .catch((e) => setError(e?.message ?? String(e)))
       .finally(() => setLoading(false));
   }, [slug]);
 

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

@@ -16,12 +16,14 @@ interface DslViewProps {
   dsl: WorkflowDSL | null;
   readonly?: boolean;
   onApply?: (newDsl: WorkflowDSL) => void;
-  onDirtyChange?: (dirty: boolean) => void;
 }
 
 export interface DslViewHandle {
-  apply: () => void;
+  /** Validate textarea and apply to parent. Returns true on success (or no-op when text unchanged), false on validation failure. */
+  apply: () => boolean;
   copy: () => Promise<void>;
+  /** Whether textarea content differs from last applied DSL. */
+  isDirty: () => boolean;
 }
 
 function stringifyDsl(dsl: WorkflowDSL | null): string {
@@ -98,7 +100,7 @@ async function copyToClipboard(text: string): Promise<boolean> {
 }
 
 export const DslView = forwardRef<DslViewHandle, DslViewProps>(function DslView(
-  { dsl, readonly = false, onApply, onDirtyChange },
+  { dsl, readonly = false, onApply },
   ref,
 ) {
   const initial = useMemo(() => stringifyDsl(dsl), [dsl]);
@@ -109,39 +111,36 @@ export const DslView = forwardRef<DslViewHandle, DslViewProps>(function DslView(
   useEffect(() => {
     setText(initial);
     setError(null);
-    onDirtyChange?.(false);
-    // onDirtyChange 故意不放进依赖数组：调用方传不稳定函数会导致死循环
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [initial]);
 
   function handleTextChange(next: string) {
     setText(next);
     if (error) setError(null);
-    if (!readonly) {
-      const dirty = next !== initial;
-      onDirtyChange?.(dirty);
-    }
   }
 
-  function handleApply() {
+  function handleApply(): boolean {
+    // 文本未变更：no-op success（无需重复应用，避免无意义重渲染）
+    if (text === initial) {
+      setError(null);
+      return true;
+    }
     let parsed: any;
     try {
       parsed = JSON.parse(text);
     } catch (e: any) {
       setError(`JSON 解析失败：${e?.message ?? String(e)}`);
-      return;
+      return false;
     }
     const result = validateDsl(parsed);
     if (!result.ok) {
       setError(result.error);
-      return;
+      return false;
     }
     const normalized = JSON.stringify(result.dsl, null, 2);
     setText(normalized);
     setError(null);
     onApply?.(result.dsl);
-    onDirtyChange?.(false);
-    message.success('已应用到画布');
+    return true;
   }
 
   async function handleCopy() {
@@ -158,9 +157,10 @@ export const DslView = forwardRef<DslViewHandle, DslViewProps>(function DslView(
     () => ({
       apply: handleApply,
       copy: handleCopy,
+      isDirty: () => text !== initial,
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [text, onApply, onDirtyChange],
+    [text, initial, onApply],
   );
 
   return (

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

@@ -20,7 +20,6 @@ import {
 } from 'antd';
 import {
   ArrowLeftOutlined,
-  CheckOutlined,
   EditOutlined,
   RobotOutlined,
   RocketOutlined,
@@ -63,7 +62,6 @@ export default function WorkflowEditorPage() {
 
   const [selectedNodeId, setSelectedNodeId] = useState<string | null>(null);
   const [viewMode, setViewMode] = useState<'canvas' | 'dsl'>('canvas');
-  const [dslDirty, setDslDirty] = useState(false);
   const dslViewRef = useRef<DslViewHandle>(null);
 
   // Title editing state
@@ -340,7 +338,10 @@ export default function WorkflowEditorPage() {
   async function handleSelectVersion(version: number) {
     if (!id) return;
 
-    if (hasUnsavedChanges || (viewMode === 'dsl' && dslDirty)) {
+    const dslDirty =
+      viewMode === 'dsl' && (dslViewRef.current?.isDirty() ?? false);
+
+    if (hasUnsavedChanges || dslDirty) {
       Modal.confirm({
         title: hasUnsavedChanges ? '未保存的修改' : 'DSL 有未应用的编辑',
         content: hasUnsavedChanges
@@ -378,21 +379,31 @@ export default function WorkflowEditorPage() {
   }
 
   function handleViewModeChange(next: 'canvas' | 'dsl') {
-    if (next === 'canvas' && dslDirty) {
+    if (next === 'canvas' && viewMode === 'dsl') {
+      // 切回画布前自动应用 textarea 中的 DSL；校验失败则阻止切换
+      const success = dslViewRef.current?.apply() ?? true;
+      if (!success) {
+        // DslView 已显示内联 Alert，无需额外提示
+        return;
+      }
+    }
+    setViewMode(next);
+  }
+
+  function handleOpenAiModal() {
+    const hasExistingWorkflow = !!(dsl && dsl.nodes.length > 0);
+    if (hasExistingWorkflow) {
       Modal.confirm({
-        title: '未应用的修改',
+        title: '覆盖现有工作流',
         content:
-          'DSL 视图中有未应用到画布的修改，切换到 Canvas 将丢弃这些修改。确定要继续吗？',
-        okText: '确定切换',
+          '当前已有工作流内容，AI 自动生成将覆盖现有内容。确定要继续吗？',
+        okText: '确定继续',
         cancelText: '取消',
-        onOk: () => {
-          setDslDirty(false);
-          setViewMode('canvas');
-        },
+        onOk: () => setAiModalOpen(true),
       });
       return;
     }
-    setViewMode(next);
+    setAiModalOpen(true);
   }
 
   function handleDslApply(newDsl: WorkflowDSL) {
@@ -478,11 +489,11 @@ export default function WorkflowEditorPage() {
                 }))}
               />
             )}
-            {isDev && viewMode === 'canvas' && (
+            {isDev && (
               <Button
                 type="primary"
                 icon={<RobotOutlined />}
-                onClick={() => setAiModalOpen(true)}
+                onClick={handleOpenAiModal}
               >
                 AI自动生成
               </Button>
@@ -500,36 +511,23 @@ export default function WorkflowEditorPage() {
         </div>
       </Card>
 
-      {/* View toggle row + DSL actions */}
+      {/* View toggle row */}
       <div
         style={{
           marginBottom: 12,
           flexShrink: 0,
           display: 'flex',
           alignItems: 'center',
-          justifyContent: 'space-between',
         }}
       >
         <Segmented
           value={viewMode}
           onChange={(v) => handleViewModeChange(v as 'canvas' | 'dsl')}
           options={[
-            { label: 'Canvas', value: 'canvas' },
+            { label: '画布', value: 'canvas' },
             { label: 'DSL', value: 'dsl' },
           ]}
         />
-        {viewMode === 'dsl' && (
-          <Space>
-            {dslDirty && <Tag color="orange">未应用</Tag>}
-            <Button
-              type="primary"
-              icon={<CheckOutlined />}
-              onClick={() => dslViewRef.current?.apply()}
-            >
-              应用到画布
-            </Button>
-          </Space>
-        )}
       </div>
 
       {/* Main area: Flow + Property Panel */}
@@ -560,12 +558,7 @@ export default function WorkflowEditorPage() {
             />
           </>
         ) : (
-          <DslView
-            ref={dslViewRef}
-            dsl={dsl}
-            onApply={handleDslApply}
-            onDirtyChange={setDslDirty}
-          />
+          <DslView ref={dslViewRef} dsl={dsl} onApply={handleDslApply} />
         )}
       </div>
 

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

@@ -9,6 +9,7 @@ import {
   Spin,
   Steps,
   Tag,
+  Tooltip,
   Typography,
 } from 'antd';
 import {
@@ -16,6 +17,7 @@ import {
   CheckCircleOutlined,
   ClockCircleOutlined,
   CloseCircleOutlined,
+  LinkOutlined,
   LoadingOutlined,
   ReloadOutlined,
   StopOutlined,
@@ -243,9 +245,35 @@ export default function WorkflowInstanceDetailPage() {
             </Tag>
           </Space>
           <Space>
-            <Button icon={<ReloadOutlined />} onClick={fetchData}>
-              Refresh
-            </Button>
+            <Tooltip
+              title={
+                data.temporalRunId
+                  ? '在 Temporal Web UI 中查看完整执行历史、Pending Activities 和 Worker 状态'
+                  : '此实例无 Temporal Run ID（可能由 outbox-poller 创建或 Temporal 当时不可用）'
+              }
+            >
+              <Button
+                icon={<LinkOutlined />}
+                disabled={!data.temporalRunId}
+                onClick={() => {
+                  if (!data.temporalRunId) return;
+                  const base =
+                    import.meta.env.VITE_TEMPORAL_UI_URL ||
+                    'http://localhost:8080';
+                  const ns =
+                    import.meta.env.VITE_TEMPORAL_NAMESPACE || 'default';
+                  window.open(
+                    `${base}/namespaces/${ns}/workflows/${encodeURIComponent(
+                      data.temporalRunId,
+                    )}`,
+                    '_blank',
+                    'noopener,noreferrer',
+                  );
+                }}
+              >
+                在 Temporal 中查看
+              </Button>
+            </Tooltip>
             {(data.status === 'RUNNING' || data.status === 'PENDING') && (
               <Popconfirm
                 title="Cancel this workflow execution?"
@@ -267,6 +295,9 @@ export default function WorkflowInstanceDetailPage() {
                 Retry
               </Button>
             )}
+            <Button icon={<ReloadOutlined />} onClick={fetchData}>
+              Refresh
+            </Button>
           </Space>
         </div>
       </Card>

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

@@ -347,7 +347,7 @@ ${diffRightDsl}
           value={viewMode}
           onChange={(v) => setViewMode(v as 'canvas' | 'dsl')}
           options={[
-            { label: 'Canvas', value: 'canvas' },
+            { label: '画布', value: 'canvas' },
             { label: 'DSL', value: 'dsl' },
           ]}
         />

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/types.ts

@@ -40,7 +40,7 @@ export interface Workflow {
   creator: string;
   createdAt: string;
   updatedAt: string;
-  versions?: { version: number }[];
+  versions?: { version: number; changeSummary?: string | null }[];
   _count?: { instances: number };
   runs?: {
     pending: number;

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/styles/antd.css

@@ -22,6 +22,12 @@
     border-top: 1px solid #d9d9d9;
     margin-top: 0px;
   }
+
+  /* Modal.confirm/warning/info/error 不走 header/body/footer 结构，
+     需单独补回 padding，否则内容会顶到边 */
+  &.ant-modal-confirm .ant-modal-content {
+    padding: 32px 32px 24px;
+  }
 }
 
 .kanban-update-modal {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/schematics",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [