hoeditor-web 3.1.127 → 3.1.129

package/lib/hoeditor.umd.js

@@ -40648,7 +40648,7 @@ var DocController = /*#__PURE__*/function () {
      */
   }, {
     key: "deleteComment",
-    value: function deleteComment(type, commentID) {
+    value: function deleteComment(type, commentID, forceDelete) {
       var _this7 = this;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var delStyleComment = function delStyleComment(commentID) {
@@ -40674,7 +40674,7 @@ var DocController = /*#__PURE__*/function () {
       };
       if (type === 0) {
         hoEditorFactory.drawTree.commentsMap.forEach(function (value) {
-          if (value.userID == hoEditorFactory.userInfo.id) {
+          if (value.userID == hoEditorFactory.userInfo.id || forceDelete) {
             del(value);
           }
         });
@@ -60429,7 +60429,7 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony export */   a: function() { return /* binding */ FormularType; }
 /* harmony export */ });
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(94310);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(40735);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(40735);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(27222);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8495);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(70280);
@@ -60489,6 +60489,8 @@ var SpecialCharsNode = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(68598);
 /* harmony import */ var _ControlNode__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(91105);
 /* harmony import */ var _RadioAndCheckBoxNode__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(99152);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(65043);
+
 
 
 
@@ -60896,6 +60898,22 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
             strValue = itemObject.text;
           }
         }
+        //针对单元格childNodes节点下嵌套的下拉选择处理
+      } else if (cell.childNodes && cell.childNodes.length > 1) {
+        var textInputFieldNode = cell.childNodes[1];
+        if (textInputFieldNode instanceof _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_40__/* .TextInputFieldNode */ .re) {
+          var tempListItems = textInputFieldNode.downListProperty.listItems;
+          var midListItems = JSON.parse(tempListItems);
+          var tempItemObject = midListItems.find(function (item) {
+            return item.text === strValue;
+          });
+          if (tempItemObject) {
+            strValue = tempItemObject.value;
+            if (strValue === '') {
+              strValue = tempItemObject.text;
+            }
+          }
+        }
       }
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, ' ', '');
       strValue = hoEditorFactory.unitConvert.replaceAll(strValue, '\b', '');
@@ -61033,7 +61051,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("体重和身高对应的单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell7 = this.getRowColByCellAdress(arrStr[0]),
         _this$getRowColByCell8 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell7, 2),
@@ -61079,7 +61097,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell11 = this.getRowColByCellAdress(arrStr[0]),
         _this$getRowColByCell12 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell11, 2),
@@ -61430,7 +61448,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var strRet = " ";
       var table = this.getParentCell().table;
       if (this.formulaStr == "") {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("体重的单元格编号传入有误:" + this.formulaStr);
       }
       var _this$getRowColByCell21 = this.getRowColByCellAdress(this.formulaStr),
         _this$getRowColByCell22 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell21, 2),
@@ -61466,7 +61484,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
         return strRet;
       }
       var _this$getRowColByCell23 = this.getRowColByCellAdress(arrStr[0]),
@@ -61510,7 +61528,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var table = this.getParentCell().table;
       var arrStr = this.formulaStr.split(",");
       if (arrStr.length < 2) {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("开始时间和结束时间对应的单元格编号传入有误:" + this.formulaStr);
         return strRet;
       }
       var _this$getRowColByCell27 = this.getRowColByCellAdress(arrStr[0]),
@@ -61603,7 +61621,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       var strRet = " ";
       var table = this.getParentCell().table;
       if (this.formulaStr == "") {
-        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z.warn("身高的单元格编号传入有误:" + this.formulaStr);
       }
       var cellNo = "";
       var isRange = false;
@@ -79764,6 +79782,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
             };
             fingerImage.onload = function () {
               var fingerHeight = fingerImage.naturalHeight !== 0 ? fingerImage.naturalHeight : fingerImage.height;
+              var fingerWidth = fingerImage.naturalWidth !== 0 ? fingerImage.naturalWidth : fingerImage.width;
               // 存在自定义指纹图片高度时
               if (hoEditorFactory.patientFingerHeight != 0) {
                 fingerscale = hoEditorFactory.patientFingerHeight / fingerHeight;
@@ -210287,7 +210306,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.127');
+/* harmony default export */ var version = ('3.1.129');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -220188,14 +220207,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "deleteComment",
-    value: function deleteComment(type, commentID) {
+    value: function deleteComment(type, commentID, forceDelete) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
       var startPath = _curDomRange.normalize().startPath;
       var endPath = _curDomRange.normalize().endPath;
       var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction */.gk.daDelete, startPath, endPath, NodeChangingEvent/* OperType */.y.deleteComment);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.deleteComment(type, commentID);
+        hoEditorFactory.docController.deleteComment(type, commentID, forceDelete);
       }
       comment/* hoCreateComment */.$.close();
     }
@@ -226971,7 +226990,10 @@ var VueController = /*#__PURE__*/function () {
               "id": key.split("|")[0],
               "dataid": key.split("|")[1]
             };
-            recordArr.push(obj);
+            var _node16 = _this14.getNodeByDataID('all', key.split("|")[1]);
+            if (_node16 == null) {
+              recordArr.push(obj);
+            }
           } else {
             if (Object.keys(value[1]).length > 0) {
               if (value[1].customProperty && typeof value[1].customProperty !== 'string') {
@@ -226990,9 +227012,9 @@ var VueController = /*#__PURE__*/function () {
                 });
               }
               if (value[1].nodeTypes == 'sign') {
-                var _node16 = _this14.getNodeByDataID('main', key.replace('|', ''));
-                if (_node16 instanceof SignNode/* SignNode */.N) {
-                  var signJsons = _node16.node2Json();
+                var _node17 = _this14.getNodeByDataID('main', key.replace('|', ''));
+                if (_node17 instanceof SignNode/* SignNode */.N) {
+                  var signJsons = _node17.node2Json();
                   var signXml = x2js.js2xml(signJsons);
                   obj = {
                     "type": value[0],
@@ -227018,7 +227040,7 @@ var VueController = /*#__PURE__*/function () {
           }
         } else {
           var id = key.split("|")[0];
-          var _node17 = _this14.getNodeByID('all', id);
+          var _node18 = _this14.getNodeByID('all', id);
         }
       });
       return recordArr;