hoeditor-web 3.1.86 → 3.1.87

package/lib/hoeditor.umd.js

@@ -207271,7 +207271,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.86');
+/* harmony default export */ var version = ('3.1.87');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -216989,11 +216989,12 @@ var VueController = /*#__PURE__*/function () {
     value: function hiddenMask(isHidden) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       if (isHidden) {
-        for (var i = 0; i < hoEditorFactory.drawTree.drawPages.length; i++) {
+        for (var i = hoEditorFactory.drawTree.drawPages.length - 1; i >= 0; i--) {
           var drawPage = hoEditorFactory.drawTree.drawPages[i];
-          for (var j = 0; j < drawPage.selectContainer.children.length; j++) {
-            if (drawPage.selectContainer.children[j].name && drawPage.selectContainer.children[j].name.indexOf('mask') >= 0) {
-              drawPage.selectContainer.children.splice(j, 1);
+          var children = drawPage.selectContainer.children;
+          for (var j = children.length - 1; j >= 0; j--) {
+            if (children[j].name && children[j].name.indexOf('mask') >= 0) {
+              children.splice(j, 1);
             }
           }
           hoEditorFactory.drawPageTree.updateDrawPage(i);
@@ -217039,7 +217040,7 @@ var VueController = /*#__PURE__*/function () {
           var _this$getPreEmptySign = this.getPreEmptySign(signNode),
             _this$getPreEmptySign2 = (0,esm_slicedToArray/* default */.Z)(_this$getPreEmptySign, 2),
             isExist = _this$getPreEmptySign2[0],
-            pSign = _this$getPreEmptySign2[1];
+            pSignArr = _this$getPreEmptySign2[1];
           var drawNode = signNode.drawNodes[0];
           var dline = hoEditorFactory.drawTree.getDrawLineByDNode(drawNode);
           superiorSign[1] = curPageIndex;
@@ -217048,28 +217049,66 @@ var VueController = /*#__PURE__*/function () {
           var localPt = curArea.globalToLocal(stagePt.x, stagePt.y);
           superiorSign[2] = localPt.y - hoEditorFactory.signHeight;
           if (isExist) {
-            var pDrawNode = pSign.drawNodes[0];
-            var pArea = hoEditorFactory.drawPageTree.getMainRootArea(pDrawNode);
-            if (pArea && pArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
-              var pageIndex = hoEditorFactory.drawPageTree.drawMainDocs.indexOf(pArea);
-              var pline = hoEditorFactory.drawTree.getDrawLineByDNode(pDrawNode);
-              var stagePt1 = pline.localToGlobal(pDrawNode.x, pDrawNode.y);
-              var localPt1 = curArea.globalToLocal(stagePt1.x, stagePt1.y);
-              var start = localPt1.y;
-              for (var h = 0; h < pageIndex; h++) {
-                paintMask(h, pageHeight);
-              }
-              paintMask(pageIndex, localPt1.y + actualHeight - hoEditorFactory.signHeight);
-              if (pageIndex === curPageIndex) {
-                paintMask(pageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight, start);
-              } else if (pageIndex + 1 <= curPageIndex) {
-                paintMask(pageIndex, pageHeight, start);
-                for (var k = pageIndex + 1; k < curPageIndex; k++) {
-                  paintMask(k, pageHeight);
+            var arrs = [];
+            for (var g = 0; g < pSignArr.length; g++) {
+              var pSign = pSignArr[g];
+              var pDrawNode = pSign.drawNodes[0];
+              var pArea = hoEditorFactory.drawPageTree.getMainRootArea(pDrawNode);
+              if (pArea && pArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$) {
+                var pageIndex = hoEditorFactory.drawPageTree.drawMainDocs.indexOf(pArea);
+                var pline = hoEditorFactory.drawTree.getDrawLineByDNode(pDrawNode);
+                var stagePt1 = pline.localToGlobal(pDrawNode.x, pDrawNode.y);
+                var localPt1 = curArea.globalToLocal(stagePt1.x, stagePt1.y);
+                var start = localPt1.y;
+                if (pSignArr.length === 1) {
+                  for (var h = 0; h < pageIndex; h++) {
+                    paintMask(h, pageHeight);
+                  }
+                  paintMask(pageIndex, localPt1.y + actualHeight - hoEditorFactory.signHeight);
+                  if (pageIndex === curPageIndex) {
+                    paintMask(pageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight, start);
+                  } else if (pageIndex + 1 <= curPageIndex) {
+                    paintMask(pageIndex, pageHeight, start);
+                    for (var k = pageIndex + 1; k < curPageIndex; k++) {
+                      paintMask(k, pageHeight);
+                    }
+                    paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
+                  }
+                  return;
                 }
-                paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
+                arrs.push([pageIndex, start]);
               }
             }
+            for (var t = 0; t < arrs.length; t++) {
+              var arr = arrs[t];
+              if (t === 0) {
+                for (var _h = 0; _h < arr[0]; _h++) {
+                  paintMask(_h, pageHeight);
+                }
+                paintMask(arr[0], arr[1] + actualHeight - hoEditorFactory.signHeight);
+              } else {
+                var parr = arrs[t - 1];
+                if (parr[0] === arr[0]) {
+                  paintMask(parr[0], arr[1] + actualHeight - hoEditorFactory.signHeight, parr[1]);
+                } else if (parr[0] <= arr[0]) {
+                  paintMask(parr[0], pageHeight, parr[1]);
+                  for (var _k = parr[0] + 1; _k < arr[0]; _k++) {
+                    paintMask(_k, pageHeight);
+                  }
+                  paintMask(arr[0], arr[1] + actualHeight - hoEditorFactory.signHeight);
+                }
+              }
+            }
+            var sarr = arrs[arrs.length - 1];
+            if (sarr[0] === curPageIndex) {
+              paintMask(sarr[0], localPt.y + actualHeight - hoEditorFactory.signHeight, sarr[1]);
+            } else if (sarr[0] <= curPageIndex) {
+              paintMask(sarr[0], pageHeight, sarr[1]);
+              for (var _k2 = sarr[0] + 1; _k2 < curPageIndex; _k2++) {
+                paintMask(_k2, pageHeight);
+              }
+              paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
+            }
           } else {
             if (curPageIndex > 0) {
               for (var _i = 0; _i < curPageIndex; _i++) {
@@ -217089,6 +217128,7 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var path1 = curSign.getNodePath();
       var mark = false;
+      var signArr = [];
       var node = null;
       var iteratesNodes = function iteratesNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
@@ -217098,8 +217138,9 @@ var VueController = /*#__PURE__*/function () {
             var result = NodePosition/* NodePosition */.F.treePathCompare(path1, path2);
             if (result > 0) {
               mark = true;
-              node = anode;
-              return;
+              //node = anode;
+              //return;
+              signArr.push(anode);
             }
           }
           if (anode instanceof BaseCombineNode/* BaseCombineNode */.V) {
@@ -217109,9 +217150,9 @@ var VueController = /*#__PURE__*/function () {
       };
       iteratesNodes(hoEditorFactory.docTree.mainNodes);
       if (mark) {
-        return [true, node];
+        return [true, signArr];
       }
-      return [false, null];
+      return [false, []];
     }
   }, {
     key: "isCanEdit",
@@ -217503,9 +217544,9 @@ var VueController = /*#__PURE__*/function () {
       }
       if (scope === 'all') {
         var _headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
-        for (var _h = 0; _h < _headerDocTree.length; _h++) {
-          if (!_headerDocTree[_h]) continue;
-          iteratesNodes(_headerDocTree[_h].subDocNodes);
+        for (var _h2 = 0; _h2 < _headerDocTree.length; _h2++) {
+          if (!_headerDocTree[_h2]) continue;
+          iteratesNodes(_headerDocTree[_h2].subDocNodes);
           if (node) break;
         }
         if (!node) {
@@ -217572,9 +217613,9 @@ var VueController = /*#__PURE__*/function () {
       }
       if (scope === 'all') {
         var _headerDocTree2 = hoEditorFactory.subDocManger.headerDocTree;
-        for (var _h2 = 0; _h2 < _headerDocTree2.length; _h2++) {
-          if (!_headerDocTree2[_h2]) continue;
-          iteratesNodes(_headerDocTree2[_h2].subDocNodes);
+        for (var _h3 = 0; _h3 < _headerDocTree2.length; _h3++) {
+          if (!_headerDocTree2[_h3]) continue;
+          iteratesNodes(_headerDocTree2[_h3].subDocNodes);
           if (node) break;
         }
         if (!node) {
@@ -217643,8 +217684,8 @@ var VueController = /*#__PURE__*/function () {
       }
       if (scope === 'all') {
         var _headerDocTree3 = hoEditorFactory.subDocManger.headerDocTree;
-        for (var _h3 = 0; _h3 < _headerDocTree3.length; _h3++) {
-          iteratesNodes(_headerDocTree3[_h3].subDocNodes);
+        for (var _h4 = 0; _h4 < _headerDocTree3.length; _h4++) {
+          iteratesNodes(_headerDocTree3[_h4].subDocNodes);
           if (!bFindAll && nodes.length > 0) {
             break;
           }
@@ -217716,8 +217757,8 @@ var VueController = /*#__PURE__*/function () {
       }
       if (scope === 'all') {
         var _headerDocTree4 = hoEditorFactory.subDocManger.headerDocTree;
-        for (var _h4 = 0; _h4 < _headerDocTree4.length; _h4++) {
-          iteratesNodes(_headerDocTree4[_h4].subDocNodes);
+        for (var _h5 = 0; _h5 < _headerDocTree4.length; _h5++) {
+          iteratesNodes(_headerDocTree4[_h5].subDocNodes);
           if (!bFindAll && nodes.length > 0) {
             break;
           }
@@ -217789,8 +217830,8 @@ var VueController = /*#__PURE__*/function () {
       }
       if (scope === 'all') {
         var _headerDocTree5 = hoEditorFactory.subDocManger.headerDocTree;
-        for (var _h5 = 0; _h5 < _headerDocTree5.length; _h5++) {
-          iteratesNodes(_headerDocTree5[_h5].subDocNodes);
+        for (var _h6 = 0; _h6 < _headerDocTree5.length; _h6++) {
+          iteratesNodes(_headerDocTree5[_h6].subDocNodes);
           if (!bFindAll && nodes.length > 0) {
             break;
           }
@@ -222110,8 +222151,8 @@ var VueController = /*#__PURE__*/function () {
             };
             var rowPropertyJson = JSON.parse(JSON.stringify(rowProperty));
             var keysName = Object.keys(defaultRowProp);
-            for (var _k = 0; _k < keysName.length; _k++) {
-              if (keysName[_k] === 'customProperties') {
+            for (var _k3 = 0; _k3 < keysName.length; _k3++) {
+              if (keysName[_k3] === 'customProperties') {
                 if (rowInfo.rowProperty.customProperties.length === 0) {
                   delete rowPropertyJson['customProperties'];
                 }
@@ -222122,8 +222163,8 @@ var VueController = /*#__PURE__*/function () {
               //     }
               // } 
               else {
-                if (rowPropertyJson[keysName[_k]] === defaultRowPropJson[keysName[_k]]) {
-                  delete rowPropertyJson[keysName[_k]];
+                if (rowPropertyJson[keysName[_k3]] === defaultRowPropJson[keysName[_k3]]) {
+                  delete rowPropertyJson[keysName[_k3]];
                 }
               }
             }
@@ -222169,9 +222210,9 @@ var VueController = /*#__PURE__*/function () {
             };
             var colPropertyJson = JSON.parse(JSON.stringify(colProperty));
             var colKeysName = Object.keys(defaultColProp);
-            for (var _k2 = 0; _k2 < colKeysName.length; _k2++) {
-              if (colPropertyJson[colKeysName[_k2]] === defaultColPropJson[colKeysName[_k2]]) {
-                delete colPropertyJson[colKeysName[_k2]];
+            for (var _k4 = 0; _k4 < colKeysName.length; _k4++) {
+              if (colPropertyJson[colKeysName[_k4]] === defaultColPropJson[colKeysName[_k4]]) {
+                delete colPropertyJson[colKeysName[_k4]];
               }
             }
             colInfosArray.push({
@@ -222321,22 +222362,22 @@ var VueController = /*#__PURE__*/function () {
           };
           var cellPropertyJson = JSON.parse(JSON.stringify(cellProperty));
           var _keysName = Object.keys(defaultCellPropJson);
-          for (var _k3 = 0; _k3 < _keysName.length; _k3++) {
-            if (_keysName[_k3] === 'customProperties') {
+          for (var _k5 = 0; _k5 < _keysName.length; _k5++) {
+            if (_keysName[_k5] === 'customProperties') {
               if (!node.cellProperty.customProperties) {
                 delete cellPropertyJson['customProperties'];
               } else if (node.cellProperty.customProperties.length === 0) {
                 delete cellPropertyJson['customProperties'];
               }
-            } else if (_keysName[_k3] === 'cellInnerMargin') {
+            } else if (_keysName[_k5] === 'cellInnerMargin') {
               if (cellPropertyJson['cellInnerMargin'] === '0,0,0.1,0.1') {
                 delete cellPropertyJson['cellInnerMargin'];
               }
-            } else if (_keysName[_k3] === 'gridLinesColor') {
+            } else if (_keysName[_k5] === 'gridLinesColor') {
               if (cellPropertyJson['gridLinesColor'] === '#000000,#000000,#000000,#000000') {
                 delete cellPropertyJson['gridLinesColor'];
               }
-            } else if (_keysName[_k3] === 'gridLineDisplay') {
+            } else if (_keysName[_k5] === 'gridLineDisplay') {
               if (cellPropertyJson['gridLineDisplay'] === 'true,true,true,true') {
                 delete cellPropertyJson['gridLineDisplay'];
               }
@@ -222347,8 +222388,8 @@ var VueController = /*#__PURE__*/function () {
             //     }
             // } 
             else {
-              if (cellPropertyJson[_keysName[_k3]] === defaultCellPropJson[_keysName[_k3]]) {
-                delete cellPropertyJson[_keysName[_k3]];
+              if (cellPropertyJson[_keysName[_k5]] === defaultCellPropJson[_keysName[_k5]]) {
+                delete cellPropertyJson[_keysName[_k5]];
               }
             }
           }
@@ -223132,8 +223173,8 @@ var VueController = /*#__PURE__*/function () {
             }
           }
         }
-        for (var _k4 = rowCellNum; _k4 < table.childNodes.length; _k4++) {
-          var cell = table.childNodes[_k4];
+        for (var _k6 = rowCellNum; _k6 < table.childNodes.length; _k6++) {
+          var cell = table.childNodes[_k6];
           if (cell.childNodes.length > 1) {
             cell.childNodes.splice(1, cell.childNodes.length);
             cell.drawCell.needUpdate = true;