openxiangda-cli 2.0.0-alpha.56 → 2.0.0-alpha.58

package/template/apps/web/src/fields.ts

@@ -8,7 +8,10 @@ export type FieldKind =
   | 'multi'
   | 'email'
   | 'phone'
-  | 'file';
+  | 'file'
+  | 'scope'
+  | 'directory-user'
+  | 'directory-department';
 
 export interface InstrumentField {
   key: string;
@@ -58,11 +61,11 @@ export const instrumentFields: InstrumentField[] = [
   { key: 'openToOutside', label: '是否对外开放', kind: 'boolean', section: 'usage', required: true },
   { key: 'subjectAreas', label: '学科领域', kind: 'multi', section: 'usage', options: options([['材料', 'material'], ['生命科学', 'life'], ['化学', 'chemistry'], ['物理', 'physics']]) },
   { key: 'platformProperty', label: '平台属性', kind: 'select', section: 'usage', options: options([['共享平台设备', 'shared'], ['课题组设备', 'research']]) },
-  { key: 'collegeId', label: '所属学院', kind: 'select', section: 'usage', required: true, createCapability: 'app:instrument-center:instrument:field:college-id:create', updateCapability: 'app:instrument-center:instrument:field:college-id:update', options: options([['先进材料学院', 'college-am'], ['生命健康学院', 'college-lh'], ['公共测试中心', 'college-pt']]) },
-  { key: 'manageDepartmentId', label: '管理部门', kind: 'select', section: 'management', required: true, options: options([['材料测试中心', 'dept-am-test'], ['生命平台中心', 'dept-lh-core'], ['公共测试中心', 'dept-public']]) },
-  { key: 'useDepartmentId', label: '使用部门', kind: 'select', section: 'management', required: true, options: options([['材料测试中心', 'dept-am-test'], ['生命平台中心', 'dept-lh-core'], ['公共测试中心', 'dept-public']]) },
-  { key: 'instrumentAdminIds', label: '仪器管理员', kind: 'multi', section: 'management', required: true, createCapability: 'app:instrument-center:instrument:field:instrument-admin-ids:create', updateCapability: 'app:instrument-center:instrument:field:instrument-admin-ids:update', options: options([['王老师', 'user-wang'], ['李老师', 'user-li'], ['陈老师', 'user-chen']]) },
-  { key: 'contactUserIds', label: '联系人', kind: 'multi', section: 'management', required: true, options: options([['王老师', 'user-wang'], ['李老师', 'user-li'], ['陈老师', 'user-chen']]) },
+  { key: 'collegeId', label: '所属学院', kind: 'scope', section: 'usage', required: true, createCapability: 'app:instrument-center:instrument:field:college-id:create', updateCapability: 'app:instrument-center:instrument:field:college-id:update' },
+  { key: 'manageDepartmentId', label: '管理部门', kind: 'directory-department', section: 'management', required: true },
+  { key: 'useDepartmentId', label: '使用部门', kind: 'directory-department', section: 'management', required: true },
+  { key: 'instrumentAdminIds', label: '仪器管理员', kind: 'directory-user', section: 'management', required: true, multiple: true, createCapability: 'app:instrument-center:instrument:field:instrument-admin-ids:create', updateCapability: 'app:instrument-center:instrument:field:instrument-admin-ids:update' },
+  { key: 'contactUserIds', label: '联系人', kind: 'directory-user', section: 'management', required: true, multiple: true },
   { key: 'contactPhone', label: '联系电话', kind: 'phone', section: 'management', required: true },
   { key: 'contactEmail', label: '联系邮箱', kind: 'email', section: 'management' },
   { key: 'locationId', label: '存放点', kind: 'select', section: 'materials', options: options([['A 区 101', 'A-101'], ['B 区 203', 'B-203']]) },
@@ -70,3 +73,11 @@ export const instrumentFields: InstrumentField[] = [
   { key: 'serviceContent', label: '服务内容与主要功能', kind: 'textarea', section: 'materials' },
   { key: 'attachments', label: '仪器资料', kind: 'file', section: 'materials', multiple: true, maxCount: 8 },
 ];
+
+const instrumentResourceFieldCodes = new Set(
+  instrumentFields.filter(field => !field.system).map(field => field.key)
+);
+
+export function isInstrumentResourceField(field: string) {
+  return instrumentResourceFieldCodes.has(field);
+}

package/template/apps/web/src/instrument.ts

@@ -31,7 +31,7 @@ export interface InstrumentRecord extends Record<string, unknown> {
   address?: string;
   serviceContent?: string;
   attachments?: DataFileRef[];
-  updatedAt?: string;
+  updated_at?: string;
 }
 
 export interface InstrumentListQuery {

package/template/apps/web/src/main.tsx

@@ -5,6 +5,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
 import { instrumentProvider } from './data-provider';
+import { CollegePage } from './CollegePage';
 import { InstrumentDetailPage } from './InstrumentDetailPage';
 import { InstrumentFormPage } from './InstrumentFormPage';
 import { InstrumentListPage } from './InstrumentListPage';
@@ -16,7 +17,20 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
     <ConfigProvider
       locale={zhCN}
-      theme={{ token: { borderRadius: 6, colorPrimary: '#1677ff' } }}
+      theme={{
+        token: {
+          borderRadius: 8,
+          colorBgLayout: '#f3f7fd',
+          colorPrimary: '#1677ff',
+          colorText: '#172033',
+          fontSize: 14,
+        },
+        components: {
+          Card: { headerFontSize: 16 },
+          Layout: { bodyBg: '#f3f7fd', headerBg: '#ffffff', siderBg: '#ffffff' },
+          Menu: { itemBorderRadius: 8, itemSelectedBg: '#eaf3ff' },
+        },
+      }}
     >
       <AntdApp>
         <RuntimeBoundary>
@@ -36,6 +50,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
               <Routes>
                 <Route path="/" element={<Navigate replace to="/instruments" />} />
                 <Route path="/instruments" element={<InstrumentListPage />} />
+                <Route path="/colleges" element={<CollegePage />} />
                 <Route
                   path="/instruments/new"
                   element={<InstrumentFormPage mode="create" />}

package/template/apps/web/src/platform-client.ts

@@ -2,17 +2,23 @@ import {
   SCHEMA_VERSIONS,
   type DataFileRef,
   type DataFileUploadPlan,
+  type DataAuditPage,
   type DataPage,
   type DataQuery,
   type DataRecord,
+  type DirectoryEntryPage,
+  type DirectoryResolveRequest,
+  type NativeScopeValuePage,
+  type NativeScopeValueResolveRequest,
 } from 'openxiangda-contracts/browser';
 import type { InstrumentListQuery, InstrumentRecord } from './instrument';
+import { isInstrumentResourceField } from './fields';
 import { applicationCode, runtimeMount } from './runtime-meta';
 
 const resourceCode = 'instruments';
 const nativeBase = () =>
   `/service/openxiangda-api/v2/applications/${applicationCode()}/native`;
-const dataBase = () => `${nativeBase()}/data/${resourceCode}`;
+const dataBase = (code = resourceCode) => `${nativeBase()}/data/${code}`;
 
 interface PlatformEnvelope<T> {
   code: number;
@@ -135,9 +141,125 @@ function currentEnvironmentKey() {
   return key;
 }
 
+export type DirectoryKind = 'user' | 'department';
+
+export async function searchDirectory(
+  kind: DirectoryKind,
+  options: { keyword: string; cursor?: string }
+) {
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    keyword: options.keyword.trim(),
+    limit: '20',
+  });
+  if (options.cursor) params.set('cursor', options.cursor);
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/${kind}s?${params}`
+  );
+}
+
+export async function browseDepartmentTree(options: {
+  parentId?: string;
+  cursor?: string;
+}) {
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    limit: '100',
+  });
+  if (options.parentId) params.set('parentId', options.parentId);
+  if (options.cursor) params.set('offset', options.cursor);
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/departments/tree?${params}`
+  );
+}
+
+export async function browseDepartmentUsers(
+  departmentId: string,
+  page = 1
+) {
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    page: String(page),
+    limit: '20',
+  });
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/departments/${encodeURIComponent(
+      departmentId
+    )}/users?${params}`
+  );
+}
+
+export async function resolveDirectory(
+  kind: DirectoryKind,
+  ids: string[]
+) {
+  const uniqueIds = [...new Set(ids)];
+  const body: DirectoryResolveRequest = {
+    schemaVersion: SCHEMA_VERSIONS.directoryResolveRequest,
+    kind,
+    ids: uniqueIds,
+  };
+  if (body.ids.length === 0) {
+    throw new Error('OPENXIANGDA_DIRECTORY_RESOLVE_IDS_REQUIRED');
+  }
+  if (body.ids.length > 50) {
+    throw new Error('OPENXIANGDA_DIRECTORY_RESOLVE_IDS_EXCEEDED');
+  }
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/resolve?environmentKey=${encodeURIComponent(
+      currentEnvironmentKey()
+    )}`,
+    { method: 'POST', body: JSON.stringify(body) }
+  );
+}
+
+const scopeValuesBase = () =>
+  `${nativeBase()}/data-resources/${resourceCode}/fields/collegeId/scope-values`;
+
+export async function searchCollegeScope(
+  operation: 'create' | 'update',
+  options: { keyword: string; cursor?: string }
+) {
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    dimensionCode: 'college',
+    operation,
+    keyword: options.keyword.trim(),
+    limit: '20',
+  });
+  if (options.cursor) params.set('cursor', options.cursor);
+  return request<NativeScopeValuePage>(`${scopeValuesBase()}?${params}`);
+}
+
+export async function resolveCollegeScope(
+  operation: 'create' | 'update',
+  values: string[]
+) {
+  const uniqueValues = [...new Set(values)];
+  const body: NativeScopeValueResolveRequest = {
+    schemaVersion: SCHEMA_VERSIONS.nativeScopeValueResolveRequest,
+    dimensionCode: 'college',
+    operation,
+    values: uniqueValues,
+  };
+  if (body.values.length === 0) {
+    throw new Error('OPENXIANGDA_SCOPE_RESOLVE_VALUES_REQUIRED');
+  }
+  if (body.values.length > 50) {
+    throw new Error('OPENXIANGDA_SCOPE_RESOLVE_VALUES_EXCEEDED');
+  }
+  return request<NativeScopeValuePage>(
+    `${scopeValuesBase()}/resolve?environmentKey=${encodeURIComponent(
+      currentEnvironmentKey()
+    )}`,
+    { method: 'POST', body: JSON.stringify(body) }
+  );
+}
+
 export interface InstrumentDataApiAdapter {
   list(query: InstrumentListQuery): Promise<{ rows: InstrumentRecord[]; total: number }>;
   get(id: string): Promise<InstrumentRecord>;
+  audit(id: string): Promise<DataAuditPage>;
   create(data: Partial<InstrumentRecord>): Promise<InstrumentRecord>;
   update(id: string, expectedRevision: number, data: Partial<InstrumentRecord>): Promise<InstrumentRecord>;
   remove(id: string, expectedRevision: number): Promise<InstrumentRecord>;
@@ -165,10 +287,11 @@ export const instrumentDataApi: InstrumentDataApiAdapter = {
     const body: DataQuery = {
       schemaVersion: SCHEMA_VERSIONS.dataQuery,
       filters,
-      order: [{ field: String(query.sort?.field || 'updatedAt'), direction: query.sort?.order || 'desc' }],
+      order: [{ field: String(query.sort?.field || 'instrumentCode'), direction: query.sort?.order || 'asc' }],
       limit: query.pageSize,
       offset: (query.page - 1) * query.pageSize,
     };
+    assertInstrumentQueryFields(body);
     const page = await request<DataPage<InstrumentRecord>>(`${dataBase()}/query`, {
       method: 'POST',
       body: JSON.stringify({ ...body, environmentKey: currentEnvironmentKey() }),
@@ -183,6 +306,15 @@ export const instrumentDataApi: InstrumentDataApiAdapter = {
     );
     return record.data;
   },
+  async audit(id) {
+    return await request<DataAuditPage>(
+      `${dataBase()}/records/${encodeURIComponent(
+        id
+      )}/audit?limit=10&offset=0&environmentKey=${encodeURIComponent(
+        currentEnvironmentKey()
+      )}`
+    );
+  },
   async create(data) {
     const record = await request<DataRecord<InstrumentRecord>>(`${dataBase()}/records`, {
       method: 'POST',
@@ -244,3 +376,82 @@ export const instrumentDataApi: InstrumentDataApiAdapter = {
     );
   },
 };
+
+export function instrumentFileContentUrl(fileId: string) {
+  return `${dataBase()}/files/${encodeURIComponent(
+    fileId
+  )}/content?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`;
+}
+
+export interface CollegeRecord extends Record<string, unknown> {
+  id: string;
+  revision: number;
+  name: string;
+  enabled: boolean;
+}
+
+export const collegeDataApi = {
+  async list(page = 1, pageSize = 20) {
+    const body: DataQuery = {
+      schemaVersion: SCHEMA_VERSIONS.dataQuery,
+      order: [{ field: 'name', direction: 'asc' }],
+      limit: pageSize,
+      offset: (page - 1) * pageSize,
+    };
+    const result = await request<DataPage<CollegeRecord>>(
+      `${dataBase('colleges')}/query`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          ...body,
+          environmentKey: currentEnvironmentKey(),
+        }),
+      }
+    );
+    return { rows: result.items, total: result.total };
+  },
+  async create(data: Pick<CollegeRecord, 'name' | 'enabled'>) {
+    const record = await request<DataRecord<CollegeRecord>>(
+      `${dataBase('colleges')}/records`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          data,
+        }),
+      }
+    );
+    return record.data;
+  },
+  async update(
+    id: string,
+    expectedRevision: number,
+    data: Pick<CollegeRecord, 'name' | 'enabled'>
+  ) {
+    const record = await request<DataRecord<CollegeRecord>>(
+      `${dataBase('colleges')}/records/${encodeURIComponent(id)}/update`,
+      {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          expectedRevision,
+          data,
+        }),
+      }
+    );
+    return record.data;
+  },
+};
+
+function assertInstrumentQueryFields(query: DataQuery) {
+  for (const field of [
+    ...(query.filters || []).map(filter => filter.field),
+    ...(query.order || []).map(order => order.field),
+  ]) {
+    if (!isInstrumentResourceField(field)) {
+      throw new Error(
+        `OPENXIANGDA_INSTRUMENT_QUERY_FIELD_NOT_DECLARED:${field}`
+      );
+    }
+  }
+}

package/template/apps/web/src/runtime.tsx

@@ -47,7 +47,7 @@ export function RuntimeBoundary({ children }: { children: React.ReactNode }) {
           showIcon
           type="error"
           data-testid="production-data-warning"
-          message="正在使用正式数据：所有新增、编辑和删除都会影响生产环境"
+          title="正在使用正式数据：所有新增、编辑和删除都会影响生产环境"
         />
       )}
       {error ? (
@@ -60,7 +60,9 @@ export function RuntimeBoundary({ children }: { children: React.ReactNode }) {
       ) : value ? (
         <RuntimeContext.Provider value={value}>{children}</RuntimeContext.Provider>
       ) : (
-        <div className="oxa-loading"><Spin tip="正在读取平台身份与权限并集" /></div>
+        <div className="oxa-loading">
+          <Spin description="正在读取平台身份与权限并集" />
+        </div>
       )}
     </>
   );