hoeditor-web 2.0.76 → 2.0.79

package/lib/hoeditor.common.js

@@ -14775,8 +14775,9 @@ var DocController = /*#__PURE__*/function () {
               if (node.text !== "") {
                 node.childNodes.splice(1, node.childNodes.length - 2);
                 var textNode = new _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R(this._hoEditorFactoryID, node.rootNodes, node, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntText */ .Jq.ntText, values["text"], hoEditorFactory.docTree.curStyleIndex);
-                node.childNodes.splice(1, 0, textNode);
-                changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode); //changeEvent.afterChangePath = ePath;
+                node.childNodes.splice(1, 0, textNode); //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(textNode);
+
+                changeEvent.afterChangePath = ePath;
               }
             } else {
               //changeEvent.afterChangePath = hoEditorFactory.docTree.getNodeLastPath(node);
@@ -14787,6 +14788,10 @@ var DocController = /*#__PURE__*/function () {
             node.update();
             var pnode = node.parentNode;
 
+            if (pnode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re) {
+              pnode.update();
+            }
+
             do {
               var _pnode;
 
@@ -14800,9 +14805,9 @@ var DocController = /*#__PURE__*/function () {
             } while ((_pnode = pnode) !== null && _pnode !== void 0 && _pnode.parentNode);
 
             if (pnode instanceof _treeNode_CellNode__WEBPACK_IMPORTED_MODULE_57__/* .CellNode */ .D) {
-              pnode.drawCell.needUpdate = true; //增加判断只有多页表格才更新table.update,以处理编辑元素 卡慢问题
-
+              //增加判断只有多页表格才更新table.update,以处理编辑元素 卡慢问题
               if (pnode.drawCell.drawPageCells.length > 1) {
+                pnode.drawCell.needUpdate = true;
                 pnode.table.update();
               }
             }
@@ -15584,6 +15589,9 @@ var DocController = /*#__PURE__*/function () {
     value: function setCellProperty(objectValues, cellNode) {
       var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_58__/* .CellProperty */ .$W(objectValues);
       cellNode.cellProperty = cellProperty;
+      cellNode.drawCell.drawPageCells.forEach(function (pcell) {
+        pcell.valignTop = pcell.calcValignTop();
+      });
     }
     /**
      * 在当前页面添加页眉
@@ -25993,9 +26001,11 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
     key: "range",
     value: function range() {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_21__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var spath = hoEditorFactory.docTree.getNodeFirstPath(this);
+      var epath = hoEditorFactory.docTree.getNodeLastPath(this);
       return {
-        from: hoEditorFactory.docTree.getNodeFirstPath(this),
-        to: hoEditorFactory.docTree.getNodeLastPath(this)
+        from: spath,
+        to: epath
       };
     }
   }, {
@@ -37412,6 +37422,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 
       if (isCopy) {
         rows = pto.row;
+        cols = pto.col;
 
         if (to.colSpan > 1) {
           cols = pto.col + to.colSpan - 1;
@@ -38841,7 +38852,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2022-07-13 14:11:55
+ * @LastEditTime: 2022-07-28 09:25:18
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -40190,6 +40201,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_32__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var endnode = hoEditorFactory.docTree.findNodePositionByPath(endPath).node;
+      var isEnd = false;
 
       for (var index = 0; index < this.childNodes.length; index++) {
         var value = this.childNodes[index];
@@ -40215,11 +40227,20 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           value.placeDNodeAfterDrawLine(paraNode, aline, endPath);
           aline = value.drawTable;
         } else {
-          if (value == this.EndMarkNode) break;
+          if (value == this.EndMarkNode) {
+            isEnd = true;
+            break;
+          }
+
           aline = value.placeDNode2DrawLine(droots, paraNode, aline, start, start + value.getLength() - 1, endPath);
         }
 
-        if (_NodePosition__WEBPACK_IMPORTED_MODULE_35__/* .NodePosition.treePathCompare */ .F.treePathCompare(endPath, hoEditorFactory.docTree.getNodeLastPath(value)) <= 0) break;
+        var nodePath = hoEditorFactory.docTree.getNodeLastPath(value);
+        var cresult = _NodePosition__WEBPACK_IMPORTED_MODULE_35__/* .NodePosition.treePathCompare */ .F.treePathCompare(endPath, nodePath);
+
+        if (cresult <= 0) {
+          break;
+        }
       }
 
       aline.fitLines();
@@ -40250,8 +40271,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         }
       }
 
-      this.EndMarkNode.node2DrawNode();
-      aline = this.EndMarkNode.placeDNode2DrawLine(droots, paraNode, aline, start, start + this.EndMarkNode.getLength() - 1, endPath);
+      if (isEnd) {
+        this.EndMarkNode.node2DrawNode();
+        aline = this.EndMarkNode.placeDNode2DrawLine(droots, paraNode, aline, start, start + this.EndMarkNode.getLength() - 1, endPath);
+      }
+
       return aline.paragraphNode.getLastDrawline();
     }
   }, {
@@ -48347,13 +48371,19 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     _this._leftBorder = new createjs.Rectangle(dLeft, dTop, 2, dHeight);
     _this._rightBorder = new createjs.Rectangle(dLeft + dWidth - 2, dTop, 2, dHeight);
     _this._bottomBorder = new createjs.Rectangle(dLeft, dTop + dHeight - 2, dWidth, 2);
-    if (paintImidiate === undefined || paintImidiate) _this.paintArea(_this._cell.drawCell.drawLines, startLine, 0);
+    var innerTop = 0;
+
+    if (_this._cell.drawCell.drawPageCells.length == 0) {
+      innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(_this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+    }
+
+    if (paintImidiate === undefined || paintImidiate) _this.paintArea(_this._cell.drawCell.drawLines, startLine, innerTop);
 
     var rowIndex = _this._cell.table.rows.indexOf(_this._cell.row);
 
     var colIndex = _this._cell.row.indexOf(_this._cell);
 
-    _this._valignTop = 0; // let maxWidth = 0;
+    _this._valignTop = innerTop; // let maxWidth = 0;
     // let maxHeight = 0;
     // if (colIndex + this._cell.colSpan - 1 === this._cell.table.colCount - 1) {
     //   maxWidth = -1;
@@ -48459,8 +48489,23 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "updateDHeight",
     value: function updateDHeight() {
-      if (this._docHeight > this._dHeight) {
-        this._dHeight = this._docHeight;
+      var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
+      var innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+      var index = this.cell.drawCell.drawPageCells.indexOf(this);
+      var docHeight = 0;
+
+      if (index == 0 || index == this.cell.drawCell.drawPageCells.length - 1) {
+        if (index == 0 && index == this.cell.drawCell.drawPageCells.length - 1) {
+          docHeight = innerTop + this.docHeight + innerBottom;
+        } else if (index == 0) {
+          docHeight = innerTop + this.docHeight;
+        } else if (index == this.cell.drawCell.drawPageCells.length - 1) {
+          docHeight = innerBottom + this.docHeight;
+        }
+      }
+
+      if (docHeight > this._dHeight) {
+        this._dHeight = docHeight;
       }
 
       if (this._dHeight > this._maxHeight) {
@@ -48962,17 +49007,25 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
   }, {
     key: "calcValignTop",
     value: function calcValignTop() {
-      var valignTop = 0;
+      var index = this.cell.drawCell.drawPageCells.indexOf(this);
+      var innerTop = 0;
+
+      if (index == 0) {
+        innerTop = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[0] * 10, true);
+      }
+
+      var valignTop = innerTop;
 
       if (this._cell.cellProperty.align === TableProperty/* VAlign.vatop */.TR.vatop) {
-        valignTop = 0;
+        valignTop = innerTop;
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vacenter */.TR.vacenter) {
         var aHeight = this.calcCellHeight();
         if (aHeight > this._cell.drawCell.docHeight) valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
       } else if (this._cell.cellProperty.align === TableProperty/* VAlign.vabottom */.TR.vabottom) {
         var _aHeight = this.calcCellHeight();
 
-        if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight;
+        var innerBottom = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._cell.hoEditorFactoryID).unitConvert.mmConversionPx(this._cell.cellProperty.cellInnerMargin[1] * 10, true);
+        if (_aHeight > this._cell.drawCell.docHeight) valignTop = _aHeight - this._cell.drawCell.docHeight - innerBottom;
       }
 
       return valignTop;
@@ -49942,12 +49995,27 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 
       if (cell.rowSpan + r - 1 === row) {
         var partCell = cell.drawCell.getDrawPageCell(this);
+        var hoeditorfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._table.hoEditorFactoryID);
 
         if (partCell) {
           // const dobj = partCell.lastDrawLine;
-          var dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
+          var innerTop = hoeditorfactory.unitConvert.mmConversionPx(partCell.cell.cellProperty.cellInnerMargin[0] * 10, true);
+          var innerBottom = hoeditorfactory.unitConvert.mmConversionPx(partCell.cell.cellProperty.cellInnerMargin[1] * 10, true);
+          var dHeight = 0;
           var index = partCell.cell.drawCell.drawPageCells.indexOf(partCell);
 
+          if (index == 0 || index == partCell.cell.drawCell.drawPageCells.length - 1) {
+            if (index == 0 && index == partCell.cell.drawCell.drawPageCells.length - 1) {
+              dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight + innerBottom);
+            } else if (index == 0) {
+              dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerTop + partCell.docHeight);
+            } else if (index == partCell.cell.drawCell.drawPageCells.length - 1) {
+              dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, innerBottom + partCell.docHeight);
+            }
+          } else {
+            dHeight = Math.max(_editor_dom_treeNode_TableNode__WEBPACK_IMPORTED_MODULE_9__/* .gDefaultRowHeight */ .dT, partCell.docHeight);
+          }
+
           if (index === partCell.cell.drawCell.drawPageCells.length - 1 || this._table.rowInfos[r].rowProperty.repeatAsTitleAtPageTop) {
             if (cell.table.rowInfos[row].rowProperty.isSpecifyHeight) {
               var aHeight = cell.table.rowInfos[row].rowHeight;
@@ -51797,7 +51865,12 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 _fingerImage.onload = function () {
                   var fingerWidth = 256;
                   var fingerHeight = _fingerImage.naturalHeight !== 0 ? _fingerImage.naturalHeight : _fingerImage.height;
-                  var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15;
+                  var fingerscale = drawNode.fingerPosition == _editor_dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_6__/* .FingerPosition.center */ .d.center ? 0.3 : 0.15; // 已经缩放过的指纹图片 不需要再次缩放
+
+                  if (fingerWidth !== _fingerImage.naturalWidth) {
+                    fingerscale = 1;
+                  }
+
                   _fingerBitmap.scaleX = fingerscale;
                   _fingerBitmap.scaleY = fingerscale;
                   _fingerBitmap.y = -fingerHeight * fingerscale;
@@ -200605,15 +200678,15 @@ var DrawSelectLevel = /*#__PURE__*/function () {
     // });
 
     /*    case PaintState.psPreview: {
-          break;
-        }
-        case PaintState.psPrint: {
-          break;
-        } default: {
-          //this.mouseClick(aevent);
-          break;
-        }
-      }
+      break;
+    }
+    case PaintState.psPrint: {
+      break;
+    } default: {
+      //this.mouseClick(aevent);
+      break;
+    }
+    }
     });*/
     // this.mainBackGround.addEventListener("click", (aevent: any) => {
     //   this.mouseClick(aevent);
@@ -200669,7 +200742,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         } // }
 
 
-        this._selectStage.addEventListener("stagemousedown", function (aevent) {
+        this._selectStage.addEventListener('stagemousedown', function (aevent) {
           //  this.mouseDown(aevent)
           switch (hoEditorFactory.drawTree.paintStatus) {
             case DrawTree/* PaintState.psPreview */.Dh.psPreview:
@@ -200693,7 +200766,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
           }
         });
 
-        this._selectStage.addEventListener("stagemouseup", function (aevent) {
+        this._selectStage.addEventListener('stagemouseup', function (aevent) {
           // this.mouseup(aevent);
           switch (hoEditorFactory.drawTree.paintStatus) {
             case DrawTree/* PaintState.psPreview */.Dh.psPreview:
@@ -200717,7 +200790,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
           }
         });
 
-        this._selectStage.addEventListener("stagemousemove", function (aevent) {
+        this._selectStage.addEventListener('stagemousemove', function (aevent) {
           switch (hoEditorFactory.drawTree.paintStatus) {
             case DrawTree/* PaintState.psPreview */.Dh.psPreview:
               {
@@ -200832,7 +200905,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
     key: "mouseDblClick",
     value: function () {
       var _mouseDblClick = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(aevent) {
-        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2;
+        var hoEditorFactory, dPage, oldDPage, oldPageIndex, oldArea, targetArea, isSameArea, cgEvent, startPos, np, _np$node$parentNode, prevNode, oldRange, startPath, endPath, newRange, selectChangeEvent, nodeNeedModifyEvent, cellNode, colInfos, rowInfos, colProperty, _nodeNeedModifyEvent, _nodeNeedModifyEvent2, dPageTable, dPageCell, pos, docHeight, dHeight, index, i, dLastObj, distance, aHeight, count, str, j, _oldRange, _endPath, _newRange;
 
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) {
@@ -200952,7 +201025,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 }
 
                 if (np.node.nodeType === BaseNode/* NodeType.ntMedicalExpression */.Jq.ntMedicalExpression || np.node.nodeType === BaseNode/* NodeType.ntControl */.Jq.ntControl && !(np.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || ((_np$node$parentNode = np.node.parentNode) === null || _np$node$parentNode === void 0 ? void 0 : _np$node$parentNode.nodeType) === BaseNode/* NodeType.ntField */.Jq.ntField || np.node.nodeType === BaseNode/* NodeType.ntSign */.Jq.ntSign || np.node.nodeType === BaseNode/* NodeType.ntGestation */.Jq.ntGestation || np.node.nodeType === BaseNode/* NodeType.ntImage */.Jq.ntImage) {
-                  nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
+                  nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, 'dblclick', this._pageIndex);
                   hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
                 }
 
@@ -200985,47 +201058,53 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 colProperty = colInfos.colProperty;
 
                 if (colProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || colProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
-                  _nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
+                  _nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, 'dblclick', this._pageIndex);
                   hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent);
                 } else if (cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DateTime */.YS.DateTime || cellNode.cellProperty.editorProperty === TableProperty/* EditorProperty.DownList */.YS.DownList) {
-                  _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, "dblclick", this._pageIndex);
+                  _nodeNeedModifyEvent2 = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, 'dblclick', this._pageIndex);
                   hoEditorFactory.docTree.nodeNeedModify(_nodeNeedModifyEvent2);
-                } //   else if (cellNode.table.tableProperty.isAutoChangeLine) {
-                //     //处理自动换行表格，双击时光标跳到指定双击位置
-                //     const dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
-                //     if (dPageTable) {
-                //       const dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
-                //       if (dPageCell) {
-                //         const pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
-                //         let docHeight = 0;
-                //         let dHeight = 0;
-                //         const index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
-                //         for (let i = 0; i < index; i++) {
-                //           docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
-                //           dHeight += cellNode.drawCell.drawPageCells[i].dHeight
-                //         }
-                //         const dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1]
-                //         if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
-                //           const distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight)
-                //           const aHeight = cellNode.table.tableProperty.autoLineHeightPx;
-                //           const count = Math.floor(distance / aHeight);
-                //           let str = "";
-                //           for (let j = 0; j < count; j++) {
-                //             str += "\n"
-                //           }
-                //           if (str != "") {
-                //             const oldRange = hoEditorFactory.docTree.curDomRange.clone();
-                //             const endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
-                //             const newRange = new DomRange(hoEditorFactory.hoEditorFactoryId, endPath, endPath);
-                //             hoEditorFactory.drawTree.moveCaretToPath(endPath);
-                //             hoEditorFactory.docTree.curDomRange = newRange;
-                //             hoEditorFactory.docController.insertPlainTextAfterPath(endPath, str);
-                //           }
-                //         }
-                //       }
-                //     }
-                //   }
+                } else if (cellNode.table.tableProperty.isAutoChangeLine) {
+                  //处理自动换行表格，双击时光标跳到指定双击位置
+                  dPageTable = cellNode.table.drawTable.getDrawTableByPageIndex(dPage.pageIndex);
+
+                  if (dPageTable) {
+                    dPageCell = cellNode.drawCell.getDrawPageCell(dPageTable);
+
+                    if (dPageCell) {
+                      pos = dPageCell.globalToLocal(aevent.stageX, aevent.stageY);
+                      docHeight = 0;
+                      dHeight = 0;
+                      index = cellNode.drawCell.drawPageCells.indexOf(dPageCell);
+
+                      for (i = 0; i < index; i++) {
+                        docHeight += cellNode.drawCell.drawPageCells[i].docHeight;
+                        dHeight += cellNode.drawCell.drawPageCells[i].dHeight;
+                      }
+
+                      dLastObj = cellNode.drawCell.drawLines[cellNode.drawCell.drawLines.length - 1];
 
+                      if (dLastObj.dTop + dLastObj.docHeight < dHeight + pos.y) {
+                        distance = pos.y + dHeight - (dLastObj.dTop + dLastObj.dHeight);
+                        aHeight = cellNode.table.tableProperty.autoLineHeightPx;
+                        count = Math.floor(distance / aHeight);
+                        str = '';
+
+                        for (j = 0; j < count; j++) {
+                          str += '\n';
+                        }
+
+                        if (str != '') {
+                          _oldRange = hoEditorFactory.docTree.curDomRange.clone();
+                          _endPath = hoEditorFactory.docTree.getNodeLastPath(cellNode.childNodes[cellNode.childNodes.length - 1]);
+                          _newRange = new DomRange/* DomRange */.a(hoEditorFactory.hoEditorFactoryId, _endPath, _endPath);
+                          hoEditorFactory.drawTree.moveCaretToPath(_endPath);
+                          hoEditorFactory.docTree.curDomRange = _newRange;
+                          hoEditorFactory.docController.insertPlainTextAfterPath(_endPath, str);
+                        }
+                      }
+                    }
+                  }
+                }
 
               case 45:
                 return _context.abrupt("return", true);
@@ -201166,7 +201245,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
 
               if (child instanceof createjs.Container && curComment.id === child.name) {
                 child.children.forEach(function (value) {
-                  if (value.name === "back") {
+                  if (value.name === 'back') {
                     value.alpha = 0.5;
                   }
                 });
@@ -201243,21 +201322,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
 
       if (!dPage.drawDomLevel) {
         return false;
-      } // const oldEvent = aevent as createjs.MouseEvent;
-      // const newEvent = new createjs.MouseEvent(
-      //   oldEvent.type,
-      //   oldEvent.bubbles,
-      //   oldEvent.cancelable,
-      //   oldEvent.stageX,
-      //   oldEvent.stageY,
-      //   oldEvent.nativeEvent,
-      //   oldEvent.pointerID,
-      //   oldEvent.primary,
-      //   oldEvent.rawX,
-      //   oldEvent.rawY
-      // );
-      // this._drawPage.drawDomLevel.stage.dispatchEvent(newEvent);
-
+      }
 
       if (hoeditorfactory.drawTree.activePage !== dPage) {
         hoeditorfactory.drawTree.activePage = dPage;
@@ -201278,6 +201343,16 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         var endPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
 
         if (endPos) {
+          // const startLine = Number(hoeditorfactory.docTree.curDomRange.startPath.split('/')[1]);
+          // const endLine = Number(endPos.path.split('/')[1]);
+          // const listNode = document.querySelector('.ho-editor-list') as HTMLDivElement;
+          // if (listNode) {
+          //     if (startLine - endLine > 8) {
+          //         listNode.scrollTo(0, listNode.scrollTop - 10);
+          //     } else if(startLine - endLine < -8) {
+          //         listNode.scrollTo(0, listNode.scrollTop + 10);
+          //     }
+          // }
           hoeditorfactory.docTree.curDomRange.endPath = endPos.path;
           hoeditorfactory.drawTree.selectRange.spEnd = endPos;
           hoeditorfactory.drawTree.drawSelectRange();
@@ -201356,7 +201431,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
 
           if (np && np.node) {
             var buttonCount = parseInt(aevent.nativeEvent.button);
-            var clickType = buttonCount === 0 ? "leftclick" : buttonCount === 2 ? "rightclick" : "centerclick";
+            var clickType = buttonCount === 0 ? 'leftclick' : buttonCount === 2 ? 'rightclick' : 'centerclick';
             var nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, clickType, startPos.page ? startPos.page.pageIndex : this._pageIndex);
             hoeditorfactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
           }
@@ -207537,7 +207612,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.76');
+/* harmony default export */ var version = ('2.0.79');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -211365,7 +211440,6 @@ var GestationNode = __webpack_require__(74873);
 
 
 
-
 
 
 var StructureConvert = /*#__PURE__*/function () {
@@ -213418,13 +213492,11 @@ var StructureConvert = /*#__PURE__*/function () {
           message_box_default().alert("不允许将表格粘贴到文本域");
 
           return undefined;
-        }
+        } // if (isPaste && parentNode instanceof CellNode) {
+        //   MessageBox.alert("不允许将表格粘贴到表格");
+        //   return undefined;
+        // }
 
-        if (isPaste && parentNode instanceof CellNode/* CellNode */.D) {
-          message_box_default().alert("不允许将表格粘贴到表格");
-
-          return undefined;
-        }
 
         var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
         return node;
@@ -222197,6 +222269,8 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 
 
 
+
+
 var EditController = /*#__PURE__*/function () {
   function EditController(hoEditorFactoryID) {
     (0,classCallCheck/* default */.Z)(this, EditController);
@@ -222525,15 +222599,66 @@ var EditController = /*#__PURE__*/function () {
 
       var nodes;
 
-      if (jsonData && hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
-        nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctJSON, jsonData);
+      if (jsonData) {
+        if (hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {
+          nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctJSON, jsonData);
+        } else {
+          var jsonObject = JSON.parse(jsonData);
+
+          if (jsonObject.length == 1 && jsonObject[0].nodeType === "ntTable" && parentNode instanceof CellNode/* CellNode */.D) {
+            nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctJSON, jsonData);
+          } else {
+            if (htmlData) {
+              nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctHTML, htmlData);
+            } else {
+              nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctText, textData);
+            }
+          }
+        }
       } else if (htmlData) {
-        //console.log(htmlData);
         nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctHTML, htmlData);
       } else {
         nodes = hoeditorfactory.structureNode.Parse(ClipboardType.ctText, textData);
       }
 
+      if (nodes.length === 1 && nodes[0] instanceof TableNode/* TableNode */.Fh && parentNode instanceof CellNode/* CellNode */.D) {
+        var tableNode = nodes[0];
+
+        var _parentNode$table$get = parentNode.table.getCellInfos(parentNode),
+            _parentNode$table$get2 = (0,slicedToArray/* default */.Z)(_parentNode$table$get, 2),
+            rs = _parentNode$table$get2[0],
+            cs = _parentNode$table$get2[1];
+
+        var endRow = 0;
+        var endCol = 0;
+
+        if (hoeditorfactory.docTree.curDomRange.isEmpty) {
+          var re = parentNode.table.rowCount - 1;
+          var ce = parentNode.table.colCount - 1;
+          endRow = re - rs + 1 >= tableNode.rowCount ? tableNode.rowCount : re - rs + 1;
+          endCol = ce - cs + 1 >= tableNode.colCount ? tableNode.colCount : ce - cs + 1;
+        } else {
+          var curDomRange = hoeditorfactory.docTree.curDomRange.normalize();
+          var rowscols = TableNode/* TableNode.getSelectTableRowColInfos */.Fh.getSelectTableRowColInfos(this._hoEditorFactoryID, curDomRange);
+          endRow = rowscols[3] - rowscols[1] + 1 >= tableNode.rowCount ? tableNode.rowCount : rowscols[3] - rowscols[1] + 1;
+          endCol = rowscols[4] - rowscols[2] + 1 >= tableNode.colCount ? tableNode.colCount : rowscols[4] - rowscols[2] + 1;
+        }
+
+        for (var i = 0; i < endRow; i++) {
+          for (var j = 0; j < endCol; j++) {
+            var fromCell = tableNode.rows[i][j];
+            var toCell = parentNode.table.rows[rs + i][cs + j];
+
+            if (fromCell && toCell) {
+              var sCellText = fromCell.getCellText();
+              toCell.setCellText(sCellText);
+            }
+          }
+        }
+
+        return;
+      }
+
       if (!hoeditorfactory.pasteBase) {
         for (var n = 0; n < nodes.length; n++) {
           var node = nodes[n];
@@ -228562,9 +228687,9 @@ var ExpressionForm_component = normalizeComponent(
 ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/index.ts
 
 /* harmony default export */ var expressionForm = (ExpressionForm);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=6f230d8e&scoped=true&
-var RadioCheckboxvue_type_template_id_6f230d8e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:'control-modal-contents radio-checkbox-modal ' + _vm.animationClassName,style:({ width: _vm.boxGroup === 1 ? '1060px' : '500px' })},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v(_vm._s(_vm.controlType === 'RadioBox' ? '单选框' : '复选框')+_vm._s(_vm.boxGroup === 1 ? '组' : ''))]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("类型")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":1},model:{value:(_vm.boxGroup),callback:function ($$v) {_vm.boxGroup=$$v},expression:"boxGroup"}},[_vm._v("多项")]),_c('el-radio',{staticStyle:{"margin-left":"30px"},attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":0},model:{value:(_vm.boxGroup),callback:function ($$v) {_vm.boxGroup=$$v},expression:"boxGroup"}},[_vm._v("单项")])],1),(_vm.boxGroup === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"名称"},model:{value:(_vm.groupName),callback:function ($$v) {_vm.groupName=$$v},expression:"groupName"}})],1):_vm._e(),(_vm.boxGroup === 1)?_c('li',{staticClass:"control-item",staticStyle:{"padding":"0"}},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.radioCheckBoxGroup,"height":"300px"}},[_c('el-table-column',{attrs:{"label":"文本","width":"160"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"文本"},on:{"input":_vm.addNewItem},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}],null,false,3552177280)}),_c('el-table-column',{attrs:{"label":"提示文本","width":"100"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"提示文本"},model:{value:(scope.row.tipText),callback:function ($$v) {_vm.$set(scope.row, "tipText", $$v)},expression:"scope.row.tipText"}})]}}],null,false,2396764658)}),_c('el-table-column',{attrs:{"label":"数值","width":"80"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数值"},model:{value:(scope.row.numericValue),callback:function ($$v) {_vm.$set(scope.row, "numericValue", $$v)},expression:"scope.row.numericValue"}})]}}],null,false,3789767535)}),_c('el-table-column',{attrs:{"label":"内部标识符","width":"120"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"内部标识符"},model:{value:(scope.row.innerIdentifier),callback:function ($$v) {_vm.$set(scope.row, "innerIdentifier", $$v)},expression:"scope.row.innerIdentifier"}})]}}],null,false,1119088692)}),_c('el-table-column',{attrs:{"label":"数据元标识符","width":"120"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数据元标识符"},model:{value:(scope.row.dataMetaIdentifier),callback:function ($$v) {_vm.$set(scope.row, "dataMetaIdentifier", $$v)},expression:"scope.row.dataMetaIdentifier"}})]}}],null,false,479119831)}),_c('el-table-column',{attrs:{"label":"表示格式","width":"100"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"表示格式"},model:{value:(scope.row.identifierFormat),callback:function ($$v) {_vm.$set(scope.row, "identifierFormat", $$v)},expression:"scope.row.identifierFormat"}})]}}],null,false,241604674)}),_c('el-table-column',{attrs:{"label":"默认选中","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(_vm.controlType === 'RadioBox')?_c('el-radio',{staticClass:"table-radio",attrs:{"label":scope.row.id},model:{value:(_vm.tableRadio),callback:function ($$v) {_vm.tableRadio=$$v},expression:"tableRadio"}}):_vm._e(),(_vm.controlType === 'CheckBox')?_c('el-checkbox',{model:{value:(scope.row.isSelected),callback:function ($$v) {_vm.$set(scope.row, "isSelected", $$v)},expression:"scope.row.isSelected"}}):_vm._e()]}}],null,false,1265273066)}),_c('el-table-column',{attrs:{"label":"勾选框左对齐","width":"54"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.boxAlign),callback:function ($$v) {_vm.$set(scope.row, "boxAlign", $$v)},expression:"scope.row.boxAlign"}})]}}],null,false,599012276)}),_c('el-table-column',{attrs:{"label":"内容转文本","width":"54"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isTransToText),callback:function ($$v) {_vm.$set(scope.row, "isTransToText", $$v)},expression:"scope.row.isTransToText"}})]}}],null,false,1354544746)}),_c('el-table-column',{attrs:{"label":"编辑文本","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isEditText),callback:function ($$v) {_vm.$set(scope.row, "isEditText", $$v)},expression:"scope.row.isEditText"}})]}}],null,false,3019799127)}),_c('el-table-column',{attrs:{"label":"可以删除","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isAllowDelete),callback:function ($$v) {_vm.$set(scope.row, "isAllowDelete", $$v)},expression:"scope.row.isAllowDelete"}})]}}],null,false,2012793206)}),_c('el-table-column',{attrs:{"label":"自动回填","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.readType),callback:function ($$v) {_vm.$set(scope.row, "readType", $$v)},expression:"scope.row.readType"}})]}}],null,false,373021414)}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")])]}}],null,false,1240557165)})],1)],1):_vm._e(),(_vm.boxGroup === 0)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.radioCheckbox.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.radioCheckbox.innerIdentifier),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "innerIdentifier", $$v)},expression:"radioCheckbox.innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.radioCheckbox.dataMetaIdentifier),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "dataMetaIdentifier", $$v)},expression:"radioCheckbox.dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.radioCheckbox.identifierFormat),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "identifierFormat", $$v)},expression:"radioCheckbox.identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"名称"},model:{value:(_vm.radioCheckbox.groupName),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "groupName", $$v)},expression:"radioCheckbox.groupName"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("文本")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"文本"},model:{value:(_vm.radioCheckbox.text),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "text", $$v)},expression:"radioCheckbox.text"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"提示文本"},model:{value:(_vm.radioCheckbox.tipText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "tipText", $$v)},expression:"radioCheckbox.tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isSelected),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isSelected", $$v)},expression:"radioCheckbox.isSelected"}},[_vm._v("处于选择状态")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isAllowDelete),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isAllowDelete", $$v)},expression:"radioCheckbox.isAllowDelete"}},[_vm._v("可以删除")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.boxAlign),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "boxAlign", $$v)},expression:"radioCheckbox.boxAlign"}},[_vm._v("勾选框左对齐")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.readType),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "readType", $$v)},expression:"radioCheckbox.readType"}},[_vm._v("自动回填")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isTransToText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isTransToText", $$v)},expression:"radioCheckbox.isTransToText"}},[_vm._v("内容转文本")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isEditText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isEditText", $$v)},expression:"radioCheckbox.isEditText"}},[_vm._v("编辑文本")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数值")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数值"},model:{value:(_vm.radioCheckbox.numericValue),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "numericValue", $$v)},expression:"radioCheckbox.numericValue"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("附加数据")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"附加数据"},model:{value:(_vm.radioCheckbox.additionalData),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "additionalData", $$v)},expression:"radioCheckbox.additionalData"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("勾选级联对象")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"勾选级联对象"},model:{value:(_vm.radioCheckbox.checkCascadeObject),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "checkCascadeObject", $$v)},expression:"radioCheckbox.checkCascadeObject"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("不勾选级联对象")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"不勾选级联对象"},model:{value:(_vm.radioCheckbox.unCheckCascadeObject),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "unCheckCascadeObject", $$v)},expression:"radioCheckbox.unCheckCascadeObject"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1)]:_vm._e()],2)]),_c('footer',{staticClass:"ho-modal-footer"},[(_vm.boxGroup === 1)?_c('el-button',{staticStyle:{"transform":"translateX(-352px)"},attrs:{"type":"primary","size":"small"},on:{"click":_vm.addBox}},[_vm._v("增加"+_vm._s(_vm.controlType === 'RadioBox' ? '单选项' : '复选项'))]):_vm._e(),_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
-var RadioCheckboxvue_type_template_id_6f230d8e_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=5f22349b&scoped=true&
+var RadioCheckboxvue_type_template_id_5f22349b_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:'control-modal-contents radio-checkbox-modal ' + _vm.animationClassName,style:({ width: _vm.boxGroup === 1 ? '1060px' : '500px' })},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v(_vm._s(_vm.controlType === 'RadioBox' ? '单选框' : '复选框')+_vm._s(_vm.boxGroup === 1 ? '组' : ''))]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("类型")]),_c('el-radio',{attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":1},model:{value:(_vm.boxGroup),callback:function ($$v) {_vm.boxGroup=$$v},expression:"boxGroup"}},[_vm._v("多项")]),_c('el-radio',{staticStyle:{"margin-left":"30px"},attrs:{"disabled":_vm.controlStatus === 'update',"size":"small","label":0},model:{value:(_vm.boxGroup),callback:function ($$v) {_vm.boxGroup=$$v},expression:"boxGroup"}},[_vm._v("单项")])],1),(_vm.boxGroup === 1)?_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"名称"},model:{value:(_vm.groupName),callback:function ($$v) {_vm.groupName=$$v},expression:"groupName"}})],1):_vm._e(),(_vm.boxGroup === 1)?_c('li',{staticClass:"control-item",staticStyle:{"padding":"0"}},[_c('el-table',{staticStyle:{"width":"100%"},attrs:{"data":_vm.radioCheckBoxGroup,"height":"300px"}},[_c('el-table-column',{attrs:{"label":"文本","width":"160"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"文本"},on:{"input":_vm.addNewItem},model:{value:(scope.row.text),callback:function ($$v) {_vm.$set(scope.row, "text", $$v)},expression:"scope.row.text"}})]}}],null,false,3552177280)}),_c('el-table-column',{attrs:{"label":"提示文本","width":"100"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"提示文本"},model:{value:(scope.row.tipText),callback:function ($$v) {_vm.$set(scope.row, "tipText", $$v)},expression:"scope.row.tipText"}})]}}],null,false,2396764658)}),_c('el-table-column',{attrs:{"label":"数值","width":"80"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数值"},model:{value:(scope.row.numericValue),callback:function ($$v) {_vm.$set(scope.row, "numericValue", $$v)},expression:"scope.row.numericValue"}})]}}],null,false,3789767535)}),_c('el-table-column',{attrs:{"label":"内部标识符","width":"120"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"内部标识符"},model:{value:(scope.row.innerIdentifier),callback:function ($$v) {_vm.$set(scope.row, "innerIdentifier", $$v)},expression:"scope.row.innerIdentifier"}})]}}],null,false,1119088692)}),_c('el-table-column',{attrs:{"label":"数据元标识符","width":"120"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数据元标识符"},model:{value:(scope.row.dataMetaIdentifier),callback:function ($$v) {_vm.$set(scope.row, "dataMetaIdentifier", $$v)},expression:"scope.row.dataMetaIdentifier"}})]}}],null,false,479119831)}),_c('el-table-column',{attrs:{"label":"表示格式","width":"100"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"表示格式"},model:{value:(scope.row.identifierFormat),callback:function ($$v) {_vm.$set(scope.row, "identifierFormat", $$v)},expression:"scope.row.identifierFormat"}})]}}],null,false,241604674)}),_c('el-table-column',{attrs:{"label":"默认选中","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(_vm.controlType === 'RadioBox')?_c('el-radio',{staticClass:"table-radio",attrs:{"label":scope.row.id},model:{value:(_vm.tableRadio),callback:function ($$v) {_vm.tableRadio=$$v},expression:"tableRadio"}}):_vm._e(),(_vm.controlType === 'CheckBox')?_c('el-checkbox',{model:{value:(scope.row.isSelected),callback:function ($$v) {_vm.$set(scope.row, "isSelected", $$v)},expression:"scope.row.isSelected"}}):_vm._e()]}}],null,false,1265273066)}),_c('el-table-column',{attrs:{"label":"勾选框左对齐","width":"54"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.boxAlign),callback:function ($$v) {_vm.$set(scope.row, "boxAlign", $$v)},expression:"scope.row.boxAlign"}})]}}],null,false,599012276)}),_c('el-table-column',{attrs:{"label":"内容转文本","width":"54"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isTransToText),callback:function ($$v) {_vm.$set(scope.row, "isTransToText", $$v)},expression:"scope.row.isTransToText"}})]}}],null,false,1354544746)}),_c('el-table-column',{attrs:{"label":"编辑文本","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isEditText),callback:function ($$v) {_vm.$set(scope.row, "isEditText", $$v)},expression:"scope.row.isEditText"}})]}}],null,false,3019799127)}),_c('el-table-column',{attrs:{"label":"可以删除","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.isAllowDelete),callback:function ($$v) {_vm.$set(scope.row, "isAllowDelete", $$v)},expression:"scope.row.isAllowDelete"}})]}}],null,false,2012793206)}),_c('el-table-column',{attrs:{"label":"自动回填","width":"40"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-checkbox',{model:{value:(scope.row.readType),callback:function ($$v) {_vm.$set(scope.row, "readType", $$v)},expression:"scope.row.readType"}})]}}],null,false,373021414)}),_c('el-table-column',{scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-button',{attrs:{"size":"mini"},on:{"click":function($event){$event.stopPropagation();return _vm.deleteCurrentRow(scope.row.id)}}},[_vm._v("删除")])]}}],null,false,1240557165)})],1)],1):_vm._e(),(_vm.boxGroup === 0)?[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("编号")]),_c('span',{staticClass:"readonly-value"},[_vm._v(_vm._s(_vm.radioCheckbox.id))])]),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("内部标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"内部标识符"},model:{value:(_vm.radioCheckbox.innerIdentifier),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "innerIdentifier", $$v)},expression:"radioCheckbox.innerIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据元标识符")]),_c('el-input',{attrs:{"size":"mini","placeholder":"数据元标识符"},model:{value:(_vm.radioCheckbox.dataMetaIdentifier),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "dataMetaIdentifier", $$v)},expression:"radioCheckbox.dataMetaIdentifier"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("表示格式")]),_c('el-input',{attrs:{"size":"mini","placeholder":"表示格式"},model:{value:(_vm.radioCheckbox.identifierFormat),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "identifierFormat", $$v)},expression:"radioCheckbox.identifierFormat"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("名称")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"名称"},model:{value:(_vm.radioCheckbox.groupName),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "groupName", $$v)},expression:"radioCheckbox.groupName"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("文本")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"文本"},model:{value:(_vm.radioCheckbox.text),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "text", $$v)},expression:"radioCheckbox.text"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("提示文本")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"提示文本"},model:{value:(_vm.radioCheckbox.tipText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "tipText", $$v)},expression:"radioCheckbox.tipText"}})],1),_c('li',{staticClass:"control-item"},[_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isSelected),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isSelected", $$v)},expression:"radioCheckbox.isSelected"}},[_vm._v("处于选择状态")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isAllowDelete),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isAllowDelete", $$v)},expression:"radioCheckbox.isAllowDelete"}},[_vm._v("可以删除")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.boxAlign),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "boxAlign", $$v)},expression:"radioCheckbox.boxAlign"}},[_vm._v("勾选框左对齐")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.readType),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "readType", $$v)},expression:"radioCheckbox.readType"}},[_vm._v("自动回填")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isTransToText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isTransToText", $$v)},expression:"radioCheckbox.isTransToText"}},[_vm._v("内容转文本")]),_c('el-checkbox',{model:{value:(_vm.radioCheckbox.isEditText),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "isEditText", $$v)},expression:"radioCheckbox.isEditText"}},[_vm._v("编辑文本")])],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数值")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"数值"},model:{value:(_vm.radioCheckbox.numericValue),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "numericValue", $$v)},expression:"radioCheckbox.numericValue"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("附加数据")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"附加数据"},model:{value:(_vm.radioCheckbox.additionalData),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "additionalData", $$v)},expression:"radioCheckbox.additionalData"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("勾选级联对象")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"勾选级联对象"},model:{value:(_vm.radioCheckbox.checkCascadeObject),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "checkCascadeObject", $$v)},expression:"radioCheckbox.checkCascadeObject"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("不勾选级联对象")]),_c('el-input',{attrs:{"type":"text","size":"mini","placeholder":"不勾选级联对象"},model:{value:(_vm.radioCheckbox.unCheckCascadeObject),callback:function ($$v) {_vm.$set(_vm.radioCheckbox, "unCheckCascadeObject", $$v)},expression:"radioCheckbox.unCheckCascadeObject"}})],1),_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("数据源")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.openDataSourceModal}},[_vm._v("设置数据源")])],1)]:_vm._e()],2)]),_c('footer',{staticClass:"ho-modal-footer"},[(_vm.boxGroup === 1)?_c('el-button',{staticStyle:{"transform":"translateX(-352px)"},attrs:{"type":"primary","size":"small"},on:{"click":_vm.addBox}},[_vm._v("增加"+_vm._s(_vm.controlType === 'RadioBox' ? '单选项' : '复选项'))]):_vm._e(),_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.sure}},[_vm._v("确定")]),_c('el-button',{staticStyle:{"margin-left":"30px"},attrs:{"size":"small"},on:{"click":_vm.handleClose}},[_vm._v("取消")])],1)])}
+var RadioCheckboxvue_type_template_id_5f22349b_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=ts&
@@ -228739,6 +228864,7 @@ var RadioCheckbox = /*#__PURE__*/function (_Vue) {
           v.groupName = _this3.groupName;
           v.controlStyle = _this3.controlType;
           if (v.id === _this3.tableRadio) v.isSelected = true;
+          if (v.text == '') return; // 处理单复选文本值为空的情况
 
           _this3.vueController.insertRadioAndCheckBox('add', JSON.stringify(v));
         });
@@ -228782,10 +228908,10 @@ RadioCheckbox = __decorate([vue_class_component_esm({
 /* harmony default export */ var RadioCheckboxvue_type_script_lang_ts_ = (RadioCheckbox);
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=ts&
  /* harmony default export */ var radioCheckBox_RadioCheckboxvue_type_script_lang_ts_ = (RadioCheckboxvue_type_script_lang_ts_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=6f230d8e&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22[0].rules[0].use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22[0].rules[0].use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=5f22349b&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=6f230d8e&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=5f22349b&lang=scss&scoped=true&
 
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue
 
@@ -228798,11 +228924,11 @@ RadioCheckbox = __decorate([vue_class_component_esm({
 
 var RadioCheckbox_component = normalizeComponent(
   radioCheckBox_RadioCheckboxvue_type_script_lang_ts_,
-  RadioCheckboxvue_type_template_id_6f230d8e_scoped_true_render,
-  RadioCheckboxvue_type_template_id_6f230d8e_scoped_true_staticRenderFns,
+  RadioCheckboxvue_type_template_id_5f22349b_scoped_true_render,
+  RadioCheckboxvue_type_template_id_5f22349b_scoped_true_staticRenderFns,
   false,
   null,
-  "6f230d8e",
+  "5f22349b",
   null
   
 )
@@ -233884,9 +234010,7 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
           if (nodes.parentNode instanceof CellNode/* CellNode */.D) {
             info = {
               cellNode: nodes.parentNode,
-              tableNode: nodes.parentNode.parentNode,
-              colInfo: nodes.parentNode.table.colInfos[nodes.parentNode.row.indexOf(nodes.parentNode)],
-              rowInfo: nodes.parentNode.table.rowInfos[nodes.parentNode.table.rows.indexOf(nodes.parentNode.row)]
+              tableNode: nodes.parentNode.parentNode
             };
           } else {
             isFn(nodes.parentNode);
@@ -233899,9 +234023,7 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
       if (nodes instanceof CellNode/* CellNode */.D) {
         info = {
           cellNode: nodes,
-          tableNode: nodes.parentNode,
-          colInfo: nodes.table.colInfos[nodes.row.indexOf(nodes)],
-          rowInfo: nodes.table.rowInfos[nodes.table.rows.indexOf(nodes.row)]
+          tableNode: nodes.parentNode
         };
       } else {
         isFn(nodes);
@@ -233939,7 +234061,7 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
         drawPageTables.forEach(function (v, key) {
           if (v.parent.pageIndex === dPage.drawMainDoc.pageIndex) {
             tableBounds.height = v.dHeight;
-            tableBounds.y = dPage.drawMainDoc.y + v.dTop;
+            tableBounds.y = dPage.drawMainDoc.y + v.y;
 
             if (drawPageCells.length === drawPageTables.length) {
               tableBounds.cellHeight = drawPageCells[key].dHeight;
@@ -234005,10 +234127,12 @@ var FontStyleMixin = /*#__PURE__*/function (_Vue) {
           canAddRow: tableNode.tableProperty.canAddRow,
           canDeleteRow: tableNode.tableProperty.canDeleteRow
         };
-      }
 
-      if (hoEditorFactory.isCanUseTableProperty && nodes) {
-        this.createTable(hoEditorFactory, nodes);
+        if (tableNode.tableProperty.isAutoChangeLine && nodes) {
+          this.createTable(hoEditorFactory, nodes);
+        } else if (hoEditorFactory.isCanUseTableProperty && nodes) {
+          this.createTable(hoEditorFactory, nodes);
+        }
       }
 
       vueControllers.getCurTextStyle();