hoeditor-web 3.1.109 → 3.1.110

package/lib/hoeditor.umd.js

@@ -59680,8 +59680,17 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
         json.fingerPrintSrc = '';
       }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .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, isFront, allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties, json.dataId, json.associatedElement);
+      // 旧的上级医生签名锁定判断方式 上级医生签名位置 存bec01数组 病历加载时根据签名元素内的bec01处理
+      var superLuck = hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01);
+      // hoEditorFactory.forbidEditBeforeSign 锁定已签名元素前内容
+      // hoEditorFactory.lockContent 锁定非患者签名所在行内容
+      if (signNode.imgSrc) {}
       if (signNode.attribute != 1) {
-        if (signNode.imgSrc != "" && (hoEditorFactory.superiorSigns.length > 0 && hoEditorFactory.superiorSigns.includes(signNode.customProperty.bce01) || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
+        if (signNode.imgSrc && (superLuck || hoEditorFactory.forbidEditBeforeSign) || hoEditorFactory.lockContent) {
+          hoEditorFactory.structureConvert._superiorSign[0] = signNode;
+        }
+      } else {
+        if (hoEditorFactory.reviewMode && (signNode.imgSrc || signNode.fingerPrintSrc)) {
           hoEditorFactory.structureConvert._superiorSign[0] = signNode;
         }
       }
@@ -206318,7 +206327,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// 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/HoDocs.vue?vue&type=template&id=643185d5&
+;// 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/HoDocs.vue?vue&type=template&id=2055fa91&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -209636,7 +209645,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.109');
+/* harmony default export */ var version = ('3.1.110');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -219699,7 +219708,7 @@ var VueController = /*#__PURE__*/function () {
     key: "hiddenMask",
     value: function () {
       var _hiddenMask = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(isHidden) {
-        var hoEditorFactory, i, drawPage, children, j, superiorSign, signNode, _this$getAllSignNodeL, bce01List, curArea, actualHeight, pageWidth, pageHeight, curPageIndex, pageCount, paintMask, _yield$this$getPreEmp, _yield$this$getPreEmp2, isExist, pSignArr, drawNode, dline, stagePt, localPt, arrs, g, pSign, pDrawNode, pArea, pageIndex, pline, stagePt1, localPt1, start, h, n, k, _k, t, arr, _h, parr, _k2, sarr, _n, _k3, _k4, _i, _i2;
+        var hoEditorFactory, i, drawPage, children, j, superiorSign, signNode, _this$getAllSignNodeL, bce01List, patientSign, hasPatientSign, curArea, actualHeight, pageWidth, pageHeight, curPageIndex, pageCount, paintMask, _yield$this$getPreEmp, _yield$this$getPreEmp2, isExist, pSignArr, drawNode, dline, stagePt, localPt, arrs, g, pSign, pDrawNode, pArea, pageIndex, pline, stagePt1, localPt1, start, h, n, k, _k, t, arr, _h, parr, _k2, sarr, _n, _k3, _k4, _i, _i2;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -219718,27 +219727,30 @@ var VueController = /*#__PURE__*/function () {
                 }
                 hoEditorFactory.drawPageTree.updateDrawPage(i);
               }
-              _context.next = 60;
+              _context.next = 61;
               break;
             case 5:
               superiorSign = hoEditorFactory.structureConvert._superiorSign;
               signNode = superiorSign[0];
               if (!(hoEditorFactory.forbidEditBeforeSign && hoEditorFactory.reviewMode)) {
-                _context.next = 12;
+                _context.next = 13;
                 break;
               }
-              _this$getAllSignNodeL = this.getAllSignNodeList(hoEditorFactory.userInfo.id), bce01List = _this$getAllSignNodeL.bce01List;
-              if (bce01List.length) {
-                _context.next = 12;
+              _this$getAllSignNodeL = this.getAllSignNodeList(hoEditorFactory.userInfo.id), bce01List = _this$getAllSignNodeL.bce01List, patientSign = _this$getAllSignNodeL.patientSign;
+              hasPatientSign = patientSign.filter(function (v) {
+                return v.signed;
+              }).length > 0;
+              if (!(!bce01List.length && !hasPatientSign)) {
+                _context.next = 13;
                 break;
               }
               this.hiddenMask(true);
               return _context.abrupt("return");
-            case 12:
+            case 13:
               curArea = hoEditorFactory.drawPageTree.getMainRootArea(signNode.drawNodes[0]);
               actualHeight = hoEditorFactory.drawPageTree.drawHeaders[0].displayHeight;
               if (!(curArea && curArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$)) {
-                _context.next = 60;
+                _context.next = 61;
                 break;
               }
               pageWidth = hoEditorFactory.pageProperty.widthPixes + 1;
@@ -219774,9 +219786,9 @@ var VueController = /*#__PURE__*/function () {
                 selectContainer.addChild(mask);
                 hoEditorFactory.drawPageTree.updateDrawPage(index);
               };
-              _context.next = 22;
+              _context.next = 23;
               return this.getPreEmptySign(signNode);
-            case 22:
+            case 23:
               _yield$this$getPreEmp = _context.sent;
               _yield$this$getPreEmp2 = (0,esm_slicedToArray/* default */.Z)(_yield$this$getPreEmp, 2);
               isExist = _yield$this$getPreEmp2[0];
@@ -219789,21 +219801,21 @@ var VueController = /*#__PURE__*/function () {
               localPt = curArea.globalToLocal(stagePt.x, stagePt.y);
               superiorSign[2] = localPt.y - hoEditorFactory.signHeight;
               if (!isExist) {
-                _context.next = 59;
+                _context.next = 60;
                 break;
               }
               arrs = [];
               g = 0;
-            case 35:
+            case 36:
               if (!(g < pSignArr.length)) {
-                _context.next = 54;
+                _context.next = 55;
                 break;
               }
               pSign = pSignArr[g];
               pDrawNode = pSign.drawNodes[0];
               pArea = hoEditorFactory.drawPageTree.getMainRootArea(pDrawNode);
               if (!(pArea && pArea instanceof DrawPageMainDoc/* DrawPageMainDoc */.$)) {
-                _context.next = 51;
+                _context.next = 52;
                 break;
               }
               pageIndex = pArea.pageIndex;
@@ -219812,7 +219824,7 @@ var VueController = /*#__PURE__*/function () {
               localPt1 = pArea.globalToLocal(stagePt1.x, stagePt1.y);
               start = localPt1.y;
               if (!(pSignArr.length === 1)) {
-                _context.next = 50;
+                _context.next = 51;
                 break;
               }
               for (h = 0; h < pageIndex; h++) {
@@ -219842,13 +219854,13 @@ var VueController = /*#__PURE__*/function () {
                 }
               }
               return _context.abrupt("return");
-            case 50:
-              arrs.push([pageIndex, start]);
             case 51:
+              arrs.push([pageIndex, start]);
+            case 52:
               g++;
-              _context.next = 35;
+              _context.next = 36;
               break;
-            case 54:
+            case 55:
               for (t = 0; t < arrs.length; t++) {
                 arr = arrs[t];
                 if (t === 0) {
@@ -219892,9 +219904,9 @@ var VueController = /*#__PURE__*/function () {
                   paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
                 }
               }
-              _context.next = 60;
+              _context.next = 61;
               break;
-            case 59:
+            case 60:
               if (hoEditorFactory.lockContent) {
                 for (_i = 0; _i < pageCount; _i++) {
                   //给前面的页画遮罩层
@@ -219910,7 +219922,7 @@ var VueController = /*#__PURE__*/function () {
                 //画当前页的遮罩层
                 paintMask(curPageIndex, localPt.y + actualHeight - hoEditorFactory.signHeight);
               }
-            case 60:
+            case 61:
             case "end":
               return _context.stop();
           }
@@ -219931,7 +219943,7 @@ var VueController = /*#__PURE__*/function () {
       var iteratesNodes = function iteratesNodes(nodes) {
         for (var i = 0; i < nodes.length; i++) {
           var anode = nodes[i];
-          if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "") {
+          if (anode instanceof SignNode/* SignNode */.N && anode.imgSrc === "" && anode.fingerPrintSrc === "") {
             if (hoEditorFactory.lockContent && anode.attribute == 1) {
               mark = true;
               signArr.push(anode);
@@ -220152,6 +220164,9 @@ var VueController = /*#__PURE__*/function () {
                 var paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
                 nodes.push(paragraphNode);
               }
+            } else if (isAppentText) {
+              var _paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, npStart.roots, npStart.node.parentNode, hoEditorFactory.docTree.curParaNo);
+              nodes.push(_paragraphNode);
             }
           }
           hoEditorFactory.docController.parseNodeData(nodes);
@@ -221098,9 +221113,9 @@ var VueController = /*#__PURE__*/function () {
           var dFooter = new DrawFooter/* DrawFooter */.d(this._hoEditorFactoryID, _arootPath, pageCount);
           hoEditorFactory.drawPageTree.drawFooters.push(dFooter);
           hoEditorFactory.drawTree.footerDNodes.push(new Array());
-          var _paragraphNode = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, arrNodes, null, 0);
-          arrNodes.push(_paragraphNode);
-          _paragraphNode.rootPath = _arootPath;
+          var _paragraphNode2 = new ParagraphNode/* ParagraphNode */.C(this._hoEditorFactoryID, arrNodes, null, 0);
+          arrNodes.push(_paragraphNode2);
+          _paragraphNode2.rootPath = _arootPath;
           //paragraphNode.rootNodes = arrNodes;
           var newFooter = new SubDocManger/* SubDocTree */.UJ(pageCount, '');
           newFooter.subDocNodes = arrNodes;
@@ -241207,10 +241222,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_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/HoDocs.vue?vue&type=style&index=0&id=643185d5&prod&lang=less&media=print&
+;// 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/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=643185d5&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=2055fa91&prod&lang=less&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -244540,8 +244555,8 @@ var ToolControlvue_type_template_id_5eea3dcd_render = function render() {
 };
 var ToolControlvue_type_template_id_5eea3dcd_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/HoDateTime.vue?vue&type=template&id=d4373800&
-var HoDateTimevue_type_template_id_d4373800_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/insert/HoDateTime.vue?vue&type=template&id=545a7112&
+var HoDateTimevue_type_template_id_545a7112_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('a-dropdown', {
@@ -244602,7 +244617,7 @@ var HoDateTimevue_type_template_id_d4373800_render = function render() {
     staticClass: "date-time-item"
   }, [_vm._v("更多日期属性")])], 2)], 1)], 2);
 };
-var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
+var HoDateTimevue_type_template_id_545a7112_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoDateTime.vue?vue&type=script&lang=js&
 
@@ -244656,6 +244671,7 @@ var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
         var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
         var params = {
           id: this.vueController.generateID('DT'),
+          innerIdentifier: '',
           name: '',
           text: value,
           title: '',
@@ -244682,8 +244698,8 @@ var HoDateTimevue_type_template_id_d4373800_staticRenderFns = [];
 ;
 var HoDateTime_component = (0,componentNormalizer/* default */.Z)(
   insert_HoDateTimevue_type_script_lang_js_,
-  HoDateTimevue_type_template_id_d4373800_render,
-  HoDateTimevue_type_template_id_d4373800_staticRenderFns,
+  HoDateTimevue_type_template_id_545a7112_render,
+  HoDateTimevue_type_template_id_545a7112_staticRenderFns,
   false,
   null,
   null,