@gct-paas/word 0.1.5 → 0.1.7

package/dist/index.es.js

@@ -85,8 +85,20 @@ const pickElement = (raw, name) => {
 const pickAllElements = (raw, name) => {
   return raw.elements?.filter((n) => isElement(n) && n.name === name) || [];
 };
+function fallbackUUID() {
+  const bytes = new Uint8Array(16);
+  crypto?.getRandomValues?.(bytes);
+  bytes[6] = bytes[6] & 15 | 64;
+  bytes[8] = bytes[8] & 63 | 128;
+  const hex2 = [...bytes].map((b2) => b2.toString(16).padStart(2, "0"));
+  return hex2.slice(0, 4).join("") + "-" + hex2.slice(4, 6).join("") + "-" + hex2.slice(6, 8).join("") + "-" + hex2.slice(8, 10).join("") + "-" + hex2.slice(10, 16).join("");
+}
 function uuid() {
-  return crypto.randomUUID();
+  try {
+    return crypto.randomUUID();
+  } catch {
+    return fallbackUUID();
+  }
 }
 const halfPixel = (n) => Math.round(n) + 0.5;
 const isEmptyValue$1 = (value) => {
@@ -5846,7 +5858,7 @@ function findCharIndexFromOffsets(offsets, localX) {
   if (localX <= 0) return 0;
   let lo = 0;
   let hi = offsets.length - 1;
-  if (localX >= offsets[hi]) return hi;
+  if (localX >= offsets[hi]) return hi - 1;
   while (lo < hi) {
     const mid = Math.floor((lo + hi) / 2);
     if (offsets[mid] === localX) return mid;
@@ -22545,7 +22557,8 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
     modalContext: {},
     widgetType: {},
     widget: {},
-    modelValue: {}
+    modelValue: {},
+    modelKey: {}
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -22578,13 +22591,14 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
           ref: dialogRef,
           key: __props.widget.id,
           widget: __props.widget,
-          modelValue: __props.modelValue
-        }, null, 8, ["widget", "modelValue"]))
+          modelValue: __props.modelValue,
+          modelKey: __props.modelKey
+        }, null, 8, ["widget", "modelValue", "modelKey"]))
       ]);
     };
   }
 });
-const DialogContainer = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["__scopeId", "data-v-e86a747f"]]);
+const DialogContainer = /* @__PURE__ */ _export_sfc(_sfc_main$1S, [["__scopeId", "data-v-89fa975a"]]);
 const _sfc_main$1R = /* @__PURE__ */ defineComponent({
   __name: "overlay-render",
   props: {
@@ -22602,9 +22616,7 @@ const _sfc_main$1R = /* @__PURE__ */ defineComponent({
     const props = __props;
     const isTargetReady = ref(false);
     const isMenuShown = ref(false);
-    const { isDropdown, isDialog, isMultiple, valuePath, widgetType } = useWidgetStaticAttrs(
-      props.widget
-    );
+    const { isDropdown, isDialog, isMultiple, valuePath, widgetType, fieldInfo } = useWidgetStaticAttrs(props.widget);
     onMounted(() => {
       nextTick(() => {
         isTargetReady.value = true;
@@ -22634,7 +22646,8 @@ const _sfc_main$1R = /* @__PURE__ */ defineComponent({
           bodyProps: {
             widgetType: widgetType.value,
             widget: props.widget,
-            modelValue: modelValue.value
+            modelValue: modelValue.value,
+            modelKey: fieldInfo.value?.modelKey
           },
           onConfirm: async ({ bodyRef, close }) => {
             const savedValue = await bodyRef?.value?.onSave?.();
@@ -22703,7 +22716,7 @@ const _sfc_main$1R = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$1R, [["__scopeId", "data-v-980815e3"]]);
+const OverlayRender = /* @__PURE__ */ _export_sfc(_sfc_main$1R, [["__scopeId", "data-v-dbb8b01e"]]);
 let activeHoverId = 0;
 function useHoverDelay(callback, delay = 120) {
   let timer = null;
@@ -50373,54 +50386,6 @@ function applyDefaultValue(props, payload) {
   }
   return defaults2;
 }
-async function fetchLabelAndFill(defaults2, valuePath, id, fetcher, props, fallback) {
-  defaults2 ??= {};
-  defaults2[valuePath] = id;
-  try {
-    const result = await apiFetchers[fetcher].getOptionById(id, props);
-    if (result) {
-      defaults2[`${valuePath}_lb_`] = result.label;
-    }
-  } catch (error) {
-    console.error(`Failed to fetch label for ${valuePath}:`, error);
-    if (fallback) {
-      defaults2[`${valuePath}_lb_`] = fallback;
-    }
-  }
-  return defaults2;
-}
-async function enrichApiDefaultValues(defaults2, rule, fieldMeta, context, ctx) {
-  if (!rule || !("fetcher" in rule)) {
-    return defaults2;
-  }
-  const valuePath = fieldMeta.valuePath;
-  const id = context?.[fieldMeta.fieldType];
-  if (!id) {
-    return defaults2;
-  }
-  if (rule.type === "resolve") {
-    if (!rule.isRenderSideRequest) {
-      return defaults2;
-    }
-    return fetchLabelAndFill(defaults2, valuePath, id, rule.fetcher, {}, rule.fallback);
-  }
-  if (rule.type !== "api") {
-    return defaults2;
-  }
-  const apiRule = rule;
-  if (apiRule.onlyMainModelFieldsCanRequest && fieldMeta.subFieldKey) {
-    return defaults2;
-  }
-  const modelKey = getLastSegment(fieldMeta.modelLink);
-  const fieldKey = getLastSegment(fieldMeta.fieldLink);
-  const fieldInfo = await ctx.runtime.loadFieldByKey(modelKey, fieldKey);
-  const params = {
-    modelKey: fieldInfo?.modelKey || modelKey,
-    fieldKey: fieldInfo?.key || fieldKey,
-    refModelKey: fieldInfo?.bindInfo
-  };
-  return fetchLabelAndFill(defaults2, valuePath, id, apiRule.fetcher, params, apiRule.fallback);
-}
 let snapshotScheduled = false;
 function scheduleSnapshot(doc, defaults2) {
   if (snapshotScheduled) return;
@@ -56593,31 +56558,6 @@ function getDefaultQueryIdsByFieldType(payload) {
   };
   return defaultQueryIds;
 }
-async function loadDefaultValuesByFields(instances, ctx, context) {
-  const defaultDataMap = {};
-  const promises = instances.map(async (instance2) => {
-    const { field, props } = instance2.widgetMeta;
-    if (!field || !props) return;
-    const manifest2 = ctx.getFieldManifest(field.fieldType);
-    if (!manifest2?.computed) return;
-    const { defaultValueRule } = manifest2.computed;
-    let defaults2 = applyDefaultValue(props, {
-      rule: defaultValueRule,
-      valuePath: field.valuePath
-    });
-    if (defaultValueRule?.type === "api" || defaultValueRule?.type === "resolve" && defaultValueRule.isRenderSideRequest) {
-      defaults2 = await enrichApiDefaultValues(defaults2, defaultValueRule, field, context, ctx);
-    }
-    if (!defaults2) return;
-    for (const [key, value] of Object.entries(defaults2)) {
-      if (value != null) {
-        defaultDataMap[key] = value;
-      }
-    }
-  });
-  await Promise.all(promises);
-  return defaultDataMap;
-}
 class DocRequestStrategy {
   props;
   payload;
@@ -56729,8 +56669,11 @@ function useDocumentFactory(props, payload) {
     if (isEmpty(result)) return;
     console.log("tangjian 初始化单个文档", result, payload);
     const { id, requestInfo, fillModeType, paramsConfig } = result;
+    await addSubModelsToFieldScope(requestInfo.modelKey || payload.modelKey, payload.ctx);
     const cloneRuntimeJson = cloneDeep(JSON.parse(requestInfo.runtimeJson || "{}"));
     const docModel = ModelConverter.toModel(cloneRuntimeJson);
+    const instances = docModel.getWidgetInstances();
+    console.log("instances", instances);
     const defaultQueryIds = getDefaultQueryIdsByFieldType({
       materialNumber: paramsConfig?.materialNo || requestInfo.materialNo,
       productId: paramsConfig?.productId,
@@ -56740,11 +56683,6 @@ function useDocumentFactory(props, payload) {
       defaultOrgId: payload?.deviceConfig?.defaultOrgId
     });
     console.log("tangjian11111111", defaultQueryIds);
-    const instances = docModel.getWidgetInstances();
-    console.log("instances", instances);
-    await addSubModelsToFieldScope(requestInfo.modelKey || payload.modelKey, payload.ctx);
-    const defaultDataMap = await loadDefaultValuesByFields(instances, payload.ctx, defaultQueryIds);
-    console.log("tangjian11111111 defaultDataMap", defaultDataMap);
     docEngine.value = createDoc({
       model: docModel,
       mode: fillModeType,
@@ -56757,7 +56695,6 @@ function useDocumentFactory(props, payload) {
         console.log(`Document [${id}] selection changed`);
       }
     });
-    docEngine.value.docInstance.dataManager.setDefaults(defaultDataMap);
     docInfo.value = createDocInfo(docEngine.value?.docInstance);
     selfInfo.value = requestInfo;
   }
@@ -58526,7 +58463,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               item.realProgress = p;
               item.progress = Math.max(item.progress, p);
             },
-            signal: controller.signal
+            signal: controller.signal,
+            modelKey: props.modelKey
           });
           if (item.timer) {
             clearInterval(item.timer);
@@ -58584,7 +58522,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       emit("update:modelValue", urls.join(","));
     }
     function preview(item) {
-      previewUrl.value = item.url || item.preview || "";
+      previewUrl.value = AssetHelper.resolveUrl(item.url) || item.preview || "";
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$2, [
@@ -58664,7 +58602,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseUploadImage = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-c678fbef"]]);
+const BaseUploadImage = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-8bb642d3"]]);
 const _hoisted_1$1 = { class: "upload-image-dialog" };
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "upload-image-dialog",
@@ -58688,7 +58626,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         /** 最大上传数量 */
         maxCount: isAdaptive ? 1 : item.maxCount,
         /** 支持的格式数组 */
-        accept: item.acceptTypes && item.acceptTypes.length ? item.acceptTypes : defaultImageAccept
+        accept: item.acceptTypes && item.acceptTypes.length ? item.acceptTypes : defaultImageAccept,
+        modelKey: props.modelKey
       };
     });
     function onSave() {
@@ -58707,7 +58646,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const uploadImageDialog = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-bf75511f"]]);
+const uploadImageDialog = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-94fa7669"]]);
 const uploadImageDialog$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: uploadImageDialog
@@ -58891,7 +58830,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const signatureDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c2e1d23e"]]);
+const signatureDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b244172e"]]);
 const signatureDialog$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: signatureDialog

package/dist/runtime/renderer/dialogs/dialog-container.vue.d.ts

@@ -6,7 +6,8 @@ type __VLS_Props = {
     /** Widget 配置对象 */
     widget: WidgetNode;
     /** 当前选中的值 */
-    modelValue?: string;
+    modelValue: string;
+    modelKey: string;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {
     onSave: () => Promise<any>;

package/dist/runtime/renderer/dialogs/signature/signature-dialog.vue.d.ts

@@ -3,8 +3,8 @@ import { WidgetNode } from '../../../canvas/types';
 type __VLS_Props = {
     widgetType: ExternalComponentType;
     widget: WidgetNode;
-    modelValue?: string;
-    modelKey?: string;
+    modelValue: string;
+    modelKey: string;
     enableSignPassword?: number;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {

package/dist/runtime/renderer/dialogs/upload-image/base-upload-image.vue.d.ts

@@ -3,7 +3,7 @@ type __VLS_Props = {
     maxCount?: number;
     maxSize?: number;
     accept?: string[];
-    modelKey?: string;
+    modelKey: string;
 };
 declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (...args: any[]) => void;

package/dist/runtime/renderer/dialogs/upload-image/upload-image-dialog.vue.d.ts

@@ -5,8 +5,8 @@ type __VLS_Props = {
     /** Widget 配置对象 */
     widget: WidgetNode;
     /** 当前选中的值 */
-    modelValue?: string;
-    modelKey?: string;
+    modelValue: string;
+    modelKey: string;
 };
 declare function onSave(): {
     [x: string]: any;

package/dist/utils/ServiceUtil.d.ts

@@ -2,6 +2,7 @@ type ParseFileMethod = (file: File) => Promise<any>;
 type UploadPayload = {
     onProgress?: (p: number) => void;
     signal?: AbortSignal;
+    modelKey?: string;
 };
 type UploadFileMethod = (file: File, payload?: UploadPayload) => Promise<any>;
 declare class ServiceUtil {

package/dist/word.css

@@ -2034,13 +2034,13 @@ input[data-v-2deda526]::placeholder {
   padding: 16px;
   min-height: 100px;
 }
-.dialog-container[data-v-e86a747f] {
+.dialog-container[data-v-89fa975a] {
   background-color: #fff;
   overflow: hidden;
   width: 100%;
   height: 100%;
 }
-.widget-container-action[data-v-980815e3] {
+.widget-container-action[data-v-dbb8b01e] {
   position: absolute;
   inset: 0;
   z-index: 999;
@@ -2048,7 +2048,7 @@ input[data-v-2deda526]::placeholder {
   height: 0;
   pointer-events: all;
 }
-.picker-trigger[data-v-980815e3] {
+.picker-trigger[data-v-dbb8b01e] {
   width: 100%;
   height: 100%;
   display: flex;
@@ -9363,14 +9363,14 @@ svg.portrait-icon[data-v-8bdb451e] {
   gap: 12px;
   padding-bottom: 12px;
 }
-.base-upload-modal[data-v-c678fbef] {
+.base-upload-modal[data-v-8bb642d3] {
   position: relative;
   width: 100%;
 }
-.base-upload-modal .upload-dragger[data-v-c678fbef] {
+.base-upload-modal .upload-dragger[data-v-8bb642d3] {
   position: relative;
 }
-.base-upload-modal .upload-dragger .upload[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload[data-v-8bb642d3] {
   border: 1px dashed #d9d9d9;
   background: #f7f8fa;
   border-radius: 2px;
@@ -9380,42 +9380,42 @@ svg.portrait-icon[data-v-8bdb451e] {
   text-align: center;
   transition: border-color 0.3s;
 }
-.base-upload-modal .upload-dragger .upload[data-v-c678fbef]:hover {
+.base-upload-modal .upload-dragger .upload[data-v-8bb642d3]:hover {
   border-color: #026ac8;
 }
-.base-upload-modal .upload-dragger .upload.dragover[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload.dragover[data-v-8bb642d3] {
   border-color: #026ac8;
   background: #eef6ff;
 }
-.base-upload-modal .upload-dragger .upload .input[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload .input[data-v-8bb642d3] {
   display: none;
 }
-.base-upload-modal .upload-dragger .upload .upload-content[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload .upload-content[data-v-8bb642d3] {
   position: relative;
   padding: 24px;
 }
-.base-upload-modal .upload-dragger .upload .upload-content .icon[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload .upload-content .icon[data-v-8bb642d3] {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.base-upload-modal .upload-dragger .upload .upload-content .text[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload .upload-content .text[data-v-8bb642d3] {
   margin-top: 4px;
   font-size: 14px;
   line-height: 24px;
 }
-.base-upload-modal .upload-dragger .upload.is-disabled[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload.is-disabled[data-v-8bb642d3] {
   cursor: not-allowed;
   background: #fafafa;
   border-color: #e5e6eb;
 }
-.base-upload-modal .upload-dragger .upload.is-disabled[data-v-c678fbef]:hover {
+.base-upload-modal .upload-dragger .upload.is-disabled[data-v-8bb642d3]:hover {
   border-color: #e5e6eb;
 }
-.base-upload-modal .upload-dragger .upload.is-disabled .upload-content[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .upload.is-disabled .upload-content[data-v-8bb642d3] {
   opacity: 0.4;
 }
-.base-upload-modal .upload-dragger .img-box[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .img-box[data-v-8bb642d3] {
   display: flex;
   gap: 12px;
   flex-wrap: wrap;
@@ -9423,16 +9423,16 @@ svg.portrait-icon[data-v-8bdb451e] {
   padding-top: 8px;
   padding-bottom: 8px;
 }
-.base-upload-modal .upload-dragger .scrollbar[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .scrollbar[data-v-8bb642d3] {
   position: relative;
   margin-top: 8px;
 }
-.base-upload-modal .upload-dragger .img-item[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .img-item[data-v-8bb642d3] {
   width: 80px;
   height: 80px;
   position: relative;
 }
-.base-upload-modal .upload-dragger .img[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .img[data-v-8bb642d3] {
   display: block;
   width: 100%;
   height: 100%;
@@ -9441,7 +9441,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   cursor: pointer;
   background-color: #f7f8fa;
 }
-.base-upload-modal .upload-dragger .delete[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .delete[data-v-8bb642d3] {
   position: absolute;
   top: -6px;
   right: -6px;
@@ -9454,7 +9454,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   justify-content: center;
   cursor: pointer;
 }
-.base-upload-modal .upload-dragger .progress[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .progress[data-v-8bb642d3] {
   position: absolute;
   bottom: 0;
   left: 0;
@@ -9462,14 +9462,14 @@ svg.portrait-icon[data-v-8bdb451e] {
   height: 2px;
   background: rgba(0, 0, 0, 0.06);
 }
-.base-upload-modal .upload-dragger .progress-inner[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .progress-inner[data-v-8bb642d3] {
   height: 100%;
   background: #026ac8;
   position: relative;
   border-radius: 100px;
   transition: all 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
 }
-.base-upload-modal .upload-dragger .preview-mask[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .preview-mask[data-v-8bb642d3] {
   position: fixed;
   inset: 0;
   background: rgba(0, 0, 0, 0.4);
@@ -9478,48 +9478,48 @@ svg.portrait-icon[data-v-8bdb451e] {
   justify-content: center;
   z-index: 9999;
 }
-.base-upload-modal .upload-dragger .preview-mask img[data-v-c678fbef] {
+.base-upload-modal .upload-dragger .preview-mask img[data-v-8bb642d3] {
   max-width: 80%;
   max-height: 80%;
 }
-.upload-image-dialog[data-v-bf75511f] {
+.upload-image-dialog[data-v-94fa7669] {
   position: relative;
   overflow: hidden;
   width: 100%;
   height: 100%;
 }
-.signature-form .form-row[data-v-c2e1d23e] {
+.signature-form .form-row[data-v-b244172e] {
   display: flex;
   align-items: center;
   margin-bottom: 24px;
   gap: 16px;
   padding-right: 24px;
 }
-.signature-form .form-footer[data-v-c2e1d23e] {
+.signature-form .form-footer[data-v-b244172e] {
   display: flex;
   justify-content: flex-end;
   gap: 24px;
   font-size: 14px;
   padding-right: 24px;
 }
-.signature-form .form-footer .form-button[data-v-c2e1d23e] {
+.signature-form .form-footer .form-button[data-v-b244172e] {
   color: #0b57d0;
   cursor: pointer;
 }
-.signature-form .label[data-v-c2e1d23e] {
+.signature-form .label[data-v-b244172e] {
   width: 100px;
   text-align: right;
   line-height: 32px;
   color: rgba(0, 0, 0, 0.85);
   font-size: 13px;
 }
-.signature-form .label[data-v-c2e1d23e]:after {
+.signature-form .label[data-v-b244172e]:after {
   content: ':';
   margin: 0 2px 0 2px;
   position: relative;
   top: -0.5px;
 }
-.signature-form .label.required[data-v-c2e1d23e]::before {
+.signature-form .label.required[data-v-b244172e]::before {
   color: #ff4d4f;
   content: '*';
   display: inline-block;
@@ -9528,13 +9528,13 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 1;
   margin-right: 4px;
 }
-.signature-form .control[data-v-c2e1d23e] {
+.signature-form .control[data-v-b244172e] {
   flex: 1;
   display: flex;
   align-items: center;
   position: relative;
 }
-.signature-form .error[data-v-c2e1d23e] {
+.signature-form .error[data-v-b244172e] {
   color: #ff4d4f;
   font-size: 12px;
   position: absolute;

package/package.json

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