hoeditor-web 2.0.80 → 2.0.81

package/lib/hoeditor.common.js

@@ -16808,11 +16808,11 @@ var DocController = /*#__PURE__*/function () {
 
   }, {
     key: "insertEmptySignNode",
-    value: function insertEmptySignNode(domRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute) {
+    value: function insertEmptySignNode(domRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute, connectChar) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_77__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute); //插入该表达式节点
+      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_24__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, name, signType, signFormat, "", "", signTimeFormat, "", 0, 0, {}, true, hoEditorFactory.docTree.curStyleIndex, connectMode, isFront, allowEditSignTime, undefined, undefined, attribute, connectChar); //插入该表达式节点
 
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_25__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -33955,7 +33955,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 
   var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(SignNode);
 
-  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute) {
+  function SignNode(hoEditorFactoryID, rootNodes, pNode, nodeType, number, type, name, signType, signFormat, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, isTemplate, styleIndex, connectMode, isFront, allowEditSignTime, fingerPrintSrc, fingerPosition, attribute, connectChar) {
     var _this;
 
     (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, SignNode);
@@ -34001,12 +34001,15 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
 
     _this._attribute = 0; //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片)
 
+    _this._connectChar = ":"; //自定义CA签名连接符
+
     _this.number = number;
     _this._type = type;
     _this._signor = signor;
     _this._signTime = signTime;
     _this._imgSrc = imgSrc;
     _this._attribute = attribute === undefined ? 0 : attribute;
+    _this._connectChar = connectChar === undefined ? ":" : connectChar;
 
     if (type == 3) {
       // 兼容旧的患者签名
@@ -34282,6 +34285,16 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this._attribute = value;
       }
     }
+  }, {
+    key: "connectChar",
+    get: function get() {
+      return this._connectChar;
+    },
+    set: function set(value) {
+      if (this._connectChar !== value) {
+        this._connectChar = value;
+      }
+    }
     /**
     *
     * @param drawTree 绘制树
@@ -34303,7 +34316,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this.styleIndex = 0;
       }
 
-      var dNode = new _editor_draw_drawNode_DrawSignNode__WEBPACK_IMPORTED_MODULE_10__/* .DrawSignNode */ .V(this._hoEditorFactoryID, this._rootPath, this, this.number, this.type, this.name, this.imgSrc, this.imgWidth, this.imgHeight, cbStyle, this.fingerPrintSrc, this.fingerPosition, this.attribute, this.customProperty);
+      var dNode = new _editor_draw_drawNode_DrawSignNode__WEBPACK_IMPORTED_MODULE_10__/* .DrawSignNode */ .V(this._hoEditorFactoryID, this._rootPath, this, this.number, this.type, this.name, this.imgSrc, this.imgWidth, this.imgHeight, cbStyle, this.fingerPrintSrc, this.fingerPosition, this.attribute, this.customProperty, this.connectChar);
 
       this._drawNodes.push(dNode);
     }
@@ -34387,7 +34400,8 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         allowEditSignTime: this.allowEditSignTime,
         fingerPrintSrc: clearSign ? "" : this.fingerPrintSrc,
         fingerPosition: clearSign ? 0 : this.fingerPosition,
-        attribute: this.attribute
+        attribute: this.attribute,
+        connectChar: this.connectChar
       };
 
       if (isCopy) {
@@ -34416,7 +34430,7 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       var imgHeight = isClearSign ? 0 : Number(json.imgHeight);
       var isTemplate = json.isTemplate === true || json.isTemplate === "true" ? true : false;
       var attribute = json.attribute ? Number(json.attribute) : 0;
-      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute);
+      var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar);
       signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0; //signNode.number = number;
       //signNode.width = width;
 
@@ -51602,7 +51616,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2022-07-26 12:00:22
+ * @LastEditTime: 2022-08-01 10:19:27
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -51613,7 +51627,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
 
   var _super = (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(DrawSignNode);
 
-  function DrawSignNode(hoeditfactoryID, rootPath, node, number, type, name, imgSrc, imgWidth, imgHeight, cbStyle, fingerPrintSrc, fingerPosition, attribute, customProperty) {
+  function DrawSignNode(hoeditfactoryID, rootPath, node, number, type, name, imgSrc, imgWidth, imgHeight, cbStyle, fingerPrintSrc, fingerPosition, attribute, customProperty, connectChar) {
     var _this;
 
     (0,D_project_go_emr_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawSignNode);
@@ -51627,6 +51641,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._fingerPosition = 0;
     _this._attribute = 0; //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片)
 
+    _this._connectChar = ":";
     _this._abi02 = "";
     _this._number = number;
     _this._imgSrc = imgSrc;
@@ -51635,6 +51650,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._fingerPrintSrc = fingerPrintSrc;
     _this._fingerPosition = fingerPosition;
     _this._attribute = attribute;
+    _this._connectChar = connectChar;
     _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : ""; //this._textStyle = cbStyle.;
 
     _this.dHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_8__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID).signHeight; //this.dHeight = 40;
@@ -51677,7 +51693,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
 
         if (_this.attribute === 2 && _this._abi02 !== "") {
-          _this._drawAbi02 = new createjs.Text(_this._abi02 + ":", _this._textStyle, '#000000');
+          _this._drawAbi02 = new createjs.Text(_this._abi02 + _this._connectChar, _this._textStyle, '#000000');
           _this.dWidth += _this._drawAbi02.getMeasuredWidth();
         }
       }
@@ -52016,7 +52032,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           }
 
           if (_this3.attribute === 2 && _this3.abi02 !== "") {
-            var abi02Text = new createjs.Text(_this3.abi02 + ":", _this3.textStyle, '#000000');
+            var abi02Text = new createjs.Text(_this3.abi02 + _this3._connectChar, _this3.textStyle, '#000000');
             abi02Text.textBaseline = 'alphabetic';
             abi02Text.textAlign = 'left';
 
@@ -55409,6 +55425,7 @@ var Caret = /*#__PURE__*/function () {
       this.div_cursor.style.left = x + "px";
       this.div_cursor.style.top = y + "px";
       this.div_cursor.style.opacity = "1";
+      this.div_cursor.style.width = "0.1px";
       this.updateCaret();
       this.setPage(pageIndex);
     }
@@ -207499,7 +207516,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.80');
+/* harmony default export */ var version = ('2.0.81');
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperTipText/PoperTipText.vue?vue&type=template&id=3fa4e4d3&scoped=true&
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"},{name:"click-outside",rawName:"v-click-outside",value:(_vm.handleClose),expression:"handleClose"}],ref:"poperTextNode",staticClass:"poper-text-modal animation-in",style:(_vm.posStyle),on:{"mouseenter":_vm.mouseEnter,"mouseleave":_vm.mouseLeave}},_vm._l((_vm.poperText),function(text){return _c('div',{key:text + Math.random(0, 1),staticClass:"poper-text"},[_vm._v(" "+_vm._s(text)+" ")])}),0)}
 var PoperTipTextvue_type_template_id_3fa4e4d3_scoped_true_staticRenderFns = []
@@ -212154,13 +212171,13 @@ var StructureConvert = /*#__PURE__*/function () {
         xmlRoot += x2js.js2xml(_userHistories);
         xmlRoot += "</userHistories>";
         xmlRoot += "<headers>";
-        xmlRoot = this.doc2Json("header", "xml", xmlRoot);
+        xmlRoot = this.doc2Json("header", "xml", xmlRoot, clearSign);
         xmlRoot += "</headers>";
         xmlRoot += "<main>";
         xmlRoot = this.doc2Json("main", "xml", xmlRoot, clearSign);
         xmlRoot += "</main>";
         xmlRoot += "<footers>";
-        xmlRoot = this.doc2Json("footer", "xml", xmlRoot);
+        xmlRoot = this.doc2Json("footer", "xml", xmlRoot, clearSign);
         xmlRoot += "</footers>";
         xmlRoot += "<docText>";
         xmlRoot += hoEditorFactory.vueController.getMainDocText();
@@ -219688,7 +219705,7 @@ var VueController = /*#__PURE__*/function () {
 
   }, {
     key: "insertEmptySignNode",
-    value: function insertEmptySignNode(name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute) {
+    value: function insertEmptySignNode(name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute, connectChar) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       var startPath = curDomRange.normalize().startPath;
@@ -219696,7 +219713,7 @@ var VueController = /*#__PURE__*/function () {
       var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertSign */.y.insertSign);
 
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.insertEmptySignNode(curDomRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute);
+        hoEditorFactory.docController.insertEmptySignNode(curDomRange, name, signType, signFormat, signTimeFormat, connectMode, isFront, allowEditSignTime, attribute, connectChar);
       }
     }
     /**
@@ -232868,9 +232885,9 @@ var ControlModal_component = normalizeComponent(
 )
 
 /* harmony default export */ var ControlModal = (ControlModal_component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/findReplace/FindReplace.vue?vue&type=template&id=15d96f32&
-var FindReplacevue_type_template_id_15d96f32_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"findModal",class:_vm.animationClassNames,on:{"mousedown":_vm.toolModalDown}},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("查找替换")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("查找内容")]),_c('el-input',{attrs:{"type":"text","size":"mini"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.toFind.apply(null, arguments)}},model:{value:(_vm.findContent),callback:function ($$v) {_vm.findContent=$$v},expression:"findContent"}})],1),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"label"},[_c('el-checkbox',{on:{"change":_vm.switchTypes},model:{value:(_vm.switchType),callback:function ($$v) {_vm.switchType=$$v},expression:"switchType"}},[_vm._v("替换内容")])],1),_c('el-input',{attrs:{"disabled":!_vm.switchType,"type":"text","size":"mini"},model:{value:(_vm.replaceCentent),callback:function ($$v) {_vm.replaceCentent=$$v},expression:"replaceCentent"}})],1),_c('li',{staticClass:"control-item"},[_c('el-radio',{attrs:{"label":0},model:{value:(_vm.direction),callback:function ($$v) {_vm.direction=$$v},expression:"direction"}},[_vm._v("向下")]),_c('el-radio',{attrs:{"label":1},model:{value:(_vm.direction),callback:function ($$v) {_vm.direction=$$v},expression:"direction"}},[_vm._v("向上")]),_c('div',{staticStyle:{"margin-left":"30px"}},[_c('el-checkbox',{model:{value:(_vm.matchCase),callback:function ($$v) {_vm.matchCase=$$v},expression:"matchCase"}},[_vm._v("区分大小写")])],1)],1)])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"disabled":_vm.findContent === '',"size":"mini"},on:{"click":_vm.toFind}},[_vm._v("查找")]),_c('el-button',{attrs:{"disabled":_vm.findContent === '' || !_vm.switchType,"size":"mini"},on:{"click":_vm.toReplace}},[_vm._v("替换")]),_c('el-button',{attrs:{"disabled":_vm.findContent === '' || !_vm.switchType,"size":"mini"},on:{"click":_vm.toReplaceAll}},[_vm._v("全部替换")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1)])}
-var FindReplacevue_type_template_id_15d96f32_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/findReplace/FindReplace.vue?vue&type=template&id=7c30bf52&
+var FindReplacevue_type_template_id_7c30bf52_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"findModal",class:_vm.animationClassNames,on:{"mousedown":_vm.toolModalDown}},[_c('header',{staticClass:"modal-title"},[_c('span',[_vm._v("查找替换")]),_c('i',{staticClass:"el-icon-close modal-title-close",on:{"click":_vm.handleClose}})]),_c('section',{staticClass:"modal-content"},[_c('ul',{staticClass:"control-list"},[_c('li',{staticClass:"control-item"},[_c('span',{staticClass:"label"},[_vm._v("查找内容")]),_c('el-input',{attrs:{"type":"text","size":"mini"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.toFind.apply(null, arguments)}},model:{value:(_vm.findContent),callback:function ($$v) {_vm.findContent=$$v},expression:"findContent"}})],1),_c('li',{staticClass:"control-item"},[_c('div',{staticClass:"label"},[_c('el-checkbox',{on:{"change":_vm.switchTypes},model:{value:(_vm.switchType),callback:function ($$v) {_vm.switchType=$$v},expression:"switchType"}},[_vm._v("替换内容")])],1),_c('el-input',{attrs:{"disabled":!_vm.switchType,"type":"text","size":"mini"},model:{value:(_vm.replaceCentent),callback:function ($$v) {_vm.replaceCentent=$$v},expression:"replaceCentent"}})],1),_c('li',{staticClass:"control-item"},[_c('el-radio',{attrs:{"label":0},model:{value:(_vm.direction),callback:function ($$v) {_vm.direction=$$v},expression:"direction"}},[_vm._v("向下")]),_c('el-radio',{attrs:{"label":1},model:{value:(_vm.direction),callback:function ($$v) {_vm.direction=$$v},expression:"direction"}},[_vm._v("向上")]),_c('div',{staticStyle:{"margin-left":"30px"}},[_c('el-checkbox',{model:{value:(_vm.matchCase),callback:function ($$v) {_vm.matchCase=$$v},expression:"matchCase"}},[_vm._v("区分大小写")])],1)],1)])]),_c('footer',{staticClass:"ho-modal-footer"},[_c('el-button',{attrs:{"disabled":_vm.findContent === '',"size":"mini"},on:{"click":_vm.toFind}},[_vm._v("查找")]),_c('el-button',{attrs:{"disabled":_vm.findContent === '' || !_vm.switchType,"size":"mini"},on:{"click":_vm.toReplace}},[_vm._v("替换")]),_c('el-button',{attrs:{"disabled":_vm.findContent === '' || !_vm.switchType,"size":"mini"},on:{"click":_vm.toReplaceAll}},[_vm._v("全部替换")]),_c('el-button',{attrs:{"size":"mini"},on:{"click":_vm.handleClose}},[_vm._v("关闭")])],1)])}
+var FindReplacevue_type_template_id_7c30bf52_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40[0].rules[0].use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/findReplace/FindReplace.vue?vue&type=script&lang=js&
@@ -232916,7 +232933,7 @@ var FindReplacevue_type_template_id_15d96f32_staticRenderFns = []
 /* harmony default export */ var FindReplacevue_type_script_lang_js_ = ({
   name: 'FindReplaceDialog',
   mixins: [AppendToBodyMixins],
-  Inject: ['setControlFindType'],
+  inject: ['setControlFindType'],
   props: {
     hoEditorFactoryId: {
       type: String,
@@ -233011,8 +233028,8 @@ var FindReplacevue_type_template_id_15d96f32_staticRenderFns = []
 
 var FindReplace_component = normalizeComponent(
   findReplace_FindReplacevue_type_script_lang_js_,
-  FindReplacevue_type_template_id_15d96f32_render,
-  FindReplacevue_type_template_id_15d96f32_staticRenderFns,
+  FindReplacevue_type_template_id_7c30bf52_render,
+  FindReplacevue_type_template_id_7c30bf52_staticRenderFns,
   false,
   null,
   null,