@gadmin2n/schematics 0.0.138 → 0.0.140

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

@@ -0,0 +1,138 @@
+import React, { useEffect, useState } from 'react';
+import { Form, Input, Modal, Select, Spin, message } from 'antd';
+import {
+  subjectProviderApi,
+  type SubjectResource,
+  type UserGroupDetail,
+} from './subject-provider.api';
+
+interface Props {
+  open: boolean;
+  groupRef?: string;
+  onCancel(): void;
+  onSaved(resource: SubjectResource): void;
+}
+
+export function UserGroupEditModal({
+  open,
+  groupRef,
+  onCancel,
+  onSaved,
+}: Props) {
+  const [form] = Form.useForm();
+  const [detail, setDetail] = useState<UserGroupDetail>();
+  const [users, setUsers] = useState<SubjectResource[]>([]);
+  const [groups, setGroups] = useState<SubjectResource[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
+
+  useEffect(() => {
+    if (!open || !groupRef) return;
+    setLoading(true);
+    Promise.all([
+      subjectProviderApi.userGroupDetail(groupRef),
+      subjectProviderApi.search('USER'),
+      subjectProviderApi.search('USER_GROUP'),
+    ])
+      .then(([nextDetail, userOptions, groupOptions]) => {
+        setDetail(nextDetail);
+        setUsers(userOptions);
+        setGroups(groupOptions.filter((item) => item.ref !== groupRef));
+        form.setFieldsValue({
+          name: nextDetail.name,
+          description: nextDetail.description ?? '',
+          userIds: nextDetail.directUserIds,
+          childGroupCodes: nextDetail.childGroupCodes,
+        });
+      })
+      .catch((error) => {
+        message.error(error?.message ?? 'Failed to load user group');
+        onCancel();
+      })
+      .finally(() => setLoading(false));
+  }, [form, groupRef, onCancel, open]);
+
+  async function save() {
+    if (!groupRef || !detail) return;
+    try {
+      const values = await form.validateFields();
+      setSaving(true);
+      const metadata = await subjectProviderApi.updateUserGroup(groupRef, {
+        expectedRevision: detail.revision,
+        name: values.name,
+        description: values.description?.trim() || null,
+      });
+      const members = await subjectProviderApi.replaceUserGroupMembers(
+        groupRef,
+        {
+          expectedRevision: metadata.revision,
+          userIds: values.userIds ?? [],
+          childGroupCodes: values.childGroupCodes ?? [],
+        },
+      );
+      message.success('User group updated');
+      onSaved({
+        ref: groupRef,
+        label: metadata.name,
+        description: metadata.description ?? undefined,
+        active: members.isActive,
+        revision: members.revision,
+      });
+    } catch (error: any) {
+      if (error?.errorFields) return;
+      message.error(error?.message ?? 'Failed to update user group');
+    } finally {
+      setSaving(false);
+    }
+  }
+
+  const option = (item: SubjectResource) => ({
+    label: item.label,
+    value: item.ref,
+  });
+
+  return (
+    <Modal
+      open={open}
+      title={groupRef ? `Edit user group · ${groupRef}` : 'Edit user group'}
+      okText="Save"
+      confirmLoading={saving}
+      onOk={save}
+      onCancel={onCancel}
+      destroyOnClose
+    >
+      <Spin spinning={loading}>
+        <Form form={form} layout="vertical" preserve={false}>
+          <Form.Item
+            name="name"
+            label="Name"
+            rules={[{ required: true, message: 'Name is required' }]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item name="description" label="Description">
+            <Input.TextArea rows={2} />
+          </Form.Item>
+          <Form.Item name="userIds" label="Users">
+            <Select
+              mode="multiple"
+              showSearch
+              optionFilterProp="label"
+              options={users.map(option)}
+              placeholder="Select users"
+            />
+          </Form.Item>
+          <Form.Item name="childGroupCodes" label="Child groups">
+            <Select
+              mode="multiple"
+              showSearch
+              optionFilterProp="label"
+              options={groups.map(option)}
+              placeholder="Select child groups"
+            />
+          </Form.Item>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+}

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

@@ -0,0 +1,25 @@
+import { addApproverSource } from './approver-source';
+
+describe('automatic approver source config', () => {
+  it('binds same-name parameters to Workflow data by default', () => {
+    expect(
+      addApproverSource([], {
+        id: '12',
+        name: '直属主管',
+        inputParameters: [
+          { key: 'employeeId', label: '申请人', required: true },
+        ],
+      }),
+    ).toEqual([
+      {
+        workflowId: '12',
+        inputBindings: {
+          employeeId: {
+            source: 'WORKFLOW',
+            path: 'employeeId',
+          },
+        },
+      },
+    ]);
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/approver-source.ts

@@ -0,0 +1,42 @@
+import {
+  workflowBinding,
+  type ParameterBinding,
+} from '../../types/parameter-binding';
+
+export type CallableInputParameter = {
+  key: string;
+  label?: string;
+  required?: boolean;
+};
+
+export type CallableWorkflowOption = {
+  id: string;
+  name: string;
+  description?: string | null;
+  inputParameters: CallableInputParameter[];
+};
+
+export type ApproverSourceConfig = {
+  workflowId: string;
+  inputBindings: Record<string, ParameterBinding>;
+};
+
+export function addApproverSource(
+  current: ApproverSourceConfig[],
+  workflow: CallableWorkflowOption,
+): ApproverSourceConfig[] {
+  if (current.some((source) => source.workflowId === workflow.id))
+    return current;
+  return [
+    ...current,
+    {
+      workflowId: workflow.id,
+      inputBindings: Object.fromEntries(
+        workflow.inputParameters.map((parameter) => [
+          parameter.key,
+          workflowBinding(parameter.key),
+        ]),
+      ),
+    },
+  ];
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/routes/workflow/node-instances/widgets/subject-provider.api.ts

@@ -0,0 +1,95 @@
+import { customRequest } from 'helpers/http';
+
+export interface SubjectProviderDescriptor {
+  key: string;
+  label: string;
+  capabilities: {
+    search: boolean;
+    preview: boolean;
+    inlineCreate: boolean;
+    edit: boolean;
+    emitsChanges: boolean;
+  };
+  createSchema?: Record<string, unknown>;
+  createUiSchema?: Record<string, unknown>;
+}
+
+export interface SubjectResource {
+  ref: string;
+  label: string;
+  description?: string;
+  active?: boolean;
+  revision?: number;
+  metadata?: Record<string, unknown>;
+}
+
+export interface SubjectPreview {
+  items: Array<
+    SubjectResource & { principals?: Array<{ principalRef: string }> }
+  >;
+  warnings?: string[];
+}
+
+export interface UserGroupDetail {
+  code: string;
+  name: string;
+  description?: string | null;
+  revision: number;
+  isActive: boolean;
+  directUserIds: string[];
+  childGroupCodes: string[];
+  resolvedUserCount: number;
+}
+
+export const subjectProviderApi = {
+  descriptors: () =>
+    customRequest<SubjectProviderDescriptor[]>('subject-providers', 'GET'),
+  search: (provider: string, query = '') =>
+    customRequest<SubjectResource[]>(
+      `subject-providers/${encodeURIComponent(provider)}/resources?q=${encodeURIComponent(query)}`,
+      'GET',
+    ),
+  preview: (provider: string, refs: string[]) =>
+    customRequest<SubjectPreview>(
+      `subject-providers/${encodeURIComponent(provider)}/preview`,
+      'POST',
+      { refs },
+    ),
+  create: (provider: string, input: Record<string, unknown>) =>
+    customRequest<SubjectResource>(
+      `subject-providers/${encodeURIComponent(provider)}/resources`,
+      'POST',
+      input,
+    ),
+  userGroupDetail: (code: string) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}/preview`,
+      'GET',
+    ),
+  updateUserGroup: (
+    code: string,
+    input: {
+      expectedRevision: number;
+      name: string;
+      description: string | null;
+    },
+  ) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}`,
+      'PATCH',
+      input,
+    ),
+  replaceUserGroupMembers: (
+    code: string,
+    input: {
+      expectedRevision: number;
+      userIds: string[];
+      childGroupCodes: string[];
+    },
+  ) =>
+    customRequest<UserGroupDetail>(
+      `user-groups/${encodeURIComponent(code)}/members`,
+      'PUT',
+      input,
+    ),
+};

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

@@ -34,6 +34,7 @@ import { customRequest } from 'helpers/http';
 import { FlowRenderer } from './components/FlowRenderer';
 import { DslView, type DslViewHandle } from './components/DslView';
 import { RunWorkflowModal } from './components/RunWorkflowModal';
+import { resolveWorkflowDisplay } from './utils/resolveWorkflowDisplay';
 import type {
   Workflow,
   WorkflowDSL,
@@ -117,11 +118,9 @@ export default function WorkflowShowPage() {
       .then(([wf, vers]) => {
         setWorkflow(wf);
         setVersions(vers);
-        const latestVersion = (wf as any).versions?.[0];
-        if (latestVersion?.dsl) {
-          setDsl(latestVersion.dsl);
-          setCurrentVersion(latestVersion.version);
-        }
+        const display = resolveWorkflowDisplay(wf);
+        setDsl(display.dsl);
+        setCurrentVersion(display.version);
       })
       .catch((e) => {
         message.error(e?.message ?? 'Failed to load workflow');
@@ -207,6 +206,9 @@ export default function WorkflowShowPage() {
       ]);
       setWorkflow(wf);
       setVersions(vers);
+      const display = resolveWorkflowDisplay(wf);
+      setDsl(display.dsl);
+      setCurrentVersion(display.version);
     } catch (e: any) {
       message.error(e?.message ?? 'Failed to publish workflow');
     } finally {
@@ -261,7 +263,7 @@ ${diffRightDsl}
         height: 'calc(100vh - 96px)',
         display: 'flex',
         flexDirection: 'column',
-        background: '#f0f2f5',
+        background: 'var(--ant-color-bg-layout)',
         overflow: 'hidden',
       }}
     >
@@ -290,10 +292,12 @@ ${diffRightDsl}
           <Space>
             {versions.length > 0 && (
               <Select
-                value={currentVersion}
+                value={currentVersion ?? undefined}
                 onChange={handleSelectVersion}
                 style={{ width: 200 }}
-                placeholder="选择版本"
+                placeholder={
+                  workflow?.status === 'DRAFT' ? 'Saved draft' : '选择版本'
+                }
                 options={versions.map((v) => ({
                   label: `v${v.version} - ${v.changeSummary?.slice(0, 20) || 'Saved'}`,
                   value: v.version,
@@ -387,8 +391,8 @@ ${diffRightDsl}
                 style={{
                   width: 320,
                   flexShrink: 0,
-                  borderLeft: '1px solid #f0f0f0',
-                  background: '#fff',
+                  borderLeft: '1px solid var(--ant-color-border-secondary)',
+                  background: 'var(--ant-color-bg-container)',
                   overflowY: 'auto',
                   padding: 16,
                 }}
@@ -412,7 +416,7 @@ ${diffRightDsl}
                   </Descriptions.Item>
                   {selectedNode.instanceRef && (
                     <Descriptions.Item label="节点实例">
-                      {selectedNode.instanceRef.instanceName}
+                      {selectedNode.instanceRef.instanceCode}
                     </Descriptions.Item>
                   )}
                 </Descriptions>

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

@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import { ArrowLeftOutlined } from '@ant-design/icons';
+import { useGetIdentity } from '@refinedev/core';
 import {
   Alert,
   Button,
@@ -9,12 +10,11 @@ import {
   Typography,
   message,
 } from 'antd';
-import { ArrowLeftOutlined } from '@ant-design/icons';
-import { useNavigate } from 'react-router-dom';
-import { useGetIdentity } from '@refinedev/core';
 import { customRequest } from 'helpers/http';
+import { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 
-const { Title, Text } = Typography;
+const { Title } = Typography;
 
 interface TenantConfig {
   id: number;
@@ -23,6 +23,8 @@ interface TenantConfig {
   namespace: string;
   dbUrl: string;
   displayName: string;
+  runtimeBaseUrl: string;
+  runtimeToken: string;
 }
 
 export default function TemporalTenantPage() {
@@ -46,6 +48,8 @@ export default function TemporalTenantPage() {
         namespace: true,
         dbUrl: true,
         displayName: true,
+        runtimeBaseUrl: true,
+        runtimeToken: true,
       },
     })
       .then((res: any) => {
@@ -84,6 +88,8 @@ export default function TemporalTenantPage() {
             namespace: true,
             dbUrl: true,
             displayName: true,
+            runtimeBaseUrl: true,
+            runtimeToken: true,
           },
         },
       );
@@ -116,7 +122,7 @@ export default function TemporalTenantPage() {
   return (
     <div
       style={{
-        background: '#f0f2f5',
+        background: 'var(--ant-color-bg-layout)',
         minHeight: 'calc(100vh - 64px)',
       }}
     >
@@ -153,7 +159,7 @@ export default function TemporalTenantPage() {
           onFinish={handleSave}
           style={{ maxWidth: 600 }}
         >
-          <Title level={5} style={{ color: '#595959' }}>
+          <Title level={5} style={{ color: 'var(--ant-color-text-secondary)' }}>
             Admin API 连接
           </Title>
           <div
@@ -179,7 +185,10 @@ export default function TemporalTenantPage() {
             </Form.Item>
           </div>
 
-          <Title level={5} style={{ color: '#595959', marginTop: 8 }}>
+          <Title
+            level={5}
+            style={{ color: 'var(--ant-color-text-secondary)', marginTop: 8 }}
+          >
             租户信息
           </Title>
           <div
@@ -213,6 +222,38 @@ export default function TemporalTenantPage() {
             <Input placeholder="postgresql://user:pw@host.containers.internal:5432/gadmin_demo" />
           </Form.Item>
 
+          <Title
+            level={5}
+            style={{ color: 'var(--ant-color-text-secondary)', marginTop: 24 }}
+          >
+            Runtime API 连接
+          </Title>
+          <Form.Item
+            label="Runtime Base URL（Temporal worker 视角）"
+            name="runtimeBaseUrl"
+            rules={[
+              { required: true, message: '请输入 Runtime Base URL' },
+              { type: 'url', message: '请输入完整的 HTTP 或 HTTPS 地址' },
+            ]}
+            extra="填写 Temporal worker 能访问到的 Gadmin API 地址，并以 /api 结尾"
+          >
+            <Input placeholder="http://gadmin-server:8000/api" />
+          </Form.Item>
+          <Form.Item
+            label="Runtime Token"
+            name="runtimeToken"
+            rules={[
+              { required: true, message: '请输入 Runtime Token' },
+              { min: 32, message: 'Runtime Token 至少需要 32 个字符' },
+            ]}
+            extra="必须与 Gadmin 的 WORKFLOW_RUNTIME_TOKEN 完全一致"
+          >
+            <Input.Password
+              placeholder="与 WORKFLOW_RUNTIME_TOKEN 相同"
+              autoComplete="new-password"
+            />
+          </Form.Item>
+
           <Form.Item style={{ marginTop: 8 }}>
             <Button type="primary" htmlType="submit" loading={saving}>
               {existing ? '更新并同步到 Temporal' : '注册到 Temporal'}

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

@@ -0,0 +1,49 @@
+export type FixedValueType = 'STRING' | 'NUMBER' | 'BOOLEAN' | 'JSON';
+
+export type ParameterBinding =
+  | {
+      source: 'INPUT' | 'WORKFLOW' | 'SYSTEM';
+      path: string;
+    }
+  | {
+      source: 'FIXED';
+      valueType: FixedValueType;
+      value: string;
+    };
+
+export function workflowBinding(path: string): ParameterBinding {
+  return { source: 'WORKFLOW', path };
+}
+
+export function bindingPreview(binding: ParameterBinding): string {
+  if (binding.source === 'FIXED') return '';
+  const source =
+    binding.source === 'INPUT'
+      ? 'input'
+      : binding.source === 'WORKFLOW'
+        ? 'workflow'
+        : 'system';
+  return `${source}.${binding.path}`;
+}
+
+export function isParameterBindingValid(
+  binding: ParameterBinding | undefined,
+): boolean {
+  if (!binding) return false;
+  if (binding.source !== 'FIXED') return binding.path.trim().length > 0;
+  if (binding.valueType === 'STRING') return true;
+  if (binding.valueType === 'NUMBER') {
+    return (
+      binding.value.trim().length > 0 && Number.isFinite(Number(binding.value))
+    );
+  }
+  if (binding.valueType === 'BOOLEAN') {
+    return binding.value === 'true' || binding.value === 'false';
+  }
+  try {
+    JSON.parse(binding.value);
+    return true;
+  } catch {
+    return false;
+  }
+}

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

@@ -1,14 +1,21 @@
 // ─── TypeScript Types ───────────────────────────────────────────────────────
 
+import type {
+  JsonSchema,
+  UiSchema,
+} from './node-instances/schema-form/schema.types';
+
 export interface WorkflowNode {
   id: string;
   type: string;
   label: string;
   position: { x: number; y: number };
   config: Record<string, any>;
+  /** Workflow-local config used instead of the referenced template config. */
+  configOverride?: Record<string, any>;
   instanceRef?: {
     instanceId: string;
-    instanceName: string;
+    instanceCode: string;
   };
 }
 
@@ -17,7 +24,15 @@ export interface WorkflowEdge {
   source: string;
   target: string;
   sourceHandle?: string;
+  /** Dot path read from the source node output for a DATA edge. */
+  sourcePath?: string;
+  targetHandle?: string;
+  kind?: 'FLOW' | 'DATA' | 'CALL' | 'RETURN';
   label?: string;
+  /** CALL/RETURN edges belonging to the same callable-node invocation. */
+  pairId?: string;
+  /** Typed payload contract for a RETURN edge. */
+  valueType?: 'JSON' | 'USER_IDS' | 'USER_GROUP_IDS';
 }
 
 export interface WorkflowDSL {
@@ -80,10 +95,24 @@ export interface WorkflowNodeType {
   label: string;
   icon: string;
   description: string | null;
-  configSchema: Record<string, any>;
+  configSchema: JsonSchema;
+  uiSchema: UiSchema;
   inputSchema: Record<string, any>;
   outputSchema: Record<string, any>;
   outputs: string[] | null;
+  runtimeKey: string;
+  schemaVersion: number;
+  instancePolicy: 'REQUIRED' | 'OPTIONAL' | 'INLINE_ONLY';
+}
+
+export interface WorkflowNodeInstance {
+  id: string;
+  nodeTypeId: string;
+  name: string;
+  description: string | null;
+  isEnabled: boolean;
+  config: Record<string, unknown>;
+  code: string;
 }
 
 export interface NodeInstanceAgentOutput {