hoeditor-web 3.0.76 → 3.0.78

package/lib/hoeditor.umd.js

@@ -3358,7 +3358,7 @@ function _extends(){return _extends=Object.assign?Object.assign.bind():function(
 
 /***/ }),
 
-/***/ 72522:
+/***/ 88736:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3370,7 +3370,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ControlModal; }
 });
 
-;// 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/ControlModal.vue?vue&type=template&id=78177eb7&
+;// 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/ControlModal.vue?vue&type=template&id=eb411f7a&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -3471,7 +3471,8 @@ var HOEditorFactorys = __webpack_require__(74089);
         style6: '光定位图',
         style7: '胎心图',
         style8: '恒牙牙位图',
-        style9: '乳牙牙位图'
+        style9: '乳牙牙位图',
+        style10: '牙位图'
       },
       modalComponent: {
         component: null
@@ -5835,7 +5836,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 99219:
+/***/ 44603:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5847,12 +5848,21 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ ExpressionForm; }
 });
 
-;// 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=a290f012&
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__(26699);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.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=6e6eed5d&
+
+
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
-    class: _vm.animationClassNames
+    class: _vm.animationClassNames,
+    style: {
+      width: _vm.expressStyle === 'style10' ? '840px' : '470px'
+    }
   }, [_c('header', {
     staticClass: "modal-title"
   }, [_c('span', [_vm._v(_vm._s(_vm.names[_vm.expressStyle]))]), _c('a-icon', {
@@ -6717,7 +6727,215 @@ var render = function render() {
         "value": item
       }
     }, [_vm._v(_vm._s(item))]);
-  }), 1)], 1)])] : _vm._e()], 2), _c('footer', {
+  }), 1)], 1)])] : _vm._e(), _vm.expressStyle === 'style10' ? [_c('div', {
+    staticClass: "style89 style10"
+  }, [_c('p', {
+    staticStyle: {
+      "position": "absolute",
+      "width": "1px",
+      "height": "100%",
+      "background": "#ccc",
+      "left": "420px",
+      "z-index": "11"
+    }
+  }), _c('div', {
+    staticClass: "ho-emr-checkbox-expression"
+  }, [_c('a-checkbox-group', {
+    staticClass: "ho-emr-checkbox-button ho-emr-checkbox-button-right",
+    attrs: {
+      "value": _vm.style89.topLeft,
+      "size": "small"
+    },
+    on: {
+      "change": _vm.topLeftChange
+    }
+  }, [_c('ul', {
+    staticStyle: {
+      "justify-content": "right"
+    }
+  }, _vm._l(_vm.style10Right, function (item) {
+    return _c('li', {
+      key: item + 'a',
+      class: {
+        selected: _vm.style89.topLeft.includes(item[0]) || _vm.style89.topLeft.includes(item[1])
+      },
+      on: {
+        "click": function click($event) {
+          return _vm.topLeftClick(item[0]);
+        }
+      }
+    }, [_c('div', {
+      class: 'img-box r-t-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px",
+        "background-position-y": "bottom"
+      }
+    })]);
+  }), 0), _vm._l(['8', '7', '6', '5', '4', '3', '2', '1'], function (item) {
+    return _c('a-checkbox', {
+      key: item + 'a',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _c('p'), _vm._l(['E', 'D', 'C', 'B', 'A'], function (item) {
+    return _c('a-checkbox', {
+      key: item + '1',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  })], 2), _c('a-checkbox-group', {
+    staticClass: "ho-emr-checkbox-button ho-emr-checkbox-button-left",
+    attrs: {
+      "value": _vm.style89.topRight,
+      "size": "small"
+    },
+    on: {
+      "change": _vm.topRightChange
+    }
+  }, [_c('ul', {
+    staticStyle: {
+      "justify-content": "left"
+    }
+  }, _vm._l(_vm.style10Left, function (item) {
+    return _c('li', {
+      key: item + 'b',
+      class: {
+        selected: _vm.style89.topRight.includes(item[0]) || _vm.style89.topRight.includes(item[1])
+      },
+      on: {
+        "click": function click($event) {
+          return _vm.topRightClick(item[0]);
+        }
+      }
+    }, [_c('div', {
+      class: 'img-box l-t-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px",
+        "background-position-y": "bottom"
+      }
+    })]);
+  }), 0), _vm._l(['1', '2', '3', '4', '5', '6', '7', '8'], function (item) {
+    return _c('a-checkbox', {
+      key: item + 'b',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _c('p'), _vm._l(['A', 'B', 'C', 'D', 'E'], function (item) {
+    return _c('a-checkbox', {
+      key: item + '1',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  })], 2)], 1), _vm._m(2), _c('div', {
+    staticClass: "ho-emr-checkbox-expression",
+    staticStyle: {
+      "margin-top": "1px"
+    }
+  }, [_c('a-checkbox-group', {
+    staticClass: "ho-emr-checkbox-button ho-emr-checkbox-button-right",
+    attrs: {
+      "value": _vm.style89.bottomLeft,
+      "size": "small"
+    },
+    on: {
+      "change": _vm.bottomLeftChange
+    }
+  }, [_c('p', {
+    staticStyle: {
+      "width": "130px"
+    }
+  }), _vm._l(['E', 'D', 'C', 'B', 'A'], function (item) {
+    return _c('a-checkbox', {
+      key: item + '1',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _vm._l(['8', '7', '6', '5', '4', '3', '2', '1'], function (item) {
+    return _c('a-checkbox', {
+      key: item + 'c',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _c('ul', {
+    staticStyle: {
+      "justify-content": "right"
+    }
+  }, _vm._l(_vm.style10Right, function (item) {
+    return _c('li', {
+      key: item + 'c',
+      class: {
+        selected: _vm.style89.bottomLeft.includes(item[0]) || _vm.style89.bottomLeft.includes(item[1])
+      },
+      on: {
+        "click": function click($event) {
+          return _vm.bottomLeftClick(item[0]);
+        }
+      }
+    }, [_c('div', {
+      class: 'img-box r-b-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px"
+      }
+    })]);
+  }), 0)], 2), _c('a-checkbox-group', {
+    staticClass: "ho-emr-checkbox-button ho-emr-checkbox-button-left",
+    attrs: {
+      "value": _vm.style89.bottomRight,
+      "size": "small"
+    },
+    on: {
+      "change": _vm.bottomRightChange
+    }
+  }, [_vm._l(['A', 'B', 'C', 'D', 'E'], function (item) {
+    return _c('a-checkbox', {
+      key: item + '1',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _c('p', {
+    staticStyle: {
+      "width": "130px"
+    }
+  }), _vm._l(['1', '2', '3', '4', '5', '6', '7', '8'], function (item) {
+    return _c('a-checkbox', {
+      key: item + 'd',
+      attrs: {
+        "value": item
+      }
+    }, [_vm._v(_vm._s(item))]);
+  }), _c('ul', {
+    staticStyle: {
+      "justify-content": "left"
+    }
+  }, _vm._l(_vm.style10Left, function (item) {
+    return _c('li', {
+      key: item + 'd',
+      class: {
+        selected: _vm.style89.bottomRight.includes(item[0]) || _vm.style89.bottomRight.includes(item[1])
+      },
+      on: {
+        "click": function click($event) {
+          return _vm.bottomRightClick(item[0]);
+        }
+      }
+    }, [_c('div', {
+      class: 'img-box l-b-z-' + item[0] + '-1',
+      staticStyle: {
+        "bottom": "0",
+        "top": "2px"
+      }
+    })]);
+  }), 0)], 2)], 1)])] : _vm._e()], 2), _c('footer', {
     staticClass: "dialog-footer"
   }, [_c('a-button', {
     staticStyle: {
@@ -6729,7 +6947,7 @@ var render = function render() {
     on: {
       "click": _vm.sure
     }
-  }, [_vm._v("确 定")]), _vm.expressStyle === 'style8' || _vm.expressStyle === 'style9' ? _c('a-button', {
+  }, [_vm._v("确 定")]), _vm.expressStyle === 'style8' || _vm.expressStyle === 'style9' || _vm.expressStyle === 'style10' ? _c('a-button', {
     staticStyle: {
       "margin": "0 20px 0 0"
     },
@@ -6743,7 +6961,7 @@ var render = function render() {
     on: {
       "click": _vm.reverse
     }
-  }, [_vm._v("反 选")]) : _vm._e(), _vm.expressStyle === 'style8' || _vm.expressStyle === 'style9' ? _c('a-button', {
+  }, [_vm._v("反 选")]) : _vm._e(), _vm.expressStyle === 'style8' || _vm.expressStyle === 'style9' || _vm.expressStyle === 'style10' ? _c('a-button', {
     staticStyle: {
       "margin": "0 20px 0 0"
     },
@@ -6768,18 +6986,71 @@ var staticRenderFns = [function () {
   return _c('ul', {
     staticClass: "titles"
   }, [_c('li', [_vm._v("第二乳磨牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳中切牙")]), _c('li', [_vm._v("乳侧切牙")]), _c('li', [_vm._v("乳尖牙")]), _c('li', [_vm._v("第一乳磨牙")]), _c('li', [_vm._v("第二乳磨牙")])]);
+}, function () {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('div', {
+    staticStyle: {
+      "position": "relative",
+      "padding": "18px 0px 13px 0"
+    }
+  }, [_c('p', {
+    staticStyle: {
+      "width": "100%",
+      "height": "1px",
+      "background": "#ccc"
+    }
+  }), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "left": "187px",
+      "top": "5px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("右")]), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "right": "187px",
+      "top": "5px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("左")]), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "right": "-2px",
+      "top": "-74px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("19")]), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "right": "-2px",
+      "top": "-27px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("29")]), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "right": "-2px",
+      "top": "39px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("39")]), _c('span', {
+    staticStyle: {
+      "position": "absolute",
+      "right": "-2px",
+      "top": "83px",
+      "font-size": "14px"
+    }
+  }, [_vm._v("49")])]);
 }];
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=a290f012&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=template&id=6e6eed5d&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
-var es_array_includes = __webpack_require__(26699);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
-var es_string_includes = __webpack_require__(32023);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
@@ -6798,6 +7069,8 @@ var es_array_push = __webpack_require__(57658);
 var es_object_to_string = __webpack_require__(41539);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
 var web_dom_collections_for_each = __webpack_require__(54747);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
+var es_array_filter = __webpack_require__(57327);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
 // EXTERNAL MODULE: ./src/plugins/util.ts
@@ -6828,6 +7101,7 @@ var zh_cn = __webpack_require__(83839);
 
 
 
+
 /* harmony default export */ var ExpressionFormvue_type_script_lang_js_ = ({
   name: 'ExpressionForm',
   data: function data() {
@@ -6847,7 +7121,8 @@ var zh_cn = __webpack_require__(83839);
         style6: '光定位图',
         style7: '胎心图',
         style8: '恒牙牙位图',
-        style9: '乳牙牙位图'
+        style9: '乳牙牙位图',
+        style10: '牙位图'
       },
       menstrualHistory: {
         menseDays: '',
@@ -6884,6 +7159,12 @@ var zh_cn = __webpack_require__(83839);
         bottomLeft: ['V', 'IV', 'III', 'II', 'I'],
         bottomRight: ['I', 'II', 'III', 'IV', 'V']
       },
+      style10: {
+        topLeft: ['8', '7', '6', '5', 'E', '4', 'D', '3', 'C', '2', 'B', '1', 'A'],
+        topRight: ['A', '1', 'B', '2', 'C', '3', 'D', '4', 'E', '5', '6', '7', '8'],
+        bottomLeft: ['8', '7', '6', '5', 'E', '4', 'D', '3', 'C', '2', 'B', '1', 'A'],
+        bottomRight: ['A', '1', 'B', '2', 'C', '3', 'D', '4', 'E', '5', '6', '7', '8']
+      },
       styleObjectArray: {
         style1: 1,
         style2: 1,
@@ -6893,7 +7174,22 @@ var zh_cn = __webpack_require__(83839);
         style6: 2,
         style7: 2,
         style8: 3,
-        style9: 3
+        style9: 3,
+        style10: 3
+      },
+      style10Left: [['1', 'A'], ['2', 'B'], ['3', 'C'], ['4', 'D'], ['5', 'E'], ['6'], ['7'], ['8']],
+      style10Right: [['8'], ['7'], ['6'], ['5', 'E'], ['4', 'D'], ['3', 'C'], ['2', 'B'], ['1', 'A']],
+      styleObj10: {
+        1: 'A',
+        2: 'B',
+        3: 'C',
+        4: 'D',
+        5: 'E',
+        A: '1',
+        B: '2',
+        C: '3',
+        D: '4',
+        E: '5'
       },
       menoPauseAgeText: '岁'
     };
@@ -7025,7 +7321,7 @@ var zh_cn = __webpack_require__(83839);
       };
     },
     /** 全选 */all: function all() {
-      if (this.expressStyle === 'style8') this.style89 = Object.assign({}, this.style8);
+      if (this.expressStyle === 'style8' || this.expressStyle === 'style10') this.style89 = Object.assign({}, this.style8);
       if (this.expressStyle === 'style9') this.style89 = Object.assign({}, this.style9);
     },
     /** 反选 */reverse: function reverse() {
@@ -7047,6 +7343,8 @@ var zh_cn = __webpack_require__(83839);
         arr = Object.assign({}, this.style8);
       } else if (this.expressStyle === 'style9') {
         arr = Object.assign({}, this.style9);
+      } else if (this.expressStyle === 'style10') {
+        arr = Object.assign({}, this.style10);
       }
       Object.keys(this.style89).map(function (v) {
         arr[v].map(function (m) {
@@ -7073,6 +7371,69 @@ var zh_cn = __webpack_require__(83839);
       });
       return arr;
     },
+    handleStyle10Value: function handleStyle10Value(checkedValues) {
+      var _this2 = this;
+      var arr = [];
+      checkedValues.forEach(function (key) {
+        var inValue = arr.includes(key);
+        var isMutex = arr.includes(_this2.styleObj10[key]);
+        if (!inValue && !isMutex) {
+          arr.push(key);
+        } else if (!inValue && isMutex) {
+          arr = arr.filter(function (v) {
+            return v !== _this2.styleObj10[key];
+          });
+          arr.push(key);
+        } else if (inValue && !isMutex) {
+          arr = arr.filter(function (v) {
+            return v !== key;
+          });
+        }
+      });
+      return (0,toConsumableArray/* default */.Z)(arr);
+    },
+    handleStyle10ValueClick: function handleStyle10ValueClick(arr, value) {
+      var _this3 = this;
+      var inValue = arr.includes(value);
+      var isMutex = arr.includes(this.styleObj10[value]);
+      if (!inValue && !isMutex) {
+        arr.push(value);
+      } else if (!inValue && isMutex) {
+        arr = arr.filter(function (v) {
+          return v !== _this3.styleObj10[value];
+        });
+        // arr.push(value);
+      } else if (inValue && !isMutex) {
+        arr = arr.filter(function (v) {
+          return v !== value;
+        });
+      }
+      return (0,toConsumableArray/* default */.Z)(arr);
+    },
+    topLeftChange: function topLeftChange(checkedValues) {
+      this.style89.topLeft = (0,toConsumableArray/* default */.Z)(this.handleStyle10Value(checkedValues));
+    },
+    topLeftClick: function topLeftClick(value) {
+      this.style89.topLeft = (0,toConsumableArray/* default */.Z)(this.handleStyle10ValueClick((0,toConsumableArray/* default */.Z)(this.style89.topLeft), value));
+    },
+    topRightChange: function topRightChange(checkedValues) {
+      this.style89.topRight = (0,toConsumableArray/* default */.Z)(this.handleStyle10Value(checkedValues));
+    },
+    topRightClick: function topRightClick(value) {
+      this.style89.topRight = (0,toConsumableArray/* default */.Z)(this.handleStyle10ValueClick((0,toConsumableArray/* default */.Z)(this.style89.topRight), value));
+    },
+    bottomLeftChange: function bottomLeftChange(checkedValues) {
+      this.style89.bottomLeft = (0,toConsumableArray/* default */.Z)(this.handleStyle10Value(checkedValues));
+    },
+    bottomLeftClick: function bottomLeftClick(value) {
+      this.style89.bottomLeft = (0,toConsumableArray/* default */.Z)(this.handleStyle10ValueClick((0,toConsumableArray/* default */.Z)(this.style89.bottomLeft), value));
+    },
+    bottomRightChange: function bottomRightChange(checkedValues) {
+      this.style89.bottomRight = (0,toConsumableArray/* default */.Z)(this.handleStyle10Value(checkedValues));
+    },
+    bottomRightClick: function bottomRightClick(value) {
+      this.style89.bottomRight = (0,toConsumableArray/* default */.Z)(this.handleStyle10ValueClick((0,toConsumableArray/* default */.Z)(this.style89.bottomRight), value));
+    },
     /** 取消 */cancel: function cancel() {
       this.animationClassNames = 'control-modal-contents express-dialog animation-out';
       this.$emit('closed');
@@ -7106,9 +7467,9 @@ var zh_cn = __webpack_require__(83839);
         this.insertLightLocation([this.controlStatus].concat((0,toConsumableArray/* default */.Z)(this.objectToArray(this.style567))));
       } else if (this.expressStyle === 'style7') {
         this.insertFetalHeartMap([this.controlStatus].concat((0,toConsumableArray/* default */.Z)(this.objectToArray(this.style567))));
-      } else if (this.expressStyle === 'style8') {
+      } else if (this.expressStyle === 'style8' || this.expressStyle === 'style10') {
         this.reverseOrSort('sort');
-        this.insertPermanentTeethMap(this.controlStatus, [this.style89.topLeft, this.style89.topRight, this.style89.bottomLeft, this.style89.bottomRight]);
+        this.insertPermanentTeethMap(this.controlStatus, [this.style89.topLeft, this.style89.topRight, this.style89.bottomLeft, this.style89.bottomRight], this.expressStyle === 'style10' ? 'teeth' : '');
       } else if (this.expressStyle === 'style9') {
         this.reverseOrSort('sort');
         this.insertPrimaryTeethMap(this.controlStatus, [this.style89.topLeft, this.style89.topRight, this.style89.bottomLeft, this.style89.bottomRight]);
@@ -7197,16 +7558,16 @@ var zh_cn = __webpack_require__(83839);
     /**
      * 恒牙牙位图
      */
-    insertPermanentTeethMap: function insertPermanentTeethMap(controlStatus, val) {
+    insertPermanentTeethMap: function insertPermanentTeethMap(controlStatus, val, remark) {
       var _ref7 = (0,toConsumableArray/* default */.Z)(val),
         topLeft = _ref7[0],
         topRight = _ref7[1],
         bottomLeft = _ref7[2],
         bottomRight = _ref7[3];
       if (controlStatus === 'add') {
-        this.vueController.insertPermanentTeethMap(controlStatus, topLeft, topRight, bottomLeft, bottomRight);
+        this.vueController.insertPermanentTeethMap(controlStatus, topLeft, topRight, bottomLeft, bottomRight, remark);
       } else {
-        this.vueController.updatePermanentTeethMap(topLeft, topRight, bottomLeft, bottomRight);
+        this.vueController.updatePermanentTeethMap(topLeft, topRight, bottomLeft, bottomRight, remark);
       }
     },
     /**
@@ -7228,10 +7589,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// 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-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=a290f012&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=6e6eed5d&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=a290f012&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/expressionForm/ExpressionForm.vue?vue&type=style&index=0&id=6e6eed5d&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -38889,7 +39250,7 @@ var DocController = /*#__PURE__*/function () {
                   break;
                 }
                 path = hoEditorFactory.docTree.getNodeLastPath(preNode);
-                signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime);
+                signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, node.rootNodes, node.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 0, 0, node.name === "" ? "医师签名" : node.name, node.signType, node.signFormat, "", "", node.signTimeFormat, "", 0, 0, {}, true, node.styleIndex, node.connectMode, node.isFront, node.allowEditSignTime, undefined, undefined, node.attribute, node.connectChar, node.otherProperties);
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodeDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_36__/* .NodeDeleteUndoUnit */ .w(this._hoEditorFactoryID, node, startPath));
                 hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_24__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, path, signNode));
@@ -38910,7 +39271,7 @@ var DocController = /*#__PURE__*/function () {
                 epath = hoEditorFactory.docTree.getNodeLastPath(node);
                 newSignNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_83__/* .SignNode */ .N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntSign */ .Jq.ntSign, 1, preNode.type, preNode.name === "" ? "签名" : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
                 //node.isTemplate,
-                node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
+                node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
                 hoEditorFactory.undoService.begin();
                 hoEditorFactory.undoService.add(new _undoRedo_NodesDeleteUndoUnit__WEBPACK_IMPORTED_MODULE_35__/* .NodesDeleteUndoUnit */ .F(this._hoEditorFactoryID, spath, epath));
                 if (node.number === 2 || node.number === 1 && node.isTemplate) {
@@ -39433,7 +39794,7 @@ var DocController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertPermanentTeethMap",
-    value: function insertPermanentTeethMap(operType, curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected) {
+    value: function insertPermanentTeethMap(operType, curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
       if (operType === "update") {
@@ -39450,7 +39811,7 @@ var DocController = /*#__PURE__*/function () {
         }
       }
       var parentNode = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getParentNode(startPath);
-      var permanentTeethMapNode = new _treeNode_PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_42__/* .PermanentTeethMapNode */ .f(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected);
+      var permanentTeethMapNode = new _treeNode_PermanentTeethMapNode__WEBPACK_IMPORTED_MODULE_42__/* .PermanentTeethMapNode */ .f(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark);
       //插入该表达式节点
       if (operType === "add") {
         _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).undoService.begin();
@@ -39668,7 +40029,9 @@ var DocController = /*#__PURE__*/function () {
       }
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
       var rootPath = hoEditorFactory.docTree.getRootPathByNodes(domRange.npStart.roots);
-      var barCodeNode = new _treeNode_BarcodeNode__WEBPACK_IMPORTED_MODULE_48__/* .BarcodeNode */ .T(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntImage */ .Jq.ntImage, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height, bandDataSource);
+      var barCodeNode = new _treeNode_BarcodeNode__WEBPACK_IMPORTED_MODULE_48__/* .BarcodeNode */ .T(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntImage */ .Jq.ntImage, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height
+      //,bandDataSource
+      );
       //插入该表达式节点
       if (operType === "add") {
         hoEditorFactory.undoService.begin();
@@ -39711,7 +40074,15 @@ var DocController = /*#__PURE__*/function () {
         }
       }
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var qrcodeNode = new _treeNode_QrcodeNode__WEBPACK_IMPORTED_MODULE_49__/* .QrcodeNode */ .d(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntImage */ .Jq.ntImage, id, name, innerIdentifier, textContent, type, correctLevel, dataSourceEnabled, dataSource, format, visitPath, isReadOnly, autoUpdate, execState, width, height, isFillBack);
+      var qrcodeNode = new _treeNode_QrcodeNode__WEBPACK_IMPORTED_MODULE_49__/* .QrcodeNode */ .d(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_23__/* .NodeType.ntImage */ .Jq.ntImage, id, name, innerIdentifier, textContent, type, correctLevel,
+      // dataSourceEnabled,
+      // dataSource,
+      // format,
+      // visitPath,
+      // isReadOnly,
+      // autoUpdate,
+      // execState,
+      width, height, isFillBack);
       //插入该表达式节点
       if (operType === "add") {
         hoEditorFactory.undoService.begin();
@@ -40084,7 +40455,9 @@ var DocController = /*#__PURE__*/function () {
       }
       if (r1 === 0 && r2 == table.rowCount - 1) {
         var range = table.getTableFullRange();
-        this.deleteRange(range, true);
+        if (range) {
+          this.deleteRange(range, true);
+        }
         return;
       }
       hoEditorFactory.undoService.begin();
@@ -40136,7 +40509,9 @@ var DocController = /*#__PURE__*/function () {
       }
       if (c1 === 0 && c2 == table.colCount - 1) {
         var range = table.getTableFullRange();
-        this.deleteRange(range, true);
+        if (range) {
+          this.deleteRange(range, true);
+        }
         return;
       }
       hoEditorFactory.undoService.begin();
@@ -45793,7 +46168,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-03-09 09:59:50
+ * @LastEditTime: 2023-07-04 11:48:39
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -46075,7 +46450,7 @@ var DataSource = /*#__PURE__*/function () {
 var RowProperty = /*#__PURE__*/function () {
   //编号
   //自定义属性
-  //数据源
+  //private _dataSource !: DataSource;//数据源
   //是否指定高度
   //指定的高度
   //private _isAutoRaiseHeight = false;//锁定行高
@@ -46091,7 +46466,6 @@ var RowProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, RowProperty);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_dataSource", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_isSpecifyHeight", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_rowHeight", 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_repeatAsTitleAtPageTop", false);
@@ -46135,14 +46509,12 @@ var RowProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._customProperties = value;
     }
-  }, {
-    key: "dataSource",
-    get: function get() {
-      return this._dataSource;
-    },
-    set: function set(value) {
-      this._dataSource = value;
-    }
+    // get dataSource(): DataSource {
+    //     return this._dataSource;
+    // }
+    // set dataSource(value: DataSource) {
+    //     this._dataSource = value;
+    // }
   }, {
     key: "isSpecifyHeight",
     get: function get() {
@@ -46555,10 +46927,10 @@ var DiagonalType;
 })(DiagonalType || (DiagonalType = {}));
 var CellProperty = /*#__PURE__*/function () {
   //编号
-  //突出显示单元格边框
+  //private _lightCellBorders = false;//突出显示单元格边框
   //标题
   //自定义属性
-  //数据源
+  //private _dataSource!: DataSource;//数据源
   //垂直对齐方式
   //单元格内边距 上、下、左、右
   //是否绘制网格线
@@ -46575,10 +46947,8 @@ var CellProperty = /*#__PURE__*/function () {
   ) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(this, CellProperty);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_id", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_lightCellBorders", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_title", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_customProperties", []);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_dataSource", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_align", VAlign.vatop);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_cellInnerMargin", [0, 0, 0.1, 0.1]);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_isDrawGridlines", true);
@@ -46593,7 +46963,7 @@ var CellProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_downListProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_dateTimeProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(this, "_diagonalType", DiagonalType.None);
-    this._dataSource = new DataSource();
+    //this._dataSource = new DataSource();
     if (objectValues !== "") {
       var valuesObj = eval('(' + objectValues + ')');
       var assignvalue = function assignvalue(target, source) {
@@ -46640,14 +47010,12 @@ var CellProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._id = value;
     }
-  }, {
-    key: "lightCellBorders",
-    get: function get() {
-      return this._lightCellBorders;
-    },
-    set: function set(value) {
-      this._lightCellBorders = value;
-    }
+    // get lightCellBorders(): boolean {
+    //     return this._lightCellBorders;
+    // }
+    // set lightCellBorders(value: boolean) {
+    //     this._lightCellBorders = value;
+    // }
   }, {
     key: "title",
     get: function get() {
@@ -46664,14 +47032,12 @@ var CellProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._customProperties = value;
     }
-  }, {
-    key: "dataSource",
-    get: function get() {
-      return this._dataSource;
-    },
-    set: function set(value) {
-      this._dataSource = value;
-    }
+    // get dataSource(): DataSource {
+    //     return this._dataSource;
+    // }
+    // set dataSource(value: DataSource) {
+    //     this._dataSource = value;
+    // }
   }, {
     key: "align",
     get: function get() {
@@ -48729,8 +49095,10 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
 
   //扩展字段
 
-  //绑定数据源
-  function BarcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height, bandDataSource, scaleX, scaleY) {
+  //private _bandDataSource!: BandDataSource; //绑定数据源
+  function BarcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height,
+  //bandDataSource: string,
+  scaleX, scaleY) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(this, BarcodeNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
@@ -48745,7 +49113,6 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_scaleY", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_remark", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_imageDataBase64String", "");
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_bandDataSource", void 0);
     _this._id = id;
     _this._textContent = textContent;
     _this._isDisplayText = isDisplayText;
@@ -48756,8 +49123,8 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     _this._scaleY = scaleY ? scaleY : 1;
     _this._name = name ? name : "";
     _this._innerIdentifier = innerIdentifier ? innerIdentifier : "";
-    _this._bandDataSource = new BandDataSource();
-    _this.setValuesObject(bandDataSource);
+    //this._bandDataSource = new BandDataSource();
+    //this.setValuesObject(bandDataSource);
     _this.node2DrawNodeRange(0, 0);
     return _this;
   }
@@ -48781,7 +49148,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
           ;
         });
       };
-      assignvalue(this.bandDataSource, valuesObj);
+      //assignvalue(this.bandDataSource, valuesObj);
     }
   }, {
     key: "id",
@@ -48856,16 +49223,14 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
         this._scaleY = value;
       }
     }
-  }, {
-    key: "bandDataSource",
-    get: function get() {
-      return this._bandDataSource;
-    },
-    set: function set(value) {
-      if (this._bandDataSource !== value) {
-        this._bandDataSource = value;
-      }
-    }
+    // get bandDataSource(): BandDataSource {
+    //   return this._bandDataSource;
+    // }
+    // set bandDataSource(value: BandDataSource) {
+    //   if (this._bandDataSource !== value) {
+    //     this._bandDataSource = value;
+    //   }
+    // }
   }, {
     key: "name",
     get: function get() {
@@ -48949,7 +49314,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
         scaleX: scaleX,
         scaleY: scaleY,
         imageDataBase64String: this.imageDataBase64String,
-        bandDataSource: this.bandDataSource,
+        //andDataSource: this.bandDataSource,
         remark: this.remark
       };
       if (isCopy) {
@@ -48978,7 +49343,9 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
       var scaleY = Number(json.scaleY);
       this.transType(json);
       var isDisplayText = !json.isDisplayText ? false : json.isDisplayText;
-      return new BarcodeNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType.ntImage */ .Jq.ntImage, json.id, json.name, json.innerIdentifier, json.textContent, isDisplayText, json.imageDataBase64String, width, height, json.bandDataSource, scaleX, scaleY);
+      return new BarcodeNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_12__/* .NodeType.ntImage */ .Jq.ntImage, json.id, json.name, json.innerIdentifier, json.textContent, isDisplayText, json.imageDataBase64String, width, height,
+      //json.bandDataSource,
+      scaleX, scaleY);
     }
   }]);
   return BarcodeNode;
@@ -50579,8 +50946,8 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
         cellInnerMargin: this.cellProperty.cellInnerMargin ? this.cellProperty.cellInnerMargin.toString() : "0,0,0.1,0.1",
         //customProperties: !this.cellProperty.customProperties ? undefined : this.cellProperty.customProperties,
         customProperties: customProperties,
-        lightCellBorders: this.cellProperty.lightCellBorders,
-        dataSource: this.cellProperty.dataSource,
+        //lightCellBorders: this.cellProperty.lightCellBorders,
+        //dataSource: this.cellProperty.dataSource,
         backColor: this.cellProperty.backColor,
         editorProperty: this.cellProperty.editorProperty,
         downListProperty: this.cellProperty.downListProperty,
@@ -50604,11 +50971,13 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
           if (cellPropertyJson["gridLinesColor"] === "#000000,#000000,#000000,#000000") {
             delete cellPropertyJson["gridLinesColor"];
           }
-        } else if (keysName[k] === "dataSource") {
-          if (this.cellProperty.dataSource === undefined || cellPropertyJson["dataSource"] === "") {
-            delete cellPropertyJson["dataSource"];
-          }
-        } else {
+        }
+        // else if (keysName[k] === "dataSource") {
+        //   if (this.cellProperty.dataSource === undefined || (cellPropertyJson["dataSource"] === "")) {
+        //     delete cellPropertyJson["dataSource"];
+        //   }
+        // } 
+        else {
           if (cellPropertyJson[keysName[k]] === defaultCellPropJson[keysName[k]]) {
             delete cellPropertyJson[keysName[k]];
           }
@@ -51051,7 +51420,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-18 11:43:06
- * @LastEditTime: 2022-05-23 14:16:08
+ * @LastEditTime: 2023-06-30 16:37:49
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\ControlNode.ts
@@ -51070,6 +51439,8 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
   //标识格式
   //是否同步
 
+  // protected _checkCascadeObject!: string;
+  // protected _unCheckCascadeObject!: string;
   //提示文本
   //是否允许删除
   //保存类型
@@ -51094,8 +51465,6 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_labelText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_title", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_styleIndex", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_checkCascadeObject", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_unCheckCascadeObject", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_tipText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_isAllowDelete", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_readType", void 0);
@@ -51236,26 +51605,22 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
         this._styleIndex = value;
       }
     }
-  }, {
-    key: "checkCascadeObject",
-    get: function get() {
-      return this._checkCascadeObject;
-    },
-    set: function set(value) {
-      if (this._checkCascadeObject !== value) {
-        this._checkCascadeObject = value;
-      }
-    }
-  }, {
-    key: "unCheckCascadeObject",
-    get: function get() {
-      return this._unCheckCascadeObject;
-    },
-    set: function set(value) {
-      if (this._unCheckCascadeObject !== value) {
-        this._unCheckCascadeObject = value;
-      }
-    }
+    // get checkCascadeObject(): string {
+    //   return this._checkCascadeObject;
+    // }
+    // set checkCascadeObject(value: string) {
+    //   if (this._checkCascadeObject !== value) {
+    //     this._checkCascadeObject = value;
+    //   }
+    // }
+    // get unCheckCascadeObject(): string {
+    //   return this._unCheckCascadeObject;
+    // }
+    // set unCheckCascadeObject(value: string) {
+    //   if (this._unCheckCascadeObject !== value) {
+    //     this._unCheckCascadeObject = value;
+    //   }
+    // }
   }, {
     key: "tipText",
     get: function get() {
@@ -56374,7 +56739,7 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
 var PermanentTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(PermanentTeethMapNode, _MedicalExpressionNod);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(PermanentTeethMapNode);
-  function PermanentTeethMapNode(hoEditorFactoryID, rootNodes, pNode, nodeType, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected) {
+  function PermanentTeethMapNode(hoEditorFactoryID, rootNodes, pNode, nodeType, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, PermanentTeethMapNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
@@ -56386,6 +56751,9 @@ var PermanentTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
     _this._topRightSelected = topRightSelected;
     _this._bottomLeftSelected = bottomLeftSelected;
     _this._bottomRightSelected = bottomRightSelected;
+    if (remark) {
+      _this._remark = remark;
+    }
     _this.node2DrawNodeRange(0, 0);
     return _this;
   }
@@ -56526,7 +56894,7 @@ var PermanentTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
   }], [{
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
-      return new PermanentTeethMapNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, json.topLeftSelected.split(","), json.topRightSelected.split(","), json.bottomLeftSelected.split(","), json.bottomRightSelected.split(","));
+      return new PermanentTeethMapNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_10__/* .NodeType.ntMedicalExpression */ .Jq.ntMedicalExpression, json.topLeftSelected.split(","), json.topRightSelected.split(","), json.bottomLeftSelected.split(","), json.bottomRightSelected.split(","), json.remark);
     }
   }]);
   return PermanentTeethMapNode;
@@ -57152,7 +57520,7 @@ var BaseNode = __webpack_require__(62358);
 /*
  * @Author: your name
  * @Date: 2020-11-13 08:51:37
- * @LastEditTime: 2023-03-16 17:59:08
+ * @LastEditTime: 2023-06-30 15:24:31
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\QrcodeNode.ts
@@ -57167,21 +57535,27 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
   //文本
   //类型
   //纠错能力
-  //数据源绑定设置有效
-  //数据源
-  //格式化
-  //访问路径
-  //只读，不能回填
-  //自动更新，当加载文档或者数据源发生改变时自动更新数值
-  //执行状态
+  // private _dataSourceEnabled = true; //数据源绑定设置有效
+  // private _dataSource = ""; //数据源
+  // private _format = ""; //格式化
+  // private _visitPath = ""; //访问路径
+  // private _isReadOnly = false; //只读，不能回填
+  // private _autoUpdate = false; //自动更新，当加载文档或者数据源发生改变时自动更新数值
+  // private _execState = ""; //执行状态
   //宽
   //高
-  //private _scaleX!: number; //x缩放比例
-  //private _scaleY!: number; //y缩放比例
   //扩展字段
 
   //是否回填
-  function QrcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, type, correctLevel, dataSourceEnabled, dataSource, format, visitPath, isReadOnly, autoUpdate, execState, width, height,
+  function QrcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, type, correctLevel,
+  // dataSourceEnabled: boolean,
+  // dataSource: string,
+  // format: string,
+  // visitPath: string,
+  // isReadOnly: boolean,
+  // autoUpdate: boolean,
+  // execState: string,
+  width, height,
   //scaleX?: number,
   //scaleY?: number
   isFillBack) {
@@ -57194,13 +57568,6 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_textContent", "");
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_type", "QR");
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_correctLevel", "M");
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dataSourceEnabled", true);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dataSource", "");
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_format", "");
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_visitPath", "");
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_isReadOnly", false);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_autoUpdate", false);
-    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_execState", "");
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_width", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_height", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_remark", "");
@@ -57210,13 +57577,13 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     _this._textContent = textContent;
     _this._type = type;
     _this._correctLevel = correctLevel;
-    _this._dataSourceEnabled = dataSourceEnabled;
-    _this._dataSource = dataSource;
-    _this._format = format;
-    _this._visitPath = visitPath;
-    _this._isReadOnly = isReadOnly;
-    _this._autoUpdate = autoUpdate;
-    _this._execState = execState;
+    // this._dataSourceEnabled = dataSourceEnabled;
+    // this._dataSource = dataSource;
+    // this._format = format;
+    // this._visitPath = visitPath;
+    // this._isReadOnly = isReadOnly;
+    // this._autoUpdate = autoUpdate;
+    // this._execState = execState;
     _this._width = width;
     _this._height = height;
     _this._name = name ? name : "";
@@ -57266,41 +57633,27 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     get: function get() {
       return this._correctLevel;
     }
-  }, {
-    key: "dataSource",
-    get: function get() {
-      return this._dataSource;
-    }
-  }, {
-    key: "format",
-    get: function get() {
-      return this._format;
-    }
-  }, {
-    key: "visitPath",
-    get: function get() {
-      return this._visitPath;
-    }
-  }, {
-    key: "isReadOnly",
-    get: function get() {
-      return this._isReadOnly;
-    }
-  }, {
-    key: "autoUpdate",
-    get: function get() {
-      return this._autoUpdate;
-    }
-  }, {
-    key: "execState",
-    get: function get() {
-      return this._execState;
-    }
-  }, {
-    key: "dataSourceEnabled",
-    get: function get() {
-      return this._dataSourceEnabled;
-    }
+    // get dataSource(): string {
+    //   return this._dataSource;
+    // }
+    // get format(): string {
+    //   return this._format;
+    // }
+    // get visitPath(): string {
+    //   return this._visitPath;
+    // }
+    // get isReadOnly(): boolean {
+    //   return this._isReadOnly;
+    // }
+    // get autoUpdate(): boolean {
+    //   return this._autoUpdate;
+    // }
+    // get execState(): string {
+    //   return this._execState;
+    // }
+    // get dataSourceEnabled(): boolean {
+    //   return this._dataSourceEnabled;
+    // }
   }, {
     key: "width",
     get: function get() {
@@ -57441,13 +57794,13 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
         textContent: isClearValue && this.isFillBack ? "" : this.textContent,
         type: this.type,
         correctLevel: this.correctLevel,
-        dataSourceEnabled: this.dataSourceEnabled,
-        dataSource: this.dataSource,
-        format: this.format,
-        visitPath: this.visitPath,
-        isReadOnly: this.isReadOnly,
-        autoUpdate: this.autoUpdate,
-        execState: this.execState,
+        // dataSourceEnabled: this.dataSourceEnabled,
+        // dataSource: this.dataSource,
+        // format: this.format,
+        // visitPath: this.visitPath,
+        // isReadOnly: this.isReadOnly,
+        // autoUpdate: this.autoUpdate,
+        // execState: this.execState,
         width: width,
         height: height,
         remark: this.remark,
@@ -57476,11 +57829,21 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
       var height = Number(json.height);
       //const scaleX = Number(json.scaleX);
       //const scaleY = Number(json.scaleY);
-      var dataSourceEnabled = !json.dataSourceEnabled ? false : json.dataSourceEnabled;
-      var isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
-      var autoUpdate = !json.autoUpdate ? false : json.autoUpdate;
+      // const dataSourceEnabled = !json.dataSourceEnabled
+      //   ? false
+      //   : json.dataSourceEnabled;
+      // const isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
+      // const autoUpdate = !json.autoUpdate ? false : json.autoUpdate;
       var isFillBack = !json.isFillBack ? false : json.isFillBack;
-      return new QrcodeNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType.ntImage */.Jq.ntImage, json.id, json.name, json.innerIdentifier, json.textContent, json.type, json.correctLevel, dataSourceEnabled, json.dataSource, json.format, json.visitPath, isReadOnly, autoUpdate, json.execState, width, height, isFillBack);
+      return new QrcodeNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType.ntImage */.Jq.ntImage, json.id, json.name, json.innerIdentifier, json.textContent, json.type, json.correctLevel,
+      // dataSourceEnabled,
+      // json.dataSource,
+      // json.format,
+      // json.visitPath,
+      // isReadOnly,
+      // autoUpdate,
+      // json.execState,
+      width, height, isFillBack);
     }
   }]);
   return QrcodeNode;
@@ -57652,6 +58015,8 @@ var BandDataSource = /*#__PURE__*/function () {
   return BandDataSource;
 }();
 var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
+  //private checkCascadeObject!: string;
+  //private unCheckCascadeObject!: string;
   //控件样式:"RadioBox"单选框;"CheckBox"复选框
 
   //处于选择状态
@@ -57661,7 +58026,7 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
   //附加数据
   //提示文本
 
-  //绑定数据源
+  //private bandDataSource!: BandDataSource; //绑定数据源
 
   //追加文本
   //内容是否转成文本节点
@@ -57674,8 +58039,6 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "name", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "text", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "title", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "checkCascadeObject", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "unCheckCascadeObject", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "controlStyle", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "groupName", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "isSelected", false);
@@ -57685,7 +58048,6 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "additionalData", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "tipText", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "readType", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "bandDataSource", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "isEditText", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "appendText", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(this, "isTransToText", false);
@@ -57752,26 +58114,22 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         this.title = value;
       }
     }
-  }, {
-    key: "CheckCascadeObject",
-    get: function get() {
-      return this.checkCascadeObject;
-    },
-    set: function set(value) {
-      if (this.checkCascadeObject !== value) {
-        this.checkCascadeObject = value;
-      }
-    }
-  }, {
-    key: "UnCheckCascadeObject",
-    get: function get() {
-      return this.unCheckCascadeObject;
-    },
-    set: function set(value) {
-      if (this.unCheckCascadeObject !== value) {
-        this.unCheckCascadeObject = value;
-      }
-    }
+    // get CheckCascadeObject(): string {
+    //   return this.checkCascadeObject;
+    // }
+    // set CheckCascadeObject(value: string) {
+    //   if (this.checkCascadeObject !== value) {
+    //     this.checkCascadeObject = value;
+    //   }
+    // }
+    // get UnCheckCascadeObject(): string {
+    //   return this.unCheckCascadeObject;
+    // }
+    // set UnCheckCascadeObject(value: string) {
+    //   if (this.unCheckCascadeObject !== value) {
+    //     this.unCheckCascadeObject = value;
+    //   }
+    // }
   }, {
     key: "ControlStyle",
     get: function get() {
@@ -57892,16 +58250,14 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         this.groupHasOptions = value;
       }
     }
-  }, {
-    key: "BandDataSource",
-    get: function get() {
-      return this.bandDataSource;
-    },
-    set: function set(value) {
-      if (this.bandDataSource !== value) {
-        this.bandDataSource = value;
-      }
-    }
+    // get BandDataSource(): BandDataSource {
+    //   return this.bandDataSource;
+    // }
+    // set BandDataSource(value: BandDataSource) {
+    //   if (this.bandDataSource !== value) {
+    //     this.bandDataSource = value;
+    //   }
+    // }
   }, {
     key: "IsTransToText",
     get: function get() {
@@ -57921,8 +58277,8 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
       ret.name = "";
       ret.text = "";
       ret.title = "复选框";
-      ret.checkCascadeObject = "";
-      ret.unCheckCascadeObject = "";
+      // ret.checkCascadeObject = "";
+      // ret.unCheckCascadeObject = "";
       ret.controlStyle = "CheckBox";
       ret.groupName = "";
       ret.isSelected = false;
@@ -57950,7 +58306,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
   //true:左对齐;false:右对齐
   //数值
   //附加数据
-
+  //private _bandDataSource = new BandDataSource();
   //是否可编辑文本
   //追加文本
   //内容是否转成文本
@@ -57966,7 +58322,6 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_boxAlign", true);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_numericValue", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_additionalData", "");
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_bandDataSource", new BandDataSource());
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_isEditText", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_appendText", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_isTransToText", false);
@@ -57980,79 +58335,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
     if (!_this.isEditText) {
       _this.appendText = "";
     }
-    // if (valuesObj["controlStyle"] !== undefined) {
-    //   this._controlStyle = valuesObj["controlStyle"];
-    // }
-    // if (valuesObj["id"] !== undefined) {
-    //   this._id = valuesObj["id"];
-    // }
-    // if (valuesObj["name"] !== undefined) {
-    //   this._name = valuesObj["name"];
-    // }
-    // if (valuesObj["groupName"] !== undefined) {
-    //   this._groupName = valuesObj["groupName"];
-    // }
-    // if (valuesObj["isSelected"] !== undefined) {
-    //   this._isSelected = valuesObj["isSelected"];
-    // }
-    // if (valuesObj["isAllowDelete"] !== undefined) {
-    //   this._isAllowDelete = valuesObj["isAllowDelete"];
-    // }
-    // if (valuesObj["boxAlign"] !== undefined) {
-    //   this._boxAlign = valuesObj["boxAlign"];
-    // }
-    // if (valuesObj["numericValue"] !== undefined) {
-    //   this._numericValue = valuesObj["numericValue"];
-    // }
-    // if (valuesObj["additionalData"] !== undefined) {
-    //   this._additionalData = valuesObj["additionalData"];
-    // }
-    // if (valuesObj["tipText"] !== undefined) {
-    //   this._tipText = valuesObj["tipText"];
-    // }
-    // let bandDataSourceObject: any;
-    // if (valuesObj["bandDataSource"] !== undefined) {
-    //   bandDataSourceObject = valuesObj["bandDataSource"];
-    // }
-    // if (valuesObj["text"] !== undefined && valuesObj["text"] !== null && valuesObj["text"] !== '') {
-    //   this._text = valuesObj["text"];
-    // } else {
-    //   this._text = ' ';
-    // }
-    // if (valuesObj["title"] !== undefined) {
-    //   this._title = valuesObj["title"];
-    // }
-    // if (valuesObj["checkCascadeObject"] !== undefined) {
-    //   this._checkCascadeObject = valuesObj["checkCascadeObject"];
-    // }
-    // if (valuesObj["unCheckCascadeObject"] !== undefined) {
-    //   this._unCheckCascadeObject = valuesObj["unCheckCascadeObject"];
-    // }
     _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_18__/* .ControlType.ctRadioAndCheckBox */ .C.ctRadioAndCheckBox;
-    // if (bandDataSourceObject !== undefined) {
-    //   if (bandDataSourceObject["dataSourceEnabled"] !== undefined) {
-    //     this._bandDataSource.DataSourceEnabled =
-    //       bandDataSourceObject["dataSourceEnabled"];
-    //   }
-    //   if (bandDataSourceObject["dataSource"] !== undefined) {
-    //     this._bandDataSource.DataSource = bandDataSourceObject["dataSource"];
-    //   }
-    //   if (bandDataSourceObject["format"] !== undefined) {
-    //     this._bandDataSource.Format = bandDataSourceObject["format"];
-    //   }
-    //   if (bandDataSourceObject["visitPath"] !== undefined) {
-    //     this._bandDataSource.VisitPath = bandDataSourceObject["visitPath"];
-    //   }
-    //   if (bandDataSourceObject["readOnly"] !== undefined) {
-    //     this._bandDataSource.ReadOnly = bandDataSourceObject["readOnly"];
-    //   }
-    //   if (bandDataSourceObject["autoUpdate"] !== undefined) {
-    //     this._bandDataSource.AutoUpdate = bandDataSourceObject["autoUpdate"];
-    //   }
-    //   if (bandDataSourceObject["execState"] !== undefined) {
-    //     this._bandDataSource.ExecState = bandDataSourceObject["execState"];
-    //   }
-    // }
     _this.node2DrawNodeRange(0, 0);
     return _this;
   }
@@ -58116,16 +58399,10 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
             var area = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
             if (area) {
               hoEditorFactory.drawPageTree.updateDrawPage(area.index);
-              // const drawLine = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).drawTree.getDrawLineByDNode(
-              //   drawNode
-              // );
             }
-            //drawNode.stage.update();
-            // if (drawLine instanceof DrawLine) drawLine.updateCache();
           });
         }
       };
-
       changeAlpha(active);
     }
   }, {
@@ -58244,16 +58521,14 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         this._groupHasOptions = value;
       }
     }
-  }, {
-    key: "bandDataSource",
-    get: function get() {
-      return this._bandDataSource;
-    },
-    set: function set(value) {
-      if (this._bandDataSource !== value) {
-        this._bandDataSource = value;
-      }
-    }
+    // get bandDataSource(): BandDataSource {
+    //   return this._bandDataSource;
+    // }
+    // set bandDataSource(value: BandDataSource) {
+    //   if (this._bandDataSource !== value) {
+    //     this._bandDataSource = value;
+    //   }
+    // }
   }, {
     key: "styleIndex",
     get: function get() {
@@ -58288,7 +58563,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       ret.GroupName = this.groupName !== undefined ? this.groupName : ret.GroupName;
       ret.AdditionalData = this.additionalData !== undefined ? this.additionalData : ret.AdditionalData;
       ret.TipText = this.tipText !== undefined ? this.tipText : ret.TipText;
-      ret.BandDataSource = this.bandDataSource;
+      //ret.BandDataSource = this.bandDataSource;
       ret.BoxAlign = this.boxAlign !== undefined ? this.boxAlign : ret.BoxAlign;
       ret.IsAllowDelete = this.isAllowDelete !== undefined ? this.isAllowDelete : ret.IsAllowDelete;
       ret.IsSelected = this.isSelected !== undefined ? this.isSelected : ret.IsSelected;
@@ -58297,8 +58572,14 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       ret.Type = this.type !== undefined ? this.type : ret.Type;
       ret.Title = this.title !== undefined ? this.title : ret.Title;
       ret.Text = this.text !== undefined ? this.text : ret.Text;
-      ret.CheckCascadeObject = this.checkCascadeObject !== undefined ? this.checkCascadeObject : ret.CheckCascadeObject;
-      ret.UnCheckCascadeObject = this.unCheckCascadeObject !== undefined ? this.unCheckCascadeObject : ret.UnCheckCascadeObject;
+      // ret.CheckCascadeObject =
+      //   this.checkCascadeObject !== undefined
+      //     ? this.checkCascadeObject
+      //     : ret.CheckCascadeObject;
+      // ret.UnCheckCascadeObject =
+      //   this.unCheckCascadeObject !== undefined
+      //     ? this.unCheckCascadeObject
+      //     : ret.UnCheckCascadeObject;
       ret.Name = this.name !== undefined ? this.name : ret.Name;
       ret.ReadType = this.readType !== undefined ? this.readType : ret.ReadType;
       ret.IsEditText = this.isEditText !== undefined ? this.isEditText : ret.IsEditText;
@@ -58413,8 +58694,8 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
           text: this.text,
           title: this.title,
           styleIndex: this.styleIndex,
-          checkCascadeObject: this.checkCascadeObject,
-          unCheckCascadeObject: this.unCheckCascadeObject,
+          //checkCascadeObject: this.checkCascadeObject,
+          //unCheckCascadeObject: this.unCheckCascadeObject,
           tipText: this.tipText,
           isAllowDelete: this.isAllowDelete,
           groupName: this.groupName,
@@ -58427,7 +58708,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
           isEditText: this.isEditText,
           appendText: this.appendText,
           readType: this.readType,
-          bandDataSource: this.bandDataSource,
+          //bandDataSource: this.bandDataSource,
           remark: this.remark
         };
       }
@@ -58446,8 +58727,8 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         text: this.text,
         title: this.title,
         styleIndex: this.styleIndex,
-        checkCascadeObject: this.checkCascadeObject,
-        unCheckCascadeObject: this.unCheckCascadeObject,
+        //checkCascadeObject: this.checkCascadeObject,
+        //unCheckCascadeObject: this.unCheckCascadeObject,
         tipText: this.tipText,
         isAllowDelete: this.isAllowDelete,
         groupName: this.groupName,
@@ -58460,7 +58741,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         isEditText: this.isEditText,
         appendText: this.appendText,
         readType: this.readType,
-        bandDataSource: this.bandDataSource,
+        //bandDataSource: this.bandDataSource,
         remark: this.remark
       };
       var paga = {
@@ -61063,8 +61344,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(19593);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(27222);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(70280);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(66298);
-/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(78255);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(66298);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(78255);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(57658);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var core_js_modules_es_array_flat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(84944);
@@ -61103,18 +61384,20 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_24___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_24__);
 /* harmony import */ var _CellNode__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(68598);
 /* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(62358);
-/* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(67800);
-/* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(74298);
-/* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(79546);
-/* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(94639);
-/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(42921);
-/* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(8277);
-/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(2613);
-/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(32629);
-/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(74089);
-/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(51760);
-/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(91404);
-/* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(15694);
+/* harmony import */ var _ParagraphNode__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(67945);
+/* harmony import */ var _RectNode__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(67800);
+/* harmony import */ var _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(74298);
+/* harmony import */ var _TableProperty__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(79546);
+/* harmony import */ var _DomRange__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(94639);
+/* harmony import */ var _NodePosition__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(42921);
+/* harmony import */ var _editor_events_Exception__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(8277);
+/* harmony import */ var _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(2613);
+/* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(32629);
+/* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(74089);
+/* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(51760);
+/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(91404);
+/* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(15694);
+
 
 
 
@@ -61161,16 +61444,16 @@ var gDefaultColWidth = 30;
 var TableProerty = /*#__PURE__*/function () {
   function TableProerty(table) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, TableProerty);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_ID", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_table", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_userData", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bResizeRowHeight", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bResizeColWidth", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bCanDeleteTable", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bCanDeleteRow", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bFullLine", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_continuePrintBorder", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_bTightlyLineSpace", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_ID", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_table", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_userData", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bResizeRowHeight", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bResizeColWidth", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bCanDeleteTable", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bCanDeleteRow", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bFullLine", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_continuePrintBorder", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_bTightlyLineSpace", void 0);
     this._table = table;
     this._ID = "";
     this._userData = new Object();
@@ -61182,7 +61465,7 @@ var TableProerty = /*#__PURE__*/function () {
     this._continuePrintBorder = false;
     this._bTightlyLineSpace = false;
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(TableProerty, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z)(TableProerty, [{
     key: "ID",
     get: function get() {
       return this._ID;
@@ -61260,20 +61543,20 @@ var TableProerty = /*#__PURE__*/function () {
 var RowInfos = /*#__PURE__*/function () {
   function RowInfos(table, rowProperty) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, RowInfos);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_table", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_id", "0");
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_isAllowEdit", true);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_rowHeight", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_heightFixed", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_rowBaseDTop", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_rowProperty", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_table", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_id", "0");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_isAllowEdit", true);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_rowHeight", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_heightFixed", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_rowBaseDTop", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_rowProperty", void 0);
     this._rowHeight = gDefaultRowHeight;
     this._table = table;
     this._heightFixed = false;
     this._rowBaseDTop = 0;
     this._rowProperty = rowProperty;
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(RowInfos, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z)(RowInfos, [{
     key: "table",
     get:
     //行id
@@ -61327,7 +61610,7 @@ var RowInfos = /*#__PURE__*/function () {
               mainCell = _this$_table$getMainC2[0],
               mr = _this$_table$getMainC2[1],
               mc = _this$_table$getMainC2[2];
-            if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign.vatop */ .TR.vatop) {
+            if (mainCell.cellProperty.align !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop) {
               mainCell.drawCell.needUpdate = true;
             }
           }
@@ -61356,19 +61639,19 @@ var RowInfos = /*#__PURE__*/function () {
 var ColInfos = /*#__PURE__*/function () {
   function ColInfos(table, colWidth, colProperty) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, ColInfos);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_table", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_colWidth", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_widthFixed", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_dLeft", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_colProperty", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)(this, "_isAllowEdit", true);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_table", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_colWidth", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_widthFixed", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_dLeft", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_colProperty", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(this, "_isAllowEdit", true);
     this._colWidth = colWidth;
     this._table = table;
     this._widthFixed = false;
     this._dLeft = 0;
     this._colProperty = colProperty;
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(ColInfos, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z)(ColInfos, [{
     key: "table",
     get:
     //列属性
@@ -61426,7 +61709,7 @@ var ColInfos = /*#__PURE__*/function () {
   }, {
     key: "clone",
     value: function clone() {
-      var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .ColProperty */ .Ti("");
+      var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ColProperty */ .Ti("");
       var ret = new ColInfos(this._table, this._colWidth, colProperty);
       ret._widthFixed = this._widthFixed;
       ret._dLeft = this._dLeft;
@@ -61442,17 +61725,17 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, TableNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, _BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType.ntTable */ .Jq.ntTable);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rows", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rowCount", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_colCount", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_borderVisible", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_borderWidth", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_headerRowCount", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rowInfos", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_colInfos", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_drawTable", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_paragraphNode", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_tableProperty", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rows", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rowCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_colCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_borderVisible", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_borderWidth", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_headerRowCount", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_rowInfos", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_colInfos", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_drawTable", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_paragraphNode", void 0);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), "_tableProperty", void 0);
     _this._rows = new Array();
     _this._rowCount = rowCount;
     _this._colCount = colCount;
@@ -61465,12 +61748,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     _this._tableProperty = tableProperty;
     var colWidth = _this.calcColWidth();
     for (var i = 0; i < _this._colCount; i++) {
-      var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .ColProperty */ .Ti("");
+      var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ColProperty */ .Ti("");
       var colInfos = new ColInfos((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), colWidth, colProperty);
       _this._colInfos[i] = colInfos;
     }
     for (var j = 0; j < _this._rowCount; j++) {
-      var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .RowProperty */ .Nr("");
+      var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .RowProperty */ .Nr("");
       var rowInfos = new RowInfos((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), rowProperty);
       _this._rowInfos[j] = rowInfos;
     }
@@ -61478,7 +61761,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var aRow = new Array();
       _this._rows.push(aRow);
       for (var c = 0; c < colCount; c++) {
-        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
+        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
         var aCell = new _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D(_this._hoEditorFactoryID, rootNodes, (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(_this), aRow, undefined, r, c, 1, 1, cellProperty);
         aRow.push(aCell);
         aCell.initBlankDoc();
@@ -61495,7 +61778,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
    * @param count 插入的行数
    * @param copyIndex 插入时复制行的一些信息
    */
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)(TableNode, [{
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .Z)(TableNode, [{
     key: "hoEditorFactoryID",
     get:
     //单元格矩阵
@@ -61660,7 +61943,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var copyRowProperty = this._rowInfos[copyIndex].rowProperty;
       for (var i = 0; i < count; i++) {
         var row = new Array();
-        var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .RowProperty */ .Nr("");
+        var rowProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .RowProperty */ .Nr("");
         rowProperty.rowHeight = copyRowProperty.rowHeight;
         rowProperty.isSpecifyHeight = copyRowProperty.isSpecifyHeight;
         rowProperty.isLockRowHeight = copyRowProperty.isLockRowHeight;
@@ -61682,8 +61965,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
               cell = null;
             }
             if (cell) {
-              var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
-              if (cell.cellProperty.editorProperty != _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty.None */ .YS.None) {
+              var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
+              if (cell.cellProperty.editorProperty != _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty.None */ .YS.None) {
                 cellProperty.editorProperty = cell.cellProperty.editorProperty;
                 if (cell.cellProperty.dateTimeProperty) {
                   cellProperty.dateTimeProperty = cell.cellProperty.dateTimeProperty;
@@ -61721,8 +62004,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           c += 1;
         }
         this._rows.splice(r + i, 0, row);
-        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
-        if (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_34__/* .EmrType.etForm */ .Fr.etForm) {
+        var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+        if (hoEditorFactory.docTree.docProperty.type === _DocTree__WEBPACK_IMPORTED_MODULE_35__/* .EmrType.etForm */ .Fr.etForm) {
           this.updateGridRowValign(r + i);
         }
         this._rowCount += 1;
@@ -61812,7 +62095,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         this.updateColsWidth(cols, newWidth);
       }
       for (var i = 0; i < count; i++) {
-        var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .ColProperty */ .Ti("");
+        var colProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ColProperty */ .Ti("");
         var colInfos = new ColInfos(this, newWidth, colProperty);
         this._colInfos.splice(c, 0, colInfos);
       }
@@ -61871,8 +62154,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           }
           for (var _i = 0; _i < count; _i++) {
             if (cell) {
-              var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
-              if (cell.cellProperty.editorProperty !== _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty.None */ .YS.None) {
+              var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
+              if (cell.cellProperty.editorProperty !== _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty.None */ .YS.None) {
                 cellProperty.editorProperty = cell.cellProperty.editorProperty;
                 if (cell.cellProperty.dateTimeProperty) {
                   cellProperty.dateTimeProperty = cell.cellProperty.dateTimeProperty;
@@ -62228,7 +62511,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     value: function doSplitCellHorz(r, c, row2) {
       var cell = this._rows[r][c];
       if (cell) {
-        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
+        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
         var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[row2], cell, row2, c, 1, 1, cellProperty);
         cell.drawCell.removeAllPartCell();
         newCell.drawCell.needUpdate = true;
@@ -62243,7 +62526,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     value: function doSplitCellVert(r, c, col2) {
       var cell = this._rows[r][c];
       if (cell) {
-        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
+        var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
         var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col2, 1, 1, cellProperty);
         cell.drawCell.removeAllPartCell();
         newCell.drawCell.needUpdate = true;
@@ -62391,7 +62674,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         if (bunMergeRow) {
           var rowSpan = cell.rowSpan;
           for (var i = r + 1; i <= r + rowSpan - 1; i++) {
-            var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
+            var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
             var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[i], cell, i, c, 1, 1, cellProperty);
             this._rows[i][c] = newCell;
             newCell.initBlankDoc();
@@ -62417,7 +62700,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var cell = this._rows[r][c];
       if (cell) {
         for (var col = c + 1; col <= c + cell.colSpan - 1; col++) {
-          var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W("");
+          var cellProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .CellProperty */ .$W("");
           var newCell = new _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D(this._hoEditorFactoryID, this.rootNodes, this, this._rows[r], cell, r, col, 1, 1, cellProperty);
           this._rows[r][col] = newCell;
           newCell.rowSpan = cell.rowSpan;
@@ -62519,7 +62802,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange(startIndex, endIndex) {
-      var drawTable = new _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_28__/* .DrawTable */ .t(this._hoEditorFactoryID, this._rootPath, this, 0);
+      var drawTable = new _editor_draw_drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_29__/* .DrawTable */ .t(this._hoEditorFactoryID, this._rootPath, this, 0);
       this._drawTable = drawTable;
       this._drawNodes.push(drawTable);
     }
@@ -62534,7 +62817,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "range",
     value: function range() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       return {
         from: hoEditorFactory.docTree.getNodeFirstPath(this),
         to: hoEditorFactory.docTree.getNodeLastPath(this)
@@ -62549,12 +62832,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       if (range) r = this.mixed(range);
       //根据路径范围确定被选中的行列信息  {col:{from,to},row:{from,to}}
       var getcell = function getcell(path) {
-        var node = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this4._hoEditorFactoryID).docTree.findNodePositionByPath(path).node;
+        var node = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(_this4._hoEditorFactoryID).docTree.findNodePositionByPath(path).node;
         // while (node && !(node instanceof CellNode) && node.parentNode == this) {
         //   node = node?.parentNode;
         // }
         for (;;) {
-          if (!node) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_32__/* .Exception.NodeNotFound */ .P.NodeNotFound();
+          if (!node) throw _editor_events_Exception__WEBPACK_IMPORTED_MODULE_33__/* .Exception.NodeNotFound */ .P.NodeNotFound();
           if (!(node instanceof _CellNode__WEBPACK_IMPORTED_MODULE_25__/* .CellNode */ .D)) {
             node = node.parentNode;
             continue;
@@ -62599,7 +62882,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       }
       var defaultRowProp = {
         customProperties: "",
-        dataSource: "",
+        //dataSource: "",
         forcedPageBreak: false,
         //isAutoRaiseHeight: false,
         isSpecifyHeight: false,
@@ -62648,7 +62931,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         };
         var rowProperty = {
           customProperties: _customProperties,
-          dataSource: rowInfo.rowProperty.dataSource,
+          //dataSource: rowInfo.rowProperty.dataSource,
           forcedPageBreak: rowInfo.rowProperty.forcedPageBreak,
           //isAutoRaiseHeight: rowInfo.rowProperty.isAutoRaiseHeight,
           isSpecifyHeight: rowInfo.rowProperty.isSpecifyHeight,
@@ -62667,11 +62950,13 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
             if (rowInfo.rowProperty.customProperties.length === 0) {
               delete rowPropertyJson["customProperties"];
             }
-          } else if (keysName[k] === "dataSource") {
-            if (rowInfo.rowProperty.dataSource === undefined) {
-              delete rowPropertyJson["dataSource"];
-            }
-          } else {
+          }
+          // else if (keysName[k] === "dataSource") {
+          //   if (rowInfo.rowProperty.dataSource === undefined) {
+          //     delete rowPropertyJson["dataSource"];
+          //   }
+          // } 
+          else {
             if (rowPropertyJson[keysName[k]] === defaultRowPropJson[keysName[k]]) {
               delete rowPropertyJson[keysName[k]];
             }
@@ -62685,8 +62970,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         });
       }
       var defaultColProp = {
-        editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty */ .YS[_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty.None */ .YS.None],
-        align: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign */ .TR[_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign.vatop */ .TR.vatop],
+        editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty */ .YS[_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty.None */ .YS.None],
+        align: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign */ .TR[_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop],
         width: 0,
         specifyWidth: false,
         downListProperty: "",
@@ -62705,8 +62990,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           customProperty: Array(colInfo.colProperty.customProperties)
         };
         var colProperty = {
-          editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty */ .YS[colInfo.colProperty.editorProperty],
-          align: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign */ .TR[colInfo.colProperty.align],
+          editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty */ .YS[colInfo.colProperty.editorProperty],
+          align: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign */ .TR[colInfo.colProperty.align],
           width: colInfo.colProperty.width ? colInfo.colProperty.width : 0,
           specifyWidth: colInfo.colProperty.isSpecifyWidth,
           downListProperty: colInfo.colProperty.downListProperty,
@@ -62732,23 +63017,23 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       }
       var defaultCellProp = {
         title: "",
-        align: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign.vatop */ .TR.vatop,
-        obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .ObliqueSplitLine.None */ .lH.None,
+        align: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign.vatop */ .TR.vatop,
+        obliqueSplitLine: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ObliqueSplitLine.None */ .lH.None,
         printGridLines: true,
         alignTextToGridline: true,
         span: 0,
-        gridLinesStyle: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .GridLinesStyle.solid */ .he.solid,
+        gridLinesStyle: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .GridLinesStyle.solid */ .he.solid,
         gridLinesColor: "#000000,#000000,#000000,#000000",
         isDrawGridlines: true,
         cellInnerMargin: "0,0,0.1,0.1",
         customProperties: "",
-        lightCellBorders: false,
-        dataSource: "",
+        //lightCellBorders: false,
+        //dataSource: "",
         backColor: "transparent",
-        editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty.None */ .YS.None,
+        editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty.None */ .YS.None,
         downListProperty: "",
         dateTimeProperty: "",
-        diagonalType: _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .DiagonalType.None */ .IF.None
+        diagonalType: _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .DiagonalType.None */ .IF.None
       };
       var defaultCellPropJson = JSON.parse(JSON.stringify(defaultCellProp));
       //处理单元格
@@ -62767,7 +63052,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         var rowArray = {
           nodeType: "ntRow",
           rowNo: _k2,
-          childNodes: (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_39__/* ["default"] */ .Z)({}, "".concat(nodeName), Array())
+          childNodes: (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .Z)({}, "".concat(nodeName), Array())
         };
         // rowArray = {
         //   nodeType: "ntRow",
@@ -63010,7 +63295,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "update",
     value: function update() {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       for (var r = 0; r < this.rowCount; r++) {
         for (var c = 0; c < this.colCount; c++) {
           var cell = this._rows[r][c];
@@ -63018,8 +63303,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
             cell.drawCell.clear();
             cell.drawCell.removeAllPartCell();
             var endPath = hoEditorFactory.docTree.getNodeLastPath(cell);
-            var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, cell.childNodes[0].getNodePath(), endPath);
-            var cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_33__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_34__/* .DocAction.daInsert */ .gk.daInsert, aRange.startPath, aRange.endPath);
+            var aRange = new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, cell.childNodes[0].getNodePath(), endPath);
+            var cgEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_34__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _DocTree__WEBPACK_IMPORTED_MODULE_35__/* .DocAction.daInsert */ .gk.daInsert, aRange.startPath, aRange.endPath);
             cgEvent.repaintImmediate = false;
             hoEditorFactory.docTree.change(cgEvent);
           }
@@ -63029,7 +63314,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var mainArea = hoEditorFactory.drawPageTree.getMainRootArea(this.drawTable.drawPageTables[0]);
       if (mainArea) {
         var drawTop = this.drawTable.drawPageTables[0].y;
-        if (mainArea.contains(this.drawTable.drawPageTables[0]) && this.drawTable.drawPageTables[0] instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_38__/* .DrawPageTable */ .ox && this.drawTable.drawPageTables[0].table.drawTable.drawPageTables.indexOf(this.drawTable.drawPageTables[0]) > 0) {
+        if (mainArea.contains(this.drawTable.drawPageTables[0]) && this.drawTable.drawPageTables[0] instanceof _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_39__/* .DrawPageTable */ .ox && this.drawTable.drawPageTables[0].table.drawTable.drawPageTables.indexOf(this.drawTable.drawPageTables[0]) > 0) {
           drawTop = 0;
         }
         hoEditorFactory.drawPageTree.update(mainArea, dpos[0].drawRoots, drawTop, dpos[0].index, dpos[0].index);
@@ -63114,20 +63399,20 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     value: function isTotalSelected(arange, bNormalized) {
       var ret = false;
       var nextNode = this.nextSibling();
-      var startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeFirstPath(this);
+      var startPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeFirstPath(this);
       var newRange = arange;
       if (!bNormalized) newRange = arange.normalize();
-      if (nextNode && _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.pathCanCompare */ .F.pathCanCompare(newRange.startPath, startPath)) {
+      if (nextNode && _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.pathCanCompare */ .F.pathCanCompare(newRange.startPath, startPath)) {
         var nextPath = nextNode.getNodePath();
-        ret = _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(newRange.startPath, startPath) <= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(newRange.endPath, nextPath) >= 0;
+        ret = _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(newRange.startPath, startPath) <= 0 && _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(newRange.endPath, nextPath) >= 0;
       }
       return ret;
     }
   }, {
     key: "delete",
     value: function _delete(operType) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_36__/* .PaintState.psDesign */ .Dh.psDesign || this.tableProperty.canDeleteTable) {
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this.hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_37__/* .PaintState.psDesign */ .Dh.psDesign || this.tableProperty.canDeleteTable) {
         var parentNodes = this.getParentNodes();
         var nextParagraphNode = this.nextSibling();
         var ret = false;
@@ -63167,7 +63452,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var ret = null;
       if (this._rows[0][0]) {
         var tableStartPath = this._rows[0][0].getNodePath();
-        var tableEndPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(this);
+        var tableEndPath = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.getNodeLastPath(this);
         var tablePath = this.getNodePath() + "/";
         if (path.startsWith(tablePath)) {
           var cellPath = path.substr(tablePath.length, path.length);
@@ -63262,7 +63547,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "getInRangeRowColInfos",
     value: function getInRangeRowColInfos(range, bNormalized) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var aRange = range;
       if (!bNormalized) {
         aRange = range.normalize();
@@ -63272,11 +63557,11 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         var tableEndPath = hoEditorFactory.docTree.getNodeLastPath(this);
         var tableSelectStart = "";
         var tableSelectEnd = "";
-        if (_NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.pathCanCompare */ .F.pathCanCompare(tableStartPath, aRange.startPath)) {
-          var startCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.startPath, tableStartPath);
-          var startCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.startPath, tableEndPath);
-          var endCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.endPath, tableStartPath);
-          var endCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_31__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.endPath, tableEndPath);
+        if (_NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.pathCanCompare */ .F.pathCanCompare(tableStartPath, aRange.startPath)) {
+          var startCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.startPath, tableStartPath);
+          var startCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.startPath, tableEndPath);
+          var endCompareStartRet = _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.endPath, tableStartPath);
+          var endCompareEndRet = _NodePosition__WEBPACK_IMPORTED_MODULE_32__/* .NodePosition.treePathCompare */ .F.treePathCompare(aRange.endPath, tableEndPath);
           //table起始位置在选中范围中间
           if (startCompareStartRet <= 0 && endCompareStartRet >= 0) {
             tableSelectStart = tableStartPath;
@@ -63519,12 +63804,24 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "getTableFullRange",
     value: function getTableFullRange() {
-      var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = this._paragraphNode.getNodePath();
       var prevNode = this._paragraphNode.prevSibling();
-      if (prevNode) startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
+      var nextNode = this.nextSibling();
+      if (prevNode) {
+        if (prevNode instanceof TableNode && nextNode) {
+          var nnextNode = nextNode.nextLeaf();
+          if (!(nnextNode instanceof _ParagraphNode__WEBPACK_IMPORTED_MODULE_27__/* .ParagraphNode */ .C)) {
+            startPath = this._paragraphNode.getNodePath();
+          } else {
+            return null;
+          }
+        } else {
+          startPath = hoeditfactory.docTree.getNodeLastPath(prevNode);
+        }
+      }
       var endPath = hoeditfactory.docTree.getNodeLastPath(this);
-      return new _DomRange__WEBPACK_IMPORTED_MODULE_30__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
+      return new _DomRange__WEBPACK_IMPORTED_MODULE_31__/* .DomRange */ .a(this._hoEditorFactoryID, startPath, endPath);
     }
   }, {
     key: "getTagNameCn",
@@ -63544,7 +63841,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
       tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
       tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
-      tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_37__/* .UnitConvert.instance.mmConversionPx */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
+      tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_38__/* .UnitConvert.instance.mmConversionPx */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
       // console.log("json2node", 1);
       var tableNode = new TableNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, Number(json.rowCount), Number(json.colCount), tableProperty);
       // console.log("json2node", 2);
@@ -63637,28 +63934,28 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         var colProperty = colInfo.colProperty;
         if (colProperty) {
           if (colProperty.align) {
-            tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign */ .TR[colProperty.align]);
+            tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign */ .TR[colProperty.align]);
           } else {
-            tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .VAlign */ .TR[defaultColProp.align]);
+            tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .VAlign */ .TR[defaultColProp.align]);
           }
           if (colProperty.editorProperty) {
-            tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty */ .YS[colProperty.editorProperty]);
+            tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty */ .YS[colProperty.editorProperty]);
           } else {
-            tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .EditorProperty */ .YS[defaultColProp.editorProperty]);
+            tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .EditorProperty */ .YS[defaultColProp.editorProperty]);
           }
           tableNode.colInfos[_i6].colProperty.width = colProperty.width ? Number(colProperty.width) : 0;
           tableNode.colInfos[_i6].colProperty.isSpecifyWidth = colProperty.isSpecifyWidth;
           if (colProperty.downListProperty) {
-            tableNode.colInfos[_i6].colProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .ColDownListProperty */ .cW(colProperty.downListProperty);
+            tableNode.colInfos[_i6].colProperty.downListProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .ColDownListProperty */ .cW(colProperty.downListProperty);
           }
           if (colProperty.dateTimeProperty) {
-            tableNode.colInfos[_i6].colProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .DateTimeProperty */ .Ks(colProperty.dateTimeProperty);
+            tableNode.colInfos[_i6].colProperty.dateTimeProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .DateTimeProperty */ .Ks(colProperty.dateTimeProperty);
           }
           if (colProperty.numberProperty) {
-            tableNode.colInfos[_i6].colProperty.numberProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .NumberProperty */ .Y6(colProperty.numberProperty);
+            tableNode.colInfos[_i6].colProperty.numberProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .NumberProperty */ .Y6(colProperty.numberProperty);
           }
           if (colProperty.signProperty) {
-            tableNode.colInfos[_i6].colProperty.signProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .SignProperty */ .q5(colProperty.signProperty);
+            tableNode.colInfos[_i6].colProperty.signProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_30__/* .SignProperty */ .q5(colProperty.signProperty);
           }
           if (colProperty.customProperties) {
             tableNode.colInfos[_i6].colProperty.customProperties = Array.isArray(colProperty.customProperties.customProperty) ? colProperty.customProperties.customProperty : Array(colProperty.customProperties.customProperty);
@@ -63769,7 +64066,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
   }, {
     key: "getSelectTableRowColInfos",
     value: function getSelectTableRowColInfos(hoEditorFactoryID, range) {
-      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_35__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
+      var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_36__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID);
       var aRange = range.normalize();
       var np1 = hoEditorFactory.docTree.findNodePositionByPath(aRange.startPath);
       var np2 = hoEditorFactory.docTree.findNodePositionByPath(aRange.endPath);
@@ -63793,7 +64090,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     }
   }]);
   return TableNode;
-}(_RectNode__WEBPACK_IMPORTED_MODULE_27__/* .RectNode */ .z);
+}(_RectNode__WEBPACK_IMPORTED_MODULE_28__/* .RectNode */ .z);
 
 /***/ }),
 
@@ -63921,7 +64218,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-05-16 16:29:56
+ * @LastEditTime: 2023-06-30 16:19:32
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -64232,7 +64529,7 @@ var DataVerifyFormat = /*#__PURE__*/function () {
   }]);
   return DataVerifyFormat;
 }();
-var BandDataSource = /*#__PURE__*/function () {
+var BandDataSource = /*#__PURE__*/(/* unused pure expression or super */ null && (function () {
   //绑定数据源
   //数据源绑定设置有效
   //数据源
@@ -64242,17 +64539,17 @@ var BandDataSource = /*#__PURE__*/function () {
   //自动更新，当加载文档或者数据源发生改变时自动更新数值
   //执行状态
   function BandDataSource() {
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z)(this, BandDataSource);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_dataSourceEnabled", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_dataSource", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_format", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_visitPath", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_isReadOnly", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_autoUpdate", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_executeStatus", void 0);
+    _classCallCheck(this, BandDataSource);
+    _defineProperty(this, "_dataSourceEnabled", void 0);
+    _defineProperty(this, "_dataSource", void 0);
+    _defineProperty(this, "_format", void 0);
+    _defineProperty(this, "_visitPath", void 0);
+    _defineProperty(this, "_isReadOnly", void 0);
+    _defineProperty(this, "_autoUpdate", void 0);
+    _defineProperty(this, "_executeStatus", void 0);
     BandDataSource.setDefaultBandDataSource(this);
   }
-  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_59__/* ["default"] */ .Z)(BandDataSource, [{
+  _createClass(BandDataSource, [{
     key: "dataSourceEnabled",
     get: function get() {
       return this._dataSourceEnabled;
@@ -64336,7 +64633,7 @@ var BandDataSource = /*#__PURE__*/function () {
     }
   }]);
   return BandDataSource;
-}();
+}()));
 var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(TextInputFieldNode, _BaseCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(TextInputFieldNode);
@@ -64355,7 +64652,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_text", '');
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_name", '');
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_tipText", '');
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_readOnlyStatus", ReadOnlyStatus.false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_fixedWidth", 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_isCentered", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_canModifyContent", true);
@@ -64364,7 +64660,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_defaultValue", '');
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_downListProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_dataVerifyFormat", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_bandDataSource", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_customProperty", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_alignWithBlocked", false);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(_this), "_readType", -1);
@@ -64382,65 +64677,9 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     //this._importStyle = new ImportStyle();
     _this._downListProperty = new DownListProperty();
     _this._dataVerifyFormat = new DataVerifyFormat();
-    _this._bandDataSource = new BandDataSource();
-    //FIXME:测试用，正常时需要删除
-    // valuesObject = `{
-    //     "labelText": "请输入",
-    //     "text": "123",
-    //     "name": "",
-    //     "readOnlyStatus": 1,
-    //     "fixedWidth": 0,
-    //     "canModifyContent": true,
-    //     "isAllowDelete": true,
-    //     "enableGlobalColor": true,
-    //     "defaultValue": "",
-    //     "serialID": "20201004153709132968",
-    //     "innerCode": "",
-    //     "importStyle": {
-    //         "_inputContent": 0,
-    //         "_allowMultiSelected": false,
-    //         "_splitCharacter": "",
-    //         "_dynamicLoadList": false,
-    //         "_listContent": "",
-    //         "_source": "",
-    //         "_listItems": "",
-    //         "_specialFormat": 0
-    //     },
-    //     "dataVerifyFormat": {
-    //         "_mustInputValue": false,
-    //         "_dataFormat": 0,
-    //         "_minLength": 0,
-    //         "_maxLength": 0,
-    //         "_onlyInputInt": false,
-    //         "_minValue": 0,
-    //         "_maxValue": 0,
-    //         "_maxSmallBits": 0,
-    //         "_noEarlierTheDate": "2020-11-19T07:37:09.878Z",
-    //         "_noLaterTheDate": "2020-11-19T07:37:09.878Z",
-    //         "_noEarlierTheTime": "15:37:09 GMT+0800 (中国标准时间)",
-    //         "_noLaterTheTime": "15:37:09 GMT+0800 (中国标准时间)"
-    //     },
-    //     "bandDataSource": {
-    //         "_dataSource": "",
-    //         "_format": "",
-    //         "_visitPath": "",
-    //         "_readOnly": false,
-    //         "_autoUpdate": false,
-    //         "_executeStatus": 0
-    //     },
-    //     "customProperty": ""
-    // }`
+    //this._bandDataSource = new BandDataSource();
     _this._alignWithBlocked = false;
     _this._customProperty = new Object();
-    // const valuesObj = eval("(" + valuesObject + ")");
-    // const assignvalue = (target: any, source: any) => {
-    //   Object.keys(source).forEach((value) => {
-    //     if (typeof target[value] == "object") {
-    //       assignvalue(target[value], source[value]);
-    //     } else target[value] = source[value];
-    //   });
-    // };
-    // assignvalue(this, valuesObj);
     _this.setValuesObject(valuesObject);
     if (_this.labelText === '') {
       if (_this.text === '' && _this.name !== '') {
@@ -64457,52 +64696,6 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     if (!_this._dataId) {
       _this._dataId = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_34__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoEditorFactoryID).gernerateCode.generateID('Field');
     }
-    // const serialID = valuesObj["serialID"];
-    // let name = "";
-    // let readOnlyStatus = ReadOnlyStatus.false;
-    // let fixedWidth = 0;
-    // let canModifyContent = true;
-    // let isAllowDelete = true;
-    // let enableGlobalColor = true;
-    // let defaultValue = "";
-    // let text = "";
-    // if (valuesObj["name"] !== undefined) {
-    //     name = valuesObj["name"];
-    // }
-    // if (valuesObj["readOnlyStatus"] !== undefined) {
-    //     readOnlyStatus = valuesObj["readOnlyStatus"];
-    // }
-    // if (valuesObj["fixedWidth"] !== undefined) {
-    //     fixedWidth = valuesObj["fixedWidth"];
-    // }
-    // if (valuesObj["canModifyContent"] !== undefined) {
-    //     canModifyContent = valuesObj["canModifyContent"];
-    // }
-    // if (valuesObj["isAllowDelete"] !== undefined) {
-    //     isAllowDelete = valuesObj["isAllowDelete"];
-    // }
-    // if (valuesObj["enableGlobalColor"] !== undefined) {
-    //     enableGlobalColor = valuesObj["enableGlobalColor"];
-    // }
-    // if (valuesObj["defaultValue"] !== undefined) {
-    //     defaultValue = valuesObj["defaultValue"];
-    // }
-    // if (valuesObj["text"] !== undefined) {
-    //     text = valuesObj["text"];
-    // } else {
-    //     text = this._labelText;
-    // }
-    // this._innerCode = this.generateInnerCode();
-    // this._serialID = serialID;
-    // this._name = name;
-    // this._readOnlyStatus = readOnlyStatus;
-    // this._fixedWidth = fixedWidth;
-    // this._canModifyContent = canModifyContent;
-    // this._allowDelete = allowDelete;
-    // this._enableGlobalColor = enableGlobalColor;
-    // this._text = text;
-    // this._defaultValue = defaultValue;
-    //this._backShape = new createjs.Shape();
     _this.node2DrawNodeRange(0, _this.text.length - 1);
     //FIXME:正式使用时下面事件触发要注释掉,这里会在节点被删除后被卡死
     // HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID).docTree.addEventListener(SelectionChangeEvent.eventName, (e: any): boolean => {
@@ -64531,7 +64724,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
 
     //名称
     //提示文本
-    //内容只读状态
+    //private _readOnlyStatus = ReadOnlyStatus.false; //内容只读状态
     //固定宽度(像素)
     //固定宽度时 文本是否居中显示
     //用户可以直接编辑修改内容
@@ -64541,7 +64734,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     //private _importStyle!: ImportStyle;//输入样式
     //下拉列表属性
     //数据校验格式
-    //绑定数据源
+    //private _bandDataSource!: BandDataSource; //绑定数据源
     //自定义属性
 
     //保存类型
@@ -64740,16 +64933,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         this._tipText = value;
       }
     }
-  }, {
-    key: "readOnlyStatus",
-    get: function get() {
-      return this._readOnlyStatus;
-    },
-    set: function set(value) {
-      if (this._readOnlyStatus !== value) {
-        this._readOnlyStatus = value;
-      }
-    }
+    // get readOnlyStatus(): ReadOnlyStatus {
+    //     return this._readOnlyStatus;
+    // }
+    // set readOnlyStatus(value: ReadOnlyStatus) {
+    //     if (this._readOnlyStatus !== value) {
+    //         this._readOnlyStatus = value;
+    //     }
+    // }
   }, {
     key: "fixedWidth",
     get: function get() {
@@ -64838,16 +65029,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         this._dataVerifyFormat = value;
       }
     }
-  }, {
-    key: "bandDataSource",
-    get: function get() {
-      return this._bandDataSource;
-    },
-    set: function set(value) {
-      if (this._bandDataSource !== value) {
-        this._bandDataSource = value;
-      }
-    }
+    // get bandDataSource(): BandDataSource {
+    //     return this._bandDataSource;
+    // }
+    // set bandDataSource(value: BandDataSource) {
+    //     if (this._bandDataSource !== value) {
+    //         this._bandDataSource = value;
+    //     }
+    // }
   }, {
     key: "customProperty",
     get: function get() {
@@ -65776,7 +65965,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           name: this.name,
           tipText: this.tipText,
           labelText: this.labelText,
-          readOnlyStatus: this.readOnlyStatus,
+          //readOnlyStatus: this.readOnlyStatus,
           fixedWidth: this.fixedWidth,
           isCentered: this.isCentered,
           canModifyContent: this.canModifyContent,
@@ -65785,7 +65974,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           defaultValue: this.defaultValue,
           downListProperty: this.downListProperty,
           dataVerifyFormat: this.dataVerifyFormat,
-          bandDataSource: this.bandDataSource,
+          //bandDataSource: this.bandDataSource,
           customProperty: this.customProperty,
           alignWithBlocked: this.alignWithBlocked,
           readType: this.readType,
@@ -65812,7 +66001,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         name: this.name,
         tipText: this.tipText,
         labelText: this.labelText,
-        readOnlyStatus: this.readOnlyStatus,
+        //readOnlyStatus: this.readOnlyStatus,
         fixedWidth: this.fixedWidth,
         isCentered: this.isCentered,
         canModifyContent: this.canModifyContent,
@@ -65821,7 +66010,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         defaultValue: this.defaultValue,
         downListProperty: this.downListProperty,
         dataVerifyFormat: this.dataVerifyFormat,
-        bandDataSource: this.bandDataSource,
+        //bandDataSource: this.bandDataSource,
         customProperty: this.customProperty,
         alignWithBlocked: this.alignWithBlocked,
         readType: this.readType,
@@ -76400,7 +76589,7 @@ var DrawRect = /*#__PURE__*/function (_DrawContainer) {
 /*
  * @Author: your name
  * @Date: 2021-09-01 16:51:49
- * @LastEditTime: 2023-06-25 10:49:59
+ * @LastEditTime: 2023-07-03 13:58:23
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\draw\drawNode\DrawSignNode.ts
@@ -76466,6 +76655,9 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     //this._textStyle = cbStyle.;
     var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID);
     _this.dHeight = hoeditfactory.signHeight;
+    if (imgHeight == 0) {
+      imgHeight = hoeditfactory.signHeight;
+    }
     //this.dHeight = 40;
     // 处理混乱的类型
     if (node.customProperty && node.customProperty.vaq01) {
@@ -91781,30 +91973,33 @@ var isMap = function isMap(map) {
 /* harmony export */ });
 /* unused harmony exports generateGetBoundingClientRect, createPrintHTMLIframe, resetScale, getUserIP, createRarewordsCanvas */
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(61748);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(74916);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(15306);
-/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(26699);
-/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32023);
-/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(91038);
-/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78783);
-/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(41539);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(39714);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(92222);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(4723);
-/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var _popperjs_core__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(95551);
-/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91404);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(74916);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15306);
+/* harmony import */ var core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26699);
+/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(32023);
+/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(91038);
+/* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(78783);
+/* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(41539);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39714);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(92222);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(4723);
+/* harmony import */ var core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_match_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _popperjs_core__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(95551);
+/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91404);
+
 
 
 
@@ -91899,22 +92094,26 @@ var dateFormatValueList = [{
 var dateFormat = function dateFormat(date, format) {
   var _date;
   if (date && typeof date === 'string') {
-    var stringDate = date.replace(/[年|月|-]/g, '/');
-    stringDate = stringDate.replace(/[点|时|分]/g, ':');
-    stringDate = stringDate.replace(/[日|秒]/g, '');
-    if (isNaN(new Date(stringDate).getTime())) {
-      if (format && format.includes('MM') && !format.includes('yyyy')) {
-        stringDate = '2021/' + stringDate;
-      }
-      if (format && format.includes('HH') && !format.includes('ss')) {
-        stringDate = stringDate + ':00';
-        stringDate = stringDate.replace('::', ':');
-      }
-      if (!stringDate.includes('/')) {
-        stringDate = '2021/10/01 ' + stringDate;
+    if (!isNaN(Number(date))) {
+      _date = toDate(Number(date));
+    } else {
+      var stringDate = date.replace(/[年|月|-]/g, '/');
+      stringDate = stringDate.replace(/[点|时|分]/g, ':');
+      stringDate = stringDate.replace(/[日|秒]/g, '');
+      if (isNaN(new Date(stringDate).getTime())) {
+        if (format && format.includes('MM') && !format.includes('yyyy')) {
+          stringDate = '2021/' + stringDate;
+        }
+        if (format && format.includes('HH') && !format.includes('ss')) {
+          stringDate = stringDate + ':00';
+          stringDate = stringDate.replace('::', ':');
+        }
+        if (!stringDate.includes('/')) {
+          stringDate = '2021/10/01 ' + stringDate;
+        }
       }
+      _date = toDate(stringDate);
     }
-    _date = toDate(stringDate);
   } else {
     _date = toDate(date);
   }
@@ -92065,7 +92264,7 @@ var createRightMenu = function createRightMenu(clientX, clientY, rightMenuModal)
   var virtualElement = {
     getBoundingClientRect: generateGetBoundingClientRect(clientX, clientY)
   };
-  (0,_popperjs_core__WEBPACK_IMPORTED_MODULE_13__/* .createPopper */ .fi)(virtualElement, rightMenuModal, {
+  (0,_popperjs_core__WEBPACK_IMPORTED_MODULE_14__/* .createPopper */ .fi)(virtualElement, rightMenuModal, {
     placement: 'bottom-start',
     modifiers: [{
       name: 'flip',
@@ -196945,7 +197144,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 var map = {
-	"./ControlModal.vue": 72522,
+	"./ControlModal.vue": 88736,
 	"./barCode/BarCodes.vue": 20329,
 	"./colorPicker/HoColorPicker.vue": 91351,
 	"./colorPicker/HoColorPickers.vue": 84214,
@@ -196954,7 +197153,7 @@ var map = {
 	"./dataSource/DataSource.vue": 9238,
 	"./dateDialog/DateDialog.vue": 17237,
 	"./delimiter/Delimiter.vue": 31861,
-	"./expressionForm/ExpressionForm.vue": 99219,
+	"./expressionForm/ExpressionForm.vue": 44603,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
 	"./hoprint/HoPrint.vue": 62321,
@@ -236333,7 +236532,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.76');
+/* harmony default export */ var version = ('3.0.78');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -244900,7 +245099,7 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertPermanentTeethMap",
-    value: function insertPermanentTeethMap(operType, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected) {
+    value: function insertPermanentTeethMap(operType, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       if (hoEditorFactory.editController.canIsEdit(hoEditorFactory)) {
         var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
@@ -244908,7 +245107,7 @@ var VueController = /*#__PURE__*/function () {
         var endPath = _curDomRange.normalize().endPath;
         var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertMedicalExpression */.y.insertMedicalExpression);
         if (hoEditorFactory.docTree.changing(changingEvent)) {
-          hoEditorFactory.docController.insertPermanentTeethMap('add', _curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected);
+          hoEditorFactory.docController.insertPermanentTeethMap('add', _curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark);
         }
       }
     }
@@ -244921,14 +245120,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updatePermanentTeethMap",
-    value: function updatePermanentTeethMap(topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected) {
+    value: function updatePermanentTeethMap(topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
       var startPath = _curDomRange.normalize().startPath;
       var endPath = _curDomRange.normalize().endPath;
       var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.updateMedicalExpression */.y.updateMedicalExpression);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.insertPermanentTeethMap('update', _curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected);
+        hoEditorFactory.docController.insertPermanentTeethMap('update', _curDomRange, topLeftSelected, topRightSelected, bottomLeftSelected, bottomRightSelected, remark);
       }
     }
     /**
@@ -247932,7 +248131,7 @@ var VueController = /*#__PURE__*/function () {
           var epath = hoEditorFactory.docTree.getNodeLastPath(node);
           var newSignNode = new SignNode/* SignNode */.N(this._hoEditorFactoryID, preNode.rootNodes, preNode.parentNode, BaseNode/* NodeType.ntSign */.Jq.ntSign, 1, preNode.type, preNode.name === '' ? '签名' : preNode.name, preNode.signType, preNode.signFormat, preNode.signor, preNode.signTime, preNode.signTimeFormat, preNode.imgSrc, preNode.imgWidth, preNode.imgHeight, preNode.customProperty, preNode.isTemplate ? preNode.isTemplate : node.isTemplate,
           //node.isTemplate,
-          node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime);
+          node.styleIndex, preNode.connectMode, preNode.isFront, preNode.allowEditSignTime, preNode.fingerPrintSrc, preNode.fingerPosition, preNode.attribute, preNode.connectChar, preNode.otherProperties);
           hoEditorFactory.undoService.begin();
           hoEditorFactory.undoService.add(new NodesDeleteUndoUnit/* NodesDeleteUndoUnit */.F(this._hoEditorFactoryID, spath, ePath));
           if (node.number === 2 || node.number === 1 && node.isTemplate) {
@@ -250191,7 +250390,7 @@ var VueController = /*#__PURE__*/function () {
             };
             var rowProperty = {
               customProperties: _customProperties,
-              dataSource: rowInfo.rowProperty.dataSource,
+              //dataSource: rowInfo.rowProperty.dataSource,
               forcedPageBreak: rowInfo.rowProperty.forcedPageBreak,
               isSpecifyHeight: rowInfo.rowProperty.isSpecifyHeight,
               printCellBg: rowInfo.rowProperty.printCellBg,
@@ -250209,11 +250408,13 @@ var VueController = /*#__PURE__*/function () {
                 if (rowInfo.rowProperty.customProperties.length === 0) {
                   delete rowPropertyJson['customProperties'];
                 }
-              } else if (keysName[_k] === 'dataSource') {
-                if (rowInfo.rowProperty.dataSource === undefined) {
-                  delete rowPropertyJson['dataSource'];
-                }
-              } else {
+              }
+              // else if (keysName[k] === 'dataSource') {
+              //     if (rowInfo.rowProperty.dataSource === undefined) {
+              //         delete rowPropertyJson['dataSource'];
+              //     }
+              // } 
+              else {
                 if (rowPropertyJson[keysName[_k]] === defaultRowPropJson[keysName[_k]]) {
                   delete rowPropertyJson[keysName[_k]];
                 }
@@ -250281,7 +250482,7 @@ var VueController = /*#__PURE__*/function () {
             isDrawGridlines: true,
             cellInnerMargin: '0,0,0.1,0.1',
             customProperties: '',
-            lightCellBorders: false,
+            //lightCellBorders: false,
             dataSource: '',
             backColor: 'transparent',
             editorProperty: TableProperty/* EditorProperty.None */.YS.None,
@@ -250397,8 +250598,8 @@ var VueController = /*#__PURE__*/function () {
             isDrawGridlines: node.cellProperty.isDrawGridlines,
             cellInnerMargin: node.cellProperty.cellInnerMargin ? node.cellProperty.cellInnerMargin.toString() : '0,0,0.1,0.1',
             customProperties: _customProperties3,
-            lightCellBorders: node.cellProperty.lightCellBorders,
-            dataSource: node.cellProperty.dataSource,
+            //lightCellBorders: node.cellProperty.lightCellBorders,
+            //dataSource: node.cellProperty.dataSource,
             backColor: node.cellProperty.backColor,
             editorProperty: node.cellProperty.editorProperty,
             downListProperty: node.cellProperty.downListProperty,
@@ -250422,11 +250623,13 @@ var VueController = /*#__PURE__*/function () {
               if (cellPropertyJson['gridLinesColor'] === '#000000,#000000,#000000,#000000') {
                 delete cellPropertyJson['gridLinesColor'];
               }
-            } else if (_keysName[_k3] === 'dataSource') {
-              if (node.cellProperty.dataSource === undefined || cellPropertyJson['dataSource'] === '') {
-                delete cellPropertyJson['dataSource'];
-              }
-            } else {
+            }
+            // else if (keysName[k] === 'dataSource') {
+            //     if (node.cellProperty.dataSource === undefined || cellPropertyJson['dataSource'] === '') {
+            //         delete cellPropertyJson['dataSource'];
+            //     }
+            // } 
+            else {
               if (cellPropertyJson[_keysName[_k3]] === defaultCellPropJson[_keysName[_k3]]) {
                 delete cellPropertyJson[_keysName[_k3]];
               }
@@ -252216,7 +252419,8 @@ var EditController = /*#__PURE__*/function () {
     key: "canIsEdit",
     value: function canIsEdit(hoEditorFactory) {
       var result = true;
-      //hoEditorFactory.isUseForm = true;
+      // hoEditorFactory.isUseForm = true;
+      // hoEditorFactory.allowEditCellInForm = false;
       if (hoEditorFactory.isUseForm) {
         var _enode$parentNode, _enode$parentNode2;
         var curDomRange = hoEditorFactory.docTree.curDomRange.normalize(); //获取当前选中区域
@@ -252236,6 +252440,11 @@ var EditController = /*#__PURE__*/function () {
         if (enode instanceof MarkNode/* MarkNode */.j && enode.MarkNodeType == 2 && (((_enode$parentNode = enode.parentNode) === null || _enode$parentNode === void 0 ? void 0 : _enode$parentNode.parentNode) == null || ((_enode$parentNode2 = enode.parentNode) === null || _enode$parentNode2 === void 0 ? void 0 : _enode$parentNode2.parentNode) instanceof CellNode/* CellNode */.D)) {
           result = false;
         }
+        if (!hoEditorFactory.allowEditCellInForm) {
+          if ((enode === null || enode === void 0 ? void 0 : enode.parentNode) instanceof CellNode/* CellNode */.D) {
+            result = false;
+          }
+        }
       }
       if (!result) {
         message/* default.destroy */.Z.destroy();
@@ -256456,6 +256665,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_classCallCheck/* default */.Z)(this, HOEditorFactory);
     (0,esm_defineProperty/* default */.Z)(this, "_printBlack", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isUseForm", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_allowEditCellInForm", true);
     (0,esm_defineProperty/* default */.Z)(this, "_isUseImagePrint", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isFixedPrintToA4", void 0);
     (0,esm_defineProperty/* default */.Z)(this, "_isRotate", void 0);
@@ -256535,6 +256745,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     get:
     // 打印时将彩色字体转换成黑色
     // 是否启用表单模式
+    //表单模式下是否允许编辑单元格文本
     // 是否启用图片打印 默认不启用即使用svg打印
     // 是否将病历固定打印到a4纸上 默认不启用，如果启用则不管什么病历都会在打印生成a4尺寸的pdf，将病历居中靠上绘制到pdf上面
     // 特殊打印时是否旋转过pdf的context内容
@@ -256549,7 +256760,6 @@ var HOEditorFactory = /*#__PURE__*/function () {
     // 待加载的图片数量
     // 图片加载完成回调
     // 获取ai文本函数
-    //private _aiText = ""; // ai文本
 
     // 医生签名图片高度
     // 患者签名签字图片高度
@@ -257207,16 +257417,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     key: "aiTextFunc",
     get: function get() {
       return this._aiTextFunc;
-    }
-    // set aiText(value: string) {
-    // 	if (this._aiText !== value) {
-    // 		this._aiText = value;
-    // 	}
-    // }
-    // get aiText(): string {
-    // 	return this._aiText;
-    // }
-    ,
+    },
     set: function set(value) {
       if (this._aiTextFunc !== value) {
         this._aiTextFunc = value;
@@ -257312,6 +257513,16 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._isUseForm = value;
       }
     }
+  }, {
+    key: "allowEditCellInForm",
+    get: function get() {
+      return this._allowEditCellInForm;
+    },
+    set: function set(value) {
+      if (this._allowEditCellInForm !== value) {
+        this._allowEditCellInForm = value;
+      }
+    }
   }, {
     key: "printBlack",
     get: function get() {
@@ -257557,7 +257768,7 @@ var HoFooter_component = (0,componentNormalizer/* default */.Z)(
 
 /* harmony default export */ var HoFooter = (HoFooter_component.exports);
 // EXTERNAL MODULE: ./src/components/controls/ControlModal.vue + 3 modules
-var ControlModal = __webpack_require__(72522);
+var ControlModal = __webpack_require__(88736);
 // EXTERNAL MODULE: ./src/components/controls/findReplace/FindReplace.vue + 5 modules
 var FindReplace = __webpack_require__(25918);
 ;// CONCATENATED MODULE: ./src/components/controls/findReplace/index.ts
@@ -258901,8 +259112,8 @@ var ToolBarvue_type_template_id_529bb754_render = function render() {
 };
 var ToolBarvue_type_template_id_529bb754_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=32d7d27f&
-var HoMedicalExpressionvue_type_template_id_32d7d27f_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=48e0dd30&
+var HoMedicalExpressionvue_type_template_id_48e0dd30_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -259305,6 +259516,10 @@ var HoMedicalExpressionvue_type_template_id_32d7d27f_render = function render()
       "d": "M 60 0 L 60 60"
     }
   })])])])]), _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"
@@ -259400,7 +259615,7 @@ var HoMedicalExpressionvue_type_template_id_32d7d27f_render = function render()
     }
   })])])])])], 1)], 1)], 2)], 1);
 };
-var HoMedicalExpressionvue_type_template_id_32d7d27f_staticRenderFns = [];
+var HoMedicalExpressionvue_type_template_id_48e0dd30_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_ = ({
@@ -259424,8 +259639,8 @@ var HoMedicalExpressionvue_type_template_id_32d7d27f_staticRenderFns = [];
 ;
 var HoMedicalExpression_component = (0,componentNormalizer/* default */.Z)(
   insert_HoMedicalExpressionvue_type_script_lang_js_,
-  HoMedicalExpressionvue_type_template_id_32d7d27f_render,
-  HoMedicalExpressionvue_type_template_id_32d7d27f_staticRenderFns,
+  HoMedicalExpressionvue_type_template_id_48e0dd30_render,
+  HoMedicalExpressionvue_type_template_id_48e0dd30_staticRenderFns,
   false,
   null,
   null,
@@ -265615,7 +265830,11 @@ var HoRightMenu_component = (0,componentNormalizer/* default */.Z)(
         this.expressStyle = 'style7';
         this.updateNodeValue = [node.value1, node.value2, node.value3, node.value4, node.value5, node.value6];
       } else if (node instanceof PermanentTeethMapNode/* PermanentTeethMapNode */.f) {
-        this.expressStyle = 'style8';
+        if (node.remark == 'teeth') {
+          this.expressStyle = 'style10';
+        } else {
+          this.expressStyle = 'style8';
+        }
         this.updateNodeValue = [node.topLeftSelected, node.topRightSelected, node.bottomLeftSelected, node.bottomRightSelected];
       } else if (node instanceof PrimaryTeethMapNode/* PrimaryTeethMapNode */.x) {
         this.expressStyle = 'style9';