@gct-paas/word 0.1.34 → 0.1.36

package/README.md

@@ -289,6 +289,12 @@ const customPlugin: WordSuitePlugin = {
 - 检查是否在 `setupPlatformAdapters` 初始化阶段完成注册
 - 检查 `suiteKey` 与已注册插件 `key` 是否一致
 
+## 本仓库开发与发布
+
+维护 `@gct-paas/word` 的分支策略、版本号与 npm 发布约定见仓库根目录文档：
+
+[开发与发布流程](../../docs/development-and-release.md)
+
 ## License
 
 MIT

package/dist/core/data/DataManager.d.ts

@@ -79,6 +79,11 @@ export declare class DataManager {
     private get2DByCoords;
     private set2DByCoords;
     private cleanupCrossByAxisUid;
+    /**
+     * 复制轴行插入时：若 uid 与已有行重复，换新 uid 并复制关联交叉区行。
+     */
+    private duplicateCrossRowsByAxisUid;
+    private prepareAxisRowForInsert;
     /**
      * 将一个部分值对象合进整体
      */

package/dist/core/model/document/Wp.d.ts

@@ -19,6 +19,8 @@ export declare class Wp extends ModelGroup {
     constructor(options: ModelGroupOptions & {
         pPr?: WpPr;
     });
+    /** 将 pPr 挂到段落节点，供样式解析沿 parent 链查找 styles */
+    private bindPPrParent;
     get styleId(): string | undefined;
     /**
      * runs 属性别名，指向 children

package/dist/core/model/document/Wtc.d.ts

@@ -46,6 +46,8 @@ export declare class Wtc extends ModelGroup {
     /** 是否是合并起始单元格 */
     get isMergeStart(): boolean;
     get contents(): Wp[];
+    /** 单元格垂直对齐（w:tcPr/w:vAlign） */
+    get vAlign(): 'top' | 'center' | 'bottom' | undefined;
     get firstContent(): Wp | undefined;
     get lastContent(): Wp | undefined;
     get cellMergeInfo(): {

package/dist/core/view/Paragraph.d.ts

@@ -18,6 +18,8 @@ export declare class Paragraph extends LayoutGroup<LayoutNode> {
     component: "paragraph";
     parent: ParagraphParent;
     baseline: number;
+    /** 上次 layout 应用的水平对齐偏移，避免重复 layout 时累加 */
+    private _alignmentOffset;
     splitFillEvent: EventUtil;
     constructor(options: ParagraphOptions);
     /**

package/dist/index.es.js

@@ -22204,7 +22204,7 @@ class WpPr extends ModelNode {
     while (node.parent) {
       node = node.parent;
     }
-    this._cachedWStyles = node.styles;
+    this._cachedWStyles = node.styles ?? node.root?.styles;
     return this._cachedWStyles;
   }
   /**
@@ -22433,6 +22433,13 @@ class Wp extends ModelGroup {
   constructor(options) {
     super(options);
     this.pPr = options.pPr;
+    this.bindPPrParent();
+  }
+  /** 将 pPr 挂到段落节点，供样式解析沿 parent 链查找 styles */
+  bindPPrParent() {
+    if (this.pPr) {
+      this.pPr.parent = this;
+    }
   }
   get styleId() {
     return this.pPr?.styleId;
@@ -22492,6 +22499,7 @@ class Wp extends ModelGroup {
     wp.runs.forEach((run) => {
       run.parent = wp;
     });
+    wp.bindPPrParent();
     return wp;
   }
   toXmlJson() {
@@ -22560,6 +22568,7 @@ class Wp extends ModelGroup {
   ensurePPr() {
     if (!this.pPr) {
       this.pPr = new WpPr({ elements: [] });
+      this.bindPPrParent();
     }
     return this.pPr;
   }
@@ -22695,6 +22704,15 @@ class Wtc extends ModelGroup {
   get contents() {
     return this.children.filter((child) => child instanceof Wp);
   }
+  /** 单元格垂直对齐（w:tcPr/w:vAlign） */
+  get vAlign() {
+    const elem = this.tcPrRaw ? pickElement(this.tcPrRaw, "w:vAlign") : void 0;
+    const val = elem?.["@attrs"]?.["w:val"];
+    if (val === "center" || val === "bottom" || val === "top") {
+      return val;
+    }
+    return void 0;
+  }
   get firstContent() {
     return this.contents[0];
   }
@@ -26036,6 +26054,101 @@ class Wdocument extends ModelGroup {
     return result;
   }
 }
+class ParagraphStyleResolver {
+  /**
+   * 计算段落的有效样式
+   * 优先级：直接属性 > 样式定义 > 文档默认
+   *
+   * @param wpPr - 段落属性节点
+   * @returns 计算后的有效样式
+   *
+   * @example
+   * const style = ParagraphStyleResolver.resolve(wpPr);
+   * console.log(style.alignment); // 可能来自直接属性或样式定义
+   */
+  static resolve(wpPr) {
+    const directStyle = wpPr.directStyle;
+    if (!wpPr.styleId || !wpPr.wStyles) {
+      return directStyle;
+    }
+    const styleDefinition = wpPr.wStyles.resolveStyleDef(wpPr.styleId);
+    if (!styleDefinition) {
+      return directStyle;
+    }
+    const inheritedStyle = this.convertPPrToStyle(styleDefinition.pPr);
+    return this.mergeStyles(inheritedStyle, directStyle);
+  }
+  /**
+   * 从 WparagraphProperties 转换为 ParagraphStyle
+   *
+   * WparagraphProperties 是样式体系内部使用的数值化表示
+   * ParagraphStyle 是对外的字符串化 API 表示
+   *
+   * @param pPr - 段落属性对象（可能为 undefined）
+   * @returns 转换后的段落样式
+   */
+  static convertPPrToStyle(pPr) {
+    if (!pPr) {
+      return {};
+    }
+    const style = {};
+    if (pPr.alignment) {
+      style.alignment = pPr.alignment;
+    }
+    if (pPr.indent && Object.keys(pPr.indent).length > 0) {
+      style.indent = {
+        left: pPr.indent.left?.toString(),
+        right: pPr.indent.right?.toString(),
+        firstLine: pPr.indent.firstLine?.toString()
+      };
+    }
+    if (pPr.spacing && Object.keys(pPr.spacing).length > 0) {
+      style.spacing = {
+        before: pPr.spacing.before?.toString(),
+        after: pPr.spacing.after?.toString(),
+        line: pPr.spacing.line?.toString(),
+        beforeAutospacing: pPr.spacing.beforeAutospacing,
+        afterAutospacing: pPr.spacing.afterAutospacing
+      };
+    }
+    return style;
+  }
+  /**
+   * 深度合并两个样式对象
+   * 后来的值优先覆盖前面的值（override > base）
+   *
+   * @param base - 基础样式（如样式定义）
+   * @param override - 覆盖样式（如直接属性）
+   * @returns 合并后的样式
+   */
+  static mergeStyles(base, override) {
+    const result = {};
+    result.alignment = override.alignment ?? base.alignment;
+    if (base.indent || override.indent) {
+      result.indent = {
+        left: override.indent?.left ?? base.indent?.left,
+        right: override.indent?.right ?? base.indent?.right,
+        firstLine: override.indent?.firstLine ?? base.indent?.firstLine
+      };
+    }
+    if (base.spacing || override.spacing) {
+      result.spacing = {
+        before: override.spacing?.before ?? base.spacing?.before,
+        after: override.spacing?.after ?? base.spacing?.after,
+        line: override.spacing?.line ?? base.spacing?.line,
+        beforeAutospacing: override.spacing?.beforeAutospacing ?? base.spacing?.beforeAutospacing,
+        afterAutospacing: override.spacing?.afterAutospacing ?? base.spacing?.afterAutospacing
+      };
+    }
+    if (base.lang || override.lang) {
+      result.lang = {
+        val: override.lang?.val ?? base.lang?.val,
+        eastAsia: override.lang?.eastAsia ?? base.lang?.eastAsia
+      };
+    }
+    return result;
+  }
+}
 class TextStyleResolver {
   /**
    * 计算字符的有效样式
@@ -40251,6 +40364,8 @@ class Paragraph extends LayoutGroup {
   component = BuiltinComponentTypeConst.Paragraph;
   baseline = 0;
   // 基线位置，默认为 0，表示与段落顶部对齐
+  /** 上次 layout 应用的水平对齐偏移，避免重复 layout 时累加 */
+  _alignmentOffset = 0;
   splitFillEvent = new EventUtil();
   // backgroundColor?: string = 'rgba(0,0,0,0.06)';
   // borderTop?: Border = {
@@ -40317,15 +40432,19 @@ class Paragraph extends LayoutGroup {
   }
   applyStyle() {
     const wp = this.doc.layoutMapper.getModelNodeById(this.modelRef.id);
-    const style = wp?.pPr?.directStyle ?? {};
+    const style = wp?.pPr ? ParagraphStyleResolver.resolve(wp.pPr) : {};
     let offset2 = 0;
     if (style.alignment === "center") {
       offset2 = (this.width - this.getContextWidth()) / 2;
     } else if (style.alignment === "right") {
       offset2 = this.width - this.getContextWidth();
     }
+    offset2 = Math.max(offset2, 0);
+    const delta = offset2 - this._alignmentOffset;
+    this._alignmentOffset = offset2;
+    if (delta === 0) return;
     this.forEachChild((child) => {
-      child.x += Math.max(offset2, 0);
+      child.x += delta;
     });
   }
   /**
@@ -42310,8 +42429,18 @@ class TableCell extends LayoutGroup {
   layout(x2, y2) {
     this.layoutX = x2;
     this.layoutY = y2;
+    const contentHeight = this.getContentHeight();
+    const innerHeight = this.height - this.pt - this.pb;
+    let contentOffsetY = 0;
+    const wtc = this.modelRef ? this.doc.layoutMapper.getModelNodeById(this.modelRef.id) : void 0;
+    const vAlign = wtc?.vAlign;
+    if (vAlign === "center") {
+      contentOffsetY = Math.max(0, (innerHeight - contentHeight) / 2);
+    } else if (vAlign === "bottom") {
+      contentOffsetY = Math.max(0, innerHeight - contentHeight);
+    }
     this.forEachChild((child) => {
-      child.layout(this.layoutX + this.pl, this.layoutY + this.pt + child.y);
+      child.layout(this.layoutX + this.pl, this.layoutY + this.pt + contentOffsetY + child.y);
     });
   }
 }
@@ -46160,6 +46289,39 @@ class DataManager {
       this.emit(path2, next, oldValue);
     });
   }
+  /**
+   * 复制轴行插入时：若 uid 与已有行重复，换新 uid 并复制关联交叉区行。
+   */
+  duplicateCrossRowsByAxisUid(crossKeys, axis, oldUid, newUid) {
+    const uidField = axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    for (const crossKey of crossKeys) {
+      const path2 = `$.${crossKey}`;
+      const rows = this.getByPath(this.rawData, path2);
+      if (!Array.isArray(rows)) continue;
+      const matched = rows.filter((item) => item?.[uidField] === oldUid);
+      if (matched.length === 0) continue;
+      const oldValue = this.deepClone(rows);
+      const copies = matched.map((item) => {
+        const copy = this.deepClone(item);
+        copy[uidField] = newUid;
+        return copy;
+      });
+      const next = [...rows, ...copies];
+      this.setByPath(this.rawData, path2, next);
+      this.emit(path2, next, oldValue);
+    }
+  }
+  prepareAxisRowForInsert(arr, axisInfo, value) {
+    const cloned = this.deepClone(value);
+    const uidField = axisInfo.axis === "y" ? "__gw_y_uid" : "__gw_x_uid";
+    const oldUid = cloned?.[uidField];
+    if (oldUid && arr.some((row) => row?.[uidField] === oldUid)) {
+      const newUid = `${axisInfo.axis}_${uuid()}`;
+      cloned[uidField] = newUid;
+      this.duplicateCrossRowsByAxisUid(axisInfo.crossKeys, axisInfo.axis, oldUid, newUid);
+    }
+    return cloned;
+  }
   /**
    * 将一个部分值对象合进整体
    */
@@ -46229,7 +46391,7 @@ class DataManager {
       const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
       values.forEach((value) => {
-        const cloned = this.deepClone(value);
+        const cloned = axisInfo ? this.prepareAxisRowForInsert(arr, axisInfo, value) : this.deepClone(value);
         arr.push(cloned);
         if (axisInfo) {
           const index2 = arr.length - 1;
@@ -46290,10 +46452,12 @@ class DataManager {
         throw new Error(`Index ${index2} out of bounds for array of length ${arr.length}`);
       }
       const oldValue = [...arr];
-      const clonedValues = values.map((value) => this.deepClone(value));
-      arr.splice(index2, 0, ...clonedValues);
       const tableKey = path2.replace(/^\$\./, "").replace(/\[(n|\d+)\]/g, "");
       const axisInfo = this.resolveAxisByTableKey(tableKey);
+      const clonedValues = values.map(
+        (value) => axisInfo ? this.prepareAxisRowForInsert(arr, axisInfo, value) : this.deepClone(value)
+      );
+      arr.splice(index2, 0, ...clonedValues);
       if (axisInfo) {
         for (let i = index2; i < arr.length; i++) {
           this.ensureAxisRowAndUid(tableKey, i, axisInfo.axis);
@@ -46344,6 +46508,7 @@ class DataManager {
     const data = this.deepClone(this.rawData);
     for (let path2 of this.defaults.keys()) {
       if (this.defaults.get(path2) === void 0) continue;
+      if (path2.includes("[n")) continue;
       const value = this.getByPath(data, path2);
       if (value !== void 0) continue;
       this.setByPath(data, path2, this.getDefault(path2));
@@ -56092,7 +56257,7 @@ function getDataIndexLayersMap({
   convertExtraProps
 }) {
   const getDataIndex = (cell) => {
-    return isLinkSubTableType(type4) && isDesign ? cell.subRenderer?.xDataIndex : cell.subRenderer?.yDataIndex;
+    return isLinkSubTableType(type4) && isDesign ? cell.subRenderer?.xDataIndex : cell.subRenderer?.yDataIndex ?? cell.subRenderer?.dataIndex;
   };
   const getAllDataIndex = (cell) => {
     const { dataIndex, xDataIndex, yDataIndex } = cell?.subRenderer || {};
@@ -58035,6 +58200,34 @@ function buildFieldChangeList(params) {
   }
   return changeList;
 }
+function createDesignerValidationResult(errors) {
+  return {
+    valid: errors.length === 0,
+    errors
+  };
+}
+function validateDocDesigner(doc) {
+  if (!doc?.model) {
+    return createDesignerValidationResult([]);
+  }
+  const errors = [];
+  const children = doc.model.document.body.children || [];
+  const fixedTableRegions = children.filter((w2) => w2.name === "w:tbl" && w2.hasBounded).flatMap((w2) => w2.bounded);
+  if (fixedTableRegions.some((r) => !r.itemRegion)) {
+    errors.push({
+      code: "item-region-required",
+      message: "请给固定表设置数据分组",
+      source: "doc"
+    });
+  }
+  return createDesignerValidationResult(errors);
+}
+function validateDesigner(doc) {
+  const errors = [];
+  const docResult = validateDocDesigner(doc);
+  errors.push(...docResult.errors);
+  return createDesignerValidationResult(errors);
+}
 function useDocOperations(docRef) {
   function getDoc() {
     return docRef.value ?? null;
@@ -58052,6 +58245,9 @@ function useDocOperations(docRef) {
     if (!doc) return null;
     return validateAllFields(doc);
   }
+  function validateDesigner$1() {
+    return validateDesigner(getDoc());
+  }
   function exportModel() {
     return getDoc()?.model?.toXmlJson() ?? null;
   }
@@ -58131,6 +58327,7 @@ function useDocOperations(docRef) {
   }
   return {
     validate,
+    validateDesigner: validateDesigner$1,
     exportModel,
     getDocumentAttachmentPaths,
     enterBaseline,
@@ -58198,6 +58395,9 @@ function useDocController(factory2, ops) {
         validate() {
           return ops.validate();
         },
+        validateDesigner() {
+          return ops.validateDesigner();
+        },
         exportModel() {
           return ops.exportModel();
         },

package/dist/sdk/doc-runtime/composables/useDocController.d.ts

@@ -12,6 +12,5 @@ import { DocOperations } from './useDocOperations';
  * const factory = useDocumentFactory(docProps, docPayload);
  * const ops = useDocOperations(factory.doc);
  * const controller = useDocController(factory, ops);
- * // controller.value?.validate()
  */
 export declare function useDocController(factory: DocumentFactory, ops: DocOperations): ShallowRef<DocController | null>;

package/dist/sdk/doc-runtime/composables/useDocOperations.d.ts

@@ -1,6 +1,7 @@
 import { ShallowRef } from 'vue';
 import { Doc } from '../../../core';
 import { FieldChangeItem, WidgetFieldMetaMap } from '../../../runtime/interface/change-diff';
+import { DesignerValidationResult } from '../../types/designer-validation';
 /** 数据变更基线上下文 */
 export interface DocBaselineContext {
     baselineSnapshot: Record<string, any> | undefined;
@@ -18,6 +19,8 @@ export interface DocGetUnsavedChangesOptions {
 export interface DocOperations {
     /** 校验所有字段，返回错误映射或 null（通过） */
     validate(): Promise<Record<string, string[]> | null>;
+    /** 设计态保存前校验（文档配置 + 数据加载模板配置等） */
+    validateDesigner(): DesignerValidationResult;
     /** 获取文档模型的 XmlJson（用于保存） */
     exportModel(): any;
     /**

package/dist/sdk/doc-runtime/validators/validate-designer.d.ts

@@ -0,0 +1,4 @@
+import { Doc } from '../../../core';
+import { DesignerValidationResult } from '../../types/designer-validation';
+/** 聚合设计态校验：文档模型 */
+export declare function validateDesigner(doc: Doc | null): DesignerValidationResult;

package/dist/sdk/doc-runtime/validators/validate-doc-designer.d.ts

@@ -0,0 +1,4 @@
+import { Doc } from '../../../core';
+import { DesignerValidationResult } from '../../types/designer-validation';
+/** 校验文档模型中的设计态配置 */
+export declare function validateDocDesigner(doc: Doc | null): DesignerValidationResult;

package/dist/sdk/engine/index.d.ts

@@ -4,7 +4,7 @@
  */
 export { DocModeTypeConst, PageSizeEnumConst, BuiltinComponentTypeConst } from '../../core';
 export type { DocModeType, CompleteComponentType, BuiltinComponentType } from '../../core';
-export type { DocController, DocQueryAPI, WordRuntime, DocInfo, DocRuntimeMeta, DocRuntimeMetaHandleInfo, DocUnsavedChanges, DocGetUnsavedChangesOptions, UseWordProps, UseWordOptions, FieldModelQuery, } from '../types';
+export type { DocController, DocQueryAPI, WordRuntime, DocInfo, DocRuntimeMeta, DocRuntimeMetaHandleInfo, DocUnsavedChanges, DocGetUnsavedChangesOptions, DesignerValidationError, DesignerValidationResult, DesignerValidationSource, UseWordProps, UseWordOptions, FieldModelQuery, } from '../types';
 export type { Execute } from '../doc-runtime/factories/useDocumentFactory';
 export { useWord } from '../doc-runtime/useWord';
 export { useDocSuite } from '../doc-runtime/composables/useDocSuite';

package/dist/sdk/types/designer-validation.d.ts

@@ -0,0 +1,16 @@
+/** 设计态校验错误来源 */
+export type DesignerValidationSource = 'doc';
+/** 单条设计态校验错误 */
+export interface DesignerValidationError {
+    code: string;
+    message: string;
+    source: DesignerValidationSource;
+    /** 便于定位 */
+    path?: string;
+}
+/** 设计态校验结果 */
+export interface DesignerValidationResult {
+    valid: boolean;
+    errors: DesignerValidationError[];
+}
+export declare function createDesignerValidationResult(errors: DesignerValidationError[]): DesignerValidationResult;

package/dist/sdk/types/index.d.ts

@@ -6,7 +6,9 @@ import { DocBaselineContext, DocUnsavedChanges, DocOperations, DocGetUnsavedChan
 import { OnlineFormInstanceResponse, OnlineFormTmplResponse } from '@gct-paas/api/apaas';
 import { FieldChangeItem } from '../../runtime/interface/change-diff';
 import { FormTmplConfigController } from '../../suites/edhr/panel-schema/data-load/hooks/form-tmpl-config';
+import { DesignerValidationResult } from './designer-validation';
 export type { DocUnsavedChanges, DocGetUnsavedChangesOptions, } from '../doc-runtime/composables/useDocOperations';
+export type { DesignerValidationError, DesignerValidationResult, DesignerValidationSource, } from './designer-validation';
 export type { FieldModelQuery } from './field-model-query';
 /** 字段权限信息 */
 export interface FieldPermissionInfo {
@@ -81,6 +83,8 @@ export interface DocControllerMethods extends DocOperations {
     refreshData(): Promise<void>;
     /** 校验全量字段，返回错误映射；通过时返回 null */
     validate(): Promise<Record<string, string[]> | null>;
+    /** 设计态保存前校验；通过时 valid 为 true */
+    validateDesigner(): DesignerValidationResult;
     /** 导出当前文档模型 XmlJson（常用于保存） */
     exportModel(): any;
     /** 获取文档内附件路径列表（默认提取 fw:file 组件） */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",
@@ -34,8 +34,10 @@
   "scripts": {
     "build": "vite build",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx --fix",
-    "publish:beta": "pnpm build && npm publish --registry=https://registry.npmjs.org/ --access public --tag beta",
-    "publish:prod": "pnpm build && npm publish --registry=https://registry.npmjs.org/ --access public",
+    "version:beta": "npm version prerelease --preid=beta --no-git-tag-version",
+    "version:release": "npm version patch --no-git-tag-version",
+    "publish:beta": "pnpm run version:beta && pnpm run build && npm publish --registry=https://registry.npmjs.org/ --access public --tag beta",
+    "publish:prod": "pnpm run version:release && pnpm run build && npm publish --registry=https://registry.npmjs.org/ --access public",
     "test": "vitest run"
   },
   "dependencies": {