hoeditor-web 3.2.28 → 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-CkGezwsU.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-CkGezwsU.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);
@@ -10626,32 +10626,43 @@ let TableFormula$1 = class _TableFormula extends ControlNode {
       }
     return t;
   }
+  getHeightNum(t) {
+    if (t) {
+      const r = this.getParentCell().table;
+      let o = 0;
+      const [n, s] = this.getRowColByCellAdress(t);
+      if (n >= 0 && s >= 0 && r.rows[n] && r.rows[n][s]) {
+        const [c, d] = this.getCellNumber(r, n, s);
+        if (c && d)
+          return o = Number(d), o;
+      }
+    }
+    return !1;
+  }
   clacBodySurfaceArea() {
     let t = " ";
     const r = this.getParentCell().table;
     this.formulaStr == "" && message.warn(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.442", null, "体重的单元格编号传入有误:") + this.formulaStr);
     const o = this.formulaStr.split("__");
-    let n, s, l, c, d = 0;
+    let n, s, l = 0;
     if (o[0] && ([n, s] = this.getRowColByCellAdress(o[0]), n >= 0 && s >= 0)) {
       if (!r.rows[n]) return t;
       if (r.rows[n][s]) {
-        const [f, p] = this.getCellNumber(r, n, s);
-        f && p && (d = Number(p));
-      }
-    }
-    if (o[2] != "1" && d) {
-      let u = 0;
-      return d > 30 ? u = 1.05 + (d - 30) * 0.02 : u = 0.035 * d + 0.1, u.toFixed(2);
-    } else if (d) {
-      let u = 0;
-      if (o[1] && ([l, c] = this.getRowColByCellAdress(o[1]), l >= 0 && c >= 0)) {
-        if (!r.rows[l]) return t;
-        if (r.rows[l][c]) {
-          const [p, m] = this.getCellNumber(r, l, c);
-          if (p && m)
-            return u = Number(m), (61e-4 * u + 0.0128 * d - 0.1529).toFixed(4);
-        }
-      }
+        const [d, u] = this.getCellNumber(r, n, s);
+        d && u && (l = Number(u));
+      }
+    }
+    if (o[2] == "2") {
+      const c = this.getHeightNum(o[1]);
+      if (typeof c == "number" && l)
+        return (7184e-6 * Math.pow(l, 0.425) * Math.pow(c, 0.725)).toFixed(4);
+    } else if (o[2] != "1" && l) {
+      let c = 0;
+      return l > 30 ? c = 1.05 + (l - 30) * 0.02 : c = 0.035 * l + 0.1, c.toFixed(2);
+    } else if (l) {
+      const c = this.getHeightNum(o[1]);
+      if (typeof c == "number")
+        return (61e-4 * c + 0.0128 * l - 0.1529).toFixed(4);
     }
     return t;
   }
@@ -10689,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";
         }
       }
     }
@@ -14898,7 +14904,7 @@ class DrawSignNode extends DrawCombineNode {
     }
   }
 }
-const version = "3.2.28";
+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) {
@@ -39605,23 +39611,30 @@ class HTMLconverter2 {
         }
       for (let y = 0; y < g.length; y++) {
         const w = new Array(), v = Array.from(g[y].children);
-        for (let C = 0; C < d; C++)
-          if (v[C]) {
-            const _ = parseInt(v[C].getAttribute("rowspan") || "1"), S = parseInt(v[C].getAttribute("colspan") || "1");
-            if (_ > 1)
-              for (let E = y + 1; E < y + _; E++)
+        let C = [];
+        for (let _ = 0; _ < v.length; _++) {
+          const S = parseInt(v[_].getAttribute("colspan") || "1");
+          if (C.push(v[_]), S > 1) {
+            const E = Array(S - 1).fill(void 0);
+            C = C.concat(E);
+          }
+        }
+        for (let _ = 0; _ < d; _++)
+          if (C[_]) {
+            const S = parseInt(C[_].getAttribute("rowspan") || "1"), E = parseInt(C[_].getAttribute("colspan") || "1");
+            if (S > 1)
+              for (let T = y + 1; T < y + S; T++)
                 f.push({
-                  rowCount: E,
-                  colCount: C
+                  rowCount: T,
+                  colCount: _
                 });
-            if (S > 1)
-              for (let E = C + 1; E < C + S; E++)
+            if (E > 1)
+              for (let T = _ + 1; T < _ + E; T++)
                 u.push({
                   rowCount: y,
-                  colCount: E
+                  colCount: T
                 });
-          } else
-            v[C] = void 0;
+          }
         w.push(...v), l.push(w);
       }
     }
@@ -64172,7 +64185,7 @@ WebPDecoder.prototype.getData = function() {
 (function(a) {
   function t() {
     return function() {
-      return globalObject.canvg ? Promise.resolve(globalObject.canvg) : import("./index.es-DJ05PGDj.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) {
@@ -65463,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;
@@ -76246,11 +76258,11 @@ var _sfc_render$S = function a() {
     }, expression: "item.range[1]" } }), r("span", { staticStyle: { padding: "0 10px" } }, [t._v(" :")]), r("a-input", { staticClass: "ft-score-mapping-input ft-score-mapping-textarea", staticStyle: { width: "173px" }, attrs: { type: "textarea", autocomplete: "off" }, model: { value: o.text, callback: function(s) {
       t.$set(o, "text", s);
     }, expression: "item.text" } })], 1);
-  }), r("li", [r("a-button", { on: { click: t.addFtScoreMappingItem } }, [r("a-icon", { staticStyle: { "font-size": "20px" }, attrs: { type: "folder-add" } })], 1)], 1)], 2)])]) : t.formula === "bodySurfaceArea" ? r("section", [t._m(0), r("a-radio-group", { staticStyle: { "font-size": "14px" }, attrs: { size: "large" }, model: { value: t.bodySurfaceAreaType, callback: function(o) {
+  }), r("li", [r("a-button", { on: { click: t.addFtScoreMappingItem } }, [r("a-icon", { staticStyle: { "font-size": "20px" }, attrs: { type: "folder-add" } })], 1)], 1)], 2)])]) : t.formula === "bodySurfaceArea" ? r("section", [r("div", { staticStyle: { "line-height": "20px", "font-size": "14px" } }, [r("div", { directives: [{ name: "show", rawName: "v-show", value: t.bodySurfaceAreaType == "0", expression: "bodySurfaceAreaType == '0'" }] }, [r("p", { staticStyle: { "font-weight": "bold" } }, [t._v(" 体表面积公式1: ")]), r("p", [t._v(" ")]), r("p", { staticStyle: { "margin-bottom": "6px" } }, [t._v("体重 > 30kg "), r("a-tag", { attrs: { color: "blue" } }, [t._v("BSA (m²) = 1.05 + (体重(kg) - 30) * 0.02")])], 1), r("p", [t._v("体重 <= 30kg "), r("a-tag", { attrs: { color: "blue" } }, [t._v("BSA (m²) = 0.035 * 体重(kg) + 0.1")])], 1), r("p", [t._v(" ")])]), r("div", { directives: [{ name: "show", rawName: "v-show", value: t.bodySurfaceAreaType == "1", expression: "bodySurfaceAreaType == '1'" }] }, [t._m(0), r("p", [t._v(" ")]), r("p", [t._v("许文生公式(Mosteller 简化版): "), r("a-tag", { attrs: { color: "blue" } }, [t._v("BSA (m²) = 0.0061*身高 (cm) +0.0128*体重(kg) -0.1529")])], 1), r("p", [t._v(" ")])]), r("div", { directives: [{ name: "show", rawName: "v-show", value: t.bodySurfaceAreaType == "2", expression: "bodySurfaceAreaType == '2'" }] }, [r("p", { staticStyle: { "font-weight": "bold" } }, [t._v(" 体表面积公式3: ")]), r("p", [t._v(" ")]), r("p", [t._v("杜波依斯公式(DuBois): "), r("a-tag", { attrs: { color: "blue" } }, [t._v("BSA (m²) = 0.007184 * ( 体重(kg)"), r("sup", [t._v("0.425")]), t._v(" * 身高(cm)"), r("sup", [t._v("0.725")]), t._v(" )")])], 1), r("p", [t._v(" ")])])]), r("a-radio-group", { staticStyle: { "font-size": "14px" }, attrs: { size: "large" }, model: { value: t.bodySurfaceAreaType, callback: function(o) {
     t.bodySurfaceAreaType = o;
-  }, expression: "bodySurfaceAreaType" } }, [r("a-radio", { attrs: { value: "0" } }, [t._v("体表面积公式1")]), r("a-radio", { attrs: { value: "1" } }, [t._v("体表面积公式2"), r("span", { staticStyle: { color: "red" } }, [t._v("(推荐)")])])], 1), r("div", { staticClass: "ho-table-features-list" }, [r("p", [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.292", null, "体重"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "kg" }, model: { value: t.bodySurfaceAreaWeight, callback: function(o) {
+  }, expression: "bodySurfaceAreaType" } }, [r("a-radio", { attrs: { value: "0" } }, [t._v("体表面积公式1")]), r("a-radio", { attrs: { value: "1" } }, [t._v("体表面积公式2"), r("span", { staticStyle: { color: "red" } }, [t._v("(推荐)")])]), r("a-radio", { attrs: { value: "2" } }, [t._v("体表面积公式3")])], 1), r("div", { staticClass: "ho-table-features-list" }, [r("p", [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.292", null, "体重"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "kg" }, model: { value: t.bodySurfaceAreaWeight, callback: function(o) {
     t.bodySurfaceAreaWeight = o;
-  }, expression: "bodySurfaceAreaWeight" } })], 1), t.bodySurfaceAreaType == "1" ? r("div", { staticClass: "ho-table-features-list" }, [r("p", [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.bodySurfaceAreaHeight, callback: function(o) {
+  }, expression: "bodySurfaceAreaWeight" } })], 1), t.bodySurfaceAreaType == "1" || t.bodySurfaceAreaType == "2" ? r("div", { staticClass: "ho-table-features-list" }, [r("p", [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.bodySurfaceAreaHeight, callback: function(o) {
     t.bodySurfaceAreaHeight = o;
   }, expression: "bodySurfaceAreaHeight" } })], 1) : t._e()], 1) : t.formula === "idealWeight" ? r("section", [r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("示例：理想体重 = (身高cm)-105")]), r("div", { staticStyle: { height: "36px", "line-height": "36px" } }, [t._v("范围 = (0.9 * (身高(cm) - 105)) ~ (1.1 * (身高(cm) - 105)), 计算结果小于0时, 显示“?”")]), r("div", { staticClass: "ho-table-features-list" }, [r("span", { staticStyle: { "margin-right": "34px" } }, [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.293", null, "身高"))]), r("a-input", { attrs: { autocomplete: "off", "addon-after": "cm" }, model: { value: t.idealWeightHeight, callback: function(o) {
     t.idealWeightHeight = o;
@@ -76287,7 +76299,7 @@ var _sfc_render$S = function a() {
   }, expression: "curve.lineColor" } })], 1)]) : t._e()]), r("footer", { staticClass: "ho-modal-footer" }, [r("a-button", { attrs: { type: "primary" }, on: { click: t.sure } }, [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.347", null, "确定"))]), r("a-button", { staticStyle: { "margin-left": "30px" }, on: { click: t.handleClose } }, [t._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.346", null, "取消"))])], 1)]);
 }, _sfc_staticRenderFns$S = [function() {
   var a = this, t = a._self._c;
-  return t("div", { staticStyle: { "line-height": "20px", "font-size": "14px" } }, [t("p", [a._v(" 体表面积公式1 ")]), t("p", [a._v("体重>30kg 体表面积= 1.05 + (体重kg - 30) * 0.02")]), t("p", [a._v("体重<= 30kg 体表面积= 0.035 * 体重kg + 0.1")]), t("p", [a._v(" ")]), t("p", [a._v(" 体表面积公式2"), t("span", { staticStyle: { color: "red" } }, [a._v("(推荐)")])]), t("p", [a._v("BSA (m²) =0.0061*身高 (cm) +0.0128*体重(kg) -0.1529")]), t("p", [a._v(" ")])]);
+  return t("p", { staticStyle: { "font-weight": "bold" } }, [a._v(" 体表面积公式2: "), t("span", { staticStyle: { color: "red" } }, [a._v("(推荐)")])]);
 }, function() {
   var a = this, t = a._self._c;
   return t("p", { staticStyle: { "margin-top": "10px" } }, [t("span", [a._v(/* @__PURE__ */ i18nHelper("04-001-009-EMR.3.3.254", null, "单元格编号"))]), a._v(":")]);
@@ -82947,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-DJ05PGDj.mjs → index.es-C7GsGahP.mjs}

@@ -1,4 +1,4 @@
-import { c as Ma, _ as qa, g as Zu } from "./index-CkGezwsU.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.28",
+    "version": "3.2.32",
     "private": false,
     "main": "lib/hoeditor.mjs",
     "typings": "types/index.d.ts",