@arronqzy/vue-blueprint 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arronqzy/vue-blueprint",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Vue 3 blueprint editor for Abuilder (Vue Flow + Ant Design Vue)",
   "license": "MIT",
   "type": "module",
@@ -20,8 +20,8 @@
     "dayjs": "^1.11.13",
     "vue": "^3.5.13",
     "@arronqzy/blueprint-dsl": "1.0.17",
-    "@arronqzy/i18n": "0.1.17",
-    "@arronqzy/vue-rx-store": "0.1.6"
+    "@arronqzy/vue-rx-store": "0.1.6",
+    "@arronqzy/i18n": "0.1.17"
   },
   "peerDependencies": {
     "vue": "^3.4.0"

package/src/components/ApiCollectionManagerDialog.vue

@@ -244,6 +244,7 @@ async function handleFiles(files: FileList | null) {
     :title="t('blueprint.apiCollection.managerTitle')"
     :footer="null"
     width="960px"
+    :mask-style="{ background: 'transparent' }"
     :body-style="{ maxHeight: '90vh', display: 'flex', flexDirection: 'column' }"
     @update:open="onOpenChange"
   >
@@ -350,47 +351,48 @@ async function handleFiles(files: FileList | null) {
         : t('blueprint.apiCollection.createTitle')
     "
     :footer="null"
-    width="1100px"
+    width="620px"
     :style="{ top: '4vh' }"
+    :mask-style="{ background: 'transparent' }"
+    destroy-on-close
     @update:open="(v) => (editorOpen = v)"
   >
-    <p class="mb-3 text-xs text-muted-foreground">
+    <p class="mb-2 text-xs text-muted-foreground">
       {{ t("blueprint.apiCollection.editorDescription") }}
     </p>
 
-    <div class="space-y-2">
-      <div class="flex items-center justify-between gap-2">
-        <span class="text-xs">{{ t("blueprint.apiCollection.jsonEditor") }}</span>
-        <label class="flex cursor-pointer items-center gap-2 text-[11px] text-muted-foreground">
-          <Checkbox v-model:checked="editorPersistLocal" />
-          {{ t("blueprint.apiCollection.persistLocal") }}
-        </label>
-      </div>
-      <Input.TextArea
-        v-model:value="editorJson"
-        :rows="28"
-        :spellcheck="false"
-        class="!min-h-[62vh] font-mono text-[12px] leading-relaxed"
-        :status="editorError ? 'error' : undefined"
-      />
-      <p v-if="editorError" class="text-[11px] text-destructive">{{ editorError }}</p>
-    </div>
-
-    <div class="mt-4 flex flex-wrap justify-end gap-2">
-      <Button @click="downloadApiCollectionTemplate()">
+    <div class="mb-2 flex flex-wrap items-center gap-1.5 border-b border-border/60 pb-2">
+      <Button size="small" @click="downloadApiCollectionTemplate()">
         {{ t("blueprint.apiCollection.downloadTemplate") }}
       </Button>
       <Button
+        size="small"
         :disabled="busy || !onSyncCollection"
         :title="t('blueprint.apiCollection.syncHint')"
         @click="void handleSyncFromEditor()"
       >
         {{ t("blueprint.apiCollection.sync") }}
       </Button>
-      <Button @click="editorOpen = false">{{ t("common.cancel") }}</Button>
-      <Button type="primary" :disabled="busy" @click="void handleSaveEditor()">
+      <Button size="small" @click="editorOpen = false">{{ t("common.cancel") }}</Button>
+      <Button size="small" type="primary" :disabled="busy" @click="void handleSaveEditor()">
         {{ t("common.save") }}
       </Button>
+      <label class="ml-auto flex cursor-pointer items-center gap-1.5 text-[11px] text-muted-foreground">
+        <Checkbox v-model:checked="editorPersistLocal" />
+        {{ t("blueprint.apiCollection.persistLocal") }}
+      </label>
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <span class="text-xs">{{ t("blueprint.apiCollection.jsonEditor") }}</span>
+      <Input.TextArea
+        v-model:value="editorJson"
+        :rows="16"
+        :spellcheck="false"
+        class="!h-[min(68vh,640px)] !min-h-[320px] font-mono text-[12px] leading-relaxed"
+        :status="editorError ? 'error' : undefined"
+      />
+      <p v-if="editorError" class="text-[11px] text-destructive">{{ editorError }}</p>
     </div>
   </Modal>
 </template>

package/src/index.ts

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

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,