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

package/dist/create-workspace.d.ts

@@ -24,5 +24,6 @@ export declare function prepareWorkspace(directory: string, options?: PrepareWor
     output: string;
     changed: boolean;
     contractDigest: string;
+    aiCatalogDigest: string;
 } | undefined>;
 //# sourceMappingURL=create-workspace.d.ts.map

package/dist/create-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,sBAAsB,GAAG,SAAS,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB;;;;;;;;GAkDhE;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,uBAA4B;;;;eAoBtC"}
+{"version":3,"file":"create-workspace.d.ts","sourceRoot":"","sources":["../src/create-workspace.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,sBAAsB,GAAG,SAAS,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,sBAAsB,CAAC;CACxC;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB;;;;;;;;GAkDhE;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,uBAA4B;;;;;eAoBtC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.59",
+  "version": "2.0.0-alpha.61",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
   ],
   "dependencies": {
     "@oclif/core": "4.13.3",
-    "openxiangda-contracts": "2.0.0-alpha.28",
-    "openxiangda-devkit-core": "2.0.0-alpha.35",
-    "openxiangda-mcp": "2.0.0-alpha.35"
+    "openxiangda-contracts": "2.0.0-alpha.29",
+    "openxiangda-devkit-core": "2.0.0-alpha.37",
+    "openxiangda-mcp": "2.0.0-alpha.37"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/apps/server/package.json

@@ -15,7 +15,7 @@
     "@nestjs/common": "11.1.29",
     "@nestjs/core": "11.1.29",
     "@nestjs/platform-fastify": "11.1.29",
-    "openxiangda-nest": "2.0.0-alpha.33",
+    "openxiangda-nest": "2.0.0-alpha.35",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

package/template/apps/web/e2e/instruments.spec.ts

@@ -441,7 +441,7 @@ test('continues create, list, detail, update, and delete with declared query fie
       .locator('.ant-table-column-sorter')
   ).toHaveCount(0);
   const queriesBeforeSort = queryBodies.length;
-  await page.getByRole('columnheader', { name: /仪器名称/ }).click();
+  await page.getByRole('columnheader', { name: /仪器中文名/ }).click();
   await expect.poll(() => queryBodies.length).toBeGreaterThan(queriesBeforeSort);
   expect(
     (queryBodies.at(-1) as { order: Array<{ field: string; direction: string }> })

package/template/apps/web/package.json

@@ -16,7 +16,7 @@
     "antd": "6.4.3",
     "dayjs": "1.11.18",
     "docx-preview": "0.3.7",
-    "openxiangda-contracts": "2.0.0-alpha.28",
+    "openxiangda-contracts": "2.0.0-alpha.29",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2",

package/template/apps/web/scripts/check.mjs

@@ -19,8 +19,11 @@ const lines = files.reduce(
   (total, file) => total + readFileSync(file, 'utf8').split(/\r?\n/).length,
   0
 );
-if (files.length > 18) throw new Error(`WEB_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>18`);
-if (lines > 4_300) throw new Error(`WEB_BUSINESS_LOC_BUDGET_EXCEEDED:${lines}>4300`);
+// The shared Surface renderer is deliberately counted as application source;
+// keep its small budget explicit instead of hiding it in generated output.
+if (files.length > 20) throw new Error(`WEB_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>20`);
+// Mobile shells, Surface filters, and generated resource CRUD are shared application infrastructure.
+if (lines > 5_600) throw new Error(`WEB_BUSINESS_LOC_BUDGET_EXCEEDED:${lines}>5600`);
 const source = files.map(file => readFileSync(file, 'utf8')).join('\n');
 for (const marker of ['@umijs/', 'openxiangda-' + 'admin', 'openxiangda-' + 'user', 'instrument_query', 'instrument_save', 'function.invoke', 'role' + '-session', 'college-' + 'am', 'user-' + 'wang', 'dept-' + 'am-test']) {
   if (source.includes(marker)) throw new Error(`WEB_FORBIDDEN_MARKER:${marker}`);

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

@@ -1,23 +1,24 @@
-import {
-  ArrowLeftOutlined,
-  EditOutlined,
-  HistoryOutlined,
-} from '@ant-design/icons';
-import { Button, Card, Result, Space, Spin, Tag, Typography } from 'antd';
+import { Space, Tag, Typography } from 'antd';
 import { useEffect, useState } from 'react';
 import type { DataAuditEntry } from 'openxiangda-contracts/browser';
 import { useNavigate, useParams } from 'react-router-dom';
+import { useOne } from '@refinedev/core';
+import {
+  MobileResourceDetailPage,
+  ResourceDetailPage,
+} from './components/resource/StandardResourcePages';
 import { InstrumentForm } from './InstrumentForm';
-import { Shell } from './Shell';
 import { INSTRUMENT_CAPABILITIES, type InstrumentRecord } from './instrument';
+import { instrumentSurface } from '../../../platform/data/instrument-surface.js';
 import { instrumentDataApi } from './platform-client';
-import { useRuntime } from './runtime';
-import { useOne } from '@refinedev/core';
 
-export function InstrumentDetailPage() {
+export function InstrumentDetailPage({ variant = 'desktop' }: { variant?: 'desktop' | 'mobile' }) {
+  return variant === 'mobile' ? <MobileInstrumentDetailPage /> : <DesktopInstrumentDetailPage />;
+}
+
+function DesktopInstrumentDetailPage() {
   const { id = '' } = useParams();
   const navigate = useNavigate();
-  const { hasCapability } = useRuntime();
   const [auditEntries, setAuditEntries] = useState<DataAuditEntry[]>([]);
   const [auditError, setAuditError] = useState('');
   const query = useOne<InstrumentRecord>({
@@ -43,61 +44,19 @@ export function InstrumentDetailPage() {
       active = false;
     };
   }, [record?.id, record?.revision]);
-  if (query.query.isLoading) {
-    return (
-      <Shell>
-        <div className="oxa-page-loading">
-          <Spin />
-        </div>
-      </Shell>
-    );
-  }
-  if (query.query.isError || !record) {
-    return (
-      <Shell>
-        <Result
-          status="403"
-          subTitle={query.query.error?.message || '记录不存在'}
-          title="无法访问"
-        />
-      </Shell>
-    );
-  }
   return (
-    <Shell>
-      <Card className="oxa-detail-hero">
-        <div className="oxa-detail-hero-top">
-          <Button
-            aria-label="返回列表"
-            icon={<ArrowLeftOutlined />}
-            onClick={() => navigate('/instruments')}
-            type="link"
-          >
-            返回仪器资源
-          </Button>
-          <Space>
-            <Button
-              icon={<HistoryOutlined />}
-              onClick={() =>
-                document
-                  .getElementById('instrument-audit')
-                  ?.scrollIntoView({ behavior: 'smooth', block: 'center' })
-              }
-            >
-              操作记录
-            </Button>
-            {hasCapability(INSTRUMENT_CAPABILITIES.update) && (
-              <Button
-                icon={<EditOutlined />}
-                onClick={() => navigate(`/instruments/${id}/edit`)}
-                type="primary"
-              >
-                编辑
-              </Button>
-            )}
-          </Space>
-        </div>
-        <div className="oxa-detail-hero-main">
+    <ResourceDetailPage
+      backLabel="返回仪器资源"
+      backPath="/instruments"
+      editCapability={INSTRUMENT_CAPABILITIES.update}
+      editPath={`/instruments/${id}/edit`}
+      error={
+        query.query.isError || (!query.query.isLoading && !record)
+          ? query.query.error?.message || '记录不存在'
+          : undefined
+      }
+      hero={
+        record ? (
           <div>
             <Space align="center" size={10}>
               <Typography.Title level={2}>仪器详情</Typography.Title>
@@ -112,20 +71,103 @@ export function InstrumentDetailPage() {
               {record.instrumentCode} · {record.specModel}
             </Typography.Text>
           </div>
-          <Space className="oxa-record-meta" separator={<span>·</span>}>
+        ) : null
+      }
+      loading={query.query.isLoading}
+      meta={
+        record ? (
+          <>
             <span>最近更新 {formatDateTime(record.updated_at)}</span>
             <span>版本 {record.revision}</span>
-          </Space>
-        </div>
-      </Card>
-      <InstrumentForm
-        auditEntries={auditEntries}
-        auditError={auditError}
-        mode="detail"
-        onCancel={() => navigate('/instruments')}
-        record={record}
-      />
-    </Shell>
+          </>
+        ) : null
+      }
+      readCapability={INSTRUMENT_CAPABILITIES.read}
+      resource="instruments"
+      surface={instrumentSurface}
+      title="仪器"
+      auditTargetId="instrument-audit"
+    >
+      {record && (
+        <InstrumentForm
+          auditEntries={auditEntries}
+          auditError={auditError}
+          mode="detail"
+          onCancel={() => navigate('/instruments')}
+          record={record}
+        />
+      )}
+    </ResourceDetailPage>
+  );
+}
+
+function MobileInstrumentDetailPage() {
+  const { id = '' } = useParams();
+  const navigate = useNavigate();
+  const [auditEntries, setAuditEntries] = useState<DataAuditEntry[]>([]);
+  const [auditError, setAuditError] = useState('');
+  const query = useOne<InstrumentRecord>({
+    resource: 'instruments',
+    id,
+    queryOptions: { retry: false },
+  });
+  const record = query.result;
+  useEffect(() => {
+    if (!record?.id) return;
+    let active = true;
+    setAuditError('');
+    void instrumentDataApi.audit(record.id).then(
+      page => {
+        if (active) setAuditEntries(page.items || []);
+      },
+      error => {
+        if (active) setAuditError(error instanceof Error ? error.message : String(error));
+      }
+    );
+    return () => {
+      active = false;
+    };
+  }, [record?.id, record?.revision]);
+  return (
+    <MobileResourceDetailPage
+      backLabel="返回仪器资源"
+      backPath="/m/instruments"
+      editCapability={INSTRUMENT_CAPABILITIES.update}
+      editPath={`/m/instruments/${id}/edit`}
+      error={query.query.isError || (!query.query.isLoading && !record) ? query.query.error?.message || '记录不存在' : undefined}
+      hero={
+        record ? (
+          <div>
+            <Space align="center" size={8}>
+              <Typography.Title level={3}>仪器详情</Typography.Title>
+              <Tag color={record.instrumentStatus === 'normal' ? 'green' : 'default'}>
+                {record.instrumentStatus === 'normal' ? '启用' : '非正常'}
+              </Tag>
+            </Space>
+            <Typography.Title className="oxa-instrument-name" level={4}>{record.chineseName}</Typography.Title>
+            <Typography.Text type="secondary">{record.instrumentCode} · {record.specModel}</Typography.Text>
+          </div>
+        ) : null
+      }
+      loading={query.query.isLoading}
+      meta={record ? <><span>最近更新 {formatDateTime(record.updated_at)}</span><span>版本 {record.revision}</span></> : null}
+      readCapability={INSTRUMENT_CAPABILITIES.read}
+      resource="instruments"
+      surface={instrumentSurface}
+      title="仪器"
+      auditTargetId="instrument-audit"
+    >
+      {record && (
+        <InstrumentForm
+          auditEntries={auditEntries}
+          auditError={auditError}
+          mode="detail"
+          onCancel={() => navigate('/m/instruments')}
+          record={record}
+          variant="mobile"
+        />
+      )}
+    </MobileResourceDetailPage>
   );
 }