hoeditor-web 3.1.138 → 3.1.140

package/lib/hoeditor.umd.js

@@ -54155,12 +54155,14 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
     key: "placeDNode2DrawLine",
     value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_12__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var paintStatus = hoEditorFactory.drawTree.paintStatus;
       var startIndex = start;
       if (startIndex >= 1) {
         return dline;
       }
       var drawNode = this._drawNodes[0];
-      if (hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint && hoEditorFactory.drawTree.paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psReview) {
+      var isDraw = true;
+      if (paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview && paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint && paintStatus !== _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psReview) {
         drawNode.alpha = 1;
         //const color = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).option.getColorByLevel(0);
         for (var i = 0; i < drawNode.children.length; i++) {
@@ -54179,16 +54181,15 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
             drawNode.children.splice(_i, 1);
           }
         }
-        if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint) {
+        if (paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPreview || paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_11__/* .PaintState */ .Dh.psPrint) {
           if (this.associatedElement) {
             var nodes = hoEditorFactory.vueController.getNodesById("main", true, this.associatedElement);
             if (nodes.length > 0) {
               for (var j = 0; j < nodes.length; j++) {
                 var node = nodes[j];
-                //const result = NodePosition.nodePositionCompare(this, node);
-                //if (result < 0 && node.text == "") {
                 if (node.text == "") {
                   drawNode.alpha = 0;
+                  isDraw = hoEditorFactory.isDrawEmptyNode;
                   break;
                 }
               }
@@ -54196,8 +54197,10 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
           }
         }
       }
-      dline.addChild(drawNode);
-      dline.drawItems.push(drawNode);
+      if (isDraw) {
+        dline.addChild(drawNode);
+        dline.drawItems.push(drawNode);
+      }
       dline.fitLines();
       dline.updateLineStyle();
       return dline.paragraphNode.getLastDrawline();
@@ -54841,16 +54844,18 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
         return dline;
       }
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var paintStatus = hoEditorFactory.drawTree.paintStatus;
       var style = hoEditorFactory.docTree.styles[this.styleIndex];
       if (!style) {
         style = hoEditorFactory.docTree.styles[0];
         this.styleIndex = 0;
       }
       var isDelete = style.deleterIndex === undefined || style.deleterIndex === -1 ? false : true; //是否是逻辑删除的状态
-      var isDisplay = hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psReview ? true : false; //逻辑删除的节点是否显示
+      var isDisplay = paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psReview ? true : false; //逻辑删除的节点是否显示
+      var isDraw = true; // 元素为空时是否绘制
       if (!isDelete || isDisplay) {
         var disPlay = true;
-        if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
+        if (paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
           if (this.MarkNodeType === MarkNodeType.mtContent) {
             if (this.text.length > 0 && (0,jquery__WEBPACK_IMPORTED_MODULE_21__.trim)(this.text) === "") {
               disPlay = true;
@@ -54865,7 +54870,7 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
           var drawNode = this._drawNodes[0];
           if (disPlay) {
             drawNode.alpha = 1;
-            if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
+            if (paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
               for (var index = 0; index < drawNode.children.length; index++) {
                 var child = drawNode.children[index];
                 if (child.name === "MarkIcon") {
@@ -54875,7 +54880,7 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
             }
           } else {
             drawNode.alpha = 0.01;
-            if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
+            if (paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
               drawNode.alpha = 0.00;
             }
           }
@@ -54886,12 +54891,15 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
             if (disPlay) {
               _drawNode.alpha = 1;
             } else {
-              if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
+              if (paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPreview || paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psPrint) {
                 _drawNode.alpha = 0.00;
+                isDraw = hoEditorFactory.isDrawEmptyNode;
               }
             }
-            dline.addChild(_drawNode);
-            dline.drawItems.push(_drawNode);
+            if (isDraw) {
+              dline.addChild(_drawNode);
+              dline.drawItems.push(_drawNode);
+            }
           }
         }
         dline.fitLines();
@@ -54903,7 +54911,6 @@ var MarkNode = /*#__PURE__*/function (_BaseNode) {
     key: "add2DrawTree",
     value: function add2DrawTree(dRoots) {
       if (this._drawNodes.length === 0) {
-        // this.node2DrawNode();
         var dline = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_19__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeParaNode(this).getLastDrawline();
         // this.placeDNode2DrawLine(dRoots,dline.paragraphNode, 0,this._text.length-1);
       }
@@ -67961,7 +67968,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         return dline;
       }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      var endnode = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
+      // const endnode = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
       var isEnd = false;
       for (var index = 0; index < this.childNodes.length; index++) {
         var value = this.childNodes[index];
@@ -68040,7 +68047,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         }
       }
       if (isEnd) {
-        //this.EndMarkNode.node2DrawNode();
         aline = this.EndMarkNode.placeDNode2DrawLine(droots, paraNode, aline, start, start + this.EndMarkNode.getLength() - 1, endPath);
       }
       if (this.hideDuringPrint && !this.isEmpty() && (hoEditorFactory.drawTree.paintStatus == DrawTree/* PaintState */.Dh.psPreview || hoEditorFactory.drawTree.paintStatus == DrawTree/* PaintState */.Dh.psPrint)) {
@@ -210278,7 +210284,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.138');
+/* harmony default export */ var version = ('3.1.140');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -215343,13 +215349,6 @@ var StructureConvert = /*#__PURE__*/function () {
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TableFormula>', "</node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '<End>', '<node>');
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</End>', '</node>');
-      //const reg2 = new RegExp(/\<([\<A-z\>]*)\>\/|\<\/end\>|\<\/ParagraphNode\>/g)
-      //xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TextNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TextNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<ParagraphNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</ParagraphNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TableNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TableNode>', "</node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '<PupilMapNode>', "<node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</PupilMapNode>', "</node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '<LightLocationMapNode>', "<node>");
@@ -215362,40 +215361,6 @@ var StructureConvert = /*#__PURE__*/function () {
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</PermanentTeethMapNode>', "</node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '<PrimaryTeethMapNode>', "<node>");
       xml = hoEditorFactory.unitConvert.replaceAll(xml, '</PrimaryTeethMapNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<ImageNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</ImageNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<BarcodeNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</BarcodeNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<QrcodeNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</QrcodeNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<DateTimeNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</DateTimeNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<DownListNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</DownListNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<RadioAndCheckBoxNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</RadioAndCheckBoxNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TextInputFieldNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TextInputFieldNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<SpecialCharsNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</SpecialCharsNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<MarkNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</MarkNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<PageCountNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</PageCountNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<PageNumNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</PageNumNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TableFormula>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TableFormula>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<End>', '<node>');
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</End>', '</node>');
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<CellNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</CellNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<SeparateCharNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</SeparateCharNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<LabelNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</LabelNode>', "</node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '<SignNode>', "<node>");
-      // xml = hoEditorFactory.unitConvert.replaceAll(xml, '</SignNode>', "</node>");
       return xml;
     }
     /**
@@ -215865,8 +215830,7 @@ var StructureConvert = /*#__PURE__*/function () {
       }
       this._comments = [];
       if (!isClearSign) {
-        var comments = xx.comments;
-        this._comments = comments.comment;
+        this._comments = xx.comments.comment || [];
       }
       this._errors = [];
       var errors = xx.errors;
@@ -223421,6 +223385,9 @@ var VueController = /*#__PURE__*/function () {
         for (var i = 0; i < nodes.length; i++) {
           var node = nodes[i];
           if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re || node instanceof DownListNode/* DownListNode */.yF || node instanceof DateTimeNode/* DateTimeNode */.Z) {
+            var xml = x2js.js2xml(node.node2Json());
+            xml = hoEditorFactory.unitConvert.replaceAll(xml, '<TempNode>', '');
+            xml = hoEditorFactory.unitConvert.replaceAll(xml, '</TempNode>', '');
             var elementObj = {
               id: node.id,
               dataId: node.dataId,
@@ -223438,7 +223405,8 @@ var VueController = /*#__PURE__*/function () {
               notReplaceElement: node.notReplaceElement,
               keyValue: '',
               value: '',
-              contentHtml: x2js.js2xml(node.node2Json())
+              contentHtml: xml,
+              content: node.text && node.text != node.name ? node.text : ''
             };
             if (!(node instanceof TextInputFieldNode/* TextInputFieldNode */.re)) {
               elementObj.controlType = node.type;
@@ -237783,12 +237751,15 @@ var PrintController = /*#__PURE__*/function () {
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              text = this.createSvg();
+              _context2.next = 2;
+              return this.createSvg();
+            case 2:
+              text = _context2.sent;
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               orientation = hoEditorFactory.pageProperty.widthMm > hoEditorFactory.pageProperty.heightMm ? 'l' : 'p';
               printStyle = (0,plugins_util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
               return _context2.abrupt("return", "\n            <!DOCTYPE html>\n            <html lang=\"en\">\n                <head>\n                    <meta charset=\"utf-8\">\n                    <style>".concat(printStyle.innerHTML, "</style>\n                </head>\n                <body>").concat(text, "</body>\n            </html>\n        "));
-            case 5:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -239916,12 +239887,14 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "reviewMode", false);
     // 临时审阅标记
     (0,esm_defineProperty/* default */.Z)(this, "innerIdentifierList", []);
+    // 内部标识符列表
+    (0,esm_defineProperty/* default */.Z)(this, "isDrawEmptyNode", true);
     this._hoEditorFactoryId = id;
   }
   (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
     key: "hoLocalStorage",
     get:
-    // 内部标识符列表
+    // 元素内容为空时是否绘制(文本域元素和关联文本域的标签元素)
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}