hoeditor-web 3.1.64 → 3.1.65

package/lib/hoeditor.umd.js

@@ -5183,7 +5183,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 6675:
+/***/ 15759:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5205,7 +5205,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/dateDialog/DateDialog.vue?vue&type=template&id=0353b7dc&
+;// 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/dateDialog/DateDialog.vue?vue&type=template&id=51a11de7&
 
 
 
@@ -5250,7 +5250,13 @@ var render = function render() {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
-  }, [_vm._v("编号")]), _c('span', {
+  }, [_vm._v("日期编号(唯一值)")]), _c('span', {
+    staticClass: "readonly-value"
+  }, [_vm._v(_vm._s(_vm.dataId))])]), _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("日期ID")]), _c('span', {
     staticClass: "readonly-value"
   }, [_vm._v(_vm._s(_vm.id))])]), _c('li', {
     staticClass: "control-item"
@@ -5474,7 +5480,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=0353b7dc&
+;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=51a11de7&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -5532,6 +5538,7 @@ var zh_cn = __webpack_require__(83839);
       // 自定义属性
       customPropertyValue: new Object(),
       id: '',
+      dataId: '',
       name: '',
       text: null,
       title: '日期时间',
@@ -5580,6 +5587,7 @@ var zh_cn = __webpack_require__(83839);
       this.innerIdentifier = updateNode.innerIdentifier;
       this.dataMetaIdentifier = updateNode.dataMetaIdentifier;
       this.identifierFormat = updateNode.identifierFormat;
+      this.dataId = updateNode.dataId;
       this.readType = updateNode.readType === 1 ? true : false;
       if ((0,type/* isObject */.Kn)(updateNode.customProperty)) {
         this.customPropertys = updateNode.customProperty;
@@ -5681,10 +5689,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var dateDialog_DateDialogvue_type_script_lang_js_ = (DateDialogvue_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/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0353b7dc&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/dateDialog/DateDialog.vue?vue&type=style&index=0&id=51a11de7&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0353b7dc&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=51a11de7&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -15837,7 +15845,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 921:
+/***/ 24193:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15851,7 +15859,10 @@ __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=657c2f70&
+// 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&
+
 
 var render = function render() {
   var _vm = this,
@@ -15950,7 +15961,7 @@ var render = function render() {
       },
       expression: "connectChar"
     }
-  })], 1) : _vm._e(), _vm.signType >= 4 ? [_c('li', {
+  })], 1) : _vm.signType >= 4 ? [_c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -16070,7 +16081,7 @@ var render = function render() {
     attrs: {
       "value": "1"
     }
-  }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm._e(), _vm.signType >= 9 ? [_c('li', {
+  }, [_vm._v("右")])], 1)], 1) : _vm._e()] : _vm.signType >= 9 ? [_c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
@@ -16210,7 +16221,34 @@ var render = function render() {
     attrs: {
       "type": "info-circle"
     }
-  })], 2)], 1)] : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
+  })], 2)], 1)] : _vm.signType == 0 || _vm.signType == 1 ? [_c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("关联日期元素")]), _c('a-select', {
+    attrs: {
+      "showSearch": "",
+      "allowClear": "",
+      "getPopupContainer": function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
+      "placeholder": "请选择关联日期时间元素"
+    },
+    model: {
+      value: _vm.associatedElement,
+      callback: function callback($$v) {
+        _vm.associatedElement = $$v;
+      },
+      expression: "associatedElement"
+    }
+  }, _vm._l(_vm.dateTimeList, function (dateTime) {
+    return _c('a-select-option', {
+      key: dateTime.dataId,
+      attrs: {
+        "value": dateTime.dataId
+      }
+    }, [_vm._v(_vm._s("".concat(dateTime.name, "(").concat(dateTime.dataId, ")")))]);
+  }), 1)], 1)] : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
     staticClass: "section-right"
   }, [_c('div', {
     staticClass: "custom-format-tool-box"
@@ -16312,7 +16350,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=657c2f70&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=034775ac&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -16320,6 +16358,16 @@ var objectSpread2 = __webpack_require__(63442);
 var style = __webpack_require__(94310);
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/index.js + 3 modules
 var message = __webpack_require__(40735);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
+var toConsumableArray = __webpack_require__(61748);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
+var es_object_to_string = __webpack_require__(41539);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
+var web_dom_collections_for_each = __webpack_require__(54747);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__(26699);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
+var es_array_push = __webpack_require__(57658);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -16328,18 +16376,8 @@ var es_string_replace = __webpack_require__(15306);
 var es_json_stringify = __webpack_require__(38862);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
-var es_object_to_string = __webpack_require__(41539);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
-var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
-var es_array_concat = __webpack_require__(92222);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
-var web_dom_collections_for_each = __webpack_require__(54747);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
-var es_array_push = __webpack_require__(57658);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.slice.js
 var es_array_slice = __webpack_require__(47042);
 // EXTERNAL MODULE: ./src/HOEditorFactorys.ts
@@ -16364,6 +16402,7 @@ var SignNode = __webpack_require__(24701);
 
 
 
+
 /* harmony default export */ var Signvue_type_script_lang_js_ = ({
   name: 'Sign',
   props: {
@@ -16395,10 +16434,23 @@ var SignNode = __webpack_require__(24701);
       animationClassNames: 'control-modal-contents sign-modal animation-in',
       isDisplayTitle: false,
       isDisplayTime: false,
-      timePosition: '0'
+      timePosition: '0',
+      dateTimeList: [],
+      associatedElement: ''
     };
   },
   mounted: function mounted() {
+    var _this = this;
+    var signs = this.vueController.getAllSignNodeList();
+    var signList = [].concat((0,toConsumableArray/* default */.Z)(signs.sign), (0,toConsumableArray/* default */.Z)(signs.patientSign));
+    var associatedElementList = [];
+    signList.forEach(function (v) {
+      if (v.associatedElement && !associatedElementList.includes(v.associatedElement)) {
+        associatedElementList.push(v.associatedElement);
+      }
+    });
+    var list = this.vueController.getAllElements();
+    this.dateTimeList = [];
     if (this.controlStatus === 'update') {
       var node = this.getCurrentSelectNode();
       if (node) {
@@ -16430,7 +16482,21 @@ var SignNode = __webpack_require__(24701);
         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.associatedElement = node.associatedElement ? node.associatedElement : '';
+        list.forEach(function (v) {
+          if (v.nodeType == 8 && (!associatedElementList.includes(v.dataId) || node.associatedElement == v.dataId)) {
+            // 只取日期元素
+            _this.dateTimeList.push(v);
+          }
+        });
       }
+    } else {
+      list.forEach(function (v) {
+        if (v.nodeType == 8 && !associatedElementList.includes(v.dataId)) {
+          // 只取日期元素
+          _this.dateTimeList.push(v);
+        }
+      });
     }
   },
   methods: {
@@ -16501,18 +16567,18 @@ 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.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {}, this.associatedElement);
         } else if (this.signType === 2) {
           // 自定义多人签名
-          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {});
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, this.associatedElement);
         } else if (this.signType === 3) {
           // 自定义多人签名
-          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {});
+          this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {}, 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
-          }, otherProperty));
+          }, otherProperty), this.associatedElement);
         } else {
           var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
           this.vueController.insertEmptySignNode(name, 0, '', '', customProperty, '', undefined, undefined, this.signType, '', {});
@@ -16525,7 +16591,7 @@ var SignNode = __webpack_require__(24701);
         var otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
           isDisplayTitle: this.isDisplayTitle
         }, otherProperty);
-        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties, this.isFront);
+        this.vueController.updateEmptySignNode(node, _name, attribute, this.connectChar, signType, this.signFormat, this.signor, '', this.signTimeFormat, this.connectMode, otherProperties, this.isFront, this.associatedElement);
       }
       this.handleClose();
     },
@@ -16537,10 +16603,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=657c2f70&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=034775ac&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=657c2f70&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=034775ac&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -44906,7 +44972,7 @@ var DocController = /*#__PURE__*/function () {
           var path1 = sign1.getNodePath();
           var path2 = node.getNodePath();
           var result = _NodePosition__WEBPACK_IMPORTED_MODULE_84__/* .NodePosition */ .F.treePathCompare(path1, path2);
-          if (result < 0) {
+          if (result <= 0) {
             hoEditorFactory.structureConvert._superiorSign[0] = node;
             hoEditorFactory.vueController.hiddenMask(false);
           }
@@ -88400,7 +88466,7 @@ var DrawTree = /*#__PURE__*/function () {
       var prevPara = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docTree.getSameRectPrevParanode(paraNode);
       var dTop = 0;
       // const pNode = paraNode.parentNode;
-      if (!prevPara) {
+      if (!prevPara || prevPara.customProperty && prevPara.customProperty.hidden == "true") {
         // if (pNode) {
         //   if (
         //     pNode instanceof CellNode &&
@@ -90617,7 +90683,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
     key: "doRedo",
     value: function () {
       var _doRedo = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2() {
-        var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, startPath, changeEvent, result, toPath;
+        var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, prevSibNode, prePara, paraEndPath, startPath, changeEvent, result, toPath;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -90683,6 +90749,34 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
             case 16:
               index = siblings.indexOf(currNode);
               pre = index == 0 ? null : siblings[index - 1];
+              prevSibNode = currNode.prevSibling();
+              if (!prevSibNode) {
+                _context2.next = 30;
+                break;
+              }
+              prePara = hoeditorFactory.docTree.getNodeParaNode(prevSibNode);
+              if (!(prePara.customProperty && prePara.customProperty.hidden == "true")) {
+                _context2.next = 30;
+                break;
+              }
+            case 22:
+              prePara = hoeditorFactory.docTree.getSameRectPrevParanode(prePara);
+              if (!(prePara && prePara.customProperty && prePara.customProperty.hidden == "true")) {
+                _context2.next = 26;
+                break;
+              }
+              _context2.next = 29;
+              break;
+            case 26:
+              paraEndPath = prePara.getParagraphLastNodePath();
+              pre = hoeditorFactory.docTree.findNodePositionByPath(paraEndPath).node;
+              return _context2.abrupt("break", 30);
+            case 29:
+              if (prePara) {
+                _context2.next = 22;
+                break;
+              }
+            case 30:
               startPath = pre ? hoeditorFactory.docTree.getNodeLastPath(pre) : currNode.rootPath + '/0';
               changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_14__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_13__/* .DocAction */ .gk.daUndoInsert, startPath, "");
               changeEvent.oldEndPath = hoeditorFactory.docTree.getNodeLastPath(currNode);
@@ -90691,7 +90785,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
               result = hoeditorFactory.docTree.deleteNode(currNode, this._operType);
               toPath = changeEvent.beforeChangePath;
               if (!result) {
-                _context2.next = 31;
+                _context2.next = 43;
                 break;
               }
               //const next = index == siblings.length ? null : siblings[index];
@@ -90699,26 +90793,26 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
               //   ? hoeditorFactory.docTree.getNodeLastPath(next)
               //   : changeEvent.beforeChangePath;
               changeEvent.afterChangePath = toPath;
-              _context2.next = 28;
+              _context2.next = 40;
               return hoeditorFactory.docTree.change(changeEvent);
-            case 28:
+            case 40:
               toPath = changeEvent.beforeChangePath;
-              _context2.next = 32;
+              _context2.next = 44;
               break;
-            case 31:
+            case 43:
               toPath = this.strBeforePath;
-            case 32:
+            case 44:
               hoeditorFactory.docTree.curDomRange.setSamePath(toPath);
               hoeditorFactory.drawTree.moveCaretToPath(toPath);
               this.strBeforePath = pre ? hoeditorFactory.docTree.getNodeLastPath(pre) : parentPath;
-              _context2.next = 37;
+              _context2.next = 49;
               return this.ParentRepaint();
-            case 37:
+            case 49:
               if (currNode instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_19__/* .SignNode */ .N && (hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psEdit || hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psReview)) {
                 hoeditorFactory.undoService.stack.splice(hoeditorFactory.undoService.stack.length - 1, 1);
                 hoeditorFactory.undoService._position--;
               }
-            case 38:
+            case 50:
             case "end":
               return _context2.stop();
           }
@@ -179124,7 +179218,7 @@ var map = {
 	"./commentDialog/CommentDialog.vue": 61720,
 	"./customAttributes/CustomAttributes.vue": 75819,
 	"./dataSource/DataSource.vue": 84051,
-	"./dateDialog/DateDialog.vue": 6675,
+	"./dateDialog/DateDialog.vue": 15759,
 	"./delimiter/Delimiter.vue": 93230,
 	"./expressionForm/ExpressionForm.vue": 77541,
 	"./findReplace/FindReplace.vue": 98064,
@@ -179143,7 +179237,7 @@ var map = {
 	"./qrCode/QrCode.vue": 59805,
 	"./radioCheckBox/RadioCheckbox.vue": 16616,
 	"./selectDialog/SelectDialog.vue": 32497,
-	"./sign/Sign.vue": 921,
+	"./sign/Sign.vue": 24193,
 	"./table/TableCellPoper.vue": 97628,
 	"./table/TableCellPoper1.vue": 44645,
 	"./table/TableCellProperty.vue": 63689,
@@ -219768,7 +219862,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.64');
+/* harmony default export */ var version = ('3.1.65');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -231330,7 +231424,20 @@ var VueController = /*#__PURE__*/function () {
           var superiorSign = hoEditorFactory.structureConvert._superiorSign;
           if (superiorSign.length > 0 && node === superiorSign[0]) {
             this.hiddenMask(true);
-            superiorSign[0] = signNode;
+            var prenode = signNode.previousLeaf();
+            do {
+              if (prenode) {
+                if (prenode instanceof SignNode/* SignNode */.N && prenode.imgSrc != "") {
+                  superiorSign[0] = prenode;
+                  this.hiddenMask(false);
+                  return;
+                }
+                prenode = prenode.previousLeaf();
+              }
+            } while (prenode);
+            if (!prenode) {
+              superiorSign.length = 0;
+            }
           }
           return;
         } else {
@@ -232857,7 +232964,9 @@ var VueController = /*#__PURE__*/function () {
               if (newNode instanceof SignNode/* SignNode */.N) {
                 Promise.all([hoEditorFactory.docController.updateSignNode(newNode, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
                   setTimeout(function () {
-                    callback && callback();
+                    callback && callback({
+                      associatedElement: newNode.associatedElement
+                    });
                   }, 0);
                 });
               }
@@ -232865,7 +232974,9 @@ var VueController = /*#__PURE__*/function () {
           } else {
             Promise.all([hoEditorFactory.docController.updateSignNode(node, 3, '患者签名', '', '', imgSrc, 0, 0, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
               setTimeout(function () {
-                callback && callback();
+                callback && callback({
+                  associatedElement: node.associatedElement
+                });
               }, 0);
             });
           }
@@ -232879,7 +232990,9 @@ var VueController = /*#__PURE__*/function () {
             if (hoEditorFactory.docTree.changing(changingEvent)) {
               Promise.all([hoEditorFactory.docController.insertSignNode(curDomRange, 1, '患者签名', node.signor, node.signTime, node.signTimeFormat, imgSrc, node.imgWidth, node.imgHeight, customPropertys, fingerPrintSrc, fingerPosition)]).then(function () {
                 setTimeout(function () {
-                  callback && callback();
+                  callback && callback({
+                    associatedElement: node.associatedElement
+                  });
                 }, 0);
               });
             }
@@ -233823,6 +233936,8 @@ var VueController = /*#__PURE__*/function () {
               number: node.number,
               isVerify: node.otherProperties && node.otherProperties.isVerify ? true : false,
               customProperty: node.customProperty,
+              associatedElement: node.associatedElement,
+              dataId: node.dataId,
               node: {}
             };
             if (showNode) {
@@ -243407,8 +243522,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// 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/toolbar/ToolBar.vue?vue&type=template&id=1bf8a068&
-var ToolBarvue_type_template_id_1bf8a068_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=2bbec870&
+var ToolBarvue_type_template_id_2bbec870_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -243641,7 +243756,7 @@ var ToolBarvue_type_template_id_1bf8a068_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_1bf8a068_staticRenderFns = [];
+var ToolBarvue_type_template_id_2bbec870_staticRenderFns = [];
 
 ;// 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/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=4699ffee&
 var HoMedicalExpressionvue_type_template_id_4699ffee_render = function render() {
@@ -248870,8 +248985,15 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
      * 下载文件
      */
     downloadFile: function downloadFile(file, fileName, fileType) {
-      var type = fileType === "plain" ? ".txt" : ".json";
-      var name = fileName + type;
+      var name = fileName;
+      var type = fileType;
+      if (fileType == 'plain') {
+        type = '.txt';
+        name += type;
+      } else if (fileType == 'json') {
+        type = '.json';
+        name += type;
+      }
       var url = window.URL.createObjectURL(new Blob([file], {
         type: "text/".concat(fileType)
       }));
@@ -248889,10 +249011,10 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_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/toolbar/ToolBar.vue?vue&type=style&index=0&id=1bf8a068&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/toolbar/ToolBar.vue?vue&type=style&index=0&id=2bbec870&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=1bf8a068&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=2bbec870&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -248905,8 +249027,8 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_1bf8a068_render,
-  ToolBarvue_type_template_id_1bf8a068_staticRenderFns,
+  ToolBarvue_type_template_id_2bbec870_render,
+  ToolBarvue_type_template_id_2bbec870_staticRenderFns,
   false,
   null,
   null,