jvs-ppt-ui 0.0.8 → 0.0.10

package/src/utils/pptxShapes.ts

@@ -76,7 +76,7 @@ export interface ShapePoolItem {
   withborder?: boolean
 }
 
-interface ShapeListItem {
+export interface ShapeListItem {
   type: string
   children: ShapePoolItem[]
 }

package/src/utils/pptxShapesLazy.ts

@@ -0,0 +1,39 @@
+import { shallowRef } from 'vue'
+import type { ShapeListItem, ShapePathFormula } from './pptxShapes'
+
+type PptxShapesModule = typeof import('./pptxShapes')
+
+// 98KB 形状公式/预设表从启动 chunk 拆出：本模块求值时即后台加载（不阻塞首屏），
+// 表就绪后写入 shallowRef，依赖它的 computed（如形状调整点 keypoints）会自动重算。
+export const pptxShapeFormulas = shallowRef<Record<string, ShapePathFormula> | null>(null)
+export const pptxShapeList = shallowRef<ShapeListItem[] | null>(null)
+
+const EMPTY_FORMULAS: Record<string, ShapePathFormula> = {}
+const EMPTY_LIST: ShapeListItem[] = []
+
+/** 同步读取形状公式表；未就绪时返回空表（调用点均有 if (formulaObj) 守卫，安全降级） */
+export function shapeFormulas(): Record<string, ShapePathFormula> {
+  return pptxShapeFormulas.value ?? EMPTY_FORMULAS
+}
+
+/** 同步读取形状预设列表；未就绪时返回空数组 */
+export function shapeList(): ShapeListItem[] {
+  return pptxShapeList.value ?? EMPTY_LIST
+}
+
+let loadPromise: Promise<PptxShapesModule> | null = null
+
+/** 确保形状表已加载；文件导入/DSL 编译等异步解析路径在调用解析器前 await 一次 */
+export function ensurePptxShapes(): Promise<PptxShapesModule> {
+  if (!loadPromise) {
+    loadPromise = import('./pptxShapes').then(mod => {
+      pptxShapeFormulas.value = mod.SHAPE_PATH_FORMULAS
+      pptxShapeList.value = mod.SHAPE_LIST
+      return mod
+    })
+  }
+  return loadPromise
+}
+
+// 启动即后台预载：与首屏渲染并行，用户首次交互（插形状/拖调整点/导文件）前早已就绪
+ensurePptxShapes()

package/src/utils/svgPathParser.ts

@@ -71,6 +71,13 @@ export const getSvgPathRange = (path: string) => {
     for (const item of pathData.commands) {
       if ('x' in item) xList.push(item.x)
       if ('y' in item) yList.push(item.y)
+      // 贝塞尔控制点也纳入边界：曲线的实际极值可能只出现在控制点上
+      // （端点算出的范围会偏小，导致 viewBox 被错误收窄、形状被拉伸），
+      // 与 normalizeSvgPath 的边界口径保持一致。
+      if ('x1' in item) xList.push(item.x1)
+      if ('y1' in item) yList.push(item.y1)
+      if ('x2' in item) xList.push(item.x2)
+      if ('y2' in item) yList.push(item.y2)
     }
     return {
       minX: Math.min(...xList),
@@ -102,9 +109,13 @@ export const normalizeSvgPath = (path: string) => {
 
     const xList: number[] = []
     const yList: number[] = []
-    for (const item of pathData.commands) {
+    for (const item of pathData.commands as any[]) {
       if ('x' in item) xList.push(item.x)
       if ('y' in item) yList.push(item.y)
+      if ('x1' in item) xList.push(item.x1)
+      if ('y1' in item) yList.push(item.y1)
+      if ('x2' in item) xList.push(item.x2)
+      if ('y2' in item) yList.push(item.y2)
     }
 
     if (xList.length === 0 || yList.length === 0) {