@gadmin2n/schematics 0.0.139 → 0.0.141

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

@@ -0,0 +1,66 @@
+import type { WorkflowNode } from '../types';
+
+export interface LookupPort {
+  id: string;
+  label: string;
+  direction: 'input' | 'output';
+  kind: 'CALL' | 'RETURN';
+}
+
+export interface RuntimePorts {
+  inputId?: string;
+  inputLabel: string;
+  outputId?: string;
+  outputLabel: string;
+  emphasized?: boolean;
+}
+
+export function resolveRuntimePorts(node: WorkflowNode): RuntimePorts {
+  if (node.type === 'http_request')
+    return {
+      inputId: 'request-in',
+      inputLabel: 'Request IN',
+      outputId: 'response-out',
+      outputLabel: 'Response OUT',
+      emphasized: true,
+    };
+  if (node.type === 'code')
+    return {
+      inputId: 'data-in',
+      inputLabel: 'Data IN',
+      outputId: 'result-out',
+      outputLabel: 'Result OUT',
+      emphasized: true,
+    };
+  return { inputLabel: 'IN', outputLabel: 'OUT' };
+}
+
+export function resolveLookupPorts(node: WorkflowNode): LookupPort[] {
+  if (node.type !== 'approval' && node.type !== 'human_approval') return [];
+  const subjects = Array.isArray(node.config?.subjects)
+    ? node.config.subjects
+    : [];
+  return subjects.flatMap((subject: any) => {
+    if (subject?.source !== 'DYNAMIC' || !subject.inputKey) return [];
+    const isGroup = subject.provider === 'USER_GROUP';
+    const inputKey = String(subject.inputKey);
+    return [
+      {
+        id: `approver:${inputKey}`,
+        label: isGroup ? 'User groups IN' : 'Users IN',
+        direction: 'input' as const,
+        kind: 'RETURN' as const,
+      },
+      {
+        id: `lookup:${inputKey}`,
+        label: isGroup ? 'Find user groups OUT' : 'Find users OUT',
+        direction: 'output' as const,
+        kind: 'CALL' as const,
+      },
+    ];
+  });
+}
+
+export function lookupInputKey(handle: string | null | undefined): string {
+  return handle?.startsWith('lookup:') ? handle.slice('lookup:'.length) : '';
+}

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

@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest';
+import type { WorkflowNode } from '../types';
+import { resolveOutputs } from './resolveOutputs';
+
+describe('resolveOutputs', () => {
+  it('always exposes approved and rejected branches for human approval', () => {
+    const node = {
+      id: 'approval-1',
+      type: 'approval',
+      label: 'Approval',
+      position: { x: 0, y: 0 },
+      config: {},
+    } as WorkflowNode;
+
+    expect(resolveOutputs(node, { outputs: [] })).toEqual(['true', 'false']);
+  });
+
+  it('uses configured external outcomes and the timeout branch', () => {
+    const node = {
+      id: 'wait-1',
+      type: 'external_wait',
+      label: '等待签署',
+      position: { x: 0, y: 0 },
+      config: {
+        outcomes: [
+          { code: 'SIGNED', label: '已签署' },
+          { code: 'REJECTED', label: '已拒绝' },
+        ],
+        timeout: { durationSeconds: 3600, outcome: 'TIMEOUT' },
+      },
+    } as WorkflowNode;
+
+    expect(resolveOutputs(node, { outputs: [] })).toEqual([
+      'SIGNED',
+      'REJECTED',
+      'TIMEOUT',
+    ]);
+  });
+});

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

@@ -14,6 +14,9 @@ export function resolveOutputs(
   node: WorkflowNode,
   nodeTypeMeta: { outputs?: string[] | null } | undefined,
 ): string[] {
+  if (node.type === 'approval' || node.type === 'human_approval') {
+    return ['true', 'false'];
+  }
   if (node.type === 'switch') {
     const cases = (node.config as any)?.cases as
       | Array<{ value?: string }>
@@ -23,5 +26,50 @@ export function resolveOutputs(
       .map((c) => c?.value)
       .filter((v): v is string => typeof v === 'string' && v.length > 0);
   }
+  if (node.type === 'external_wait') {
+    const outcomes = Array.isArray((node.config as any)?.outcomes)
+      ? ((node.config as any).outcomes as Array<{ code?: unknown }>)
+      : [];
+    const codes = outcomes
+      .map((item) => item?.code)
+      .filter(
+        (code): code is string =>
+          typeof code === 'string' && code.trim().length > 0,
+      );
+    const timeoutOutcome = (node.config as any)?.timeout?.outcome;
+    return [
+      ...codes,
+      ...(typeof timeoutOutcome === 'string' && timeoutOutcome.trim()
+        ? [timeoutOutcome]
+        : []),
+    ];
+  }
   return nodeTypeMeta?.outputs ?? [];
 }
+
+export function resolveOutputLabels(
+  node: WorkflowNode,
+): Record<string, string> {
+  if (node.type !== 'external_wait') return {};
+  const outcomes = Array.isArray((node.config as any)?.outcomes)
+    ? ((node.config as any).outcomes as Array<{
+        code?: unknown;
+        label?: unknown;
+      }>)
+    : [];
+  const labels = Object.fromEntries(
+    outcomes.flatMap((item) =>
+      typeof item.code === 'string' &&
+      item.code.trim() &&
+      typeof item.label === 'string' &&
+      item.label.trim()
+        ? [[item.code, item.label]]
+        : [],
+    ),
+  );
+  const timeoutOutcome = (node.config as any)?.timeout?.outcome;
+  if (typeof timeoutOutcome === 'string' && timeoutOutcome.trim()) {
+    labels[timeoutOutcome] = '已超时';
+  }
+  return labels;
+}

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

@@ -0,0 +1,51 @@
+import { describe, expect, it } from 'vitest';
+import type { Workflow, WorkflowDSL } from '../types';
+import { resolveWorkflowDisplay } from './resolveWorkflowDisplay';
+
+const draftDsl: WorkflowDSL = { nodes: [], edges: [] };
+
+function workflow(overrides: Partial<Workflow>): Workflow {
+  return {
+    id: '1',
+    name: 'Approval',
+    description: null,
+    status: 'DRAFT',
+    isEnabled: false,
+    dsl: null,
+    creator: 'test',
+    createdAt: '',
+    updatedAt: '',
+    ...overrides,
+  };
+}
+
+describe('resolveWorkflowDisplay', () => {
+  it('shows a saved draft even when it has not been published', () => {
+    expect(resolveWorkflowDisplay(workflow({ dsl: draftDsl }))).toEqual({
+      dsl: draftDsl,
+      version: null,
+    });
+  });
+
+  it('shows the immutable latest version for a published workflow', () => {
+    const publishedDsl: WorkflowDSL = {
+      nodes: [
+        {
+          id: 'start',
+          type: 'start',
+          label: 'Start',
+          position: { x: 0, y: 0 },
+          config: {},
+        },
+      ],
+      edges: [],
+    };
+
+    expect(
+      resolveWorkflowDisplay({
+        ...workflow({ status: 'PUBLISHED', dsl: draftDsl }),
+        versions: [{ version: 2, dsl: publishedDsl }],
+      }),
+    ).toEqual({ dsl: publishedDsl, version: 2 });
+  });
+});

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

@@ -0,0 +1,32 @@
+import type { Workflow, WorkflowDSL, WorkflowVersion } from '../types';
+
+type WorkflowWithLoadedVersion = Workflow & {
+  versions?: Array<Partial<WorkflowVersion>>;
+};
+
+export interface WorkflowDisplay {
+  dsl: WorkflowDSL | null;
+  version: number | null;
+}
+
+/**
+ * Drafts are the latest saved editor state. Published workflows display the
+ * compiled DSL snapshot belonging to their latest immutable version.
+ */
+export function resolveWorkflowDisplay(
+  workflow: WorkflowWithLoadedVersion,
+): WorkflowDisplay {
+  if (workflow.status === 'DRAFT' && workflow.dsl) {
+    return { dsl: workflow.dsl, version: null };
+  }
+
+  const latestVersion = workflow.versions?.[0];
+  if (latestVersion?.dsl) {
+    return {
+      dsl: latestVersion.dsl,
+      version: latestVersion.version ?? null,
+    };
+  }
+
+  return { dsl: workflow.dsl ?? null, version: null };
+}

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

@@ -83,7 +83,7 @@ export const WorkflowEventOutboxEdit: React.FC<
       headerButtons={
         <>
           <ListButton />
-          <RefreshButton meta={{ select: formPrismaSelect }} />
+          <RefreshButton />
         </>
       }
     >

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

@@ -95,10 +95,10 @@ export const WorkflowEventOutboxList: React.FC<
   const {
     tableProps,
     sorters: sorter,
-    setCurrent,
+    setCurrentPage,
     setFilters,
     filters,
-    tableQueryResult,
+    tableQuery,
     searchFormProps,
   } = useTable<WorkflowEventOutbox, HttpError>({
     meta: {
@@ -114,22 +114,24 @@ export const WorkflowEventOutboxList: React.FC<
   // onFinish: 将表单值转换为 CrudFilters 并更新筛选条件
   // 有 createdAt 字段的模型（默认）
   searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters);
-  searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters);
+  searchFormProps.onFinish = createSearchFormOnFinish(
+    setCurrentPage,
+    setFilters,
+  );
 
   // 没有 createdAt 字段的模型
   // searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters, { dateField: null });
-  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters, { dateField: null });
-
+  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrentPage, setFilters, { dateField: null });
   // 使用其他日期字段（如 updatedAt）
   // searchFormProps.initialValues = getSearchFormInitialValues(parsedFilters, { dateField: 'updatedAt' });
-  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrent, setFilters, { dateField: 'updatedAt' });
+  // searchFormProps.onFinish = createSearchFormOnFinish(setCurrentPage, setFilters, { dateField: 'updatedAt' });
 
   // Batch operations (selection, update, delete)
   const batchOps = useBatchOperations({
     resourceName,
     apiUrl,
     requestHeaders,
-    onSuccess: () => tableQueryResult.refetch(),
+    onSuccess: () => tableQuery.refetch(),
     t,
   });
 
@@ -201,7 +203,7 @@ export const WorkflowEventOutboxList: React.FC<
             importProps={importProps}
             onExport={triggerExport}
             exportLoading={exportLoading}
-            onRefresh={() => tableQueryResult.refetch()}
+            onRefresh={() => tableQuery.refetch()}
             resourceName={resourceName}
           />
         ),

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

@@ -22,10 +22,10 @@ export const WorkflowEventOutboxShow: React.FC<
   const resourceName = 'workflowEventOutbox';
   const t = useTranslate();
 
-  const { queryResult } = useShow<WorkflowEventOutbox>({
+  const { query } = useShow<WorkflowEventOutbox>({
     meta: { select: showPrismaSelect },
   });
-  const { data, isLoading } = queryResult;
+  const { data, isLoading } = query;
   const record = data?.data;
 
   const [[fields, model]] = useState(() => {
@@ -60,7 +60,7 @@ export const WorkflowEventOutboxShow: React.FC<
     >
       <div
         style={{
-          border: '1px solid #f0f0f0',
+          border: '1px solid var(--ant-color-border-secondary)',
           borderRadius: 8,
           overflow: 'hidden',
         }}

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

@@ -0,0 +1,93 @@
+/**
+ * --ant-* 主题变量（手写，替代 antd theme.cssVar）。
+ *
+ * 背景：antd 5.x 的 cssVar 机制按 ConfigProvider 实例生成 .css-var-{id} 类并全局
+ * 注入变量规则；在暗→浅来回切换时，旧主题的样式 tag 清理依赖 cssinjs 的引用计数
+ * 与 effect 时序，组件树较大时会出现旧暗色规则滞后的竞态（表头/按钮残留暗色）。
+ * 弃用 cssVar 后，antd 组件改回按主题生成 hash 类（类名随主题变化，旧规则天然
+ * 失效），明暗切换稳健；我们页面里使用的 var(--ant-*) 则由本文件提供。
+ *
+ * 取值来源：antd 5.29 defaultAlgorithm / darkAlgorithm 的实际派生结果
+ * （colorError 固定 #fa541c；主色按 THEME_PRESETS 各预设分别派生）。
+ * 升级 antd 或调整预设色板时，需同步核对本文件。
+ */
+
+/* ============ 亮色（默认蓝色预设） ============ */
+html[data-mode='light'] {
+  --ant-color-bg-layout: #f0f2f5; /* 项目约定值，antd 默认 #f5f5f5 */
+  --ant-color-bg-container: #ffffff;
+  --ant-color-bg-elevated: #ffffff;
+  --ant-color-border: #d9d9d9;
+  --ant-color-border-secondary: #f0f0f0;
+  --ant-color-error-bg: #fff2e8;
+  --ant-color-fill-alter: rgba(0, 0, 0, 0.02);
+  --ant-color-fill-quaternary: rgba(0, 0, 0, 0.02);
+  --ant-color-fill-secondary: rgba(0, 0, 0, 0.06);
+  --ant-color-fill-tertiary: rgba(0, 0, 0, 0.04);
+  --ant-color-text: rgba(0, 0, 0, 0.88);
+  --ant-color-text-secondary: rgba(0, 0, 0, 0.65);
+  --ant-color-text-tertiary: rgba(0, 0, 0, 0.45);
+  --ant-color-text-quaternary: rgba(0, 0, 0, 0.25);
+  --ant-color-text-disabled: rgba(0, 0, 0, 0.25);
+  --ant-color-warning-bg: #fffbe6;
+
+  --ant-color-primary: #1677ff;
+  --ant-color-primary-bg: #e6f4ff;
+  --ant-color-primary-border: #91caff;
+}
+
+/* ============ 暗色（默认蓝色预设） ============ */
+html[data-mode='dark'] {
+  --ant-color-bg-layout: #000000;
+  --ant-color-bg-container: #141414;
+  --ant-color-bg-elevated: #1f1f1f;
+  --ant-color-border: #424242;
+  --ant-color-border-secondary: #303030;
+  --ant-color-error-bg: #2b1611;
+  --ant-color-fill-alter: rgba(255, 255, 255, 0.04);
+  --ant-color-fill-quaternary: rgba(255, 255, 255, 0.04);
+  --ant-color-fill-secondary: rgba(255, 255, 255, 0.12);
+  --ant-color-fill-tertiary: rgba(255, 255, 255, 0.08);
+  --ant-color-text: rgba(255, 255, 255, 0.85);
+  --ant-color-text-secondary: rgba(255, 255, 255, 0.65);
+  --ant-color-text-tertiary: rgba(255, 255, 255, 0.45);
+  --ant-color-text-quaternary: rgba(255, 255, 255, 0.25);
+  --ant-color-text-disabled: rgba(255, 255, 255, 0.25);
+  --ant-color-warning-bg: #2b2111;
+
+  --ant-color-primary: #1668dc;
+  --ant-color-primary-bg: #15325b;
+  --ant-color-primary-border: #15325b;
+}
+
+/* ============ 主色预设覆盖（仅 primary 系列随预设变化） ============ */
+html[data-preset='teal'][data-mode='light'] {
+  --ant-color-primary: #13a8a8;
+  --ant-color-primary-bg: #d3e8e5;
+  --ant-color-primary-border: #7acfc6;
+}
+html[data-preset='teal'][data-mode='dark'] {
+  --ant-color-primary: #139292;
+  --ant-color-primary-bg: #144040;
+  --ant-color-primary-border: #144040;
+}
+html[data-preset='purple'][data-mode='light'] {
+  --ant-color-primary: #722ed1;
+  --ant-color-primary-bg: #f9f0ff;
+  --ant-color-primary-border: #d3adf7;
+}
+html[data-preset='purple'][data-mode='dark'] {
+  --ant-color-primary: #642ab5;
+  --ant-color-primary-bg: #301c4d;
+  --ant-color-primary-border: #301c4d;
+}
+html[data-preset='orange'][data-mode='light'] {
+  --ant-color-primary: #fa8c16;
+  --ant-color-primary-bg: #fff7e6;
+  --ant-color-primary-border: #ffd591;
+}
+html[data-preset='orange'][data-mode='dark'] {
+  --ant-color-primary: #d87a16;
+  --ant-color-primary-bg: #593815;
+  --ant-color-primary-border: #593815;
+}

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

@@ -5,7 +5,7 @@
 
   .ant-modal-header {
     padding: 20px 24px;
-    border-bottom: 1px solid #d9d9d9;
+    border-bottom: 1px solid var(--ant-color-border);
     margin-bottom: 0px;
   }
 
@@ -19,7 +19,7 @@
 
   .ant-modal-footer {
     padding: 20px 24px;
-    border-top: 1px solid #d9d9d9;
+    border-top: 1px solid var(--ant-color-border);
     margin-top: 0px;
   }
 
@@ -43,7 +43,7 @@
 
 .ant-select.kanban-users-form-select {
   .ant-select-selector {
-    background-color: #fff;
+    background-color: var(--ant-color-bg-container);
   }
 }
 
@@ -77,7 +77,7 @@
 .ant-pagination-total-text {
   margin-right: auto;
   font-size: 14px !important;
-  color: rgba(0, 0, 0, 0.45) !important;
+  color: var(--ant-color-text-tertiary) !important;
   margin-inline-end: auto !important;
 }
 
@@ -94,11 +94,11 @@
 }
 
 th.ant-table-column-sort {
-  background-color: #fafafa !important;
+  background-color: var(--ant-color-fill-alter) !important;
 }
 
 td.ant-table-column-sort {
-  background-color: #ffffff !important;
+  background-color: var(--ant-color-bg-container) !important;
 }
 
 .ant-table-tbody > tr > td {
@@ -131,8 +131,8 @@ tr.ant-table-measure-row {
 }
 
 .ant-picker-input > input[disabled] {
-  color: #777 !important;
+  color: var(--ant-color-text-disabled) !important;
 }
 .ant-table-expanded-row-level-1 {
-  background-color: #eee;
+  background-color: var(--ant-color-fill-secondary);
 }

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

@@ -1,10 +1,10 @@
 :root {
-  --fc-today-bg-color: rgba(230, 244, 255, 1);
+  --fc-today-bg-color: var(--ant-color-primary-bg);
 }
 
 .fc-daygrid-day-number,
 .fc-col-header-cell-cushion {
-  color: rgba(0, 0, 0, 0.75) !important;
+  color: var(--ant-color-text) !important;
   font-weight: 400;
 }
 
@@ -21,7 +21,7 @@
 .fc-event {
   .fc-event-title,
   .fc-event-time {
-    color: rgba(0, 0, 0, 0.65);
+    color: var(--ant-color-text-secondary);
     font-weight: 400 !important;
     font-size: 12px;
   }
@@ -44,7 +44,7 @@
 .fc-timegrid-slot-label-cushion,
 .fc-list-day-text,
 .fc-list-day-side-text {
-  color: rgba(0, 0, 0, 0.75);
+  color: var(--ant-color-text);
 }
 
 .fc-list-day {

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

@@ -46,13 +46,13 @@
 .ant-text,
 .anticon {
   &.primary {
-    color: rgba(0, 0, 0, 0.85);
+    color: var(--ant-color-text);
   }
   &.secondary {
-    color: rgba(0, 0, 0, 0.65);
+    color: var(--ant-color-text-secondary);
   }
   &.tertiary {
-    color: rgba(0, 0, 0, 0.45);
+    color: var(--ant-color-text-tertiary);
   }
 }
 
@@ -103,7 +103,7 @@
 .ant-picker-prefix,
 .ant-input-prefix,
 .ant-select-prefix {
-  color: gray !important;
+  color: var(--ant-color-text-quaternary) !important;
 }
 
 .flex-center {
@@ -119,10 +119,45 @@
 }
 
 .cost-cente-cell-bg-color {
-  background-color: #fffbe6;
+  background-color: var(--ant-color-warning-bg);
 }
 
 .endpoint-self-select .ant-select-selection-item  {
   display: inline-flex !important;
   justify-content: flex-end !important;
 }
+
+/* 卡片内的筛选表单：去掉 Form.Item 底部间距，避免卡片下方空隙过大 */
+.card-search-bar .ant-form-item {
+  margin-bottom: 0;
+}
+
+/* 卡片内的表格：去掉分页器底部间距，避免卡片下方空隙过大 */
+.card-table .ant-table-pagination.ant-pagination {
+  margin-bottom: 0;
+}
+
+/* 批量操作栏为空（无选中且非检查模式）时，隐藏占位容器避免多余空隙 */
+.card-table > .ant-card-body > div:empty {
+  display: none;
+}
+
+/*
+ * Refine CRUD 页头统一为「压扁白卡」风格（与 PageHeader/HEADER_CARD_PROPS 一致）。
+ * Refine Create/Edit/Show/List 的页头是 pro-layout PageHeader（ghost 透明底、
+ * 根节点内联 padding:0），其标题行渲染为 .ant-page-header-heading，
+ * 内容（表单/卡片）在兄弟节点 .ant-page-header-content，因此只给标题行加白卡样式。
+ * cssinjs 生成的类优先级更高，box 属性需 !important。
+ */
+.ant-page-header-heading {
+  background: var(--ant-color-bg-container);
+  border: 1px solid var(--ant-color-border-secondary);
+  border-radius: 8px;
+  padding: 12px 24px !important;
+  margin-bottom: 16px !important;
+}
+
+/* pro-layout 默认给内容区 12px 上 padding，归零使页头卡与内容卡间距恰为 16px */
+.ant-page-header-content {
+  padding-top: 0 !important;
+}

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

@@ -2,17 +2,17 @@
   display: flex;
   justify-content: flex-end;
   padding: 16px;
-  background: #fff;
+  background: var(--ant-color-bg-container);
 }
 
 .container {
   padding: 16px;
-  background: #f5f5f5;
+  background: var(--ant-color-bg-layout);
 }
 
 .container > div {
   padding: 16px;
-  background: #fff;
+  background: var(--ant-color-bg-container);
   border-radius: 2px;
   margin-bottom: 16px;
 }

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

@@ -1,5 +1,5 @@
 .contentProps {
-  background-color: #f5f5f5;
+  background-color: var(--ant-color-bg-layout);
   padding: 0;
   margin-top: 1rem;
 }
@@ -10,12 +10,12 @@
 
 .container {
   padding: 0px;
-  background: #f5f5f5;
+  background: var(--ant-color-bg-layout);
 }
 
 .container > div {
   padding: 16px;
-  background: #fff;
+  background: var(--ant-color-bg-container);
   border-radius: 2px;
   margin-bottom: 16px;
 }