@gct-paas/word 0.1.42 → 0.1.44

package/dist/base/utils/asset-helper-util.d.ts

@@ -27,6 +27,7 @@ export declare class AssetHelper {
     static init(opts: {
         transfer: (key: string) => string;
     }): void;
+    private static normalizeUploadedPath;
     /** 上传（基础版） */
     static upload(file: File, opts?: UploadOptions): Promise<any>;
     /** 上传（带进度） */

package/dist/index.es.js

@@ -115,13 +115,22 @@ class AssetHelper {
   static init(opts) {
     this.transfer = opts.transfer;
   }
+  static normalizeUploadedPath(path2) {
+    if (!path2) return path2;
+    if (/^https?:\/\//.test(path2)) return path2;
+    return path2.startsWith("/") ? path2 : `/${path2}`;
+  }
   /** 上传（基础版） */
   static async upload(file, opts) {
-    return serviceUtil.uploadFile(file, {
+    const res = await serviceUtil.uploadFile(file, {
       modelKey: opts?.modelKey,
       signal: opts?.signal,
       onProgress: opts?.onProgress
     });
+    if (res?.data && typeof res.data === "string") {
+      res.data = this.normalizeUploadedPath(res.data);
+    }
+    return res;
   }
   /** 上传（带进度） */
   static async uploadWithProgress(file, opts = {}) {
@@ -32089,11 +32098,20 @@ class Enter extends CommandBase {
     const { nodeId, offset: offset2, side } = cursor.getCursor();
     const mapper = this.doc.layoutMapper;
     const run = mapper.getLayoutNodeById(nodeId);
+    const wpId = run?.parent?.modelRef?.id;
+    if (!run || !wpId) {
+      this.isTerminated = true;
+      return null;
+    }
     if (!this.doc.eventManager.policy.canInput(run)) {
       this.isTerminated = true;
       return null;
     }
-    const wp = mapper.getModelNodeById(run.parent.modelRef.id);
+    const wp = mapper.getModelNodeById(wpId);
+    if (!wp) {
+      this.isTerminated = true;
+      return null;
+    }
     let targetModelIndex = 0;
     if (!run.isPlaceholderRun) {
       if (run.isWidgetRun || run.isPageWidgetRun) {
@@ -40350,6 +40368,7 @@ class CommandManager {
   compositionUpdate(text) {
   }
   compositionEnd(text) {
+    if (!text) return;
     this.doc.commandManager.execute(CommandType.insertText, {
       text
     });
@@ -46547,10 +46566,11 @@ class IMEHandler {
     this.eventManager.doc.commandManager.compositionUpdate(data);
   }
   handleCompositionEnd(payload) {
-    const data = payload?.data ?? this.lastComposedText ?? "";
+    const data = payload?.data !== null && payload?.data !== void 0 ? payload.data : this.lastComposedText ?? "";
     this.lastComposedText = null;
     this.isComposing = false;
     this.lastCompositionCommitTime = performance.now();
+    if (!data) return;
     this.eventManager.doc.commandManager.compositionEnd(data);
   }
   handleInput(payload) {
@@ -46579,6 +46599,7 @@ class IMEHandler {
       case "delete":
         break;
       case "enter":
+        if (this.isComposing) return;
         doc.commandManager.execute(CommandType.enter);
         break;
       case "tab":
@@ -51118,8 +51139,18 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
       lastComposedText.value = data;
       dispatch("ime:compositionupdate", { data });
     }
+    function resolveCompositionEndData(e) {
+      if (e.data !== null && e.data !== void 0) {
+        return e.data;
+      }
+      const fromTextarea = ta2.value?.value ?? "";
+      if (fromTextarea !== lastComposedText.value) {
+        lastComposedText.value = fromTextarea;
+      }
+      return lastComposedText.value ?? "";
+    }
     function onCompositionEnd(e) {
-      const data = e.data ?? lastComposedText.value ?? "";
+      const data = resolveCompositionEndData(e);
       isComposing.value = false;
       pos.opacity = props.idleOpacity;
       lastComposedText.value = "";
@@ -51148,6 +51179,7 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
           }
           break;
         case "Enter":
+          if (isComposing.value) return;
           e.preventDefault();
           dispatch("ime:keydown", { type: "enter" });
           break;
@@ -51195,9 +51227,10 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
     function onBlur(e) {
       if (isComposing.value) {
         isComposing.value = false;
-        dispatch("ime:compositionend", { data: lastComposedText.value });
+        const data = ta2.value?.value ?? lastComposedText.value ?? "";
         lastComposedText.value = "";
         lastCompositionCommitTime.value = performance.now();
+        dispatch("ime:compositionend", { data });
       }
       dispatch("ime:blur", {});
     }
@@ -51296,7 +51329,7 @@ const _sfc_main$2X = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const HiddenInput = /* @__PURE__ */ _export_sfc(_sfc_main$2X, [["__scopeId", "data-v-58dae928"]]);
+const HiddenInput = /* @__PURE__ */ _export_sfc(_sfc_main$2X, [["__scopeId", "data-v-72d0b6f5"]]);
 function useLatestRequest(execFn) {
   let lastReqId = 0;
   const loading = ref(false);
@@ -51859,8 +51892,33 @@ function resolveSubmitCrossKeys(formData, subTableInfoList) {
   }
   return Object.keys(formData).filter((k) => k.includes(":"));
 }
+const handleSyncCheckValue = (row) => {
+  const { type_, value_ } = row;
+  if (type_ === "boolean") {
+    row.bool_value_ = value_;
+  } else if (type_ === "string") {
+    row.text_value_ = value_;
+  } else if (type_ === "integer") {
+    row.int_value_ = value_;
+  } else if (type_ === "decimal") {
+    row.double_value_ = value_;
+  } else if (type_ === "user") {
+    row.user_value_ = value_;
+  } else if (type_ === "org") {
+    row.org_value_ = value_;
+  } else if (type_ === "date") {
+    row.date_value_ = value_;
+  } else if (type_ === "date_time") {
+    row.date_time_value_ = value_;
+  } else if (type_ === "image") {
+    row.image_value_ = value_;
+  } else if (type_ === "attachment") {
+    row.attachment_value_ = value_;
+  }
+};
 function getSubmitFormData(formData, subTableInfoList) {
   const _formData = { ...formData };
+  const checkTableFieldList = (subTableInfoList || []).filter((o) => o.subType === "check-table-2d").map((o) => o.field);
   resolveSubmitCrossKeys(_formData, subTableInfoList).forEach((crossKey) => {
     const [subKey, linkKey] = crossKey.split(":");
     const subData = _formData[subKey] || [];
@@ -51882,6 +51940,7 @@ function getSubmitFormData(formData, subTableInfoList) {
     delete _formData[crossKey];
   });
   const realFormData = Object.keys(_formData).reduce((reducedData, fieldKey) => {
+    const isCheckTable = checkTableFieldList.includes(fieldKey);
     const fieldValue = _formData[fieldKey];
     if (Array.isArray(fieldValue)) {
       fieldValue.forEach((row) => {
@@ -51889,6 +51948,9 @@ function getSubmitFormData(formData, subTableInfoList) {
         if (__gw_x_uid) {
           row.group_ = __gw_x_uid;
         }
+        if (isCheckTable) {
+          handleSyncCheckValue(row);
+        }
       });
       reducedData[fieldKey] = _formData[fieldKey].map(
         (row) => Object.fromEntries(
@@ -100024,9 +100086,7 @@ async function addSubModelsToFieldScope(modelKey, ctx) {
   try {
     const res = await api.apaas.modelMeta.getListSlaveModel({ modelKey });
     const subModelKeys = Array.isArray(res) ? res.map((item) => item?.key || "").filter(Boolean) : [];
-    subModelKeys.forEach((subKey) => {
-      ctx.runtime.fieldScope.addModel(subKey);
-    });
+    await Promise.all(subModelKeys.map((subKey) => ctx.runtime.fieldScope.addModel(subKey)));
   } catch (error) {
     console.error("拉取子模型key失败", { modelKey, error });
     return;

package/dist/word.css

@@ -7572,7 +7572,7 @@ textarea[data-v-57fe54a3]::placeholder {
 .avatar--horizontal .avatar__name[data-v-b2773d93] {
   margin-left: 6px;
 }
-.hidden-input[data-v-58dae928] {
+.hidden-input[data-v-72d0b6f5] {
   position: absolute;
   resize: none;
   border: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",