@gadmin2n/schematics 0.0.146 → 0.0.148

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

@@ -0,0 +1,69 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { act } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { searchStaffDirectory } from './staff-directory.api';
+import { StaffSelect } from './StaffSelect';
+
+vi.mock('./staff-directory.api', () => ({
+  searchStaffDirectory: vi.fn(),
+}));
+
+vi.mock('antd', () => ({
+  Select: ({ onSearch, onChange, options = [] }: any) => (
+    <div>
+      <input
+        aria-label="staff search"
+        onChange={(event) => onSearch(event.target.value)}
+      />
+      {options.map((option: any) => (
+        <button key={option.value} onClick={() => onChange(option.value)}>
+          {option.label}
+        </button>
+      ))}
+    </div>
+  ),
+  Empty: Object.assign(() => <div>empty</div>, {
+    PRESENTED_IMAGE_SIMPLE: 'simple',
+  }),
+  Space: ({ children }: any) => <div>{children}</div>,
+  Spin: () => <div>loading</div>,
+  Typography: {
+    Text: ({ children }: any) => <span>{children}</span>,
+  },
+}));
+
+describe('StaffSelect', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => vi.useRealTimers());
+
+  it('searches through the shared backend and returns the selected person', async () => {
+    vi.mocked(searchStaffDirectory).mockResolvedValue([
+      {
+        userId: 'junrujrwang',
+        displayName: 'Junru Wang',
+        businessGroup: 'OIT',
+      },
+    ]);
+    const onChange = vi.fn();
+    const onPersonChange = vi.fn();
+    render(<StaffSelect onChange={onChange} onPersonChange={onPersonChange} />);
+
+    fireEvent.change(screen.getByRole('textbox', { name: 'staff search' }), {
+      target: { value: 'junru' },
+    });
+    await act(() => vi.advanceTimersByTimeAsync(300));
+
+    expect(searchStaffDirectory).toHaveBeenCalledWith('junru');
+    fireEvent.click(
+      screen.getByRole('button', { name: 'Junru Wang (junrujrwang)' }),
+    );
+    expect(onChange).toHaveBeenCalledWith('junrujrwang');
+    expect(onPersonChange).toHaveBeenCalledWith(
+      expect.objectContaining({ userId: 'junrujrwang' }),
+    );
+  });
+});

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

@@ -0,0 +1,145 @@
+import { Empty, Select, Space, Spin, Typography, type SelectProps } from 'antd';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import {
+  searchStaffDirectory,
+  type StaffDirectoryPerson,
+} from './staff-directory.api';
+
+export interface StaffSelectProps {
+  value?: string;
+  onChange?(value?: string): void;
+  onPersonChange?(person?: StaffDirectoryPerson): void;
+  disabled?: boolean;
+  placeholder?: string;
+  allowClear?: boolean;
+  initialPerson?: StaffDirectoryPerson;
+  style?: SelectProps['style'];
+}
+
+export function StaffSelect({
+  value,
+  onChange,
+  onPersonChange,
+  disabled,
+  placeholder = '输入姓名或企业微信账号搜索',
+  allowClear = true,
+  initialPerson,
+  style,
+}: StaffSelectProps) {
+  const [people, setPeople] = useState<StaffDirectoryPerson[]>(
+    initialPerson ? [initialPerson] : [],
+  );
+  const [loading, setLoading] = useState(false);
+  const [searched, setSearched] = useState(false);
+  const [error, setError] = useState(false);
+  const timer = useRef<ReturnType<typeof setTimeout>>();
+  const requestSequence = useRef(0);
+
+  useEffect(
+    () => () => {
+      clearTimeout(timer.current);
+      requestSequence.current += 1;
+    },
+    [],
+  );
+
+  const peopleById = useMemo(
+    () => new Map(people.map((person) => [person.userId, person])),
+    [people],
+  );
+
+  function search(keyword: string) {
+    clearTimeout(timer.current);
+    const query = keyword.trim();
+    if (!query) {
+      requestSequence.current += 1;
+      setPeople(initialPerson ? [initialPerson] : []);
+      setLoading(false);
+      setSearched(false);
+      setError(false);
+      return;
+    }
+    const sequence = ++requestSequence.current;
+    timer.current = setTimeout(async () => {
+      setLoading(true);
+      setSearched(true);
+      setError(false);
+      try {
+        const result = await searchStaffDirectory(query);
+        if (sequence !== requestSequence.current) return;
+        const selected = value ? peopleById.get(value) : undefined;
+        setPeople(
+          selected &&
+            !result.some((person) => person.userId === selected.userId)
+            ? [selected, ...result]
+            : result,
+        );
+      } catch {
+        if (sequence === requestSequence.current) {
+          setPeople(initialPerson ? [initialPerson] : []);
+          setError(true);
+        }
+      } finally {
+        if (sequence === requestSequence.current) setLoading(false);
+      }
+    }, 300);
+  }
+
+  return (
+    <Select
+      showSearch
+      value={value}
+      disabled={disabled}
+      allowClear={allowClear}
+      placeholder={placeholder}
+      filterOption={false}
+      loading={loading}
+      onSearch={search}
+      onChange={(nextValue?: string) => {
+        const person = nextValue ? peopleById.get(nextValue) : undefined;
+        onChange?.(nextValue);
+        onPersonChange?.(person);
+      }}
+      options={people.map((person) => ({
+        value: person.userId,
+        label: `${person.displayName} (${person.userId})`,
+        person,
+      }))}
+      optionRender={(option) => {
+        const person = option.data.person as StaffDirectoryPerson;
+        const organization = [person.businessGroup, person.department]
+          .filter(Boolean)
+          .join(' · ');
+        return (
+          <Space direction="vertical" size={0}>
+            <Typography.Text>
+              {person.displayName} ({person.userId})
+            </Typography.Text>
+            {organization && (
+              <Typography.Text type="secondary" style={{ fontSize: 12 }}>
+                {organization}
+              </Typography.Text>
+            )}
+          </Space>
+        );
+      }}
+      notFoundContent={
+        loading ? (
+          <Spin size="small" />
+        ) : error ? (
+          <Typography.Text type="danger">
+            人员搜索暂时不可用，请稍后重试
+          </Typography.Text>
+        ) : searched ? (
+          <Empty
+            image={Empty.PRESENTED_IMAGE_SIMPLE}
+            description="未找到人员"
+          />
+        ) : (
+          <Typography.Text type="secondary">输入关键词开始搜索</Typography.Text>
+        )
+      }
+      style={{ width: '100%', ...style }}
+    />
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/StaffSelect/index.ts

@@ -0,0 +1,2 @@
+export * from './StaffSelect';
+export type { StaffDirectoryPerson } from './staff-directory.api';

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/StaffSelect/staff-directory.api.ts

@@ -0,0 +1,16 @@
+import { customRequest } from 'helpers/http';
+
+export interface StaffDirectoryPerson {
+  userId: string;
+  displayName: string;
+  businessGroup?: string;
+  department?: string;
+}
+
+export function searchStaffDirectory(keyword: string) {
+  return customRequest<StaffDirectoryPerson[]>(
+    'staff-directory/search',
+    'GET',
+    { keyword },
+  );
+}

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/components/index.ts

@@ -8,3 +8,4 @@ export * from './pagination-total';
 export * from './tags';
 export * from './text';
 export * from './WorkflowActionButton';
+export * from './StaffSelect';

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/config/routeRegistry.test.ts

@@ -8,3 +8,13 @@ describe('workflow route placement', () => {
     );
   });
 });
+
+describe('person and access routes', () => {
+  it('keeps people, groups and access authorization as separate pages', () => {
+    expect(getRoutePath('person_directory')).toBe('/admin/permission/people');
+    expect(getRoutePath('people_group')).toBe(
+      '/admin/permission/people-groups',
+    );
+    expect(getRoutePath('user')).toBe('/admin/permission/user');
+  });
+});

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/config/routeRegistry.tsx

@@ -191,14 +191,32 @@ export const routeRegistry: Record<string, RouteEntry> = {
               })),
             ),
           },
-          // 用户管理 — sortOrder 1030, code: admin.permission.user
+          // 人员目录 — code: person_directory
+          person_directory: {
+            path: 'people',
+            component: lazyWithReload(() =>
+              import('routes/person-directory').then((m) => ({
+                default: m.default,
+              })),
+            ),
+          },
+          // 访问授权 — 保留 user code/path，兼容既有页面权限和链接
           user: {
             path: 'user',
             component: lazyWithReload(() =>
               import('routes/user').then((m) => ({ default: m.UserListPage })),
             ),
           },
-          // 角色管理 — sortOrder 1040, code: admin.permission.role
+          // 人员组 — code: people_group
+          people_group: {
+            path: 'people-groups',
+            component: lazyWithReload(() =>
+              import('routes/people-groups').then((m) => ({
+                default: m.default,
+              })),
+            ),
+          },
+          // 角色管理
           role: {
             path: 'role-list',
             component: lazyWithReload(() =>

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/hooks/useDynamicResources.tsx

@@ -6,6 +6,9 @@ import {
   BgColorsOutlined,
   ScheduleOutlined,
   ApartmentOutlined,
+  SafetyCertificateOutlined,
+  TeamOutlined,
+  UserOutlined,
 } from '@ant-design/icons';
 import { getRoutePath } from 'config/routeRegistry';
 import { useUserPageAccess } from './useUserPageAccess';
@@ -46,6 +49,9 @@ export const iconMapping: Record<string, React.ReactNode> = {
   canvas: <BgColorsOutlined />,
   agenda: <ScheduleOutlined />,
   workflow: <ApartmentOutlined />,
+  person_directory: <UserOutlined />,
+  user: <SafetyCertificateOutlined />,
+  people_group: <TeamOutlined />,
 };
 
 // Pages whose children are tabs (not separate menu items)

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/en/workflow.json

@@ -162,18 +162,21 @@
     "taskDetailValue": "Field value",
     "whoCanApprove": "Who can approve",
     "description": "Choose fixed approvers or call an API inside this node to look them up dynamically.",
-    "fixedApprovers": "Fixed approvers",
+    "fixedApprovers": "Fixed approver sources",
+    "fixedUsers": "Fixed people",
+    "fixedUserGroups": "Fixed people groups",
+    "addFixedUsers": "Add people",
+    "addFixedUserGroups": "Add people group",
+    "removeFixedSource": "Remove {{name}}",
+    "noFixedApprovers": "No fixed people or people groups added",
     "approvedBranch": "Approved",
     "rejectedBranch": "Rejected",
     "dynamicApprovers": "Dynamic approvers",
-    "addUsers": "Add dynamic users",
-    "addGroups": "Add dynamic user groups",
+    "addUsers": "Add dynamic approvers",
     "noDynamicInputs": "No dynamic approvers added",
     "lookupDescription": "Calls an API and transforms its response into one or more approver IDs",
-    "dynamicUsers": "Look up users",
-    "dynamicGroups": "Look up user groups",
+    "dynamicUsers": "Look up approvers",
     "dynamicUserDefaultName": "Look up approvers",
-    "dynamicGroupDefaultName": "Look up approver groups",
     "dynamicLookupName": "Lookup name",
     "dynamicLookupNamePlaceholder": "For example: Find direct manager",
     "lookupRequest": "Look up approvers",
@@ -229,7 +232,7 @@
         "input": "The result received by the approval node from the previous node.",
         "workflow": "The original data received when the Workflow started.",
         "response": "The approver lookup response: { status, data, headers }.",
-        "return": "Return { subjects: [{ provider, refs }] } to select approvers for this task."
+        "return": "Return an array of user IDs, for example ['alice', 'bob']."
       },
       "approvalCreation": {
         "input": "The result received by the approval node from the previous node.",
@@ -293,6 +296,11 @@
     "loadFailed": "Unable to load connections",
     "disabled": "Disabled",
     "edit": "Edit connection",
+    "deleteAria": "Delete {{name}}",
+    "deleteConfirm": "Delete connection {{name}}?",
+    "deleteDescription": "This cannot be undone. Connections used by a Workflow cannot be deleted.",
+    "deleteSuccess": "Connection deleted",
+    "deleteFailed": "Unable to delete connection",
     "create": "Create connection",
     "saveChanges": "Save changes",
     "authentication": "Authentication",
@@ -560,6 +568,8 @@
     },
     "database": {
       "sql": "SQL statement",
+      "readOnly": "Read-only SQL",
+      "writeEnabled": "Writes enabled",
       "allowWrite": "Allow writes",
       "readOnlyDescription": "When off, this node can only query data.",
       "readWriteDescription": "When on, this node can query, insert, update, or delete data.",
@@ -622,10 +632,16 @@
     "enableConfirm": "Enable this node instance?",
     "disableConfirm": "Disable this node instance?",
     "detailDescription": "Review this reusable configuration and the Workflows that reference it.",
+    "detailSummaryDescription": "Review the instance purpose, node type, and maintenance details.",
     "referencesLoadFailed": "References could not be loaded",
     "createdAt": "Created",
+    "instanceId": "Instance ID",
+    "referenceCount": "References",
+    "noDescription": "No description",
     "noConfiguration": "This instance has no configuration",
+    "configurationDescription": "Review the saved {{name}} execution parameters in read-only mode.",
     "referencedBy": "Referenced by",
+    "referencesDescription": "These Workflows currently use this reusable configuration.",
     "noReferences": "No Workflows reference this instance",
     "node": "Node",
     "new": "New Instance",
@@ -734,7 +750,12 @@
     "add": "Add",
     "template": "Node template",
     "templateOptional": "Use a template or configure this node directly",
-    "createTemplate": "New template",
+    "saveCurrentAsTemplate": "Save current configuration as template",
+    "saveCurrentAsTemplateHint": "Create a template from the current node configuration and immediately use it for this node. Save the Workflow from the top of the page to persist this reference.",
+    "saveAndUseTemplate": "Save and use template",
+    "templateName": "Template name",
+    "templateSavedAndApplied": "Template created and applied to this node",
+    "templateSaveFailed": "Failed to save template",
     "selectTemplate": "Select a template",
     "noTemplates": "No templates available",
     "loadingInstances": "Loading templates…",
@@ -777,6 +798,14 @@
         "string": "Text"
       },
       "fieldLabels": {
+        "event_trigger": {
+          "operation": "Operation type",
+          "table": "Source table",
+          "primaryKey": "Primary key",
+          "before": "Data before the change",
+          "after": "Data after the change",
+          "changedFields": "Changed fields"
+        },
         "webhook_trigger": {
           "body": "Request body",
           "headers": "Request headers",
@@ -813,6 +842,14 @@
         }
       },
       "fields": {
+        "event_trigger": {
+          "operation": "Database operation: INSERT, UPDATE, or DELETE",
+          "table": "The changed table, including its schema and table name",
+          "primaryKey": "The primary key of the changed row",
+          "before": "The complete row before the change; null for INSERT",
+          "after": "The complete row after the change; null for DELETE",
+          "changedFields": "Changed watched fields for UPDATE; all row fields for INSERT or DELETE"
+        },
         "webhook_trigger": {
           "body": "",
           "headers": "",
@@ -859,12 +896,9 @@
         "anyValue": "Output is determined at runtime"
       }
     },
-    "saveAsInstance": "Also save as a template",
-    "instanceNamePlaceholder": "Template name (required)",
     "aiEditHint": "Describe what to change",
     "aiEditPlaceholder": "For example: change the timeout to 30 minutes",
     "send": "Send",
-    "saveChanges": "Save changes",
     "aiGenerating": "AI is generating workflow…",
     "aiGeneratingHint": "Please wait. The workflow canvas will update automatically.",
     "untitled": "Untitled Workflow",
@@ -988,6 +1022,7 @@
     "completed": "Completed",
     "running": "Running",
     "failed": "Failed",
+    "cancelled": "Cancelled",
     "publishedStatus": "Published",
     "status": "Status",
     "version": "Version",
@@ -1038,6 +1073,9 @@
     "openTemporal": "Open in Temporal",
     "cancel": "Cancel run",
     "executionDetails": "Run information",
+    "cancellationRequestedBy": "Cancelled by",
+    "cancellationRequestedAt": "Cancelled at",
+    "cancellationReason": "Cancellation reason",
     "result": "Final result",
     "retryAll": "Run entire Workflow again",
     "retryAllConfirm": "Run the entire Workflow again?",

package/dist/lib/application/files/gadmin2-game-angle-demo/web/src/locales/zh_CN/workflow.json

@@ -162,18 +162,21 @@
     "taskDetailValue": "字段值",
     "whoCanApprove": "审批人设置",
     "description": "选择固定审批人，或在节点内调用接口动态查询审批人。",
-    "fixedApprovers": "固定审批人",
+    "fixedApprovers": "固定审批来源",
+    "fixedUsers": "固定人员",
+    "fixedUserGroups": "固定人员组",
+    "addFixedUsers": "添加人员",
+    "addFixedUserGroups": "添加人员组",
+    "removeFixedSource": "删除{{name}}",
+    "noFixedApprovers": "暂未添加固定人员或人员组",
     "approvedBranch": "通过",
     "rejectedBranch": "拒绝",
     "dynamicApprovers": "动态审批人",
-    "addUsers": "添加动态用户",
-    "addGroups": "添加动态用户组",
+    "addUsers": "添加动态审批人",
     "noDynamicInputs": "暂未添加动态审批人",
     "lookupDescription": "调用接口并把响应转换为一个或多个审批人 ID",
-    "dynamicUsers": "动态查询用户",
-    "dynamicGroups": "动态查询用户组",
+    "dynamicUsers": "动态查询审批人",
     "dynamicUserDefaultName": "查询审批人",
-    "dynamicGroupDefaultName": "查询审批用户组",
     "dynamicLookupName": "查询名称",
     "dynamicLookupNamePlaceholder": "例如：查询直属领导",
     "lookupRequest": "查询审批人",
@@ -229,7 +232,7 @@
         "input": "人工审批节点从上一个节点收到的结果。",
         "workflow": "Workflow 最初收到的启动数据。",
         "response": "查询审批人接口返回的 { status, data, headers }。",
-        "return": "返回 { subjects: [{ provider, refs }] }，用于确定本次审批人。"
+        "return": "返回人员 ID 数组，例如 ['zhangsan', 'lisi']。"
       },
       "approvalCreation": {
         "input": "人工审批节点从上一个节点收到的结果。",
@@ -293,6 +296,11 @@
     "loadFailed": "加载连接失败",
     "disabled": "停用",
     "edit": "编辑连接",
+    "deleteAria": "删除 {{name}}",
+    "deleteConfirm": "删除连接 {{name}}？",
+    "deleteDescription": "删除后将无法恢复。正在被 Workflow 使用的连接不能删除。",
+    "deleteSuccess": "连接已删除",
+    "deleteFailed": "连接删除失败",
     "create": "创建连接",
     "saveChanges": "保存修改",
     "authentication": "认证方式",
@@ -560,6 +568,8 @@
     },
     "database": {
       "sql": "SQL 语句",
+      "readOnly": "只读 SQL",
+      "writeEnabled": "允许写入",
       "allowWrite": "允许写入",
       "readOnlyDescription": "关闭时只能查询数据。",
       "readWriteDescription": "开启后可以查询、新增、更新或删除数据。",
@@ -622,10 +632,16 @@
     "enableConfirm": "确定启用此节点实例吗？",
     "disableConfirm": "确定停用此节点实例吗？",
     "detailDescription": "查看可复用配置及引用它的工作流。",
+    "detailSummaryDescription": "确认实例用途、节点类型和维护信息。",
     "referencesLoadFailed": "引用关系加载失败",
     "createdAt": "创建时间",
+    "instanceId": "实例 ID",
+    "referenceCount": "引用数",
+    "noDescription": "暂无描述",
     "noConfiguration": "此实例没有配置项",
+    "configurationDescription": "只读查看 {{name}} 当前保存的执行参数。",
     "referencedBy": "引用此实例的工作流",
+    "referencesDescription": "以下 Workflow 当前正在使用这份可复用配置。",
     "noReferences": "暂无工作流引用此实例",
     "node": "节点",
     "new": "新建实例",
@@ -734,7 +750,12 @@
     "add": "添加",
     "template": "节点模板",
     "templateOptional": "可以使用模板，也可以直接配置",
-    "createTemplate": "新建模板",
+    "saveCurrentAsTemplate": "将当前配置保存为模板",
+    "saveCurrentAsTemplateHint": "将使用当前节点配置创建模板，并立即让当前节点引用该模板。Workflow 仍需通过页面顶部的“保存”进行保存。",
+    "saveAndUseTemplate": "保存并使用模板",
+    "templateName": "模板名称",
+    "templateSavedAndApplied": "模板已创建并应用到当前节点",
+    "templateSaveFailed": "保存模板失败",
     "selectTemplate": "选择模板",
     "noTemplates": "暂无可用模板",
     "loadingInstances": "正在加载模板…",
@@ -777,6 +798,14 @@
         "string": "文本"
       },
       "fieldLabels": {
+        "event_trigger": {
+          "operation": "操作类型",
+          "table": "数据表",
+          "primaryKey": "主键",
+          "before": "变更前的数据",
+          "after": "变更后的数据",
+          "changedFields": "发生变化的字段"
+        },
         "webhook_trigger": {
           "body": "请求内容",
           "headers": "请求头",
@@ -813,6 +842,14 @@
         }
       },
       "fields": {
+        "event_trigger": {
+          "operation": "数据库操作类型：INSERT（新增）、UPDATE（更新）或 DELETE（删除）",
+          "table": "发生变化的数据表，包含 schema 和表名",
+          "primaryKey": "发生变化的这一行数据的主键",
+          "before": "变更前的整行数据；新增时为 null",
+          "after": "变更后的整行数据；删除时为 null",
+          "changedFields": "更新时为实际变化的监听字段；新增或删除时为整行字段"
+        },
         "webhook_trigger": {
           "body": "",
           "headers": "",
@@ -859,12 +896,9 @@
         "anyValue": "输出内容在运行时确定"
       }
     },
-    "saveAsInstance": "同时保存为模板",
-    "instanceNamePlaceholder": "模板名称（必填）",
     "aiEditHint": "描述要修改的内容",
     "aiEditPlaceholder": "例如：将超时时间改为 30 分钟",
     "send": "发送",
-    "saveChanges": "保存修改",
     "aiGenerating": "AI 正在生成工作流…",
     "aiGeneratingHint": "请稍候，工作流画布会自动更新。",
     "untitled": "未命名工作流",
@@ -988,6 +1022,7 @@
     "completed": "已完成",
     "running": "运行中",
     "failed": "失败",
+    "cancelled": "已取消",
     "publishedStatus": "已发布",
     "status": "状态",
     "version": "版本",
@@ -1038,6 +1073,9 @@
     "openTemporal": "在 Temporal 中查看",
     "cancel": "取消运行",
     "executionDetails": "运行信息",
+    "cancellationRequestedBy": "取消人",
+    "cancellationRequestedAt": "取消时间",
+    "cancellationReason": "取消原因",
     "result": "最终结果",
     "retryAll": "重新运行整个流程",
     "retryAllConfirm": "确定重新运行整个流程吗？",