hoeditor-web 3.1.118 → 3.1.119

package/lib/hoeditor.umd.js

@@ -5952,7 +5952,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 77541:
+/***/ 62250:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5968,7 +5968,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=11c57cc6&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=26962a98&
 
 
 var render = function render() {
@@ -7051,7 +7051,21 @@ var render = function render() {
         "top": "2px"
       }
     })]);
-  }), 0)], 2)], 1)])] : _vm._e()], 2), _c('footer', {
+  }), 0)], 2)], 1)])] : _vm._e(), _vm.expressStyle === 'style11' ? [_c('div', {
+    staticClass: "style11"
+  }, _vm._l(_vm.style11, function (item, key) {
+    return _c('div', {
+      key: key
+    }, [_c('span', [_vm._v(_vm._s(key))]), _c('a-input', {
+      model: {
+        value: _vm.style11[key],
+        callback: function callback($$v) {
+          _vm.$set(_vm.style11, key, $$v);
+        },
+        expression: "style11[key]"
+      }
+    })], 1);
+  }), 0)] : _vm._e()], 2), _c('footer', {
     staticClass: "dialog-footer"
   }, [_c('a-button', {
     staticStyle: {
@@ -7161,7 +7175,7 @@ var staticRenderFns = [function () {
   }, [_vm._v("49")])]);
 }];
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=11c57cc6&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=26962a98&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -7193,11 +7207,6 @@ var es_array_concat = __webpack_require__(92222);
 var util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/date-picker/locale/zh_CN.js + 2 modules
 var zh_CN = __webpack_require__(43372);
-// EXTERNAL MODULE: ./node_modules/moment/moment.js
-var moment = __webpack_require__(30381);
-var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
-// EXTERNAL MODULE: ./node_modules/moment/locale/zh-cn.js
-var zh_cn = __webpack_require__(83839);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
 
 
@@ -7216,13 +7225,10 @@ var zh_cn = __webpack_require__(83839);
 
 
 
-
-
 /* harmony default export */ var ExpressionFormvue_type_script_lang_js_ = ({
   name: 'ExpressionForm',
   data: function data() {
     return {
-      moment: (moment_default()),
       locale: zh_CN/* default */.Z,
       animationClassNames: 'control-modal-contents express-dialog animation-in',
       isUseDate: false,
@@ -7238,7 +7244,8 @@ var zh_cn = __webpack_require__(83839);
         style7: '胎心图',
         style8: '恒牙牙位图',
         style9: '乳牙牙位图',
-        style10: '牙位图'
+        style10: '牙位图',
+        style11: 'Pop-Q评分'
       },
       menstrualHistory: {
         menseDays: '',
@@ -7307,6 +7314,17 @@ var zh_cn = __webpack_require__(83839);
         D: '4',
         E: '5'
       },
+      style11: {
+        Aa: '',
+        Ba: '',
+        C: '',
+        gh: '',
+        pb: '',
+        TVL: '',
+        Ap: '',
+        Bp: '',
+        D: ''
+      },
       menoPauseAgeText: '岁'
     };
   },
@@ -7405,6 +7423,8 @@ var zh_cn = __webpack_require__(83839);
         this.style89.topRight = _ref2[1];
         this.style89.bottomLeft = _ref2[2];
         this.style89.bottomRight = _ref2[3];
+      } else if (this.expressStyle == 'style11') {
+        this.style11 = (0,objectSpread2/* default */.Z)({}, updateNode);
       }
     }
   },
@@ -7589,7 +7609,11 @@ var zh_cn = __webpack_require__(83839);
       } else if (this.expressStyle === 'style9') {
         this.reverseOrSort('sort');
         this.insertPrimaryTeethMap(this.controlStatus, [this.style89.topLeft, this.style89.topRight, this.style89.bottomLeft, this.style89.bottomRight]);
-      } else {}
+      } else if (this.expressStyle === 'style11') {
+        this.insertPopQScore(this.controlStatus);
+      } else {
+        console.warn('错误样式', this.expressStyle);
+      }
       this.cancel();
     },
     /**
@@ -7700,15 +7724,25 @@ var zh_cn = __webpack_require__(83839);
       } else {
         this.vueController.updatePrimaryTeethMap(topLeft, topRight, bottomLeft, bottomRight);
       }
+    },
+    /**
+     * Pop-Q评分
+     */
+    insertPopQScore: function insertPopQScore(controlStatus) {
+      if (controlStatus === 'add') {
+        this.vueController.insertPopQScore(this.style11);
+      } else {
+        this.vueController.updatePopQScore(this.style11);
+      }
     }
   }
 });
 ;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=script&lang=js&
  /* harmony default export */ var expressionForm_ExpressionFormvue_type_script_lang_js_ = (ExpressionFormvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=11c57cc6&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=26962a98&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=11c57cc6&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=26962a98&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -38683,28 +38717,28 @@ var DocController = /*#__PURE__*/function () {
     value: function insertPopQScore(operType, curDomRange, popQScoreRequest) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       if (operType === 'update') {
-        var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
+        var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
           var node = np.node;
           if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-            //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
-            //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+            //hoEditorFactory.undoService.commit();
+            //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
           }
         }
       }
-      var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
-      var popQScoreNode = new _treeNode_PopQScoreNode__WEBPACK_IMPORTED_MODULE_100__/* .PopQScoreNode */ .B(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.nPopQScore, popQScoreRequest.Aa, popQScoreRequest.Ba, popQScoreRequest.C, popQScoreRequest.gh, popQScoreRequest.pb, popQScoreRequest.TVL, popQScoreRequest.Ap, popQScoreRequest.Bp, popQScoreRequest.D);
-      debugger;
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
+      var popQScoreNode = new _treeNode_PopQScoreNode__WEBPACK_IMPORTED_MODULE_100__/* .PopQScoreNode */ .B(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, popQScoreRequest.Aa, popQScoreRequest.Ba, popQScoreRequest.C, popQScoreRequest.gh, popQScoreRequest.pb, popQScoreRequest.TVL, popQScoreRequest.Ap, popQScoreRequest.Bp, popQScoreRequest.D);
       //插入该表达式节点
       if (operType === 'add') {
-        _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
+        hoEditorFactory.undoService.begin();
       }
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, popQScoreNode));
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, popQScoreNode));
+      hoEditorFactory.undoService.commit();
     }
     /**
      * 瞳孔图
@@ -38721,27 +38755,28 @@ var DocController = /*#__PURE__*/function () {
     value: function insertPupilMap(operType, curDomRange, value1, value2, value3, value4, value5, value6, value7) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       if (operType === 'update') {
-        var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
+        var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
           var node = np.node;
           if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-            //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
-            //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+            //hoEditorFactory.undoService.commit();
+            //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
           }
         }
       }
-      var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
       var pupilMapNode = new _treeNode_PupilMapNode__WEBPACK_IMPORTED_MODULE_47__/* .PupilMapNode */ .v(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, value1, value2, value3, value4, value5, value6, value7);
       //插入该表达式节点
       if (operType === 'add') {
-        _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
+        hoEditorFactory.undoService.begin();
       }
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, pupilMapNode));
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, pupilMapNode));
+      hoEditorFactory.undoService.commit();
     }
     /**
      * 光定位图
@@ -38760,27 +38795,28 @@ var DocController = /*#__PURE__*/function () {
     value: function insertLightLocation(operType, curDomRange, value1, value2, value3, value4, value5, value6, value7, value8, value9) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       if (operType === 'update') {
-        var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
+        var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
           var node = np.node;
           if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-            //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
-            //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+            //hoEditorFactory.undoService.commit();
+            //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
           }
         }
       }
-      var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
       var lightLocationMapNode = new _treeNode_LightLocationMapNode__WEBPACK_IMPORTED_MODULE_48__/* .LightLocationMapNode */ .D(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, value1, value2, value3, value4, value5, value6, value7, value8, value9);
       //插入该表达式节点
       if (operType === 'add') {
-        _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
+        hoEditorFactory.undoService.begin();
       }
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, lightLocationMapNode));
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, lightLocationMapNode));
+      hoEditorFactory.undoService.commit();
     }
     /**
      * 胎心图
@@ -38796,27 +38832,28 @@ var DocController = /*#__PURE__*/function () {
     value: function insertFetalHeartMap(operType, curDomRange, value1, value2, value3, value4, value5, value6) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       if (operType === 'update') {
-        var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
+        var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
           var node = np.node;
           if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-            //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
-            //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+            //hoEditorFactory.undoService.commit();
+            //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
           }
         }
       }
-      var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
       var fetalHeartMapNode = new _treeNode_FetalHeartMapNode__WEBPACK_IMPORTED_MODULE_49__/* .FetalHeartMapNode */ .t(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, value1, value2, value3, value4, value5, value6);
       //插入该表达式节点
       if (operType === 'add') {
-        _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
+        hoEditorFactory.undoService.begin();
       }
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, fetalHeartMapNode));
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, fetalHeartMapNode));
+      hoEditorFactory.undoService.commit();
     }
     /**
      * 恒牙牙位图
@@ -38830,27 +38867,28 @@ var DocController = /*#__PURE__*/function () {
     value: function insertPermanentTeethMap(operType, curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       if (operType === 'update') {
-        var np = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.findNodePositionByPath(startPath);
+        var np = hoEditorFactory.docTree.findNodePositionByPath(startPath);
         if (np) {
           var node = np.node;
           if (node instanceof _treeNode_MedicalExpressionNode__WEBPACK_IMPORTED_MODULE_52__/* .MedicalExpressionNode */ .H) {
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
-            _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
-            //HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
-            //startPath = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.curDomRange.startPath;
+            hoEditorFactory.undoService.begin();
+            hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_44__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
+            //hoEditorFactory.undoService.commit();
+            //startPath = hoEditorFactory.docTree.curDomRange.startPath;
             startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(node.previousLeaf());
           }
         }
       }
-      var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
+      var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
       var permanentTeethMapNode = new _treeNode_PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_50__/* .PermanentTeethMapNode */ .f(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_32__/* .NodeType */ .Jq.ntMedicalExpression, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark);
       //插入该表达式节点
       if (operType === 'add') {
-        _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
+        hoEditorFactory.undoService.begin();
       }
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, permanentTeethMapNode));
-      _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_84__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.commit();
+      hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_33__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, permanentTeethMapNode));
+      hoEditorFactory.undoService.commit();
     }
     /**
      * 乳牙牙位图
@@ -49192,7 +49230,6 @@ var NodeType;
   NodeType[NodeType["ntGestation"] = 16] = "ntGestation";
   NodeType[NodeType["ntRareChar"] = 17] = "ntRareChar";
   NodeType[NodeType["ntJumpButton"] = 18] = "ntJumpButton";
-  NodeType[NodeType["nPopQScore"] = 19] = "nPopQScore";
 })(NodeType || (NodeType = {}));
 var ChildIndexRange = /*#__PURE__*/function () {
   function ChildIndexRange(start, end) {
@@ -56824,10 +56861,9 @@ var PopQScoreNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   }, {
     key: "node2Json",
     value: function node2Json(range, isCopy) {
-      debugger;
       var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_9__/* .NodeType */ .Jq[this.nodeType],
-        expressType: "PopQScoreNode",
+        expressType: "PopQScore",
         Aa: this.aa,
         Ba: this.ba,
         C: this.c,
@@ -56862,7 +56898,6 @@ var PopQScoreNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange(startIndex, endIndex) {
-      debugger;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_11__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var curStyleIndex = hoEditorFactory.docTree.curStyleIndex;
       var cbStyle;
@@ -56888,7 +56923,6 @@ var PopQScoreNode = /*#__PURE__*/function (_MedicalExpressionNod) {
       var arrValues = ['Ap=' + this.ap, 'Bp=' + this.bp, 'D=' + this.d, 'gh=' + this.gh, 'pb=' + this.pb, 'TVL=' + this.tVL, 'Aa=' + this.aa, 'Ba=' + this.ba, 'C=' + this.c];
       var bIsInsert = startIndex < 0;
       var width = 240;
-      debugger;
       var dNode = new _editor_draw_drawNode_DrawMedicalExpression__WEBPACK_IMPORTED_MODULE_10__/* .DrawMedicalExpression */ .T(this._hoEditorFactoryID, this._rootPath, this, 0, "pop-QScore", arrValues, cbStyle, lineHight, width);
       if (bIsInsert) {
         this._drawNodes.splice(0, 0, dNode);
@@ -56913,7 +56947,6 @@ var PopQScoreNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   }, {
     key: "placeDNode2DrawLine",
     value: function placeDNode2DrawLine(droots, paragraphNode, dline, start, endIndex) {
-      debugger;
       var startIndex = start;
       if (startIndex >= 1) {
         return dline;
@@ -56926,8 +56959,7 @@ var PopQScoreNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   }], [{
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
-      debugger;
-      var rtn = new PopQScoreNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_9__/* .NodeType */ .Jq.nPopQScore, json.Aa, json.Ba, json.C, json.gh, json.pb, json.TVL, json.Ap, json.Bp, json.D);
+      var rtn = new PopQScoreNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_9__/* .NodeType */ .Jq.ntMedicalExpression, json.Aa, json.Ba, json.C, json.gh, json.pb, json.TVL, json.Ap, json.Bp, json.D);
       return rtn;
     }
   }]);
@@ -75129,7 +75161,7 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
     value: function drawPopQScore() {
       var cellWidth = this.dWidth / 3;
       var cellHeight = this.dHeight / 3;
-      // 绘制9宫图文本  
+      // 绘制9宫图文本
       for (var i = 0; i < 9; i++) {
         var scoreObj = this._arrValues[i];
         var _scoreObj$split = scoreObj.split('='),
@@ -75141,21 +75173,21 @@ var DrawMedicalExpression = /*#__PURE__*/function (_DrawCombineNode) {
         text.textBaseline = "middle";
         var row = Math.floor(i / 3);
         var col = i % 3;
-        text.x = col * cellWidth + cellWidth / 2; // 居中于格子  
-        text.y = -(row * cellHeight + cellHeight / 2); // 居中于格子  
+        text.x = col * cellWidth + cellWidth / 2; // 居中于格子
+        text.y = -(row * cellHeight + cellHeight / 2); // 居中于格子
         this.addChild(text);
       }
-      // 添加格子线  
+      // 添加格子线
       for (var _i = 0; _i <= 3; _i++) {
-        // 绘制水平线  
+        // 绘制水平线
         var hLine = new createjs.Shape();
         hLine.graphics.beginStroke(this._textStyle.color).moveTo(0, -_i * cellHeight).lineTo(this.dWidth, -_i * cellHeight);
-        hLine.graphics.endStroke(); // 结束线条绘制  
+        hLine.graphics.endStroke(); // 结束线条绘制
         this.addChild(hLine);
-        // 绘制垂直线  
+        // 绘制垂直线
         var vLine = new createjs.Shape();
         vLine.graphics.beginStroke(this._textStyle.color).moveTo(_i * cellWidth, 0).lineTo(_i * cellWidth, -this.dHeight);
-        vLine.graphics.endStroke(); // 结束线条绘制  
+        vLine.graphics.endStroke(); // 结束线条绘制
         this.addChild(vLine);
       }
     }
@@ -169509,7 +169541,7 @@ var map = {
 	"./dataSource/DataSource.vue": 84051,
 	"./dateDialog/DateDialog.vue": 64362,
 	"./delimiter/Delimiter.vue": 93230,
-	"./expressionForm/ExpressionForm.vue": 77541,
+	"./expressionForm/ExpressionForm.vue": 62250,
 	"./findReplace/FindReplace.vue": 98064,
 	"./gestation/Gestation.vue": 20329,
 	"./hoprint/HoPrint.vue": 79228,
@@ -210168,7 +210200,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.118');
+/* harmony default export */ var version = ('3.1.119');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -216084,6 +216116,8 @@ var StructureConvert = /*#__PURE__*/function () {
           return PermanentTeethMapNode/* PermanentTeethMapNode */.f.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
         } else if (temp.expressType == "PrimaryTeethMap") {
           return PrimaryTeethMapNode/* PrimaryTeethMapNode */.x.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
+        } else if (temp.expressType == "PopQScore") {
+          return PopQScoreNode/* PopQScoreNode */.B.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
         }
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntImage) {
         if (temp.imageType == "Image") {
@@ -216129,8 +216163,6 @@ var StructureConvert = /*#__PURE__*/function () {
         return RareCharNode/* RareCharNode */.Q.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       } else if (temp.nodeType == BaseNode/* NodeType */.Jq.ntJumpButton) {
         return JumpButtonNode/* JumpButtonNode */.a.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
-      } else if (temp.nodeType == BaseNode/* NodeType */.Jq.nPopQScore) {
-        return PopQScoreNode/* PopQScoreNode */.B.json2Node(this._hoEditorFactoryID, temp, rootNodes, parentNode);
       }
       return undefined;
     }
@@ -242065,8 +242097,8 @@ var ToolBarvue_type_template_id_2bbec870_render = function render() {
 };
 var ToolBarvue_type_template_id_2bbec870_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=4699ffee&
-var HoMedicalExpressionvue_type_template_id_4699ffee_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=template&id=079ade04&
+var HoMedicalExpressionvue_type_template_id_079ade04_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -242122,457 +242154,37 @@ var HoMedicalExpressionvue_type_template_id_4699ffee_render = function render()
     key: "style1"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("经期史")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg",
-      "viewBox": "0 0 130 60"
-    }
-  }, [_c('g', {
-    staticClass: "text",
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "0",
-      "y": "33"
-    }
-  }, [_vm._v("初潮年龄")]), _c('text', {
-    attrs: {
-      "x": "48",
-      "y": "13"
-    }
-  }, [_vm._v("经期")]), _c('text', {
-    attrs: {
-      "x": "48",
-      "y": "55"
-    }
-  }, [_vm._v("周期")]), _c('text', {
-    attrs: {
-      "x": "75",
-      "y": "33"
-    }
-  }, [_vm._v("末次月经")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 52 30 L 70 30"
-    }
-  })])])])]), _c('a-menu-item', {
-    key: "style2"
-  }, [_c('p', {
-    staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("经期史")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "5",
-      "y": "20"
-    }
-  }, [_vm._v("初潮年龄")]), _c('text', {
-    attrs: {
-      "x": "70",
-      "y": "20"
-    }
-  }, [_vm._v("经期")]), _c('text', {
-    attrs: {
-      "x": "5",
-      "y": "50"
-    }
-  }, [_vm._v("末次月经")]), _c('text', {
-    attrs: {
-      "x": "70",
-      "y": "50"
-    }
-  }, [_vm._v("周期")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 5 30 L 120 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 60 0 L 60 60"
-    }
-  })])])])]), _c('a-menu-item', {
-    key: "style3"
+  }, [_c('span', [_vm._v("月经史")])])]), _c('a-menu-item', {
+    key: "style5"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("经期史")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "0",
-      "y": "33"
-    }
-  }, [_vm._v("初潮年龄")]), _c('text', {
-    attrs: {
-      "x": "50",
-      "y": "13"
-    }
-  }, [_vm._v("经期")]), _c('text', {
-    attrs: {
-      "x": "40",
-      "y": "55"
-    }
-  }, [_vm._v("末次月经")]), _c('text', {
-    attrs: {
-      "x": "83",
-      "y": "33"
-    }
-  }, [_vm._v("周期")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 15 5 L 110 55"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 15 55 L 110 5"
-    }
-  })])])])]), _c('a-menu-item', {
-    key: "style4"
+  }, [_c('span', [_vm._v("瞳孔图")])])]), _c('a-menu-item', {
+    key: "style6"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("经期史")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "0",
-      "y": "33"
-    }
-  }, [_vm._v("初潮年龄")]), _c('text', {
-    attrs: {
-      "x": "70",
-      "y": "20"
-    }
-  }, [_vm._v("经期")]), _c('text', {
-    attrs: {
-      "x": "70",
-      "y": "50"
-    }
-  }, [_vm._v("周期")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 62 30 L 110 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 45 45 L 55 15"
-    }
-  })])])])]), _c('a-menu-item', {
-    key: "style5"
+  }, [_c('span', [_vm._v("光定位图")])])]), _c('a-menu-item', {
+    key: "style7"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("瞳孔图")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "10",
-      "y": "25"
-    }
-  }, [_vm._v("1")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "25"
-    }
-  }, [_vm._v("2")]), _c('text', {
-    attrs: {
-      "x": "10",
-      "y": "40"
-    }
-  }, [_vm._v("3")]), _c('text', {
-    attrs: {
-      "x": "45",
-      "y": "40"
-    }
-  }, [_vm._v("4")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "40"
-    }
-  }, [_vm._v("5")]), _c('text', {
-    attrs: {
-      "x": "10",
-      "y": "55"
-    }
-  }, [_vm._v("6")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "55"
-    }
-  }, [_vm._v("7")])])])])]), _c('a-menu-item', {
-    key: "style6"
+  }, [_c('span', [_vm._v("胎心图")])])]), _c('a-menu-item', {
+    key: "style8"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("光定位图")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "10",
-      "y": "25"
-    }
-  }, [_vm._v("1")]), _c('text', {
-    attrs: {
-      "x": "10",
-      "y": "40"
-    }
-  }, [_vm._v("4")]), _c('text', {
-    attrs: {
-      "x": "10",
-      "y": "55"
-    }
-  }, [_vm._v("7")]), _c('text', {
-    attrs: {
-      "x": "45",
-      "y": "25"
-    }
-  }, [_vm._v("2")]), _c('text', {
-    attrs: {
-      "x": "45",
-      "y": "40"
-    }
-  }, [_vm._v("5")]), _c('text', {
-    attrs: {
-      "x": "45",
-      "y": "55"
-    }
-  }, [_vm._v("8")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "25"
-    }
-  }, [_vm._v("3")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "40"
-    }
-  }, [_vm._v("6")]), _c('text', {
-    attrs: {
-      "x": "80",
-      "y": "55"
-    }
-  }, [_vm._v("9")])])])])]), _c('a-menu-item', {
-    key: "style7"
+  }, [_c('span', [_vm._v("恒牙牙位图")])])]), _c('a-menu-item', {
+    key: "style9"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("胎心图")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "26",
-      "y": "15"
-    }
-  }, [_vm._v("1")]), _c('text', {
-    attrs: {
-      "x": "26",
-      "y": "35"
-    }
-  }, [_vm._v("4")]), _c('text', {
-    attrs: {
-      "x": "26",
-      "y": "55"
-    }
-  }, [_vm._v("7")]), _c('text', {
-    attrs: {
-      "x": "84",
-      "y": "15"
-    }
-  }, [_vm._v("2")]), _c('text', {
-    attrs: {
-      "x": "84",
-      "y": "35"
-    }
-  }, [_vm._v("5")]), _c('text', {
-    attrs: {
-      "x": "84",
-      "y": "55"
-    }
-  }, [_vm._v("8")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 0 30 L 10 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 52 30 L 67 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 110 30 L 120 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 60 0 L 60 60"
-    }
-  })])])])]), _c('a-menu-item', {
+  }, [_c('span', [_vm._v("乳牙牙位图")])])]), _c('a-menu-item', {
     key: "style10"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
   }, [_c('span', [_vm._v("牙位图")])])]), _c('a-menu-item', {
-    key: "style8"
-  }, [_c('p', {
-    staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("恒牙牙位图")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "3",
-      "y": "23"
-    }
-  }, [_vm._v("87654321")]), _c('text', {
-    attrs: {
-      "x": "63",
-      "y": "23"
-    }
-  }, [_vm._v("12345678")]), _c('text', {
-    attrs: {
-      "x": "3",
-      "y": "47"
-    }
-  }, [_vm._v("87654321")]), _c('text', {
-    attrs: {
-      "x": "63",
-      "y": "47"
-    }
-  }, [_vm._v("12345678")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 2 30 L 118 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 60 10 L 60 50"
-    }
-  })])])])]), _c('a-menu-item', {
-    key: "style9"
+    key: "style11"
   }, [_c('p', {
     staticClass: "ant-dropdown-item-text"
-  }, [_c('span', [_vm._v("乳牙牙位图")]), _c('svg', {
-    attrs: {
-      "version": "1.1",
-      "xmlns": "http://www.w3.org/2000/svg"
-    }
-  }, [_c('g', {
-    attrs: {
-      "stroke": "none",
-      "fill": "#000000"
-    }
-  }, [_c('text', {
-    attrs: {
-      "x": "3",
-      "y": "23"
-    }
-  }, [_vm._v("V IV III II I")]), _c('text', {
-    attrs: {
-      "x": "63",
-      "y": "23"
-    }
-  }, [_vm._v("I II III IV V")]), _c('text', {
-    attrs: {
-      "x": "3",
-      "y": "47"
-    }
-  }, [_vm._v("V IV III II I")]), _c('text', {
-    attrs: {
-      "x": "63",
-      "y": "47"
-    }
-  }, [_vm._v("I II III IV V")])]), _c('g', {
-    attrs: {
-      "fill": "none",
-      "stroke": "#000000"
-    }
-  }, [_c('path', {
-    attrs: {
-      "d": "M 2 30 L 118 30"
-    }
-  }), _c('path', {
-    attrs: {
-      "d": "M 60 10 L 60 50"
-    }
-  })])])])])], 1)], 1)], 2)], 1);
+  }, [_c('span', [_vm._v("Pop-Q评分")])])])], 1)], 1)], 2)], 1);
 };
-var HoMedicalExpressionvue_type_template_id_4699ffee_staticRenderFns = [];
+var HoMedicalExpressionvue_type_template_id_079ade04_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoMedicalExpression.vue?vue&type=script&lang=js&
 /* harmony default export */ var HoMedicalExpressionvue_type_script_lang_js_ = ({
@@ -242596,8 +242208,8 @@ var HoMedicalExpressionvue_type_template_id_4699ffee_staticRenderFns = [];
 ;
 var HoMedicalExpression_component = (0,componentNormalizer/* default */.Z)(
   insert_HoMedicalExpressionvue_type_script_lang_js_,
-  HoMedicalExpressionvue_type_template_id_4699ffee_render,
-  HoMedicalExpressionvue_type_template_id_4699ffee_staticRenderFns,
+  HoMedicalExpressionvue_type_template_id_079ade04_render,
+  HoMedicalExpressionvue_type_template_id_079ade04_staticRenderFns,
   false,
   null,
   null,
@@ -248176,6 +247788,8 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
 
 
 
+
+
 
 
 
@@ -248398,6 +248012,19 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
       } else if (node instanceof PrimaryTeethMapNode/* PrimaryTeethMapNode */.x) {
         this.expressStyle = 'style9';
         this.updateNodeValue = [node.topLeftSelected, node.topRightSelected, node.bottomLeftSelected, node.bottomRightSelected];
+      } else if (node instanceof PopQScoreNode/* PopQScoreNode */.B) {
+        this.expressStyle = 'style11';
+        this.updateNodeValue = {
+          Aa: node.aa,
+          Ba: node.ba,
+          C: node.c,
+          gh: node.gh,
+          pb: node.pb,
+          TVL: node.tVL,
+          Ap: node.ap,
+          Bp: node.bp,
+          D: node.d
+        };
       } else if (node instanceof GestationNode/* GestationNode */.G) {
         this.controlType = 'gestation';
         this.controlStatus = 'update';
@@ -248540,7 +248167,7 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
     },
     getUpdateNode: function getUpdateNode() {
       var value;
-      if (Array.isArray(this.updateNodeValue)) {
+      if (Array.isArray(this.updateNodeValue) || (0,esm_typeof/* default */.Z)(this.updateNodeValue) === 'object') {
         value = this.updateNodeValue;
       } else {
         value = this.getCurrentSelectNode();