hoeditor-web 3.2.29 → 3.2.32

package/lib/hoeditor.mjs

@@ -1,5 +1,5 @@
 import "vue";
-import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-BSu6xkui.mjs";
+import { H as i, d as r, b as e, a as l, e as t, T as H, f as d, i as f } from "./index-DwjHgIT9.mjs";
 export {
   i as HoDocs,
   r as HoEditorProvide,

package/lib/{index-BSu6xkui.mjs → index-DwjHgIT9.mjs}

@@ -5393,7 +5393,7 @@ class CombineStyle {
           r *= this.scale;
           break;
       }
-    let o = this._bold ? "bold " : "", n = this.font.replace(/宋体|黑体|微软雅黑/g, "SimSun");
+    let o = this._bold ? "bold " : "", n = this.font.replace(/宋体|黑体|微软雅黑/g, "SimSun").replace(/仿宋/g, "FangSong");
     return this.font == "黑体" && (o = "bold "), (this._italic ? "italic " : "") + o + r + "px " + n;
   }
   /**
@@ -10414,7 +10414,7 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
           if (m >= 0 && g >= 0 && m < d.rowCount && g < d.colCount) {
             const [v, C] = this.getCellNumber(d, m, g);
             if (v)
-              isNaN(Number(C)) ? s[f] = "0" : s[f] = Number(C).toString().replace(/\+|-/g, "");
+              C.trim() == "" ? s[f] = "" : isNaN(Number(C)) ? s[f] = "0" : s[f] = Number(C).toString().replace(/\+|-/g, "");
             else {
               u = !1;
               break;
@@ -10426,7 +10426,7 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
         else
           this._cellRange.push([y, w]);
     }
-    if (!t)
+    if (!t || s.filter(Boolean).length == 0)
       return " ";
     if (u) {
       const f = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
@@ -10700,18 +10700,13 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
         let f = d.getCellText(), p = u.getCellText();
         if (!f || !p) return t;
         if (f.indexOf("年") >= 0 && f.indexOf("时") >= 0 && (f = dateFormat(f, "yyyy-MM-dd HH:mm:ss")), p.indexOf("年") >= 0 && p.indexOf("时") >= 0 && (p = dateFormat(p, "yyyy-MM-dd HH:mm:ss")), f.indexOf("年") >= 0 && f.indexOf("时") == -1 && (f = dateFormat(f, "yyyy/MM/dd")), p.indexOf("年") >= 0 && p.indexOf("时") == -1 && (p = dateFormat(p, "yyyy/MM/dd")), f.indexOf("-") >= 0 && f.indexOf(" ") == -1 && (f = dateFormat(f, "yyyy/MM/dd")), p.indexOf("-") >= 0 && p.indexOf(" ") == -1 && (p = dateFormat(p, "yyyy/MM/dd")), isDate(f) && isDate(p)) {
-          const m = new Date(f), g = new Date(p), y = m.getHours(), w = g.getHours();
-          if (y === 0 && w === 0) {
-            const v = Date.UTC(m.getFullYear(), m.getMonth(), m.getDate()), C = Date.UTC(g.getFullYear(), g.getMonth(), g.getDate()), _ = Math.abs(C - v);
-            let S = Math.floor(_ / (1e3 * 60 * 60 * 24));
-            return S == 0 && (S = 1), S.toString() + /* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.35", null, "天");
-          } else {
-            const v = g.getTime() - m.getTime();
-            if (v < 0) return "";
-            const C = Math.floor(v / (1e3 * 60)), _ = Math.floor(C / 60), S = C % 60, E = _ % 24, T = Math.floor(_ / 24);
-            let I = "";
-            return T > 0 && (I += `${T}天`), E > 0 && (I += `${E}小时`), (S > 0 || I === "") && (I += `${S}分钟`), I || "0";
-          }
+          const m = new Date(f), g = new Date(p);
+          m.getHours(), g.getHours();
+          const y = g.getTime() - m.getTime();
+          if (y < 0) return "";
+          const w = Math.floor(y / (1e3 * 60)), v = Math.floor(w / 60), C = w % 60, _ = v % 24, S = Math.floor(v / 24);
+          let E = "";
+          return S > 0 && (E += `${S}天`), _ > 0 && (E += `${_}小时`), (C > 0 || E === "") && (E += `${C}分钟`), E || "0";
         }
       }
     }
@@ -14909,7 +14904,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.29";
+const version = "3.2.32";
 var FingerPosition = /* @__PURE__ */ ((a) => (a[a.left = 0] = "left", a[a.center = 1] = "center", a[a.right = 2] = "right", a))(FingerPosition || {});
 class SignNode extends BaseNode {
   constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar, otherProperties, dataId, associatedElement, isTemp, innerIdentifier) {
@@ -64190,7 +64185,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-Ch-T0w8y.mjs");
+      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-C7GsGahP.mjs");
     }().catch(function(r) {
       return Promise.reject(new Error("Could not load canvg: " + r));
     }).then(function(r) {
@@ -65481,22 +65476,21 @@ class PrintController {
     })), f = f.then(() => new Promise((m) => {
       Print.createPDFBase64(this._hoEditorFactoryID, m, this.PDF);
     }));
-    const p = await f.then((m) => {
-      var y, w;
-      o.drawTree.paintStatus = s, o.vueController.openXml(l);
-      const g = this.PDF.internal.getNumberOfPages() - m;
-      if (g >= 2)
-        for (let v = 0; v < g; v++)
-          (y = this.PDF) == null || y.deletePage(1);
-      else g <= 1 && ((w = this.PDF) == null || w.deletePage(1));
-      return new Promise((v) => {
-        let C = "";
-        r == "url" ? C = this.PDF.output("bloburl") : C = this.PDF.output("datauristring"), t && t && t({
+    const p = await f.then((m) => (o.drawTree.paintStatus = s, new Promise((g) => {
+      o.vueController.openXml(l).then(() => {
+        var v, C;
+        const y = this.PDF.internal.getNumberOfPages() - m;
+        if (y >= 2)
+          for (let _ = 0; _ < y; _++)
+            (v = this.PDF) == null || v.deletePage(1);
+        else y <= 1 && ((C = this.PDF) == null || C.deletePage(1));
+        let w = "";
+        r == "url" ? w = this.PDF.output("bloburl") : w = this.PDF.output("datauristring"), t && t && t({
           page: m,
-          pdf: C.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")
-        }), v(C);
+          pdf: w.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")
+        }), g(w);
       });
-    });
+    })));
     return p ? (setTimeout(() => {
       o.vueController.moveCaretToPath(n), this.clearJsPDF();
     }, 0), r == "url" ? p : p.replace(/^data:application\/pdf;filename=generated.pdf;base64,/, "")) : null;
@@ -82965,6 +82959,16 @@ const HoDocs = __component__$s.exports, _sfc_main$r = defineComponent({
         { ch: "arial", en: "arial", family: "arial" },
         { ch: "Times New Roman", en: "Times New Roman", family: "Times New Roman" },
         { ch: "himalaya", en: "himalaya", family: "himalaya(藏语字体)" }
+        // { 
+        //   "ch": "仿宋", 
+        //   "en": "FangSong", 
+        //   "family": "仿宋, FangSong, STFangsong, serif" 
+        // },
+        // { 
+        //   "ch": "黑体", 
+        //   "en": "SimHei", 
+        //   "family": "黑体, SimHei, Heiti SC, sans-serif" 
+        // },
       ],
       fontSize: fontSizes,
       isSuperScript: !1,

package/lib/{index.es-Ch-T0w8y.mjs → index.es-C7GsGahP.mjs}

@@ -1,4 +1,4 @@
-import { c as Ma, _ as qa, g as Zu } from "./index-BSu6xkui.mjs";
+import { c as Ma, _ as qa, g as Zu } from "./index-DwjHgIT9.mjs";
 var un = {}, ln = {}, lr, hn;
 function Z() {
   if (hn) return lr;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hoeditor-web",
-    "version": "3.2.29",
+    "version": "3.2.32",
     "private": false,
     "main": "lib/hoeditor.mjs",
     "typings": "types/index.d.ts",