hoeditor-web 3.1.77 → 3.1.78

package/lib/hoeditor.umd.js

@@ -15853,7 +15853,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 24193:
+/***/ 8494:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15869,7 +15869,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
-;// 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/controls/sign/Sign.vue?vue&type=template&id=034775ac&
+;// 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/controls/sign/Sign.vue?vue&type=template&id=9c073ac8&
 
 
 var render = function render() {
@@ -15953,7 +15953,7 @@ var render = function render() {
     attrs: {
       "value": 4
     }
-  }, [_vm._v("自定义多人签名")])], 1)], 1)]), _vm.signType == 2 ? _c('li', {
+  }, [_vm._v("自定义多人签名（自定义签名格式）")])], 1)], 1)]), _vm.signType == 2 ? _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -16256,7 +16256,19 @@ var render = function render() {
         "value": dateTime.dataId
       }
     }, [_vm._v(_vm._s("".concat(dateTime.name, "(").concat(dateTime.dataId, ")")))]);
-  }), 1)], 1)] : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
+  }), 1)], 1)] : _vm._e(), _vm.signType !== 1 ? _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("上级医师签名")]), _c('a-checkbox', {
+    model: {
+      value: _vm.isHigher,
+      callback: function callback($$v) {
+        _vm.isHigher = $$v;
+      },
+      expression: "isHigher"
+    }
+  })], 1) : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
     staticClass: "section-right"
   }, [_c('div', {
     staticClass: "custom-format-tool-box"
@@ -16358,7 +16370,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=034775ac&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=9c073ac8&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -16388,6 +16400,8 @@ var es_array_filter = __webpack_require__(57327);
 var es_string_includes = __webpack_require__(32023);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
 var es_array_slice = __webpack_require__(47042);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
+var es_object_keys = __webpack_require__(47941);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
 var HOEditorFactorys = __webpack_require__(74089);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/SignNode.ts
@@ -16411,6 +16425,7 @@ var SignNode = __webpack_require__(24701);
 
 
 
+
 /* harmony default export */ var Signvue_type_script_lang_js_ = ({
   name: 'Sign',
   props: {
@@ -16427,7 +16442,6 @@ var SignNode = __webpack_require__(24701);
   inject: ['getCustomProperty'],
   data: function data() {
     return {
-      height: 20,
       name: '',
       signType: 0,
       signFormat: '<医师姓名>',
@@ -16441,10 +16455,14 @@ var SignNode = __webpack_require__(24701);
       defaultFormatList: ['<医师姓名>', '<医师姓名>（<医师职称>）', '<医师姓名>：<医师职称>', '<医师姓名>：<医师职称>\n<签名时间>'],
       animationClassNames: 'control-modal-contents sign-modal animation-in',
       isDisplayTitle: false,
+      isHigher: false,
       isDisplayTime: false,
       timePosition: '0',
       dateTimeList: [],
-      associatedElement: ''
+      associatedElement: '',
+      modifyProps: {},
+      unwatchProps: [],
+      watchProps: ['name', 'signType', 'signFormat', 'connectMode', 'connectChar', 'isFront', 'signTimeFormat', 'customFormatContent', 'isDisplayTitle', 'isDisplayTime', 'timePosition', 'associatedElement', 'isHigher']
     };
   },
   mounted: function mounted() {
@@ -16462,7 +16480,7 @@ var SignNode = __webpack_require__(24701);
     if (this.controlStatus === 'update') {
       var node = this.getCurrentSelectNode();
       if (node) {
-        var _node$otherProperties, _node$otherProperties2, _node$otherProperties3, _node$otherProperties4, _node$otherProperties5;
+        var _node$otherProperties, _node$otherProperties2, _node$otherProperties3, _node$otherProperties4, _node$otherProperties5, _node$otherProperties6, _node$otherProperties7;
         this.name = node.name;
         if (node.attribute == 2) {
           this.signType = 2; // 自定义多人签名(带职称)
@@ -16486,10 +16504,11 @@ var SignNode = __webpack_require__(24701);
         this.isFront = node.isFront === true || node.isFront === 'true' ? true : false;
         this.signTimeFormat = node.signTimeFormat;
         this.customFormatContent = node.customFormatContent ? node.customFormatContent : '';
-        this.customSignFormatList = node.customSignFormatList ? node.customSignFormatList : [];
+        // this.customSignFormatList = node.customSignFormatList ? node.customSignFormatList : [];
         this.isDisplayTitle = ((_node$otherProperties = node.otherProperties) === null || _node$otherProperties === void 0 ? void 0 : _node$otherProperties.isDisplayTitle) === 'true' | ((_node$otherProperties2 = node.otherProperties) === null || _node$otherProperties2 === void 0 ? void 0 : _node$otherProperties2.isDisplayTitle) === true ? true : false;
-        this.isDisplayTime = ((_node$otherProperties3 = node.otherProperties) === null || _node$otherProperties3 === void 0 ? void 0 : _node$otherProperties3.isDisplayTime) === 'true' | ((_node$otherProperties4 = node.otherProperties) === null || _node$otherProperties4 === void 0 ? void 0 : _node$otherProperties4.isDisplayTime) === true ? true : false;
-        this.timePosition = ((_node$otherProperties5 = node.otherProperties) === null || _node$otherProperties5 === void 0 ? void 0 : _node$otherProperties5.timePosition) == '1' ? '1' : '0';
+        this.isHigher = ((_node$otherProperties3 = node.otherProperties) === null || _node$otherProperties3 === void 0 ? void 0 : _node$otherProperties3.isHigher) === 'true' | ((_node$otherProperties4 = node.otherProperties) === null || _node$otherProperties4 === void 0 ? void 0 : _node$otherProperties4.isHigher) === true ? true : false;
+        this.isDisplayTime = ((_node$otherProperties5 = node.otherProperties) === null || _node$otherProperties5 === void 0 ? void 0 : _node$otherProperties5.isDisplayTime) === 'true' | ((_node$otherProperties6 = node.otherProperties) === null || _node$otherProperties6 === void 0 ? void 0 : _node$otherProperties6.isDisplayTime) === true ? true : false;
+        this.timePosition = ((_node$otherProperties7 = node.otherProperties) === null || _node$otherProperties7 === void 0 ? void 0 : _node$otherProperties7.timePosition) == '1' ? '1' : '0';
         this.associatedElement = node.associatedElement ? node.associatedElement : '';
         list.forEach(function (v) {
           if (v.nodeType == 8 && (!associatedElementList.includes(v.dataId) || node.associatedElement == v.dataId)) {
@@ -16497,6 +16516,7 @@ var SignNode = __webpack_require__(24701);
             _this.dateTimeList.push(v);
           }
         });
+        this.setWatchProps();
       }
     } else {
       list.forEach(function (v) {
@@ -16508,6 +16528,19 @@ var SignNode = __webpack_require__(24701);
     }
   },
   methods: {
+    setWatchProps: function setWatchProps() {
+      var _this2 = this;
+      this.watchProps.forEach(function (key) {
+        _this2.unwatchProps.push(_this2.$watch("".concat(key), function (newValue, oldValue) {
+          this.modifyProps[key] = newValue;
+        }));
+      });
+    },
+    clearWatchProps: function clearWatchProps() {
+      this.unwatchProps.forEach(function (func) {
+        func && func();
+      });
+    },
     getCurrentSelectNode: function getCurrentSelectNode() {
       var _hoEditorFactory$vueC;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
@@ -16574,32 +16607,56 @@ var SignNode = __webpack_require__(24701);
       }
       if (this.controlStatus === 'add') {
         if (this.signType === 9) {
-          // 自定义多人签名
-          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {}, this.associatedElement);
+          // 自定义医生签名
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {
+            isHigher: this.isHigher
+          }, this.associatedElement);
         } else if (this.signType === 2) {
-          // 自定义多人签名
-          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, this.associatedElement);
+          // 多人签名（默认带职称）
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {
+            isHigher: this.isHigher
+          }, this.associatedElement);
         } else if (this.signType === 3) {
-          // 自定义多人签名
-          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, this.associatedElement);
+          // 自定义多人签名（默认带出职称和日期）
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {
+            isHigher: this.isHigher
+          }, this.associatedElement);
         } else if (this.signType === 4) {
-          // 自定义多人签名
+          // 自定义多人签名（职称，连接符可选）
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（职称，连接符可选）', 0, '', this.signTimeFormat, customProperty, this.connectMode, undefined, undefined, this.signType, this.connectChar, (0,objectSpread2/* default */.Z)({
-            isDisplayTitle: this.isDisplayTitle
+            isDisplayTitle: this.isDisplayTitle,
+            isHigher: this.isHigher
           }, otherProperty), this.associatedElement);
         } else {
           var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
-          this.vueController.insertEmptySignNode(name, 0, '', '', customProperty, '', undefined, undefined, this.signType, '', {});
+          var otherProperties = {
+            isHigher: this.isHigher
+          };
+          if (this.signType == 1) {
+            otherProperties = {};
+          }
+          this.vueController.insertEmptySignNode(name, 0, '', '', customProperty, '', undefined, undefined, this.signType, '', otherProperties, this.associatedElement);
         }
       } else if (this.controlStatus === 'update') {
+        this.clearWatchProps();
         var node = this.getCurrentSelectNode();
         var _name = this.name ? this.name : node.name;
         var attribute = this.signType === 9 ? 0 : this.signType;
         var signType = this.signType == 9 ? 1 : 0; // 自定义签名的signType=1 其他签名 signType=0
-        var otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
-          isDisplayTitle: this.isDisplayTitle
+        var _otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
+          isDisplayTitle: this.isDisplayTitle,
+          isHigher: this.isHigher
         }, otherProperty);
-        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties, this.isFront, this.associatedElement);
+        if (Object.keys(this.modifyProps).length) {
+          var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
+          var record = hoEditorFactory.docTree.elementChangeRecords.get('|' + node.dataId);
+          if (!record || record.indexOf('add') < 0) {
+            hoEditorFactory.docTree.elementChangeRecords.set('|' + node.dataId, ['update', {
+              nodeTypes: 'sign'
+            }]);
+          }
+        }
+        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, _otherProperties, this.isFront, this.associatedElement);
       }
       this.handleClose();
     },
@@ -16611,10 +16668,10 @@ var SignNode = __webpack_require__(24701);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
  /* harmony default export */ var sign_Signvue_type_script_lang_js_ = (Signvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=034775ac&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=9c073ac8&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=034775ac&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=9c073ac8&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -166383,7 +166440,7 @@ var map = {
 	"./qrCode/QrCode.vue": 59805,
 	"./radioCheckBox/RadioCheckbox.vue": 22876,
 	"./selectDialog/SelectDialog.vue": 32497,
-	"./sign/Sign.vue": 24193,
+	"./sign/Sign.vue": 8494,
 	"./table/TableCellPoper.vue": 97628,
 	"./table/TableCellPoper1.vue": 44645,
 	"./table/TableCellProperty.vue": 63689,
@@ -207024,7 +207081,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.77');
+/* harmony default export */ var version = ('3.1.78');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -213745,6 +213802,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntLabel], function (val) {
       return _this.TransText(val);
     });
+    this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign], function (val) {
+      return _this.TransText(val);
+    });
     // this.convert.set(NodeType[NodeType.ntControl], (val: Record<string, any>) => {
     //   return this.TransText(val);
     // });
@@ -213868,6 +213928,14 @@ var TOHTMLConverter = /*#__PURE__*/function () {
       if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntControl]) {
         str += jnode.text;
       }
+      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntSign]) {
+        if (jnode.type == "2") {
+          str += jnode.imgSrc;
+        }
+        if (jnode.type == "1") {
+          return this.TransImg(jnode);
+        }
+      }
       return "<span style=\"".concat(style, "\">").concat(str, "</span>");
     }
   }, {
@@ -213880,9 +213948,15 @@ var TOHTMLConverter = /*#__PURE__*/function () {
   }, {
     key: "TransImg",
     value: function TransImg(jnode) {
-      var style = this.ToHTMLStyle(jnode);
-      var img = jnode.imageDataBase64String;
-      return "<img id=\"".concat(jnode.id, "\" style=\"").concat(style, "\" src=\"").concat(img, "\"/>");
+      var style = "";
+      if (jnode.nodeType == "ntSign") {
+        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+        style = "height:" + hoEditorFactory.signHeight + "px;";
+      } else {
+        style = this.ToHTMLStyle(jnode);
+      }
+      var img = jnode.imageDataBase64String || jnode.imgSrc;
+      return "<img id=\"".concat(jnode.id ? jnode.id : jnode.dataId, "\" style=\"").concat(style, "\" src=\"").concat(img, "\"/>");
     }
   }, {
     key: "TransPara",
@@ -213947,7 +214021,7 @@ var TOHTMLConverter = /*#__PURE__*/function () {
       var content = "";
       for (var n = 0; n < jnode.childNodes.item.length; n++) {
         //这里只分析Cell
-
+        //console.log(n);
         var item = this.iterator.next();
         if (item.done) break;
         item.value["style"] = jnode.colInfos.item[n];
@@ -213980,7 +214054,7 @@ var TOHTMLConverter = /*#__PURE__*/function () {
         if (node['nodeType'] == 'ntRow') {
           //TODO:row属性CSS
           rtnText += "margin: 0;";
-          var hp = style['rowHeight'] ? "height:".concat(style.rowHeight, "px;") : '';
+          var hp = style['rowHeight'] ? "height:".concat(style.rowHeight, "pt;") : '';
           if (style['rowProperty']) {
             hp = style.rowProperty['rowHeight'] && style.rowProperty['rowHeight'] != 0 ? "height:".concat(style.rowProperty.rowHeight, "cm;") : hp;
           }
@@ -213988,7 +214062,7 @@ var TOHTMLConverter = /*#__PURE__*/function () {
         } else if (node['nodeType'] == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntCell]) {
           //TODO:col属性CSS
           rtnText += "margin: 0;";
-          rtnText += style['colWidth'] ? "width:".concat(style.colWidth, "px;") : '';
+          rtnText += style['colWidth'] ? "width:".concat(style.colWidth, "pt;") : '';
           if (style['crossLineType']) {
             switch (style.crossLineType) {
               case CellNode/* CrossLineType */.v[CellNode/* CrossLineType */.v.ct02]:
@@ -214027,19 +214101,27 @@ var TOHTMLConverter = /*#__PURE__*/function () {
           rtnText += "margin-top:".concat(topMarginPx, "px;");
           rtnText += "margin-bottom:".concat(bottomMarginPx, "px;");
         }
+        var unit = 'pt';
+        if (node['nodeType'] == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntImage]) {
+          unit = 'px';
+        }
         if (node["width"]) {
-          rtnText += "width:".concat(node.width, "px;");
+          rtnText += "width:".concat(node.width).concat(unit, ";");
         }
         if (node["height"]) {
-          rtnText += "height:".concat(node.height, "px;");
+          rtnText += "height:".concat(node.height).concat(unit, ";");
         }
       } else {
         //其他什么只要是需要放到属性里都放这
+        var _unit = 'pt';
+        if (node['nodeType'] == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntImage]) {
+          _unit = 'px';
+        }
         if (node["width"]) {
-          rtnText += "width:".concat(node.width, "px;");
+          rtnText += "width:".concat(node.width).concat(_unit, ";");
         }
         if (node["height"]) {
-          rtnText += "height:".concat(node.height, "px;");
+          rtnText += "height:".concat(node.height).concat(_unit, ";");
         }
         if (node['nodeType'] == BaseNode/* NodeType */.Jq[BaseNode/* NodeType */.Jq.ntTable]) {
           rtnText += 'border-collapse: collapse;';
@@ -214053,7 +214135,7 @@ var TOHTMLConverter = /*#__PURE__*/function () {
     key: "CombineStyleToHTMLStyle",
     value: function CombineStyleToHTMLStyle(val) {
       var spanText = "";
-      spanText += "font-size:" + val.size + "px;";
+      spanText += "font-size:" + val.size + "pt;";
       spanText += "font-family:" + val.font + ";";
       spanText += val.bold ? "font-weight:bold;" : "";
       spanText += val.italic ? "font-style:italic;" : "";
@@ -220740,19 +220822,18 @@ var VueController = /*#__PURE__*/function () {
       hoEditorFactory.docTree.curDomRange = newRange;
       hoEditorFactory.drawTree.moveCaretToPath(curDomRange.startPath);
     }
-    /**
-     * 查询光标所在位置之前的文本内容
-     */
   }, {
-    key: "getCaretPreviousTextNode",
-    value: function getCaretPreviousTextNode() {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
-      var node = curDomRange.npEnd.node;
+    key: "getCaretPreviousNode",
+    value: function getCaretPreviousNode(node) {
+      if (!node) {
+        return "";
+      }
       var text = '';
       var getText = function getText(previousNode) {
         if (previousNode instanceof TextNode/* TextNode */.R || previousNode instanceof LabelNode/* LabelNode */.P || previousNode instanceof DownListNode/* DownListNode */.yF) {
           return previousNode.text;
+        } else if (node instanceof MarkNode/* MarkNode */.j) {
+          return "";
         } else if ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re && (previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode.inputFieldType) === TextInputFieldNode/* InputFieldType */.Zi.dropDownList) {
           return previousNode === null || previousNode === void 0 ? void 0 : previousNode.parentNode.text;
         }
@@ -220764,16 +220845,17 @@ var VueController = /*#__PURE__*/function () {
           text = getText(node.previousLeaf());
         }
       } else if (node instanceof SignNode/* SignNode */.N && node.type !== 3 || node instanceof ParagraphNode/* ParagraphNode */.C) {
-        text = getText(node.previousLeaf());
+        text = "";
       } else if (node instanceof LabelNode/* LabelNode */.P) {
         text = node.text;
+      } else if (node instanceof MarkNode/* MarkNode */.j) {
+        text = "";
       } else if ((node === null || node === void 0 ? void 0 : node.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-        text = getText(node.parentNode.previousLeaf());
+        text = node.text;
         if (!text) {
-          text = getText(node.previousLeaf());
+          text = getText(node.parentNode.previousLeaf());
         }
-      }
-      if (!text && (node === null || node === void 0 ? void 0 : node.parentNode) instanceof CellNode/* CellNode */.D) {
+      } else if (!text && (node === null || node === void 0 ? void 0 : node.parentNode) instanceof CellNode/* CellNode */.D) {
         var cellNode = node === null || node === void 0 ? void 0 : node.parentNode;
         var colNo = cellNode.row.indexOf(cellNode);
         if (colNo != 0) {
@@ -220791,9 +220873,41 @@ var VueController = /*#__PURE__*/function () {
           }
         }
       }
-      text = text.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-      if (text && text.length > 5) {
-        text = text.substring(text.length - 5, text.length);
+      if (text) {
+        text = text.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+        if (text.length > 8) {
+          text = text.substring(text.length - 8, text.length);
+        }
+      }
+      return text;
+    }
+    /**
+     * 查询光标所在位置之前的文本内容
+     */
+  }, {
+    key: "getCaretPreviousTextNode",
+    value: function getCaretPreviousTextNode() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
+      var node = curDomRange.npEnd.node;
+      var count = 0;
+      var text = "";
+      var whileText = "";
+      while (node && text.length < 3 && count < 12) {
+        var _node5;
+        count++;
+        if (node instanceof SignNode/* SignNode */.N || node instanceof MarkNode/* MarkNode */.j || node instanceof TextNode/* TextNode */.R || node instanceof LabelNode/* LabelNode */.P || node instanceof DownListNode/* DownListNode */.yF) {
+          node = node.previousLeaf();
+        } else if (((_node5 = node) === null || _node5 === void 0 ? void 0 : _node5.parentNode) instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+          node = node.parentNode.previousLeaf();
+        } else {
+          node = node.previousLeaf();
+        }
+        whileText = this.getCaretPreviousNode(node);
+        text = whileText + text;
+      }
+      if (text.length < 3) {
+        console.error("\u7B7E\u540D\u5143\u7D20\u524D\u6587\u672C\u5173\u952E\u5B57\u3010".concat(text, "\u3011,\u67E5\u8BE2\u8282\u70B9\u6B21\u6570\u3010").concat(count, "\u3011"));
       }
       return text ? text : '';
     }
@@ -220991,42 +221105,42 @@ var VueController = /*#__PURE__*/function () {
       var downNames = [];
       hoEditorFactory.docTree.curDomRange = new DomRange/* DomRange */.a(this._hoEditorFactoryID, curDomRange.startPath, curDomRange.startPath);
       for (var i = 0; i < nodes.length; i++) {
-        var _node5 = nodes[i];
-        if (_node5 instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          if (fieldNames.indexOf(_node5.name) === -1) {
-            fieldNames.push(_node5.name);
-            var sameNameEles = this.getNodesByName('all', true, _node5.name);
+        var _node6 = nodes[i];
+        if (_node6 instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+          if (fieldNames.indexOf(_node6.name) === -1) {
+            fieldNames.push(_node6.name);
+            var sameNameEles = this.getNodesByName('all', true, _node6.name);
             for (var j = 0; j < sameNameEles.length; j++) {
               var ele = sameNameEles[j];
               if (nodes.indexOf(ele) >= 0) continue;
               if (ele instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-                ele.setFieldText(_node5.text);
+                ele.setFieldText(_node6.text);
               }
             }
           }
         }
-        if (_node5 instanceof DateTimeNode/* DateTimeNode */.Z) {
-          if (dateNames.indexOf(_node5.name) === -1) {
-            dateNames.push(_node5.name);
-            var _sameNameEles = this.getNodesByName('all', true, _node5.name);
+        if (_node6 instanceof DateTimeNode/* DateTimeNode */.Z) {
+          if (dateNames.indexOf(_node6.name) === -1) {
+            dateNames.push(_node6.name);
+            var _sameNameEles = this.getNodesByName('all', true, _node6.name);
             for (var _j = 0; _j < _sameNameEles.length; _j++) {
               var _ele = _sameNameEles[_j];
               if (nodes.indexOf(_ele) >= 0) continue;
               if (_ele instanceof DateTimeNode/* DateTimeNode */.Z) {
-                _ele.setDateTimeText(_node5.text);
+                _ele.setDateTimeText(_node6.text);
               }
             }
           }
         }
-        if (_node5 instanceof DownListNode/* DownListNode */.yF) {
-          if (downNames.indexOf(_node5.name) === -1) {
-            downNames.push(_node5.name);
-            var _sameNameEles2 = this.getNodesByName('all', true, _node5.name);
+        if (_node6 instanceof DownListNode/* DownListNode */.yF) {
+          if (downNames.indexOf(_node6.name) === -1) {
+            downNames.push(_node6.name);
+            var _sameNameEles2 = this.getNodesByName('all', true, _node6.name);
             for (var _j2 = 0; _j2 < _sameNameEles2.length; _j2++) {
               var _ele2 = _sameNameEles2[_j2];
               if (nodes.indexOf(_ele2) >= 0) continue;
               if (_ele2 instanceof DownListNode/* DownListNode */.yF) {
-                _ele2.setDownListText(_node5.text);
+                _ele2.setDownListText(_node6.text);
               }
             }
           }
@@ -221157,29 +221271,29 @@ var VueController = /*#__PURE__*/function () {
       var hasEmptyDoctorSign = false;
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node6 = nodes[i];
-          if (_node6 instanceof SignNode/* SignNode */.N) {
+          var _node7 = nodes[i];
+          if (_node7 instanceof SignNode/* SignNode */.N) {
             // 有值的患者签名
-            if (attribute == 1 && _node6.attribute === 1) {
+            if (attribute == 1 && _node7.attribute === 1) {
               patientSignCount++;
             }
-            if (attribute == 1 && _node6.attribute === 1 && (_node6.imgSrc !== '' || _node6.fingerPrintSrc !== '')) {
+            if (attribute == 1 && _node7.attribute === 1 && (_node7.imgSrc !== '' || _node7.fingerPrintSrc !== '')) {
               hasEmptyPatientSign = true;
               break;
             }
             // 空的医生签名
-            if (attribute != 1 && _node6.attribute != 1 && _node6.imgSrc === '') {
+            if (attribute != 1 && _node7.attribute != 1 && _node7.imgSrc === '') {
               hasEmptyDoctorSign = true;
               break;
             }
           }
-          if (_node6 instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 1 && hasEmptyPatientSign) {
+          if (_node7 instanceof BaseCombineNode/* BaseCombineNode */.V && attribute === 1 && hasEmptyPatientSign) {
             // 患者签名已存在的情况不在深层调用深层遍历
-            getAllNodes(_node6.childNodes);
+            getAllNodes(_node7.childNodes);
           }
-          if (_node6 instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 1 && !hasEmptyDoctorSign) {
+          if (_node7 instanceof BaseCombineNode/* BaseCombineNode */.V && attribute != 1 && !hasEmptyDoctorSign) {
             // 医生签名不存在的情况不在深层调用深层遍历
-            getAllNodes(_node6.childNodes);
+            getAllNodes(_node7.childNodes);
           }
         }
       };
@@ -221395,28 +221509,28 @@ var VueController = /*#__PURE__*/function () {
       var signList = [];
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node7 = nodes[i];
-          if (_node7 instanceof SignNode/* SignNode */.N) {
+          var _node8 = nodes[i];
+          if (_node8 instanceof SignNode/* SignNode */.N) {
             // 空的医生签名
-            if (_node7.attribute != 1) {
+            if (_node8.attribute != 1) {
               var sign = {
                 type: 'sign',
                 signed: false,
-                isTemplate: _node7.isTemplate,
-                number: _node7.number,
-                isVerify: _node7.otherProperties && _node7.otherProperties.isVerify ? true : false,
-                customProperty: _node7.customProperty,
+                isTemplate: _node8.isTemplate,
+                number: _node8.number,
+                isVerify: _node8.otherProperties && _node8.otherProperties.isVerify ? true : false,
+                customProperty: _node8.customProperty,
                 previousText: '',
-                dataId: _node7.dataId,
-                name: _node7.name
+                dataId: _node8.dataId,
+                name: _node8.name
               };
-              sign.previousText = _this8.getPreviousText(_node7);
+              sign.previousText = _this8.getPreviousText(_node8);
               signList.push(sign);
             }
           }
-          if (_node7 instanceof BaseCombineNode/* BaseCombineNode */.V) {
+          if (_node8 instanceof BaseCombineNode/* BaseCombineNode */.V) {
             // 医生签名不存在的情况不在深层调用深层遍历
-            getAllNodes(_node7.childNodes);
+            getAllNodes(_node8.childNodes);
           }
         }
       };
@@ -221434,23 +221548,23 @@ var VueController = /*#__PURE__*/function () {
       var arr = [];
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node8 = nodes[i];
-          if (_node8 instanceof SignNode/* SignNode */.N) {
+          var _node9 = nodes[i];
+          if (_node9 instanceof SignNode/* SignNode */.N) {
             // 空的医生签名
             // if (node.attribute != 1) {
             var sign = {
               type: 'sign',
               signed: false,
-              isTemplate: _node8.isTemplate,
-              number: _node8.number,
-              isVerify: _node8.otherProperties && _node8.otherProperties.isVerify ? true : false,
-              customProperty: _node8.customProperty,
+              isTemplate: _node9.isTemplate,
+              number: _node9.number,
+              isVerify: _node9.otherProperties && _node9.otherProperties.isVerify ? true : false,
+              customProperty: _node9.customProperty,
               previousText: '',
-              dataId: _node8.dataId,
-              name: _node8.name,
-              node: _node8
+              dataId: _node9.dataId,
+              name: _node9.name,
+              node: _node9
             };
-            sign.previousText = _this9.getPreviousText(_node8);
+            sign.previousText = _this9.getPreviousText(_node9);
             if (sign.number == 0 || sign.number == 1) {
               if (arr.length > 0) {
                 signList.push(arr);
@@ -221464,9 +221578,9 @@ var VueController = /*#__PURE__*/function () {
             // }
           }
 
-          if (_node8 instanceof BaseCombineNode/* BaseCombineNode */.V) {
+          if (_node9 instanceof BaseCombineNode/* BaseCombineNode */.V) {
             // 医生签名不存在的情况不在深层调用深层遍历
-            getAllNodes(_node8.childNodes);
+            getAllNodes(_node9.childNodes);
           }
         }
       };
@@ -221498,15 +221612,15 @@ var VueController = /*#__PURE__*/function () {
       var isHasDoctorSign = false;
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node9 = nodes[i];
-          if (_node9 instanceof SignNode/* SignNode */.N && _node9.type !== 3 && _node9.imgSrc) {
+          var _node10 = nodes[i];
+          if (_node10 instanceof SignNode/* SignNode */.N && _node10.type !== 3 && _node10.imgSrc) {
             isHasDoctorSign = true;
             break; // 医生签名已存在的情况中断当前层的遍历
           }
 
-          if (_node9 instanceof BaseCombineNode/* BaseCombineNode */.V && !isHasDoctorSign) {
+          if (_node10 instanceof BaseCombineNode/* BaseCombineNode */.V && !isHasDoctorSign) {
             // 医生签名已存在的情况不在深层调用深层遍历
-            getAllNodes(_node9.childNodes);
+            getAllNodes(_node10.childNodes);
           }
         }
       };
@@ -221961,9 +222075,9 @@ var VueController = /*#__PURE__*/function () {
       var xmlRoot = '<?xml version="1.0" encoding="utf-8"?>';
       var doc2XmlJson = function doc2XmlJson(nodes) {
         for (var _i9 = 0; _i9 < nodes.length; _i9++) {
-          var _node10 = nodes[_i9];
-          if (_node10 instanceof TextNode/* TextNode */.R || _node10 instanceof ParagraphNode/* ParagraphNode */.C || _node10 instanceof TableNode/* TableNode */.Fh || _node10 instanceof ImageNode/* ImageNode */.H) {
-            var nodeJson = node2Json(_node10);
+          var _node11 = nodes[_i9];
+          if (_node11 instanceof TextNode/* TextNode */.R || _node11 instanceof ParagraphNode/* ParagraphNode */.C || _node11 instanceof TableNode/* TableNode */.Fh || _node11 instanceof ImageNode/* ImageNode */.H) {
+            var nodeJson = node2Json(_node11);
             xmlRoot += x2js.js2xml(nodeJson);
           }
         }
@@ -222191,9 +222305,9 @@ var VueController = /*#__PURE__*/function () {
               paragraphRecordId: recordId
             });
           }
-          var _node11 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null);
-          if (_node11) {
-            nodes.push(_node11);
+          var _node12 = hoEditorFactory.structureConvert.convertNode(temp, hoEditorFactory.docTree.mainNodes, null);
+          if (_node12) {
+            nodes.push(_node12);
           }
         }
         if (nodes.length > 0) {
@@ -222293,12 +222407,12 @@ var VueController = /*#__PURE__*/function () {
       var ret = [];
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node12 = nodes[i];
-          if (_node12 instanceof QrcodeNode/* QrcodeNode */.d) {
-            ret.push(_node12);
+          var _node13 = nodes[i];
+          if (_node13 instanceof QrcodeNode/* QrcodeNode */.d) {
+            ret.push(_node13);
           }
-          if (_node12 instanceof BaseCombineNode/* BaseCombineNode */.V) {
-            getAllNodes(_node12.childNodes);
+          if (_node13 instanceof BaseCombineNode/* BaseCombineNode */.V) {
+            getAllNodes(_node13.childNodes);
           }
         }
       };
@@ -222330,12 +222444,12 @@ var VueController = /*#__PURE__*/function () {
       var ret = [];
       var getAllNodes = function getAllNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
-          var _node13 = nodes[i];
-          if (_node13 instanceof QrcodeNode/* QrcodeNode */.d) {
-            ret.push(_node13);
+          var _node14 = nodes[i];
+          if (_node14 instanceof QrcodeNode/* QrcodeNode */.d) {
+            ret.push(_node14);
           }
-          if (_node13 instanceof BaseCombineNode/* BaseCombineNode */.V) {
-            getAllNodes(_node13.childNodes);
+          if (_node14 instanceof BaseCombineNode/* BaseCombineNode */.V) {
+            getAllNodes(_node14.childNodes);
           }
         }
       };
@@ -222677,11 +222791,11 @@ var VueController = /*#__PURE__*/function () {
       var table = null;
       var i = 0;
       for (var k = 0; k < hoEditorFactory.docTree.mainNodes.length; k++) {
-        var _node14 = hoEditorFactory.docTree.mainNodes[k];
-        if (_node14 instanceof TableNode/* TableNode */.Fh) {
+        var _node15 = hoEditorFactory.docTree.mainNodes[k];
+        if (_node15 instanceof TableNode/* TableNode */.Fh) {
           i++;
           if (i === index) {
-            table = _node14;
+            table = _node15;
             break;
           }
         }
@@ -222842,18 +222956,36 @@ var VueController = /*#__PURE__*/function () {
                   downLists: value[1].downLists
                 });
               }
-              obj = {
-                "type": value[0],
-                "id": key.split("|")[0],
-                "dataid": key.split("|")[1],
-                "record": value[1]
-              };
-              recordArr.push(obj);
+              if (value[1].nodeTypes == 'sign') {
+                var _node16 = _this13.getNodeByDataID('main', key.replace('|', ''));
+                if (_node16 instanceof SignNode/* SignNode */.N) {
+                  var signJsons = _node16.node2Json();
+                  var signXml = x2js.js2xml(signJsons);
+                  obj = {
+                    "type": value[0],
+                    "id": '',
+                    "dataid": key.split("|")[1],
+                    "record": {
+                      nodeTypes: 'sign',
+                      content: signXml
+                    }
+                  };
+                  recordArr.push(obj);
+                }
+              } else {
+                obj = {
+                  "type": value[0],
+                  "id": key.split("|")[0],
+                  "dataid": key.split("|")[1],
+                  "record": value[1]
+                };
+                recordArr.push(obj);
+              }
             }
           }
         } else {
           var id = key.split("|")[0];
-          var _node15 = _this13.getNodeByID('all', id);
+          var _node17 = _this13.getNodeByID('all', id);
         }
       });
       return recordArr;
@@ -222901,6 +223033,32 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       return hoEditorFactory.docTree.mainNodes;
     }
+  }, {
+    key: "getFileHtml",
+    value: function getFileHtml() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var firstHead = hoEditorFactory.subDocManger.getHeaderPageNodes()[0];
+      var headerEnd = hoEditorFactory.docTree.getNodeLastPath(firstHead[firstHead.length - 1]);
+      var headerRange = new DomRange/* DomRange */.a(this._hoEditorFactoryID, 'header/0/0', headerEnd);
+      hoEditorFactory.structureNode.Copy(headerRange, null);
+      var headHtml = hoEditorFactory.structureNode.htmldata;
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      var mainEnd = hoEditorFactory.docTree.getNodeLastPath(mainNodes[mainNodes.length - 1]);
+      var mainRange = new DomRange/* DomRange */.a(this._hoEditorFactoryID, 'main/0', mainEnd);
+      hoEditorFactory.structureNode.Copy(mainRange, null);
+      var mainHtml = hoEditorFactory.structureNode.htmldata;
+      var padding = "".concat(hoEditorFactory.pageProperty.headerYPixes, "px ").concat(hoEditorFactory.pageProperty.rightMarginPixes, "px ").concat(hoEditorFactory.pageProperty.bottomMarginPixes, "px ").concat(hoEditorFactory.pageProperty.leftMarginPixes, "px");
+      var content = "";
+      var head = headHtml.match(/<!--StartFragment-->([\s\S]*?)<!--EndFragment-->/);
+      var main = mainHtml.match(/<!--StartFragment-->([\s\S]*?)<!--EndFragment-->/);
+      if (head && head[1]) {
+        content += head[1];
+      }
+      if (main && main[1]) {
+        content += main[1];
+      }
+      return "\n        <html>\n        <head>\n            <style>\n                html, body {\n                    padding: 0;\n                    margin: 0;\n                    background: #f2f4f7;\n                }\n                #hoEmrContent {\n                    margin: 20px auto;\n                    background: #fff;\n                    box-shadow: 0px 2px 12px 0px #c7cacf;\n                }\n            </style>\n        </head>\n        <body>\n            <div id=\"hoEmrContent\" style='width: ".concat(hoEditorFactory.pageProperty.widthPixes, "px; padding: ").concat(padding, ";'>\n                ").concat(content, "\n            </div>\n        </body>\n        </html>");
+    }
   }]);
   return VueController;
 }();