hoeditor-web 3.1.15 → 3.1.16

package/lib/hoeditor.umd.js

@@ -62313,7 +62313,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         }
 
         var result = (0,_editor_utils_ExpressionCalculator__WEBPACK_IMPORTED_MODULE_30__/* .expressionCalculator */ .C)(strFormula);
-        strRet = result.toString() == "NaN" ? " " : result.toString();
+        strRet = result == "NaN" ? " " : result;
       }
       return strRet;
     }
@@ -93516,6 +93516,15 @@ var DrawSimpleText = /*#__PURE__*/function (_createjs$Text) {
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(40561);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39714);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(56977);
+/* harmony import */ var core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_to_fixed_js__WEBPACK_IMPORTED_MODULE_10__);
+
+
+
 
 
 
@@ -93788,7 +93797,17 @@ function expressionCalculator(expr) {
         break;
     }
   }
-  return stNum[0];
+  if (stNum[0].toString() === "NaN") {
+    return "NaN";
+  } else {
+    var valStr = stNum[0].toFixed(2);
+    var valArr = valStr.split(".");
+    if (valArr[1] == "00") {
+      return valArr[0];
+    } else {
+      return valStr;
+    }
+  }
   // console.log(stNum[0]);
 }
 
@@ -106572,7 +106591,7 @@ if(frame.interlaced===true){scanstride+=width*4*7;// Pass 1.
 for(var i=0,il=index_stream.length;i<il;++i){var index=index_stream[i];if(xleft===0){// Beginning of new scan line
 op+=scanstride;xleft=framewidth;if(op>=opend){// Catch the wrap to switch passes when interlacing.
 scanstride=framestride*4+width*4*(interlaceskip-1);// interlaceskip / 2 * 4 is interlaceskip << 1.
-op=opbeg+(framewidth+framestride)*(interlaceskip<<1);interlaceskip>>=1;}}if(index===trans){// 将Gif格式图片透明背景强制转换为白色 已测试不影响正常png格式图片
+op=opbeg+(framewidth+framestride)*(interlaceskip<<1);interlaceskip>>=1;}}if(index===trans){// 自定义修改 将Gif格式图片透明背景强制转换为白色 已测试不影响正常png格式图片
 // op += 4;
 pixels[op++]=255;pixels[op++]=255;pixels[op++]=255;pixels[op++]=255;}else{var r=buf[palette_offset+index*3];var g=buf[palette_offset+index*3+1];var b=buf[palette_offset+index*3+2];pixels[op++]=r;pixels[op++]=g;pixels[op++]=b;pixels[op++]=255;}--xleft;}};}function GifReaderLZWOutputIndexStream(code_stream,p,output,output_length){var min_code_size=code_stream[p++];var clear_code=1<<min_code_size;var eoi_code=clear_code+1;var next_code=eoi_code+1;var cur_code_size=min_code_size+1;// Number of bits per code.
 // NOTE: This shares the same name as the encoder, but has a different
@@ -217832,7 +217851,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.15');
+/* harmony default export */ var version = ('3.1.16');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -230923,6 +230942,7 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var commentsMap = hoEditorFactory.drawTree.commentsMap;
       var arr = [];
+      var transformScale = DrawConfig/* DrawConfig */.f.instance().transformScale;
       commentsMap.forEach(function (comment) {
         var pos = comment.getPosition();
         if (arr[pos[0]] == undefined) {
@@ -230938,8 +230958,8 @@ var VueController = /*#__PURE__*/function () {
           date: comment.date,
           customProperty: comment.customProperty,
           pageIndex: pos[0],
-          endNodeX: Math.floor(pos[1]),
-          endNodeY: Math.floor(pos[2]),
+          endNodeX: Math.floor(pos[1] / transformScale),
+          endNodeY: Math.floor(pos[2] / transformScale),
           reviewJson: hoEditorFactory.reviewJson
         };
         arr[pos[0]].push(obj);