发布 v0.7.3

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)（版本段不记日期），版本号遵循语义化版本。
 
+## [0.7.3]
+
+### Added
+
+- 实例规格表单配额判定改为数据驱动（shape `quotaNames` × compute limits，按行 scope 区分 AD / 区域限额），删除硬编码映射，覆盖全部带配额名的 shape；选定可用域后 Shape 选项按该 AD 配额禁用并标注「该 AD 无配额」，选定 Shape 后可用域选项禁用 / 标注无配额 AD
+- 创建实例可用域留空且默认 AD-1 对所选 shape 无配额时，自动落位首个有配额的可用域（字段可见可改；抢机表单保持留空 = 轮询语义）
+
+### Changed
+
+- 创建实例默认规格 4 OCPU / 24 GB → 2 OCPU / 12 GB（创建与抢机共用表单）
+- 实例表单（创建 / 调整规格 / 抢机）去除「免费额度」「永久免费」标注与「容量不足可改用抢机任务」「A1 免费额度上限」等提示；免费 shape 仍置顶排序
+- 回传日志表格移除最大高度限制，行为与系统日志 / AI 调用一致；页脚与通知设置说明同步「创建不回传，避免抢机噪声」
+- 创建实例失败 / 部分成功提示改为「短标题 + 展开详情」形态，逐台错误进详情块、可复制
+
+### Fixed
+
+- 修复批量接口全部失败（HTTP 500 + `errors` 数组）时提示只显示「请求失败（500）」：统一请求层现解析 `errors` 数组，展示具体失败原因
+
 ## [0.7.2]
 
 ### Added

src/api/mock.ts

@@ -509,6 +509,7 @@ export const mockRegionSubs: RegionSubscription[] = [
 ]
 
 export const mockLimits: LimitItem[] = [
+  // A1:三个 AD 均有配额 + 区域总额(镜像真实免费租户形态)
   {
     name: 'standard-a1-core-count',
     scopeType: 'AD',
@@ -517,6 +518,19 @@ export const mockLimits: LimitItem[] = [
     used: 4,
     available: 0,
   },
+  {
+    name: 'standard-a1-core-count',
+    scopeType: 'AD',
+    availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-2',
+    value: 4,
+  },
+  {
+    name: 'standard-a1-core-count',
+    scopeType: 'AD',
+    availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-3',
+    value: 4,
+  },
+  { name: 'standard-a1-core-regional-count', scopeType: 'REGION', value: 4 },
   {
     name: 'standard-a1-memory-count',
     scopeType: 'AD',
@@ -525,14 +539,27 @@ export const mockLimits: LimitItem[] = [
     used: 24,
     available: 0,
   },
+  // Micro:仅 AD-2 有配额(AD 受限 shape,驱动创建表单自动落位)
   {
     name: 'standard-e2-micro-core-count',
     scopeType: 'AD',
     availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-1',
+    value: 0,
+  },
+  {
+    name: 'standard-e2-micro-core-count',
+    scopeType: 'AD',
+    availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-2',
     value: 2,
     used: 1,
     available: 1,
   },
+  {
+    name: 'standard-e2-micro-core-count',
+    scopeType: 'AD',
+    availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-3',
+    value: 0,
+  },
   {
     name: 'standard-e4-core-count',
     scopeType: 'AD',
@@ -1374,6 +1401,12 @@ export const mockShapes: ComputeShape[] = [
     memoryMinGBs: 1,
     memoryMaxGBs: 512,
     processorDescription: '3.0 GHz Ampere® Altra™',
+    quotaNames: [
+      'standard-a1-memory-count',
+      'standard-a1-memory-regional-count',
+      'standard-a1-core-count',
+      'standard-a1-core-regional-count',
+    ],
   },
   {
     name: 'VM.Standard.E2.1.Micro',
@@ -1382,6 +1415,7 @@ export const mockShapes: ComputeShape[] = [
     ocpus: 1,
     memoryInGBs: 1,
     processorDescription: '2.0 GHz AMD EPYC™ 7551',
+    quotaNames: ['standard-e2-micro-core-count'],
   },
   {
     name: 'VM.Standard.E4.Flex',
@@ -1392,6 +1426,7 @@ export const mockShapes: ComputeShape[] = [
     memoryMinGBs: 1,
     memoryMaxGBs: 1024,
     processorDescription: '2.55 GHz AMD EPYC™ 7J13',
+    quotaNames: ['standard-e4-core-count', 'standard-e4-memory-count'],
   },
   {
     name: 'VM.Standard.E5.Flex',

src/api/request.ts

@@ -32,8 +32,15 @@ function buildUrl(path: string, query?: RequestOptions['query']): string {
 async function parseError(resp: Response): Promise<never> {
   let message = `请求失败（${resp.status}）`
   try {
-    const body = (await resp.json()) as { error?: string; hint?: string }
+    const body = (await resp.json()) as { error?: string; hint?: string; errors?: unknown[] }
-    if (body.error) message = body.hint ? `${body.hint}｜${body.error}` : body.error
+    if (body.error) {
+      message = body.hint ? `${body.hint}｜${body.error}` : body.error
+    } else {
+      // 批量接口(如创建实例)全部失败时返回 errors 数组,逐行合并;
+      // 调用方以「短标题 + detail」经 useToast 展示,多行在详情块中逐行可读
+      const list = (body.errors ?? []).filter((e): e is string => typeof e === 'string')
+      if (list.length) message = list.join('\n')
+    }
   } catch {
     /* 非 JSON 响应体，保留默认消息 */
   }

src/components/instance/CreateInstanceModal.vue

@@ -56,12 +56,13 @@ async function submit() {
     // 后端 errors / instances 为空时序列化为 null，判空防炸
     const ok = result.instances?.length ?? 0
     const failed = result.errors?.length ?? 0
-    if (failed) message.warning(`${ok} 台创建成功，${failed} 台失败：${result.errors![0]}`)
+    if (failed) message.warning(`${ok} 台创建成功，${failed} 台失败`, result.errors!.join('\n'))
     else message.success(`已创建 ${ok} 台实例`)
     emit('update:show', false)
     emit('created')
   } catch (e) {
-    message.error(e instanceof Error ? e.message : '创建失败')
+    // 逐台错误(可能多行)收进「展开详情」,标题保持简短
+    message.error('创建实例失败', e instanceof Error && e.message ? e.message : undefined)
   } finally {
     submitting.value = false
   }
@@ -90,17 +91,18 @@ async function submit() {
     <InstanceSpecForm
       ref="specForm"
       sectioned
+      auto-pick-ad
       :cfg-id="cfgId"
       :region="region"
       :compartment-id="compartmentId"
     />
     <div
-      class="mt-3 flex flex-wrap items-center justify-between gap-2 rounded-lg border border-line-soft bg-wash px-3 py-2 text-xs leading-relaxed text-ink-3"
+      v-if="specForm?.summary"
+      class="mt-3 rounded-lg border border-line-soft bg-wash px-3 py-2 text-xs leading-relaxed"
     >
-      <span v-if="specForm?.summary" class="font-medium text-ink-2">
+      <span class="font-medium text-ink-2">
         预估规格:{{ form.count }} 台 · {{ specForm.summary }}
       </span>
-      <span>容量不足（Out of host capacity）时可改用抢机任务反复尝试</span>
     </div>
   </FormModal>
 </template>

src/components/instance/InstanceSpecForm.vue

@@ -10,6 +10,7 @@ import FormField from '@/components/FormField.vue'
 import FormSection from '@/components/FormSection.vue'
 import { shortAd } from '@/composables/useFormat'
 import { useAsync } from '@/composables/useAsync'
+import type { ComputeShape, LimitItem } from '@/types/api'
 
 /** 实例规格表单（创建实例弹窗与抢机任务共用）：
  *  Shape / 可用域 / 规格 / 镜像 / VCN 子网 / 引导卷 / 登录方式 / IP 分配。
@@ -22,6 +23,9 @@ const props = defineProps<{
   sectioned?: boolean
   /** 可用域字段说明;抢机任务留空为轮询语义,与手动创建(固定 AD-1)不同 */
   adHint?: string
+  /** 创建场景:AD 留空(默认 AD-1)而所选 shape 在 AD-1 无配额时,自动落位首个有配额 AD;
+   *  抢机表单留空 = 轮询语义,勿开 */
+  autoPickAd?: boolean
 }>()
 
 /** VCN 选择的「自动创建」哨兵：提交时不传 subnetId，由后端建 VCN 与子网 */
@@ -30,8 +34,8 @@ const AUTO_VCN = '__auto__'
 const blank = {
   availabilityDomain: null as string | null,
   shape: 'VM.Standard.A1.Flex',
-  ocpus: 4,
+  ocpus: 2,
-  memoryInGBs: 24,
+  memoryInGBs: 12,
   imageId: null as string | null,
   vcnId: AUTO_VCN,
   subnetId: null as string | null,
@@ -194,51 +198,82 @@ watch(
   },
 )
 
-/** shape → OCI compute 配额名（官方 Limits by Service 命名）；已知映射用于配额标注，
+/** 免费类计费类型:仅用于排序置顶,不在选项文案中标注 */
- *  清单外的 shape 不判定配额。AD 维度多行求和 > 0 才认为有配额。 */
+const FREE_BILLING = new Set(['ALWAYS_FREE', 'LIMITED_FREE'])
-const SHAPE_QUOTAS: Record<string, string> = {
+
-  'VM.Standard.A1.Flex': 'standard-a1-core-count',
+/** shape 的核数配额名:quotaNames 排除 memory / reserved / reservable 变体,
-  'VM.Standard.A2.Flex': 'standard-a2-core-count',
+ *  剩余为核数(或实例数)限额名,与 compute limits 的 name 同名 */
-  'VM.Standard.A4.Flex': 'standard-a4-core-count',
+function coreQuotaNames(s: ComputeShape): string[] {
-  'VM.Standard.E2.1.Micro': 'standard-e2-micro-core-count',
+  return (s.quotaNames ?? []).filter(
-  'VM.Standard.E3.Flex': 'standard-e3-core-ad-count',
+    (n) => !n.includes('memory') && !n.includes('reserved') && !n.includes('reservable'),
-  'VM.Standard.E4.Flex': 'standard-e4-core-count',
+  )
-  'VM.Standard.E5.Flex': 'standard-e5-core-count',
-  'VM.Standard.E6.Flex': 'standard-e6-core-count',
-  'VM.Standard3.Flex': 'standard3-core-count',
 }
 
-const BILLING_LABEL: Record<string, string> = {
+/** 单个 shape 的配额汇总:AD 行按 AD 求和,REGION 行累计为区域总额;无匹配行返回 null */
-  ALWAYS_FREE: '永久免费',
+function shapeQuotaEntry(names: Set<string>, rows: LimitItem[]): ShapeQuota | null {
-  LIMITED_FREE: '免费额度',
+  const byAd = new Map<string, number>()
+  let regional: number | null = null
+  let matched = false
+  for (const r of rows) {
+    if (!names.has(r.name)) continue
+    matched = true
+    if (r.scopeType === 'AD' && r.availabilityDomain) {
+      byAd.set(r.availabilityDomain, (byAd.get(r.availabilityDomain) ?? 0) + Math.max(r.value, 0))
+    } else if (r.scopeType === 'REGION') {
+      regional = (regional ?? 0) + Math.max(r.value, 0)
+    }
+  }
+  return matched ? { byAd, regional } : null
 }
 
-/** 已知映射 shape 的核数配额合计；未知映射或配额未加载返回 null（不判定） */
+interface ShapeQuota {
-function quotaOf(shape: string): number | null {
+  byAd: Map<string, number> // AD 全名 → 核数配额
-  const quota = SHAPE_QUOTAS[shape]
+  regional: number | null // 区域级总额,null = 无区域行
-  const items = limits.data.value ?? []
+}
-  if (!quota || !items.length) return null
+
-  return items.filter((l) => l.name === quota).reduce((sum, l) => sum + (l.value > 0 ? l.value : 0), 0)
+/** 全部 shape 的配额汇总;quotaNames 缺失或 limits 无匹配行的 shape 无条目(不判定) */
+const quotaByShape = computed(() => {
+  const rows = limits.data.value ?? []
+  const out = new Map<string, ShapeQuota>()
+  if (!rows.length) return out
+  for (const s of shapes.data.value ?? []) {
+    const names = new Set(coreQuotaNames(s))
+    if (!names.size) continue
+    const entry = shapeQuotaEntry(names, rows)
+    if (entry) out.set(s.name, entry)
+  }
+  return out
+})
+
+/** shape 在指定 AD(null = 任一 AD)是否有配额;null = 数据不足不判定 */
+function quotaInAd(name: string, ad: string | null): boolean | null {
+  const q = quotaByShape.value.get(name)
+  if (!q) return null
+  if (q.regional !== null && q.regional <= 0) return false
+  if (!q.byAd.size) return true // 仅区域级限额且 > 0
+  if (ad === null) return [...q.byAd.values()].some((v) => v > 0)
+  return (q.byAd.get(ad) ?? 0) > 0
 }
 
 /** 排序：免费 shape 优先 → VM.Standard 系列 → 其他 VM → 裸金属等 */
 function shapeRank(s: { billingType: string; name: string }): number {
-  if (BILLING_LABEL[s.billingType]) return 0
+  if (FREE_BILLING.has(s.billingType)) return 0
   if (s.name.startsWith('VM.Standard')) return 1
   if (s.name.startsWith('VM.')) return 2
   return 3
 }
 
 const shapeOptions = computed(() => {
-  // 清单全部来自 shapes 接口,不做本地预设;接口不可用时仍可手输(tag 模式)
+  // 清单全部来自 shapes 接口,不做本地预设;接口不可用时仍可手输(tag 模式);
+  // 选定 AD 时按该 AD 判定配额,未选时看任一 AD
   const list = shapes.data.value ?? []
+  const ad = form.availabilityDomain
   return [...list]
     .sort((a, b) => shapeRank(a) - shapeRank(b) || a.name.localeCompare(b.name))
     .map((s) => {
-      const free = BILLING_LABEL[s.billingType]
+      const ok = quotaInAd(s.name, ad)
-      const quota = quotaOf(s.name)
+      const suffix = ok === false ? (ad ? ' · 该 AD 无配额' : ' · 无配额') : ''
-      const suffix = (free ? `（${free}）` : '') + (quota === 0 ? ' · 无配额' : '')
+      return { label: s.name + suffix, value: s.name, disabled: ok === false }
-      return { label: s.name + suffix, value: s.name, disabled: quota === 0 }
     })
 })
 
@@ -288,10 +323,29 @@ const imageOptions = computed(() => {
     .map((i) => ({ label: i.displayName, value: i.id }))
 })
 
+/** AD 选项按当前 shape 的配额标注并禁用无配额项;数据不足时不标注 */
 const adOptions = computed(
-  () => ads.data.value?.map((ad) => ({ label: shortAd(ad), value: ad })) ?? [],
+  () =>
+    ads.data.value?.map((ad) => {
+      const ok = quotaInAd(form.shape, ad)
+      return {
+        label: shortAd(ad) + (ok === false ? '（无配额）' : ''),
+        value: ad,
+        disabled: ok === false,
+      }
+    }) ?? [],
 )
 
+// 创建场景(autoPickAd):AD 留空将由后端取 AD-1;所选 shape 在 AD-1 无配额
+// 而其他 AD 有配额时,自动落位首个有配额 AD(字段可见,用户可改)
+watch([() => form.shape, quotaByShape, () => ads.data.value], () => {
+  if (!props.autoPickAd || form.availabilityDomain !== null) return
+  const list = ads.data.value ?? []
+  if (!list.length || quotaInAd(form.shape, list[0]) !== false) return
+  const target = list.find((ad) => quotaInAd(form.shape, ad) === true)
+  if (target) form.availabilityDomain = target
+})
+
 const vcnOptions = computed(() => [
   { label: '自动创建（oci-portal-auto-vcn）', value: AUTO_VCN },
   ...(vcns.data.value ?? []).map((v) => ({ label: v.displayName, value: v.id })),
@@ -325,12 +379,10 @@ const valid = computed(() => {
   return !isFlex.value || form.ocpus > 0
 })
 
-/** 规格摘要(父表单底部预估条用):shape 短名 + 弹性核内存 + 免费标注 */
+/** 规格摘要(父表单底部预估条用):shape 短名 + 弹性核内存 */
 const summary = computed(() => {
   const parts = [form.shape.replace(/^VM\.Standard\.?/, '') || form.shape]
   if (isFlex.value) parts.push(`${form.ocpus} OCPU · ${form.memoryInGBs} GB`)
-  const free = selectedShape.value && BILLING_LABEL[selectedShape.value.billingType]
-  if (free) parts.push(free)
   return parts.join(' · ')
 })
 
@@ -366,7 +418,7 @@ defineExpose({ valid, buildSpec, reset, applySpec, summary })
     <FormField
       label="Shape"
       required
-      hint="清单来自租户当前区域实际提供的 shape（免费与无配额已标注），可手输其他"
+      hint="清单来自租户当前区域实际提供的 shape（无配额已标注），可手输其他"
     >
       <NSelect
         v-model:value="form.shape"

src/components/instance/ResizeModal.vue

@@ -37,18 +37,10 @@ watch(
   },
 )
 
-const BILLING_LABEL: Record<string, string> = {
-  ALWAYS_FREE: '永久免费',
-  LIMITED_FREE: '免费额度',
-}
-
 const shapeOptions = computed(() => {
   const list = shapes.data.value ?? []
   if (!list.length) return [{ label: form.shape, value: form.shape }]
-  return list.map((s) => {
+  return list.map((s) => ({ label: s.name, value: s.name }))
-    const free = BILLING_LABEL[s.billingType]
-    return { label: s.name + (free ? `（${free}）` : ''), value: s.name }
-  })
 })
 
 const selectedShape = computed(
@@ -141,7 +133,7 @@ async function submit() {
     </div>
     <div class="text-xs leading-relaxed text-ink-3">
       运行中实例 OCI 会自动重启完成变更；更换 shape 要求镜像与目标 shape 架构兼容（如 aarch64
-      镜像不能换到 x86 shape）。A1 免费额度上限 4 OCPU / 24 GB。
+      镜像不能换到 x86 shape）。
     </div>
   </FormModal>
 </template>

src/components/logs/LogEventPanel.vue

@@ -240,15 +240,15 @@ useAutoRefresh(() => load(true))
       :loading="loading"
       :pagination="pagination"
       :scroll-x="880"
-      :max-height="480"
       :row-key="(r: LogEvent) => r.id"
       :row-props="rowProps"
     />
     <FootNote>
-      在租户详情「其他」tab 一键创建链路后,实例生命周期(Launch/Terminate/InstanceAction)、
+      在租户详情「其他」tab 一键创建链路后,实例终止与电源操作(Terminate/InstanceAction;
-      用户与凭据(Create/Delete/UpdateUser、Create/DeleteApiKey、UpdateUserCapabilities)、
+      创建不回传,避免面板抢机与批量创建刷屏)、用户与凭据(Create/Delete/UpdateUser、
-      区域订阅与策略变更等关键审计事件将自动回传;消息按 MessageId 幂等去重,保留 90
+      Create/DeleteApiKey、UpdateUserCapabilities)、区域订阅与策略变更等关键审计事件将自动回传;
-      天、总量超 2 万条时删除最旧,关键事件另经「通知管理 → 云端事件」推送告警
+      消息按 MessageId 幂等去重,保留 90 天、总量超 2 万条时删除最旧,关键事件另经
+      「通知管理 → 云端事件」推送告警
     </FootNote>
 
     <NModal v-model:show="showDetail" preset="card" closable :style="{ width: '720px', maxWidth: 'calc(100vw - 24px)' }">

src/types/api.ts

@@ -489,6 +489,8 @@ export interface ComputeShape {
   memoryMaxGBs?: number
   gpus?: number
   processorDescription?: string
+  /** 该 shape 对应的配额名(与 compute limits 的 name 同名),用于配额与 AD 可用性判定 */
+  quotaNames?: string[]
 }
 
 // ---- 引导卷 ----

src/views/SettingsView.vue

@@ -89,7 +89,7 @@ const eventRows: { key: keyof NotifyEventsSetting; label: string; hint: string }
   { key: 'taskStop', label: '任务停止', hint: '抢机连续鉴权失败熔断停止时推送' },
   { key: 'loginLock', label: '登录锁定', hint: '同一 IP+用户名连续失败达阈值时推送' },
   { key: 'modelDeprecated', label: '模型弃用预警', hint: 'AI 网关在池模型 30 天内被 OCI 弃用时随每日探测推送' },
-  { key: 'logEventInstance', label: '实例生命周期', hint: '创建 / 终止 / 电源操作(Launch、Terminate、InstanceAction)' },
+  { key: 'logEventInstance', label: '实例生命周期', hint: '终止 / 电源操作(Terminate、InstanceAction);创建不回传,避免抢机噪声' },
   { key: 'logEventIdentity', label: '用户与凭据', hint: '用户增删改、API Key 增删、能力变更' },
   { key: 'logEventPolicy', label: '策略变更', hint: 'IAM Policy 创建 / 修改 / 删除' },
   { key: 'logEventRegion', label: '区域订阅', hint: '订阅新区域(CreateRegionSubscription)' },