hoeditor-web 3.0.85 → 3.0.86

package/lib/hoeditor.umd.js

@@ -47167,13 +47167,13 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-07-13 10:31:51
+ * @LastEditTime: 2023-07-14 10:34:05
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
  */
 var TableProperty = /*#__PURE__*/function () {
-  //编号
+  //private _id!: string; //编号
   //自定义属性
   //用户可调整行高
   //用户可调整行宽
@@ -47190,7 +47190,6 @@ var TableProperty = /*#__PURE__*/function () {
   //是否启用表单弹框编辑
   function TableProperty(objectValues) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, TableProperty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_canAdjustRowHeight", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_canAdjustRowWidth", false);
@@ -47224,15 +47223,13 @@ var TableProperty = /*#__PURE__*/function () {
       assignvalue(this, valuesObj);
     }
   }
+  // get id(): string {
+  //     return this._id;
+  // }
+  // set id(value: string) {
+  //     this._id = value;
+  // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(TableProperty, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    },
-    set: function set(value) {
-      this._id = value;
-    }
-  }, {
     key: "customProperties",
     get: function get() {
       return this._customProperties;
@@ -47926,9 +47923,9 @@ var DiagonalType;
   DiagonalType[DiagonalType["Right"] = 2] = "Right";
 })(DiagonalType || (DiagonalType = {}));
 var CellProperty = /*#__PURE__*/function () {
-  //编号
+  //private _id!: string;//编号
   //private _lightCellBorders = false;//突出显示单元格边框
-  //标题
+  //private _title = "";//标题
   //自定义属性
   //private _dataSource!: DataSource;//数据源
   //垂直对齐方式
@@ -47947,8 +47944,6 @@ var CellProperty = /*#__PURE__*/function () {
   function CellProperty(objectValues //, table: TableNode
   ) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, CellProperty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_title", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_cellInnerMargin", [0, 0, 0.1, 0.1]);
@@ -48004,29 +47999,25 @@ var CellProperty = /*#__PURE__*/function () {
       }
     }
   }
+  // get id(): string {
+  //     return this._id;
+  // }
+  // set id(value: string) {
+  //     this._id = value;
+  // }
+  // get lightCellBorders(): boolean {
+  //     return this._lightCellBorders;
+  // }
+  // set lightCellBorders(value: boolean) {
+  //     this._lightCellBorders = value;
+  // }
+  // get title(): string {
+  //     return this._title;
+  // }
+  // set title(value: string) {
+  //     this._title = value;
+  // }
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(CellProperty, [{
-    key: "id",
-    get: function get() {
-      return this._id;
-    },
-    set: function set(value) {
-      this._id = value;
-    }
-    // get lightCellBorders(): boolean {
-    //     return this._lightCellBorders;
-    // }
-    // set lightCellBorders(value: boolean) {
-    //     this._lightCellBorders = value;
-    // }
-  }, {
-    key: "title",
-    get: function get() {
-      return this._title;
-    },
-    set: function set(value) {
-      this._title = value;
-    }
-  }, {
     key: "customProperties",
     get: function get() {
       return this._customProperties;
@@ -48198,7 +48189,7 @@ var CellProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-01-20 10:18:55
- * @LastEditTime: 2023-05-23 11:29:52
+ * @LastEditTime: 2023-07-18 16:01:49
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\domNode\Comment.ts
@@ -48213,6 +48204,7 @@ var Comment = /*#__PURE__*/function () {
 
   // 自定义属性 处理插入批注时带上的评分内容和插入批注后下级医生是否确认处理批注内容
 
+  //是否已处理(标记)
   function Comment(hoEditorFactoryID, id, text, endNode, source) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, Comment);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_id", '');
@@ -48225,6 +48217,7 @@ var Comment = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_hoEditorFactoryID", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_customProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_permissionLevel", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "_isProcessed", false);
     this._hoEditorFactoryID = hoEditorFactoryID;
     var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_5__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
     this._id = id;
@@ -48262,6 +48255,16 @@ var Comment = /*#__PURE__*/function () {
         this._customProperty = value;
       }
     }
+  }, {
+    key: "isProcessed",
+    get: function get() {
+      return this._isProcessed;
+    },
+    set: function set(value) {
+      if (this._isProcessed !== value) {
+        this._isProcessed = value;
+      }
+    }
   }, {
     key: "text",
     get: function get() {
@@ -51943,7 +51946,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
         customProperty: Array(this.cellProperty.customProperties)
       };
       var cellProperty = {
-        title: this.cellProperty.title,
+        //title: this.cellProperty.title,
         align: Number(this.cellProperty.align || 0),
         obliqueSplitLine: Number(this.cellProperty.obliqueSplitLine || 0),
         //ObliqueSplitLine[Number(this.cellProperty.obliqueSplitLine || 0)],
@@ -64031,7 +64034,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         });
       }
       var defaultCellProp = {
-        title: "",
+        //title: "",
         align: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop,
         obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ObliqueSplitLine.None */ .lH.None,
         printGridLines: true,
@@ -65240,7 +65243,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-07-14 09:49:07
+ * @LastEditTime: 2023-07-14 16:52:06
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -66499,9 +66502,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                   hoEditorFactory.docController.deleteRange(aRange, true, 'update');
                 }
                 if (!(text === '')) {
-                  _context2.next = 22;
+                  _context2.next = 23;
                   break;
                 }
+                this._childNodes.splice(1, this._childNodes.length - 2);
                 markNode = new _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j(this._hoEditorFactoryID, this.rootNodes, this, _BaseNode__WEBPACK_IMPORTED_MODULE_42__/* .NodeType.ntText */ .Jq.ntText, this.labelText, hoEditorFactory.docTree.curStyleIndex, _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtContent */ .q.mtContent);
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _editor_undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_35__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, markNode));
@@ -66513,11 +66517,11 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                 this._canModifyContent = oldValue;
                 this.update(0);
                 return _context2.abrupt("return");
-              case 22:
+              case 23:
                 hoEditorFactory.docController.insertPlainTextAfterPath(startPath, text, oldValue);
                 //this._canModifyContent = await oldValue;
                 //this.update(0);
-              case 23:
+              case 24:
               case "end":
                 return _context2.stop();
             }
@@ -67304,7 +67308,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
       if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
         throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
       }
-      if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j) {
+      if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNode */ .j && temp.childNodes[1].MarkNodeType == _MarkNode__WEBPACK_IMPORTED_MODULE_47__/* .MarkNodeType.mtContent */ .q.mtContent) {
         temp.childNodes.splice(1, 1);
       }
       //}
@@ -77485,10 +77489,10 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     _this._dText = new createjs.Text(node.isTransToText ? "" : _this._text, textStyle.getStyleKey(), textStyle.color);
     if (controlStyle === "CheckBox") {
       _this._dBox = new createjs.Shape();
-      _this._dBox.graphics.clear().beginStroke("#000").drawRect(0, -_this.dHeight + 2, _this.dHeight - 2, _this.dHeight - 2);
+      _this._dBox.graphics.clear().beginStroke("#000").drawRect(0, -_this.dHeight + 2, _this.dHeight - 2, _this.dHeight - 2).endStroke();
     } else {
       _this._dBox = new createjs.Shape();
-      _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2);
+      _this._dBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke("#000").drawCircle((height - 2) / 2, -height / 2 + 2, (height - 2) / 2).endStroke();
     }
     var textWidth = _this._dText.getMeasuredWidth();
     var boxwidth = height;
@@ -77504,7 +77508,7 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
         underLineLen = _this._dAppendText.getMeasuredWidth();
       }
       _this._dUnderLine = new createjs.Shape();
-      _this._dUnderLine.graphics.beginStroke(textStyle.color).moveTo(_this.dWidth - blockWidth, 1).lineTo(_this.dWidth - blockWidth + underLineLen, 1);
+      _this._dUnderLine.graphics.beginStroke(textStyle.color).moveTo(_this.dWidth - blockWidth, 1).lineTo(_this.dWidth - blockWidth + underLineLen, 1).endStroke();
       _this.dWidth = _this.dWidth - blockWidth + underLineLen;
     }
     _this.dHeight = height;
@@ -77589,41 +77593,41 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
       if (this.controlStyle === "CheckBox") {
         //复选框
         if (this.isSelected) {
-          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2);
+          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
           this.addChild(drawBox);
           var line1 = new createjs.Shape();
           var line2 = new createjs.Shape();
           if (this.boxAlign) {
-            line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2);
+            line1.graphics.beginStroke(this._textStyle.color).moveTo(3, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1, -2).endStroke();
             this.addChild(line1);
-            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4);
+            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1, -2).lineTo(this.dHeight - 3, -this.dHeight + 4).endStroke();
             this.addChild(line2);
           } else {
             var textWidth = this._dText.getMeasuredWidth();
-            line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2);
+            line1.graphics.beginStroke(this._textStyle.color).moveTo(3 + textWidth, -this.dHeight / 2 + 2).lineTo(this.dHeight / 2 - 1 + textWidth, -2).endStroke();
             this.addChild(line1);
-            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4);
+            line2.graphics.beginStroke(this._textStyle.color).moveTo(this.dHeight / 2 - 1 + textWidth, -2).lineTo(this.dHeight - 3 + textWidth, -this.dHeight + 4).endStroke();
             this.addChild(line2);
           }
         } else {
-          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2);
+          drawBox.graphics.clear().beginStroke(this._textStyle.color).drawRect(0, -this.dHeight + 2, this.dHeight - 2, this.dHeight - 2).endStroke();
           this.addChild(drawBox);
         }
       } else {
         //单选框
         if (this.isSelected) {
-          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2);
+          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
           this.addChild(drawBox);
           var dot = new createjs.Shape();
           if (this.boxAlign) {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1);
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + 1, -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           } else {
-            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1);
+            dot.graphics.clear().beginStroke(this._textStyle.color).beginFill(this._textStyle.color).drawCircle((this.dHeight - 2) / 2 + this._dText.getMeasuredWidth(), -this.dHeight / 2 + 2, 1).endStroke();
             this.addChild(dot);
           }
         } else {
-          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2);
+          drawBox.graphics.clear().setStrokeStyle(1, 'round', 'round').beginStroke(this._textStyle.color).drawCircle((this.dHeight - 2) / 2, -this.dHeight / 2 + 2, (this.dHeight - 2) / 2).endStroke();
           this.addChild(drawBox);
         }
       }
@@ -80431,6 +80435,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
           var createHistory = hoEditorFactory.docTree.userHistories[createID];
           var deleteHistory = hoEditorFactory.docTree.userHistories[deleteID];
           var comLevel = comment ? comment.permissionLevel : -1;
+          if (comment && comment.isProcessed) {
+            comLevel = -1;
+          }
           var createLevel = createHistory ? createHistory.permissionLevel : -1;
           var deleteLevel = deleteHistory ? deleteHistory.permissionLevel : -1;
           var ilevel = Math.max(comLevel, createLevel, deleteLevel);
@@ -235848,8 +235855,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// 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/HoDoc.vue?vue&type=template&id=91a4fbf4&
-var HoDocvue_type_template_id_91a4fbf4_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/HoDoc.vue?vue&type=template&id=197ca538&
+var HoDocvue_type_template_id_197ca538_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -235997,7 +236004,7 @@ var HoDocvue_type_template_id_91a4fbf4_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_91a4fbf4_staticRenderFns = [];
+var HoDocvue_type_template_id_197ca538_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -238956,7 +238963,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.85');
+/* harmony default export */ var version = ('3.0.86');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -239484,6 +239491,16 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
             this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
             return;
           }
+          var text = node.text.replace(/ /g, '');
+          if (text != node.parentNode.name && text !== '') {
+            var _node$parentNode$down, _node$parentNode$down2;
+            var list = (_node$parentNode$down = node.parentNode.downListProperty) !== null && _node$parentNode$down !== void 0 && _node$parentNode$down.listItems ? JSON.parse((_node$parentNode$down2 = node.parentNode.downListProperty) === null || _node$parentNode$down2 === void 0 ? void 0 : _node$parentNode$down2.listItems) : [];
+            if (list.filter(function (v) {
+              return v.text.split('<元素>')[0].includes(text);
+            }).length === 0) {
+              return;
+            }
+          }
           var _callback = function _callback(list) {
             _this5.computedPoperPosition(node, pageIndex);
             if (Array.isArray(list) && list.length > 0) {
@@ -239691,10 +239708,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_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/HoDoc.vue?vue&type=style&index=0&id=91a4fbf4&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/HoDoc.vue?vue&type=style&index=0&id=197ca538&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=91a4fbf4&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=197ca538&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -239707,8 +239724,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_91a4fbf4_render,
-  HoDocvue_type_template_id_91a4fbf4_staticRenderFns,
+  HoDocvue_type_template_id_197ca538_render,
+  HoDocvue_type_template_id_197ca538_staticRenderFns,
   false,
   null,
   null,
@@ -244166,6 +244183,11 @@ var StructureConvert = /*#__PURE__*/function () {
               v.backColor = defaultTextStyle.combineStyle.backColor;
             }
           }
+          if (v && typeof v.color === 'string') {
+            if (v.color.replace(/^\s+|\s+$/g, '') === '') {
+              v.color = defaultTextStyle.combineStyle.color;
+            }
+          }
         });
       }
       if (fontStyles) {
@@ -246524,6 +246546,7 @@ var hoCreateHistory = {
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -253057,7 +253080,7 @@ var VueController = /*#__PURE__*/function () {
             });
           }
           var defaultCellProp = {
-            title: '',
+            //title: '',
             align: TableProperty/* VAlign.vatop */.TR.vatop,
             obliqueSplitLine: 0,
             printGridLines: true,
@@ -253174,7 +253197,7 @@ var VueController = /*#__PURE__*/function () {
             customProperty: Array(node.cellProperty.customProperties)
           };
           var cellProperty = {
-            title: node.cellProperty.title,
+            //title: node.cellProperty.title,
             align: Number(node.cellProperty.align || 0),
             obliqueSplitLine: Number(node.cellProperty.obliqueSplitLine || 0),
             printGridLines: node.cellProperty.printGridLines,
@@ -253912,6 +253935,63 @@ var VueController = /*#__PURE__*/function () {
         }
       }
     }
+    /**
+     * 回填表格数据
+     * @param index 第几个表格
+     * @param data 回填的数据
+     */
+  }, {
+    key: "backFillTableData",
+    value: function backFillTableData(index, data) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var table = null;
+      var i = 0;
+      for (var k = 0; k < hoEditorFactory.docTree.mainNodes.length; k++) {
+        var node = hoEditorFactory.docTree.mainNodes[k];
+        if (node instanceof TableNode/* TableNode */.Fh) {
+          i++;
+          if (i === index) {
+            table = node;
+            break;
+          }
+        }
+      }
+      if (table) {
+        var rowCellNum = table.rows[0].length;
+        if (table.childNodes.length - rowCellNum < data.length) {
+          var needCellNum = data.length - (table.childNodes.length - rowCellNum);
+          var needRows = Number((needCellNum / rowCellNum).toFixed());
+          var remainder = needCellNum % rowCellNum;
+          if (remainder > 0) {
+            needRows++;
+          }
+          table.insertRows(table.rowCount, needRows, table.rowCount - 1);
+        }
+        for (var m = 0; m < data.length; m++) {
+          var cell = table.childNodes[m + rowCellNum];
+          if (cell) {
+            var text = data[m] || ' ';
+            cell.childNodes.splice(1, cell.childNodes.length);
+            var textNode = new TextNode/* TextNode */.R(this._hoEditorFactoryID, table.rootNodes, cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, cell.childNodes[0].styleIndex);
+            cell.drawCell.needUpdate = true;
+            cell.childNodes.push(textNode);
+          }
+        }
+        table.update();
+      }
+    }
+  }, {
+    key: "clearCommentTextBackColor",
+    value: function clearCommentTextBackColor(ids) {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      for (var i = 0; i < ids.length; i++) {
+        var id = ids[i];
+        var comment = hoEditorFactory.drawTree.commentsMap.get(id);
+        if (comment) {
+          comment.isProcessed = true;
+        }
+      }
+    }
   }]);
   return VueController;
 }();