hoeditor-web 3.0.36 → 3.0.37

package/lib/hoeditor.umd.js

@@ -8892,7 +8892,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 85936:
+/***/ 80206:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8912,7 +8912,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/poperSelect/PoperSelect.vue?vue&type=template&id=09a357ac&
+;// 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/poperSelect/PoperSelect.vue?vue&type=template&id=7a572170&
 
 
 
@@ -9294,7 +9294,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=09a357ac&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=7a572170&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -9310,8 +9310,6 @@ var web_dom_collections_for_each = __webpack_require__(54747);
 var es_array_filter = __webpack_require__(57327);
 // 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.number.constructor.js
-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);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
@@ -9324,6 +9322,8 @@ var es_array_map = __webpack_require__(21249);
 var es_object_keys = __webpack_require__(47941);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
 var es_array_join = __webpack_require__(69600);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
+var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
@@ -11387,7 +11387,8 @@ var type = __webpack_require__(41542);
       if (this.dateTimeStyle.includes('yyyy') || this.dateTimeStyle.includes('MM') || this.dateTimeStyle.includes('dd')) {
         return {
           width: '100px',
-          height: '10px'
+          height: '0',
+          border: '0'
         };
       } else {
         return {
@@ -11505,8 +11506,8 @@ var type = __webpack_require__(41542);
     calendarInstanceChange: function calendarInstanceChange(event) {
       var style = this.dateTimeStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
       var format = this.dateTimeStyle.replace(/[^a-zA-Z]/g, '').replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
-      var dateStyle = format.replace(/hh|mm|ss/, '');
-      var timeStyle = format.replace(/YYYY|MM|DD/, '');
+      var dateStyle = format.replace(/HH|hh|mm|ss/g, '');
+      var timeStyle = format.replace(/yyyy|YYYY|MM|DD/g, '');
       var defaultValue = event.target.value;
       if (event.target.value.replace(/[^0-9]/g, '').length !== defaultValue.length) {
         console.warn("value: ".concat(defaultValue));
@@ -11514,23 +11515,22 @@ var type = __webpack_require__(41542);
       }
       if (dateStyle && timeStyle) {
         if (defaultValue.length >= dateStyle.length && defaultValue.length < format.length) {
-          var _value = moment_default()(Number(defaultValue), dateStyle).format(style.split(" ")[0]);
-          if (_value != 'Invalid date') {
-            this.date = _value;
+          var value = moment_default()(String(defaultValue), dateStyle).format(style.split(" ")[0]);
+          if (value != 'Invalid date') {
+            this.date = value;
           }
         } else if (defaultValue.length >= format.length) {
-          var _value2 = moment_default()(Number(defaultValue), format).format(style);
-          if (_value2 != 'Invalid date') {
-            this.date = _value2.split(" ")[0];
-            this.time = _value2.split(" ")[1];
+          var _value = moment_default()(String(defaultValue), format).format(style);
+          if (_value != 'Invalid date') {
+            this.date = _value.split(" ")[0];
+            this.time = _value.split(" ")[1];
           }
         }
       } else if (dateStyle && !timeStyle) {
-        consoel.log('dateStyle ==> ', value, dateStyle);
         if (defaultValue.length >= dateStyle.length) {
-          var _value3 = moment_default()(Number(defaultValue), dateStyle).format(style);
-          if (_value3 != 'Invalid date') {
-            this.date = _value3;
+          var _value2 = moment_default()(String(defaultValue), dateStyle).format(style);
+          if (_value2 != 'Invalid date') {
+            this.date = _value2;
           }
         }
       } else if (timeStyle && !dateStyle) {}
@@ -11958,10 +11958,10 @@ var type = __webpack_require__(41542);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=09a357ac&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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7a572170&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=09a357ac&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7a572170&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -18563,7 +18563,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 74559:
+/***/ 2064:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -18575,7 +18575,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ table_TableFormula; }
 });
 
-;// 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/table/TableFormula.vue?vue&type=template&id=3db836cb&
+;// 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/table/TableFormula.vue?vue&type=template&id=58b786b2&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -18781,6 +18781,24 @@ var render = function render() {
     }
   })], 1), _c('div', {
     staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "220px"
+    }
+  }, [_vm._v("附加单元格编号")]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off",
+      "placeholder": "多个单元格编号用,隔开"
+    },
+    model: {
+      value: _vm.ftScoreMappingCell,
+      callback: function callback($$v) {
+        _vm.ftScoreMappingCell = $$v;
+      },
+      expression: "ftScoreMappingCell"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
   }, [_c('p', {
     staticStyle: {
       "width": "152px"
@@ -18920,20 +18938,20 @@ var toConsumableArray = __webpack_require__(61748);
 var objectSpread2 = __webpack_require__(63442);
 // 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.map.js
-var es_array_map = __webpack_require__(21249);
-// 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/es.array.join.js
+var es_array_join = __webpack_require__(69600);
 // 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.map.js
+var es_array_map = __webpack_require__(21249);
+// 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/es.regexp.exec.js
 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);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
-var es_array_join = __webpack_require__(69600);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
@@ -18986,6 +19004,7 @@ var TableFormula = __webpack_require__(90832);
       expectedDate: '',
       isHideZero: true,
       isOnceClick: false,
+      ftScoreMappingCell: '',
       ftScoreMapping: {
         cell: '',
         items: [{
@@ -19057,6 +19076,13 @@ var TableFormula = __webpack_require__(90832);
             if (node.formulaStr) {
               try {
                 var ftScoreMapping = JSON.parse(node.formulaStr);
+                var cell = ftScoreMapping.cell.split(",");
+                if (cell.length > 1) {
+                  ftScoreMapping.cell = cell[0];
+                  this.ftScoreMappingCell = cell.filter(function (v, index) {
+                    return index > 0;
+                  }).join(",");
+                }
                 ftScoreMapping.items = ftScoreMapping.items.map(function (v) {
                   v.range = v.range.split('-');
                   return v;
@@ -19097,8 +19123,12 @@ var TableFormula = __webpack_require__(90832);
         // this.vueController.insertTableFormula(`${this.expectedDate}`.toLocaleLowerCase(), this.isHideZero, FormularType.ftPregnantDays)
       } else if (this.formula === 'ftScoreMapping') {
         var item = (0,toConsumableArray/* default */.Z)(this.ftScoreMapping.items);
+        var cell = this.ftScoreMapping.cell;
+        if (this.ftScoreMappingCell) {
+          cell += ',' + this.ftScoreMappingCell;
+        }
         var ftScoreMapping = {
-          cell: this.ftScoreMapping.cell,
+          cell: cell,
           items: item.map(function (v) {
             if (v.text.replace(/\s*/g, '') === '') {
               return '';
@@ -19137,10 +19167,10 @@ var TableFormula = __webpack_require__(90832);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableFormulavue_type_script_lang_js_ = (TableFormulavue_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/controls/table/TableFormula.vue?vue&type=style&index=0&id=3db836cb&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/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=3db836cb&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -35754,7 +35784,7 @@ var Print = /*#__PURE__*/function () {
                   _context3.next = 5;
                   break;
                 }
-                message/* default.warn */.Z.warn('病程记录文件有删除或者内容减少，导致上一次记录的打印位置错误无法使用，请用重打进行打印或者删除所有打印记录后续打');
+                message/* default.warn */.Z.warn('病程记录已打印文件有删除、内容减少或者新起一页打印参数变更，导致已记录的打印位置错误无法使用，请用重打进行打印或者删除所有打印记录后续打');
                 reslove && reslove(null);
                 return _context3.abrupt("return");
               case 5:
@@ -59728,56 +59758,81 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
     value: function getScoreMapping() {
       var strRet = " ";
       var formularJson = JSON.parse(this.formulaStr);
-      var cellNo = formularJson.cell;
+      var cellNos = formularJson.cell;
       var items = formularJson.items;
       var table = this.getParentCell().table;
-      var _this$getRowColByCell21 = this.getRowColByCellAdress(cellNo),
-        _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),
-        row = _this$getRowColByCell22[0],
-        col = _this$getRowColByCell22[1];
-      if (row >= 0 && col >= 0) {
-        if (!table.rows[row]) return " ";
-        var cell = table.rows[row][col];
-        if (cell) {
-          var tableFormular = cell.childNodes[0];
-          var loopNodes = function loopNodes(nodes) {
-            for (var k = 1; k < nodes.length; k++) {
-              var node = nodes[k];
-              if (node instanceof TableFormula) {
-                tableFormular = node;
-                break;
+      var cellNoArr = cellNos.split(",");
+      var score = 0;
+      for (var i = 0; i < cellNoArr.length; i++) {
+        var _this$getRowColByCell21 = this.getRowColByCellAdress(cellNoArr[i]),
+          _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),
+          row = _this$getRowColByCell22[0],
+          col = _this$getRowColByCell22[1];
+        if (row >= 0 && col >= 0) {
+          if (!table.rows[row]) continue;
+          var cell = table.rows[row][col];
+          if (cell) {
+            if (i == 0) {
+              var _ret = function () {
+                var tableFormular = cell.childNodes[0];
+                var loopNodes = function loopNodes(nodes) {
+                  for (var k = 1; k < nodes.length; k++) {
+                    var node = nodes[k];
+                    if (node instanceof TableFormula) {
+                      tableFormular = node;
+                      break;
+                    }
+                    if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
+                      loopNodes(node.childNodes);
+                    }
+                  }
+                };
+                loopNodes(cell.childNodes);
+                var scoreText = "";
+                if (!(tableFormular instanceof TableFormula)) {
+                  scoreText = cell.getCellText();
+                } else {
+                  scoreText = tableFormular.text;
+                }
+                if (cellNoArr.length == 1 && (scoreText == "" || scoreText == " ")) {
+                  return {
+                    v: strRet
+                  };
+                }
+                if (scoreText == "" || scoreText == " ") return "continue";
+                score = Number(scoreText);
+              }();
+              if (_ret === "continue") continue;
+              if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_ret) === "object") return _ret.v;
+            } else {
+              var _this$getCellNumber9 = this.getCellNumber(cell.table, row, col),
+                _this$getCellNumber10 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber9, 2),
+                result = _this$getCellNumber10[0],
+                value = _this$getCellNumber10[1];
+              if (value == "") {
+                continue;
               }
-              if (node instanceof _BaseCombineNode__WEBPACK_IMPORTED_MODULE_31__/* .BaseCombineNode */ .V) {
-                loopNodes(node.childNodes);
+              if (result) {
+                score += Number(value);
               }
             }
-          };
-          loopNodes(cell.childNodes);
-          var scoreText = "";
-          if (!(tableFormular instanceof TableFormula)) {
-            scoreText = cell.getCellText();
           } else {
-            scoreText = tableFormular.text;
+            continue;
           }
-          if (scoreText == "" || scoreText == " ") {
+        } else {
+          continue;
+        }
+      }
+      if (items.length > 0) {
+        for (var _i = 0; _i < items.length; _i++) {
+          var item = items[_i];
+          var range = item.range.split('-');
+          var from = Number(range[0]);
+          var to = Number(range[1]);
+          if (score >= from && score <= to) {
+            strRet = item.text;
             return strRet;
           }
-          // if (tableFormular.hideZero && (scoreText == "0" || scoreText == "0.00")) {
-          //     return strRet;
-          // }
-          var score = Number(scoreText);
-          if (items.length > 0) {
-            for (var i = 0; i < items.length; i++) {
-              var item = items[i];
-              var range = item.range.split('-');
-              var from = Number(range[0]);
-              var to = Number(range[1]);
-              if (score >= from && score <= to) {
-                strRet = item.text;
-                return strRet;
-              }
-            }
-          }
         }
       }
       return strRet;
@@ -59798,10 +59853,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         if (!table.rows[row]) return strRet;
         var wCell = table.rows[row][col];
         if (wCell) {
-          var _this$getCellNumber9 = this.getCellNumber(table, row, col),
-            _this$getCellNumber10 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber9, 2),
-            wRet = _this$getCellNumber10[0],
-            weight = _this$getCellNumber10[1];
+          var _this$getCellNumber11 = this.getCellNumber(table, row, col),
+            _this$getCellNumber12 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getCellNumber11, 2),
+            wRet = _this$getCellNumber12[0],
+            weight = _this$getCellNumber12[1];
           if (weight == "") return strRet;
           var weightNum = Number(weight);
           if (wRet) {
@@ -62790,7 +62845,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-03-21 11:27:21
+ * @LastEditTime: 2023-03-22 15:28:47
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65002,8 +65057,13 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                     }
                   } else {
                     if (textArr[0] != "") {
-                      var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
-                      temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                      if (temp.innerIdentifier == "name" && temp.text.length > (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(temp.text).length) {
+                        var rareCharNode = new _RareCharNode__WEBPACK_IMPORTED_MODULE_57__/* .RareCharNode */ .Q(temp.hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntRareChar */ .Jq.ntRareChar, textArr[0], styleIndex);
+                        temp.childNodes.splice(temp.childNodes.length - 1, 0, rareCharNode);
+                      } else {
+                        var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
+                        temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                      }
                     }
                   }
                   if (textArr.length > 1) {
@@ -69941,8 +70001,8 @@ var DrawPageMainDoc = /*#__PURE__*/function (_DrawArea) {
 /*
  * @Author: your name
  * @Date: 2020-11-11 18:32:02
- * @LastEditTime: 2021-09-28 10:05:52
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-21 18:16:31
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawBarcodeNode.ts
  */
@@ -69973,6 +70033,7 @@ var DrawBarcodeNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_scaleY", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_imageY", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_drawResize", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_bitMap", void 0);
     _this._textContent = textContent;
     //this._barCodeStyle = barCodeStyle;
     //this._textAlign = textAlign;
@@ -70023,12 +70084,25 @@ var DrawBarcodeNode = /*#__PURE__*/function (_DrawCombineNode) {
       this.clear();
       var image = new Image();
       image.src = this.imagePath;
-      var bitmap = new createjs.Bitmap(image);
-      bitmap.y = this._imageY;
-      bitmap.x = 0;
-      bitmap.name = this.node.id;
-      bitmap.setTransform(0, this._imageY, this._scaleX, this._scaleY);
-      this.addChild(bitmap);
+      this._bitMap = new createjs.Bitmap(image);
+      this._bitMap.y = this._imageY;
+      this._bitMap.x = 0;
+      this._bitMap.name = this.node.id;
+      this._bitMap.setTransform(0, this._imageY, this._scaleX, this._scaleY);
+      this.addChild(this._bitMap);
+    }
+  }, {
+    key: "clone",
+    value: function clone() {
+      var aConTainer = new createjs.Container();
+      var bitMap = this._bitMap.clone();
+      bitMap.name = this.node.id;
+      if (this._cloneProps) {
+        this._cloneProps(aConTainer);
+      }
+      aConTainer.removeAllChildren();
+      aConTainer.addChild(bitMap);
+      return aConTainer;
     }
   }]);
   return DrawBarcodeNode;
@@ -195503,7 +195577,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 85936,
+	"./poperSelect/PoperSelect.vue": 80206,
 	"./poperTipText/PoperTipText.vue": 15845,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -195517,7 +195591,7 @@ var map = {
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
-	"./table/TableFormula.vue": 74559,
+	"./table/TableFormula.vue": 2064,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 5218,
 	"./textDialog/TextDialog.vue": 94535,
@@ -233408,7 +233482,7 @@ var DrawPage = __webpack_require__(72722);
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(85936);
+var PoperSelect = __webpack_require__(80206);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235107,7 +235181,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.36');
+/* harmony default export */ var version = ('3.0.37');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -241883,6 +241957,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
     this.convert.set(BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntLabel */.Jq.ntLabel], function (val) {
       return _this.TransText(val);
     });
+    // this.convert.set(NodeType[NodeType.ntControl], (val: Record<string, any>) => {
+    //   return this.TransText(val);
+    // });
   }
   (0,esm_createClass/* default */.Z)(TOHTMLConverter, [{
     key: "nextnode",
@@ -242002,6 +242079,9 @@ var TOHTMLConverter = /*#__PURE__*/function () {
       if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntSpecialChar */.Jq.ntSpecialChar]) {
         str += jnode.text;
       }
+      if (jnode.nodeType == BaseNode/* NodeType */.Jq[BaseNode/* NodeType.ntControl */.Jq.ntControl]) {
+        str += jnode.text;
+      }
       return "<span style=\"".concat(style, "\">").concat(str, "</span>");
     }
   }, {
@@ -242258,6 +242338,8 @@ var commonParamList = new Map();
   commonParamList.set(key, true);
 });
 
+// EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
+var comment = __webpack_require__(32980);
 ;// CONCATENATED MODULE: ./src/editor/VueController.ts
 
 
@@ -242350,6 +242432,7 @@ var commonParamList = new Map();
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -244340,6 +244423,10 @@ var VueController = /*#__PURE__*/function () {
           commentWidthMm: commentWidthMm
         }));
       }
+      if (status !== 4) {
+        // 非审阅状态销毁选中批注创建的组件
+        comment/* $Comment.close */.D.close();
+      }
       if (hoEditorFactory.structureConvert._superiorSign.length > 0) {
         if (status === 1 || status === 4) {
           this.hiddenMask(false);
@@ -255070,8 +255157,6 @@ var getFormula = function getFormula(tableFormular) {
 };
 // EXTERNAL MODULE: ./src/components/common/commondata/index.ts
 var commondata = __webpack_require__(76285);
-// EXTERNAL MODULE: ./src/components/common/comment/index.ts + 6 modules
-var comment = __webpack_require__(32980);
 ;// 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/HoDocs.vue?vue&type=script&lang=js&
 
 
@@ -255987,8 +256072,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=3957338e&
-var ToolBarvue_type_template_id_3957338e_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=7f1a29a4&
+var ToolBarvue_type_template_id_7f1a29a4_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -256221,7 +256306,7 @@ var ToolBarvue_type_template_id_3957338e_render = function render() {
     }, [_vm._v(_vm._s(item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var ToolBarvue_type_template_id_3957338e_staticRenderFns = [];
+var ToolBarvue_type_template_id_7f1a29a4_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
 var es_array_map = __webpack_require__(21249);
@@ -261155,7 +261240,7 @@ var ToolTable_component = (0,componentNormalizer/* default */.Z)(
           this.tabKey = Object.keys(this.defaultSelect)[0] || ''; // 处理页签不存在的情况 默认取存在页签中的一个;
         }
 
-        if (this.defaultToolBarParams[this.tabKey]) {
+        if (this.defaultToolBarParams[this.tabKey] != undefined) {
           this.vueController.setEditorStatus(this.defaultToolBarParams[this.tabKey]);
         }
       }
@@ -261404,10 +261489,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-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/toolbar/ToolBar.vue?vue&type=style&index=0&id=3957338e&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/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=3957338e&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7f1a29a4&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -261420,8 +261505,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_3957338e_render,
-  ToolBarvue_type_template_id_3957338e_staticRenderFns,
+  ToolBarvue_type_template_id_7f1a29a4_render,
+  ToolBarvue_type_template_id_7f1a29a4_staticRenderFns,
   false,
   null,
   null,