hoeditor-web 3.0.42 → 3.0.44

package/lib/hoeditor.umd.js

@@ -52906,6 +52906,8 @@ var HOEditorFactorys = __webpack_require__(74089);
 var BaseNode = __webpack_require__(62358);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawCombineNode.ts
 var DrawCombineNode = __webpack_require__(66114);
+// EXTERNAL MODULE: ./src/editor/events/NodeNeedModifyEvent.ts
+var NodeNeedModifyEvent = __webpack_require__(76830);
 ;// CONCATENATED MODULE: ./src/editor/draw/drawNode/DrawJumpButton.ts
 
 
@@ -52916,11 +52918,12 @@ var DrawCombineNode = __webpack_require__(66114);
 
 
 
+
 /*
  * @Author: liyanan 2441631434@qq.com
  * @Date: 2023-03-17 14:19:29
  * @LastEditors: liyanan 2441631434@qq.com
- * @LastEditTime: 2023-03-20 08:55:15
+ * @LastEditTime: 2023-03-30 09:44:07
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawJumpButton.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -52953,10 +52956,11 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
   }, {
     key: "drawJumpButton",
     value: function drawJumpButton() {
+      var drawNode = this;
       // 创建按钮形状
       var buttonShape = new createjs.Shape();
       buttonShape.name = "buttonShape";
-      buttonShape.graphics.beginFill("#A9A7AB").drawRoundRect(0, 5, this.dWidth, this.dHeight, 4);
+      buttonShape.graphics.clear().beginStroke("#000000").beginFill("#A9A7AB").drawRoundRect(0, 5, this.dWidth, this.dHeight, 5);
       // 创建按钮文本
       var buttonText = new createjs.Text(this.buttonName, "12px SimSun", "#000000");
       buttonText.textAlign = "left";
@@ -52964,12 +52968,12 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
       buttonText.x = (this._dText.getMeasuredWidth() - buttonText.getMeasuredWidth()) / 2;
       buttonText.y = this.dHeight - 1;
       buttonText.name = "buttonText";
+      buttonText.setBounds(0, 0, 0, 0);
       // 创建按钮容器
       var button = new createjs.Container();
       button.x = 0;
       button.y = -this.dHeight;
       button.addChild(buttonShape, buttonText);
-      var drawNode = this;
       var font = buttonText.font;
       button.addEventListener("mousedown", function () {
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(drawNode._hoEditorFactoryID);
@@ -52977,6 +52981,9 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
         if (dArea) {
           button.children[1].font = "bold " + font;
           hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
+          var startPos = hoEditorFactory.drawTree.selectRange.spStart;
+          var nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(drawNode.node, 'leftclick', startPos.page ? startPos.page.pageIndex : 0);
+          hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
         }
       });
       // button.addEventListener("mouseover", function () {
@@ -60018,6 +60025,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
         ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_38__/* ["default"].warn */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
+        return strRet;
       }
       var _this$getRowColByCell25 = this.getRowColByCellAdress(arrStr[0]),
         _this$getRowColByCell26 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell25, 2),
@@ -60039,12 +60047,15 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
           if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(rysj) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(cysj)) {
             var rDate = new Date(rysj);
             var cDate = new Date(cysj);
-            var rTime = rDate.getTime();
-            var cTime = cDate.getTime();
-            var subTime = ((cTime - rTime + 1) / (1000 * 3600 * 24)).toString();
-            var dayData = subTime.split('.');
-            var day = dayData[0] + "天";
-            return day;
+            // 将日期转换为 UTC 时间戳
+            var rTime = Date.UTC(rDate.getFullYear(), rDate.getMonth(), rDate.getDate());
+            var cTime = Date.UTC(cDate.getFullYear(), cDate.getMonth(), cDate.getDate());
+            // 计算日期相差的毫秒数
+            var diff = Math.abs(cTime - rTime);
+            // 将毫秒数转换为天数
+            var subTime = Math.floor(diff / (1000 * 60 * 60 * 24));
+            if (subTime == 0) subTime = 1;
+            return subTime.toString();
           }
         }
       }
@@ -70884,38 +70895,23 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
               _this2._event = new createjs.Shape();
               _this2._event.name = 'event';
               _this2._event.graphics.clear();
-              // this._event.graphics.beginFill('#0F0')
-              //     .drawRect(0, -r.height * 1.5, r.width + 2, r.height * 1.5).closePath();
               _this2._event.graphics.beginFill('#FFFFFF').drawRect(0, -r.height, r.width + 2, r.height).closePath();
-              // console.log(0, -r.height, r.width + 2, r.height);
               _this2._event.alpha = 0.01;
               _this2.addChild(_this2._event);
               _this2.on('mouseover', function (e) {
                 hoEditorFactory.nodeMouseMove.setNode(_this2._node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__/* .DmouseEventType.detOver */ .p.detOver);
-                //hoEditorFactory.docTree.mouseEvent(new DmouseEvent(this._node, DmouseEventType.detOver))
               });
-
               _this2.on('mouseout', function (e) {
                 hoEditorFactory.nodeMouseMove.setNode(_this2._node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__/* .DmouseEventType.detOut */ .p.detOut);
-                //hoEditorFactory.docTree.mouseEvent(new DmouseEvent(this.node, DmouseEventType.detOut))
               });
-
               _this2.on('click', function (e) {
                 if (e.nativeEvent.button === 0) {
                   hoEditorFactory.nodeMouseMove.NodeClick(_this2._node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__/* .DmouseEventType.detClick */ .p.detClick);
-                  //hoEditorFactory.docTree.mouseEvent(new DmouseEvent(this.node, DmouseEventType.detClick))
                 }
               });
-              // this.on('click', (e) => {
-              //     hoEditorFactory.docTree.mouseEvent(new DmouseEvent(this.node, DmouseEventType.detClick))
-              // })
-              // this.on('dblclick', (e) => {
-              //     hoEditorFactory.docTree.mouseEvent(new DmouseEvent(this.node, DmouseEventType.detDblclick))
-              // })
             }
           });
         } else {
-          //if (this.node instanceof RadioAndCheckBoxNode) {
           this.on('added', function (e1) {
             if (!_this2._event) {
               var r = _this2.getBounds();
@@ -70934,13 +70930,6 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
                   hoEditorFactory.nodeMouseMove.setNode(_this2.node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__/* .DmouseEventType.detOut */ .p.detOut);
                 });
               }
-              // if(this.node && this.node.drawNodes && this.node.drawNodes[0]) {
-              //     const paragraphNode = hoEditorFactory.drawTree.getDrawLineByDNode(this._node.drawNodes[0])?.paragraphNode;
-              //     const customProperty = paragraphNode && paragraphNode.customProperty;
-              //     if(['男', '女'].includes(customProperty.sex) || (customProperty.age && customProperty.age.select == '隐藏')) {
-              //         console.log({...paragraphNode.customProperty})
-              //     }
-              // }
               _this2.on('click', function (e) {
                 if (e.nativeEvent.button === 0) {
                   hoEditorFactory.nodeMouseMove.NodeClick(_this2._node, _editor_events_DmouseEvent__WEBPACK_IMPORTED_MODULE_7__/* .DmouseEventType.detClick */ .p.detClick);
@@ -70950,7 +70939,6 @@ var DrawCombineNode = /*#__PURE__*/function (_DrawContainer) {
               _this2._event.alpha = 0.01;
             }
           });
-          //}
         }
       }
     }
@@ -80127,6 +80115,8 @@ var DrawConfig = __webpack_require__(37616);
 var DrawSignNode = __webpack_require__(75638);
 // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
 var TableProperty = __webpack_require__(79546);
+// EXTERNAL MODULE: ./src/editor/dom/treeNode/JumpButtonNode.ts + 1 modules
+var JumpButtonNode = __webpack_require__(330);
 ;// CONCATENATED MODULE: ./src/editor/draw/drawTree/DrawTree.ts
 
 
@@ -80192,6 +80182,7 @@ var TableProperty = __webpack_require__(79546);
 
 
 
+
 
 
 //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -81798,6 +81789,9 @@ var DrawTree = /*#__PURE__*/function () {
             this._caret.visible = false;
           }
         }
+        if (anode instanceof JumpButtonNode/* JumpButtonNode */.a) {
+          this._caret.visible = false;
+        }
       }
       //console.timeEnd("文档change事件");
       return true;
@@ -82136,6 +82130,9 @@ var DrawTree = /*#__PURE__*/function () {
           this._caret.visible = false;
         }
       }
+      if (endNp.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+        this._caret.visible = false;
+      }
       return true;
     }
   }, {
@@ -82413,6 +82410,9 @@ var DrawTree = /*#__PURE__*/function () {
               this._caret.visible = false;
             }
           }
+          if (_np4.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+            this._caret.visible = false;
+          }
         }
       }
     }
@@ -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=44fd6504&
-var HoDocvue_type_template_id_44fd6504_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=2f0d52fa&
+var HoDocvue_type_template_id_2f0d52fa_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232159,7 +232159,7 @@ var HoDocvue_type_template_id_44fd6504_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_44fd6504_staticRenderFns = [];
+var HoDocvue_type_template_id_2f0d52fa_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232822,25 +232822,29 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         }
         var endPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (endPos) {
-          var result = Math.abs(aevent.stageY + hoeditorfactory.moveYParams.startY) < (hoeditorfactory.pageProperty.heightPixes + 20) * hoeditorfactory.drawTree.drawPages.length;
+          // const 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);
-          }
+          // if (result && hoeditorfactory.moveYParams.startY && hoeditorfactory.canvasListNode) {
+          //     const height = aevent.stageY + y - hoeditorfactory.moveYParams.startY;
+          //     if(height > 0) {
+          //         if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight > 0) {
+          //             hoeditorfactory.canvasListNode.scrollTop += 13;
+          //             console.log("初始 ↓ 一直向 ↓");
+          //         } else if(Math.abs(height) - hoeditorfactory.moveYParams.moveHeight < 0) {
+          //             console.log("初始 ↓ 中间转 ↑", Math.abs(height) - hoeditorfactory.moveYParams.moveHeight, height, hoeditorfactory.moveYParams.moveHeight);
+          //             hoeditorfactory.canvasListNode.scrollTop -= 13;
+          //         }
+          //     } else if(height < 0) {
+          //         if (Math.abs(height) - hoeditorfactory.moveYParams.moveHeight > 0) {
+          //             console.log("初始 ↑ 一直向 ↑")
+          //             hoeditorfactory.canvasListNode.scrollTop -= 13;
+          //         } else if(Math.abs(height) - hoeditorfactory.moveYParams.moveHeight < 0) {
+          //             console.log("初始 ↑ 中间转 ↓", Math.abs(height) - hoeditorfactory.moveYParams.moveHeight, height, hoeditorfactory.moveYParams.moveHeight)
+          //             hoeditorfactory.canvasListNode.scrollTop += 13;
+          //         }
+          //     }
+          //     hoeditorfactory.moveYParams.moveHeight = Math.abs(height);
+          // }
           hoeditorfactory.docTree.curDomRange.endPath = endPos.path;
           hoeditorfactory.drawTree.selectRange.spEnd = endPos;
           if (endPos.path != '') {
@@ -232880,7 +232884,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         hoeditorfactory.drawTree.selectRange.beginRangeSelect = false;
         if (startPos) {
           var np = hoeditorfactory.docTree.findNodePositionByPath(startPos.path);
-          if (np && np.node) {
+          if (np && np.node && np.node.nodeType !== BaseNode/* NodeType.ntJumpButton */.Jq.ntJumpButton) {
             var buttonCount = parseInt(aevent.nativeEvent.button);
             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);
@@ -235382,7 +235386,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.42');
+/* harmony default export */ var version = ('3.0.44');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -236094,10 +236098,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=44fd6504&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=2f0d52fa&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=44fd6504&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=2f0d52fa&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -236110,8 +236114,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_44fd6504_render,
-  HoDocvue_type_template_id_44fd6504_staticRenderFns,
+  HoDocvue_type_template_id_2f0d52fa_render,
+  HoDocvue_type_template_id_2f0d52fa_staticRenderFns,
   false,
   null,
   null,