hoeditor-web 3.1.200 → 3.1.202

package/lib/hoeditor.umd.js

@@ -103476,7 +103476,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 68480:
+/***/ 37667:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -103490,7 +103490,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=4396d84c
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=7b23ba21
 
 var render = function render() {
   var _vm = this,
@@ -103849,7 +103849,9 @@ var render = function render() {
       },
       expression: "printGridLines"
     }
-  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.42", null, "打印边框"))]), _c('a-checkbox', {
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.42", null, "打印边框"))])], 1), _c('li', {
+    staticClass: "control-item"
+  }, [_c('a-checkbox', {
     model: {
       value: _vm.isSignLock,
       callback: function ($$v) {
@@ -103857,7 +103859,17 @@ var render = function render() {
       },
       expression: "isSignLock"
     }
-  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.585", null, "签名完成后锁定单元格"))])], 1)], 1)])])]), _c('a-tab-pane', {
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.585", null, "签名完成后锁定单元格"))])], 1), _c('li', {
+    staticClass: "control-item"
+  }, [_c('a-checkbox', {
+    model: {
+      value: _vm.notAllowEdit,
+      callback: function ($$v) {
+        _vm.notAllowEdit = $$v;
+      },
+      expression: "notAllowEdit"
+    }
+  }, [_vm._v("不允许编辑单元格")])], 1)], 1)])])]), _c('a-tab-pane', {
     key: "1",
     attrs: {
       "tab": /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.41", null, "双击属性")
@@ -104319,7 +104331,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=4396d84c
+;// ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=7b23ba21
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
@@ -104454,6 +104466,8 @@ const columns = [{
       // 打印边框
       isSignLock: false,
       // 锁定单元格
+      notAllowEdit: false,
+      // 是否允许编辑
       cellTop: 0,
       cellBottom: 0,
       cellLeft: 0,
@@ -104526,6 +104540,7 @@ const columns = [{
       this.alignTextToGridline = cellNode.cellProperty.alignTextToGridline;
       this.printGridLines = cellNode.cellProperty.printGridLines;
       this.isSignLock = cellNode.cellProperty.isSignLock ? cellNode.cellProperty.isSignLock : false;
+      this.notAllowEdit = cellNode.cellProperty.notAllowEdit ? cellNode.cellProperty.notAllowEdit : false;
       // 单元格内边距 上、下、左、右
       [this.cellTop, this.cellBottom, this.cellLeft, this.cellRight] = cellNode.cellProperty.cellInnerMargin ? cellNode.cellProperty.cellInnerMargin : [0, 0, 0, 0];
       this.editorProperty = cellNode.cellProperty.editorProperty;
@@ -104672,6 +104687,7 @@ const columns = [{
         alignTextToGridline: this.alignTextToGridline,
         printGridLines: this.printGridLines,
         isSignLock: this.isSignLock,
+        notAllowEdit: this.notAllowEdit,
         obliqueSplitLine: this.obliqueSplitLine,
         editorProperty: this.editorProperty
       };
@@ -104716,10 +104732,10 @@ const columns = [{
 
 /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js = (TableCellPropertyvue_type_script_lang_js);
 
-;// ./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/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=4396d84c&prod&lang=less
+;// ./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/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=7b23ba21&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=4396d84c&prod&lang=less
+;// ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=7b23ba21&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -106120,7 +106136,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ }),
 
-/***/ 63459:
+/***/ 68707:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -106134,7 +106150,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=66f8e512
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=template&id=22ffd471
 
 var render = function render() {
   var _vm = this,
@@ -106202,7 +106218,7 @@ var render = function render() {
       },
       expression: "simpleFormula"
     }
-  })], 1) : _vm._e(), _vm.formula === 'bmi' ? _c('section', [_c('div', {
+  })], 1) : _vm.formula === 'bmi' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.293", null, "身高"))]), _c('a-input', {
     attrs: {
@@ -106228,7 +106244,7 @@ var render = function render() {
       },
       expression: "weight"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'labor' ? _c('section', [_c('a-checkbox', {
+  })], 1)]) : _vm.formula === 'labor' ? _c('section', [_c('a-checkbox', {
     model: {
       value: _vm.isHideZero,
       callback: function ($$v) {
@@ -106307,7 +106323,7 @@ var render = function render() {
       },
       expression: "labor3"
     }
-  })], 1) : _vm._e()], 1) : _vm._e(), _vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks' ? _c('section', [_c('div', {
+  })], 1) : _vm._e()], 1) : _vm.formula === 'expectedDate' || _vm.formula === 'pregnantDays' || _vm.formula === 'pregnantWeeks' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.272", null, "末次月经"))]), _c('a-input', {
     attrs: {
@@ -106320,7 +106336,7 @@ var render = function render() {
       },
       expression: "expectedDate"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'ftScoreMapping' ? _c('section', [_c('div', {
+  })], 1)]) : _vm.formula === 'ftScoreMapping' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', {
     staticStyle: {
@@ -106427,7 +106443,7 @@ var render = function render() {
     attrs: {
       "type": "folder-add"
     }
-  })], 1)], 1)], 2)])]) : _vm._e(), _vm.formula === 'bodySurfaceArea' ? _c('section', [_c('div', {
+  })], 1)], 1)], 2)])]) : _vm.formula === 'bodySurfaceArea' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.292", null, "体重"))]), _c('a-input', {
     attrs: {
@@ -106440,7 +106456,7 @@ var render = function render() {
       },
       expression: "bodySurfaceAreaWeight"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'idealWeight' ? _c('section', [_c('div', {
+  })], 1)]) : _vm.formula === 'idealWeight' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('span', {
     staticStyle: {
@@ -106469,7 +106485,7 @@ var render = function render() {
       },
       expression: "displayRange"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'iss' ? _c('section', [_c('div', {
+  })], 1)]) : _vm.formula === 'iss' ? _c('section', [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_vm._m(0), _c('a-input', {
     staticStyle: {
@@ -106485,7 +106501,7 @@ var render = function render() {
       },
       expression: "issCode"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'costumRowColumns' ? _c('section', {
+  })], 1)]) : _vm.formula === 'costumRowColumns' ? _c('section', {
     staticClass: "costum-row-columns"
   }, [_c('div', {
     staticClass: "ho-table-features-list"
@@ -106525,7 +106541,7 @@ var render = function render() {
       },
       expression: "form.columns"
     }
-  })], 1)]) : _vm._e(), _vm.formula === 'ftCalcDays' || _vm.formula === 'ftCalcTime' ? _c('section', {
+  })], 1)]) : _vm.formula === 'ftCalcDays' || _vm.formula === 'ftCalcTime' ? _c('section', {
     staticClass: "costum-row-columns"
   }, [_c('div', {
     staticClass: "ho-table-features-list"
@@ -106563,6 +106579,162 @@ var render = function render() {
       },
       expression: "endDateCode"
     }
+  })], 1)]) : _vm.formula === 'curveChart' ? _c('section', [_c('div', {
+    staticClass: "ho-table-features-list ho-table-features-list-column"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100%"
+    }
+  }, [_vm._v("横轴(X轴)单元格编号")]), _c('div', {
+    staticClass: "ho-table-features-list",
+    staticStyle: {
+      "width": "100%"
+    }
+  }, [_c('a-input', {
+    staticStyle: {
+      "flex": "1",
+      "margin": "0 20px 0 0"
+    },
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.codeX,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "codeX", $$v);
+      },
+      expression: "curve.codeX"
+    }
+  }), _c('a-checkbox', {
+    model: {
+      value: _vm.curve.lockX,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "lockX", $$v);
+      },
+      expression: "curve.lockX"
+    }
+  }, [_vm._v("锁定对应单元格不允许编辑")])], 1)]), _c('div', {
+    staticClass: "ho-table-features-list ho-table-features-list-column"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100%"
+    }
+  }, [_vm._v("纵轴(Y轴)单元格编号")]), _c('div', {
+    staticClass: "ho-table-features-list",
+    staticStyle: {
+      "width": "100%"
+    }
+  }, [_c('a-input', {
+    staticStyle: {
+      "flex": "1",
+      "margin": "0 20px 0 0"
+    },
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.codeY,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "codeY", $$v);
+      },
+      expression: "curve.codeY"
+    }
+  })], 1)]), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.65", null, "最小值"))]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.min,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "min", $$v);
+      },
+      expression: "curve.min"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.64", null, "最大值"))]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.max,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "max", $$v);
+      },
+      expression: "curve.max"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v("间隔")]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.step,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "step", $$v);
+      },
+      expression: "curve.step"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.238", null, "高度"))]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.curve.height,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "height", $$v);
+      },
+      expression: "curve.height"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v("曲线图颜色")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.curve.baseColor,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "baseColor", $$v);
+      },
+      expression: "curve.baseColor"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100px"
+    }
+  }, [_vm._v("连接线颜色")]), _c('ho-color-picker', {
+    model: {
+      value: _vm.curve.lineColor,
+      callback: function ($$v) {
+        _vm.$set(_vm.curve, "lineColor", $$v);
+      },
+      expression: "curve.lineColor"
+    }
   })], 1)]) : _vm._e()]), _c('footer', {
     staticClass: "ho-modal-footer"
   }, [_c('a-button', {
@@ -106591,7 +106763,7 @@ var staticRenderFns = [function () {
   }, [_c('span', [_vm._v(/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.254", null, "单元格编号"))]), _vm._v(":")]);
 }];
 
-;// ./src/components/controls/table/TableFormula.vue?vue&type=template&id=66f8e512
+;// ./src/components/controls/table/TableFormula.vue?vue&type=template&id=22ffd471
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(44114);
@@ -106613,6 +106785,8 @@ var web_dom_collections_iterator = __webpack_require__(62953);
 var objectSpread2 = __webpack_require__(33217);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
 var TableFormula = __webpack_require__(28646);
+// EXTERNAL MODULE: ./src/components/controls/colorPicker/HoColorPicker.vue + 6 modules
+var HoColorPicker = __webpack_require__(53071);
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[19].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js
 
 
@@ -106633,8 +106807,12 @@ var TableFormula = __webpack_require__(28646);
 
 
 
+
 /* harmony default export */ var TableFormulavue_type_script_lang_js = ({
   name: 'TablePoperty',
+  components: {
+    HoColorPicker: HoColorPicker["default"]
+  },
   props: {
     vueController: {
       default: () => {}
@@ -106689,14 +106867,30 @@ var TableFormula = __webpack_require__(28646);
         expectedDate: [/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.274", null, "预产期计算公式为末次月经第一天的月份加9个月或者减去3个月，为预产期的月份数；日期加7天，为预产期日。"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.273", null, "例如某孕妇的末次月经时间是1月11日来潮，她的预产期是，1+9=10，11+7=18，也就是10月18日的预产期。")],
         ftScoreMapping: /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.270", null, "通过多个分值组合计算，转换为对应的值域信息。例如：1-5分(高)，6-10分中，10-15分(低)"),
         labor: [/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.290", null, "将时间元素设置成运算模式，比如这个第一产程时间=宫口全开时间-宫缩开始时间"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.289", null, "第1产程是从规律 “宫缩开始”到“宫口开全”，（“宫口开全” - “宫缩开始”）"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.288", null, "第2产程是从 “宫口开全” 到 “胎儿娩出”， (“胎儿娩出” - “宫口开全” )"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.287", null, "第3产程是从 “胎儿娩出” 到 “胎盘娩出” ， (“胎盘娩出” - “胎儿娩出” )"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.286", null, "总产程:= 第1产程+第2产程+第3产程"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.285", null, "表示格式 示例: 9小时24分24秒，当时间大于24小时时, 显示格式为“28小时30分30秒”")],
-        iss: [/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.256", null, "计算ISS的一般原则：本法把人体分为6个区域，ISS是身体3个最严重损伤区域的最高AIS值的平方和。ISS=AIS1²+AIS2²+AIS3²"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.255", null, "示例：a1,a2,a3,a4,a5,a6")]
+        iss: [/*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.256", null, "计算ISS的一般原则：本法把人体分为6个区域，ISS是身体3个最严重损伤区域的最高AIS值的平方和。ISS=AIS1²+AIS2²+AIS3²"), /*#__PURE__*/(0,i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.255", null, "示例：a1,a2,a3,a4,a5,a6")],
+        curveChart: [
+        // "视力曲线图（Visual Acuity Curve）是眼科检查中常用的一种工具，用于评估和记录不同距离或不同条件下的视力情况。通过绘制视力曲线图，医生可以直观地了解患者的视力变化，从而帮助诊断和治疗各种眼部疾病。",
+        "横轴（X轴）: 通常表示距离，单位可以是米（m）或英尺（ft）, 值域区间为(+2.00 到 -5.00, 每单元格间隔为0.5)", "纵轴（Y轴）: 表示视力，通常以最小分辨角对数表示。值域区间为(0.0到1.5之间, 每单元格间隔为0.1)", "单元格编号：（a1:a3表示从a1到a3的连续单元格）"]
       },
       bodySurfaceAreaWeight: '',
       startDateCode: '',
       endDateCode: '',
       idealWeightHeight: '',
       displayRange: false,
-      issCode: ''
+      issCode: '',
+      curve: {
+        codeX: '',
+        lockX: false,
+        codeY: '',
+        lockY: false,
+        min: '',
+        max: '',
+        step: '',
+        height: '',
+        width: '',
+        baseColor: '#000000',
+        lineColor: '#000000'
+      }
     };
   },
   inject: ['hoEditorProvider'],
@@ -106772,6 +106966,10 @@ var TableFormula = __webpack_require__(28646);
             } else {
               this.idealWeightHeight = node.formulaStr;
             }
+          } else if (this.formula === 'curveChart') {
+            if (node.formularProperty) {
+              this.curve = (0,objectSpread2/* default */.A)({}, node.formularProperty);
+            }
           }
         }
       }
@@ -106832,6 +107030,13 @@ var TableFormula = __webpack_require__(28646);
         this.vueController.insertTableFormula(`${this.idealWeightHeight},${this.displayRange}`.toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.D.ftIdealWeight);
       } else if (this.formula === 'iss') {
         this.vueController.insertTableFormula(`${this.issCode}`.toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.D.ftISS);
+      } else if (this.formula === 'curveChart') {
+        if (this.curve.lockX || this.curve.lockY) {
+          this.vueController.lockCell(this.curve);
+        }
+        setTimeout(() => {
+          this.vueController.insertTableFormula(this.curve.codeY.toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType */.D.ftCurveChart, this.curve);
+        }, 100);
       }
       this.handleClose();
     },
@@ -106855,10 +107060,10 @@ var TableFormula = __webpack_require__(28646);
 
 /* harmony default export */ var table_TableFormulavue_type_script_lang_js = (TableFormulavue_type_script_lang_js);
 
-;// ./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/controls/table/TableFormula.vue?vue&type=style&index=0&id=66f8e512&prod&lang=less
+;// ./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/controls/table/TableFormula.vue?vue&type=style&index=0&id=22ffd471&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=66f8e512&prod&lang=less
+;// ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=22ffd471&prod&lang=less
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(81656);
@@ -117421,11 +117626,14 @@ class DocController {
       let curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
       const curParaNo = hoEditorFactory.docTree.curParaNo;
       let curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
-      curStyleIndex = curTextStyle.changeStyleString('fontFormat', "himalaya");
+      if (curTextStyle.combineStyle.font != "himalaya") {
+        curStyleIndex = curTextStyle.changeStyleString('fontFormat', "himalaya");
+      }
       curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
       const nodeStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_23__/* .TextStyle */ .xJ(this._hoEditorFactoryID);
       nodeStyle.copyProperty(curTextStyle, nodeStyle);
-      if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psTrace) {
+      const paintStatus = hoEditorFactory.drawTree.paintStatus;
+      if (paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview || paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psTrace) {
         const newHistory = new _domNode_UserHistory__WEBPACK_IMPORTED_MODULE_50__/* .UserHistory */ .i(this._hoEditorFactoryID, _domNode_UserHistory__WEBPACK_IMPORTED_MODULE_50__/* .HistoryEditType */ .t.hetCreate);
         const historyIndex = newHistory.userCompare();
         nodeStyle.creatorIndex = historyIndex;
@@ -117441,16 +117649,14 @@ class DocController {
       nodeStyle.combineStyle.size = 24;
       nodeStyle.size = 24;
       let pNode = node.parentNode;
-      if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .IM && pNode.childNodes.indexOf(node) === 0 && hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview) {
+      if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .IM && pNode.childNodes.indexOf(node) === 0 && paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview) {
         curStyleIndex = node.styleIndex;
         hoEditorFactory.docTree.curStyleIndex = curStyleIndex;
       }
-      let slibs = nodePosition.roots;
       if (pNode && pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .IM && node == pNode.last()) {
-        slibs = pNode.getParentNodes();
         pNode = pNode.parentNode;
       }
-      if (hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview || hoEditorFactory.drawTree.paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psTrace) {
+      if (paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psReview || paintStatus === _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_81__/* .PaintState */ .ak.psTrace) {
         if (curTextStyle.strikeout) {
           const nodeStyle = new _domNode_TextStyle__WEBPACK_IMPORTED_MODULE_23__/* .TextStyle */ .xJ(this._hoEditorFactoryID);
           nodeStyle.copyProperty(curTextStyle, nodeStyle);
@@ -117462,15 +117668,6 @@ class DocController {
           curStyleIndex = hoEditorFactory.docTree.styleCompare(nodeStyle);
         }
       }
-      let canModifyContent = true;
-      if (pNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_36__/* .TextInputFieldNode */ .IM) {
-        canModifyContent = pNode.canModifyContent;
-      }
-      const insertParagraph = aPath => {
-        const paragraphNode = new _treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_20__/* .ParagraphNode */ .f(this._hoEditorFactoryID, nodePosition.roots, pNode, curParaNo);
-        this.insertNodeByPath(aPath, paragraphNode);
-        return hoEditorFactory.docTree.curDomRange.startPath;
-      };
       curTextStyle = hoEditorFactory.docTree.styles[curStyleIndex];
       let aPromise = new Promise((resolve, reject) => {
         resolve(strPath);
@@ -117479,20 +117676,16 @@ class DocController {
         aPromise = aPromise.then(res => {
           strPath = res;
           return new Promise((resolve, reject) => {
-            if (text === '' && index < lines.length - 1) {
-              strPath = insertParagraph(strPath);
-              resolve(strPath);
-            } else {
-              strPath = this.insertZWALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, keydownIsUnidentified);
-            }
+            strPath = this.insertZWALine(hoEditorFactory, strPath, text, nodePosition.roots, pNode, curTextStyle, node, nodePosition.childIndex, index === lines.length - 1, resolve, true);
+            // insertZWALine最后一个参数 keydownIsUnidentified 默认传true 处理非m键盘输入的组合音符问题
           });
         });
       });
-      setTimeout(() => {
-        if (text) {
+      if (text) {
+        setTimeout(() => {
           hoEditorFactory.vueController.getCaretPositionNode();
-        }
-      }, 0);
+        }, 0);
+      }
       return;
     }
   }
@@ -120644,7 +120837,7 @@ class DocController {
    * @param 选区
    * @param 公式
    */
-  insertTableFormula(domRange, formulaStr, isHideZero, formulaType) {
+  insertTableFormula(domRange, formulaStr, isHideZero, formulaType, formulaProperty) {
     const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_67__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
     let startPath = domRange.normalize().endPath;
     const pNode = hoEditorFactory.docTree.getParentNode(startPath);
@@ -120654,7 +120847,7 @@ class DocController {
       hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_27__/* .NodeDeleteUndoUnit */ .s(this._hoEditorFactoryID, domRange.npEnd.node, startPath, 'update'));
       startPath = prePath;
     }
-    const tableFormula = new _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_61__/* .TableFormula */ .d(this._hoEditorFactoryID, domRange.npStart.roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntTableFormula, formulaStr, hoEditorFactory.docTree.curStyleIndex, isHideZero, formulaType);
+    const tableFormula = new _treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_61__/* .TableFormula */ .d(this._hoEditorFactoryID, domRange.npStart.roots, pNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Z6.ntTableFormula, formulaStr, hoEditorFactory.docTree.curStyleIndex, isHideZero, formulaType, '', formulaProperty);
     hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_16__/* .NodeInsertUndoUnit */ .Q(this._hoEditorFactoryID, startPath, tableFormula));
     hoEditorFactory.undoService.commit();
   }
@@ -125505,7 +125698,7 @@ var DiagonalType;
   DiagonalType[DiagonalType["Right"] = 2] = "Right";
 })(DiagonalType || (DiagonalType = {}));
 class CellProperty {
-  //是否已签名 运行时属性
+  //是否禁止编辑
   constructor(objectValues) {
     //private _lightCellBorders = false;//突出显示单元格边框
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_customProperties", []);
@@ -125541,6 +125734,8 @@ class CellProperty {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_isSignLock", false);
     // 签名后是否锁定
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "signed", new Map());
+    //是否已签名 运行时属性
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "notAllowEdit", false);
     if (objectValues !== "") {
       const valuesObj = eval('(' + objectValues + ')');
       const assignvalue = (target, source) => {
@@ -128104,7 +128299,8 @@ class CellNode extends _RectNode__WEBPACK_IMPORTED_MODULE_22__/* .RectNode */ .P
       dateTimeProperty: this.cellProperty.dateTimeProperty,
       diagonalType: this.cellProperty.diagonalType,
       formula: this.cellProperty.formula,
-      isSignLock: this.cellProperty.isSignLock
+      isSignLock: this.cellProperty.isSignLock,
+      notAllowEdit: this.cellProperty.notAllowEdit
     };
     const cellPropertyJson = JSON.parse(JSON.stringify(cellProperty));
     const keysName = Object.keys(defaultCellPropJson);
@@ -136398,7 +136594,7 @@ class SpecialCharsNode extends _ControlNode__WEBPACK_IMPORTED_MODULE_4__/* .Cont
 /* harmony export */ });
 /* harmony import */ var _i18n__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49850);
 /* harmony import */ var ant_design_vue_es_message_style__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21902);
-/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(40233);
+/* harmony import */ var ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(40233);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(32356);
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(16280);
 /* harmony import */ var core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_error_cause_js__WEBPACK_IMPORTED_MODULE_3__);
@@ -136446,6 +136642,8 @@ class SpecialCharsNode extends _ControlNode__WEBPACK_IMPORTED_MODULE_4__/* .Cont
 /* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(65018);
 /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(58382);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(76582);
+/* harmony import */ var _editor_draw_drawNode_DrawTableFormularChart__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(14968);
+
 
 
 
@@ -136500,15 +136698,17 @@ var FormularType;
   FormularType[FormularType["ftCalcTime"] = 9] = "ftCalcTime";
   FormularType[FormularType["ftIdealWeight"] = 10] = "ftIdealWeight";
   FormularType[FormularType["ftISS"] = 11] = "ftISS";
+  FormularType[FormularType["ftCurveChart"] = 12] = "ftCurveChart";
 })(FormularType || (FormularType = {}));
 class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .ControlNode */ .g {
-  constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, formulaStr, styleIndex, hideZero, formularType, customProperty) {
+  constructor(hoEditorFactoryID, rootNodes, pNode, nodeType, formulaStr, styleIndex, hideZero, formularType, customProperty, formularProperty) {
     super(hoEditorFactoryID, rootNodes, pNode, nodeType);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_formularType", FormularType.ftSum);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_formulaStr", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_hideZero", true);
     //计算结果为0时是否隐藏
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "_cellRange", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "formularProperty", null);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A)(this, "code", void 0);
     this._id = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID("TFS");
     this._styleIndex = styleIndex;
@@ -136520,7 +136720,9 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
       this._formularType = formulaStr.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
     }
     this.formulaStr = formulaStr;
-    // this.setCode();
+    if (formularProperty) {
+      this.formularProperty = formularProperty;
+    }
     if (hideZero !== undefined) this._hideZero = hideZero;
     if (customProperty && customProperty !== "") {
       this.setCustomProperty(customProperty);
@@ -136568,45 +136770,31 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     if (this._formulaStr !== val) {
       this._formulaStr = val;
       this._cellRange.length = 0;
-      // if (val.indexOf(':') > 0) {
+      // if (this.formularType === FormularType.ftSum) {
       //     this.calcSumValue(false)
-      // } else this.clacFormula(false)
-      if (this.formularType === FormularType.ftSum) {
-        this.calcSumValue(false);
-      }
-      if (this.formularType === FormularType.ftFormular) {
-        this.clacFormula(false);
-      }
-      if (this.formularType === FormularType.ftBMI) {
-        this.clacBMI();
-      }
-      if (this.formularType === FormularType.ftLaborProcess) {
-        this.clacLaborProcess();
-      }
-      if (this.formularType === FormularType.ftExpectedBirthDate) {
-        this.clacExpectedBirthDate();
-      }
-      if (this.formularType === FormularType.ftPregnantWeeks) {
-        this.clacPregnantWeeks();
-      }
-      if (this.formularType === FormularType.ftScoreMapping) {
-        this.getScoreMapping();
-      }
-      if (this.formularType === FormularType.ftBodySurfaceArea) {
-        this.clacBodySurfaceArea();
-      }
-      if (this.formularType === FormularType.ftCalcDays) {
-        this.clacDays();
-      }
-      if (this.formularType === FormularType.ftCalcTime) {
-        this.clacTime();
-      }
-      if (this.formularType === FormularType.ftIdealWeight) {
-        this.clacIdealWeight();
-      }
-      if (this.formularType === FormularType.ftISS) {
-        this.clacISS();
-      }
+      // } else if (this.formularType === FormularType.ftFormular) {
+      //     this.clacFormula(false);
+      // } else if (this.formularType === FormularType.ftBMI) {
+      //     this.clacBMI();
+      // } else if (this.formularType === FormularType.ftLaborProcess) {
+      //     this.clacLaborProcess();
+      // } else if (this.formularType === FormularType.ftExpectedBirthDate) {
+      //     this.clacExpectedBirthDate();
+      // } else if (this.formularType === FormularType.ftPregnantWeeks) {
+      //     this.clacPregnantWeeks();
+      // } else if (this.formularType === FormularType.ftScoreMapping) {
+      //     this.getScoreMapping();
+      // } else if (this.formularType === FormularType.ftBodySurfaceArea) {
+      //     this.clacBodySurfaceArea();
+      // } else if (this.formularType === FormularType.ftCalcDays) {
+      //     this.clacDays();
+      // } else if (this.formularType === FormularType.ftCalcTime) {
+      //     this.clacTime();
+      // } else if (this.formularType === FormularType.ftIdealWeight) {
+      //     this.clacIdealWeight();
+      // } else if (this.formularType === FormularType.ftISS) {
+      //     this.clacISS();
+      // }
     }
   }
   get styleIndex() {
@@ -136637,10 +136825,12 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     this.dCombineStyle = cbStyle;
   }
   node2DrawNodeRange(startIndex, endIndex) {
-    this.refreshDrawStyle();
-    //const text = this._hideZero && (this._text == "0" || this._text === "0.00") ? " " : this._text;
-    const dNode = new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_20__/* .DrawTableFormular */ .$(this._rootPath, this, this._text);
-    this._drawNodes.push(dNode);
+    if (this.formularType === FormularType.ftCurveChart) {
+      this._drawNodes.push(new _editor_draw_drawNode_DrawTableFormularChart__WEBPACK_IMPORTED_MODULE_32__/* .DrawTableFormularChart */ .t(this.hoEditorFactoryID, this._rootPath, this));
+    } else {
+      this.refreshDrawStyle();
+      this._drawNodes.push(new _editor_draw_drawNode_DrawTableFormular__WEBPACK_IMPORTED_MODULE_20__/* .DrawTableFormular */ .$(this._rootPath, this, this._text));
+    }
   }
   node2DrawNode() {
     this.clearDrawNodes(0, 0);
@@ -136675,7 +136865,8 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
       styleIndex: this.styleIndex,
       //hideZero: this._hideZero,
       formularType: this.formularType,
-      customProperty: this.customProperty
+      customProperty: this.customProperty,
+      formularProperty: this.formularProperty
     };
     if (!this.hideZero) {
       retObj.hideZero = this.hideZero;
@@ -136696,7 +136887,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     } else {
       formularType = json.text.indexOf(':') >= 0 ? FormularType.ftSum : FormularType.ftFormular;
     }
-    const ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Z6.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty);
+    const ret = new TableFormula(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Z6.ntTableFormula, json.text, styleIndex, hideZero, formularType, json.customProperty, json.formularProperty);
     return ret;
   }
   getParentCell() {
@@ -136975,7 +137166,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const arrStr = this.formulaStr.split(",");
     if (arrStr.length < 2) {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.444",null,"体重和身高对应的单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.444",null,"体重和身高对应的单元格编号传入有误:") + this.formulaStr);
     }
     const [weightRow, weightCol] = this.getRowColByCellAdress(arrStr[0]);
     const [heightRow, heightCol] = this.getRowColByCellAdress(arrStr[1]);
@@ -137008,7 +137199,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const arrStr = this.formulaStr.split(",");
     if (arrStr.length < 2) {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.443",null,"单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.443",null,"单元格编号传入有误:") + this.formulaStr);
     }
     const [sRow, sCol] = this.getRowColByCellAdress(arrStr[0]);
     const [eRow, eCol] = this.getRowColByCellAdress(arrStr[1]);
@@ -137295,7 +137486,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const table = this.getParentCell().table;
     if (this.formulaStr == "") {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.442",null,"体重的单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.442",null,"体重的单元格编号传入有误:") + this.formulaStr);
     }
     const [row, col] = this.getRowColByCellAdress(this.formulaStr);
     if (row >= 0 && col >= 0) {
@@ -137324,7 +137515,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const arrStr = this.formulaStr.split(",");
     if (arrStr.length < 2) {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.441",null,"入院时间和出院时间对应的单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.441",null,"入院时间和出院时间对应的单元格编号传入有误:") + this.formulaStr);
       return strRet;
     }
     const [rysjRow, rysjCol] = this.getRowColByCellAdress(arrStr[0]);
@@ -137361,7 +137552,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const arrStr = this.formulaStr.split(",");
     if (arrStr.length < 2) {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.440",null,"开始时间和结束时间对应的单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.440",null,"开始时间和结束时间对应的单元格编号传入有误:") + this.formulaStr);
       return strRet;
     }
     const [rysjRow, rysjCol] = this.getRowColByCellAdress(arrStr[0]);
@@ -137447,7 +137638,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
     const table = this.getParentCell().table;
     if (this.formulaStr == "") {
       const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.439",null,"身高的单元格编号传入有误:") + this.formulaStr);
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.439",null,"身高的单元格编号传入有误:") + this.formulaStr);
     }
     let cellNo = "";
     let isRange = false;
@@ -137547,17 +137738,18 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
       result = String.fromCharCode(abyte + achar - 1) + result;
       icol = Math.floor(icol / 26);
     }
-    if (icol > 0) result = String.fromCharCode(abyte + icol - 1) + result;
+    if (icol > 0) {
+      result = String.fromCharCode(abyte + icol - 1) + result;
+    }
     return result;
   }
-  delete(operType) {
+  delete(operType, nodeType, forceDelete) {
     const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-    if (hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_30__/* .PaintState */ .ak.psDesign) {
+    if (hoEditorFactory.drawTree.paintStatus == _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_30__/* .PaintState */ .ak.psDesign || forceDelete) {
       hoEditorFactory.drawTree.formularNodes.delete(this._id);
       super.delete(operType);
     } else {
-      const hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_22__/* .HOEditorFactorys */ .O.instance().getFactory(this._hoEditorFactoryID);
-      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_32__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.438",null,"不能删除表格计算公式"));
+      ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_33__/* ["default"] */ .A.warn(/*#__PURE__*/(0,_i18n__WEBPACK_IMPORTED_MODULE_0__/* .i18nHelper */ .p)("04-001-009-EMR.3.3.438",null,"不能删除表格计算公式"));
     }
     return true;
   }
@@ -137586,7 +137778,7 @@ class TableFormula extends _ControlNode__WEBPACK_IMPORTED_MODULE_27__/* .Control
       this._text = this.clacIdealWeight();
     } else if (this.formularType === FormularType.ftISS) {
       this._text = this.clacISS();
-    }
+    } else if (this.formularType === FormularType.ftCurveChart) {}
     this.node2DrawNode();
   }
   getTagNameCn() {
@@ -139089,6 +139281,7 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
       dateTimeProperty: "",
       diagonalType: _TableProperty__WEBPACK_IMPORTED_MODULE_19__/* .DiagonalType */ .Q_.None,
       isSignLock: false,
+      notAllowEdit: false,
       formula: ""
     };
     const defaultCellPropJson = JSON.parse(JSON.stringify(defaultCellProp));
@@ -139421,15 +139614,25 @@ class TableNode extends _RectNode__WEBPACK_IMPORTED_MODULE_17__/* .RectNode */ .
       const aRow = new Array();
       const nodeRowSpan = node.rowSpan ? parseInt(node.rowSpan) : 1;
       const nodeColSpan = node.colSpan ? parseInt(node.colSpan) : 1;
-      if (nodeRowSpan > 1) {
+      if (nodeRowSpan > 1 && nodeColSpan > 1) {
+        for (let r = parseInt(node.rowNo); r < parseInt(node.rowNo) + nodeRowSpan; r++) {
+          for (let c = parseInt(node.colNo); c < parseInt(node.colNo) + nodeColSpan; c++) {
+            if (!(node.rowNo == r && node.colNo == c)) {
+              rowSpanArr.push({
+                rowCount: r,
+                colCount: c
+              });
+            }
+          }
+        }
+      } else if (nodeRowSpan > 1) {
         for (let r = parseInt(node.rowNo) + 1; r < parseInt(node.rowNo) + nodeRowSpan; r++) {
           rowSpanArr.push({
             rowCount: r,
             colCount: parseInt(node.colNo)
           });
         }
-      }
-      if (nodeColSpan > 1) {
+      } else if (nodeColSpan > 1) {
         for (let c = parseInt(node.colNo) + 1; c < parseInt(node.colNo) + nodeColSpan; c++) {
           colSpanArr.push({
             rowCount: parseInt(node.rowNo),
@@ -144412,13 +144615,11 @@ class TextNode extends _BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .BaseNode */ .Y
     if (combination) {
       this.combination = combination || [];
     }
-    // this._text=text;
     this._styleIndex = styleIndex;
     if (errorIndex != undefined) {
       this._errorIndex = errorIndex;
     }
     this.node2DrawNodeRange(0, this._text.length - 1);
-    // this.drawItems=new Array<DrawNode>();
   }
   /**
    * @author xyl
@@ -154461,6 +154662,210 @@ class DrawTableFormular extends DrawSimpleNode {
 
 /***/ }),
 
+/***/ 14968:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   t: function() { return /* binding */ DrawTableFormularChart; }
+/* harmony export */ });
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(32356);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(44114);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13609);
+/* harmony import */ var core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_unshift_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(27495);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25440);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(98992);
+/* harmony import */ var core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_constructor_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(54520);
+/* harmony import */ var core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_filter_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3949);
+/* harmony import */ var core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_for_each_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(81454);
+/* harmony import */ var core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_esnext_iterator_map_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(62953);
+/* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(56419);
+/* harmony import */ var _yuki_createjs__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_yuki_createjs__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _types_EditorType__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(27195);
+/* harmony import */ var _DrawCombineNode__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(10431);
+
+
+
+
+
+
+
+
+
+
+
+
+
+class DrawTableFormularChart extends _DrawCombineNode__WEBPACK_IMPORTED_MODULE_12__/* .DrawCombineNode */ .A {
+  constructor(hoEditfactoryId, rootPath, node) {
+    super(hoEditfactoryId, rootPath, node, 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "dNode", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "hoEditfactoryId", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A)(this, "formularProperty", null);
+    this.dNode = node;
+    this.hoEditfactoryId = hoEditfactoryId;
+    if (node.formularType == _types_EditorType__WEBPACK_IMPORTED_MODULE_11__/* .FormularType */ .Dd.ftCurveChart) {
+      var _node$formularPropert;
+      this.dWidth = Number((_node$formularPropert = node.formularProperty) === null || _node$formularPropert === void 0 ? void 0 : _node$formularPropert.width) || 100;
+      // this.dHeight = Number(node.formularProperty?.height) || 100;
+      // console.log(node.formularProperty?.height, node.formularProperty?.width);
+      this.formularProperty = node.formularProperty;
+      this.drawCurveChart();
+    }
+  }
+  getCell(table, arr) {
+    const [startRow, startCol] = this.dNode.getRowColByCellAdress(arr[0]);
+    const [endRow, endCol] = this.dNode.getRowColByCellAdress(arr[1]);
+    const list = [];
+    let notAllowEdit = false;
+    if (startRow >= 0 && startCol >= 0 && endRow >= 0 && endCol >= 0) {
+      if (startRow === endRow || startCol === endCol) {
+        for (let r = startRow; r <= endRow; r++) {
+          for (let c = startCol; c <= endCol; c++) {
+            const cell = table.rows[r][c];
+            if (cell) {
+              notAllowEdit = cell.cellProperty.notAllowEdit || false;
+              const text = cell.getCellText() || '';
+              if (notAllowEdit) {
+                list.push(text);
+              } else {
+                list.push(text.replace(/\+|-/g, ''));
+              }
+            }
+          }
+        }
+      }
+    }
+    return {
+      notAllowEdit,
+      startRow,
+      startCol,
+      endRow,
+      endCol,
+      list
+    };
+  }
+  drawCurveChart() {
+    if (this.dNode && this.formularProperty) {
+      const xArr = this.formularProperty.codeX.split(':');
+      const yArr = this.formularProperty.codeY.split(':');
+      const currentCell = this.dNode.getParentCell();
+      this.dWidth = currentCell.drawCell.dWidth - 30;
+      const xInfo = this.getCell(currentCell.table, xArr);
+      const yInfo = this.getCell(currentCell.table, yArr);
+      let xAxis = [];
+      let yAxis = [];
+      let valueList = [];
+      const formularChartContainer = new createjs.Container();
+      if (this.formularProperty.lockX) {
+        var _this$formularPropert;
+        xAxis = xInfo.list;
+        valueList = yInfo.list;
+        const list = yInfo.list.filter(item => item !== '').map(Number);
+        let maxValue = Math.max(...list);
+        if (list.length == 0) {
+          this.dHeight = 50;
+          this.addChild(formularChartContainer);
+          return;
+        }
+        this.dHeight = Number((_this$formularPropert = this.formularProperty) === null || _this$formularPropert === void 0 ? void 0 : _this$formularPropert.height) || 100;
+        // maxValue = Math.ceil(maxValue * 10) / 10; // 向上取整到最近的 0.1
+        let step = Math.ceil(maxValue / Number(this.formularProperty.step));
+        if (step < 5) {
+          step = 5;
+        }
+        for (let i = 0; i <= step; i++) {
+          yAxis.push((i * Number(this.formularProperty.step)).toFixed(1));
+        }
+      }
+      const baseChild = this.createGraduation(xAxis, yAxis, valueList);
+      formularChartContainer.addChild(...baseChild);
+      this.addChild(formularChartContainer);
+      setTimeout(() => {
+        this.setChildIndex(formularChartContainer, this.children.length - 1);
+      }, 0);
+    }
+  }
+  createGraduation(xAxis, yAxis, valueList) {
+    var _this$formularPropert2, _this$formularPropert3;
+    const baseChild = [];
+    const baseColor = ((_this$formularPropert2 = this.formularProperty) === null || _this$formularPropert2 === void 0 ? void 0 : _this$formularPropert2.baseColor) || '#000000';
+    const lineColor = ((_this$formularPropert3 = this.formularProperty) === null || _this$formularPropert3 === void 0 ? void 0 : _this$formularPropert3.lineColor) || '#000000';
+    const circleRadius = 4; // 坐标点半径
+    if (this.formularProperty) {
+      const line = new createjs.Shape();
+      xAxis.unshift("0");
+      valueList.unshift("");
+      let marginY = 30;
+      let dHeight = this.dHeight - marginY;
+      const xScale = this.dWidth / xAxis.length;
+      const yScale = dHeight / yAxis.length;
+      line.graphics.beginStroke(baseColor);
+      let valuePoint = [];
+      // 基本坐标系
+      xAxis.forEach((xText, xIndex) => {
+        let x = (xIndex + 1) * xScale;
+        if (xIndex > 0) {
+          const xT = new createjs.Text(xText, '12px Arial', baseColor);
+          xT.x = x - xScale * 0.4;
+          xT.y = -marginY * 0.7;
+          baseChild.push(xT);
+        }
+        yAxis.forEach((yText, yIndex) => {
+          let y = Math.floor(-yIndex * yScale - marginY);
+          if (xIndex == 0) {
+            const yT = new createjs.Text(yText, '12px Arial', baseColor);
+            yT.x = 10;
+            yT.y = y;
+            baseChild.push(yT);
+          }
+          if (xIndex == 0 && yIndex == 0) {
+            line.graphics.setStrokeStyle(2).moveTo(xScale, y).lineTo(this.dWidth, y);
+          } else if (xIndex == xAxis.length - 1 && yIndex == yAxis.length - 1) {
+            line.graphics.setStrokeStyle(2).setStrokeDash([0, 0]).moveTo(xScale, -marginY).lineTo(xScale, y);
+            line.graphics.setStrokeStyle(1).setStrokeDash([6, 2]).moveTo(x, -marginY).lineTo(x, y);
+            line.graphics.setStrokeStyle(1).setStrokeDash([6, 2]).moveTo(xScale, y).lineTo(x, y);
+          } else if (xIndex > 0 && yIndex == yAxis.length - 1) {
+            line.graphics.setStrokeStyle(1).setStrokeDash([6, 2]).moveTo(x, -marginY).lineTo(x, y);
+          } else if (xIndex == xAxis.length - 1 && yIndex > 0) {
+            line.graphics.setStrokeStyle(1).setStrokeDash([6, 2]).moveTo(xScale, y).lineTo(x, y);
+          }
+        });
+        if (valueList[xIndex] !== '' && Number(valueList[xIndex]) > 0) {
+          valuePoint.push({
+            x: x,
+            y: -Number(valueList[xIndex]) / Number(yAxis[yAxis.length - 1]) * (yScale * (yAxis.length - 1)) - marginY
+          });
+        }
+      });
+      baseChild.push(line);
+      valuePoint.forEach((point, index) => {
+        const circle = new createjs.Shape();
+        circle.graphics.beginFill(lineColor).drawCircle(point.x, point.y, circleRadius);
+        if (index > 0) {
+          const prevPoint = valuePoint[index - 1];
+          const line = new createjs.Shape();
+          line.graphics.beginStroke(lineColor).moveTo(prevPoint.x, prevPoint.y).lineTo(point.x, point.y);
+          baseChild.push(line);
+        }
+        baseChild.push(circle);
+      });
+    }
+    return baseChild;
+  }
+}
+
+/***/ }),
+
 /***/ 68880:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -157229,8 +157634,6 @@ var PrintStatus = __webpack_require__(61663);
 var DrawPageMainDoc = __webpack_require__(54071);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawTextNode.ts + 1 modules
 var DrawTextNode = __webpack_require__(68880);
-// EXTERNAL MODULE: ./src/editor/dom/treeNode/TableFormula.ts
-var TableFormula = __webpack_require__(28646);
 // EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawSignNode.ts
 var DrawSignNode = __webpack_require__(54625);
 // EXTERNAL MODULE: ./src/editor/dom/TableProperty.ts
@@ -157297,7 +157700,6 @@ var UserHistory = __webpack_require__(78911);
 
 
 
-
 
 
 //当前的显示状态，psDesign为设计状态，psEdit为正常编辑状态 psPreview为打印预览态态  psPrint 正在打印状态, psReview审阅状态
@@ -157309,7 +157711,7 @@ var PaintState;
   PaintState[PaintState["psPrint"] = 3] = "psPrint";
   PaintState[PaintState["psReview"] = 4] = "psReview";
   PaintState[PaintState["psReadOnly"] = 5] = "psReadOnly";
-  PaintState[PaintState["psTrace"] = 6] = "psTrace"; // 留痕模式
+  PaintState[PaintState["psTrace"] = 6] = "psTrace";
 })(PaintState || (PaintState = {}));
 class RedrawPosition {
   constructor() {
@@ -157437,9 +157839,9 @@ class DrawTree {
     }
   }
   /**
-  * Getter formularNodes
-  * @return {Map<string, TableFormula>}
-  */
+   * Getter formularNodes
+   * @return {Map<string, TableFormula>}
+   */
   get formularNodes() {
     return this._formularNodes;
   }
@@ -157796,7 +158198,7 @@ class DrawTree {
    */
   getHeaderDNodes(pageNo) {
     let droots = null;
-    let path = "";
+    let path = '';
     const iend = Math.min(pageNo, this._headerChildNodes.length - 1);
     if (iend >= 0) {
       for (let i = iend; i >= 0; i--) {
@@ -157938,7 +158340,7 @@ class DrawTree {
       } else {
         //放置时不包含第一个节点
         if (dline instanceof DrawTable/* DrawTable */.n) {
-          throw new Error("错误的文档结构，表格后面需要放置一个段落节点");
+          throw new Error('错误的文档结构，表格后面需要放置一个段落节点');
         } else {
           if (!(hoeditorFactory.drawTree.paintStatus != PaintState.psDesign && node instanceof TextInputFieldNode/* TextInputFieldNode */.IM && node.customProperty.hidden == true)) {
             dline = node.placeDNode2DrawLine(paraNode.drootNodes, paraNode, dline, startChildIndex, node.getLength() - 1, aEndPath);
@@ -158067,7 +158469,7 @@ class DrawTree {
       } else {
         //放置时不包含第一个节点
         if (dline instanceof DrawTable/* DrawTable */.n) {
-          throw new Error("错误的文档结构，表格前面需要放置一个段落节点");
+          throw new Error('错误的文档结构，表格前面需要放置一个段落节点');
         } else {
           if (!(hoEditorFactory.drawTree.paintStatus != PaintState.psDesign && node instanceof TextInputFieldNode/* TextInputFieldNode */.IM && node.customProperty.hidden == true)) {
             dline = node.placeDNode2DrawLine(paraNode.drootNodes, paraNode, dline, 0, node.getLength() - 1, aEndPath);
@@ -158393,7 +158795,9 @@ class DrawTree {
         }
         if (e.repaintImmediate) {
           let mainArea = dArea;
-          if (dline.parent) mainArea = hoEditorFactory.drawPageTree.getMainRootArea(startUpdateLine);else if (dArea) {
+          if (dline.parent) {
+            mainArea = hoEditorFactory.drawPageTree.getMainRootArea(startUpdateLine);
+          } else if (dArea) {
             mainArea = hoEditorFactory.drawPageTree.getMainRootArea(dArea);
           }
           if (mainArea) {
@@ -158575,7 +158979,7 @@ class DrawTree {
   }
   onSelectChanged(e) {
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
-    if (e.newRange.startPath === "" || e.newRange.endPath === "") {
+    if (e.newRange.startPath === '' || e.newRange.endPath === '') {
       return false;
     }
     const endNp = hoEditorFactory.docTree.findNodePositionByPath(e.newRange.endPath);
@@ -158633,19 +159037,19 @@ class DrawTree {
         }
         // console.log(aNode); 互斥
         const groupName = aNode.groupName;
-        if (aNode.controlStyle === "CheckBox" && !aNode.isMutualExclusion) {
+        if (aNode.controlStyle === 'CheckBox' && !aNode.isMutualExclusion) {
           if (aNode.isSelected) {
             aNode.isSelected = false;
           } else {
             aNode.isSelected = true;
           }
         }
-        if (aNode.controlStyle === "RadioBox" || aNode.controlStyle === "CheckBox" && aNode.isMutualExclusion) {
+        if (aNode.controlStyle === 'RadioBox' || aNode.controlStyle === 'CheckBox' && aNode.isMutualExclusion) {
           if (groupName.length > 0) {
             if (aNode.isSelected) {
               if (hoEditorFactory.allowUncheckRadio) {
                 aNode.isSelected = false;
-              } else if (aNode.controlStyle === "CheckBox" && aNode.isMutualExclusion) {
+              } else if (aNode.controlStyle === 'CheckBox' && aNode.isMutualExclusion) {
                 aNode.isSelected = false;
               } else {
                 return true;
@@ -158655,7 +159059,7 @@ class DrawTree {
               let selectedGroupList = [];
               let isGroupList = [];
               radioAndCheckBoxs.forEach((value, key) => {
-                if (value.controlStyle === aNode.controlStyle && value.controlStyle === "CheckBox" && value.groupName === groupName) {
+                if (value.controlStyle === aNode.controlStyle && value.controlStyle === 'CheckBox' && value.groupName === groupName) {
                   if (!isGroupList.includes(value.groupType)) {
                     isGroupList.push(value.groupType);
                   }
@@ -158663,14 +159067,14 @@ class DrawTree {
               });
               radioAndCheckBoxs.forEach((value, key) => {
                 if (value.controlStyle === aNode.controlStyle && value.groupName === groupName && value.isSelected) {
-                  if (value.controlStyle === "CheckBox" && value.isMutualExclusion && isGroupList.length > 1) {
+                  if (value.controlStyle === 'CheckBox' && value.isMutualExclusion && isGroupList.length > 1) {
                     selectedGroupList.push(value.groupType);
                   } else {
                     value.isSelected = false;
                     const nodePath = value.getNodePath();
                     const newDomRange = new DomRange/* DomRange */.g(this._hoEditorFactoryID, nodePath, nodePath);
                     const nodeObjectTemp = JSON.stringify(value.radioAndCheckBoxInstance);
-                    hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRange, nodeObjectTemp, value.styleIndex);
+                    hoEditorFactory.docController.insertRadioAndCheckBox('update', newDomRange, nodeObjectTemp, value.styleIndex);
                   }
                 }
               });
@@ -158706,10 +159110,10 @@ class DrawTree {
           nodeStyle.color = color;
           styleIndex = hoEditorFactory.docTree.styleCompare(nodeStyle);
         }
-        hoEditorFactory.docController.insertRadioAndCheckBox("update", newDomRangeCur, nodeObjectStr, styleIndex);
+        hoEditorFactory.docController.insertRadioAndCheckBox('update', newDomRangeCur, nodeObjectStr, styleIndex);
         //单复选关联元素必填标记
         if (e.node.associatedElement) {
-          const node = hoEditorFactory.vueController.getNodeByDataID("main", e.node.associatedElement);
+          const node = hoEditorFactory.vueController.getNodeByDataID('main', e.node.associatedElement);
           if (node && node instanceof TextInputFieldNode/* TextInputFieldNode */.IM) {
             if (e.node.isSelected) {
               node.customProperty.must = true;
@@ -158720,10 +159124,10 @@ class DrawTree {
             }
           }
         } else {
-          if ((e.node.controlStyle === "RadioBox" || e.node.controlStyle === "CheckBox" && e.node.isMutualExclusion) && e.node.isSelected) {
+          if ((e.node.controlStyle === 'RadioBox' || e.node.controlStyle === 'CheckBox' && e.node.isMutualExclusion) && e.node.isSelected) {
             for (let value of hoEditorFactory.docTree.radioAndCheckBoxsMap.values()) {
-              if (value.associatedElement && value.controlStyle === e.node.controlStyle && value.groupName === groupName && groupName !== "") {
-                const node = hoEditorFactory.vueController.getNodeByDataID("main", value.associatedElement);
+              if (value.associatedElement && value.controlStyle === e.node.controlStyle && value.groupName === groupName && groupName !== '') {
+                const node = hoEditorFactory.vueController.getNodeByDataID('main', value.associatedElement);
                 if (node && node instanceof TextInputFieldNode/* TextInputFieldNode */.IM) {
                   node.customProperty.must = false;
                   node.update(0);
@@ -158736,10 +159140,10 @@ class DrawTree {
         //单复选带出关联元素
         const deleteAssociatedEle = (node, tPath) => {
           const oldEndPath = hoEditorFactory.docTree.getNodeLastPath(node);
-          const changeEvent = new NodeChangeEvent/* NodeChangeEvent */.b(this._hoEditorFactoryID, DocTree/* DocAction */.LC.daDelete, tPath, "");
+          const changeEvent = new NodeChangeEvent/* NodeChangeEvent */.b(this._hoEditorFactoryID, DocTree/* DocAction */.LC.daDelete, tPath, '');
           changeEvent.oldEndPath = oldEndPath;
           changeEvent.oldDrawTreeLines = new SelectRange/* SelectRange */.u(this._hoEditorFactoryID).getRangeDrawTreeLines(nodePathCur, oldEndPath);
-          hoEditorFactory.docTree.deleteNode(node, "update");
+          hoEditorFactory.docTree.deleteNode(node, 'update');
           changeEvent.afterChangePath = nodePathCur;
           hoEditorFactory.docTree.change(changeEvent);
         };
@@ -158751,17 +159155,17 @@ class DrawTree {
                 newpath = res;
               });
             } else {
-              const node = hoEditorFactory.vueController.getNodeByID("main", e.node.associatedId);
+              const node = hoEditorFactory.vueController.getNodeByID('main', e.node.associatedId);
               if (node) {
                 deleteAssociatedEle(node, newpath);
               }
             }
           }
         } else {
-          if ((e.node.controlStyle === "RadioBox" || e.node.controlStyle === "CheckBox" && e.node.isMutualExclusion) && e.node.isSelected) {
+          if ((e.node.controlStyle === 'RadioBox' || e.node.controlStyle === 'CheckBox' && e.node.isMutualExclusion) && e.node.isSelected) {
             for (let val of hoEditorFactory.docTree.radioAndCheckBoxsMap.values()) {
-              if (val.associatedId && val.controlStyle === e.node.controlStyle && val.groupName === groupName && groupName !== "") {
-                const node = hoEditorFactory.vueController.getNodeByID("main", val.associatedId);
+              if (val.associatedId && val.controlStyle === e.node.controlStyle && val.groupName === groupName && groupName !== '') {
+                const node = hoEditorFactory.vueController.getNodeByID('main', val.associatedId);
                 if (node) {
                   const bpath = val.getNodePath();
                   deleteAssociatedEle(node, bpath);
@@ -158782,7 +159186,7 @@ class DrawTree {
    */
   getFooterDNodes(pageNo) {
     let droots = null;
-    let path = "";
+    let path = '';
     const iend = Math.min(pageNo, this._footerChildNodes.length - 1);
     if (iend >= 0) {
       for (let i = iend; i >= 0; i--) {
@@ -158816,13 +159220,13 @@ class DrawTree {
     return null;
   }
   getDNodePath(dPage, dLine, x, y) {
-    let selectStart = "";
+    let selectStart = '';
     if (!dPage.drawDomLevel) {
-      return "";
+      return '';
     }
     const lineIndex = dLine.paragraphNode.drawlines.indexOf(dLine);
     if (lineIndex == -1) {
-      return "";
+      return '';
     }
     const index = dLine.getChildByPos(x, y)[0];
     if (index === -1) {
@@ -158899,7 +159303,7 @@ class DrawTree {
           const pos = dline.localToLocal(dright, 0, dPage.drawDocContainer);
           this._caret.height = dline.dHeight + dline.paragraphNode.combineParagraph.lineSpace;
           if (dPage && dPage.drawSelectLevel) {
-            if (this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
+            if (this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== '') {
               this._editor.moveTo(dPage.pageIndex, pos.x, pos.y);
             }
             if (dNode instanceof DrawSignNode/* DrawSignNode */._) {
@@ -158949,7 +159353,7 @@ class DrawTree {
   }
   moveEditTo(pageIndex, x, y) {
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
-    if (this.selectRange.beginRangeSelect === undefined || this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== "") {
+    if (this.selectRange.beginRangeSelect === undefined || this.selectRange.isEmpty || hoEditorFactory.docController.findContent !== '') {
       this._editor.moveTo(pageIndex, x, y);
     }
   }
@@ -159136,7 +159540,7 @@ class DrawTree {
    */
   getDrawRootsByPath(strPath) {
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
-    const arr = strPath.split("/");
+    const arr = strPath.split('/');
     const istart = 1;
     let dArea = null;
     let dlines = null;
@@ -159203,19 +159607,19 @@ class DrawTree {
   getDTreePathByNodePath(nodePath) {
     const hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const np = hoEditorFactory.docTree.findNodePositionByPath(nodePath);
-    let ret = "";
+    let ret = '';
     if (np && np.node) {
       if (np.childIndex >= 0 && np.node.drawNodes.length > np.childIndex) {
         let dnode = np.node.drawNodes[np.childIndex];
         let dParent = dnode.parent;
         while (dParent && dParent instanceof DrawContainer/* DrawContainer */.g) {
           const index = dParent.drawItems.indexOf(dnode);
-          ret = index.toString() + "/" + ret;
+          ret = index.toString() + '/' + ret;
           dnode = dParent;
           dParent = dnode.parent;
         }
-        if (ret !== "") {
-          ret = hoEditorFactory.docTree.getPathRoots(nodePath) + "/" + ret.substr(0, ret.length - 1);
+        if (ret !== '') {
+          ret = hoEditorFactory.docTree.getPathRoots(nodePath) + '/' + ret.substr(0, ret.length - 1);
         }
       }
     }
@@ -159271,7 +159675,7 @@ class DrawTree {
     return ditem;
   }
   getNodePathByDPath(dPath) {
-    let ret = "";
+    let ret = '';
     const dnode = this.getDNodeByPath(dPath);
     //组合节点
     if (dnode instanceof DrawCombineNode/* DrawCombineNode */.A) {
@@ -159281,7 +159685,7 @@ class DrawTree {
       ret = dnode.parent.node.getNodePath();
       const index = dnode.parent.node.drawNodes.indexOf(dnode);
       if (index >= 0 && index < dnode.parent.node.drawNodes.length) {
-        ret += "/" + index;
+        ret += '/' + index;
       }
     }
     return ret;
@@ -159339,7 +159743,7 @@ class DrawTree {
     const hoeditorFactory = HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const prevPara = hoeditorFactory.docTree.getSameRectPrevParanode(paraNode);
     let dTop = 0;
-    if (!prevPara || hoeditorFactory.drawTree.paintStatus != PaintState.psDesign && prevPara.customProperty && prevPara.customProperty.hidden == "true") {
+    if (!prevPara || hoeditorFactory.drawTree.paintStatus != PaintState.psDesign && prevPara.customProperty && prevPara.customProperty.hidden == 'true') {
       dTop = paraNode.combineParagraph.topMarginPixes;
     } else {
       //存在上一个同区域段落节点
@@ -159371,7 +159775,7 @@ class DrawTree {
           if (pageCell) {
             return pageCell.getPagePaintPosition();
           } else {
-            throw new Error("表格结点还未准备好绘制");
+            throw new Error('表格结点还未准备好绘制');
           }
         } else {
           //页的起始段茖
@@ -159459,7 +159863,7 @@ class DrawTree {
         if (dnextDline === aRange.spStart.dline && aRange.spStart.index >= 0) {
           const ditem = dnextDline.drawItems[aRange.spStart.index];
           if (ditem instanceof DrawTextNode/* DrawTextNode */.w && ditem.node instanceof TextNode/* TextNode */.E) {
-            const arr = aRange.spStart.path.split("/");
+            const arr = aRange.spStart.path.split('/');
             const iindex = parseInt(arr[arr.length - 1]);
             if (!isNaN(iindex)) left = ditem.x + ditem.dText.getWidthByIndex(iindex);
           } else {
@@ -159471,7 +159875,7 @@ class DrawTree {
           if (aRange.spEnd.index >= 0) {
             const ditem = dnextDline.drawItems[aRange.spEnd.index];
             if (ditem instanceof DrawTextNode/* DrawTextNode */.w && ditem.node instanceof TextNode/* TextNode */.E) {
-              const arr = aRange.spEnd.path.split("/");
+              const arr = aRange.spEnd.path.split('/');
               const iindex = parseInt(arr[arr.length - 1]);
               if (!isNaN(iindex)) right = ditem.x + ditem.dText.getWidthByIndex(iindex);
             } else {
@@ -159487,8 +159891,8 @@ class DrawTree {
           }
         }
         if (dPage && dPage.selectContainer) {
-          const shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, "blue");
-          shape.name = "select";
+          const shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, 'blue');
+          shape.name = 'select';
           shape.alpha = 0.5;
           dPage.selectContainer.addChild(shape);
           if (dPages.indexOf(dPage) < 0) {
@@ -159544,7 +159948,7 @@ class DrawTree {
           if (dnextDline === aRange.spStart.dline && aRange.spStart.index >= 0) {
             const ditem = dnextDline.drawItems[aRange.spStart.index];
             if (ditem instanceof DrawTextNode/* DrawTextNode */.w && ditem.node instanceof TextNode/* TextNode */.E) {
-              arr = aRange.spStart.path.split("/");
+              arr = aRange.spStart.path.split('/');
               iindex = parseInt(arr[arr.length - 1]);
               if (!isNaN(iindex)) {
                 if (iindex == 0) {
@@ -159562,7 +159966,7 @@ class DrawTree {
             if (aRange.spEnd.index >= 0) {
               const ditem = dnextDline.drawItems[aRange.spEnd.index];
               if (ditem instanceof DrawTextNode/* DrawTextNode */.w && ditem.node instanceof TextNode/* TextNode */.E) {
-                arr = aRange.spEnd.path.split("/");
+                arr = aRange.spEnd.path.split('/');
                 iindex = parseInt(arr[arr.length - 1]);
                 if (!isNaN(iindex)) right = ditem.x + ditem.dText.getWidthByIndex(iindex);
               } else {
@@ -159749,7 +160153,7 @@ class DrawTree {
     cgEvent.needUpdateParaStyle = needUpdateParaStyle;
     cgEvent.oldDrawLines = new SelectRange/* SelectRange */.u(this._hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true, true);
     await hoEditorFactory.docTree.change(cgEvent);
-    if (hoEditorFactory.docTree.curDomRange.startPath != "") {
+    if (hoEditorFactory.docTree.curDomRange.startPath != '') {
       if (moveCaret) {
         this.moveCaretToPath(hoEditorFactory.docTree.curDomRange.startPath);
       }
@@ -159769,7 +160173,7 @@ class DrawTree {
       this.drawPages[0].storeDrawHeader.visible = true;
       this.drawPages[0].storeDrawFooter.visible = true;
     }
-    if (area === "header") {
+    if (area === 'header') {
       const headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
       for (let i = 0; i < headerDocTree.length; i++) {
         const nodes = headerDocTree[i].subDocNodes;
@@ -159791,7 +160195,7 @@ class DrawTree {
         }
       }
     }
-    if (area === "footer") {
+    if (area === 'footer') {
       const footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
       for (let j = 0; j < footerDocTree.length; j++) {
         const nodes = footerDocTree[j].subDocNodes;
@@ -159813,7 +160217,7 @@ class DrawTree {
         }
       }
     }
-    if (area === "main") {
+    if (area === 'main') {
       const nodes = hoEditorFactory.docTree.mainNodes;
       if (this._mainChildNodes.length > 0) {
         const dline = this._mainChildNodes[0];
@@ -159826,7 +160230,7 @@ class DrawTree {
       cgEvent.needUpdateParaStyle = needUpdateParaStyle;
       cgEvent.oldDrawLines = new SelectRange/* SelectRange */.u(this._hoEditorFactoryID).getRangeDrawLines(startPath, endPath, true, true);
       await hoEditorFactory.docTree.change(cgEvent);
-      if (hoEditorFactory.docTree.curDomRange.startPath != "") this.moveCaretToPath(hoEditorFactory.docTree.curDomRange.startPath);else {
+      if (hoEditorFactory.docTree.curDomRange.startPath != '') this.moveCaretToPath(hoEditorFactory.docTree.curDomRange.startPath);else {
         const lastPath = hoEditorFactory.docTree.getNodeLastPath(hoEditorFactory.docTree.mainNodes[hoEditorFactory.docTree.mainNodes.length - 1]);
         const selChangeEvent = new SelectionChangeEvent/* SelectionChangeEvent */.h(hoEditorFactory.docTree.curDomRange, new DomRange/* DomRange */.g(this._hoEditorFactoryID, lastPath, lastPath));
         hoEditorFactory.docTree.selectChange(selChangeEvent);
@@ -159839,7 +160243,7 @@ class DrawTree {
     this.pageCountNodes.forEach((value, key) => {
       value.drawNodes[0].updatePaint();
       const dArea = hoeditfactory.drawPageTree.getMainRootArea(value.drawNodes[0]);
-      if (dArea && value.rootPath.indexOf("main") < 0) {
+      if (dArea && value.rootPath.indexOf('main') < 0) {
         if (dArea.index < this.drawPages.length) {
           hoeditfactory.subDocManger.updateAllSameSubDoc(dArea.index, dArea.hftType, false, false);
         }
@@ -159935,7 +160339,7 @@ class DrawTree {
       aline = dParent;
       dParent = dParent.parent;
     }
-    if (aline instanceof DrawLine/* DrawLine */.D || aline instanceof DrawPageTable/* DrawPageTable */.Yt) return aline;else throw new Error("首行未放置于页上无法定位到更新起始点");
+    if (aline instanceof DrawLine/* DrawLine */.D || aline instanceof DrawPageTable/* DrawPageTable */.Yt) return aline;else throw new Error('首行未放置于页上无法定位到更新起始点');
   }
   updateTablesdHeight(tables) {
     for (let i = 0; i < tables.length; i++) {
@@ -159977,11 +160381,22 @@ class DrawTree {
     this.formularNodes.forEach((value, key) => {
       const pnode = value.getParentCell();
       if (cell.table == pnode.table) {
-        if (value.formularType === TableFormula/* FormularType */.D.ftSum || value.formularType === TableFormula/* FormularType */.D.ftFormular || value.formularType === TableFormula/* FormularType */.D.ftBMI || value.formularType === TableFormula/* FormularType */.D.ftLaborProcess || value.formularType === TableFormula/* FormularType */.D.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType */.D.ftPregnantWeeks || value.formularType === TableFormula/* FormularType */.D.ftScoreMapping || value.formularType === TableFormula/* FormularType */.D.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType */.D.ftCalcDays || value.formularType === TableFormula/* FormularType */.D.ftCalcTime || value.formularType === TableFormula/* FormularType */.D.ftIdealWeight || value.formularType === TableFormula/* FormularType */.D.ftISS) {
-          value.updateResult();
-          value.getParentCell().drawCell.needUpdate = true;
-          isNeedUpdate = true;
-        }
+        // if (value.formularType === FormularType.ftSum
+        //   || value.formularType === FormularType.ftFormular
+        //   || value.formularType === FormularType.ftBMI
+        //   || value.formularType === FormularType.ftLaborProcess
+        //   || value.formularType === FormularType.ftExpectedBirthDate
+        //   || value.formularType === FormularType.ftPregnantWeeks
+        //   || value.formularType === FormularType.ftScoreMapping
+        //   || value.formularType === FormularType.ftBodySurfaceArea
+        //   || value.formularType === FormularType.ftCalcDays
+        //   || value.formularType === FormularType.ftCalcTime
+        //   || value.formularType === FormularType.ftIdealWeight
+        //   || value.formularType === FormularType.ftISS) {
+        value.updateResult();
+        value.getParentCell().drawCell.needUpdate = true;
+        isNeedUpdate = true;
+        // }
       }
     });
     if (isNeedUpdate) {
@@ -165138,7 +165553,22 @@ class NodeConvert {
         const item = data[i];
         if (item["nodeType"]) {
           if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntText]) {
-            paragraphText += item.text;
+            // paragraphText += item.text;
+            if (item.combination) {
+              let combination = [];
+              if (typeof item.combination === "string") {
+                combination = item.combination.replace(/ /g, '').split(",");
+              } else if (Array.isArray(item.combination)) {
+                combination = item.combination;
+              }
+              let text = item.text;
+              combination.forEach(cText => {
+                text = text + cText;
+              });
+              paragraphText += text;
+            } else {
+              paragraphText += item.text;
+            }
           } else if (item.nodeType == _dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6[_dom_treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType */ .Z6.ntParagraph]) {
             if (i != 0) {
               paragraphText += "\n";
@@ -166277,10 +166707,11 @@ const createRarewordsCanvas = (text, textStyle) => {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Dd: function() { return /* binding */ FormularType; },
 /* harmony export */   Z6: function() { return /* binding */ NodeType; },
 /* harmony export */   v2: function() { return /* binding */ SliderDecimalType; }
 /* harmony export */ });
-/* unused harmony exports FormularType, SliderFigureType */
+/* unused harmony export SliderFigureType */
 var NodeType;
 (function (NodeType) {
   NodeType[NodeType["ntParagraph"] = 0] = "ntParagraph";
@@ -166320,6 +166751,7 @@ var FormularType;
   FormularType[FormularType["ftCalcTime"] = 9] = "ftCalcTime";
   FormularType[FormularType["ftIdealWeight"] = 10] = "ftIdealWeight";
   FormularType[FormularType["ftISS"] = 11] = "ftISS";
+  FormularType[FormularType["ftCurveChart"] = 12] = "ftCurveChart";
 })(FormularType || (FormularType = {}));
 var SliderDecimalType;
 (function (SliderDecimalType) {
@@ -166331,7 +166763,7 @@ var SliderFigureType;
 (function (SliderFigureType) {
   SliderFigureType[SliderFigureType["Figure"] = 0] = "Figure";
   SliderFigureType[SliderFigureType["Skin"] = 1] = "Skin";
-  SliderFigureType[SliderFigureType["Joint"] = 2] = "Joint"; // 疼痛关节
+  SliderFigureType[SliderFigureType["Joint"] = 2] = "Joint";
 })(SliderFigureType || (SliderFigureType = {}));
 
 /***/ }),
@@ -167293,11 +167725,11 @@ var map = {
 	"./specialChars/HoSpecialChars.vue": 33336,
 	"./table/TableCellPoper.vue": 12097,
 	"./table/TableCellPoper1.vue": 8813,
-	"./table/TableCellProperty.vue": 68480,
+	"./table/TableCellProperty.vue": 37667,
 	"./table/TableColProperty.vue": 81078,
 	"./table/TableForm.vue": 35121,
 	"./table/TableFormTree.vue": 75295,
-	"./table/TableFormula.vue": 63459,
+	"./table/TableFormula.vue": 68707,
 	"./table/TableProperty.vue": 65356,
 	"./table/TableRowProperty.vue": 51653,
 	"./textDialog/TextBorderDialog.vue": 80713,
@@ -219614,7 +220046,7 @@ entry_lib_Input.install = function (Vue) {
 
 
 /* harmony default export */ var entry_lib_antd = ([entry_lib_es_button, entry_lib_input, entry_lib_input_number, entry_lib_es_checkbox, entry_lib_date_picker, entry_lib_time_picker, entry_lib_es_radio, entry_lib_es_select, entry_lib_es_tabs, entry_lib_es_dropdown, entry_lib_es_menu, entry_lib_es_upload, entry_lib_tooltip, entry_lib_table, entry_lib_popover, entry_lib_es_icon/* default */.A, entry_lib_config_provider]);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=12e6aefd
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDocs.vue?vue&type=template&id=de9e9654
 var entry_lib_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -219640,6 +220072,7 @@ var entry_lib_render = function render() {
       },
       on: {
         "leftclick": _vm.leftclick,
+        "clickEvents": _vm.clickEvents,
         "dblNodeClick": _vm.dblNodeClick,
         "setFontStyles": _vm.setFontStyle,
         "rightClickEventIn": _vm.rightClickEventIn,
@@ -219735,9 +220168,9 @@ var entry_lib_web_dom_collections_iterator = __webpack_require__(62953);
 var build_entry_lib_objectSpread2 = __webpack_require__(33217);
 // EXTERNAL MODULE: ./src/i18n/index.ts + 1 modules
 var entry_lib_i18n = __webpack_require__(49850);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=526129d2
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=52882d22
 
-var entry_lib_HoDocvue_type_template_id_526129d2_render = function render() {
+var entry_lib_HoDocvue_type_template_id_52882d22_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -219936,9 +220369,9 @@ var entry_lib_HoDocvue_type_template_id_526129d2_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])], 2)], 1);
 };
-var entry_lib_HoDocvue_type_template_id_526129d2_staticRenderFns = [];
+var entry_lib_HoDocvue_type_template_id_52882d22_staticRenderFns = [];
 
-;// ./src/components/HoDoc.vue?vue&type=template&id=526129d2
+;// ./src/components/HoDoc.vue?vue&type=template&id=52882d22
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var entry_lib_es_array_sort = __webpack_require__(26910);
@@ -222784,7 +223217,7 @@ var entry_lib_TextNode = __webpack_require__(32083);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var entry_lib_ParagraphNode = __webpack_require__(40504);
 ;// ./src/components/version.ts
-/* harmony default export */ var entry_lib_version = ('3.1.200');
+/* harmony default export */ var entry_lib_version = ('3.1.202');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var entry_lib_PoperTipText = __webpack_require__(89316);
 ;// ./src/components/controls/poperTipText/index.ts
@@ -223208,6 +223641,38 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
               });
             }
           }
+          if (paintStatus == entry_lib_DrawTree/* PaintState */.ak.psEdit && hoEditorFactory.emitClickEvent) {
+            const parentNode = node.parentNode;
+            if (parentNode && parentNode instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM && parentNode.canModifyContent) {
+              this.$emit("clickEvents", {
+                id: parentNode.id,
+                name: parentNode.name,
+                dataId: parentNode.dataId,
+                innerIdentifier: parentNode.innerIdentifier,
+                pageIndex: pageIndex,
+                x: hoEditorFactory.drawTree.caret.X,
+                y: hoEditorFactory.drawTree.caret.Y,
+                height: hoEditorFactory.drawTree.caret.height,
+                caretId: "ho_caret",
+                parentName: "edit-container",
+                isInElement: true
+              });
+            } else {
+              this.$emit("clickEvents", {
+                id: '',
+                name: '',
+                dataId: '',
+                innerIdentifier: '',
+                pageIndex: pageIndex,
+                x: hoEditorFactory.drawTree.caret.X,
+                y: hoEditorFactory.drawTree.caret.Y,
+                height: hoEditorFactory.drawTree.caret.height,
+                caretId: "ho_caret",
+                parentName: "edit-container",
+                isInElement: false
+              });
+            }
+          }
         } else if (e.clickType === 'rightClick') {
           // this.mouseRightClickEvent(node)
         }
@@ -223820,10 +224285,10 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
 
 /* harmony default export */ var entry_lib_components_HoDocvue_type_script_lang_js = (entry_lib_HoDocvue_type_script_lang_js);
 
-;// ./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/HoDoc.vue?vue&type=style&index=0&id=526129d2&prod&lang=less
+;// ./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/HoDoc.vue?vue&type=style&index=0&id=52882d22&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/HoDoc.vue?vue&type=style&index=0&id=526129d2&prod&lang=less
+;// ./src/components/HoDoc.vue?vue&type=style&index=0&id=52882d22&prod&lang=less
 
 ;// ./src/components/HoDoc.vue
 
@@ -223836,8 +224301,8 @@ const entry_lib_defaultHeight = Math.floor(1122 * entry_lib_scaleXY) % 2 === 1 ?
 
 var entry_lib_HoDoc_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_components_HoDocvue_type_script_lang_js,
-  entry_lib_HoDocvue_type_template_id_526129d2_render,
-  entry_lib_HoDocvue_type_template_id_526129d2_staticRenderFns,
+  entry_lib_HoDocvue_type_template_id_52882d22_render,
+  entry_lib_HoDocvue_type_template_id_52882d22_staticRenderFns,
   false,
   null,
   null,
@@ -226152,9 +226617,17 @@ class entry_lib_HTMLconverter2 {
   }
   TransHTMLSPAN(jnode, style) {
     const styleobj = this.mergestyle(entry_lib_jquery_default()(jnode).attr('style') || '', style);
+    let combination = entry_lib_jquery_default()(jnode).attr('combination');
+    let ctext = entry_lib_jquery_default()(jnode).attr('ctext');
     if (jnode.childNodes.length == 0) {
       const node = this.generateTextNode(entry_lib_jquery_default()(jnode).text(), styleobj);
-      if (node) return [node];else return [];
+      if (combination && ctext && node) {
+        node.combination = combination.replace(/ /g, '').split(",");
+        node.text = ctext;
+        return [node];
+      } else {
+        return [];
+      }
     } else {
       const tmp = new Array();
       for (let i = 0; i < jnode.childNodes.length; i++) {
@@ -226273,7 +226746,15 @@ class entry_lib_HTMLconverter2 {
         return tmp;
       }
       const node = this.generateTextNode(entry_lib_jquery_default()(jnode).text(), styleobj);
-      if (node) return [node];else return [];
+      let combination = jnode.parentNode ? entry_lib_jquery_default()(jnode.parentNode).attr('combination') : "";
+      let ctext = jnode.parentNode ? entry_lib_jquery_default()(jnode.parentNode).attr('ctext') : "";
+      if (combination && ctext && node) {
+        node.combination = combination.replace(/ /g, '').split(",");
+        node.text = ctext;
+        return [node];
+      } else {
+        return [];
+      }
     } else {
       const tmp = new Array();
       for (let i = 0; i < jnode.childNodes.length; i++) {
@@ -227576,29 +228057,33 @@ class entry_lib_StructureConvert {
       if (entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID).fixTableInTextInput) {
         // 处理正文
         const mainNodes = root.main.node;
-        mainNodes.forEach((node, key) => {
-          let arr = [];
-          if (node.nodeType == "ntField") {
-            // 文本域
-            const childNode = node.childNodes.node;
-            const index = childNode.findIndex(item => item.nodeType == "ntTable");
-            if (childNode[1] && childNode[1].nodeType == "ntParagraph" && index > 0) {
-              arr = childNode.slice(1, childNode.length - 1);
-              let empty = {
-                "nodeType": "ntMark",
-                "type": "1",
-                "text": node.name,
-                "styleIndex": childNode[0].styleIndex
-              };
-              node.text = "";
-              node.childNodes.node = [childNode[0], empty, childNode[childNode.length - 1]];
+        if (Array.isArray(mainNodes)) {
+          mainNodes.forEach((node, key) => {
+            let arr = [];
+            if (node.nodeType == "ntField") {
+              // 文本域
+              const childNode = node.childNodes.node;
+              const index = childNode.findIndex(item => item.nodeType == "ntTable");
+              if (childNode[1] && childNode[1].nodeType == "ntParagraph" && index > 0) {
+                arr = childNode.slice(1, childNode.length - 1);
+                let empty = {
+                  "nodeType": "ntMark",
+                  "type": "1",
+                  "text": node.name,
+                  "styleIndex": childNode[0].styleIndex
+                };
+                node.text = "";
+                node.childNodes.node = [childNode[0], empty, childNode[childNode.length - 1]];
+              }
             }
-          }
-          newMainNodes.push(node);
-          if (arr.length > 0) {
-            newMainNodes.push(...arr);
-          }
-        });
+            newMainNodes.push(node);
+            if (arr.length > 0) {
+              newMainNodes.push(...arr);
+            }
+          });
+        } else {
+          newMainNodes = root.main.node;
+        }
       } else {
         newMainNodes = root.main.node;
       }
@@ -228746,14 +229231,25 @@ class entry_lib_StructureConvert {
       const formularNodes = hoEditorFactory.drawTree.formularNodes;
       const tableArr = [];
       formularNodes.forEach((value, key) => {
-        if (value.formularType === entry_lib_TableFormula/* FormularType */.D.ftSum || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftFormular || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftBMI || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftLaborProcess || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftExpectedBirthDate || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftPregnantWeeks || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftScoreMapping || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftBodySurfaceArea || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftCalcDays || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftCalcTime || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftIdealWeight || value.formularType === entry_lib_TableFormula/* FormularType */.D.ftISS) {
-          value.updateResult();
-          value.getParentCell().drawCell.needUpdate = true;
-          const table = value.getParentCell().table;
-          if (!tableArr.includes(table)) {
-            tableArr.push(table);
-          }
+        // if (value.formularType === FormularType.ftSum
+        //   || value.formularType === FormularType.ftFormular
+        //   || value.formularType === FormularType.ftBMI
+        //   || value.formularType === FormularType.ftLaborProcess
+        //   || value.formularType === FormularType.ftExpectedBirthDate
+        //   || value.formularType === FormularType.ftPregnantWeeks
+        //   || value.formularType === FormularType.ftScoreMapping
+        //   || value.formularType === FormularType.ftBodySurfaceArea
+        //   || value.formularType === FormularType.ftCalcDays
+        //   || value.formularType === FormularType.ftCalcTime
+        //   || value.formularType === FormularType.ftIdealWeight
+        //   || value.formularType === FormularType.ftISS) {
+        value.updateResult();
+        value.getParentCell().drawCell.needUpdate = true;
+        const table = value.getParentCell().table;
+        if (!tableArr.includes(table)) {
+          tableArr.push(table);
         }
+        // }
       });
       for (let t = tableArr.length - 1; t >= 0; t--) {
         tableArr[t].update();
@@ -229147,6 +229643,10 @@ class entry_lib_TestDataSet {
 
 
 
+
+
+
+
 class entry_lib_TOHTMLConverter {
   constructor(hoEditorFactoryID) {
     (0,entry_lib_esm_defineProperty/* default */.A)(this, "convert", void 0);
@@ -229268,8 +229768,17 @@ class entry_lib_TOHTMLConverter {
   TransText(jnode) {
     const style = this.getNodesStyle(jnode);
     let str = "";
+    let combination = "";
+    let ctext = "";
     if (jnode.nodeType == entry_lib_BaseNode/* NodeType */.Z6[entry_lib_BaseNode/* NodeType */.Z6.ntText]) {
       str += jnode.text;
+      if (jnode.combination) {
+        combination = jnode.combination;
+        ctext = jnode.text;
+        combination.replace(/ /g, "").split(",").forEach(item => {
+          str += item;
+        });
+      }
     } else if (jnode.nodeType == entry_lib_BaseNode/* NodeType */.Z6[entry_lib_BaseNode/* NodeType */.Z6.ntLabel]) {
       str += jnode.text;
     } else if (jnode.nodeType == entry_lib_BaseNode/* NodeType */.Z6[entry_lib_BaseNode/* NodeType */.Z6.ntTextBorder]) {
@@ -229288,7 +229797,7 @@ class entry_lib_TOHTMLConverter {
         return this.TransImg(jnode);
       }
     }
-    return `<span style="${style}">${str}</span>`;
+    return `<span style="${style}" combination="${combination}" ctext="${ctext}">${str}</span>`;
   }
   TransField(jnode) {
     const item = this.iterator.next();
@@ -233698,14 +234207,49 @@ class entry_lib_VueController {
    * 插入表格计算公式
    * @param formulaStr 公式
    */
-  insertTableFormula(formulaStr, isHideZero, formulaType) {
+  insertTableFormula(formulaStr, isHideZero, formulaType, formulaProperty) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     const _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
     const startPath = _curDomRange.normalize().startPath;
     const endPath = _curDomRange.normalize().endPath;
     const changingEvent = new entry_lib_NodeChangingEvent/* NodeChangingEvent */.k(entry_lib_DocTree/* DocAction */.LC.daInsert, startPath, endPath, entry_lib_NodeChangingEvent/* OperType */.j.insertTableFormula);
     if (hoEditorFactory.docTree.changing(changingEvent)) {
-      hoEditorFactory.docController.insertTableFormula(_curDomRange, formulaStr, isHideZero, formulaType);
+      hoEditorFactory.docController.insertTableFormula(_curDomRange, formulaStr, isHideZero, formulaType, formulaProperty);
+    }
+  }
+  /**
+   * 锁定单元格不允许编辑
+   */
+  lockCell(curve) {
+    var _hoEditorFactory$docT;
+    const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this.hoEditorFactoryID);
+    const endPos = hoEditorFactory.drawTree.selectRange.spEnd;
+    let endNode = (_hoEditorFactory$docT = hoEditorFactory.docTree.findNodePositionByPath(endPos.path)) === null || _hoEditorFactory$docT === void 0 ? void 0 : _hoEditorFactory$docT.node;
+    if (endNode) {
+      const cellNode = this.getParentCellNode(endNode);
+      if (cellNode) {
+        this.setCellLock(cellNode.table, curve.codeX.split(':'), curve.lockX);
+      }
+      // if(cellNode && curve.lockY) {
+      //     this.setCellLock(cellNode.table, curve.codeX.split(':'))
+      // }
+    }
+  }
+  setCellLock(table, arr, lock) {
+    const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this.hoEditorFactoryID);
+    const [startRow, startCol] = hoEditorFactory.unitConvert.getRowColByCellAdress(arr[0]);
+    const [endRow, endCol] = hoEditorFactory.unitConvert.getRowColByCellAdress(arr[1]);
+    if (startRow >= 0 && startCol >= 0 && endRow >= 0 && endCol >= 0) {
+      if (startRow === endRow || startCol === endCol) {
+        for (let r = startRow; r <= endRow; r++) {
+          for (let c = startCol; c <= endCol; c++) {
+            const cell = table.rows[r][c];
+            if (cell) {
+              cell.cellProperty.notAllowEdit = lock;
+            }
+          }
+        }
+      }
     }
   }
   /**
@@ -234659,20 +235203,17 @@ class entry_lib_VueController {
         iteratesNodes(headerDocTree[h].subDocNodes);
         if (node) break;
       }
-    }
-    if (scope === 'main') {
+    } else if (scope === 'main') {
       const mainNodes = hoEditorFactory.docTree.mainNodes;
       iteratesNodes(mainNodes);
-    }
-    if (scope === 'footer') {
+    } else if (scope === 'footer') {
       const footerDocTree = hoEditorFactory.subDocManger.footerDocTree;
       for (let f = 0; f < footerDocTree.length; f++) {
         if (!footerDocTree[f]) continue;
         iteratesNodes(footerDocTree[f].subDocNodes);
         if (node) break;
       }
-    }
-    if (scope === 'all') {
+    } else if (scope === 'all') {
       const headerDocTree = hoEditorFactory.subDocManger.headerDocTree;
       for (let h = 0; h < headerDocTree.length; h++) {
         if (!headerDocTree[h]) continue;
@@ -235726,7 +236267,7 @@ class entry_lib_VueController {
       }
       updateNodesStyle(xmlobj.main, fontStyleMap, paraStyleMap);
       const ilen = mergeObject.main.length;
-      //(mergeObject as any).main.push(...xmlobj.main);
+      //mergeObject.main.push(...xmlobj.main);
       mergeObject.pageSettingsTree = [];
       if (list[i][0]) {
         updateNodesStyle(xmlobj.header[0].subDocNodes, fontStyleMap, paraStyleMap);
@@ -236014,6 +236555,17 @@ class entry_lib_VueController {
     hoEditorFactory.structureNode.Copy(currDom, null, undefined, "copy");
     return hoEditorFactory.structureNode.textdata;
   }
+  deleteFormula(formula) {
+    if (formula) {
+      const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
+      const preNode = formula.previousLeaf();
+      let sPath = hoEditorFactory.docTree.getNodeLastPath(preNode);
+      let ePath = hoEditorFactory.docTree.getNodeLastPath(formula);
+      hoEditorFactory.undoService.begin();
+      hoEditorFactory.undoService.add(new entry_lib_NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.p(this._hoEditorFactoryID, sPath, ePath, true));
+      hoEditorFactory.undoService.commit();
+    }
+  }
   deleteNode(node) {
     const hoEditorFactory = entry_lib_HOEditorFactorys/* HOEditorFactorys */.O.instance().getFactory(this._hoEditorFactoryID);
     if (!node) return;
@@ -236451,7 +237003,15 @@ class entry_lib_VueController {
         if (node.hidden || node !== null && node !== void 0 && (_node$customProperty2 = node.customProperty) !== null && _node$customProperty2 !== void 0 && _node$customProperty2.hidden) {
           // console.log(node.text, '111');
         } else if (node instanceof entry_lib_TextNode/* TextNode */.E) {
-          docText += node.text;
+          if (node.combination) {
+            let text = node.text;
+            node.combination.forEach(cText => {
+              text = text + cText;
+            });
+            docText += text;
+          } else {
+            docText += node.text;
+          }
         } else if (node instanceof entry_lib_ControlNode/* ControlNode */.g && !(node instanceof entry_lib_PageNumNode/* PageNumNode */.O) && !(node instanceof entry_lib_PageCountNode/* PageCountNode */.d)) {
           docText += node.text;
         } else if (node instanceof entry_lib_BaseCombineNode/* BaseCombineNode */.h) {
@@ -236847,16 +237407,11 @@ class entry_lib_VueController {
             // if (node.readType === 1) {
             if (node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM) {
               await node.setFieldText(text);
-            }
-            if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y) {
+            } else if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y) {
               await node.setDateTimeText(text);
-            }
-            if (node instanceof entry_lib_DownListNode/* DownListNode */.dS) {
+            } else if (node instanceof entry_lib_DownListNode/* DownListNode */.dS) {
               await node.setDownListText(text);
             }
-            // } else {
-            // 	throw new Error("根据元素name:" + name + "定位到的元素非可回填元素");
-            // }
           } else {
             throw new Error('根据元素name:' + name + '定位到的元素非可回填元素');
           }
@@ -236868,6 +237423,18 @@ class entry_lib_VueController {
       throw new Error('根据元素name:' + name + '未找到对应的元素');
     }
   }
+  async updateTextByDataId(dataId, text) {
+    const node = this.getNodeByDataID('main', dataId);
+    if (node) {
+      if (node instanceof entry_lib_TextInputFieldNode/* TextInputFieldNode */.IM) {
+        node.setFieldText(text);
+      } else if (node instanceof entry_lib_DateTimeNode/* DateTimeNode */.Y) {
+        node.setDateTimeText(text);
+      } else if (node instanceof entry_lib_DownListNode/* DownListNode */.dS) {
+        node.setDownListText(text);
+      }
+    }
+  }
   //元素替换
   async updateElementTextById(id, text) {
     const nodes = this.getNodeByID('all', id, 'array');
@@ -239491,7 +240058,7 @@ class entry_lib_VueController {
         }
       }
       if (nodes.length > 0) {
-        hoEditorFactory.docController.parseNodeData(nodes, true);
+        hoEditorFactory.docController.parseNodeData(nodes);
       }
     }
   }
@@ -241324,7 +241891,10 @@ class entry_lib_EditController {
       entry_lib_message/* default */.A.destroy();
       const pNode = hoEditorFactory.docTree.getFinalParentNode(curDomRange.startPath);
       if (pNode && pNode instanceof entry_lib_CellNode/* CellNode */.H) {
-        if (pNode.table.tableProperty.isSignLock) {
+        if (pNode.cellProperty.notAllowEdit) {
+          entry_lib_message/* default */.A.error("当前单元格已设置不允许编辑！");
+          return false;
+        } else if (pNode.table.tableProperty.isSignLock) {
           // 	message.error("表格已完成签名，不允许修改编辑。")
           // 	return false;
           // } else {
@@ -250546,7 +251116,7 @@ var entry_lib_DocController = __webpack_require__(5011);
 
 
 class entry_lib_HOEditorFactory {
-  // 修复新增页在文本域中插入的表格问题
+  // 点击元素是否触发click事件
   /**
    * Getter hoLocalStorage
    * @return {HoLocalStorage}
@@ -250791,6 +251361,8 @@ class entry_lib_HOEditorFactory {
     (0,entry_lib_esm_defineProperty/* default */.A)(this, "useFixTableMerge", false);
     // 启用表格合并单元格问题修复功能
     (0,entry_lib_esm_defineProperty/* default */.A)(this, "fixTableInTextInput", false);
+    // 修复新增页在文本域中插入的表格问题
+    (0,entry_lib_esm_defineProperty/* default */.A)(this, "emitClickEvent", false);
     this._hoEditorFactoryId = id;
   }
   get defaultLineHeight() {
@@ -251532,7 +252104,23 @@ const entry_lib_formularType = {
   8: 'ftCalcDays',
   9: 'ftCalcTime',
   10: 'idealWeight',
-  11: 'iss' //损伤严重程度评分
+  11: 'iss',
+  12: 'curveChart' //曲线图
+};
+const entry_lib_formularName = {
+  sum: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.300",null,"表格行列求和公式"),
+  formula: '四则运算公式',
+  bmi: 'BMI计算公式',
+  labor: '产程公式',
+  expectedDate: '预产期公式',
+  pregnantWeeks: '孕周公式',
+  ftScoreMapping: '分值映射公式',
+  bodySurfaceArea: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.264",null,"体表面积公式"),
+  ftCalcDays: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.263",null,"计算住院天数公式"),
+  ftCalcTime: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.260",null,"时间计算公式"),
+  idealWeight: '理想体重公式',
+  iss: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257",null,"损伤严重程度评分(ISS)"),
+  curveChart: '曲线图'
 };
 const entry_lib_getFormula = tableFormular => {
   // 获取公式类型
@@ -252216,6 +252804,9 @@ var entry_lib_commondata = __webpack_require__(92611);
     leftclick(node) {
       this.$emit('leftClickEvent', node);
     },
+    clickEvents(node) {
+      this.$emit("clickEvents", node);
+    },
     openXmlList(xmlList) {
       if (xmlList.length > 1) {
         // this.hoEditorFactoryIdList = [];
@@ -252623,10 +253214,10 @@ var entry_lib_commondata = __webpack_require__(92611);
 
 /* harmony default export */ var entry_lib_components_HoDocsvue_type_script_lang_js = (entry_lib_HoDocsvue_type_script_lang_js);
 
-;// ./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=12e6aefd&prod&lang=less&media=print
+;// ./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=de9e9654&prod&lang=less&media=print
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/HoDocs.vue?vue&type=style&index=0&id=12e6aefd&prod&lang=less&media=print
+;// ./src/components/HoDocs.vue?vue&type=style&index=0&id=de9e9654&prod&lang=less&media=print
 
 ;// ./src/components/HoDocs.vue
 
@@ -252649,9 +253240,9 @@ var entry_lib_HoDocs_component = (0,entry_lib_componentNormalizer/* default */.A
 )
 
 /* harmony default export */ var entry_lib_HoDocs = (entry_lib_HoDocs_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=7ff8d3aa
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=template&id=0caaf4d5
 
-var entry_lib_ToolBarvue_type_template_id_7ff8d3aa_render = function render() {
+var entry_lib_ToolBarvue_type_template_id_0caaf4d5_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -252701,8 +253292,10 @@ var entry_lib_ToolBarvue_type_template_id_7ff8d3aa_render = function render() {
   }, [_c('a-menu-item', {
     key: "xml"
   }, [_vm._v("XML")]), _c('a-menu-item', {
-    key: "html"
-  }, [_vm._v("HTML")]), _c('a-menu-item', {
+    key: "html(svg)"
+  }, [_vm._v("HTML(svg)")]), _c('a-menu-item', {
+    key: "html(html)"
+  }, [_vm._v("HTML(txt)")]), _c('a-menu-item', {
     key: "pdf"
   }, [_vm._v("PDF")]), _c('a-menu-item', {
     key: "plain"
@@ -252882,9 +253475,9 @@ var entry_lib_ToolBarvue_type_template_id_7ff8d3aa_render = function render() {
     }, [_vm._v(_vm._s(item.key ? ['', /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.1", null, "浏览模式"), /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.5", null, "编辑模式"), /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.4", null, "插入"), /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.3", null, "表格"), /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.2", null, "审阅模式")][item.key] : item.title))]);
   }), 1)], 1) : _vm._e()], 1);
 };
-var entry_lib_ToolBarvue_type_template_id_7ff8d3aa_staticRenderFns = [];
+var entry_lib_ToolBarvue_type_template_id_0caaf4d5_staticRenderFns = [];
 
-;// ./src/components/toolbar/ToolBar.vue?vue&type=template&id=7ff8d3aa
+;// ./src/components/toolbar/ToolBar.vue?vue&type=template&id=0caaf4d5
 
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=079ade04
 
@@ -256284,9 +256877,9 @@ var entry_lib_ToolTablevue_type_template_id_5f320070_staticRenderFns = [];
 
 ;// ./src/components/toolbar/insert/ToolTable.vue?vue&type=template&id=5f320070
 
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=18b19744
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=31a8ae0c
 
-var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_render = function render() {
+var entry_lib_HoTableFeaturesvue_type_template_id_31a8ae0c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -256339,7 +256932,9 @@ var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_render = function ren
     key: "idealWeight"
   }, [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.259", null, "理想体重"))]), _c('a-menu-item', {
     key: "iss"
-  }, [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257", null, "损伤严重程度评分(ISS)"))])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
+  }, [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257", null, "损伤严重程度评分(ISS)"))]), _c('a-menu-item', {
+    key: "curveChart"
+  }, [_vm._v("曲线图")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
     directives: [{
       name: "debounce",
       rawName: "v-debounce:1000.click",
@@ -256497,9 +257092,9 @@ var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_render = function ren
     staticClass: "ho-emr-tool-item"
   }, [_c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.319", null, "取消合并单元格"))])]) : _vm._e()]);
 };
-var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_staticRenderFns = [];
+var entry_lib_HoTableFeaturesvue_type_template_id_31a8ae0c_staticRenderFns = [];
 
-;// ./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=18b19744
+;// ./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=template&id=31a8ae0c
 
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[19].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=script&lang=js
 
@@ -256520,6 +257115,7 @@ var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_staticRenderFns = [];
 
 
 
+
 /* harmony default export */ var entry_lib_HoTableFeaturesvue_type_script_lang_js = ({
   name: 'HoTableFeatures',
   props: {
@@ -256675,14 +257271,14 @@ var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_staticRenderFns = [];
         ftCalcDays: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.263", null, "计算住院天数公式"),
         ftCalcTime: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.260", null, "时间计算公式"),
         idealWeight: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.259", null, "理想体重"),
-        iss: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257", null, "损伤严重程度评分(ISS)")
+        iss: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257", null, "损伤严重程度评分(ISS)"),
+        curveChart: '曲线图'
       };
-      if (formula[formulaType] === 'code') {
-        this.setCellCode();
+      if (entry_lib_formularName[formulaType]) {
+        this.$emit('setModalStatus', ['table-formula', 'add', [entry_lib_formularName[formulaType], formulaType]]);
       } else {
-        this.$emit('setModalStatus', ['table-formula', 'add', [formula[formulaType], formulaType]]);
+        this.setCellCode();
       }
-
       // this.dialogFormVisible = true;
       // this.dialogFormTitle = params[0];
       // this.formula = params[1];
@@ -256750,8 +257346,8 @@ var entry_lib_HoTableFeaturesvue_type_template_id_18b19744_staticRenderFns = [];
 ;
 var entry_lib_HoTableFeatures_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_insert_HoTableFeaturesvue_type_script_lang_js,
-  entry_lib_HoTableFeaturesvue_type_template_id_18b19744_render,
-  entry_lib_HoTableFeaturesvue_type_template_id_18b19744_staticRenderFns,
+  entry_lib_HoTableFeaturesvue_type_template_id_31a8ae0c_render,
+  entry_lib_HoTableFeaturesvue_type_template_id_31a8ae0c_staticRenderFns,
   false,
   null,
   null,
@@ -257596,13 +258192,15 @@ var entry_lib_ToolTable_component = (0,entry_lib_componentNormalizer/* default *
       const fileName = this.vueController.getDocTitle() ? this.vueController.getDocTitle() : '电子病历文档';
       if (fileType == 'pdf') {
         this.vueController.saveAsPDF('', 'pdf', false);
+      } else if (fileType == 'html(svg)') {
+        this.vueController.saveAsPDF('', 'html', false);
+      } else if (fileType == 'html(html)') {
+        let fileName = this.vueController.getDocTitle();
+        const file = this.vueController.getFileHtml();
+        this.downloadFile(file, fileName + '.html', 'html');
       } else {
-        if (fileType !== 'html') {
-          const file = this.vueController.saveAsFile(fileType, true);
-          this.downloadFile(file, fileName, fileType);
-        } else {
-          this.vueController.saveAsPDF('', 'html', false);
-        }
+        const file = this.vueController.saveAsFile(fileType, true);
+        this.downloadFile(file, fileName, fileType);
       }
     },
     /**
@@ -257635,10 +258233,10 @@ var entry_lib_ToolTable_component = (0,entry_lib_componentNormalizer/* default *
 
 /* harmony default export */ var entry_lib_toolbar_ToolBarvue_type_script_lang_js = (entry_lib_ToolBarvue_type_script_lang_js);
 
-;// ./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/toolbar/ToolBar.vue?vue&type=style&index=0&id=7ff8d3aa&prod&lang=less
+;// ./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/toolbar/ToolBar.vue?vue&type=style&index=0&id=0caaf4d5&prod&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=7ff8d3aa&prod&lang=less
+;// ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=0caaf4d5&prod&lang=less
 
 ;// ./src/components/toolbar/ToolBar.vue
 
@@ -257651,8 +258249,8 @@ var entry_lib_ToolTable_component = (0,entry_lib_componentNormalizer/* default *
 
 var entry_lib_ToolBar_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_toolbar_ToolBarvue_type_script_lang_js,
-  entry_lib_ToolBarvue_type_template_id_7ff8d3aa_render,
-  entry_lib_ToolBarvue_type_template_id_7ff8d3aa_staticRenderFns,
+  entry_lib_ToolBarvue_type_template_id_0caaf4d5_render,
+  entry_lib_ToolBarvue_type_template_id_0caaf4d5_staticRenderFns,
   false,
   null,
   null,
@@ -258481,10 +259079,10 @@ var entry_lib_HoToolBar_component = (0,entry_lib_componentNormalizer/* default *
 )
 
 /* harmony default export */ var entry_lib_HoToolBar = (entry_lib_HoToolBar_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=0a3b51f0
+;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=c072f7c2
 
-var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render() {
-  var _vm$hoEditorProvider$, _vm$hoEditorProvider$2, _vm$hoEditorProvider$3, _vm$hoEditorProvider$4, _vm$hoEditorProvider$5, _vm$hoEditorProvider$6, _vm$hoEditorProvider$7, _vm$hoEditorProvider$8, _vm$hoEditorProvider$10, _vm$hoEditorProvider$11, _vm$hoEditorProvider$12, _vm$hoEditorProvider$13, _vm$hoEditorProvider$14, _vm$hoEditorProvider$15, _vm$hoEditorProvider$16, _vm$hoEditorProvider$17, _vm$hoEditorProvider$18, _vm$hoEditorProvider$19, _vm$hoEditorProvider$20, _vm$hoEditorProvider$21, _vm$hoEditorProvider$22, _vm$hoEditorProvider$23, _vm$hoEditorProvider$24, _vm$hoEditorProvider$25, _vm$hoEditorProvider$26;
+var entry_lib_HoRightMenuvue_type_template_id_c072f7c2_render = function render() {
+  var _vm$hoEditorProvider$, _vm$hoEditorProvider$2, _vm$hoEditorProvider$3, _vm$hoEditorProvider$4, _vm$hoEditorProvider$5, _vm$hoEditorProvider$6, _vm$hoEditorProvider$7, _vm$hoEditorProvider$8, _vm$hoEditorProvider$10, _vm$hoEditorProvider$11, _vm$hoEditorProvider$12, _vm$hoEditorProvider$13, _vm$hoEditorProvider$14, _vm$hoEditorProvider$15, _vm$hoEditorProvider$16, _vm$hoEditorProvider$17, _vm$hoEditorProvider$18, _vm$hoEditorProvider$19, _vm$hoEditorProvider$20, _vm$hoEditorProvider$21, _vm$hoEditorProvider$22, _vm$hoEditorProvider$23, _vm$hoEditorProvider$24, _vm$hoEditorProvider$25, _vm$hoEditorProvider$26, _vm$hoEditorProvider$27;
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -258708,7 +259306,18 @@ var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render(
         return _vm.toUpdateNodes('table-formula');
       }
     }
-  }, [_vm._v(" " + _vm._s(_vm.formularType[_vm.hoEditorProvider.rightNode.tableFormulaType]) + " ")]) : _vm._e()]) : _vm._e(), ((_vm$hoEditorProvider$21 = _vm.hoEditorProvider.rightNode) === null || _vm$hoEditorProvider$21 === void 0 ? void 0 : _vm$hoEditorProvider$21.paintStatus) != 5 && (_vm$hoEditorProvider$22 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$22 !== void 0 && _vm$hoEditorProvider$22.rightTypeIsTable && this.defaultTable ? _c('ul', {
+  }, [_vm._v(" " + _vm._s(_vm.formularType[_vm.hoEditorProvider.rightNode.tableFormulaType]) + " ")]) : _vm._e()]) : _vm._e(), ((_vm$hoEditorProvider$21 = _vm.hoEditorProvider.rightNode) === null || _vm$hoEditorProvider$21 === void 0 ? void 0 : _vm$hoEditorProvider$21.paintStatus) === 1 && _vm.hoEditorProvider.rightNode.tableFormulaType ? _c('ul', {
+    staticClass: "mouse-right-menu"
+  }, [_c('li', {
+    staticClass: "mouse-menu-item mouse-right-menu-line"
+  }), _c('li', {
+    staticClass: "mouse-menu-item",
+    on: {
+      "click": function ($event) {
+        return _vm.deleteFormula();
+      }
+    }
+  }, [_c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.139", null, "删除"))]), _vm._v(" "), _c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.321", null, "表格计算公式"))])])]) : _vm._e(), ((_vm$hoEditorProvider$22 = _vm.hoEditorProvider.rightNode) === null || _vm$hoEditorProvider$22 === void 0 ? void 0 : _vm$hoEditorProvider$22.paintStatus) != 5 && (_vm$hoEditorProvider$23 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$23 !== void 0 && _vm$hoEditorProvider$23.rightTypeIsTable && this.defaultTable ? _c('ul', {
     staticClass: "mouse-right-menu"
   }, [_c('li', {
     staticClass: "mouse-menu-item mouse-right-menu-line"
@@ -258770,7 +259379,7 @@ var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render(
     attrs: {
       "type": "delete"
     }
-  }), _c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.9", null, "删除对角线"))])], 1) : _vm._e()]) : _vm._e(), ((_vm$hoEditorProvider$23 = _vm.hoEditorProvider.rightNode) === null || _vm$hoEditorProvider$23 === void 0 ? void 0 : _vm$hoEditorProvider$23.paintStatus) != 5 && (_vm$hoEditorProvider$24 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$24 !== void 0 && _vm$hoEditorProvider$24.rightTypeIsTable && this.defaultTable ? _c('ul', {
+  }), _c('span', [_vm._v(/*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.9", null, "删除对角线"))])], 1) : _vm._e()]) : _vm._e(), ((_vm$hoEditorProvider$24 = _vm.hoEditorProvider.rightNode) === null || _vm$hoEditorProvider$24 === void 0 ? void 0 : _vm$hoEditorProvider$24.paintStatus) != 5 && (_vm$hoEditorProvider$25 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$25 !== void 0 && _vm$hoEditorProvider$25.rightTypeIsTable && this.defaultTable ? _c('ul', {
     staticClass: "mouse-right-menu"
   }, [_c('li', {
     staticClass: "mouse-menu-item mouse-right-menu-line"
@@ -258785,7 +259394,7 @@ var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render(
     on: {
       "closeMenu": _vm.handleClose
     }
-  })], 1) : _vm._e(), (_vm$hoEditorProvider$25 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$25 !== void 0 && _vm$hoEditorProvider$25.canShowComment ? _c('ul', {
+  })], 1) : _vm._e(), (_vm$hoEditorProvider$26 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$26 !== void 0 && _vm$hoEditorProvider$26.canShowComment ? _c('ul', {
     staticClass: "mouse-right-menu"
   }, [_c('li', {
     staticClass: "mouse-menu-item",
@@ -258794,7 +259403,7 @@ var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render(
         return _vm.hideComments();
       }
     }
-  }, [_vm._v(" " + _vm._s((_vm$hoEditorProvider$26 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$26 !== void 0 && _vm$hoEditorProvider$26.isHideComments ? /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.8", null, "显示批注") : /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.7", null, "隐藏批注")) + " ")])]) : _vm._e()], 2) : _vm._e(), _c('ul', {
+  }, [_vm._v(" " + _vm._s((_vm$hoEditorProvider$27 = _vm.hoEditorProvider.rightNode) !== null && _vm$hoEditorProvider$27 !== void 0 && _vm$hoEditorProvider$27.isHideComments ? /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.8", null, "显示批注") : /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.7", null, "隐藏批注")) + " ")])]) : _vm._e()], 2) : _vm._e(), _c('ul', {
     staticClass: "mouse-right-menu"
   }, [_c('li', {
     staticClass: "mouse-menu-item"
@@ -258805,9 +259414,9 @@ var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render = function render(
     }
   }, [_vm._v("v " + _vm._s(_vm.versions))])])])], 2);
 };
-var entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_staticRenderFns = [];
+var entry_lib_HoRightMenuvue_type_template_id_c072f7c2_staticRenderFns = [];
 
-;// ./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=0a3b51f0
+;// ./src/components/toolbar/HoRightMenu.vue?vue&type=template&id=c072f7c2
 
 ;// ./node_modules/babel-loader/lib/index.js??ruleSet[1].rules[3].use[0]!./node_modules/unplugin/dist/webpack/loaders/transform.js?unpluginName=vite-plugin-i18n-helper!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[5]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/TableFeatures.vue?vue&type=template&id=5bcdf497
 
@@ -259366,6 +259975,7 @@ var entry_lib_popper = __webpack_require__(98234);
 
 
 
+
 
 
 /* harmony default export */ var entry_lib_HoRightMenuvue_type_script_lang_js = ({
@@ -259417,20 +260027,7 @@ var entry_lib_popper = __webpack_require__(98234);
       isIncludes: '',
       showTableOnRightMenu: false,
       // 获取全局变量 showTableOnRightMenu
-      formularType: {
-        sum: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.300", null, "表格行列求和公式"),
-        formula: '四则运算公式',
-        bmi: 'BMI计算公式',
-        labor: '产程公式',
-        expectedDate: '预产期公式',
-        pregnantWeeks: '孕周公式',
-        ftScoreMapping: '分值映射公式',
-        bodySurfaceArea: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.264", null, "体表面积公式"),
-        ftCalcDays: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.263", null, "计算住院天数公式"),
-        ftCalcTime: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.260", null, "时间计算公式"),
-        idealWeight: '理想体重公式',
-        iss: /*#__PURE__*/(0,entry_lib_i18n/* i18nHelper */.p)("04-001-009-EMR.3.3.257", null, "损伤严重程度评分(ISS)")
-      },
+      formularType: entry_lib_formularName,
       isPasted: false,
       isWebview: false,
       htmlText: '',
@@ -259668,6 +260265,11 @@ var entry_lib_popper = __webpack_require__(98234);
     clearSelectedRangeParas() {
       this.vueController.clearSelectedRangeParas();
       this.handleClose();
+    },
+    deleteFormula() {
+      const formulaNode = this.hoEditorProvider.rightNode.node();
+      this.vueController.deleteFormula(formulaNode);
+      this.handleClose();
     }
   }
 
@@ -259896,8 +260498,8 @@ var entry_lib_popper = __webpack_require__(98234);
 ;
 var entry_lib_HoRightMenu_component = (0,entry_lib_componentNormalizer/* default */.A)(
   entry_lib_toolbar_HoRightMenuvue_type_script_lang_js,
-  entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_render,
-  entry_lib_HoRightMenuvue_type_template_id_0a3b51f0_staticRenderFns,
+  entry_lib_HoRightMenuvue_type_template_id_c072f7c2_render,
+  entry_lib_HoRightMenuvue_type_template_id_c072f7c2_staticRenderFns,
   false,
   null,
   null,