hoeditor-web 3.1.71 → 3.1.73

package/lib/hoeditor.umd.js

@@ -63142,6 +63142,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }], [{
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
+      // console.log("加载表格", json.rowCount, json.colCount)
       json = this.transType(json);
       var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .TableProperty */ .vE("");
       if (json.tableProperty) {
@@ -92605,20 +92606,20 @@ var isMap = function isMap(map) {
 /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(32023);
 /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91038);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(78783);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41539);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39714);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(4723);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(92222);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(92222);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(91038);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(78783);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(39714);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(4723);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__);
 /* harmony import */ var _popperjs_core__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(95551);
 /* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91404);
 
@@ -92724,15 +92725,18 @@ var dateFormat = function dateFormat(date, format) {
       stringDate = stringDate.replace(/[日|秒]/g, '');
       if (isNaN(new Date(stringDate).getTime())) {
         if (format && format.includes('MM') && !format.includes('yyyy')) {
-          stringDate = '2021/' + stringDate;
+          stringDate = new Date().getFullYear() + '/' + stringDate;
         }
         if (format && format.includes('HH') && !format.includes('ss')) {
           stringDate = stringDate + ':00';
           stringDate = stringDate.replace('::', ':');
         }
         if (!stringDate.includes('/')) {
-          stringDate = '2021/10/01 ' + stringDate;
+          var newDates = new Date();
+          stringDate = "".concat(newDates.getFullYear(), "/").concat(newDates.getMonth() + 1, "/").concat(_date.getDate(), " ") + stringDate;
         }
+      } else if (format && format.includes('MM') && !format.includes('yyyy')) {
+        stringDate = new Date().getFullYear() + '/' + stringDate;
       }
       _date = toDate(stringDate);
     }
@@ -206938,7 +206942,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.71');
+/* harmony default export */ var version = ('3.1.73');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -214016,8 +214020,8 @@ var commonParamList = new Map();
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.from.js
 var es_array_from = __webpack_require__(91038);
-;// 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/common/history/index.vue?vue&type=template&id=cbb3a73a&
-var historyvue_type_template_id_cbb3a73a_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/common/history/index.vue?vue&type=template&id=1a14bdbf&
+var historyvue_type_template_id_1a14bdbf_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('section', {
@@ -214058,7 +214062,7 @@ var historyvue_type_template_id_cbb3a73a_render = function render() {
     }, [[_vm._v(" 修改后：" + _vm._s(item.afterContent) + " ")]], 2)])];
   })], 2);
 };
-var historyvue_type_template_id_cbb3a73a_staticRenderFns = [];
+var historyvue_type_template_id_1a14bdbf_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/common/history/index.vue?vue&type=script&lang=js&
 
@@ -214109,17 +214113,19 @@ var historyvue_type_template_id_cbb3a73a_staticRenderFns = [];
           }
         } else {
           var boxNextSection = box.querySelector(".ho-history-box");
-          var list = Array.from(box.querySelectorAll('.ho-comment-item'));
-          box.style.transform = "translate(0, 0)";
-          boxNextSection.style.paddingLeft = '0';
-          list.forEach(function (element, index) {
-            element.style.transform = "translate(0, 0)";
-            element.style.boxShadow = '';
-            if (!element.className.includes('history-comment')) {
-              element.className += ' history-comment';
-            }
-          });
-          box.className = box.className.replace('ho-comment-history-selected', '');
+          if (boxNextSection) {
+            var list = Array.from(box.querySelectorAll('.ho-comment-item'));
+            box.style.transform = "translate(0, 0)";
+            boxNextSection.style.paddingLeft = '0';
+            list.forEach(function (element, index) {
+              element.style.transform = "translate(0, 0)";
+              element.style.boxShadow = '';
+              if (!element.className.includes('history-comment')) {
+                element.className += ' history-comment';
+              }
+            });
+            box.className = box.className.replace('ho-comment-history-selected', '');
+          }
         }
       });
       if (hoCommentBox) {
@@ -214200,10 +214206,10 @@ var historyvue_type_template_id_cbb3a73a_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var common_historyvue_type_script_lang_js_ = (historyvue_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/common/history/index.vue?vue&type=style&index=0&id=cbb3a73a&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/common/history/index.vue?vue&type=style&index=0&id=1a14bdbf&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=cbb3a73a&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/common/history/index.vue?vue&type=style&index=0&id=1a14bdbf&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/common/history/index.vue
 
@@ -214216,8 +214222,8 @@ var historyvue_type_template_id_cbb3a73a_staticRenderFns = [];
 
 var history_component = (0,componentNormalizer/* default */.Z)(
   common_historyvue_type_script_lang_js_,
-  historyvue_type_template_id_cbb3a73a_render,
-  historyvue_type_template_id_cbb3a73a_staticRenderFns,
+  historyvue_type_template_id_1a14bdbf_render,
+  historyvue_type_template_id_1a14bdbf_staticRenderFns,
   false,
   null,
   null,
@@ -215012,10 +215018,13 @@ var VueController = /*#__PURE__*/function () {
     value: function insertTableRowAbove(count, table) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       if (table) {
-        var path = table.childNodes[0].childNodes[0].getNodePath();
-        hoEditorFactory.docTree.curDomRange.setSamePath(path);
-        hoEditorFactory.drawTree.moveCaretToPath(path);
-        count = 1;
+        var index = this.getTableTitleMaxRowIndex(table);
+        if (table.rowCount > index + 1) {
+          var path = table.rows[index + 1][0].childNodes[0].getNodePath();
+          hoEditorFactory.docTree.curDomRange.setSamePath(path);
+          hoEditorFactory.drawTree.moveCaretToPath(path);
+          count = 1;
+        }
       }
       var _curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
       var startPath = _curDomRange.normalize().startPath;
@@ -223366,6 +223375,7 @@ var DomController = /*#__PURE__*/function () {
 
 
 
+
 
 
 var EditController = /*#__PURE__*/function () {
@@ -223899,6 +223909,11 @@ var EditController = /*#__PURE__*/function () {
               message/* default */.Z.error("本列已完成签名，不允许修改编辑。");
               return false;
             }
+            if (colProperty.editorProperty === TableProperty/* EditorProperty */.YS.OrderNumber) {
+              message/* default */.Z.destroy();
+              message/* default */.Z.error("不允许编辑该列");
+              return false;
+            }
           }
         }
       }
@@ -233809,12 +233824,19 @@ var PrintController = /*#__PURE__*/function () {
                   return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee7$(_context7) {
                     while (1) switch (_context7.prev = _context7.next) {
                       case 0:
-                        if (params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid)) {
-                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true, pageNumber);
-                        } else {
-                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, false, pageNumber);
+                        if (!(params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid))) {
+                          _context7.next = 5;
+                          break;
                         }
-                      case 1:
+                        _context7.next = 3;
+                        return PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true, pageNumber);
+                      case 3:
+                        _context7.next = 7;
+                        break;
+                      case 5:
+                        _context7.next = 7;
+                        return PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, false, pageNumber);
+                      case 7:
                       case "end":
                         return _context7.stop();
                     }
@@ -233837,6 +233859,7 @@ var PrintController = /*#__PURE__*/function () {
                             if (position == undefined) {
                               position = {};
                             }
+                            // 多种连续病程时先提交前一类病程循环后重新开始下一类病程循环
                             if (position && Object.keys(position).length != 0) {
                               callback && callback((0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, position), {}, {
                                 continuousid: continuousid
@@ -233861,6 +233884,13 @@ var PrintController = /*#__PURE__*/function () {
                               createSvg();
                             }
                           } else {
+                            // 只有一类病程记录时循环到非病程直接提交
+                            if (continuousid && position && Object.keys(position).length != 0) {
+                              callback && callback((0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, position), {}, {
+                                continuousid: continuousid
+                              }));
+                              position = {};
+                            }
                             mergeList = [];
                             continuousid = '';
                             Promise.all([hoEditorFactory.vueController.openXml(xmlList[xmlIndex][0])]).then(function () {
@@ -233873,9 +233903,7 @@ var PrintController = /*#__PURE__*/function () {
                             });
                           }
                         } else if (xmlIndex > xmlList.length - 1) {
-                          callback && callback((0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, position), {}, {
-                            continuousid: continuousid
-                          }));
+                          callback && callback({});
                           hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
                           hoEditorFactory.vueController.openXml(xml);
                           if (hoEditorFactory.isUseImagePrint) {