hoeditor-web 3.0.43 → 3.0.44

package/lib/hoeditor.umd.js

@@ -52923,7 +52923,7 @@ var NodeNeedModifyEvent = __webpack_require__(76830);
  * @Author: liyanan 2441631434@qq.com
  * @Date: 2023-03-17 14:19:29
  * @LastEditors: liyanan 2441631434@qq.com
- * @LastEditTime: 2023-03-29 18:05:05
+ * @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
  */
@@ -52960,7 +52960,7 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
       // 创建按钮形状
       var buttonShape = new createjs.Shape();
       buttonShape.name = "buttonShape";
-      buttonShape.graphics.clear().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";
@@ -52982,7 +52982,7 @@ var DrawJumpButton = /*#__PURE__*/function (_DrawCombineNode) {
           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);
+          var nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(drawNode.node, 'leftclick', startPos.page ? startPos.page.pageIndex : 0);
           hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
         }
       });
@@ -60025,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),
@@ -60046,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();
           }
         }
       }
@@ -80111,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
 
 
@@ -80176,6 +80182,7 @@ var TableProperty = __webpack_require__(79546);
 
 
 
+
 
 
 //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -81782,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;
@@ -82120,6 +82130,9 @@ var DrawTree = /*#__PURE__*/function () {
           this._caret.visible = false;
         }
       }
+      if (endNp.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+        this._caret.visible = false;
+      }
       return true;
     }
   }, {
@@ -82397,6 +82410,9 @@ var DrawTree = /*#__PURE__*/function () {
               this._caret.visible = false;
             }
           }
+          if (_np4.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+            this._caret.visible = false;
+          }
         }
       }
     }
@@ -235370,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.43');
+/* 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