hoeditor-web 3.0.41 → 3.0.42

package/lib/hoeditor.umd.js

@@ -232013,8 +232013,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=41bb5f98&
-var HoDocvue_type_template_id_41bb5f98_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=44fd6504&
+var HoDocvue_type_template_id_44fd6504_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232159,7 +232159,7 @@ var HoDocvue_type_template_id_41bb5f98_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_41bb5f98_staticRenderFns = [];
+var HoDocvue_type_template_id_44fd6504_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232169,8 +232169,8 @@ var es_string_includes = __webpack_require__(32023);
 var es_array_sort = __webpack_require__(2707);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=template&id=5ed62e92&scoped=true&
-var HoPagevue_type_template_id_5ed62e92_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=template&id=59b9f9ce&scoped=true&
+var HoPagevue_type_template_id_59b9f9ce_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232234,7 +232234,7 @@ var HoPagevue_type_template_id_5ed62e92_scoped_true_render = function render() {
     }], null, true)
   }) : _vm._e()], 2);
 };
-var HoPagevue_type_template_id_5ed62e92_scoped_true_staticRenderFns = [];
+var HoPagevue_type_template_id_59b9f9ce_scoped_true_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/regeneratorRuntime.js
 var regeneratorRuntime = __webpack_require__(80543);
@@ -232682,7 +232682,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       if (!hoeditorfactory.canvasListNode) {
         hoeditorfactory.canvasListNode = document.querySelector(".ho-editor-list");
       }
-      hoeditorfactory.moveY = aevent.stageY + this._pageIndex * hoeditorfactory.pageProperty.heightPixes;
+      hoeditorfactory.moveYParams.startY = aevent.stageY + this._pageIndex * hoeditorfactory.pageProperty.heightPixes;
+      hoeditorfactory.moveYParams.moveHeight = 0;
       if (aevent.currentTarget === this.stage) {
         var _hoeditorfactory$draw;
         if (aevent.nativeEvent.button === 0) {
@@ -232821,21 +232822,25 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         }
         var endPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (endPos) {
-          if (hoeditorfactory.moveY && hoeditorfactory.canvasListNode) {
-            if (aevent.stageY + y - hoeditorfactory.moveY > 0) {
-              hoeditorfactory.canvasListNode.scrollTop += 13;
-            } else {
-              hoeditorfactory.canvasListNode.scrollTop -= 13;
+          var result = Math.abs(aevent.stageY + hoeditorfactory.moveYParams.startY) < (hoeditorfactory.pageProperty.heightPixes + 20) * hoeditorfactory.drawTree.drawPages.length;
+          // console.log(Math.abs(aevent.stageY + hoeditorfactory.moveYParams.startY), (hoeditorfactory.pageProperty.heightPixes + 20) * hoeditorfactory.drawTree.drawPages.length);
+          if (result && hoeditorfactory.moveYParams.startY && hoeditorfactory.canvasListNode) {
+            var height = aevent.stageY + y - hoeditorfactory.moveYParams.startY;
+            if (height > 0) {
+              if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight > 0) {
+                hoeditorfactory.canvasListNode.scrollTop += 13;
+              } else if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight < 0) {
+                hoeditorfactory.canvasListNode.scrollTop -= 13;
+              }
+            } else if (height < 0) {
+              if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight > 0) {
+                hoeditorfactory.canvasListNode.scrollTop -= 13;
+              } else if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight < 0) {
+                hoeditorfactory.canvasListNode.scrollTop += 13;
+              }
             }
+            hoeditorfactory.moveYParams.moveHeight = Math.abs(height);
           }
-          // 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;
           if (endPos.path != '') {
@@ -233455,7 +233460,10 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
      * canvasRightClick
      */
     canvasRightClick: function canvasRightClick(e) {
-      this.$emit('canvasRightClick', e);
+      var _this2 = this;
+      this.$nextTick(function () {
+        _this2.$emit('canvasRightClick', e);
+      });
     },
     canvasKeydown: function canvasKeydown(e) {
       this.$emit('canvasKeydown', e);
@@ -233468,10 +233476,10 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoPagevue_type_script_lang_js_ = (HoPagevue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=5ed62e92&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoPage.vue?vue&type=style&index=0&id=59b9f9ce&prod&scoped=true&lang=css&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=5ed62e92&prod&scoped=true&lang=css&
+;// CONCATENATED MODULE: ./src/components/HoPage.vue?vue&type=style&index=0&id=59b9f9ce&prod&scoped=true&lang=css&
 
 ;// CONCATENATED MODULE: ./src/components/HoPage.vue
 
@@ -233484,11 +233492,11 @@ var AiModels_component = (0,componentNormalizer/* default */.Z)(
 
 var HoPage_component = (0,componentNormalizer/* default */.Z)(
   components_HoPagevue_type_script_lang_js_,
-  HoPagevue_type_template_id_5ed62e92_scoped_true_render,
-  HoPagevue_type_template_id_5ed62e92_scoped_true_staticRenderFns,
+  HoPagevue_type_template_id_59b9f9ce_scoped_true_render,
+  HoPagevue_type_template_id_59b9f9ce_scoped_true_staticRenderFns,
   false,
   null,
-  "5ed62e92",
+  "59b9f9ce",
   null
   
 )
@@ -235374,7 +235382,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.41');
+/* harmony default export */ var version = ('3.0.42');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235739,8 +235747,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
               });
             }
           }
-        } else if (e.clickType === 'rightClick' && node instanceof SignNode/* SignNode */.N && node.type == 3) {
-          if (hoEditorFactory.drawTree.paintStatus === 1) {}
+        } else if (e.clickType === 'rightClick') {
+          // this.mouseRightClickEvent(node)
         }
       }
       return true;
@@ -236005,49 +236013,54 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
      * 先关闭一次 再延迟打开 触发弹出层动画
      */
     mouseRightClickEvent: function mouseRightClickEvent(e) {
-      var _hoEditorFactory$vueC2;
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
-      var rightPosition = {
-        clientX: e.clientX || e.pageX,
-        clientY: e.clientY || e.pageY
-      };
-      var startPos = hoEditorFactory.drawTree.selectRange.spStart;
-      var path = hoEditorFactory.vueController.getCaretPosition();
-      var node = (_hoEditorFactory$vueC2 = hoEditorFactory.vueController.findNodebyPath(path)) === null || _hoEditorFactory$vueC2 === void 0 ? void 0 : _hoEditorFactory$vueC2.node;
-      if (startPos) {
+      var _this6 = this;
+      this.$nextTick(function () {
         var _hoEditorFactory$docT;
-        var npNode = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
-        if (npNode instanceof SignNode/* SignNode */.N && npNode.type == 3) {
-          node = npNode;
-        }
-      }
-      // psDesign,     // 设计状态
-      // psEdit,       // 编辑状态
-      // psPreview,    // 打印预览
-      // psPrint,      // 打印
-      // psReview,     // 审阅
-      // psReadOnly,   // 预览
-      if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psDesign */.Dh.psDesign && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psEdit */.Dh.psEdit) {
-        this.isCreateRightMenuModal = true;
-        if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview) {
-          if (node instanceof SignNode/* SignNode */.N && node.number > 0) {
-            this.showDeleteSignMenu = true;
-            this.hoEditorProvider.setRightClickNodeValue(node);
+        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(_this6.hoEditorId);
+        var rightPosition = {
+          clientX: e.clientX || e.pageX,
+          clientY: e.clientY || e.pageY
+        };
+        var startPos = hoEditorFactory.drawTree.selectRange.spStart;
+        var node = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
+        // const path = hoEditorFactory.vueController.getCaretPosition();
+        // let node = hoEditorFactory.vueController.findNodebyPath(path)?.node;
+
+        // if (startPos) {
+        //     const npNode = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)?.node;
+        //     if (npNode instanceof SignNode) {
+        //         node = npNode;
+        //     }
+        // }
+
+        // psDesign,     // 设计状态
+        // psEdit,       // 编辑状态
+        // psPreview,    // 打印预览
+        // psPrint,      // 打印
+        // psReview,     // 审阅
+        // psReadOnly,   // 预览
+        if (hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psDesign */.Dh.psDesign && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psEdit */.Dh.psEdit) {
+          _this6.isCreateRightMenuModal = true;
+          if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState.psReview */.Dh.psReview) {
+            if (node instanceof SignNode/* SignNode */.N && node.number > 0) {
+              _this6.showDeleteSignMenu = true;
+              _this6.hoEditorProvider.setRightClickNodeValue(node);
+            } else {
+              _this6.showDeleteSignMenu = false;
+            }
           } else {
-            this.showDeleteSignMenu = false;
+            _this6.isHideComments = hoEditorFactory.isHideComments;
+            _this6.showCommentsBtn = true;
           }
-        } else {
-          this.isHideComments = hoEditorFactory.isHideComments;
-          this.showCommentsBtn = true;
+          (0,plugins_util/* createRightMenu */.GN)(rightPosition.clientX, rightPosition.clientY, _this6.$refs.rightMenuModal);
+          return;
         }
-        (0,plugins_util/* createRightMenu */.GN)(rightPosition.clientX, rightPosition.clientY, this.$refs.rightMenuModal);
-        return;
-      }
-      if (node && node !== null && node instanceof BaseNode/* BaseNode */.Hd) {
-        this.hoEditorProvider.setRightClickNodeValue(node);
-      }
-      hoEditorFactory.drawTree.selectRange.beginRangeSelect = false;
-      this.$emit('rightClickEventIn', rightPosition);
+        if (node && node !== null && node instanceof BaseNode/* BaseNode */.Hd) {
+          _this6.hoEditorProvider.setRightClickNodeValue(node);
+        }
+        hoEditorFactory.drawTree.selectRange.beginRangeSelect = false;
+        _this6.$emit('rightClickEventIn', rightPosition);
+      });
     },
     /**
      * 打开和隐藏批注
@@ -236081,10 +236094,10 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=41bb5f98&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=44fd6504&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=41bb5f98&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=44fd6504&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -236097,8 +236110,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_41bb5f98_render,
-  HoDocvue_type_template_id_41bb5f98_staticRenderFns,
+  HoDocvue_type_template_id_44fd6504_render,
+  HoDocvue_type_template_id_44fd6504_staticRenderFns,
   false,
   null,
   null,
@@ -254467,7 +254480,10 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_printSilently", false);
     (0,esm_defineProperty/* default */.Z)(this, "_limitCharNumber", 0);
     (0,esm_defineProperty/* default */.Z)(this, "_reviewJson", void 0);
-    (0,esm_defineProperty/* default */.Z)(this, "_moveY", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_moveYParams", {
+      startY: 0,
+      moveHeight: 0
+    });
     (0,esm_defineProperty/* default */.Z)(this, "_canvasListNode", void 0);
     this._hoEditorFactoryId = id;
   }
@@ -255269,13 +255285,13 @@ var HOEditorFactory = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "moveY",
+    key: "moveYParams",
     get: function get() {
-      return this._moveY;
+      return this._moveYParams;
     },
     set: function set(value) {
-      if (value && this._moveY !== value) {
-        this._moveY = value;
+      if (value && this._moveYParams !== value) {
+        this._moveYParams = value;
       }
     }
   }, {
@@ -263323,18 +263339,19 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
       }
     },
     getCurrentSelectNode: function getCurrentSelectNode() {
-      var _hoEditorFactory$vueC;
+      var _hoEditorFactory$docT;
       var value;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.activeDocId);
-      var node = (_hoEditorFactory$vueC = hoEditorFactory.vueController.findNodebyPath(this.domRange.endPath)) === null || _hoEditorFactory$vueC === void 0 ? void 0 : _hoEditorFactory$vueC.node;
+      // let node = hoEditorFactory.vueController.findNodebyPath(this.domRange.endPath)?.node;
+
       var startPos = hoEditorFactory.drawTree.selectRange.spStart;
-      if (startPos) {
-        var _hoEditorFactory$docT;
-        var npNode = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
-        if (npNode instanceof SignNode/* SignNode */.N && npNode.type == 3) {
-          node = npNode;
-        }
-      }
+      var node = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
+      // if (startPos) {
+      //     const npNode = hoEditorFactory.docTree.findNodePositionByPath(startPos.path)?.node;
+      //     if (npNode instanceof SignNode && npNode.type == 3) {
+      //         node = npNode;
+      //     }
+      // }
       if (node instanceof MarkNode/* MarkNode */.j || node instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         var parentNode = node.parentNode;
         if (parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {