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

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

@@ -1,380 +0,0 @@
-import {
-  App,
-  Button,
-  Card,
-  Descriptions,
-  Form,
-  Tag,
-  Timeline,
-  Typography,
-} from 'antd';
-import dayjs from 'dayjs';
-import { useEffect, useState } from 'react';
-import type { DataAuditEntry } from 'openxiangda-contracts/browser';
-import {
-  AuthoritativeSelector,
-  ResolvedValueText,
-} from './AuthoritativeSelector';
-import {
-  MobileSurfaceFieldControl,
-  SurfaceFieldControl,
-  SurfaceFieldValue,
-  type SurfaceField,
-} from './components/resource/SurfaceFields';
-import { instrumentFields, sectionTitles, type InstrumentField } from './fields';
-import type { InstrumentRecord } from './instrument';
-import { instrumentDataApi } from './platform-client';
-import { useRuntime } from './runtime';
-import { instrumentSurface } from '../../../platform/data/instrument-surface.js';
-
-type Values = Record<string, unknown>;
-const createDefaults = {
-  openToOutside: false,
-  instrumentStatus: 'normal',
-  usageStatus: 'active',
-} as const;
-
-export function instrumentFieldAllowed(
-  field: InstrumentField,
-  mode: 'create' | 'edit',
-  hasCapability: (capability: string) => boolean
-) {
-  const capability =
-    mode === 'create' ? field.createCapability : field.updateCapability;
-  return !capability || hasCapability(capability);
-}
-
-export function sanitizeInstrumentValues(
-  values: Values,
-  mode: 'create' | 'edit',
-  hasCapability: (capability: string) => boolean
-): Values {
-  return Object.fromEntries(
-    instrumentFields
-      .filter(
-        field =>
-          !field.system && instrumentFieldAllowed(field, mode, hasCapability)
-      )
-      .filter(field => Object.prototype.hasOwnProperty.call(values, field.key))
-      .map(field => [field.key, values[field.key]])
-  );
-}
-
-export function InstrumentForm({
-  mode,
-  record,
-  variant = 'desktop',
-  onCancel,
-  onSubmit,
-  auditEntries = [],
-  auditError,
-}: {
-  mode: 'create' | 'edit' | 'detail';
-  record?: InstrumentRecord;
-  variant?: 'desktop' | 'mobile';
-  onCancel: () => void;
-  onSubmit?: (values: Values) => Promise<void>;
-  auditEntries?: DataAuditEntry[];
-  auditError?: string;
-}) {
-  const [form] = Form.useForm();
-  const { message } = App.useApp();
-  const { hasCapability } = useRuntime();
-  const [submitting, setSubmitting] = useState(false);
-  useEffect(() => {
-    if (record) {
-      form.setFieldsValue({
-        ...record,
-        enabledDate: record.enabledDate
-          ? variant === 'mobile'
-            ? record.enabledDate
-            : dayjs(record.enabledDate)
-          : undefined,
-      });
-    }
-  }, [form, record]);
-  if (mode === 'detail' && record) {
-    return (
-      <Detail
-        auditEntries={auditEntries}
-        auditError={auditError}
-        record={record}
-        variant={variant}
-      />
-    );
-  }
-  const isCreate = mode === 'create';
-  const writeMode = isCreate ? 'create' : 'edit';
-  const submit = async (values: Values) => {
-    if (submitting) return;
-    const normalized = {
-      ...(isCreate ? createDefaults : {}),
-      ...values,
-      enabledDate:
-        values.enabledDate &&
-        typeof values.enabledDate === 'object' &&
-        'format' in values.enabledDate
-          ? (values.enabledDate as { format(pattern: string): string }).format(
-              'YYYY-MM-DD'
-            )
-          : values.enabledDate,
-    };
-    setSubmitting(true);
-    try {
-      await onSubmit?.(
-        sanitizeInstrumentValues(normalized, writeMode, hasCapability)
-      );
-    } catch (error) {
-      message.error(error instanceof Error ? error.message : String(error));
-    } finally {
-      setSubmitting(false);
-    }
-  };
-  const groups = Object.entries(sectionTitles).map(([key, title]) => ({
-    key,
-    title,
-    fields: instrumentFields
-      .filter(field => field.section === key && !field.system)
-      .map(field => field.key),
-  }));
-  const FieldControl =
-    variant === 'mobile' ? MobileSurfaceFieldControl : SurfaceFieldControl;
-  return (
-    <Form
-      className={`oxa-instrument-form oxa-form-full${variant === 'mobile' ? ' oxa-mobile-form' : ''}`}
-      form={form}
-      initialValues={isCreate ? createDefaults : undefined}
-      layout="vertical"
-      onFinish={values => void submit(values)}
-      scrollToFirstError={{ block: 'center' }}
-    >
-      <div className="oxa-sections">
-        {groups.map(group => (
-          <Card className="oxa-section-card" key={group.key} title={group.title}>
-            <div className="oxa-grid">
-              {group.fields
-                .map(key => instrumentFields.find(field => field.key === key))
-                .filter((field): field is InstrumentField => Boolean(field))
-                .map(field => (
-                  <SurfaceFieldControl
-                    disabled={
-                      !instrumentFieldAllowed(field, writeMode, hasCapability)
-                    }
-                    field={surfaceField(field.key)}
-                    key={field.key}
-                    operation={isCreate ? 'create' : 'update'}
-                    recordId={record?.id}
-                    renderers={{
-                      renderExtra: context =>
-                        context.disabled
-                          ? '当前角色不可修改此字段'
-                          : context.field.widget === 'scope'
-                            ? '仅显示当前角色可管理的学院'
-                            : context.field.key === 'instrumentAdminIds'
-                              ? '管理员选择结果将参与仪器数据权限判断'
-                              : undefined,
-                      renderScope: context => (
-                        <AuthoritativeSelector
-                          disabled={context.disabled}
-                          operation={context.operation}
-                          placeholder={`请选择${context.field.label}`}
-                          source="college"
-                        />
-                      ),
-                      upload: (field, file, recordId) =>
-                        instrumentDataApi.upload(
-                          field.key as 'image' | 'attachments',
-                          file,
-                          recordId
-                        ),
-                    }}
-                  />
-                ))}
-            </div>
-          </Card>
-        ))}
-      </div>
-      <div className="oxa-actions">
-        <Button disabled={submitting} onClick={onCancel}>
-          取消
-        </Button>
-        <Button
-          data-testid="save-instrument"
-          htmlType="submit"
-          loading={submitting}
-          type="primary"
-        >
-          {isCreate ? '保存' : '保存修改'}
-        </Button>
-      </div>
-    </Form>
-  );
-}
-
-function Detail({
-  record,
-  auditEntries,
-  auditError,
-  variant = 'desktop',
-}: {
-  record: InstrumentRecord;
-  auditEntries: DataAuditEntry[];
-  auditError?: string;
-  variant?: 'desktop' | 'mobile';
-}) {
-  const groups = Object.entries(sectionTitles)
-    .map(([section, title]) => ({
-      section,
-      title,
-      fields: instrumentFields.filter(
-        field =>
-          field.section === section &&
-          !field.system &&
-          Object.prototype.hasOwnProperty.call(record, field.key)
-      ),
-    }))
-    .filter(group => group.fields.length > 0);
-  return (
-    <div className={`oxa-detail-layout${variant === 'mobile' ? ' oxa-mobile-detail' : ''}`}>
-      <div className="oxa-detail-main">
-        {groups.map(group => (
-          <Card className="oxa-section-card" key={group.section} title={group.title}>
-            <Descriptions
-              column={{ xs: 1, sm: 2, lg: 3 }}
-              items={group.fields.map(field => ({
-                key: field.key,
-                label: field.label,
-                span:
-                  surfaceField(field.key).widget === 'textarea' ||
-                  surfaceField(field.key).widget === 'file'
-                    ? 3
-                    : 1,
-                children: (
-                  <SurfaceFieldValue
-                    field={surfaceField(field.key)}
-                    renderers={{
-                      renderValue: ({ field: surface, value }) => {
-                        if (surface.widget === 'scope') {
-                          return (
-                            <ResolvedValueText
-                              source="college"
-                              value={String(value)}
-                            />
-                          );
-                        }
-                        if (
-                          surface.key === 'instrumentStatus' ||
-                          surface.key === 'usageStatus'
-                        ) {
-                          const label =
-                            surface.options?.find(
-                              option => option.value === value
-                            )?.label || String(value);
-                          return (
-                            <Tag
-                              color={
-                                value === 'normal' || value === 'active'
-                                  ? 'green'
-                                  : 'default'
-                              }
-                            >
-                              {label}
-                            </Tag>
-                          );
-                        }
-                        return undefined;
-                      },
-                    }}
-                    value={record[field.key]}
-                  />
-                ),
-              }))}
-            />
-          </Card>
-        ))}
-      </div>
-      <aside className="oxa-detail-aside">
-        <Card className="oxa-section-card" title="记录信息">
-          <Descriptions
-            column={1}
-            items={[
-              { key: 'revision', label: '数据版本', children: record.revision },
-              {
-                key: 'updatedAt',
-                label: '更新时间',
-                children: formatDateTime(record.updated_at),
-              },
-              {
-                key: 'status',
-                label: '仪器状态',
-                children: (
-                  <SurfaceFieldValue
-                    field={surfaceField('instrumentStatus')}
-                    renderers={{
-                      renderValue: ({ field, value }) => {
-                        const label =
-                          field.options?.find(
-                            option => option.value === value
-                          )?.label || String(value);
-                        return (
-                          <Tag
-                            color={
-                              value === 'normal' || value === 'active'
-                                ? 'green'
-                                : 'default'
-                            }
-                          >
-                            {label}
-                          </Tag>
-                        );
-                      },
-                    }}
-                    value={record.instrumentStatus}
-                  />
-                ),
-              },
-            ]}
-          />
-        </Card>
-        <Card className="oxa-section-card" id="instrument-audit" title="最近变更">
-          {auditError ? (
-            <Typography.Text type="secondary">审计记录暂不可用</Typography.Text>
-          ) : auditEntries.length ? (
-            <Timeline
-              items={auditEntries.slice(0, 5).map(entry => ({
-                children: (
-                  <div className="oxa-audit-entry">
-                    <strong>{auditLabel(entry.operation)}</strong>
-                    <span>{formatDateTime(entry.occurredAt)}</span>
-                    {entry.actor.userId && (
-                      <ResolvedValueText source="user" value={entry.actor.userId} />
-                    )}
-                  </div>
-                ),
-              }))}
-            />
-          ) : (
-            <Typography.Text type="secondary">暂无变更记录</Typography.Text>
-          )}
-        </Card>
-      </aside>
-    </div>
-  );
-}
-
-function surfaceField(key: string): SurfaceField {
-  const field = instrumentSurface.fields[key];
-  return field ? { key, ...field } : { key, label: key, widget: 'text' };
-}
-
-function auditLabel(operation: DataAuditEntry['operation']) {
-  return {
-    created: '创建仪器档案',
-    updated: '更新仪器信息',
-    deleted: '删除仪器档案',
-  }[operation];
-}
-
-function formatDateTime(value?: string) {
-  return value ? new Date(value).toLocaleString('zh-CN', { hour12: false }) : '-';
-}

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

@@ -1,82 +0,0 @@
-import { useCreate, useOne, useUpdate } from '@refinedev/core';
-import { App } from 'antd';
-import { useNavigate, useParams } from 'react-router-dom';
-import {
-  MobileResourceFormPage,
-  ResourceFormPage,
-} from './components/resource/StandardResourcePages';
-import { InstrumentForm } from './InstrumentForm';
-import { INSTRUMENT_CAPABILITIES, type InstrumentRecord } from './instrument';
-import { instrumentSurface } from '../../../platform/data/instrument-surface.js';
-
-export function InstrumentFormPage({
-  mode,
-  variant = 'desktop',
-}: {
-  mode: 'create' | 'edit';
-  variant?: 'desktop' | 'mobile';
-}) {
-  const { id = '' } = useParams();
-  const navigate = useNavigate();
-  const { message } = App.useApp();
-  const create = useCreate();
-  const update = useUpdate();
-  const query = useOne<InstrumentRecord>({
-    resource: 'instruments',
-    id,
-    queryOptions: { enabled: mode === 'edit' },
-  });
-  const record = query.result;
-  const Page = variant === 'mobile' ? MobileResourceFormPage : ResourceFormPage;
-  const listPath = variant === 'mobile' ? '/m/instruments' : '/instruments';
-  const detailPath = variant === 'mobile' ? `/m/instruments/${id}` : `/instruments/${id}`;
-  return (
-    <Page
-      backLabel={mode === 'edit' ? '返回仪器详情' : '返回仪器资源'}
-      backPath={mode === 'edit' ? detailPath : listPath}
-      capability={
-        mode === 'create'
-          ? INSTRUMENT_CAPABILITIES.create
-          : INSTRUMENT_CAPABILITIES.update
-      }
-      detailPath={record ? detailPath : undefined}
-      loading={mode === 'edit' && query.query.isLoading}
-      mode={mode}
-      notFound={mode === 'edit' && !record}
-      recordSummary={
-        record && `${record.chineseName} · ${record.instrumentCode} · 当前版本 ${record.revision}`
-      }
-      resource="instruments"
-      surface={instrumentSurface}
-      title="仪器"
-    >
-      <InstrumentForm
-        mode={mode}
-        variant={variant}
-        onCancel={() =>
-          navigate(mode === 'edit' ? detailPath : listPath)
-        }
-        onSubmit={async values => {
-          if (mode === 'create') {
-            await create.mutateAsync({
-              resource: 'instruments',
-              values,
-            });
-            message.success('仪器已创建');
-            navigate(listPath);
-          } else {
-            const result = await update.mutateAsync({
-              resource: 'instruments',
-              id,
-              values,
-              meta: { expectedRevision: record!.revision },
-            });
-            message.success('修改已保存');
-            navigate(variant === 'mobile' ? `/m/instruments/${result.data.id}` : `/instruments/${result.data.id}`);
-          }
-        }}
-        record={record}
-      />
-    </Page>
-  );
-}