hoeditor-web 3.1.170 → 3.1.171

package/lib/hoeditor.umd.js

@@ -18605,7 +18605,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 14278:
+/***/ 88684:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -18621,7 +18621,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=082cc123&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=108877c7&
 
 
 var render = function render() {
@@ -19439,7 +19439,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=082cc123&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=108877c7&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
 var slicedToArray = __webpack_require__(27222);
@@ -19848,10 +19848,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=082cc123&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=108877c7&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=082cc123&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=108877c7&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -55060,6 +55060,11 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
       }
       this._dStyleKey = cbStyle.getStyleKey();
       this._dColor = "#838586";
+      if (hoEditorFactorys.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || hoEditorFactorys.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
+        if (this.MarkNodeType === MarkNodeType.mtContent) {
+          this._dColor = "#fff";
+        }
+      }
       this._dHeight = hoEditorFactorys.getFontHeightByFontSize(cbStyle.size);
       this._dCombineStyle = cbStyle;
     }
@@ -55131,7 +55136,7 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
             if (this.text.length > 0 && (0,jquery__WEBPACK_IMPORTED_MODULE_21__.trim)(this.text) === "") {
               disPlay = true;
             } else {
-              disPlay = false;
+              disPlay = true;
             }
           }
         }
@@ -81314,6 +81319,10 @@ var SpecialCharsNode = __webpack_require__(61024);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__(26699);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
+var es_string_includes = __webpack_require__(32023);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
 var es_error_cause = __webpack_require__(21703);
 // EXTERNAL MODULE: ./src/editor/utils/UnitConvert.ts
@@ -81332,6 +81341,8 @@ var HOEditorFactorys = __webpack_require__(74089);
 
 
 
+
+
 var DrawText = /*#__PURE__*/function (_createjs$Text) {
   (0,inherits/* default */.Z)(DrawText, _createjs$Text);
   var _super = (0,createSuper/* default */.Z)(DrawText);
@@ -81519,26 +81530,35 @@ var DrawText = /*#__PURE__*/function (_createjs$Text) {
       this._firstCharWidth = this.getCharWidth(ctx, str[0]);
       for (var j = 0, jl = str.length; j < jl; j++) {
         // Line needs to wrap:
-        var wordW = this.getCharWidth(ctx, str[j]);
+        var strj = str[j];
+        // if(strj == '\r' || strj == '\n') {
+        //     strj = ' ';
+        //     console.log(JSON.stringify(str), strj)
+        // }
+        var wordW = this.getCharWidth(ctx, strj);
         if (ctx instanceof CanvasRenderingContext2D) {
           if (this.outline) {
-            ctx.strokeText(str[j], left, 0, this.maxWidth || 0xffff);
+            ctx.strokeText(strj, left, 0, this.maxWidth || 0xffff);
           } else {
-            ctx.fillText(str[j], left, 0, this.maxWidth || 0xffff);
+            ctx.fillText(strj, left, 0, this.maxWidth || 0xffff);
           }
         }
         left += wordW + this._letterSpacing;
         docWidth += wordW;
       }
       if (!(ctx instanceof CanvasRenderingContext2D)) {
+        var printStr = str;
+        if (printStr.includes("\n") || printStr.includes("\r")) {
+          printStr = printStr.replace(/\n|\r/g, ' ');
+        }
         if (this.outline) {
-          ctx.strokeText(str, 0, 0, docWidth || this._maxWidth);
+          ctx.strokeText(printStr, 0, 0, docWidth || this._maxWidth);
         } else {
           if (this.font.indexOf("bold") != -1) {
             ctx.strokeStyle = ctx.fillStyle;
-            ctx.strokeText(str, 0, 0, docWidth || this._maxWidth);
+            ctx.strokeText(printStr, 0, 0, docWidth || this._maxWidth);
           }
-          ctx.fillText(str, 0, 0, docWidth || this._maxWidth);
+          ctx.fillText(printStr, 0, 0, docWidth || this._maxWidth);
         }
       }
       this._docWidth = docWidth;
@@ -168494,7 +168514,7 @@ var map = {
 	"./specialChars/HoSpecialChars.vue": 75058,
 	"./table/TableCellPoper.vue": 21166,
 	"./table/TableCellPoper1.vue": 44645,
-	"./table/TableCellProperty.vue": 14278,
+	"./table/TableCellProperty.vue": 88684,
 	"./table/TableColProperty.vue": 3828,
 	"./table/TableForm.vue": 79036,
 	"./table/TableFormTree.vue": 84804,
@@ -209126,7 +209146,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.170');
+/* harmony default export */ var version = ('3.1.171');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -215311,114 +215331,7 @@ var StructureConvert = /*#__PURE__*/function () {
             hoEditorFactory.vueController.hiddenMask(true);
           }
         }
-        /*
-        //错别字检测
-        let errors = [];
-        if (this._errors.length === undefined) {
-          errors = Array(this._errors);
-        } else {
-          errors = this._errors;
-        }
-        if (errors.length > 0) {
-          for (let m = 0; m < errors.length; m++) {
-            const tips = [];
-            const error = errors[m];
-            let datas = error.data;
-            if (datas.length == undefined) {
-              datas = Array(datas);
-            }
-            for (let d = 0; d < datas.length; d++) {
-              const data = datas[d];
-              tips.push("错误:" + data.wrong + ",正确:" + data.correct);
-            }
-            hoEditorFactory.drawTree.errorsMap.set(m, tips);
-          }
-                  //const selectRangeArr: SelectRange[] = [];
-                  for (let n = 0; n < this._errTextNodes.length; n++) {
-            const node = this._errTextNodes[n];
-            const drawNodes = node.drawNodes;
-            const errIndex = this._errTextNodes[n].errorIndex as number;
-            const error = errors[errIndex];
-            let datass = error.data;
-            if (datass.length == undefined) {
-              datass = Array(datass);
-            }
-            for (let t = 0; t < datass.length; t++) {
-              const adata = datass[t];
-              const start = adata.start as number;
-              const end = adata.end as number;
-              for (let k = 0; k < drawNodes.length; k++) {
-                const drawNode = drawNodes[k] as DrawTextNode;
-                const drawMark = ((width: number) => {
-                  const h = 0.5;
-                  const line1 = new createjs.Shape();
-                  line1.graphics.clear();
-                  line1.graphics
-                    .beginStroke("#F31A1A")
-                    .moveTo(0, 1 + 2 * h)
-                    .lineTo(width + drawNode._wspace + 1, 1 + 2 * h);
-                  drawNode.addChild(line1);
-                          const line2 = new createjs.Shape();
-                  line2.graphics.clear();
-                  line2.graphics
-                    .beginStroke("#F31A1A")
-                    .moveTo(0, 8 * h)
-                    .lineTo(width + drawNode._wspace + 1, 8 * h);
-                  drawNode.addChild(line2);
-                });
-                const dtext = drawNode.dText as DrawText;
-                if (start >= dtext.startIndex) {
-                  if (end <= dtext.endIndex) {
-                    drawMark(16);
-                    break;
-                  } else {
-                    //drawMark()
-                  }
-                } else {
-                  if (end <= dtext.endIndex) {
-                    //drawMark()
-                    break;
-                  } else {
-                    //drawMark()
-                  }
-                }
-              }
-              // const ePath = hoEditorFactory.docTree.getNodeLastPath(node);
-              // const eindexArr = ePath.split("/");
-              // const eindex = eindexArr[eindexArr.length - 1];
-              // if (Number(adata.start) < 0 || Number(adata.start) > Number(eindex)) {
-              //   message.warn("文本节点(" + node.text + ')的起始位置有误：' + adata.start + "。(索引" + errIndex.toString() + ")");
-              //   return;
-              // }
-              // if (Number(adata.end) < 0 || Number(adata.end) > Number(eindex)) {
-              //   message.warn("文本节点(" + node.text + ')的结束位置有误：' + adata.end + "。(索引" + errIndex.toString() + ")");
-              //   return;
-              // }
-              // const sPath = hoEditorFactory.docTree.getNodeFirstPath(node);
-              // const pathArr = sPath.split("/");
-              // pathArr[pathArr.length - 1] = adata.start;
-              // const rsPath = pathArr.join("/");
-              // pathArr[pathArr.length - 1] = adata.end;
-              // const rePath = pathArr.join("/");
-              // const pStartPoint = StagePosition.getStagePosByPath(this._hoEditorFactoryID, rsPath);
-              // const pEndPoint = StagePosition.getStagePosByPath(this._hoEditorFactoryID, rePath);
-              // const selectRange = new SelectRange(this._hoEditorFactoryID);
-              // selectRange.spStart = pStartPoint;
-              // selectRange.spEnd = pEndPoint;
-              // selectRangeArr.push(selectRange);
-            }
-          }
-          */
-        // if (selectRangeArr.length > 0) {
-        //   hoEditorFactory.drawTree.drawMultiMarks(selectRangeArr, true, true);
-        // }
-        //}
-        //模板加载完成后  开始加载数据集
-        // if (test) {
-        //   const data =hoEditorFactory.testDataSet.getTestJsonData();
-        //   const jsonData = JSON.parse(JSON.stringify(data));
-        //   this.loadDataSet(jsonData);
-        // }
+        hoEditorFactory.vueController.getCurTextStyle();
         callback && callback({
           text: hoEditorFactory.vueController.getDocTitle(),
           count: 0
@@ -224771,10 +224684,14 @@ var VueController = /*#__PURE__*/function () {
                   selectRangeArr = selectRangeArr.concat(range);
                 }
               } else if (item.text === '' && isCurrent) {
-                var _range = _this6.search(anode, anode.text);
-                if (_range.length > 0) {
-                  selectRangeArr = selectRangeArr.concat(_range);
-                }
+                var sPath = hoEditorFactory.docTree.getNodeLastPath(anode.previousLeaf());
+                var ePath = hoEditorFactory.docTree.getNodeLastPath(anode);
+                var pStartPoint = StagePosition/* StagePosition */.M.getStagePosByPath(_this6._hoEditorFactoryID, sPath);
+                var pEndPoint = StagePosition/* StagePosition */.M.getStagePosByPath(_this6._hoEditorFactoryID, ePath);
+                var selectRange = new SelectRange/* SelectRange */.E(_this6.hoEditorFactoryID);
+                selectRange.spStart = pStartPoint;
+                selectRange.spEnd = pEndPoint;
+                selectRangeArr.push(selectRange);
               }
             }
           }