hoeditor-web 3.0.43 → 3.0.45

package/lib/hoeditor.umd.js

@@ -51116,10 +51116,11 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
-        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-          //json.id = hoEditorFactory.gernerateCode.generateID("DT");
-          json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
-        }
+        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+        //   //json.id = hoEditorFactory.gernerateCode.generateID("DT");
+        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
+        // }
+        json.dataId = hoEditorFactory.gernerateCode.generateID("DateTime");
       }
       json.readType = json.readType ? Number(json.readType) : -1;
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
@@ -51912,10 +51913,11 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       this.transType(json);
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_20__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
-        if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
-          //json.id = hoEditorFactory.gernerateCode.generateID("DL");
-          json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
-        }
+        // if (hoEditorFactory.vueController.getNodeByDataID("all", json.dataId)) {
+        //   //json.id = hoEditorFactory.gernerateCode.generateID("DL");
+        //   json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
+        // }
+        json.dataId = hoEditorFactory.gernerateCode.generateID("DownList");
       }
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
@@ -52923,7 +52925,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 +52962,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 +52984,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);
         }
       });
@@ -57706,15 +57708,16 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       delete json.nodeType;
       if (isPaste) {
         var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_16__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
-        var name = "";
-        if (json.controlStyle === "RadioBox") name = "RB";
-        if (json.controlStyle === "CheckBox") name = "CB";
-        hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach(function (value, key) {
-          if (value.dataId === json.dataId) {
-            //json.id = hoEditorFactory.gernerateCode.generateID(name);
-            json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
-          }
-        });
+        //let name = "";
+        //if (json.controlStyle === "RadioBox") name = "RB";
+        //if (json.controlStyle === "CheckBox") name = "CB";
+        // hoEditorFactory.docTree.radioAndCheckBoxsMap.forEach((value, key) => {
+        //   if (value.dataId === json.dataId) {
+        //     //json.id = hoEditorFactory.gernerateCode.generateID(name);
+        //     json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
+        //   }
+        // });
+        json.dataId = hoEditorFactory.gernerateCode.generateID(json.controlStyle);
       }
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isSelected = !json.isSelected ? false : json.isSelected.text != undefined ? json.isSelected.text : json.isSelected;
@@ -60025,6 +60028,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 +60050,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();
           }
         }
       }
@@ -63032,7 +63039,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-03-22 15:28:47
+ * @LastEditTime: 2023-03-30 16:16:55
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -64947,10 +64954,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       delete json.nodeType;
       this.transType(json);
       if (isPaste) {
-        if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
-          //json.id = hoEditorFactory.gernerateCode.generateID("TF");
-          json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
-        }
+        // if (hoEditorFactory.vueController.getNodeByDataID('all', json.dataId)) {
+        //     //json.id = hoEditorFactory.gernerateCode.generateID("TF");
+        //     json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
+        // }
+        json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
       }
       json.canModifyContent = !json.canModifyContent ? false : json.canModifyContent;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
@@ -80111,6 +80119,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 +80186,7 @@ var TableProperty = __webpack_require__(79546);
 
 
 
+
 
 
 //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -81782,6 +81793,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 +82134,9 @@ var DrawTree = /*#__PURE__*/function () {
           this._caret.visible = false;
         }
       }
+      if (endNp.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+        this._caret.visible = false;
+      }
       return true;
     }
   }, {
@@ -82397,6 +82414,9 @@ var DrawTree = /*#__PURE__*/function () {
               this._caret.visible = false;
             }
           }
+          if (_np4.node instanceof JumpButtonNode/* JumpButtonNode */.a) {
+            this._caret.visible = false;
+          }
         }
       }
     }
@@ -231997,8 +232017,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=2f0d52fa&
-var HoDocvue_type_template_id_2f0d52fa_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=bc0f5c2a&
+var HoDocvue_type_template_id_bc0f5c2a_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -232143,7 +232163,7 @@ var HoDocvue_type_template_id_2f0d52fa_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_2f0d52fa_staticRenderFns = [];
+var HoDocvue_type_template_id_bc0f5c2a_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -235370,7 +235390,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.45');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235953,8 +235973,9 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
       if (colProperty.editorProperty === 4) {
         this.$emit('dblNodeClick', {
           node: function node() {
+            var _colProperty$signProp;
             return {
-              name: colProperty.signProperty.name || '签名',
+              name: ((_colProperty$signProp = colProperty.signProperty) === null || _colProperty$signProp === void 0 ? void 0 : _colProperty$signProp.name) || '签名',
               type: 'table-sign'
             };
           },
@@ -236082,10 +236103,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=2f0d52fa&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=bc0f5c2a&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=2f0d52fa&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=bc0f5c2a&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -236098,8 +236119,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_2f0d52fa_render,
-  HoDocvue_type_template_id_2f0d52fa_staticRenderFns,
+  HoDocvue_type_template_id_bc0f5c2a_render,
+  HoDocvue_type_template_id_bc0f5c2a_staticRenderFns,
   false,
   null,
   null,
@@ -242649,6 +242670,7 @@ var comment = __webpack_require__(32980);
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -248397,41 +248419,84 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "getAllSignNodeList",
     value: function getAllSignNodeList() {
+      var _this5 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var signList = [];
       var patientSignList = [];
+      var tableSignList = [];
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
           var node = nodes[i];
           if (node instanceof SignNode/* SignNode */.N) {
+            if (node.parentNode instanceof CellNode/* CellNode */.D) {
+              var currentCols = node.parentNode.row.indexOf(node.parentNode);
+              var colInfoes = node.parentNode.table.colInfos[currentCols];
+              if (colInfoes.colProperty.editorProperty == 4) {
+                continue;
+              }
+            }
             var sign = {
               type: 'sign',
               signed: false,
-              customProperty: node.customProperty
+              customProperty: {}
             };
             // 有值的患者签名
             if (node.attribute === 1) {
               sign.type = 'patientSign';
               if (node.imgSrc == '' && node.fingerPrintSrc == '') {
                 sign.signed = false;
-                patientSignList.push(sign);
               } else {
                 sign.signed = true;
-                patientSignList.push(sign);
               }
+              patientSignList.push(sign);
             }
             // 空的医生签名
             if (node.attribute != 1) {
               sign.type = 'sign';
               if (node.imgSrc == '') {
                 sign.signed = false;
-                signList.push(sign);
               } else {
                 sign.signed = true;
-                signList.push(sign);
               }
+              signList.push(sign);
             }
           }
+          if (node instanceof TableNode/* TableNode */.Fh) {
+            (function () {
+              var signColList = [];
+              node.colInfos.forEach(function (col, colIndex) {
+                if (col.colProperty.editorProperty == 4) {
+                  // 确定签名列
+                  signColList.push(colIndex);
+                }
+              });
+              if (signColList.length > 0) {
+                var firstDataRowIndex = _this5.getTableTitleMaxRowIndex(node) + 1;
+                node.rows.forEach(function (rows, rowIndex) {
+                  if (rowIndex >= firstDataRowIndex) {
+                    rows.forEach(function (cellNode, colIndex) {
+                      if (cellNode && signColList.includes(colIndex)) {
+                        var _sign = {
+                          type: 'sign',
+                          signed: false,
+                          customProperty: {},
+                          position: [rowIndex + 1, colIndex + 1]
+                        };
+                        var child = cellNode.childNodes.filter(function (child) {
+                          return child instanceof SignNode/* SignNode */.N;
+                        });
+                        if (child.length > 0) {
+                          _sign.customProperty = child[0].customProperty;
+                          _sign.signed = child[0].imgSrc == '' ? false : true;
+                        }
+                        signList.push(_sign);
+                      }
+                    });
+                  }
+                });
+              }
+            })();
+          }
           if (node instanceof BaseCombineNode/* BaseCombineNode */.V) {
             // 医生签名不存在的情况不在深层调用深层遍历
             getAllNodes(node.childNodes);
@@ -248487,13 +248552,13 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "html2Xml",
     value: function html2Xml(json) {
-      var _this5 = this;
+      var _this6 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var headerNodes = hoEditorFactory.structureNode.Parse(ClipboardType.ctHTML, json.header);
       var footerNodes = hoEditorFactory.structureNode.Parse(ClipboardType.ctHTML, json.footer);
       var mainNodes = hoEditorFactory.structureNode.Parse(ClipboardType.ctHTML, json.main);
       var insertParaNode = function insertParaNode(area, index) {
-        var node = new ParagraphNode/* ParagraphNode */.C(_this5._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, null, 0);
+        var node = new ParagraphNode/* ParagraphNode */.C(_this6._hoEditorFactoryID, hoEditorFactory.docTree.activeNodes, null, 0);
         if (area == 'header') {
           node.rootPath = 'header/0';
           headerNodes.splice(index, 0, node);
@@ -248970,7 +249035,7 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "updateNurseRecord",
     value: function updateNurseRecord(table, operType, rowIndex, data) {
-      var _this6 = this;
+      var _this7 = this;
       var keys = Object.keys(data);
       var backfill = function backfill(r) {
         for (var i = 0; i < keys.length; i++) {
@@ -248979,7 +249044,7 @@ var VueController = /*#__PURE__*/function () {
           if (cell) {
             var text = data[keys[i]];
             cell.childNodes.splice(1, cell.childNodes.length);
-            var textNode = new TextNode/* TextNode */.R(_this6._hoEditorFactoryID, table.rootNodes, cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, cell.childNodes[0].styleIndex);
+            var textNode = new TextNode/* TextNode */.R(_this7._hoEditorFactoryID, table.rootNodes, cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, cell.childNodes[0].styleIndex);
             cell.drawCell.needUpdate = true;
             cell.childNodes.push(textNode);
           }
@@ -249176,7 +249241,7 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "updateAllCodeElements",
     value: function updateAllCodeElements(element) {
-      var _this7 = this;
+      var _this8 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var ret = [];
       var getAllNodes = function getAllNodes(nodes) {
@@ -249205,7 +249270,7 @@ var VueController = /*#__PURE__*/function () {
       if (ret.length > 0) {
         ret.forEach(function (v) {
           if (v.name === element.name) {
-            _this7.updateCodeContent(v, element.content);
+            _this8.updateCodeContent(v, element.content);
           }
         });
         this.rebuildAll(false);