@gct-paas/word 0.1.63-beta.8 → 0.1.63-beta.9

package/dist/index.es.js

@@ -108002,33 +108002,16 @@ const DefaultDocxJson = {
   fontTable,
   footers
 };
-const updatePgSzElInfo = (pgSz, paperSize, options) => {
-  const direction = options?.direction ?? "portrait";
-  let width = 11906;
-  let height = 16838;
-  switch (paperSize) {
-    case PaperSizeConst.A3:
-      width = 16838;
-      height = 23811;
-      break;
-    case PaperSizeConst.A5:
-      width = 8391;
-      height = 11906;
-      break;
-    case PaperSizeConst.CUSTOM:
-      width = Number(UnitConverter.mmToTwip(options.width));
-      height = Number(UnitConverter.mmToTwip(options.height));
-      break;
-    default:
-      width = 11906;
-      height = 16838;
-      break;
-  }
-  if (direction === "landscape") {
-    [width, height] = [height, width];
-  }
-  pgSz["@attrs"]["w:w"] = String(width);
-  pgSz["@attrs"]["w:h"] = String(height);
+const getDirectedSize = (direction, mmWidth, mmHeight) => {
+  const [short, long] = [mmWidth, mmHeight].sort((a, b2) => a - b2);
+  const isLandscape = direction === "landscape";
+  const width = isLandscape ? long : short;
+  const height = isLandscape ? short : long;
+  return { width, height };
+};
+const updatePgSzElInfo = (pgSz, mmWidth, mmHeight) => {
+  pgSz["@attrs"]["w:w"] = String(UnitConverter.mmToTwip(mmWidth));
+  pgSz["@attrs"]["w:h"] = String(UnitConverter.mmToTwip(mmHeight));
 };
 class RuntimeJsonBuilder {
   json;
@@ -108051,10 +108034,11 @@ class RuntimeJsonBuilder {
   /**
    * 页面设置
    */
-  setPageSize(paperSize, options) {
+  setPageSize(mmWidth, mmHeight) {
     const pgSz = this.findNode(this.json.document, "w:pgSz");
-    if (!pgSz) return this;
-    updatePgSzElInfo(pgSz, paperSize, options);
+    if (pgSz) {
+      updatePgSzElInfo(pgSz, mmWidth, mmHeight);
+    }
     return this;
   }
   /**
@@ -109505,14 +109489,13 @@ const syncMaterialConsumeTableBomInfo = async (templateId, docModel) => {
 };
 const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
   if (!tmplBomC?.formInstBom?.formTmplBomList) return;
+  const useBomMode = tmplBomC.defaultMCPattern === MaterialConsumptionPatternEnum.BOM;
   tmplBomC.formInstBom.formTmplBomList.forEach(({
-    material_consumption_pattern_,
     personal_bom_enabled_,
     entries_,
     table_key_
   }) => {
-    const isBomMode = material_consumption_pattern_ === MaterialConsumptionPatternEnum.BOM;
-    if (isBomMode) {
+    if (useBomMode) {
       const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
       const includedIds = [];
       (entries || []).forEach((e) => {
@@ -109672,32 +109655,28 @@ class SingleTemplateStrategy extends DocRequestStrategy {
       console.warn(`Document template ${id} not found`);
       return null;
     }
-    const { baseId, id: tmpId } = requestInfo;
+    const {
+      baseId,
+      id: tmpId,
+      paperSize,
+      direction,
+      width: w2,
+      height: h2
+    } = requestInfo;
+    const { width, height } = getDirectedSize(direction, w2, h2);
+    requestInfo.width = width;
+    requestInfo.height = height;
     if (!requestInfo.runtimeJson) {
-      const json = new RuntimeJsonBuilder(DefaultDocxJson).setPageSize(requestInfo.paperSize, {
-        width: requestInfo.width,
-        height: requestInfo.height,
-        direction: requestInfo.direction
-      }).build();
+      const json = new RuntimeJsonBuilder(DefaultDocxJson).setPageSize(width, height).build();
       requestInfo.runtimeJson = JSON.stringify(json);
     } else {
       const jsonObj = JSON.parse(requestInfo.runtimeJson);
       const wSec = jsonObj.document.elements[0]?.elements?.find((el) => el.name === "w:sectPr");
       if (wSec) {
-        wSec.paperSize = requestInfo.paperSize;
+        wSec.paperSize = paperSize;
         const pgSzEl = wSec.elements?.find((el) => el.name === "w:pgSz");
         if (pgSzEl) {
-          const { paperSize, width: w2, height: h2, direction } = requestInfo;
-          const [width, height] = [w2, h2].sort();
-          updatePgSzElInfo(
-            pgSzEl,
-            paperSize,
-            {
-              width,
-              height,
-              direction
-            }
-          );
+          updatePgSzElInfo(pgSzEl, width, height);
         }
         requestInfo.runtimeJson = JSON.stringify(jsonObj);
       }
@@ -124072,7 +124051,7 @@ const manifest$j = {
     ...commonDefaultProps
   },
   computed: {
-    onValueChangeRule: idOnValueChangeRule
+    onValueChangeRule: [...hyperlinkAndIdOnValueChangeRules]
   }
 };
 const __vite_glob_0_53 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -127440,9 +127419,13 @@ const _hoisted_1$1w = {
 };
 const _sfc_main$1U = /* @__PURE__ */ defineComponent({
   __name: "page-size-config",
+  props: {
+    orientation: {}
+  },
   setup(__props) {
     const { docInst } = useDocPubApiContext();
     const { active, widget } = useActivePanel();
+    const props = __props;
     const isCustom = (s) => s === PaperSizeConst.CUSTOM;
     const paperSizeOptions = Object.entries(PaperSizeConst).map(([paperSize2, value]) => {
       const label = isCustom(paperSize2) ? "自定义" : `${paperSize2} (${PaperSizeMmMap[paperSize2].join("×")}mm)`;
@@ -127477,6 +127460,15 @@ const _sfc_main$1U = /* @__PURE__ */ defineComponent({
       const [mmWidth, mmHeight] = PaperSizeMmMap[_sizeEnum];
       handlePageSizeChange(mmWidth, mmHeight);
     };
+    watch(
+      () => props.orientation,
+      () => {
+        const { mmWidth, mmHeight } = activeSecSize.value;
+        const { width, height } = getDirectedSize(props.orientation, mmWidth, mmHeight);
+        activeSecSize.value.mmWidth = width;
+        activeSecSize.value.mmHeight = height;
+      }
+    );
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         createVNode(unref(GctFormItem), {
@@ -127532,7 +127524,7 @@ const _sfc_main$1U = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const PageSizeConfig = /* @__PURE__ */ _export_sfc(_sfc_main$1U, [["__scopeId", "data-v-e735bbe5"]]);
+const PageSizeConfig = /* @__PURE__ */ _export_sfc(_sfc_main$1U, [["__scopeId", "data-v-0c96db84"]]);
 const _hoisted_1$1v = { style: { "display": "flex", "align-items": "center" } };
 const _hoisted_2$V = { class: "form-item-end" };
 const _hoisted_3$F = { style: { "margin-top": "8px" } };
@@ -127727,7 +127719,7 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_3$E, [
-              createVNode(PageSizeConfig),
+              createVNode(PageSizeConfig, { orientation: orient.value }, null, 8, ["orientation"]),
               createVNode(unref(GctFormItem), {
                 label: "页面方向",
                 inline: false
@@ -127790,7 +127782,7 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const PaperPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["__scopeId", "data-v-09c58e04"]]);
+const PaperPanel = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["__scopeId", "data-v-243a03df"]]);
 const schema$j = {
   key: "paper.basic",
   title: "表单属性",

package/dist/sdk/doc-runtime/factories/runtime-json-builder.d.ts

@@ -1,10 +1,3 @@
-import { PaperSize } from '../../../core/constants';
-interface IPageSizeOptions {
-    width: number;
-    height: number;
-    direction?: 'portrait' | 'landscape';
-}
-export declare const updatePgSzElInfo: (pgSz: any, paperSize: PaperSize, options: IPageSizeOptions) => void;
 export declare class RuntimeJsonBuilder {
     private json;
     constructor(base: any);
@@ -12,10 +5,9 @@ export declare class RuntimeJsonBuilder {
     /**
      * 页面设置
      */
-    setPageSize(paperSize: PaperSize, options: IPageSizeOptions): this;
+    setPageSize(mmWidth: number, mmHeight: number): this;
     /**
      * 构建
      */
     build(): any;
 }
-export {};

package/dist/suites/edhr/panel-schema/paper/modules/page-size-config/index.d.ts

@@ -0,0 +1,12 @@
+import { VOrientationType } from '../../../../../../domain/constants/enum';
+/**
+ * 根据纸张方向计算实际展示的宽、高（单位mm）
+ */
+export declare const getDirectedSize: (direction: VOrientationType, mmWidth: number, mmHeight: number) => {
+    width: number;
+    height: number;
+};
+/**
+ * 更新 sec 下 pgSz 的 twip 尺寸信息
+ */
+export declare const updatePgSzElInfo: (pgSz: any, mmWidth: number, mmHeight: number) => void;

package/dist/suites/edhr/panel-schema/paper/modules/page-size-config/page-size-config.vue.d.ts

@@ -0,0 +1,6 @@
+import { VOrientationType } from '../../../../../../domain/constants/enum';
+type __VLS_Props = {
+    orientation: VOrientationType;
+};
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+export default _default;

package/dist/word.css

@@ -10540,7 +10540,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   height: 36px;
   color: #bebdc7;
 }
-.page-size-custom-setting[data-v-e735bbe5] {
+.page-size-custom-setting[data-v-0c96db84] {
   margin: 12px 0;
   display: flex;
   align-items: center;
@@ -10559,10 +10559,10 @@ svg.portrait-icon[data-v-8bdb451e] {
   width: 240px;
   color: #666;
 }
-.panel-paper[data-v-09c58e04] {
+.panel-paper[data-v-243a03df] {
   position: relative;
 }
-.panel-paper .container[data-v-09c58e04] {
+.panel-paper .container[data-v-243a03df] {
   padding: 16px;
 }
 .qrcode-parse-modal[data-v-7a8c7960] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.63-beta.8",
+  "version": "0.1.63-beta.9",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",

package/dist/suites/edhr/panel-schema/paper/modules/page-size-config.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-export default _default;