hoeditor-web 3.0.69 → 3.0.71

package/lib/hoeditor.umd.js

@@ -8964,7 +8964,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 63138:
+/***/ 59046:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8984,7 +8984,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=05078cc6&
+;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=7d01edb7&
 
 
 
@@ -9372,7 +9372,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=05078cc6&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=7d01edb7&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -11533,8 +11533,7 @@ var type = __webpack_require__(41542);
           v.showText = v.text.split("<元素>")[0];
         } else if (v.text.includes("<\u641C\u7D22>")) {
           v.showText = v.text.split("<搜索>")[0];
-        }
-        if (v.text.includes("__")) {
+        } else if (v.text.includes("__")) {
           v.showText = v.text.split("__")[0];
         } else {
           v.showText = v.text;
@@ -12137,10 +12136,10 @@ var type = __webpack_require__(41542);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=05078cc6&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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7d01edb7&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=05078cc6&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7d01edb7&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -14939,7 +14938,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 37930:
+/***/ 84240:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -14953,7 +14952,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// 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=7416bc9f&
+;// 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=5cef9662&
 
 var render = function render() {
   var _vm = this,
@@ -15032,7 +15031,11 @@ var render = function render() {
     attrs: {
       "value": 3
     }
-  }, [_vm._v("自定义CA签名（默认带出职称和日期）")])], 1)], 1)]), _vm.signType == 2 ? _c('li', {
+  }, [_vm._v("自定义CA签名（默认带出职称和日期）")]), _c('a-radio', {
+    attrs: {
+      "value": 4
+    }
+  }, [_vm._v("自定义CA签名（职称，连接符可选）")])], 1)], 1)]), _vm.signType == 2 ? _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -15048,11 +15051,11 @@ var render = function render() {
       },
       expression: "connectChar"
     }
-  })], 1) : _vm._e(), _vm.signType >= 9 ? [_c('li', {
+  })], 1) : _vm._e(), _vm.signType == 4 ? _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
-  }, [_vm._v("签名格式")]), _c('a-select', {
+  }, [_vm._v("连接符")]), _c('a-select', {
     attrs: {
       "getPopupContainer": function getPopupContainer(triggerNode) {
         return triggerNode.parentNode;
@@ -15060,29 +15063,66 @@ var render = function render() {
       "placeholder": "请选择"
     },
     model: {
-      value: _vm.signFormat,
+      value: _vm.connectMode,
       callback: function callback($$v) {
-        _vm.signFormat = $$v;
+        _vm.connectMode = $$v;
       },
-      expression: "signFormat"
+      expression: "connectMode"
     }
   }, [_c('a-select-option', {
     attrs: {
-      "value": "<医师姓名>"
+      "value": "/"
+    }
+  }, [_vm._v("/")]), _c('a-select-option', {
+    attrs: {
+      "value": "换行"
     }
-  }, [_vm._v("<医师姓名>")]), _c('a-select-option', {
+  }, [_vm._v("换行")]), _c('a-select-option', {
     attrs: {
-      "value": "<医师姓名>（<医师职称>）"
+      "value": "、"
     }
-  }, [_vm._v("<医师姓名>（<医师职称>）")]), _c('a-select-option', {
+  }, [_vm._v("、")]), _c('a-select-option', {
     attrs: {
-      "value": ""
+      "value": "，"
     }
-  }, [_vm._v("<医师姓名>：<医师职称>\" value=\"<医师姓名>：<医师职称>")]), _c('a-select-option', {
+  }, [_vm._v("，")])], 1)], 1) : _vm._e(), _vm.signType == 4 ? _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("职称")]), _c('a-checkbox', {
+    model: {
+      value: _vm.isDisplayTitle,
+      callback: function callback($$v) {
+        _vm.isDisplayTitle = $$v;
+      },
+      expression: "isDisplayTitle"
+    }
+  })], 1) : _vm._e(), _vm.signType >= 9 ? [_c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("签名格式")]), _c('a-select', {
     attrs: {
-      "value": "<医师姓名>：<医师职称>\\n<签名时间>"
+      "getPopupContainer": function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
+      "placeholder": "请选择"
+    },
+    model: {
+      value: _vm.signFormat,
+      callback: function callback($$v) {
+        _vm.signFormat = $$v;
+      },
+      expression: "signFormat"
     }
-  }, [_vm._v("<医师姓名>：<医师职称>\\n<签名时间>")]), _vm._l(_vm.customSignFormatList, function (format) {
+  }, [_vm._l(_vm.defaultFormatList, function (format) {
+    return _c('a-select-option', {
+      key: format,
+      attrs: {
+        "value": format
+      }
+    }, [_vm._v(_vm._s(format))]);
+  }), _vm._l(_vm.customSignFormatList, function (format) {
     return _c('a-select-option', {
       key: format.label,
       attrs: {
@@ -15311,8 +15351,10 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=7416bc9f&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=5cef9662&
 
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
+var objectSpread2 = __webpack_require__(63442);
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/style/index.js + 1 modules
 var style = __webpack_require__(94310);
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/index.js + 3 modules
@@ -15360,6 +15402,7 @@ var SignNode = __webpack_require__(24701);
 
 
 
+
 /* harmony default export */ var Signvue_type_script_lang_js_ = ({
   name: 'Sign',
   props: {
@@ -15387,18 +15430,23 @@ var SignNode = __webpack_require__(24701);
       signTimeFormat: 'yyyy-MM-DD HH:mm',
       customFormatContent: '',
       customSignFormatList: [],
-      animationClassNames: 'control-modal-contents sign-modal animation-in'
+      defaultFormatList: ['<医师姓名>', '<医师姓名>（<医师职称>）', '<医师姓名>：<医师职称>', '<医师姓名>：<医师职称>\n<签名时间>'],
+      animationClassNames: 'control-modal-contents sign-modal animation-in',
+      isDisplayTitle: false
     };
   },
   mounted: function mounted() {
     if (this.controlStatus === 'update') {
       var node = this.getCurrentSelectNode();
       if (node) {
+        var _node$otherProperties;
         this.name = node.name;
         if (node.attribute == 2) {
           this.signType = 2; // 自定义ca签名(带职称)
         } else if (node.attribute == 3) {
-          this.signType = 3; // 自定义ca签名(带职称)
+          this.signType = 3; // 自定义CA签名（默认带出职称和日期）
+        } else if (node.attribute == 4) {
+          this.signType = 4; // 自定义CA签名（职称，连接符可选）
         } else if (node.attribute == 1) {
           this.signType = 1; // 患者签名
         } else {
@@ -15416,6 +15464,7 @@ var SignNode = __webpack_require__(24701);
         this.signTimeFormat = node.signTimeFormat;
         this.customFormatContent = node.customFormatContent ? node.customFormatContent : '';
         this.customSignFormatList = node.customSignFormatList ? node.customSignFormatList : [];
+        this.isDisplayTitle = (_node$otherProperties = node.otherProperties) !== null && _node$otherProperties !== void 0 && _node$otherProperties.isDisplayTitle ? true : false;
       }
     }
   },
@@ -15488,6 +15537,12 @@ var SignNode = __webpack_require__(24701);
         } else if (this.signType === 3) {
           // 自定义多人签名
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义CA签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar);
+        } else if (this.signType === 4) {
+          // 自定义多人签名
+
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义CA签名（职称，连接符可选）', 0, '', '', customProperty, this.connectMode, undefined, undefined, this.signType, this.connectChar, {
+            isDisplayTitle: this.isDisplayTitle
+          });
         } else {
           var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
           this.vueController.insertEmptySignNode(name, 0, '', '', customProperty, '', undefined, undefined, this.signType);
@@ -15497,7 +15552,10 @@ var SignNode = __webpack_require__(24701);
         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
-        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat);
+        var otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
+          isDisplayTitle: this.isDisplayTitle
+        });
+        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties);
       }
       this.handleClose();
     },
@@ -15509,10 +15567,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-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/controls/sign/Sign.vue?vue&type=style&index=0&id=7416bc9f&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/controls/sign/Sign.vue?vue&type=style&index=0&id=5cef9662&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=7416bc9f&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=5cef9662&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -41434,18 +41492,19 @@ var DocController = /*#__PURE__*/function () {
         node.imgHeight = imgHeight;
         node.fingerPrintSrc = fingerPrintSrc ? fingerPrintSrc : "";
         node.fingerPosition = fingerPosition ? fingerPosition : 0;
-        node.otherProperties = otherProperties ? otherProperties : new Object();
+        node.otherProperties = otherProperties ? otherProperties : node.otherProperties;
         node.imgSrc = imgSrc;
-        if (type == 1 && node.signType == 1) {
-          node.isFront = true;
-          node.connectMode = "/";
-        }
+        // if (type == 1 && node.signType == 1) {
+        //   node.isFront = true;
+        // }
+        //node.connectMode = "/";
         hoEditorFactory.docTree.change(changeEvent);
       } else {
         //第二次更新签名
         if (node.connectMode === "换行") {
           sPath = hoEditorFactory.docTree.getNodeLastPath(node);
-          var curParaNode = hoEditorFactory.drawTree.getDlineByPath(sPath).paragraphNode;
+          var dline = hoEditorFactory.drawTree.getDrawLineByDNode(node.drawNodes[0]);
+          var curParaNode = dline.paragraphNode;
           var newPara = new _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_29__/* .ParagraphNode */ .C(this._hoEditorFactoryID, node.rootNodes, node.parentNode, curParaNode.paraNo);
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newPara));
@@ -41456,7 +41515,7 @@ var DocController = /*#__PURE__*/function () {
             sPath = hoEditorFactory.docTree.getNodeLastPath(node);
           }
         }
-        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, undefined, undefined, otherProperties);
+        var newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 2, type, name, node.signType, node.signFormat, signor, signTime, node.signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, node.styleIndex, node.connectMode, type == 1 && node.signType == 1 ? true : node.isFront, node.allowEditSignTime, fingerPrintSrc, fingerPosition, node.attribute, node.connectChar, otherProperties ? otherProperties : node.otherProperties);
         //插入该表达式节点
         hoEditorFactory.undoService.begin();
         hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, sPath, newSignNode));
@@ -41476,7 +41535,7 @@ var DocController = /*#__PURE__*/function () {
        */
   }, {
     key: "updateEmptySignNode",
-    value: function updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat) {
+    value: function updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat, connectMode, otherProperties) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var sPath = hoEditorFactory.docTree.getNodeLastPath(node.previousLeaf());
       var ePath = hoEditorFactory.docTree.getNodeLastPath(node);
@@ -41492,6 +41551,8 @@ var DocController = /*#__PURE__*/function () {
       node.signTime = signTime;
       node.signTimeFormat = signTimeFormat;
       node.attribute = attribute;
+      node.connectMode = connectMode;
+      node.otherProperties = otherProperties;
       hoEditorFactory.docTree.change(changeEvent);
     }
     /**
@@ -58882,10 +58943,9 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
   //指纹
   //指纹
   //样式
-  // 当前签名图片是否已转成jpg  0代表未转换 1代表已转换
-  //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片) 3:ca签名（职称+签名+日期）
+  //签名属性 0:医生签名  1:患者签名 2:ca签名(职称+签名图片) 3:ca签名（职称+签名+日期）4.ca签名(职称、连接符可选)
   //自定义CA签名连接符
-  //其它属性{"title":"职称","time":"签名日期"}
+  //其它属性{"isDisplayTitle":true,"title":"职称","time":"签名日期"}
   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, otherProperties) {
     var _this;
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, SignNode);
@@ -58909,7 +58969,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_fingerPrintSrc", "");
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_fingerPosition", FingerPosition.center);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_styleIndex", 0);
-    (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_PNGToJPG", 0);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_attribute", 0);
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_connectChar", ":");
     (0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z)((0,D_project_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_otherProperties", void 0);
@@ -58945,8 +59004,8 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
     } else {
       _this._styleIndex = hoEditorFactory.docTree.curStyleIndex;
     }
+    _this._connectMode = connectMode;
     if (signType === 1 && type !== 1) {
-      _this._connectMode = connectMode;
       _this._isFront = isFront;
       _this._allowEditSignTime = allowEditSignTime;
     }
@@ -59136,16 +59195,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         this._customProperty = value;
       }
     }
-  }, {
-    key: "PNGToJPG",
-    get: function get() {
-      return this._PNGToJPG;
-    },
-    set: function set(value) {
-      if (this._PNGToJPG !== value) {
-        this._PNGToJPG = value;
-      }
-    }
   }, {
     key: "isTemplate",
     get: function get() {
@@ -59332,7 +59381,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         imgWidth: clearSign ? 0 : this.imgWidth,
         imgHeight: clearSign ? 0 : this.imgHeight,
         customProperty: clearSign ? new Object() : this.customProperty,
-        PNGToJPG: this.PNGToJPG,
         isTemplate: this.isTemplate,
         styleIndex: this.styleIndex,
         connectMode: this.connectMode,
@@ -59374,7 +59422,6 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         json.fingerPrintSrc = '';
       }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .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, json.otherProperties);
-      signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0;
       // if (json.id != "") {
       //     signNode.id = json.id;
       // }
@@ -76087,7 +76134,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-04-12 13:58:22
+ * @LastEditTime: 2023-06-15 19:32:06
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -76133,6 +76180,16 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     _this._textStyle = cbStyle.getStyleKey();
     _this._abi02 = customProperty && customProperty.abi02 ? customProperty.abi02 : "";
     _this._title = otherProperties && otherProperties.title ? otherProperties.title : "";
+    var isDisplayTitle = otherProperties && otherProperties.isDisplayTitle == "true" ? true : false;
+    if (_this.attribute === 4) {
+      if (isDisplayTitle) {
+        if (_this._title == "") {
+          _this._title = _this._abi02;
+        }
+      } else {
+        _this._title = "";
+      }
+    }
     _this._signTime = otherProperties && otherProperties.time ? otherProperties.time : "";
     if (_this._title != "") {
       _this._drawTitle = new createjs.Text(_this.title + _this._connectChar, _this._textStyle, '#000000');
@@ -76174,7 +76231,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       }
     }
     //this._drawText = new DrawSimpleText('/', cbStyle.getStyleKey(), "#000000");
-    _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, '#000000');
+    if (node.connectMode != "换行" && node.connectMode != "无") {
+      _this._drawText = new createjs.Text(node.connectMode, _this._textStyle, '#000000');
+    }
     if (_this.number === 0) {
       var dText = new createjs.Text(_this.signName, _this._textStyle, '#000000');
       _this.dWidth = dText.getMeasuredWidth();
@@ -76185,7 +76244,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
         if (number === 1) {
           _this.dWidth = imgWidth * scale;
         } else {
-          _this.dWidth = imgWidth * scale + _this._drawText.getMeasuredWidth();
+          _this.dWidth = imgWidth * scale + (_this._drawText ? _this._drawText.getMeasuredWidth() : 0);
         }
         if (_this.attribute === 2 && _this._abi02 !== "") {
           _this._drawAbi02 = new createjs.Text(_this._abi02 + _this._connectChar, _this._textStyle, '#000000');
@@ -76202,6 +76261,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             _this.dHeight = _this.dHeight + _this._drawDate.getMeasuredHeight() + 2;
           }
         }
+        if (_this.attribute === 4) {
+          if (_this.title != "") {
+            _this.dWidth += _this._drawTitle.getMeasuredWidth();
+          }
+        }
       }
       if (_this.type === 2) {
         //文字
@@ -76579,6 +76643,17 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 bitmap.x = _this3._drawTitle.getMeasuredWidth();
                 _this3.addChild(bitmap);
               }
+            } else if (_this3.attribute === 4) {
+              if (_this3.title !== "") {
+                _this3._drawTitle.textBaseline = 'alphabetic';
+                _this3._drawTitle.textAlign = 'left';
+                _this3.addChildAt(_this3._drawTitle, 0);
+                bitmap.x = _this3._drawTitle.getMeasuredWidth();
+                _this3.addChild(bitmap);
+              } else {
+                bitmap.x = 0;
+                _this3.addChild(bitmap);
+              }
             } else {
               _this3.addChildAt(bitmap, 0);
             }
@@ -76614,30 +76689,36 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
                 drawNode.dWidth = _this3._drawDate.getMeasuredWidth();
               }
             }
+            if (drawNode.attribute == 4 && drawNode.title != "") {
+              drawNode.dWidth += drawNode._drawTitle.getMeasuredWidth();
+            }
             if (_this3.number === 2) {
-              drawNode.dWidth += _this3._drawText.getMeasuredWidth();
+              drawNode.dWidth += _this3._drawText ? _this3._drawText.getMeasuredWidth() : 0;
             }
             if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
               bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
             } else if (drawNode.attribute === 3 && drawNode.title !== "") {
               bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight - 4, width / hitWidth, (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight);
+            } else if (drawNode.attribute === 4 && drawNode.title !== "") {
+              bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight + 5, width / hitWidth, drawNode.dHeight / hitHeight);
             } else {
               bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
             }
             var hitArea = new createjs.Shape();
             hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
             bitmap.hitArea = hitArea;
-            if (_this3.imgSrc.indexOf('data:image/') != -1 && _this3.imgSrc.indexOf('data:image/png') == -1) {
-              var canvas = document.createElement('canvas');
-              canvas.width = image.naturalWidth;
-              canvas.height = image.naturalHeight;
-              var ctx = canvas.getContext('2d');
-              ctx.fillStyle = '#FFFFFF';
-              ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
-              ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
-              _this3.node.imgSrc = canvas.toDataURL('image/png');
-              _this3.node.PNGToJPG = 1;
-            }
+            // if (this.attribute !== 4) {
+            //     if (this.imgSrc.indexOf('data:image/') != -1 && this.imgSrc.indexOf('data:image/png') == -1) {
+            //         const canvas = document.createElement('canvas');
+            //         canvas.width = image.naturalWidth;
+            //         canvas.height = image.naturalHeight;
+            //         const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
+            //         ctx.fillStyle = '#FFFFFF';
+            //         ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
+            //         ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
+            //         (this.node as SignNode).imgSrc = canvas.toDataURL('image/png');
+            //     }
+            // }
             var dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
             if (dArea) {
               var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
@@ -196618,7 +196699,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 63138,
+	"./poperSelect/PoperSelect.vue": 59046,
 	"./poperTipText/PoperTipText.vue": 36081,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -196626,7 +196707,7 @@ var map = {
 	"./qrCode/QrCode.vue": 86349,
 	"./radioCheckBox/RadioCheckbox.vue": 93638,
 	"./selectDialog/SelectDialog.vue": 59075,
-	"./sign/Sign.vue": 37930,
+	"./sign/Sign.vue": 84240,
 	"./table/TableCellPoper.vue": 61917,
 	"./table/TableCellProperty.vue": 74601,
 	"./table/TableColProperty.vue": 2116,
@@ -234740,7 +234821,7 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(63138);
+var PoperSelect = __webpack_require__(59046);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -236147,7 +236228,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.69');
+/* harmony default export */ var version = ('3.0.71');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -247917,12 +247998,12 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateEmptySignNode",
-    value: function updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat) {
+    value: function updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat, connectMode, otherProperties) {
       if (node.type !== 0) {
         return;
       }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.docController.updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat);
+      hoEditorFactory.docController.updateEmptySignNode(node, name, attribute, connectChar, signType, signFormat, signor, signTime, signTimeFormat, connectMode, otherProperties);
     }
     /**
      * 更新签名时间
@@ -248616,6 +248697,13 @@ var VueController = /*#__PURE__*/function () {
       var y = (hoEditorFactory.pageProperty.heightPixes - caret.stageY) * 0.75;
       return [caret.pageIndex + 1, caret.stageX * 0.75, y];
     }
+  }, {
+    key: "getPosition2",
+    value: function getPosition2() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var caret = hoEditorFactory.drawTree.caret;
+      return [caret.pageIndex + 1, caret.stageX * 0.75, caret.stageY * 0.75 + 40];
+    }
     /**
      * 获取光标位置
      * returns [pageIndex, x, y]
@@ -250749,6 +250837,56 @@ var VueController = /*#__PURE__*/function () {
         }
       }
     }
+    /**
+     * 根据节点名称找符合条件的文本域元素
+     * @param name 节点名称
+     */
+  }, {
+    key: "getTextInputFieldsByName",
+    value: function getTextInputFieldsByName(name) {
+      var nodes = [];
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var iteratesNodes = function iteratesNodes(pnodes) {
+        for (var i = 0; i < pnodes.length; i++) {
+          var anode = pnodes[i];
+          if (anode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+            if (anode.name === name) {
+              nodes.push(anode);
+            }
+          }
+          if (anode instanceof BaseCombineNode/* BaseCombineNode */.V) {
+            iteratesNodes(anode.childNodes);
+          }
+        }
+      };
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      iteratesNodes(mainNodes);
+      return nodes;
+    }
+  }, {
+    key: "moveCaretToTextInputField",
+    value: function moveCaretToTextInputField(node) {
+      var endNode = node.EndMarkNode.previousLeaf();
+      if (endNode) {
+        var _hoEditorFactory2 = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+        var toPath = _hoEditorFactory2.docTree.getNodeLastPath(endNode);
+        _hoEditorFactory2.drawTree.moveCaretToPath(toPath);
+      }
+    }
+  }, {
+    key: "updateCustomProperty",
+    value: function updateCustomProperty(objs) {
+      for (var i = 0; i < objs.length; i++) {
+        var obj = objs[i];
+        var elements = this.getNodesById("all", true, obj.id);
+        for (var e = 0; e < elements.length; e++) {
+          var element = elements[e];
+          if (element instanceof TextInputFieldNode/* TextInputFieldNode */.re || element instanceof DateTimeNode/* DateTimeNode */.Z || element instanceof DownListNode/* DownListNode */.yF) {
+            element.customProperty = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, element.customProperty), obj.customProperty);
+          }
+        }
+      }
+    }
   }]);
   return VueController;
 }();