hoeditor-web 2.0.78 → 2.0.79

package/lib/hoeditor.common.js

@@ -37422,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;
@@ -207611,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.78');
+/* 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 = []
@@ -211439,7 +211440,6 @@ var GestationNode = __webpack_require__(74873);
 
 
 
-
 
 
 var StructureConvert = /*#__PURE__*/function () {
@@ -213492,13 +213492,11 @@ var StructureConvert = /*#__PURE__*/function () {
           message_box_default().alert("不允许将表格粘贴到文本域");
 
           return undefined;
-        }
-
-        if (isPaste && parentNode instanceof CellNode/* CellNode */.D) {
-          message_box_default().alert("不允许将表格粘贴到表格");
+        } // if (isPaste && parentNode instanceof CellNode) {
+        //   MessageBox.alert("不允许将表格粘贴到表格");
+        //   return undefined;
+        // }
 
-          return undefined;
-        }
 
         var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
         return node;
@@ -222271,6 +222269,8 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 
 
 
+
+
 var EditController = /*#__PURE__*/function () {
   function EditController(hoEditorFactoryID) {
     (0,classCallCheck/* default */.Z)(this, EditController);
@@ -222599,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];

package/lib/hoeditor.umd.js

@@ -37432,6 +37432,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 
       if (isCopy) {
         rows = pto.row;
+        cols = pto.col;
 
         if (to.colSpan > 1) {
           cols = pto.col + to.colSpan - 1;
@@ -207621,7 +207622,7 @@ var SignNode = __webpack_require__(78975);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(13880);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.78');
+/* 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 = []
@@ -211449,7 +211450,6 @@ var GestationNode = __webpack_require__(55817);
 
 
 
-
 
 
 var StructureConvert = /*#__PURE__*/function () {
@@ -213502,13 +213502,11 @@ var StructureConvert = /*#__PURE__*/function () {
           message_box_default().alert("不允许将表格粘贴到文本域");
 
           return undefined;
-        }
-
-        if (isPaste && parentNode instanceof CellNode/* CellNode */.D) {
-          message_box_default().alert("不允许将表格粘贴到表格");
+        } // if (isPaste && parentNode instanceof CellNode) {
+        //   MessageBox.alert("不允许将表格粘贴到表格");
+        //   return undefined;
+        // }
 
-          return undefined;
-        }
 
         var node = TableNode/* TableNode.json2Node */.Fh.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode, isPaste, isClearSign);
         return node;
@@ -222281,6 +222279,8 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message);
 
 
 
+
+
 var EditController = /*#__PURE__*/function () {
   function EditController(hoEditorFactoryID) {
     (0,classCallCheck/* default */.Z)(this, EditController);
@@ -222609,15 +222609,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];