@arronqzy/react-blueprint 1.0.23 → 1.0.25

package/index.ts

@@ -56,6 +56,7 @@ export {
   getApiCollectionById,
   getApiCollectionListItems,
   upsertApiCollectionFromJson,
+  putApiCollection,
   removeApiCollection,
   deleteApiCollection,
   clearApiCollections,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arronqzy/react-blueprint",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "",
   "files": [
     "index.ts",
@@ -18,10 +18,10 @@
     "dayjs": "^1.11.13",
     "react-dom": "^19",
     "@xyflow/react": "^12.9.3",
-    "@arronqzy/blueprint-dsl": "1.0.17",
     "@arronqzy/i18n": "0.1.17",
-    "@arronqzy/react-rx-store": "1.1.8",
-    "@arronqzy/ui": "1.0.10"
+    "@arronqzy/blueprint-dsl": "1.0.17",
+    "@arronqzy/ui": "1.0.11",
+    "@arronqzy/react-rx-store": "1.1.8"
   },
   "devDependencies": {
     "@types/react": "^19.0.1",
@@ -35,8 +35,8 @@
     "typescript": "^5.5.4",
     "vite": "^5.1.4",
     "@arronqzy/tailwind": "1.0.2",
-    "@arronqzy/eslint-config": "0.0.0",
-    "@arronqzy/typescript-config": "1.0.0"
+    "@arronqzy/typescript-config": "1.0.0",
+    "@arronqzy/eslint-config": "0.0.0"
   },
   "keywords": [],
   "author": "",

package/src/components/ApiCollectionManagerDialog.tsx

@@ -241,7 +241,10 @@ export function ApiCollectionManagerDialog({
   return (
     <>
       <Dialog open={open} onOpenChange={onOpenChange}>
-        <DialogContent className="flex max-h-[90vh] w-[min(96vw,960px)] flex-col sm:max-w-[960px]">
+        <DialogContent
+          overlayClassName="bg-transparent"
+          className="flex max-h-[90vh] w-[min(96vw,960px)] flex-col sm:max-w-[960px]"
+        >
           <DialogHeader>
             <DialogTitle>{t("blueprint.apiCollection.managerTitle")}</DialogTitle>
             <DialogDescription>
@@ -376,8 +379,12 @@ export function ApiCollectionManagerDialog({
       </Dialog>
 
       <Dialog open={editorOpen} onOpenChange={setEditorOpen}>
-        <DialogContent className="flex max-h-[90vh] w-[min(96vw,1100px)] flex-col sm:max-w-[1100px]">
-          <DialogHeader>
+        <DialogContent
+          overlayClassName="bg-transparent"
+          className="flex w-[min(92vw,620px)] flex-col gap-3 overflow-hidden sm:max-w-[620px]"
+          resizable={false}
+        >
+          <DialogHeader className="shrink-0 space-y-1">
             <DialogTitle>
               {editingId
                 ? t("blueprint.apiCollection.editTitle")
@@ -388,59 +395,71 @@ export function ApiCollectionManagerDialog({
             </DialogDescription>
           </DialogHeader>
 
-          <div className="space-y-2">
-            <div className="flex items-center justify-between gap-2">
-              <Label className="text-xs">
-                {t("blueprint.apiCollection.jsonEditor")}
-              </Label>
-              <label className="flex cursor-pointer items-center gap-2 text-[11px] text-muted-foreground">
-                <input
-                  type="checkbox"
-                  className="h-3.5 w-3.5 rounded border border-input"
-                  checked={editorPersistLocal}
-                  onChange={(e) => setEditorPersistLocal(e.target.checked)}
-                />
-                {t("blueprint.apiCollection.persistLocal")}
-              </label>
-            </div>
-            <Textarea
-              value={editorJson}
-              onChange={(e) => setEditorJson(e.target.value)}
-              className={cn(
-                "min-h-[min(62vh,640px)] flex-1 font-mono text-[12px] leading-relaxed",
-                editorError && "border-destructive"
-              )}
-              spellCheck={false}
-            />
-            {editorError ? (
-              <p className="text-[11px] text-destructive">{editorError}</p>
-            ) : null}
-          </div>
-
-          <DialogFooter>
+          <div className="flex shrink-0 flex-wrap items-center gap-1.5 border-b border-border/60 pb-2">
             <Button
               type="button"
+              size="sm"
               variant="outline"
+              className="h-7 px-2 text-[11px]"
               onClick={() => downloadApiCollectionTemplate()}
             >
               {t("blueprint.apiCollection.downloadTemplate")}
             </Button>
             <Button
               type="button"
+              size="sm"
               variant="outline"
+              className="h-7 px-2 text-[11px]"
               disabled={busy || !onSyncCollection}
               title={t("blueprint.apiCollection.syncHint")}
               onClick={() => void handleSyncFromEditor()}
             >
               {t("blueprint.apiCollection.sync")}
             </Button>
-            <Button type="button" variant="outline" onClick={() => setEditorOpen(false)}>
+            <Button
+              type="button"
+              size="sm"
+              variant="outline"
+              className="h-7 px-2 text-[11px]"
+              onClick={() => setEditorOpen(false)}
+            >
               {t("common.cancel")}
             </Button>
-            <Button type="button" disabled={busy} onClick={() => void handleSaveEditor()}>
+            <Button
+              type="button"
+              size="sm"
+              className="h-7 px-2.5 text-[11px]"
+              disabled={busy}
+              onClick={() => void handleSaveEditor()}
+            >
               {t("common.save")}
             </Button>
-          </DialogFooter>
+            <label className="ml-auto flex cursor-pointer items-center gap-1.5 text-[11px] text-muted-foreground">
+              <input
+                type="checkbox"
+                className="h-3.5 w-3.5 rounded border border-input"
+                checked={editorPersistLocal}
+                onChange={(e) => setEditorPersistLocal(e.target.checked)}
+              />
+              {t("blueprint.apiCollection.persistLocal")}
+            </label>
+          </div>
+
+          <div className="flex flex-col gap-2">
+            <Label className="text-xs">{t("blueprint.apiCollection.jsonEditor")}</Label>
+            <Textarea
+              value={editorJson}
+              onChange={(e) => setEditorJson(e.target.value)}
+              className={cn(
+                "h-[min(68vh,640px)] min-h-[320px] w-full resize-y overflow-auto font-mono text-[12px] leading-relaxed",
+                editorError && "border-destructive"
+              )}
+              spellCheck={false}
+            />
+            {editorError ? (
+              <p className="text-[11px] text-destructive">{editorError}</p>
+            ) : null}
+          </div>
         </DialogContent>
       </Dialog>
     </>

package/src/library/api-collection-store.ts

@@ -70,18 +70,48 @@ export type UpsertApiCollectionInput = {
   persistLocal: boolean;
   /** 未写 document.name 时用文件名 */
   fallbackName?: string;
+  /** 省略时写入当前已 hydrate 的 nameSpace */
+  nameSpace?: string | null;
 };
 
 export type UpsertApiCollectionResult =
   | { ok: true; record: ApiCollectionRecord }
   | { ok: false; error: string };
 
+function isCurrentNameSpace(nameSpace?: string | null): boolean {
+  return normalizeAppNameSpace(nameSpace) === normalizeAppNameSpace(nameSpaceRef);
+}
+
+/** 写入接口集合；persistLocal 时落 IndexedDB，同一 nameSpace 下刷新内存列表 */
+export async function putApiCollection(
+  record: ApiCollectionRecord,
+  nameSpace?: string | null
+): Promise<ApiCollectionRecord> {
+  if (record.persistLocal) {
+    await putApiCollectionRecord(record, nameSpace);
+  } else if (isCurrentNameSpace(nameSpace)) {
+    const existing = records.find((item) => item.id === record.id);
+    if (existing?.persistLocal) {
+      await deleteApiCollectionRecord(record.id, nameSpace);
+    }
+  }
+  if (isCurrentNameSpace(nameSpace)) {
+    const next = records.filter((item) => item.id !== record.id);
+    next.push(record);
+    records = sortRecords(next);
+    emit();
+  }
+  return record;
+}
+
 export async function upsertApiCollectionFromJson(
   input: UpsertApiCollectionInput
 ): Promise<UpsertApiCollectionResult> {
   const parsed = parseApiCollectionJson(input.rawJson);
   if (!parsed.ok) return parsed;
 
+  const targetNameSpace =
+    input.nameSpace !== undefined ? input.nameSpace : nameSpaceRef;
   const document: ApiCollectionDocument = {
     ...parsed.document,
     name:
@@ -90,11 +120,18 @@ export async function upsertApiCollectionFromJson(
       parsed.document.name,
   };
   const now = Date.now();
-  const existing = input.id
+  const existingInMemory = input.id
     ? records.find((item) => item.id === input.id) ?? null
     : null;
+  const existingPersisted =
+    input.id && !isCurrentNameSpace(targetNameSpace)
+      ? await listApiCollectionRecords(targetNameSpace).then(
+          (list) => list.find((item) => item.id === input.id) ?? null
+        )
+      : null;
+  const existing = existingInMemory ?? existingPersisted;
   const record: ApiCollectionRecord = {
-    id: existing?.id ?? createApiCollectionId(),
+    id: existing?.id ?? input.id ?? createApiCollectionId(),
     name: document.name,
     persistLocal: input.persistLocal,
     document,
@@ -103,16 +140,7 @@ export async function upsertApiCollectionFromJson(
     updatedAt: now,
   };
 
-  if (record.persistLocal) {
-    await putApiCollectionRecord(record, nameSpaceRef);
-  } else if (existing?.persistLocal) {
-    await deleteApiCollectionRecord(record.id, nameSpaceRef);
-  }
-
-  const next = records.filter((item) => item.id !== record.id);
-  next.push(record);
-  records = sortRecords(next);
-  emit();
+  await putApiCollection(record, targetNameSpace);
   return { ok: true, record };
 }
 
@@ -129,10 +157,6 @@ export async function removeApiCollection(id: string): Promise<void> {
   emit();
 }
 
-function isCurrentNameSpace(nameSpace?: string | null): boolean {
-  return normalizeAppNameSpace(nameSpace) === normalizeAppNameSpace(nameSpaceRef);
-}
-
 /** 按 nameSpace 删除接口集合；若该 nameSpace 正在被编辑器使用，内存列表同步移除 */
 export async function deleteApiCollection(
   id: string,