openxiangda-cli 2.0.0-alpha.59 → 2.0.0-alpha.61

package/template/apps/web/src/components/resource/SurfaceFields.tsx

@@ -0,0 +1,469 @@
+import {
+  PictureOutlined,
+  ReloadOutlined,
+  UploadOutlined,
+} from '@ant-design/icons';
+import {
+  Alert,
+  Button,
+  DatePicker,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Switch,
+  Tag,
+  Upload,
+} from 'antd';
+import type {
+  DataFieldSurface,
+  DataFileRef,
+} from 'openxiangda-contracts/browser';
+import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
+import { ResolvedValueText } from '../../AuthoritativeSelector';
+import { AttachmentFileList } from '../platform-fields/AttachmentFileList';
+import { PlatformDirectoryPicker } from '../platform-fields/PlatformDirectoryPicker';
+
+export type SurfaceField = DataFieldSurface & { key: string };
+
+export function listSurfaceFields(fields: Record<string, DataFieldSurface>) {
+  return Object.entries(fields)
+    .filter(([, field]) => field.list)
+    .map(([key, field]) => ({ key, ...field }));
+}
+
+export interface SurfaceFieldEditContext {
+  field: SurfaceField;
+  disabled: boolean;
+  operation: 'create' | 'update';
+  recordId?: string;
+}
+
+export interface SurfaceFieldValueContext {
+  field: SurfaceField;
+  value: unknown;
+}
+
+export interface SurfaceFieldRenderers {
+  renderExtra?: (context: SurfaceFieldEditContext) => ReactNode;
+  renderScope?: (context: SurfaceFieldEditContext) => ReactNode;
+  renderFilter?: (context: SurfaceFilterContext) => ReactNode;
+  upload?: (
+    field: SurfaceField,
+    file: File,
+    recordId?: string
+  ) => Promise<DataFileRef>;
+  renderValue?: (context: SurfaceFieldValueContext) => ReactNode | undefined;
+}
+
+export interface SurfaceFilterContext {
+  field: SurfaceField;
+  value: unknown;
+  onChange: (value: unknown) => void;
+}
+
+/** Render a standard filter control from the same field surface used by forms. */
+export function SurfaceFilterControl({
+  field,
+  value,
+  onChange,
+  range = false,
+  renderers,
+}: SurfaceFilterContext & { range?: boolean; renderers?: Pick<SurfaceFieldRenderers, 'renderScope' | 'renderFilter'> }) {
+  const custom = renderers?.renderFilter?.({ field, value, onChange });
+  if (custom !== undefined) return custom;
+  const placeholder = `筛选${field.label}`;
+  switch (field.widget) {
+    case 'boolean':
+      return (
+        <Select
+          allowClear
+          options={[{ label: '是', value: true }, { label: '否', value: false }]}
+          placeholder={placeholder}
+          value={value}
+          onChange={onChange}
+        />
+      );
+    case 'select':
+    case 'multi':
+      return (
+        <Select
+          allowClear
+          mode={field.widget === 'multi' ? 'multiple' : undefined}
+          options={field.options}
+          placeholder={placeholder}
+          value={value}
+          onChange={onChange}
+        />
+      );
+    case 'date':
+    case 'datetime':
+      return range ? (
+        <DatePicker.RangePicker
+          placeholder={[`起始${field.label}`, `结束${field.label}`]}
+          showTime={field.widget === 'datetime'}
+          onChange={(_, values) => onChange(values[0] && values[1] ? [values[0], values[1]] : undefined)}
+        />
+      ) : <DatePicker showTime={field.widget === 'datetime'} onChange={onChange} placeholder={placeholder} />;
+    case 'number':
+    case 'money':
+    case 'percent':
+      if (range) {
+        const values = Array.isArray(value) ? value as [number | undefined, number | undefined] : [];
+        return (
+          <Space.Compact>
+            <InputNumber min={0} onChange={next => onChange([next === null ? undefined : Number(next), values[1]])} placeholder={`最低${field.label}`} value={values[0]} />
+            <InputNumber min={0} onChange={next => onChange([values[0], next === null ? undefined : Number(next)])} placeholder={`最高${field.label}`} value={values[1]} />
+          </Space.Compact>
+        );
+      }
+      return <InputNumber min={0} onChange={onChange} placeholder={placeholder} value={value as number | null | undefined} />;
+    case 'scope':
+      return renderers?.renderScope?.({ field, disabled: false, operation: 'update' }) || <Input allowClear value={value as string | undefined} onChange={event => onChange(event.target.value)} placeholder={placeholder} />;
+    case 'directory-user':
+    case 'directory-department':
+      return <PlatformDirectoryPicker kind={field.widget === 'directory-user' ? 'user' : 'department'} multiple={field.multiple} onChange={onChange as (value: string | string[] | undefined) => void} placeholder={placeholder} value={value as string | string[] | undefined} />;
+    default:
+      return <Input allowClear value={value as string | undefined} onChange={event => onChange(event.target.value)} placeholder={placeholder} />;
+  }
+}
+
+export function SurfaceFieldControl({
+  field,
+  disabled,
+  operation,
+  recordId,
+  renderers,
+}: SurfaceFieldEditContext & { renderers?: SurfaceFieldRenderers }) {
+  const rules = [
+    ...(field.requiredHint
+      ? [{ required: true, message: `请填写或选择${field.label}` }]
+      : []),
+    ...(field.widget === 'email'
+      ? [{ type: 'email' as const, message: '邮箱格式不正确' }]
+      : []),
+    ...(field.widget === 'phone'
+      ? [{ pattern: /^1\d{10}$/, message: '请输入 11 位手机号' }]
+      : []),
+  ];
+  const common = { disabled, placeholder: `请输入${field.label}` };
+  let control: ReactNode = <Input {...common} />;
+  switch (field.widget) {
+    case 'textarea':
+      control = <Input.TextArea {...common} rows={3} />;
+      break;
+    case 'number':
+    case 'money':
+    case 'percent':
+      control = <InputNumber {...common} min={0} style={{ width: '100%' }} />;
+      break;
+    case 'date':
+    case 'datetime':
+      control = <DatePicker disabled={disabled} showTime={field.widget === 'datetime'} style={{ width: '100%' }} />;
+      break;
+    case 'boolean':
+      control = <Switch checkedChildren="是" disabled={disabled} unCheckedChildren="否" />;
+      break;
+    case 'select':
+      control = <Select disabled={disabled} options={field.options} placeholder={`请选择${field.label}`} />;
+      break;
+    case 'multi':
+      control = <Select disabled={disabled} mode="multiple" options={field.options} placeholder={`请选择${field.label}`} />;
+      break;
+    case 'email':
+      control = <Input {...common} type="email" />;
+      break;
+    case 'phone':
+      control = <Input {...common} type="tel" />;
+      break;
+    case 'scope':
+      control = renderers?.renderScope?.({ field, disabled, operation, recordId }) || (
+        <Input {...common} />
+      );
+      break;
+    case 'directory-user':
+    case 'directory-department':
+      control = (
+        <PlatformDirectoryPicker
+          disabled={disabled}
+          kind={field.widget === 'directory-user' ? 'user' : 'department'}
+          multiple={field.multiple}
+          placeholder={`搜索并选择${field.label}`}
+        />
+      );
+      break;
+    case 'file':
+      control = (
+        <ManagedFileField
+          accept={field.accept}
+          disabled={disabled}
+          field={field}
+          maxCount={field.maxCount}
+          multiple={field.multiple}
+          onUpload={renderers?.upload}
+          recordId={recordId}
+        />
+      );
+      break;
+    case 'json':
+      control = <Input.TextArea {...common} rows={4} />;
+      break;
+    case 'readonly':
+      control = <Input {...common} readOnly />;
+      break;
+    case 'text':
+    default:
+      break;
+  }
+  const extra =
+    renderers?.renderExtra?.({ field, disabled, operation, recordId }) ||
+    (disabled ? '当前角色不可修改此字段' : undefined);
+  const wide = field.widget === 'textarea' || field.widget === 'file' || field.widget === 'json';
+  return (
+    <Form.Item
+      className={wide ? 'oxa-field-wide' : undefined}
+      extra={extra}
+      label={field.label}
+      name={field.key}
+      rules={rules}
+      valuePropName={field.widget === 'boolean' ? 'checked' : 'value'}
+    >
+      {control}
+    </Form.Item>
+  );
+}
+
+/** Mobile keeps the same field values and validation but uses native controls. */
+export function MobileSurfaceFieldControl({
+  field,
+  disabled,
+  operation,
+  recordId,
+  renderers,
+}: SurfaceFieldEditContext & { renderers?: SurfaceFieldRenderers }) {
+  const rules = field.requiredHint
+    ? [{ required: true, message: `请填写或选择${field.label}` }]
+    : [];
+  const inputProps = { disabled, className: 'oxa-mobile-input', placeholder: `请输入${field.label}` };
+  let control: ReactNode = <input {...inputProps} />;
+  switch (field.widget) {
+    case 'textarea':
+    case 'json':
+      control = <textarea {...inputProps} rows={4} />;
+      break;
+    case 'number':
+    case 'money':
+    case 'percent':
+      control = <input {...inputProps} min={0} type="number" />;
+      break;
+    case 'date':
+      control = <input {...inputProps} type="date" />;
+      break;
+    case 'datetime':
+      control = <input {...inputProps} type="datetime-local" />;
+      break;
+    case 'boolean':
+      control = <input disabled={disabled} type="checkbox" />;
+      break;
+    case 'select':
+    case 'multi':
+      control = (
+        <select
+          className="oxa-mobile-input"
+          disabled={disabled}
+          multiple={field.widget === 'multi'}
+        >
+          {field.options?.map(option => (
+            <option key={option.value} value={option.value}>
+              {option.label}
+            </option>
+          ))}
+        </select>
+      );
+      break;
+    case 'email':
+      control = <input {...inputProps} type="email" />;
+      break;
+    case 'phone':
+      control = <input {...inputProps} type="tel" />;
+      break;
+    case 'scope':
+      control = renderers?.renderScope?.({ field, disabled, operation, recordId }) || (
+        <input {...inputProps} />
+      );
+      break;
+    case 'directory-user':
+    case 'directory-department':
+      control = (
+        <PlatformDirectoryPicker
+          disabled={disabled}
+          kind={field.widget === 'directory-user' ? 'user' : 'department'}
+          multiple={field.multiple}
+          placeholder={`搜索并选择${field.label}`}
+        />
+      );
+      break;
+    case 'file':
+      control = (
+        <ManagedFileField
+          accept={field.accept}
+          disabled={disabled}
+          field={field}
+          maxCount={field.maxCount}
+          multiple={field.multiple}
+          onUpload={renderers?.upload}
+          recordId={recordId}
+        />
+      );
+      break;
+    case 'readonly':
+      control = <input {...inputProps} readOnly />;
+      break;
+  }
+  return (
+    <Form.Item
+      className="oxa-mobile-field"
+      extra={renderers?.renderExtra?.({ field, disabled, operation, recordId })}
+      label={field.label}
+      name={field.key}
+      rules={rules}
+      valuePropName={field.widget === 'boolean' ? 'checked' : 'value'}
+    >
+      {control}
+    </Form.Item>
+  );
+}
+
+export function SurfaceFieldValue({
+  field,
+  value,
+  renderers,
+}: SurfaceFieldValueContext & { renderers?: SurfaceFieldRenderers }) {
+  if (value === undefined || value === null || value === '') return <>-</>;
+  const custom = renderers?.renderValue?.({ field, value });
+  if (custom !== undefined) return <>{custom}</>;
+  if (field.widget === 'directory-user' || field.widget === 'directory-department') {
+    return (
+      <ResolvedValueText
+        source={field.widget === 'directory-user' ? 'user' : 'department'}
+        value={Array.isArray(value) ? value.map(String) : String(value)}
+      />
+    );
+  }
+  if (field.widget === 'file') {
+    const values = (Array.isArray(value) ? value : [value]).filter(isFileRef);
+    return values.length ? <AttachmentFileList files={values} /> : <>-</>;
+  }
+  if (field.widget === 'boolean') {
+    return <Tag color={value ? 'green' : 'default'}>{value ? '是' : '否'}</Tag>;
+  }
+  if (Array.isArray(value)) {
+    return <>{value.map(item => optionLabel(field, item)).join('、') || '-'}</>;
+  }
+  if (field.widget === 'date' || field.widget === 'datetime') {
+    const parsed = new Date(String(value));
+    return <>{Number.isNaN(parsed.getTime()) ? String(value) : parsed.toLocaleString('zh-CN', { hour12: false })}</>;
+  }
+  return <>{optionLabel(field, value)}</>;
+}
+
+function optionLabel(field: SurfaceField, value: unknown) {
+  return field.options?.find(option => option.value === value)?.label || String(value);
+}
+
+function isFileRef(value: unknown): value is DataFileRef {
+  return Boolean(value && typeof value === 'object' && 'id' in value);
+}
+
+function ManagedFileField({
+  field,
+  value,
+  onChange,
+  recordId,
+  disabled,
+  multiple,
+  maxCount = 1,
+  accept,
+  onUpload,
+}: {
+  field: SurfaceField;
+  value?: DataFileRef | DataFileRef[];
+  onChange?: (value: DataFileRef | DataFileRef[] | undefined) => void;
+  recordId?: string;
+  disabled?: boolean;
+  multiple?: boolean;
+  maxCount?: number;
+  accept?: string | string[];
+  onUpload?: SurfaceFieldRenderers['upload'];
+}) {
+  const [uploading, setUploading] = useState(false);
+  const [uploadError, setUploadError] = useState('');
+  const refs = useMemo(() => (Array.isArray(value) ? value : value ? [value] : []), [value]);
+  const refsRef = useRef(refs);
+  useEffect(() => {
+    refsRef.current = refs;
+  }, [refs]);
+  if (!onUpload) {
+    return <Alert type="info" showIcon message="该文件字段尚未配置上传能力" />;
+  }
+  const uploadProps = {
+    accept: Array.isArray(accept) ? accept.join(',') : accept,
+    disabled,
+    maxCount,
+    multiple,
+    customRequest: async (options: {
+      file: string | Blob;
+      onError?: (error: Error) => void;
+      onProgress?: (event: { percent: number }) => void;
+      onSuccess?: (body: unknown) => void;
+    }) => {
+      setUploading(true);
+      setUploadError('');
+      try {
+        options.onProgress?.({ percent: 15 });
+        const uploaded = await onUpload(field, options.file as File, recordId);
+        options.onProgress?.({ percent: 100 });
+        const next = multiple ? [...refsRef.current, uploaded] : uploaded;
+        refsRef.current = Array.isArray(next) ? next : [next];
+        onChange?.(next);
+        options.onSuccess?.(uploaded);
+      } catch (error) {
+        const failure = error instanceof Error ? error : new Error(String(error));
+        setUploadError(failure.message);
+        options.onError?.(failure);
+      } finally {
+        setUploading(false);
+      }
+    },
+    showUploadList: false,
+  };
+  return (
+    <div className="oxa-file-field">
+      <Upload {...uploadProps} pastable>
+        <Button disabled={disabled || uploading || refs.length >= maxCount} icon={field.accept?.toString().startsWith('image/') ? <PictureOutlined /> : <UploadOutlined />} loading={uploading}>
+          {field.accept?.toString().startsWith('image/') ? '上传图片' : '上传文件'}
+        </Button>
+      </Upload>
+      <Upload.Dragger {...uploadProps} className="oxa-file-dropzone" openFileDialogOnClick={false} pastable>
+        <span>可将文件拖到这里，或在此区域按 <kbd>⌘ V</kbd> 粘贴</span>
+        <small>{multiple ? `最多 ${maxCount} 个文件，单个不超过 50MB` : '仅保留一个文件，新上传会替换当前文件'}</small>
+      </Upload.Dragger>
+      {uploadError && (
+        <div className="oxa-file-error">
+          <span>{uploadError}</span>
+          <Button icon={<ReloadOutlined />} onClick={() => setUploadError('')} size="small" type="text">关闭</Button>
+        </div>
+      )}
+      {refs.length ? (
+        <AttachmentFileList files={refs} onRemove={file => {
+          const next = refs.filter(item => item.id !== file.id);
+          refsRef.current = next;
+          onChange?.(multiple ? next : undefined);
+        }} removable={!disabled} />
+      ) : (
+        <div className="oxa-file-empty">尚未上传文件</div>
+      )}
+    </div>
+  );
+}

package/template/apps/web/src/data-provider.ts

@@ -1,7 +1,29 @@
 import type { DataProvider } from '@refinedev/core';
 import type { InstrumentListQuery, InstrumentRecord } from './instrument';
-import { instrumentDataApi } from './platform-client';
+import {
+  createNativeResourceClient,
+  instrumentDataApi,
+  type GenericResourceQuery,
+} from './platform-client';
 import { applicationCode } from './runtime-meta';
+import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
+
+type GeneratedDefinition = {
+  code: string;
+  name: string;
+  capabilities: { read: string; create: string; update: string; delete: string };
+  surface: import('openxiangda-contracts/browser').DataResourceSurface;
+};
+
+const generatedDefinitions = resourceDefinitions as unknown as Record<string, GeneratedDefinition>;
+
+function generatedClient(resource: string) {
+  const definition = generatedDefinitions[resource];
+  if (!definition || definition.surface.generated === false) {
+    throw new Error(`OPENXIANGDA_GENERATED_RESOURCE_NOT_DECLARED:${resource}`);
+  }
+  return createNativeResourceClient(resource, definition.surface);
+}
 
 export const instrumentProvider = {
   getApiUrl: () =>
@@ -40,3 +62,65 @@ export const instrumentProvider = {
     ),
   }),
 } as DataProvider;
+
+const generatedProvider = {
+  getApiUrl: () =>
+    `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
+  getList: async ({ resource, pagination, sorters, meta }) => {
+    const query = (meta?.query || {}) as Partial<GenericResourceQuery>;
+    const sorter = sorters?.[0];
+    const result = await generatedClient(resource).list({
+      ...query,
+      page: pagination?.currentPage || 1,
+      pageSize: pagination?.pageSize || 20,
+      sort: sorter
+        ? { field: String(sorter.field), order: sorter.order || 'asc' }
+        : query.sort,
+    });
+    return { data: result.rows, total: result.total };
+  },
+  getOne: async ({ resource, id }) => ({
+    data: await generatedClient(resource).get(String(id)),
+  }),
+  create: async ({ resource, variables }) => ({
+    data: await generatedClient(resource).create(variables as Record<string, unknown>),
+  }),
+  update: async ({ resource, id, variables, meta }) => ({
+    data: await generatedClient(resource).update(
+      String(id),
+      Number(meta?.expectedRevision),
+      variables as Record<string, unknown>
+    ),
+  }),
+  deleteOne: async ({ resource, id, meta }) => ({
+    data: await generatedClient(resource).remove(
+      String(id),
+      Number(meta?.expectedRevision)
+    ),
+  }),
+} as DataProvider;
+
+/** One Refine provider: golden modules may override a resource, simple resources use generated CRUD. */
+export const applicationProvider = {
+  getApiUrl: instrumentProvider.getApiUrl,
+  getList: (args: Parameters<NonNullable<DataProvider['getList']>>[0]) =>
+    args.resource === 'instruments'
+      ? instrumentProvider.getList!(args)
+      : generatedProvider.getList!(args),
+  getOne: (args: Parameters<NonNullable<DataProvider['getOne']>>[0]) =>
+    args.resource === 'instruments'
+      ? instrumentProvider.getOne!(args)
+      : generatedProvider.getOne!(args),
+  create: (args: Parameters<NonNullable<DataProvider['create']>>[0]) =>
+    args.resource === 'instruments'
+      ? instrumentProvider.create!(args)
+      : generatedProvider.create!(args),
+  update: (args: Parameters<NonNullable<DataProvider['update']>>[0]) =>
+    args.resource === 'instruments'
+      ? instrumentProvider.update!(args)
+      : generatedProvider.update!(args),
+  deleteOne: (args: Parameters<NonNullable<DataProvider['deleteOne']>>[0]) =>
+    args.resource === 'instruments'
+      ? instrumentProvider.deleteOne!(args)
+      : generatedProvider.deleteOne!(args),
+} as DataProvider;

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

@@ -1,78 +1,13 @@
-export type FieldKind =
-  | 'text'
-  | 'textarea'
-  | 'number'
-  | 'date'
-  | 'boolean'
-  | 'select'
-  | 'multi'
-  | 'email'
-  | 'phone'
-  | 'file'
-  | 'scope'
-  | 'directory-user'
-  | 'directory-department';
+import {
+  instrumentFields,
+  instrumentSurface,
+  sectionTitles,
+  type FieldKind,
+  type InstrumentField,
+} from '../../../platform/data/instrument-surface.js';
 
-export interface InstrumentField {
-  key: string;
-  label: string;
-  kind: FieldKind;
-  section: keyof typeof sectionTitles;
-  required?: boolean;
-  system?: boolean;
-  createCapability?: string;
-  updateCapability?: string;
-  multiple?: boolean;
-  maxCount?: number;
-  accept?: string;
-  options?: Array<{ label: string; value: string }>;
-}
-
-const options = (pairs: Array<[string, string]>) =>
-  pairs.map(([label, value]) => ({ label, value }));
-
-export const sectionTitles = {
-  basic: '基本信息',
-  asset: '资产信息',
-  usage: '使用与归属',
-  management: '管理与联系',
-  materials: '地址与资料',
-} as const;
-
-// 30 fields: id/revision are Data API system fields; the remaining 28 are
-// declared by platform/data/instruments.ts.
-export const instrumentFields: InstrumentField[] = [
-  { key: 'id', label: '记录 ID', kind: 'text', section: 'basic', system: true },
-  { key: 'revision', label: '修订版本', kind: 'number', section: 'basic', system: true },
-  { key: 'instrumentCode', label: '仪器编码', kind: 'text', section: 'basic', required: true, createCapability: 'app:instrument-center:instrument:field:instrument-code:create', updateCapability: 'app:instrument-center:instrument:field:instrument-code:update' },
-  { key: 'chineseName', label: '仪器中文名', kind: 'text', section: 'basic', required: true },
-  { key: 'englishName', label: '仪器英文名', kind: 'text', section: 'basic' },
-  { key: 'aliasName', label: '别名', kind: 'text', section: 'basic' },
-  { key: 'image', label: '仪器图片', kind: 'file', section: 'basic', maxCount: 1, accept: 'image/*' },
-  { key: 'specModel', label: '规格型号', kind: 'text', section: 'basic', required: true },
-  { key: 'categoryId', label: '仪器分类', kind: 'select', section: 'basic', required: true, options: options([['显微成像', 'analysis_microscope'], ['光谱分析', 'analysis_spectrum'], ['色谱质谱', 'analysis_ms']]) },
-  { key: 'instrumentSource', label: '仪器来源', kind: 'select', section: 'basic', options: options([['购置', 'purchase'], ['捐赠', 'donation'], ['调拨', 'transfer']]) },
-  { key: 'manufacturer', label: '制造商', kind: 'text', section: 'basic' },
-  { key: 'assetCode', label: '资产编码', kind: 'text', section: 'asset', required: true, createCapability: 'app:instrument-center:instrument:field:asset-code:create', updateCapability: 'app:instrument-center:instrument:field:asset-code:update' },
-  { key: 'assetValue', label: '资产价值（元）', kind: 'number', section: 'asset', createCapability: 'app:instrument-center:instrument:field:asset-value:create', updateCapability: 'app:instrument-center:instrument:field:asset-value:update' },
-  { key: 'enabledDate', label: '启用日期', kind: 'date', section: 'asset', required: true },
-  { key: 'usageStatus', label: '使用状况', kind: 'select', section: 'usage', required: true, options: options([['在用', 'active'], ['闲置', 'idle'], ['借出', 'lent']]) },
-  { key: 'instrumentStatus', label: '仪器状态', kind: 'select', section: 'usage', required: true, options: options([['正常', 'normal'], ['维修', 'maintenance'], ['停用', 'disabled'], ['报废', 'scrapped']]) },
-  { 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: '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']]) },
-  { key: 'address', label: '详细地址', kind: 'textarea', section: 'materials' },
-  { key: 'serviceContent', label: '服务内容与主要功能', kind: 'textarea', section: 'materials' },
-  { key: 'attachments', label: '仪器资料', kind: 'file', section: 'materials', multiple: true, maxCount: 8 },
-];
+export { instrumentFields, instrumentSurface, sectionTitles };
+export type { FieldKind, InstrumentField };
 
 const instrumentResourceFieldCodes = new Set(
   instrumentFields.filter(field => !field.system).map(field => field.key)

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

@@ -38,6 +38,7 @@ export interface InstrumentListQuery {
   page: number;
   pageSize: number;
   keyword?: string;
+  searchField?: string;
   collegeId?: string;
   instrumentAdminId?: string;
   instrumentStatus?: string;