hoeditor-web 3.1.9 → 3.1.11

package/lib/hoeditor.umd.js

@@ -3596,7 +3596,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 62814:
+/***/ 72727:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3608,7 +3608,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ BarCodes; }
 });
 
-;// 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/barCode/BarCodes.vue?vue&type=template&id=15bd5089&
+;// 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/barCode/BarCodes.vue?vue&type=template&id=15c46fec&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -3842,9 +3842,9 @@ var HOEditorFactorys = __webpack_require__(74089);
       // this.dataSource = this.hoEditorProvider.getDataSource();
 
       if (this.controlStatus === 'add') {
-        vueController.insertBarcode(this.controlStatus, this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, '', this.innerIdentifier);
+        vueController.insertBarcode(this.controlStatus, this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, this.innerIdentifier);
       } else if (this.controlStatus === 'update') {
-        vueController.updateBarcode(this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, this.name, this.innerIdentifier);
+        vueController.updateBarcode(this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, this.innerIdentifier);
       }
       this.handleClose();
     },
@@ -3859,10 +3859,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=script&lang=js&
  /* harmony default export */ var barCode_BarCodesvue_type_script_lang_js_ = (BarCodesvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=15bd5089&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=15c46fec&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=15bd5089&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=15c46fec&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -13529,7 +13529,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 68763:
+/***/ 23875:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -13543,7 +13543,7 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
 var es_function_name = __webpack_require__(68309);
-;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=ddf4f372&
+;// 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/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=53dc81b2&
 
 var render = function render() {
   var _vm = this,
@@ -14252,7 +14252,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=ddf4f372&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=template&id=53dc81b2&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -14516,6 +14516,7 @@ var defaultBox = {
           v.groupName = _this2.groupName;
           v.controlStyle = _this2.controlType == 'RadioBox' ? 'RadioBox' : 'CheckBox';
           v.groupHasOptions = _this2.groupHasOptions;
+          v.readType = v.readType ? 1 : 0;
           if (v.id === _this2.tableRadio) v.isSelected = true;
           if (v.text == '') return; // 处理单复选文本值为空的情况
           _this2.vueController.insertRadioAndCheckBox('add', JSON.stringify(v));
@@ -14526,6 +14527,7 @@ var defaultBox = {
           v.groupName = _this2.groupName;
           v.controlStyle = _this2.controlType == 'RadioBox' ? 'RadioBox' : 'CheckBox';
           v.groupHasOptions = _this2.groupHasOptions;
+          v.readType = v.readType ? 1 : 0;
           if (v.id === _this2.tableRadio) v.isSelected = true;
           if (v.text == '') return; // 处理单复选文本值为空的情况
           if (v.tableType == 'update') {
@@ -14553,10 +14555,10 @@ var defaultBox = {
 });
 ;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=script&lang=js&
  /* harmony default export */ var radioCheckBox_RadioCheckboxvue_type_script_lang_js_ = (RadioCheckboxvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=ddf4f372&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=53dc81b2&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=ddf4f372&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/radioCheckBox/RadioCheckbox.vue?vue&type=style&index=0&id=53dc81b2&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -37863,7 +37865,7 @@ var Print = /*#__PURE__*/function () {
     key: "printToPDF",
     value: function () {
       var _printToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee2(hoEditorFactoryID, PDF, type, fileName, reslove, positionY, format, repeatPrintToA5) {
-        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, pageSize, last, pageNumber, startPageNumOver, _iterator, _step, _children$1$drawItems, _children$0$drawItems, index, cpage, children, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, ctx, _cpage$drawDomLevel, _cpage$drawDomLevel2, _cpage$drawDomLevel3, _cpage$drawDomLevel4, _cpage$drawDomLevel5, _cpage$drawDomLevel6, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s, _svgBox, printStyle, exportHtml, url, link, _last, otherPageNumber, i, name;
+        var hoEditorFactory, dPage, docHeight, dHeight, startPageNum, svgBox, orientation, width, height, pageSize, last, pageNumber, startPageNumOver, _iterator, _step, _children$1$drawItems, _children$0$drawItems, index, cpage, children, mainHeight, lastDline, dShape, posIndex, posY, _dShape, svg2pdfOptions, ctx, _cpage$drawDomLevel, _cpage$drawDomLevel2, _cpage$drawDomLevel3, _cpage$drawDomLevel4, _cpage$drawDomLevel5, _cpage$drawDomLevel6, _ctx, _ctx2, _svgBox2, svgData, _ctx3, _cpage$drawDomLevel$s, _last, _svgBox, printStyle, exportHtml, url, link, otherPageNumber, i, name;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -38107,18 +38109,31 @@ var Print = /*#__PURE__*/function () {
               console.timeEnd('绘制svg和生成pdf');
               if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
               hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
+              if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
+                _context3.next = 82;
+                break;
+              }
+              _last = hoEditorFactory.printStatus.printRecord.last();
+              if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
+                _context3.next = 82;
+                break;
+              }
+              message/* default */.Z.info('无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录');
+              reslove && reslove('printend');
+              return _context3.abrupt("return");
+            case 82:
               if (!(type === 'html')) {
-                _context3.next = 93;
+                _context3.next = 101;
                 break;
               }
               if (!(svgBox && svgBox.childNodes.length === 0)) {
-                _context3.next = 81;
+                _context3.next = 87;
                 break;
               }
               message/* default */.Z.info('无新增内容');
               reslove && reslove('printend');
               return _context3.abrupt("return");
-            case 81:
+            case 87:
               printStyle = (0,util/* createPrintHTMLStyle */.j_)(hoEditorFactory.pageProperty.pageSize, orientation);
               exportHtml = "\n                <!DOCTYPE html>\n                <html lang=\"en\">\n                    <head>\n                    <meta charset=\"utf-8\">\n                    <style>".concat(printStyle.innerHTML, "</style>\n                    </head>\n                    <body>").concat((_svgBox = svgBox) === null || _svgBox === void 0 ? void 0 : _svgBox.innerHTML, "</body>\n                </html>\n            ");
               url = window.URL.createObjectURL(new Blob([exportHtml], {
@@ -38135,20 +38150,7 @@ var Print = /*#__PURE__*/function () {
               }, 100);
               reslove && reslove('printend');
               return _context3.abrupt("return");
-            case 93:
-              if (!(positionY || hoEditorFactory.startPageNum !== 0 && positionY !== undefined)) {
-                _context3.next = 99;
-                break;
-              }
-              _last = hoEditorFactory.printStatus.printRecord.last();
-              if (!(_last && hoEditorFactory.startPageNum == _last[0] && positionY === _last[1])) {
-                _context3.next = 99;
-                break;
-              }
-              message/* default */.Z.info('无新增内容无法续打，如果要打印最后一份病历，请打开打印记录，删除最近一次打印记录');
-              reslove && reslove('printend');
-              return _context3.abrupt("return");
-            case 99:
+            case 101:
               if (type === 'pdf') {
                 PDF === null || PDF === void 0 ? void 0 : PDF.deletePage(1);
                 PDF === null || PDF === void 0 ? void 0 : PDF.save(fileName + '.pdf');
@@ -38170,8 +38172,9 @@ var Print = /*#__PURE__*/function () {
                 name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                 PDF && this.openDataUriInWindow(PDF, name, hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.printSilently);
               }
+            case 102:
               reslove && reslove('printend');
-            case 101:
+            case 103:
             case "end":
               return _context3.stop();
           }
@@ -38403,7 +38406,7 @@ var Print = /*#__PURE__*/function () {
   }, {
     key: "printAllNew",
     value: function () {
-      var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position, isPrintFirstDoc) {
+      var _printAllNew = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee5(hoEditorFactoryID, reslove, PDF, position, isPrintFirstDoc, pageNumber) {
         var hoEditorFactory, a4Size, svgBox, last, widthPixes, heightPixes, orientation, formats, format, svg2pdfOptions, firstPageIndex, _iterator4, _step4, _cpage$drawDomLevel14, index, cpage, children, _cpage$drawDomLevel12, pageSize, ctx, _cpage$drawDomLevel13, _ctx7, _ctx6, lastPos;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee5$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -38452,7 +38455,7 @@ var Print = /*#__PURE__*/function () {
               _iterator4.s();
             case 19:
               if ((_step4 = _iterator4.n()).done) {
-                _context6.next = 55;
+                _context6.next = 56;
                 break;
               }
               index = _step4.value;
@@ -38461,13 +38464,13 @@ var Print = /*#__PURE__*/function () {
                 break;
               }
               message/* default */.Z.info('请进行翻页');
-              return _context6.abrupt("continue", 53);
+              return _context6.abrupt("continue", 54);
             case 24:
               if (!(index < firstPageIndex)) {
                 _context6.next = 26;
                 break;
               }
-              return _context6.abrupt("continue", 53);
+              return _context6.abrupt("continue", 54);
             case 26:
               last = index;
               cpage = hoEditorFactory.drawTree.drawPages[index];
@@ -38494,7 +38497,7 @@ var Print = /*#__PURE__*/function () {
                 _context6.next = 33;
                 break;
               }
-              return _context6.abrupt("continue", 53);
+              return _context6.abrupt("continue", 54);
             case 33:
               if (!hoEditorFactory.isUseImagePrint) {
                 _context6.next = 46;
@@ -38548,22 +38551,23 @@ var Print = /*#__PURE__*/function () {
             case 51:
               _ctx6 = null;
             case 52:
+              if (pageNumber) pageNumber.value++;
               index > 0 && ((_cpage$drawDomLevel14 = cpage.drawDomLevel) === null || _cpage$drawDomLevel14 === void 0 ? void 0 : _cpage$drawDomLevel14.clearStage());
-            case 53:
+            case 54:
               _context6.next = 19;
               break;
-            case 55:
-              _context6.next = 60;
+            case 56:
+              _context6.next = 61;
               break;
-            case 57:
-              _context6.prev = 57;
+            case 58:
+              _context6.prev = 58;
               _context6.t0 = _context6["catch"](17);
               _iterator4.e(_context6.t0);
-            case 60:
-              _context6.prev = 60;
+            case 61:
+              _context6.prev = 61;
               _iterator4.f();
-              return _context6.finish(60);
-            case 63:
+              return _context6.finish(61);
+            case 64:
               if (hoEditorFactory.printStatus.printRange !== PrintRange.prSelected) {
                 hoEditorFactory.printStatus.recordLastPosByPageIndex(last);
               }
@@ -38577,13 +38581,13 @@ var Print = /*#__PURE__*/function () {
               }
               hoEditorFactory.printStatus.DrawPrintRange().PrintOver();
               reslove();
-            case 67:
+            case 68:
             case "end":
               return _context6.stop();
           }
-        }, _callee5, null, [[17, 57, 60, 63]]);
+        }, _callee5, null, [[17, 58, 61, 64]]);
       }));
-      function printAllNew(_x16, _x17, _x18, _x19, _x20) {
+      function printAllNew(_x16, _x17, _x18, _x19, _x20, _x21) {
         return _printAllNew.apply(this, arguments);
       }
       return printAllNew;
@@ -41150,6 +41154,10 @@ var DocController = /*#__PURE__*/function () {
                 }
               }
             }
+            var record = hoEditorFactory.docTree.elementChangeRecords.get(node.id + "|" + node.dataId);
+            if (!record || record.indexOf("add") < 0) {
+              hoEditorFactory.docTree.elementChangeRecords.set(node.id + "|" + node.dataId, "update");
+            }
             return "";
           } else {
             return "";
@@ -41177,6 +41185,11 @@ var DocController = /*#__PURE__*/function () {
       var afterPath = hoEditorFactory.docTree.getNodeLastPath(textInputFieldNode);
       //hoEditorFactory.drawTree.moveCaretToPath(afterPath);
       hoEditorFactory.docTree.curDomRange.setSamePath(afterPath);
+      if (parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_47__/* .TextInputFieldNode */ .re) {
+        hoEditorFactory.docTree.elementChangeRecords.set(textInputFieldNode.id + "|" + textInputFieldNode.dataId, "add");
+      } else {
+        hoEditorFactory.docTree.elementChangeRecords.set(textInputFieldNode.id + "|" + textInputFieldNode.dataId, "add0");
+      }
       return afterPath;
     }
     /**
@@ -41213,7 +41226,8 @@ var DocController = /*#__PURE__*/function () {
     key: "insertBarcode",
     value: function insertBarcode(operType, curDomRange, id, textContent, isDisplayText, imagePath, width, height,
     //bandDataSource: string,
-    name, innerIdentifier) {
+    //name: string,
+    innerIdentifier) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
@@ -41230,7 +41244,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_50__/* .BarcodeNode */ .T(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntImage, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height
+      var barCodeNode = new _treeNode_BarcodeNode__WEBPACK_IMPORTED_MODULE_50__/* .BarcodeNode */ .T(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntImage, id,
+      //name,
+      innerIdentifier, textContent, isDisplayText, imagePath, width, height
       //,bandDataSource
       );
       //插入该表达式节点
@@ -41257,15 +41273,7 @@ var DocController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertQrcode",
-    value: function insertQrcode(operType, curDomRange, id, textContent, type, correctLevel,
-    // dataSourceEnabled: boolean,
-    // dataSource: string,
-    // format: string,
-    // visitPath: string,
-    // isReadOnly: boolean,
-    // autoUpdate: boolean,
-    // execState: string,
-    width, height, name, innerIdentifier, isFillBack) {
+    value: function insertQrcode(operType, curDomRange, id, textContent, type, correctLevel, width, height, name, innerIdentifier, isFillBack) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
@@ -41283,15 +41291,7 @@ var DocController = /*#__PURE__*/function () {
         }
       }
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var qrcodeNode = new _treeNode_QrcodeNode__WEBPACK_IMPORTED_MODULE_51__/* .QrcodeNode */ .d(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .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_51__/* .QrcodeNode */ .d(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_25__/* .NodeType */ .Jq.ntImage, id, name, innerIdentifier, textContent, type, correctLevel, width, height, isFillBack);
       //插入该表达式节点
       if (operType === "add") {
         hoEditorFactory.undoService.begin();
@@ -42439,7 +42439,7 @@ var DocController = /*#__PURE__*/function () {
     key: "insertDownList",
     value: function () {
       var _insertDownList = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().mark(function _callee3(operType, curDomRange, valuesObject, downListContent, styleIndex) {
-        var domRange, startPath, oldDataID, oldId, hoEditorFactory, np, node, parentNode, downListNode;
+        var domRange, startPath, oldDataID, oldId, hoEditorFactory, np, node, parentNode, downListNode, record;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -42482,7 +42482,19 @@ var DocController = /*#__PURE__*/function () {
               }
               hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_26__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, downListNode));
               hoEditorFactory.undoService.commit();
-            case 21:
+              if (operType === "add") {
+                if (parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_47__/* .TextInputFieldNode */ .re) {
+                  hoEditorFactory.docTree.elementChangeRecords.set(downListNode.id + "|" + downListNode.dataId, "add");
+                } else {
+                  hoEditorFactory.docTree.elementChangeRecords.set(downListNode.id + "|" + downListNode.dataId, "add0");
+                }
+              } else {
+                record = hoEditorFactory.docTree.elementChangeRecords.get(downListNode.id + "|" + downListNode.dataId);
+                if (!record || record.indexOf("add") < 0) {
+                  hoEditorFactory.docTree.elementChangeRecords.set(downListNode.id + "|" + downListNode.dataId, "update");
+                }
+              }
+            case 22:
             case "end":
               return _context3.stop();
           }
@@ -43951,6 +43963,7 @@ var DocTree = /*#__PURE__*/function () {
     //文档属性
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_isSaveValid", false);
     //是否是保存校验
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_elementChangeRecords", void 0);
     // private _curUserIndex: number; //当前用户
     //private _curOnSelectedComment: Comment | null; //当前处于选中状态的批注
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_ctlKey", 0);
@@ -43976,6 +43989,7 @@ var DocTree = /*#__PURE__*/function () {
     this._curOnDragNode = null;
     //this._comments = new Array<Comment>();
     this._userHistories = new Array();
+    this._elementChangeRecords = new Map();
     // this._docProperty = new DocProperty(this);
     // this._curUserIndex = -1;
     //this._curOnSelectedComment = null;
@@ -44129,6 +44143,16 @@ var DocTree = /*#__PURE__*/function () {
         this._userHistories = value;
       }
     }
+  }, {
+    key: "elementChangeRecords",
+    get: function get() {
+      return this._elementChangeRecords;
+    },
+    set: function set(value) {
+      if (value !== this._elementChangeRecords) {
+        this._elementChangeRecords = value;
+      }
+    }
   }, {
     key: "docProperty",
     get: function get() {
@@ -45849,6 +45873,7 @@ var DocTree = /*#__PURE__*/function () {
       this._radioAndCheckBoxsMap = new Map();
       this._curOnDragNode = null;
       this._userHistories = new Array();
+      this._elementChangeRecords = new Map();
       var curPath = this._mainNodes[0].getNodePath();
       this._curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_24__/* .DomRange */ .a(this._hoEditorFactoryID, curPath, curPath);
     }
@@ -47574,7 +47599,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-08-23 15:35:57
+ * @LastEditTime: 2023-09-15 15:03:38
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -47600,10 +47625,8 @@ var TableProperty = /*#__PURE__*/function () {
     //用户可删除表格
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_continuePrintBorders", false);
     //续打时打印所有单元格边框
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_layoutFullLine", true);
-    //排版时占据整行
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_tightLineSpace", false);
-    //压缩表格上下行间距
+    //private _layoutFullLine = true;//排版时占据整行
+    //private _tightLineSpace = false;//压缩表格上下行间距
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_isAutoChangeLine", false);
     //表格内是否自动换行
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(this, "_autoLineHeight", 0.53);
@@ -47703,22 +47726,6 @@ var TableProperty = /*#__PURE__*/function () {
     set: function set(value) {
       this._continuePrintBorders = value;
     }
-  }, {
-    key: "layoutFullLine",
-    get: function get() {
-      return this._layoutFullLine;
-    },
-    set: function set(value) {
-      this._layoutFullLine = value;
-    }
-  }, {
-    key: "tightLineSpace",
-    get: function get() {
-      return this._tightLineSpace;
-    },
-    set: function set(value) {
-      this._tightLineSpace = value;
-    }
   }, {
     key: "isAutoChangeLine",
     get: function get() {
@@ -50407,14 +50414,11 @@ var UserHistory = /*#__PURE__*/function () {
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(57658);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(68309);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(9653);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var _editor_draw_drawNode_DrawBarcodeNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(48396);
-/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(62358);
-/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(90161);
-
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _editor_draw_drawNode_DrawBarcodeNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(48396);
+/* harmony import */ var _BaseNode__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(62358);
+/* harmony import */ var _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(90161);
 
 
 
@@ -50530,7 +50534,7 @@ var BandDataSource = /*#__PURE__*/function () {
       ret._visitPath = "";
       ret._isReadOnly = false;
       ret._autoUpdate = false;
-      ret._executeStatus = _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_16__/* .ExecuteStatus */ .hc.AlwaysExec;
+      ret._executeStatus = _TextInputFieldNode__WEBPACK_IMPORTED_MODULE_15__/* .ExecuteStatus */ .hc.AlwaysExec;
       return ret;
     }
   }]);
@@ -50540,7 +50544,9 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(BarcodeNode, _BaseNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(BarcodeNode);
   //private _bandDataSource!: BandDataSource; //绑定数据源
-  function BarcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, isDisplayText, imagePath, width, height,
+  function BarcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id,
+  //name: string,
+  innerIdentifier, textContent, isDisplayText, imagePath, width, height,
   //bandDataSource: string,
   scaleX, scaleY) {
     var _this;
@@ -50548,8 +50554,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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), "_id", void 0);
     //编号
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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), "_name", void 0);
-    //名称
+    //private _name!: string;//名称
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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), "_innerIdentifier", void 0);
     //内部标识符
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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), "_textContent", "");
@@ -50562,8 +50567,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     //条形码高
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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), "_scaleX", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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_6__/* ["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", "");
-    //扩展字段
+    //private _remark = ""; //扩展字段
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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", "");
     _this._id = id;
     _this._textContent = textContent;
@@ -50573,7 +50577,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     _this._height = height;
     _this._scaleX = scaleX ? scaleX : 1;
     _this._scaleY = scaleY ? scaleY : 1;
-    _this._name = name ? name : "";
+    //this._name = name ? name : "";
     _this._innerIdentifier = innerIdentifier ? innerIdentifier : "";
     //this._bandDataSource = new BandDataSource();
     //this.setValuesObject(bandDataSource);
@@ -50607,16 +50611,14 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     get: function get() {
       return this._id;
     }
-  }, {
-    key: "remark",
-    get: function get() {
-      return this._remark;
-    },
-    set: function set(value) {
-      if (this._remark !== value) {
-        this._remark = value;
-      }
-    }
+    // get remark(): string {
+    //   return this._remark;
+    // }
+    // set remark(value: string) {
+    //   if (this._remark !== value) {
+    //     this._remark = value;
+    //   }
+    // }
   }, {
     key: "textContent",
     get: function get() {
@@ -50683,16 +50685,14 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     //     this._bandDataSource = value;
     //   }
     // }
-  }, {
-    key: "name",
-    get: function get() {
-      return this._name;
-    },
-    set: function set(value) {
-      if (this._name !== value) {
-        this._name = value;
-      }
-    }
+    // get name(): string {
+    //   return this._name;
+    // }
+    // set name(value: string) {
+    //   if (this._name !== value) {
+    //     this._name = value;
+    //   }
+    // }
   }, {
     key: "innerIdentifier",
     get: function get() {
@@ -50717,7 +50717,7 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange(startIndex, endIndex) {
-      var dNode = new _editor_draw_drawNode_DrawBarcodeNode__WEBPACK_IMPORTED_MODULE_14__/* .DrawBarcodeNode */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.textContent, this.isDisplayText, this.imageDataBase64String, this.width, this.height, this.scaleX, this.scaleY);
+      var dNode = new _editor_draw_drawNode_DrawBarcodeNode__WEBPACK_IMPORTED_MODULE_13__/* .DrawBarcodeNode */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.textContent, this.isDisplayText, this.imageDataBase64String, this.width, this.height, this.scaleX, this.scaleY);
       this._drawNodes.push(dNode);
     }
   }, {
@@ -50754,21 +50754,29 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
       var scaleX = drawBarcodeNode.children[0].scaleX;
       var scaleY = drawBarcodeNode.children[0].scaleY;
       var retObj = {
-        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Jq[this.nodeType],
+        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_14__/* .NodeType */ .Jq[this.nodeType],
         imageType: "Barcode",
         id: this.id,
-        name: this.name,
         innerIdentifier: this.innerIdentifier,
         textContent: this.textContent,
-        isDisplayText: this.isDisplayText,
+        //isDisplayText: this.isDisplayText,
         width: width,
         height: height,
-        scaleX: scaleX,
-        scaleY: scaleY,
-        imageDataBase64String: this.imageDataBase64String,
-        //andDataSource: this.bandDataSource,
-        remark: this.remark
+        //scaleX: scaleX,
+        //scaleY: scaleY,
+        imageDataBase64String: this.imageDataBase64String
+        //remark: this.remark
       };
+
+      if (this.scaleX !== 1) {
+        retObj.scaleX = this.scaleX;
+      }
+      if (this.scaleY !== 1) {
+        retObj.scaleY = this.scaleY;
+      }
+      if (this.isDisplayText) {
+        retObj.isDisplayText = this.isDisplayText;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -50791,17 +50799,15 @@ var BarcodeNode = /*#__PURE__*/function (_BaseNode) {
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
       var width = Number(json.width);
       var height = Number(json.height);
-      var scaleX = Number(json.scaleX);
-      var scaleY = Number(json.scaleY);
+      var scaleX = json.scaleX === undefined ? 1 : Number(json.scaleX);
+      var scaleY = json.scaleY === undefined ? 1 : 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_15__/* .NodeType */ .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_14__/* .NodeType */ .Jq.ntImage, json.id, json.innerIdentifier, json.textContent, isDisplayText, json.imageDataBase64String, width, height, scaleX, scaleY);
     }
   }]);
   return BarcodeNode;
-}(_BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .BaseNode */ .Hd);
+}(_BaseNode__WEBPACK_IMPORTED_MODULE_14__/* .BaseNode */ .Hd);
 
 /***/ }),
 
@@ -52427,15 +52433,15 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
           if (cellPropertyJson["gridLineDisplay"] === "true,true,true,true") {
             delete cellPropertyJson["gridLineDisplay"];
           }
-        }
-        // 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]];
+        } else {
+          if (keysName[k] === "backColor") {
+            if (cellPropertyJson["backColor"].toString().toLowerCase() === defaultCellPropJson["backColor"].toString().toLowerCase()) {
+              delete cellPropertyJson["backColor"];
+            }
+          } else {
+            if (cellPropertyJson[keysName[k]] === defaultCellPropJson[keysName[k]]) {
+              delete cellPropertyJson[keysName[k]];
+            }
           }
         }
       }
@@ -52456,19 +52462,35 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
         }
       }
       var cellText = this.getCellText(clearSign);
-      return {
+      var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_31__/* .NodeType */ .Jq[this.nodeType],
-        borderVisible: this.borderVisible.toString(),
-        crossLineType: CrossLineType[this.crossLineType],
-        rowSpan: this.rowSpan,
-        colSpan: this.colSpan,
+        //borderVisible: this.borderVisible.toString(),
+        //crossLineType: CrossLineType[this.crossLineType],
+        //rowSpan: this.rowSpan,
+        //colSpan: this.colSpan,
         childNodes: childNodes,
         rowNo: rowNo,
         colNo: colNo,
-        cellProperty: cellPropertyJson,
+        //cellProperty: cellPropertyJson,
         isModified: false,
         text: cellText
       };
+      if (this.borderVisible.toString() !== "true,true,true,true") {
+        retObj.borderVisible = this.borderVisible.toString();
+      }
+      if (this.crossLineType !== CrossLineType.ctNone) {
+        retObj.crossLineType = CrossLineType[this.crossLineType];
+      }
+      if (this.rowSpan !== 1) {
+        retObj.rowSpan = this.rowSpan;
+      }
+      if (this.colSpan !== 1) {
+        retObj.colSpan = this.colSpan;
+      }
+      if (Object.keys(cellPropertyJson).length > 0) {
+        retObj.cellProperty = cellPropertyJson;
+      }
+      return retObj;
     }
   }, {
     key: "removeChild",
@@ -52672,16 +52694,18 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
     }
   }], [{
     key: "json2Node",
-    value: function json2Node(hoEditorFactoryID, json, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste, isClearSign) {
+    value: function json2Node(hoEditorFactoryID, json, rootNodes, tableNode, aRow, rowsMap, rows,
+    //defaultCellProperty: any,
+    isPaste, isClearSign) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_24__/* .HOEditorFactorys */ .b.instance().getFactory(hoEditorFactoryID);
       var rowNo = parseInt(json.rowNo);
       var colNo = parseInt(json.colNo);
       aRow = rowsMap.get(rowNo);
       var cellNode = new CellNode(hoEditorFactoryID, rootNodes, tableNode, aRow, undefined, rowNo, colNo, 1, 1, new _TableProperty__WEBPACK_IMPORTED_MODULE_29__/* .CellProperty */ .$W(""));
       var cellProperty = json.cellProperty;
-      if (cellProperty === "") {
-        cellProperty = JSON.parse("{}");
-      }
+      // if (cellProperty === "") {
+      //   cellProperty = JSON.parse("{}");
+      // }
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
           if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target[value]) == "object") {
@@ -52721,7 +52745,9 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
           ;
         });
       };
-      assignvalue(cellNode.cellProperty, cellProperty);
+      if (cellProperty && Object.keys(cellProperty).length > 0) {
+        assignvalue(cellNode.cellProperty, cellProperty);
+      }
       aRow.splice(colNo, 1);
       aRow.splice(colNo, 0, cellNode);
       //aRow.push(cellNode);
@@ -52732,10 +52758,10 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
       //   }
       // }
       cellNode.initBlankDoc();
-      cellNode.rowSpan = Number(json.rowSpan);
-      cellNode.colSpan = Number(json.colSpan);
-      cellNode.borderVisible = json.borderVisible;
-      cellNode.crossLineType = Number(CrossLineType[json.crossLineType]);
+      cellNode.rowSpan = json.rowSpan === undefined ? 1 : Number(json.rowSpan);
+      cellNode.colSpan = json.colSpan === undefined ? 1 : Number(json.colSpan);
+      cellNode.borderVisible = json.borderVisible === undefined ? "true,true,true,true" : json.borderVisible;
+      cellNode.crossLineType = json.crossLineType === undefined ? 0 : Number(CrossLineType[json.crossLineType]);
       rows[rowNo] = aRow;
       cellNode.row = aRow;
       rows[rowNo][colNo] = cellNode;
@@ -52883,7 +52909,7 @@ var CellNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-18 11:43:06
- * @LastEditTime: 2023-06-30 16:37:49
+ * @LastEditTime: 2023-09-14 11:16:12
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\ControlNode.ts
@@ -52917,7 +52943,7 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["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_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["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_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["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_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this), "_title", void 0);
+    //protected _title!: string;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this), "_styleIndex", void 0);
     // protected _checkCascadeObject!: string;
     // protected _unCheckCascadeObject!: string;
@@ -53046,16 +53072,14 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
         this._text = value;
       }
     }
-  }, {
-    key: "title",
-    get: function get() {
-      return this._title;
-    },
-    set: function set(value) {
-      if (this._title !== value) {
-        this._title = value;
-      }
-    }
+    // get title(): string {
+    //   return this._title;
+    // }
+    // set title(value: string) {
+    //   if (this._title !== value) {
+    //     this._title = value;
+    //   }
+    // }
   }, {
     key: "styleIndex",
     get: function get() {
@@ -53192,6 +53216,14 @@ var ControlNode = /*#__PURE__*/function (_BaseNode) {
     value: function _delete(operType, nodeType) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys */ .b.instance().getFactory(this.hoEditorFactoryID);
       if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_9__/* .PaintState */ .Dh.psDesign || this.isAllowDelete) {
+        if (nodeType === "DownList") {
+          var record = hoEditorFactory.docTree.elementChangeRecords.get(this.id + "|" + this.dataId);
+          if (record && record.indexOf("add") >= 0) {
+            hoEditorFactory.docTree.elementChangeRecords.delete(this.id + "|" + this.dataId);
+          } else {
+            hoEditorFactory.docTree.elementChangeRecords.set(this.id + "|" + this.dataId, "delete");
+          }
+        }
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(ControlNode.prototype), "delete", this).call(this);
       } else {
         if (operType !== "update") {
@@ -53328,45 +53360,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(_this), "_controlStyle", "");
     _this._styleIndex = styleIndex;
     _this.remark = "";
-    // if (valuesObj["id"] !== undefined) {
-    //   this._id = valuesObj["id"];
-    // }
     _this._type = _ControlNode__WEBPACK_IMPORTED_MODULE_25__/* .ControlType */ .C.ctDateTime;
-    // if (valuesObj["name"] !== undefined) {
-    //   this._name = valuesObj["name"];
-    // }
-    // if (valuesObj["controlStyle"] !== undefined) {
-    //   this._controlStyle = valuesObj["controlStyle"];
-    // }
-    // if (valuesObj["labelText"] !== undefined) {
-    //   this._labelText = valuesObj["labelText"];
-    // }
-    // if (this._labelText === "") {
-    //   this.labelText = this._name !== "" ? this.name : this._controlStyle;
-    // }
-    // if (valuesObj["text"] !== undefined && valuesObj["text"] !== null && valuesObj["text"] !== '') {
-    //   this._text = valuesObj["text"];
-    // } else {
-    //   this._text = this._labelText !== "" && this._labelText !== undefined && this._labelText != null ? this._labelText : " ";
-    // }
-    // if (valuesObj["title"] !== undefined) {
-    //   this._title = valuesObj["title"];
-    // }
-    // if (valuesObj["tipText"] !== undefined) {
-    //   this._tipText = valuesObj["tipText"];
-    // }
-    // if (valuesObj["isAllowDelete"] !== undefined) {
-    //   this._isAllowDelete = valuesObj["isAllowDelete"];
-    // }
-    // if (valuesObj["isReadOnly"] !== undefined) {
-    //   this._isReadOnly = valuesObj["isReadOnly"];
-    // }
-    // if (valuesObj["readType"] !== undefined) {
-    //   this._readType = valuesObj["readType"];
-    // }
-    // if (valuesObj["dataId"] !== undefined) {
-    //   this.dataId = valuesObj["dataId"];
-    // }
     _this.customProperty = new Object();
     _this.setValuesObject(valuesObject);
     if (!_this.dataId) {
@@ -53577,7 +53571,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
           name: this.name,
           text: isClearValue || this.text === this.name ? "" : this.text,
           labelText: this.labelText,
-          title: this.title,
+          //title: this.title,
           styleIndex: this.styleIndex,
           tipText: this.tipText,
           isAllowDelete: this.isAllowDelete,
@@ -53602,22 +53596,44 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
         identifierFormat: this.identifierFormat,
-        isSynchro: this.isSynchro,
+        //isSynchro: this.isSynchro,
         controlStyle: this.controlStyle.replace("hh", "HH"),
         name: this.name,
         text: isClearValue || this.text === this.name ? "" : this.text,
         labelText: this.labelText,
-        title: this.title,
+        //title: this.title,
         styleIndex: this.styleIndex,
-        tipText: this.tipText,
-        isAllowDelete: this.isAllowDelete,
-        isReadOnly: this.isReadOnly,
+        //tipText: this.tipText,
+        //isAllowDelete: this.isAllowDelete,
+        //isReadOnly: this.isReadOnly,
         readType: this.readType,
-        customProperty: this.customProperty,
-        notReplaceElement: this.notReplaceElement,
-        notSelectTime: this.notSelectTime,
-        remark: this.remark
+        customProperty: this.customProperty
+        //notReplaceElement: this.notReplaceElement,
+        //notSelectTime: this.notSelectTime,
+        //remark: this.remark,
       };
+
+      if (this.isSynchro) {
+        retObj.isSynchro = this.isSynchro;
+      }
+      if (this.tipText) {
+        retObj.tipText = this.tipText;
+      }
+      if (this.isAllowDelete) {
+        retObj.isAllowDelete = this.isAllowDelete;
+      }
+      if (this.isReadOnly) {
+        retObj.isReadOnly = this.isReadOnly;
+      }
+      if (this.notReplaceElement) {
+        retObj.notReplaceElement = this.notReplaceElement;
+      }
+      if (this.notSelectTime) {
+        retObj.notSelectTime = this.notSelectTime;
+      }
+      if (this.remark) {
+        retObj.remark = this.remark;
+      }
       var paga = {
         "DateTimeNode": retObj
       };
@@ -53644,6 +53660,7 @@ var DateTimeNode = /*#__PURE__*/function (_ControlNode) {
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isReadOnly = !json.isReadOnly ? false : json.isReadOnly;
+      json.notReplaceElement = !json.notReplaceElement ? false : json.notReplaceElement;
       json.notSelectTime = !json.notSelectTime ? false : json.notSelectTime;
       json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_25__/* .ControlType */ .C[json.type]);
       json.controlStyle = json.controlStyle.replace("hh", "HH");
@@ -54210,7 +54227,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       var ret = new DownListNodeInstance();
       ret.Id = this.id !== undefined ? this.id : ret.Id;
       ret.Name = this.name !== undefined ? this.name : ret.Name;
-      ret.Title = this.title !== undefined ? this.title : ret.Title;
+      //ret.Title = this.title !== undefined ? this.title : ret.Title;
       ret.Text = this.text !== undefined ? this.text : ret.Text;
       ret.KeyValue = this.keyValue !== undefined ? this.keyValue : ret.KeyValue;
       ret.TipText = this.tipText !== undefined ? this.tipText : ret.TipText;
@@ -54381,7 +54398,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
           text: this.keyValue == "" ? "" : this.text,
           keyValue: this.keyValue,
           value: this.value,
-          title: this.title,
+          //title: this.title,
           styleIndex: this.styleIndex,
           tipText: this.tipText,
           labelText: this.labelText,
@@ -54409,25 +54426,46 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
         identifierFormat: this.identifierFormat,
-        isSynchro: this.isSynchro,
+        //isSynchro: this.isSynchro,
         name: this.name,
         text: this.keyValue == "" ? "" : this.text,
         keyValue: this.keyValue,
         value: this.value,
-        title: this.title,
+        //title: this.title,
         styleIndex: this.styleIndex,
-        tipText: this.tipText,
+        //tipText: this.tipText,
         labelText: this.labelText,
-        isAllowDelete: this.isAllowDelete,
-        isReadOnly: this.isReadOnly,
-        mutexSelect: this.mutexSelect,
-        allowMultiSelect: this.allowMultiSelect,
+        //isAllowDelete: this.isAllowDelete,
+        //isReadOnly: this.isReadOnly,
+        //mutexSelect: this.mutexSelect,
+        //allowMultiSelect: this.allowMultiSelect,
         readType: this.readType,
         downLists: downLists,
         //dataSource: this.bandDataSource,
-        remark: this.remark,
+        //remark: this.remark,
         customProperty: this.customProperty
       };
+      if (this.isSynchro) {
+        retObj.isSynchro = this.isSynchro;
+      }
+      if (this.tipText) {
+        retObj.tipText = this.tipText;
+      }
+      if (this.isAllowDelete) {
+        retObj.isAllowDelete = this.isAllowDelete;
+      }
+      if (this.isReadOnly) {
+        retObj.isReadOnly = this.isReadOnly;
+      }
+      if (this.mutexSelect) {
+        retObj.mutexSelect = this.mutexSelect;
+      }
+      if (this.allowMultiSelect) {
+        retObj.allowMultiSelect = this.allowMultiSelect;
+      }
+      if (this.remark) {
+        retObj.remark = this.remark;
+      }
       var paga = {
         "DownListNode": retObj
       };
@@ -55384,8 +55422,8 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
       var drawImageNode = this.drawNodes[0];
       var width = drawImageNode.dWidth;
       var height = drawImageNode.dHeight;
-      var scaleX = drawImageNode.children[0].scaleX;
-      var scaleY = drawImageNode.children[0].scaleY;
+      //const scaleX = drawImageNode.children[0].scaleX;
+      //const scaleY = drawImageNode.children[0].scaleY;
       var retObj = {
         nodeType: BaseNode/* NodeType */.Jq[this.nodeType],
         imageType: "Image",
@@ -55394,12 +55432,25 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
         height: height,
         //scaleX: scaleX,
         //scaleY: scaleY,
-        imageDataBase64String: this.imageDataBase64String,
-        isFormula: this.isFormula,
-        remark: this.remark,
-        markImage: this.markImage,
-        imageJson: this.imageJson
+        imageDataBase64String: this.imageDataBase64String
+        //isFormula: this.isFormula,
+        //remark: this.remark,
+        //markImage: this.markImage,
+        //imageJson: this.imageJson
       };
+
+      if (this.isFormula) {
+        retObj.isFormula = this.isFormula;
+      }
+      if (this.remark) {
+        retObj.remark = this.remark;
+      }
+      if (this.markImage) {
+        retObj.markImage = this.markImage;
+      }
+      if (this.imageJson) {
+        retObj.imageJson = this.imageJson;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -55573,7 +55624,7 @@ var DrawTree = __webpack_require__(51760);
  * @Author: liyanan 2441631434@qq.com
  * @Date: 2023-03-17 14:00:18
  * @LastEditors: liyanan 2441631434@qq.com
- * @LastEditTime: 2023-03-17 17:53:26
+ * @LastEditTime: 2023-05-09 16:23:54
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\JumpButtonNode.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -55629,15 +55680,6 @@ var JumpButtonNode = /*#__PURE__*/function (_BaseNode) {
   }, {
     key: "node2DrawNodeRange",
     value: function node2DrawNodeRange() {
-      //const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
-      // const textStyle = hoEditorFactory.docTree.styles[this._styleIndex];
-      // let cbStyle;
-      // if (textStyle) {
-      //     cbStyle = textStyle.combineStyle;
-      // } else {
-      //     cbStyle = hoEditorFactory.docTree.styles[0].combineStyle;
-      // }
-      //const dHeight = hoEditorFactory.getFontHeightByFontSize(14);
       var dNode = new DrawJumpButton(this._hoEditorFactoryID, this._rootPath, this, this.name);
       this._drawNodes.push(dNode);
     }
@@ -55895,9 +55937,13 @@ var LabelNode = /*#__PURE__*/function (_ControlNode) {
       var retObj = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_13__/* .NodeType */ .Jq[this.nodeType],
         text: this.text,
-        styleIndex: this.styleIndex,
-        associatedElement: this.associatedElement
+        styleIndex: this.styleIndex
+        //associatedElement: this.associatedElement,
       };
+
+      if (this.associatedElement) {
+        retObj.associatedElement = this.associatedElement;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -57073,9 +57119,13 @@ var MenstrualHistoryNode = /*#__PURE__*/function (_MedicalExpressionNod) {
         menseDays: this.menseDays,
         cycleDays: this.cycleDays,
         menarcheAge: this.menarcheAge,
-        menoPauseAge: this.menoPauseAge,
-        remark: this.remark
+        menoPauseAge: this.menoPauseAge
+        //remark: this.remark,
       };
+
+      if (this.remark !== "") {
+        retObj.remark = this.remark;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -58085,16 +58135,32 @@ var ParagraphNode = /*#__PURE__*/function (_BaseNode) {
         };
         return paga;
       }
+      var paraNode = {
+        //"ParagraphNode": {
+        nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Jq[this.nodeType],
+        styleIndex: this._paraNo,
+        textStyleNo: this.styleIndex
+        //printAsSinglePage: this.printAsSinglePage,
+        //forceChangeHeader: this.forceChangeHeader,
+        //docId: this.docId,
+        //customProperty: this.customProperty
+        //}
+      };
+
+      if (this.printAsSinglePage) {
+        paraNode.printAsSinglePage = this.printAsSinglePage;
+      }
+      if (this.forceChangeHeader) {
+        paraNode.forceChangeHeader = this.forceChangeHeader;
+      }
+      if (this.docId !== "") {
+        paraNode.docId = this.docId;
+      }
+      if (Object.keys(this.customProperty).length > 0) {
+        paraNode.customProperty = this.customProperty;
+      }
       return {
-        "ParagraphNode": {
-          nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType */ .Jq[this.nodeType],
-          styleIndex: this._paraNo,
-          textStyleNo: this.styleIndex,
-          printAsSinglePage: this.printAsSinglePage,
-          forceChangeHeader: this.forceChangeHeader,
-          docId: this.docId,
-          customProperty: this.customProperty
-        }
+        "ParagraphNode": paraNode
       };
     }
   }, {
@@ -58352,9 +58418,13 @@ var PermanentTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
         topLeftSelected: this.topLeftSelected.toString(),
         topRightSelected: this.topRightSelected.toString(),
         bottomLeftSelected: this.bottomLeftSelected.toString(),
-        bottomRightSelected: this.bottomRightSelected.toString(),
-        remark: this.remark
+        bottomRightSelected: this.bottomRightSelected.toString()
+        //remark: this.remark,
       };
+
+      if (this.remark !== "") {
+        retObj.remark = this.remark;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -58566,9 +58636,13 @@ var PrimaryTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
         topLeftSelected: this.topLeftSelected.toString(),
         topRightSelected: this.topRightSelected.toString(),
         bottomLeftSelected: this.bottomLeftSelected.toString(),
-        bottomRightSelected: this.bottomRightSelected.toString(),
-        remark: this.remark
+        bottomRightSelected: this.bottomRightSelected.toString()
+        //remark: this.remark,
       };
+
+      if (this.remark !== "") {
+        retObj.remark = this.remark;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -58624,8 +58698,8 @@ var PrimaryTeethMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
 /*
  * @Author: your name
  * @Date: 2020-10-28 15:50:18
- * @LastEditTime: 2022-03-25 10:05:10
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-09-14 11:03:19
+ * @LastEditors: liyanan 2441631434@qq.com
  * @Description: 瞳孔图
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\PupilMap.ts
  */
@@ -58810,6 +58884,9 @@ var PupilMapNode = /*#__PURE__*/function (_MedicalExpressionNod) {
         value7: this.value7,
         remark: this.remark
       };
+      if (this.remark !== "") {
+        retObj.remark = this.remark;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -58995,7 +59072,7 @@ var BaseNode = __webpack_require__(62358);
 /*
  * @Author: your name
  * @Date: 2020-11-13 08:51:37
- * @LastEditTime: 2023-06-30 15:24:31
+ * @LastEditTime: 2023-09-14 17:38:33
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\QrcodeNode.ts
@@ -59005,18 +59082,7 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
   (0,inherits/* default */.Z)(QrcodeNode, _BaseNode);
   var _super = (0,createSuper/* default */.Z)(QrcodeNode);
   //是否回填
-  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) {
+  function QrcodeNode(hoEditorFactoryID, rootNodes, pNode, nodeType, id, name, innerIdentifier, textContent, type, correctLevel, width, height, isFillBack) {
     var _this;
     (0,classCallCheck/* default */.Z)(this, QrcodeNode);
     _this = _super.call(this, hoEditorFactoryID, rootNodes, pNode, nodeType);
@@ -59032,32 +59098,16 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     //类型
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_correctLevel", "M");
     //纠错能力
-    // private _dataSourceEnabled = true; //数据源绑定设置有效
-    // private _dataSource = ""; //数据源
-    // private _format = ""; //格式化
-    // private _visitPath = ""; //访问路径
-    // private _isReadOnly = false; //只读，不能回填
-    // private _autoUpdate = false; //自动更新，当加载文档或者数据源发生改变时自动更新数值
-    // private _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", "");
-    //扩展字段
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_imageDataBase64String", "");
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_isFillBack", false);
     _this._id = id;
     _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._width = width;
     _this._height = height;
     _this._name = name ? name : "";
@@ -59076,16 +59126,6 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     get: function get() {
       return this._id;
     }
-  }, {
-    key: "remark",
-    get: function get() {
-      return this._remark;
-    },
-    set: function set(value) {
-      if (this._remark !== value) {
-        this._remark = value;
-      }
-    }
   }, {
     key: "textContent",
     get: function get() {
@@ -59107,27 +59147,6 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
     get: function get() {
       return this._correctLevel;
     }
-    // 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() {
@@ -59263,26 +59282,23 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
         nodeType: BaseNode/* NodeType */.Jq[this.nodeType],
         imageType: "Qrcode",
         id: this.id,
-        name: this.name,
+        //name: this.name,
         innerIdentifier: this.innerIdentifier,
         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,
         width: width,
         height: height,
-        remark: this.remark,
-        //scaleX: scaleX,
-        //scaleY: scaleY,
-        imageDataBase64String: this.imageDataBase64String,
-        isFillBack: this.isFillBack
+        imageDataBase64String: this.imageDataBase64String
+        //isFillBack: this.isFillBack
       };
+
+      if (this.name) {
+        retObj.name = this.name;
+      }
+      if (this.isFillBack) {
+        retObj.isFillBack = this.isFillBack;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -59301,23 +59317,8 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
       this.transType(json);
       var width = Number(json.width);
       var height = Number(json.height);
-      //const scaleX = Number(json.scaleX);
-      //const scaleY = Number(json.scaleY);
-      // 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 */.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 */.Jq.ntImage, json.id, json.name ? json.name : "", json.innerIdentifier, json.textContent, json.type, json.correctLevel, width, height, isFillBack);
     }
   }]);
   return QrcodeNode;
@@ -59340,16 +59341,16 @@ var QrcodeNode = /*#__PURE__*/function (_BaseNode) {
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(70280);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(66298);
 /* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(78255);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(68309);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_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_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(47941);
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(39714);
-/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_11__);
+/* 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_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(47941);
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(39714);
+/* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(68309);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(9653);
 /* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_12__);
 /* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(57658);
@@ -59504,9 +59505,9 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "id", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "dataId", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "type", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "name", void 0);
+    //private name!: string;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["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_6__/* ["default"] */ .Z)(this, "title", void 0);
+    //private title!: string;
     //private checkCascadeObject!: string;
     //private unCheckCascadeObject!: string;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(this, "controlStyle", void 0);
@@ -59566,16 +59567,14 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         this.type = value;
       }
     }
-  }, {
-    key: "Name",
-    get: function get() {
-      return this.name;
-    },
-    set: function set(value) {
-      if (this.name !== value) {
-        this.name = value;
-      }
-    }
+    // get Name(): string {
+    //   return this.name;
+    // }
+    // set Name(value: string) {
+    //   if (this.name !== value) {
+    //     this.name = value;
+    //   }
+    // }
   }, {
     key: "Text",
     get: function get() {
@@ -59586,16 +59585,14 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
         this.text = value;
       }
     }
-  }, {
-    key: "Title",
-    get: function get() {
-      return this.title;
-    },
-    set: function set(value) {
-      if (this.title !== value) {
-        this.title = value;
-      }
-    }
+    // get Title(): string {
+    //   return this.title;
+    // }
+    // set Title(value: string) {
+    //   if (this.title !== value) {
+    //     this.title = value;
+    //   }
+    // }
     // get CheckCascadeObject(): string {
     //   return this.checkCascadeObject;
     // }
@@ -59766,9 +59763,9 @@ var RadioAndCheckBoxInstance = /*#__PURE__*/function () {
       ret.id = "";
       ret.dataId = "";
       ret.type = _ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType */ .C.ctRadioAndCheckBox;
-      ret.name = "";
+      //ret.name = "";
       ret.text = "";
-      ret.title = "复选框";
+      //ret.title = "复选框";
       // ret.checkCascadeObject = "";
       // ret.unCheckCascadeObject = "";
       ret.controlStyle = "CheckBox";
@@ -60074,7 +60071,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       ret.NumericValue = this.numericValue !== undefined ? this.numericValue : ret.NumericValue;
       ret.Id = this.id !== undefined ? this.id : ret.Id;
       ret.Type = this.type !== undefined ? this.type : ret.Type;
-      ret.Title = this.title !== undefined ? this.title : ret.Title;
+      //ret.Title = this.title !== undefined ? this.title : ret.Title;
       ret.Text = this.text !== undefined ? this.text : ret.Text;
       // ret.CheckCascadeObject =
       //   this.checkCascadeObject !== undefined
@@ -60084,7 +60081,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       //   this.unCheckCascadeObject !== undefined
       //     ? this.unCheckCascadeObject
       //     : ret.UnCheckCascadeObject;
-      ret.Name = this.name !== undefined ? this.name : ret.Name;
+      //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;
       ret.AppendText = this.appendText !== undefined ? this.appendText : ret.AppendText;
@@ -60116,9 +60113,13 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         this.styleIndex = 0;
       }
       var dHeight = hoEditorFactory.getFontHeightByFontSize(cbStyle.size);
-      var dNode = new _editor_draw_drawNode_DrawRadioAndCheckBox__WEBPACK_IMPORTED_MODULE_15__/* .DrawRadioAndCheckBox */ .e(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle, this.name, this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
+      var dNode = new _editor_draw_drawNode_DrawRadioAndCheckBox__WEBPACK_IMPORTED_MODULE_15__/* .DrawRadioAndCheckBox */ .e(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle,
+      //this.name,
+      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
       this._drawNodes.push(dNode);
-      var dNodePrint = new _editor_draw_drawNode_DrawRadioAndCheckBoxPrint__WEBPACK_IMPORTED_MODULE_16__/* .DrawRadioAndCheckBoxPrint */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle, this.name, this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
+      var dNodePrint = new _editor_draw_drawNode_DrawRadioAndCheckBoxPrint__WEBPACK_IMPORTED_MODULE_16__/* .DrawRadioAndCheckBoxPrint */ .w(this._hoEditorFactoryID, this._rootPath, this, 0, this.controlStyle,
+      //this.name,
+      this.isSelected, this.boxAlign, this.numericValue, dHeight, cbStyle);
       this._drawNodes.push(dNodePrint);
     }
   }, {
@@ -60185,9 +60186,9 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
   }, {
     key: "node2Json",
     value: function node2Json(range, isCopy, type) {
-      var name = "";
-      if (this.controlStyle === "RadioBox") name = "RB";
-      if (this.controlStyle === "CheckBox") name = "CB";
+      //let name = "";
+      //if (this.controlStyle === "RadioBox") name = "RB";
+      //if (this.controlStyle === "CheckBox") name = "CB";
       if (isCopy) {
         return {
           nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq[_BaseNode__WEBPACK_IMPORTED_MODULE_20__/* .NodeType */ .Jq.ntControl],
@@ -60195,9 +60196,9 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
           controlStyle: this.controlStyle,
           id: this.id,
           dataId: this.dataId,
-          name: this.name,
+          //name: this.name,
           text: this.text,
-          title: this.title,
+          //title: this.title,
           styleIndex: this.styleIndex,
           //checkCascadeObject: this.checkCascadeObject,
           //unCheckCascadeObject: this.unCheckCascadeObject,
@@ -60229,28 +60230,62 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
         id: this.id,
         parentId: parentid,
         dataId: this.dataId,
-        name: this.name,
+        //name: this.name,
         text: this.text,
-        title: this.title,
+        //title: this.title,
         styleIndex: this.styleIndex,
         //checkCascadeObject: this.checkCascadeObject,
         //unCheckCascadeObject: this.unCheckCascadeObject,
-        tipText: this.tipText,
-        isAllowDelete: this.isAllowDelete,
+        //tipText: this.tipText,
+        //isAllowDelete: this.isAllowDelete,
         groupName: this.groupName,
         isSelected: this.isSelected,
-        boxAlign: this.boxAlign,
-        numericValue: this.numericValue,
-        additionalData: this.additionalData,
-        isTransToText: this.isTransToText,
-        groupHasOptions: this.groupHasOptions,
-        isEditText: this.isEditText,
-        appendText: this.appendText,
-        readType: this.readType,
-        associatedElement: this.associatedElement,
+        //boxAlign: this.boxAlign,
+        //numericValue: this.numericValue,
+        //additionalData: this.additionalData,
+        //isTransToText: this.isTransToText,
+        //groupHasOptions: this.groupHasOptions,
+        //isEditText: this.isEditText,
+        //appendText: this.appendText,
+        readType: this.readType
+        //associatedElement: this.associatedElement,
         //bandDataSource: this.bandDataSource,
-        remark: this.remark
+        //remark: this.remark,
       };
+
+      if (this.tipText) {
+        retObj.tipText = this.tipText;
+      }
+      if (this.isAllowDelete) {
+        retObj.isAllowDelete = this.isAllowDelete;
+      }
+      if (!this.boxAlign) {
+        retObj.boxAlign = this.boxAlign;
+      }
+      if (this.numericValue && this.numericValue !== "0") {
+        retObj.numericValue = this.numericValue;
+      }
+      if (this.additionalData) {
+        retObj.additionalData = this.additionalData;
+      }
+      if (this.isTransToText) {
+        retObj.isTransToText = this.isTransToText;
+      }
+      if (this.groupHasOptions) {
+        retObj.groupHasOptions = this.groupHasOptions;
+      }
+      if (this.isEditText) {
+        retObj.isEditText = this.isEditText;
+      }
+      if (this.appendText) {
+        retObj.appendText = this.appendText;
+      }
+      if (this.associatedElement) {
+        retObj.associatedElement = this.associatedElement;
+      }
+      if (this.remark) {
+        retObj.remark = this.remark;
+      }
       var paga = {
         "RadioAndCheckBoxNode": retObj
       };
@@ -60286,11 +60321,11 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
       }
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.isSelected = !json.isSelected ? false : json.isSelected.text != undefined ? json.isSelected.text : json.isSelected;
-      json.boxAlign = !json.boxAlign ? false : json.boxAlign;
+      json.boxAlign = json.boxAlign === undefined ? true : json.boxAlign;
       json.isEditText = !json.isEditText ? false : json.isEditText;
       json.isTransToText = !json.isTransToText ? false : json.isTransToText;
       json.groupHasOptions = !json.groupHasOptions ? false : json.groupHasOptions;
-      json.numericValue = Number(json.numericValue);
+      json.numericValue = json.numericValue === undefined ? '0' : Number(json.numericValue);
       var styleIndex = Number(json.styleIndex);
       json.type = parseInt(_ControlNode__WEBPACK_IMPORTED_MODULE_21__/* .ControlType */ .C[json.type]);
       json.readType = json.readType ? Number(json.readType) : -1;
@@ -61952,10 +61987,13 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_34__/* .NodeType */ .Jq[this.nodeType],
         text: this._formulaStr,
         styleIndex: this.styleIndex,
-        hideZero: this._hideZero,
+        //hideZero: this._hideZero,
         formularType: this.formularType,
         customProperty: this.customProperty
       };
+      if (!this.hideZero) {
+        retObj.hideZero = this.hideZero;
+      }
       if (isCopy) {
         return retObj;
       }
@@ -62898,7 +62936,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode) {
       var styleIndex = Number(json.styleIndex);
-      var hideZero = !json.hideZero ? false : json.hideZero;
+      var hideZero = json.hideZero === undefined ? true : json.hideZero;
       var formularType = FormularType.ftSum;
       if (json.formularType) {
         formularType = Number(json.formularType);
@@ -62958,10 +62996,10 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_19__);
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(39714);
 /* harmony import */ var core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_to_string_js__WEBPACK_IMPORTED_MODULE_20__);
-/* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(23157);
-/* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_21__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(9653);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_22__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(9653);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_21__);
+/* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(23157);
+/* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_22__);
 /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(66992);
 /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_23__);
 /* harmony import */ var core_js_modules_es_map_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(51532);
@@ -62983,9 +63021,7 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
 /* harmony import */ var _DocTree__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(32629);
 /* harmony import */ var _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(74089);
 /* harmony import */ var _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(51760);
-/* harmony import */ var _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(91404);
-/* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(15694);
-
+/* harmony import */ var _editor_draw_drawNode_DrawPageTable__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(15694);
 
 
 
@@ -64490,26 +64526,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         cols = pto.col;
         if (to.colSpan > 1) {
           cols = pto.col + to.colSpan - 1;
-        } //else {
-        // const tableProperty = {
-        //   canAddRow: this.tableProperty.canAddRow,
-        //   canAddCol: this.tableProperty.canAddCol,
-        //   canAdjustRowHeight: this.tableProperty.canAdjustRowHeight,
-        //   canAdjustRowWidth: this.tableProperty.canAdjustRowWidth,
-        //   canDeleteRow: this.tableProperty.canDeleteRow,
-        //   canDeleteTable: this.tableProperty.canDeleteTable,
-        //   continuePrintBorders: this.tableProperty.continuePrintBorders,
-        //   customProperties: this.tableProperty.customProperties,
-        //   layoutFullLine: this.tableProperty.layoutFullLine,
-        //   tightLineSpace: this.tableProperty.tightLineSpace,
-        //   isAutoChangeLine: this.tableProperty.isAutoChangeLine,
-        //   autoLineHeight: this.tableProperty.autoLineHeight,
-        //   fixedOnePage: this.tableProperty.fixedOnePage,
-        //   isUsePopEdit: this.tableProperty.isUsePopEdit,
-        //   isSignLock: this.tableProperty.isSignLock,
-        //   isLock: this.tableProperty.isLock
-        // };
-        //}
+        }
       }
       //for (let i = pfrom.row; i <= this.rowInfos.length-1; i++) {
       for (var i = pfrom.row; i <= rows; i++) {
@@ -64539,24 +64556,23 @@ 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 (rowPropertyJson[keysName[k]] === defaultRowPropJson[keysName[k]]) {
               delete rowPropertyJson[keysName[k]];
             }
           }
         }
-        rowInfosArray.push({
-          rowHeight: rowInfo.rowHeight,
+        var rowProp = {
+          rowHeight: rowInfo.rowHeight
           //heightFixed: rowInfo.heightFixed,
           //rowBaseDTop: rowInfo.rowBaseDTop,
-          rowProperty: rowPropertyJson
-        });
+          //rowProperty: rowPropertyJson
+        };
+
+        if (Object.keys(rowPropertyJson).length > 0) {
+          rowProp.rowProperty = rowPropertyJson;
+        }
+        rowInfosArray.push(rowProp);
       }
       var defaultColProp = {
         editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None],
@@ -64596,17 +64612,31 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         };
         var colPropertyJson = JSON.parse(JSON.stringify(colProperty));
         var colKeysName = Object.keys(defaultColProp);
+        if (colInfo.colProperty.customProperties.length === 0 || colInfo.colProperty.customProperties[0].length === 0) {
+          delete colPropertyJson["customProperties"];
+        }
         for (var _k = 0; _k < colKeysName.length; _k++) {
           if (colPropertyJson[colKeysName[_k]] === defaultColPropJson[colKeysName[_k]]) {
             delete colPropertyJson[colKeysName[_k]];
           }
         }
-        colInfosArray.push({
-          colWidth: colInfo.colWidth,
-          widthFixed: colInfo.widthFixed,
-          dLeft: colInfo.dLeft,
-          colProperty: colPropertyJson
-        });
+        var cinfo = {
+          colWidth: colInfo.colWidth
+          //widthFixed: colInfo.widthFixed,
+          //dLeft: colInfo.dLeft,
+          //colProperty: colPropertyJson
+        };
+
+        if (colInfo.widthFixed) {
+          cinfo.widthFixed = colInfo.widthFixed;
+        }
+        if (colInfo.dLeft > 0) {
+          cinfo.dLeft = colInfo.dLeft;
+        }
+        if (Object.keys(colPropertyJson).length > 0) {
+          cinfo.colProperty = colPropertyJson;
+        }
+        colInfosArray.push(cinfo);
       }
       var defaultCellProp = {
         //title: "",
@@ -64623,7 +64653,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         customProperties: "",
         //lightCellBorders: false,
         //dataSource: "",
-        backColor: "transparent",
+        backColor: "#FFFFFF",
         editorProperty: _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None,
         downListProperty: "",
         dateTimeProperty: "",
@@ -64719,79 +64749,114 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           }
         }
       }
+      //const rowInfos = { defaultRowProperty: defaultRowProp, item: rowInfosArray };
+      //const colInfos = { defaultColProperty: defaultColProp, item: colInfosArray };
+      //const childNodes = { defaultCellProperty: defaultCellProp, item: rowArrays };
       var rowInfos = {
-        defaultRowProperty: defaultRowProp,
         item: rowInfosArray
       };
       var colInfos = {
-        defaultColProperty: defaultColProp,
         item: colInfosArray
       };
       var childNodes = {
-        defaultCellProperty: defaultCellProp,
         item: rowArrays
       };
       var customProperties = {
         customProperty: Array(this.tableProperty.customProperties)
       };
-      // const childNodes = [...rowArrays];
-      //const rowCount = Math.abs(pfrom.row - pto.row) + 1;
-      //const colCount = Math.abs(pfrom.col - pto.col) + 1;
-      //const rowCount = Math.abs(pfrom.row - rowInfos.item.length);
-      //const colCount = Math.abs(pfrom.col - colInfos.item.length);
       var rowCount = rowInfos.item.length;
       var colCount = colInfos.item.length;
-      var tableProperty = {
-        canAddRow: this.tableProperty.canAddRow,
-        canAddCol: this.tableProperty.canAddCol,
-        canAdjustRowHeight: this.tableProperty.canAdjustRowHeight,
-        canAdjustRowWidth: this.tableProperty.canAdjustRowWidth,
-        canDeleteRow: this.tableProperty.canDeleteRow,
-        canDeleteTable: this.tableProperty.canDeleteTable,
-        continuePrintBorders: this.tableProperty.continuePrintBorders,
-        //customProperties: this.tableProperty.customProperties,
-        customProperties: customProperties,
-        layoutFullLine: this.tableProperty.layoutFullLine,
-        tightLineSpace: this.tableProperty.tightLineSpace,
-        isAutoChangeLine: this.tableProperty.isAutoChangeLine,
-        autoLineHeight: this.tableProperty.autoLineHeight,
-        fixedOnePage: this.tableProperty.fixedOnePage,
-        isUsePopEdit: this.tableProperty.isUsePopEdit,
-        isSignLock: this.tableProperty.isSignLock,
-        isLock: this.tableProperty.isLock
-      };
+      // const tableProperty = {
+      //   canAddRow: this.tableProperty.canAddRow,
+      //   canAddCol: this.tableProperty.canAddCol,
+      //   canAdjustRowHeight: this.tableProperty.canAdjustRowHeight,
+      //   canAdjustRowWidth: this.tableProperty.canAdjustRowWidth,
+      //   canDeleteRow: this.tableProperty.canDeleteRow,
+      //   canDeleteTable: this.tableProperty.canDeleteTable,
+      //   continuePrintBorders: this.tableProperty.continuePrintBorders,
+      //   customProperties,
+      //   layoutFullLine: this.tableProperty.layoutFullLine,
+      //   tightLineSpace: this.tableProperty.tightLineSpace,
+      //   isAutoChangeLine: this.tableProperty.isAutoChangeLine,
+      //   autoLineHeight: this.tableProperty.autoLineHeight,
+      //   fixedOnePage: this.tableProperty.fixedOnePage,
+      //   isUsePopEdit: this.tableProperty.isUsePopEdit,
+      //   isSignLock: this.tableProperty.isSignLock,
+      //   isLock: this.tableProperty.isLock,
+      // };
+      var tableProperty = {};
+      if (this.tableProperty.canAdjustRowHeight) {
+        tableProperty.canAdjustRowHeight = this.tableProperty.canAdjustRowHeight;
+      }
+      if (this.tableProperty.canAdjustRowWidth) {
+        tableProperty.canAdjustRowWidth = this.tableProperty.canAdjustRowWidth;
+      }
+      if (!this.tableProperty.canAddRow) {
+        tableProperty.canAddRow = this.tableProperty.canAddRow;
+      }
+      if (this.tableProperty.canAddCol === false) {
+        tableProperty.canAddCol = this.tableProperty.canAddCol;
+      }
+      if (!this.tableProperty.canDeleteRow) {
+        tableProperty.canDeleteRow = this.tableProperty.canDeleteRow;
+      }
+      if (!this.tableProperty.canDeleteTable) {
+        tableProperty.canDeleteTable = this.tableProperty.canDeleteTable;
+      }
+      if (this.tableProperty.continuePrintBorders) {
+        tableProperty.continuePrintBorders = this.tableProperty.continuePrintBorders;
+      }
+      if (this.tableProperty.isAutoChangeLine) {
+        tableProperty.isAutoChangeLine = this.tableProperty.isAutoChangeLine;
+      }
+      if (this.tableProperty.autoLineHeight.toString() !== '0.53') {
+        tableProperty.autoLineHeight = Number(this.tableProperty.autoLineHeight);
+      }
+      if (this.tableProperty.fixedOnePage) {
+        tableProperty.fixedOnePage = this.tableProperty.fixedOnePage;
+      }
+      if (this.tableProperty.isUsePopEdit) {
+        tableProperty.isUsePopEdit = this.tableProperty.isUsePopEdit;
+      }
+      if (this.tableProperty.isSignLock) {
+        tableProperty.isSignLock = this.tableProperty.isSignLock;
+      }
+      if (this.tableProperty.isLock) {
+        tableProperty.isLock = this.tableProperty.isLock;
+      }
+      if (this.tableProperty.customProperties.length > 0 && this.tableProperty.customProperties[0]) {
+        tableProperty.customProperties = customProperties;
+      }
       var retJson = {
         nodeType: _BaseNode__WEBPACK_IMPORTED_MODULE_28__/* .NodeType */ .Jq[this.nodeType],
         rowCount: rowCount,
         colCount: colCount,
-        borderVisible: this.borderVisible.toString(),
-        borderWidth: this._borderWidth,
-        headerRowCount: this.headerRowCount,
-        tableProperty: tableProperty,
+        //borderVisible: this.borderVisible.toString(),
+        //borderWidth: this._borderWidth,
+        //headerRowCount: this.headerRowCount,
+        //tableProperty: tableProperty,
         rowInfos: rowInfos,
         colInfos: colInfos,
         childNodes: childNodes
       };
+      if (this.borderVisible.toString() !== "true,true,true,true") {
+        retJson.borderVisible = this.borderVisible.toString();
+      }
+      if (this.borderWidth !== 1) {
+        retJson.borderWidth = this.borderWidth;
+      }
+      if (this.headerRowCount !== 0) {
+        retJson.headerRowCount = this.headerRowCount;
+      }
+      if (Object.keys(tableProperty).length > 0) {
+        retJson.tableProperty = tableProperty;
+      }
       if (isCopy) {
         return retJson;
       }
       return {
         "TableNode": retJson
       };
-      // return {
-      //   nodeType: NodeType[this.nodeType],
-      //   rowCount, //: this.rowCount,
-      //   colCount, //: this.colCount,
-      //   borderVisible: this.borderVisible.toString(),
-      //   borderWidth: this._borderWidth,
-      //   headerRowCount: this.headerRowCount,
-      //   tableProperty: tableProperty,
-      //   rowInfos,
-      //   colInfos,
-      //   //paragraphNode: this._paragraphNode.node2Json(),
-      //   // cellNodes: cellNodes,
-      //   childNodes,
-      // };
     }
   }, {
     key: "calcRowSpanColsSpan",
@@ -64910,7 +64975,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_41__/* .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_40__/* .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);
@@ -65428,29 +65493,31 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
     key: "json2Node",
     value: function json2Node(hoEditorFactoryID, json, rootNodes, pNode, isPaste, isClearSign) {
       json = this.transType(json);
-      var tableProperty = json.tableProperty;
-      tableProperty.customProperties = Array.isArray(tableProperty.customProperties.customProperty) ? tableProperty.customProperties.customProperty : Array(tableProperty.customProperties.customProperty);
-      tableProperty.tightLineSpace = tableProperty["tightLineSpace"] || false;
-      tableProperty.layoutFullLinisAutoChangeLineidth = tableProperty["canAdjustRowWidth"] || false;
-      tableProperty.canAdjustRowHeight = tableProperty["canAdjustRowHeight"] || false;
-      tableProperty.fixedOnePage = tableProperty["fixedOnePage"] || false;
-      tableProperty.isUsePopEdit = tableProperty["isUsePopEdit"] || false;
-      tableProperty.isAutoChangeLine = tableProperty["isAutoChangeLine"] || false;
-      tableProperty.autoLineHeight = tableProperty["autoLineHeight"] || 0.53;
-      tableProperty.autoLineHeightPx = _editor_utils_UnitConvert__WEBPACK_IMPORTED_MODULE_40__/* .UnitConvert */ .P.instance.mmConversionPx(parseFloat(tableProperty.autoLineHeight) * 10, false);
-      tableProperty.isSignLock = tableProperty["isSignLock"] || false;
-      tableProperty.isLock = tableProperty["isLock"] || false;
-      // console.log("json2node", 1);
+      var tableProperty = new _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .TableProperty */ .vE("");
+      if (json.tableProperty) {
+        tableProperty.canAdjustRowHeight = json.tableProperty["canAdjustRowHeight"] || false;
+        tableProperty.canAdjustRowWidth = json.tableProperty["canAdjustRowWidth"] || false;
+        tableProperty.canAddRow = json.tableProperty["canAddRow"] || true;
+        tableProperty.canAddCol = json.tableProperty["canAddCol"] || true;
+        tableProperty.canDeleteRow = json.tableProperty["canDeleteRow"] || true;
+        tableProperty.canDeleteTable = json.tableProperty["canDeleteTable"] || true;
+        tableProperty.continuePrintBorders = json.tableProperty["continuePrintBorders"] || false;
+        tableProperty.isAutoChangeLine = json.tableProperty["isAutoChangeLine"] || false;
+        tableProperty.autoLineHeight = json.tableProperty["autoLineHeight"] ? Number(json.tableProperty["autoLineHeight"]) : 0.53;
+        tableProperty.fixedOnePage = json.tableProperty["fixedOnePage"] || false;
+        tableProperty.isUsePopEdit = json.tableProperty["isUsePopEdit"] || false;
+        tableProperty.isSignLock = json.tableProperty["isSignLock"] || false;
+        tableProperty.isLock = json.tableProperty["isLock"] || false;
+        tableProperty.customProperties = json.tableProperty.customProperties ? Array.isArray(json.tableProperty.customProperties.customProperty) ? json.tableProperty.customProperties.customProperty : Array(json.tableProperty.customProperties.customProperty) : "";
+      }
       var tableNode = new TableNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, Number(json.rowCount), Number(json.colCount), tableProperty);
-      // console.log("json2node", 2);
       tableNode.rowCount = Number(json.rowCount);
       tableNode.colCount = Number(json.colCount);
-      tableNode.borderVisible = json.borderVisible;
-      tableNode._borderWidth = Number(json.borderWidth);
-      tableNode.headerRowCount = Number(json.headerRowCount);
-      // console.log("json2node", 3);
+      tableNode.borderVisible = json.borderVisible === undefined ? "true,true,true,true" : json.borderVisible;
+      tableNode._borderWidth = json.borderWidth === undefined ? 1 : Number(json.borderWidth);
+      tableNode.headerRowCount = json.headerRowCount === undefined ? 0 : Number(json.headerRowCount);
       //行高处理
-      var defaultRowProp = json.rowInfos.defaultRowProperty;
+      //const defaultRowProp = json.rowInfos.defaultRowProperty;
       var rowInfosArr = json.rowInfos.item;
       if (!rowInfosArr.length) {
         rowInfosArr = Array(json.rowInfos.item);
@@ -65458,9 +65525,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
       var _loop = function _loop() {
         var rowInfo = rowInfosArr[i];
         tableNode.rowInfos[i].rowHeight = Number(rowInfo.rowHeight);
-        //rowInfo.heightFixed = rowInfo["heightFixed"] || false;
-        //tableNode.rowInfos[i].heightFixed = rowInfo.heightFixed;
-        //tableNode.rowInfos[i].rowBaseDTop = rowInfo.rowBaseDTop;
         var rowProperty = rowInfo.rowProperty;
         var assignvalue = function assignvalue(target, source) {
           Object.keys(source).forEach(function (value) {
@@ -65493,33 +65557,15 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
             }
           });
         };
-        assignvalue(tableNode.rowInfos[i].rowProperty, rowProperty);
-        // tableNode.rowInfos[i].rowProperty.tabKeyInsNewLine =
-        //   rowProperty["tabKeyInsNewLine"] || false;
-        // tableNode.rowInfos[i].rowProperty.printCellBg =
-        //   rowProperty["printCellBg"] || false;
-        // tableNode.rowInfos[i].rowProperty.printCellBorders =
-        //   rowProperty["printCellBorders"] || false;
-        // tableNode.rowInfos[i].rowProperty.forcedPageBreak =
-        //   rowProperty["forcedPageBreak"] || false;
-        // tableNode.rowInfos[i].rowProperty.sameLineCanAcrossPages =
-        //   rowProperty["sameLineCanAcrossPages"] || false;
-        // tableNode.rowInfos[i].rowProperty.repeatAsTitleAtPageTop =
-        //   rowProperty["repeatAsTitleAtPageTop"] || false;
-        // tableNode.rowInfos[i].rowProperty.isAutoRaiseHeight =
-        //   rowProperty["isAutoRaiseHeight"] || false;
-        // tableNode.rowInfos[i].rowProperty.isSpecifyHeight =
-        //   rowProperty["isSpecifyHeight"] || false;
-        // tableNode.rowInfos[i].rowProperty.rowHeight = Number(
-        //   rowProperty["rowHeight"]
-        // );
+        if (rowProperty && Object.keys(rowProperty).length > 0) {
+          assignvalue(tableNode.rowInfos[i].rowProperty, rowProperty);
+        }
       };
       for (var i = 0; i < rowInfosArr.length; i++) {
         _loop();
       }
-      // console.log("json2node", 4);
       //列宽处理
-      var defaultColProp = json.colInfos.defaultColProperty;
+      //const defaultColProp = json.colInfos.defaultColProperty;
       var colInfosArr = json.colInfos.item;
       if (!colInfosArr.length) {
         colInfosArr = Array(json.colInfos.item);
@@ -65528,18 +65574,18 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         var colInfo = colInfosArr[_i6];
         tableNode.colInfos[_i6].colWidth = Number(colInfo.colWidth);
         tableNode.colInfos[_i6].widthFixed = colInfo["widthFixed"] || false;
-        tableNode.colInfos[_i6].dLeft = Number(colInfo.dLeft);
+        tableNode.colInfos[_i6].dLeft = colInfo.dLeft === undefined ? 0 : Number(colInfo.dLeft);
         var colProperty = colInfo.colProperty;
         if (colProperty) {
           if (colProperty.align) {
             tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR[colProperty.align]);
           } else {
-            tableNode.colInfos[_i6].colProperty.align = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR[defaultColProp.align]);
+            tableNode.colInfos[_i6].colProperty.align = _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .VAlign */ .TR.vatop;
           }
           if (colProperty.editorProperty) {
             tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[colProperty.editorProperty]);
           } else {
-            tableNode.colInfos[_i6].colProperty.editorProperty = Number(_TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS[defaultColProp.editorProperty]);
+            tableNode.colInfos[_i6].colProperty.editorProperty = _TableProperty__WEBPACK_IMPORTED_MODULE_32__/* .EditorProperty */ .YS.None;
           }
           tableNode.colInfos[_i6].colProperty.width = colProperty.width ? Number(colProperty.width) : 0;
           tableNode.colInfos[_i6].colProperty.isSpecifyWidth = colProperty.isSpecifyWidth;
@@ -65566,13 +65612,8 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           }
         }
       }
-      // console.log("json2node", 5);
       //单元格处理
       var rows = tableNode.rows;
-      // let cellNodes = json.childNodes;
-      // if (cellNodes.length === undefined) {
-      //   cellNodes = Array(cellNodes);
-      // }
       var transArr = function transArr(info) {
         var row = new Array();
         if (!Array.isArray(info.childNodes.item)) {
@@ -65613,8 +65654,6 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         return cells;
       };
       var cellNodes = transArr(json); //table.childNodes.childNodes
-      // console.log("json2node", 7);
-      // console.log(cellNodes);
       var existMap = new Map();
       var rowsMap = new Map();
       for (var _i7 = 0; _i7 < cellNodes.length; _i7++) {
@@ -65625,7 +65664,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
         rowsMap.set(rowNo, _aRow);
       }
       rowsMap.delete(NaN);
-      var defaultCellProperty = json.childNodes.defaultCellProperty;
+      //const defaultCellProperty = json.childNodes.defaultCellProperty;
       var aRow;
       for (var s = 0; s < cellNodes.length; s++) {
         var _node = cellNodes[s];
@@ -65633,14 +65672,12 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
           var _rowNo = parseInt(_node.rowNo);
           var colNo = parseInt(_node.colNo);
           existMap.set(_rowNo + "-" + colNo, 1);
-          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows, defaultCellProperty, isPaste, isClearSign);
+          aRow = _CellNode__WEBPACK_IMPORTED_MODULE_27__/* .CellNode */ .D.json2Node(hoEditorFactoryID, _node, rootNodes, tableNode, aRow, rowsMap, rows,
+          //defaultCellProperty,
+          isPaste, isClearSign);
         }
       }
-      // console.log("json2node", 8);
-      //console.log(existMap);
       //删除掉不存在的合并节点
-      // for (let x = 0; x < tableNode.rows.length; x++) {
-      //for (let y = 0; y < tableNode.rows[x].length; y++) {
       for (var x = 0; x < tableNode._rowCount; x++) {
         for (var y = 0; y < tableNode._colCount; y++) {
           if (!existMap.get(x + "-" + y)) {
@@ -65827,7 +65864,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-08-25 11:39:25
+ * @LastEditTime: 2023-09-14 16:25:00
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -66279,8 +66316,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     //允许被删除
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["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), "_enableGlobalColor", true);
     //启用全局文本颜色
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["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", '');
-    //默认值
+    //private _defaultValue = ''; //默认值
     //private _importStyle!: ImportStyle;//输入样式
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["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);
     //下拉列表属性
@@ -66598,16 +66634,14 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         this._enableGlobalColor = value;
       }
     }
-  }, {
-    key: "defaultValue",
-    get: function get() {
-      return this._defaultValue;
-    },
-    set: function set(value) {
-      if (this._defaultValue !== value) {
-        this._defaultValue = value;
-      }
-    }
+    // get defaultValue(): string {
+    //     return this._defaultValue;
+    // }
+    // set defaultValue(value: string) {
+    //     if (this._defaultValue !== value) {
+    //         this._defaultValue = value;
+    //     }
+    // }
     // get importStyle(): ImportStyle {
     //     return this._importStyle;
     // }
@@ -67364,6 +67398,12 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     value: function _delete(operType) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_38__/* .HOEditorFactorys */ .b.instance().getFactory(this.hoEditorFactoryID);
       if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_32__/* .PaintState */ .Dh.psDesign || this.isAllowDelete) {
+        var record = hoEditorFactory.docTree.elementChangeRecords.get(this.id + "|" + this.dataId);
+        if (record && record.indexOf("add") >= 0) {
+          hoEditorFactory.docTree.elementChangeRecords.delete(this.id + "|" + this.dataId);
+        } else {
+          hoEditorFactory.docTree.elementChangeRecords.set(this.id + "|" + this.dataId, "delete");
+        }
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_get_js__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_getPrototypeOf_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TextInputFieldNode.prototype), "delete", this).call(this);
       } else {
         if (operType !== 'update') {
@@ -67596,7 +67636,7 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           canModifyContent: this.canModifyContent,
           isAllowDelete: this.isAllowDelete,
           enableGlobalColor: this.enableGlobalColor,
-          defaultValue: this.defaultValue,
+          //defaultValue: this.defaultValue,
           downListProperty: this.downListProperty,
           //dataVerifyFormat: this.dataVerifyFormat,
           //bandDataSource: this.bandDataSource,
@@ -67625,34 +67665,76 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         innerIdentifier: this.innerIdentifier,
         dataMetaIdentifier: this.dataMetaIdentifier,
         identifierFormat: this.identifierFormat,
-        isSynchro: this.isSynchro,
+        //isSynchro: this.isSynchro,
         text: this.text,
         keyValue: this.keyValue,
         value: this.value,
         name: this.name,
-        tipText: this.tipText,
+        //tipText: this.tipText,
         labelText: this.labelText,
-        //readOnlyStatus: this.readOnlyStatus,
-        fixedWidth: this.fixedWidth,
-        isCentered: this.isCentered,
-        canModifyContent: this.canModifyContent,
-        isAllowDelete: this.isAllowDelete,
-        enableGlobalColor: this.enableGlobalColor,
-        defaultValue: this.defaultValue,
-        downListProperty: this.downListProperty,
-        //dataVerifyFormat: this.dataVerifyFormat,
-        //bandDataSource: this.bandDataSource,
+        //fixedWidth: this.fixedWidth,
+        //isCentered: this.isCentered,
+        //canModifyContent: this.canModifyContent,
+        //isAllowDelete: this.isAllowDelete,
+        //enableGlobalColor: this.enableGlobalColor,
+        //defaultValue: this.defaultValue,
+        //downListProperty: this.downListProperty,
         customProperty: this.customProperty,
-        alignWithBlocked: this.alignWithBlocked,
+        //alignWithBlocked: this.alignWithBlocked,
         readType: this.readType,
-        insCheckSyncUpdateList: this.insCheckSyncUpdateList,
-        hideDuringPrint: this.hideDuringPrint,
-        notReplaceElement: this.notReplaceElement,
-        valueArea: this.valueArea,
-        includesKeyword: this.includesKeyword,
-        isElementLink: this.isElementLink,
+        //insCheckSyncUpdateList: this.insCheckSyncUpdateList,
+        //hideDuringPrint: this.hideDuringPrint,
+        //notReplaceElement: this.notReplaceElement,
+        //valueArea: this.valueArea,
+        //includesKeyword: this.includesKeyword,
+        //isElementLink: this.isElementLink,
         childNodes: childNodes
       };
+      if (this.isSynchro) {
+        retObj.isSynchro = this.isSynchro;
+      }
+      if (this.tipText) {
+        retObj.tipText = this.tipText;
+      }
+      if (this.fixedWidth > 0) {
+        retObj.fixedWidth = this.fixedWidth;
+      }
+      if (this.isCentered) {
+        retObj.isCentered = this.isCentered;
+      }
+      if (!this.canModifyContent) {
+        retObj.canModifyContent = this.canModifyContent;
+      }
+      if (this.isAllowDelete) {
+        retObj.isAllowDelete = this.isAllowDelete;
+      }
+      if (this.enableGlobalColor) {
+        retObj.enableGlobalColor = this.enableGlobalColor;
+      }
+      if (this.inputFieldType === 1) {
+        retObj.downListProperty = this.downListProperty;
+      }
+      if (this.alignWithBlocked) {
+        retObj.alignWithBlocked = this.alignWithBlocked;
+      }
+      if (this.insCheckSyncUpdateList) {
+        retObj.insCheckSyncUpdateList = this.insCheckSyncUpdateList;
+      }
+      if (this.hideDuringPrint) {
+        retObj.hideDuringPrint = this.hideDuringPrint;
+      }
+      if (this.notReplaceElement) {
+        retObj.notReplaceElement = this.notReplaceElement;
+      }
+      if (this.valueArea !== "[]") {
+        retObj.valueArea = this.valueArea;
+      }
+      if (this.includesKeyword !== "[]") {
+        retObj.includesKeyword = this.includesKeyword;
+      }
+      if (this.isElementLink) {
+        retObj.isElementLink = this.isElementLink;
+      }
       return {
         TextInputFieldNode: retObj
       };
@@ -67728,22 +67810,25 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
         // }
         json.dataId = hoEditorFactory.gernerateCode.generateID('Field');
       }
-      json.canModifyContent = !json.canModifyContent ? false : json.canModifyContent;
+      json.canModifyContent = json.canModifyContent === undefined ? true : json.canModifyContent;
       json.isAllowDelete = !json.isAllowDelete ? false : json.isAllowDelete;
       json.enableGlobalColor = !json.enableGlobalColor ? false : json.enableGlobalColor;
-      json.fixedWidth = Number(json.fixedWidth);
+      json.fixedWidth = Number(json.fixedWidth === undefined ? 0 : json.fixedWidth);
       json.isCentered = !json.isCentered ? false : json.isCentered;
       json.inputFieldType = InputFieldType[json.inputFieldType];
-      json.downListProperty._allowMultiSelected = json.downListProperty.allowMultiSelected ? json.downListProperty.allowMultiSelected : json.downListProperty._allowMultiSelected;
-      json.downListProperty._isMultiLinesDisplay = json.downListProperty.isMultiLinesDisplay ? json.downListProperty.isMultiLinesDisplay : json.downListProperty._isMultiLinesDisplay == "true" || json.downListProperty._isMultiLinesDisplay == true ? true : false;
+      if (json.inputFieldType == 1) {
+        json.downListProperty._allowMultiSelected = json.downListProperty.allowMultiSelected ? json.downListProperty.allowMultiSelected : json.downListProperty._allowMultiSelected;
+        json.downListProperty._isMultiLinesDisplay = json.downListProperty.isMultiLinesDisplay ? json.downListProperty.isMultiLinesDisplay : json.downListProperty._isMultiLinesDisplay == "true" || json.downListProperty._isMultiLinesDisplay == true ? true : false;
+        json.downListProperty._mutexSelect = json.downListProperty.mutexSelect ? json.downListProperty.mutexSelect : json.downListProperty._mutexSelect == "true" || json.downListProperty._mutexSelect == true ? true : false;
+      }
       json.alignWithBlocked = !json.alignWithBlocked ? false : json.alignWithBlocked;
       json.isSynchro = !json.isSynchro ? false : json.isSynchro;
       json.readType = json.readType ? Number(json.readType) : -1;
       json.insCheckSyncUpdateList = !json.insCheckSyncUpdateList ? false : json.insCheckSyncUpdateList;
       json.hideDuringPrint = !json.hideDuringPrint ? false : json.hideDuringPrint;
       json.notReplaceElement = !json.notReplaceElement ? false : json.notReplaceElement;
-      json.includesKeyword = !json.includesKeyword ? false : json.includesKeyword;
-      json.valueArea = !json.valueArea ? false : json.valueArea;
+      json.includesKeyword = !json.includesKeyword ? "[]" : json.includesKeyword;
+      json.valueArea = !json.valueArea ? "[]" : json.valueArea;
       json.isElementLink = !json.isElementLink ? false : json.isElementLink;
       var temp = new TextInputFieldNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_44__/* .NodeType */ .Jq.ntField, json);
       // this.insertChild
@@ -77789,12 +77874,14 @@ var DrawPageTable = /*#__PURE__*/function (_DrawRect) {
 var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawRadioAndCheckBox, _DrawCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(DrawRadioAndCheckBox);
-  function DrawRadioAndCheckBox(hoeditfactoryID, rootPath, node, index, controlStyle, name, isSelected, boxAlign, numericValue, height, textStyle) {
+  function DrawRadioAndCheckBox(hoeditfactoryID, rootPath, node, index, controlStyle,
+  //name: string,
+  isSelected, boxAlign, numericValue, height, textStyle) {
     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, DrawRadioAndCheckBox);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_controlStyle", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_name", void 0);
+    //private _name!: string;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_isSelected", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_boxAlign", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_numericValue", void 0);
@@ -77805,7 +77892,7 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_dAppendText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_dUnderLine", void 0);
     _this._controlStyle = controlStyle;
-    _this._name = name;
+    //this._name = name;
     _this._isSelected = isSelected;
     _this._boxAlign = boxAlign;
     _this._numericValue = numericValue;
@@ -77858,11 +77945,9 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
     get: function get() {
       return this._controlStyle;
     }
-  }, {
-    key: "nameStr",
-    get: function get() {
-      return this._name;
-    }
+    // get nameStr(): string {
+    //   return this._name;
+    // }
   }, {
     key: "dBox",
     get: function get() {
@@ -78046,12 +78131,14 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
 var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint, _DrawCombineNode);
   var _super = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(DrawRadioAndCheckBoxPrint);
-  function DrawRadioAndCheckBoxPrint(hoeditfactoryID, rootPath, node, index, controlStyle, name, isSelected, boxAlign, numericValue, height, textStyle) {
+  function DrawRadioAndCheckBoxPrint(hoeditfactoryID, rootPath, node, index, controlStyle,
+  //name: string,
+  isSelected, boxAlign, numericValue, height, textStyle) {
     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, DrawRadioAndCheckBoxPrint);
     _this = _super.call(this, hoeditfactoryID, rootPath, node, index);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_controlStyle", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_name", void 0);
+    //private _name!: string;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_isSelected", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_boxAlign", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_numericValue", void 0);
@@ -78062,7 +78149,7 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_dAppendText", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["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), "_dUnderLine", void 0);
     _this._controlStyle = controlStyle;
-    _this._name = name;
+    //this._name = name;
     _this._isSelected = isSelected;
     _this._boxAlign = boxAlign;
     _this._numericValue = numericValue;
@@ -78102,11 +78189,9 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
     get: function get() {
       return this._controlStyle;
     }
-  }, {
-    key: "nameStr",
-    get: function get() {
-      return this._name;
-    }
+    // get nameStr(): string {
+    //   return this._name;
+    // }
   }, {
     key: "dBox",
     get: function get() {
@@ -88556,7 +88641,7 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
     key: "doRedo",
     value: function () {
       var _doRedo = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)( /*#__PURE__*/(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().mark(function _callee2() {
-        var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, startPath, changeEvent, result, toPath, next;
+        var strPath, hoeditorFactory, np, siblings, currNode, parentPath, getSlibs, index, pre, startPath, changeEvent, result, toPath;
         return (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -88630,31 +88715,34 @@ var NodeDeleteUndoUnit = /*#__PURE__*/function (_UndoInfo) {
               result = hoeditorFactory.docTree.deleteNode(currNode, this._operType);
               toPath = changeEvent.beforeChangePath;
               if (!result) {
-                _context2.next = 32;
+                _context2.next = 31;
                 break;
               }
-              next = index == siblings.length ? null : siblings[index];
-              changeEvent.afterChangePath = next ? hoeditorFactory.docTree.getNodeLastPath(next) : changeEvent.beforeChangePath;
-              _context2.next = 29;
+              //const next = index == siblings.length ? null : siblings[index];
+              // changeEvent.afterChangePath = next
+              //   ? hoeditorFactory.docTree.getNodeLastPath(next)
+              //   : changeEvent.beforeChangePath;
+              changeEvent.afterChangePath = toPath;
+              _context2.next = 28;
               return hoeditorFactory.docTree.change(changeEvent);
-            case 29:
+            case 28:
               toPath = changeEvent.beforeChangePath;
-              _context2.next = 33;
+              _context2.next = 32;
               break;
-            case 32:
+            case 31:
               toPath = this.strBeforePath;
-            case 33:
+            case 32:
               hoeditorFactory.docTree.curDomRange.setSamePath(toPath);
               hoeditorFactory.drawTree.moveCaretToPath(toPath);
               this.strBeforePath = pre ? hoeditorFactory.docTree.getNodeLastPath(pre) : parentPath;
-              _context2.next = 38;
+              _context2.next = 37;
               return this.ParentRepaint();
-            case 38:
+            case 37:
               if (currNode instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_19__/* .SignNode */ .N && (hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psEdit || hoeditorFactory.drawTree.paintStatus == _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_20__/* .PaintState */ .Dh.psReview)) {
                 hoeditorFactory.undoService.stack.splice(hoeditorFactory.undoService.stack.length - 1, 1);
                 hoeditorFactory.undoService._position--;
               }
-            case 39:
+            case 38:
             case "end":
               return _context2.stop();
           }
@@ -176972,7 +177060,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 var map = {
 	"./ControlModal.vue": 77004,
-	"./barCode/BarCodes.vue": 62814,
+	"./barCode/BarCodes.vue": 72727,
 	"./colorPicker/HoColorPicker.vue": 10306,
 	"./colorPicker/HoColorPickers.vue": 98181,
 	"./commentDialog/CommentDialog.vue": 61720,
@@ -176995,7 +177083,7 @@ var map = {
 	"./popers/Title.vue": 85516,
 	"./printstyle/PrintLineStyle.vue": 51484,
 	"./qrCode/QrCode.vue": 93973,
-	"./radioCheckBox/RadioCheckbox.vue": 68763,
+	"./radioCheckBox/RadioCheckbox.vue": 23875,
 	"./selectDialog/SelectDialog.vue": 76913,
 	"./sign/Sign.vue": 64207,
 	"./table/TableCellPoper.vue": 2043,
@@ -214444,8 +214532,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=9bd6cea8&
-var HoDocvue_type_template_id_9bd6cea8_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=template&id=4d76cdc3&
+var HoDocvue_type_template_id_4d76cdc3_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -214593,7 +214681,7 @@ var HoDocvue_type_template_id_9bd6cea8_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_9bd6cea8_staticRenderFns = [];
+var HoDocvue_type_template_id_4d76cdc3_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -214973,7 +215061,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               dPage = hoEditorFactory.drawTree.drawPages[this._pageIndex];
               if (!(aevent.currentTarget === this.stage)) {
-                _context.next = 45;
+                _context.next = 49;
                 break;
               }
               oldDPage = hoEditorFactory.drawTree.activePage;
@@ -215015,7 +215103,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
               //this._drawPage.drawDomLevel.activeDrawRect,
               aevent.stageX, aevent.stageY);
               if (!startPos) {
-                _context.next = 45;
+                _context.next = 49;
                 break;
               }
               if (!(!isSameArea && startPos.page)) {
@@ -215035,7 +215123,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
             case 30:
               np = hoEditorFactory.docTree.findNodePositionByPath(startPos.path);
               if (!(np && np.node)) {
-                _context.next = 45;
+                _context.next = 49;
                 break;
               }
               prevNode = np.node.prevSibling();
@@ -215051,29 +215139,34 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                 hoEditorFactory.docTree.selectChange(selectChangeEvent);
                 hoEditorFactory.docTree.curDomRange = newRange;
               }
-              if (np.node.nodeType === BaseNode/* NodeType */.Jq.ntMedicalExpression || np.node.nodeType === BaseNode/* NodeType */.Jq.ntControl && !(np.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || ((_np$node$parentNode = np.node.parentNode) === null || _np$node$parentNode === void 0 ? void 0 : _np$node$parentNode.nodeType) === BaseNode/* NodeType */.Jq.ntField || np.node.nodeType === BaseNode/* NodeType */.Jq.ntSign || np.node.nodeType === BaseNode/* NodeType */.Jq.ntGestation || np.node.nodeType === BaseNode/* NodeType */.Jq.ntImage) {
-                nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, 'dblclick', this._pageIndex);
-                hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
+              if (!(np.node.nodeType === BaseNode/* NodeType */.Jq.ntMedicalExpression || np.node.nodeType === BaseNode/* NodeType */.Jq.ntControl && !(np.node instanceof RadioAndCheckBoxNode/* RadioAndCheckBoxNode */.Yh) || ((_np$node$parentNode = np.node.parentNode) === null || _np$node$parentNode === void 0 ? void 0 : _np$node$parentNode.nodeType) === BaseNode/* NodeType */.Jq.ntField || np.node.nodeType === BaseNode/* NodeType */.Jq.ntSign || np.node.nodeType === BaseNode/* NodeType */.Jq.ntGestation || np.node.nodeType === BaseNode/* NodeType */.Jq.ntImage)) {
+                _context.next = 39;
+                break;
               }
+              nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(np.node, 'dblclick', this._pageIndex);
+              hoEditorFactory.docTree.nodeNeedModify(nodeNeedModifyEvent);
+              _context.next = 49;
+              break;
+            case 39:
               if (!(np.node.parentNode instanceof CellNode/* CellNode */.D)) {
-                _context.next = 45;
+                _context.next = 49;
                 break;
               }
               cellNode = np.node.parentNode;
               colInfos = cellNode.table.colInfos[np.node.parentNode.row.indexOf(np.node.parentNode)];
               if (colInfos.isAllowEdit) {
-                _context.next = 40;
+                _context.next = 44;
                 break;
               }
               return _context.abrupt("return");
-            case 40:
+            case 44:
               rowInfos = cellNode.table.rowInfos[np.node.parentNode.table.rows.indexOf(np.node.parentNode.row)];
               if (!(!rowInfos.isAllowEdit || rowInfos.rowProperty.repeatAsTitleAtPageTop)) {
-                _context.next = 43;
+                _context.next = 47;
                 break;
               }
               return _context.abrupt("return");
-            case 43:
+            case 47:
               colProperty = colInfos.colProperty;
               if (cellNode.table.tableProperty.isUsePopEdit && colProperty.editorProperty !== TableProperty/* EditorProperty */.YS.Sign) {
                 _nodeNeedModifyEvent = new NodeNeedModifyEvent/* NodeNeedModifyEvent */.x(cellNode, 'dblclick', this._pageIndex);
@@ -215119,9 +215212,9 @@ var DrawSelectLevel = /*#__PURE__*/function () {
                   }
                 }
               }
-            case 45:
+            case 49:
               return _context.abrupt("return", true);
-            case 46:
+            case 50:
             case "end":
               return _context.stop();
           }
@@ -217593,7 +217686,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.9');
+/* harmony default export */ var version = ('3.1.11');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -218036,151 +218129,152 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         });
         this.poperType = '';
         return;
-      }
-      if (paintStatus === 4) {
-        if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-          var parentNode = node.parentNode;
-          if (Number(parentNode.inputFieldType) === 0) {
-            this.$emit('dblNodeClick', {
-              setActiveDoc: this.setActiveDocIndex,
-              node: this.getCurrentSelectNode,
-              type: 'modify_node',
-              paintStatus: paintStatus
-            });
-            this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
+      } else {
+        if (paintStatus === 4) {
+          if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+            var parentNode = node.parentNode;
+            if (Number(parentNode.inputFieldType) === 0) {
+              this.$emit('dblNodeClick', {
+                setActiveDoc: this.setActiveDocIndex,
+                node: this.getCurrentSelectNode,
+                type: 'modify_node',
+                paintStatus: paintStatus
+              });
+              this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
+              return false;
+            }
             return false;
           }
           return false;
         }
-        return false;
-      }
-      if (node instanceof DateTimeNode/* DateTimeNode */.Z) {
-        if (paintStatus === 0) {
-          this.hoEditorProvider.setControlProperty('date', 'update', '');
-          this.hoEditorProvider.setUpdateNodeValue(node);
-          return;
-        }
-        if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
-          return false;
-        }
-        this.computedPoperPosition(node, pageIndex);
-        this.poperType = 'datePoper';
-      } else if (node instanceof DownListNode/* DownListNode */.yF) {
-        if (paintStatus === 0) {
-          this.hoEditorProvider.setControlProperty('select', 'update', '');
-          return;
-        }
-        if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
-          return;
-        }
-        var callback = function callback(list) {
-          _this5.computedPoperPosition(node, pageIndex);
-          if (Array.isArray(list) && list.length > 0) {
-            _this5.poperSelectList = list;
-          } else {
-            _this5.poperSelectList = node.downListContent ? node.downListContent : [];
-          }
-          _this5.poperType = 'selectPoper';
-        };
-        if (node.customProperty && node.customProperty.hasThirdData == true) {
-          this.$emit('dblNodeClick', {
-            setActiveDoc: this.setActiveDocIndex,
-            node: this.getCurrentSelectNode,
-            type: 'downlist',
-            callback: callback,
-            paintStatus: paintStatus
-          });
-        } else {
-          callback(undefined);
-        }
-      } else if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
-        // 文本域
-        var _parentNode = node.parentNode;
-        if (Number(_parentNode.inputFieldType) === 0) {
-          if (_parentNode.canModifyContent) {
-            this.$emit('dblNodeClick', {
-              setActiveDoc: this.setActiveDocIndex,
-              node: this.getCurrentSelectNode,
-              type: 'text',
-              paintStatus: paintStatus
-            });
-          } else {
-            this.$emit('dblNodeClick', {
-              setActiveDoc: this.setActiveDocIndex,
-              node: this.getCurrentSelectNode,
-              type: 'modify_node',
-              paintStatus: paintStatus
-            });
-          }
-          this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
-          return false;
-        }
-        if (_parentNode.readOnlyStatus === 0 && _parentNode.text.replace(/\s*/g, '') !== '') {
-          return false;
-        }
-        if (Number(_parentNode.inputFieldType) === 2) {
+        if (node instanceof DateTimeNode/* DateTimeNode */.Z) {
           if (paintStatus === 0) {
             this.hoEditorProvider.setControlProperty('date', 'update', '');
+            this.hoEditorProvider.setUpdateNodeValue(node);
             return;
           }
+          if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
+            return false;
+          }
+          this.computedPoperPosition(node, pageIndex);
           this.poperType = 'datePoper';
-        } else if (Number(_parentNode.inputFieldType) === 1) {
-          var _parentNode$downListP, _parentNode$downListP2, _parentNode$downListP3;
+        } else if (node instanceof DownListNode/* DownListNode */.yF) {
           if (paintStatus === 0) {
-            this.hoEditorProvider.setControlProperty('text', 'update', '');
-            this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
+            this.hoEditorProvider.setControlProperty('select', 'update', '');
             return;
           }
-          var text = node.text.replace(/ /g, '');
-          var lists = (_parentNode$downListP = _parentNode.downListProperty) !== null && _parentNode$downListP !== void 0 && _parentNode$downListP.listItems ? JSON.parse((_parentNode$downListP2 = _parentNode.downListProperty) === null || _parentNode$downListP2 === void 0 ? void 0 : _parentNode$downListP2.listItems) : [];
-          var allowMultiSelected = ((_parentNode$downListP3 = _parentNode.downListProperty) === null || _parentNode$downListP3 === void 0 ? void 0 : _parentNode$downListP3.allowMultiSelected) || false;
-          var childs = _parentNode.childNodes.filter(function (v) {
-            return v.nodeType != 5 && v.nodeType != 2;
-          });
-          if (childs.length > 0 && text != _parentNode.name && text !== '' && !allowMultiSelected && lists.length > 0) {
-            if (lists.filter(function (v) {
-              return v.text.includes('<元素>');
-            }).length > 0) {
-              return;
-            }
+          if (node.isReadOnly && node.text.replace(/\s*/g, '') !== '') {
+            return;
           }
-          var _callback = function _callback(list) {
+          var callback = function callback(list) {
             _this5.computedPoperPosition(node, pageIndex);
             if (Array.isArray(list) && list.length > 0) {
               _this5.poperSelectList = list;
             } else {
-              _this5.poperSelectList = lists.filter(function (v) {
-                return v.value || v.text;
-              });
+              _this5.poperSelectList = node.downListContent ? node.downListContent : [];
             }
             _this5.poperType = 'selectPoper';
           };
-          if (_parentNode.customProperty && _parentNode.customProperty.hasThirdData == true) {
+          if (node.customProperty && node.customProperty.hasThirdData == true) {
             this.$emit('dblNodeClick', {
               setActiveDoc: this.setActiveDocIndex,
               node: this.getCurrentSelectNode,
-              type: 'textlist',
-              callback: _callback,
+              type: 'downlist',
+              callback: callback,
               paintStatus: paintStatus
             });
           } else {
-            _callback(undefined);
+            callback(undefined);
+          }
+        } else if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+          // 文本域
+          var _parentNode = node.parentNode;
+          if (Number(_parentNode.inputFieldType) === 0) {
+            if (_parentNode.canModifyContent) {
+              this.$emit('dblNodeClick', {
+                setActiveDoc: this.setActiveDocIndex,
+                node: this.getCurrentSelectNode,
+                type: 'text',
+                paintStatus: paintStatus
+              });
+            } else {
+              this.$emit('dblNodeClick', {
+                setActiveDoc: this.setActiveDocIndex,
+                node: this.getCurrentSelectNode,
+                type: 'modify_node',
+                paintStatus: paintStatus
+              });
+            }
+            this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
+            return false;
+          }
+          if (_parentNode.readOnlyStatus === 0 && _parentNode.text.replace(/\s*/g, '') !== '') {
+            return false;
+          }
+          if (Number(_parentNode.inputFieldType) === 2) {
+            if (paintStatus === 0) {
+              this.hoEditorProvider.setControlProperty('date', 'update', '');
+              return;
+            }
+            this.poperType = 'datePoper';
+          } else if (Number(_parentNode.inputFieldType) === 1) {
+            var _parentNode$downListP, _parentNode$downListP2, _parentNode$downListP3;
+            if (paintStatus === 0) {
+              this.hoEditorProvider.setControlProperty('text', 'update', '');
+              this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
+              return;
+            }
+            var text = node.text.replace(/ /g, '');
+            var lists = (_parentNode$downListP = _parentNode.downListProperty) !== null && _parentNode$downListP !== void 0 && _parentNode$downListP.listItems ? JSON.parse((_parentNode$downListP2 = _parentNode.downListProperty) === null || _parentNode$downListP2 === void 0 ? void 0 : _parentNode$downListP2.listItems) : [];
+            var allowMultiSelected = ((_parentNode$downListP3 = _parentNode.downListProperty) === null || _parentNode$downListP3 === void 0 ? void 0 : _parentNode$downListP3.allowMultiSelected) || false;
+            var childs = _parentNode.childNodes.filter(function (v) {
+              return v.nodeType != 5 && v.nodeType != 2;
+            });
+            if (childs.length > 0 && text != _parentNode.name && text !== '' && !allowMultiSelected && lists.length > 0) {
+              if (lists.filter(function (v) {
+                return v.text.includes('<元素>');
+              }).length > 0) {
+                return;
+              }
+            }
+            var _callback = function _callback(list) {
+              _this5.computedPoperPosition(node, pageIndex);
+              if (Array.isArray(list) && list.length > 0) {
+                _this5.poperSelectList = list;
+              } else {
+                _this5.poperSelectList = lists.filter(function (v) {
+                  return v.value || v.text;
+                });
+              }
+              _this5.poperType = 'selectPoper';
+            };
+            if (_parentNode.customProperty && _parentNode.customProperty.hasThirdData == true) {
+              this.$emit('dblNodeClick', {
+                setActiveDoc: this.setActiveDocIndex,
+                node: this.getCurrentSelectNode,
+                type: 'textlist',
+                callback: _callback,
+                paintStatus: paintStatus
+              });
+            } else {
+              _callback(undefined);
+            }
           }
+        } else if (node.parentNode instanceof CellNode/* CellNode */.D && node.nodeType !== BaseNode/* NodeType */.Jq.ntMedicalExpression && node.nodeType !== BaseNode/* NodeType */.Jq.ntImage) {
+          this.handleCellNode(node, node.parentNode, pageIndex, paintStatus);
+        } else if (node instanceof CellNode/* CellNode */.D) {
+          this.handleForm('update');
+        } else if (node instanceof ImageNode/* ImageNode */.H) {
+          this.poperType = '';
+          this.$emit('dblNodeClick', {
+            setActiveDoc: this.setActiveDocIndex,
+            node: this.getCurrentSelectNode,
+            type: 'edit-image',
+            paintStatus: paintStatus
+          });
+        } else {
+          this.hoEditorProvider.setDblclickNodeValue(node, 'dblclick');
         }
-      } else if (node.parentNode instanceof CellNode/* CellNode */.D && node.nodeType !== BaseNode/* NodeType */.Jq.ntMedicalExpression && node.nodeType !== BaseNode/* NodeType */.Jq.ntImage) {
-        this.handleCellNode(node, node.parentNode, pageIndex, paintStatus);
-      } else if (node instanceof CellNode/* CellNode */.D) {
-        this.handleForm('update');
-      } else if (node instanceof ImageNode/* ImageNode */.H) {
-        this.poperType = '';
-        this.$emit('dblNodeClick', {
-          setActiveDoc: this.setActiveDocIndex,
-          node: this.getCurrentSelectNode,
-          type: 'edit-image',
-          paintStatus: paintStatus
-        });
-      } else {
-        this.hoEditorProvider.setDblclickNodeValue(node, 'dblclick');
       }
     },
     createAddCellButton: function createAddCellButton(node, pageIndex) {
@@ -218353,10 +218447,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=9bd6cea8&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/HoDoc.vue?vue&type=style&index=0&id=4d76cdc3&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=9bd6cea8&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=4d76cdc3&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -218369,8 +218463,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_9bd6cea8_render,
-  HoDocvue_type_template_id_9bd6cea8_staticRenderFns,
+  HoDocvue_type_template_id_4d76cdc3_render,
+  HoDocvue_type_template_id_4d76cdc3_staticRenderFns,
   false,
   null,
   null,
@@ -220702,8 +220796,6 @@ var HTMLconverter2 = /*#__PURE__*/function () {
     value: function generateTableProperty(jnode) {
       jquery_default()(jnode).attr;
       var tableProperty = new TableProperty/* TableProperty */.vE('');
-      tableProperty.tightLineSpace = tableProperty['tightLineSpace'] || false;
-      tableProperty.layoutFullLine = tableProperty['layoutFullLine'] || false;
       tableProperty.continuePrintBorders = tableProperty['continuePrintBorders'] || false;
       tableProperty.canDeleteTable = tableProperty['canDeleteTable'] || false;
       tableProperty.canDeleteRow = tableProperty['canDeleteRow'] || false;
@@ -225990,14 +226082,15 @@ var VueController = /*#__PURE__*/function () {
     key: "insertBarcode",
     value: function insertBarcode(operType, id, textContent, isDisplayText, imagePath, width, height,
     //bandDataSource: string,
-    name, innerIdentifier) {
+    //name: string,
+    innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.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 */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.insertBarcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.insertBarcode('add', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
+        hoEditorFactory.docController.insertBarcode('add', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, innerIdentifier);
       }
     }
     /**
@@ -226011,14 +226104,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateBarcode",
-    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
+    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.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 */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.updateBarcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertBarcode('update', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
+        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertBarcode('update', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, innerIdentifier);
       }
     }
     /**
@@ -226040,30 +226133,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertQrcode",
-    value: function insertQrcode(operType, id, textContent, type, correctLevel,
-    // dataSourceEnabled: boolean,
-    // dataSource: string,
-    // format: string,
-    // visitPath: string,
-    // isReadOnly: boolean,
-    // autoUpdate: boolean,
-    // execState: string,
-    width, height, name, innerIdentifier, isFillBack) {
+    value: function insertQrcode(operType, id, textContent, type, correctLevel, width, height, name, innerIdentifier, isFillBack) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.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 */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.insertQrcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertQrcode('add', _curDomRange, id, textContent, type, correctLevel,
-        // dataSourceEnabled,
-        // dataSource,
-        // format,
-        // visitPath,
-        // isReadOnly,
-        // autoUpdate,
-        // execState,
-        width, height, name, innerIdentifier, isFillBack);
+        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertQrcode('add', _curDomRange, id, textContent, type, correctLevel, width, height, name, innerIdentifier, isFillBack);
       }
     }
     /**
@@ -226084,30 +226161,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateQrcode",
-    value: function updateQrcode(id, textContent, type, correctLevel,
-    // dataSourceEnabled: boolean,
-    // dataSource: string,
-    // format: string,
-    // visitPath: string,
-    // isReadOnly: boolean,
-    // autoUpdate: boolean,
-    // execState: string,
-    width, height, name, innerIdentifier, isFillBack) {
+    value: function updateQrcode(id, textContent, type, correctLevel, width, height, name, innerIdentifier, isFillBack) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.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 */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType */.y.updateQrcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertQrcode('update', _curDomRange, id, textContent, type, correctLevel,
-        // dataSourceEnabled,
-        // dataSource,
-        // format,
-        // visitPath,
-        // isReadOnly,
-        // autoUpdate,
-        // execState,
-        width, height, name, innerIdentifier, isFillBack);
+        HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertQrcode('update', _curDomRange, id, textContent, type, correctLevel, width, height, name, innerIdentifier, isFillBack);
       }
     }
     /**
@@ -229601,9 +229662,12 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateElementById",
-    value: function updateElementById(id, eleJson) {
+    value: function updateElementById(id, eleJson, name) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var node = this.getNodeByID('all', id);
+      if (!node && name) {
+        node = this.getNodesByName('all', false, name)[0];
+      }
       if (node) {
         //eleJson = JSON.parse(eleJson);
         if (node instanceof TextInputFieldNode/* TextInputFieldNode */.re || node instanceof DateTimeNode/* DateTimeNode */.Z || node instanceof DownListNode/* DownListNode */.yF) {
@@ -229633,10 +229697,10 @@ var VueController = /*#__PURE__*/function () {
           var toPath = hoEditorFactory.docTree.getNodeLastPath(newNode);
           hoEditorFactory.drawTree.moveCaretToPath(toPath);
         } else {
-          throw new Error('根据元素id:' + id + '定位到的元素非可回填元素');
+          console.warn('根据元素id:' + id + '和元素name:' + name + '定位到的元素非可回填元素');
         }
       } else {
-        throw new Error('根据元素id:' + id + '未找到对应的元素');
+        console.warn('根据元素id:' + id + '和元素name:' + name + '未找到对应的元素');
       }
     }
     //更新回填元素的文本内容  更正元素
@@ -231273,8 +231337,6 @@ var VueController = /*#__PURE__*/function () {
             canDeleteTable: node.tableProperty.canDeleteTable,
             continuePrintBorders: node.tableProperty.continuePrintBorders,
             customProperties: customProperties,
-            layoutFullLine: node.tableProperty.layoutFullLine,
-            tightLineSpace: node.tableProperty.tightLineSpace,
             isAutoChangeLine: node.tableProperty.isAutoChangeLine,
             autoLineHeight: node.tableProperty.autoLineHeight,
             fixedOnePage: node.tableProperty.fixedOnePage,
@@ -232377,6 +232439,24 @@ var VueController = /*#__PURE__*/function () {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       return hoEditorFactory.editController.canIsEdit(hoEditorFactory);
     }
+  }, {
+    key: "getElementChangeRecords",
+    value: function getElementChangeRecords() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      var recordArr = new Array();
+      var records = hoEditorFactory.docTree.elementChangeRecords;
+      records.forEach(function (value, key) {
+        if (value !== "add0") {
+          var record = {
+            "type": value,
+            "id": key.split("|")[0],
+            "dataid": key.split("|")[1]
+          };
+          recordArr.push(record);
+        }
+      });
+      return recordArr;
+    }
   }]);
   return VueController;
 }();
@@ -233822,7 +233902,7 @@ var ElementController = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-07-31 10:10:30
- * @LastEditTime: 2023-08-08 18:09:19
+ * @LastEditTime: 2023-09-14 17:03:18
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\externalCall\NodeController.ts
@@ -234135,9 +234215,9 @@ var NodeController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertBarcode",
-    value: function insertBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
+    value: function insertBarcode(id, textContent, isDisplayText, imagePath, width, height, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.insertBarcode('add', id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
+      hoEditorFactory.vueController.insertBarcode('add', id, textContent, isDisplayText, imagePath, width, height, innerIdentifier);
     }
     /**
      * 修改条形码
@@ -234150,9 +234230,9 @@ var NodeController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateBarcode",
-    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
+    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
+      hoEditorFactory.vueController.updateBarcode(id, textContent, isDisplayText, imagePath, width, height, innerIdentifier);
     }
     /**
      * 插入二维码
@@ -236659,7 +236739,7 @@ var PrintController = /*#__PURE__*/function () {
     value: function () {
       var _pintAllToPDF = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee8(xmlList, callback, params) {
         var _this6 = this;
-        var hoEditorFactory, beforePrintStatus, xml, xmlIndex, mergeList, position, continuousid, options, toPrint, createSvg;
+        var hoEditorFactory, beforePrintStatus, xml, xmlIndex, mergeList, position, continuousid, options, pageNumber, toPrint, createSvg;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -236679,15 +236759,18 @@ var PrintController = /*#__PURE__*/function () {
               };
               this.PDF = null;
               this.PDF = new jspdf/* default */.ZP(options);
+              pageNumber = {
+                value: 0
+              };
               toPrint = /*#__PURE__*/function () {
                 var _ref3 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee6() {
                   return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee6$(_context6) {
                     while (1) switch (_context6.prev = _context6.next) {
                       case 0:
                         if (params && continuousid && Array.isArray(params.notPrintDocId) && params.notPrintDocId.length > 0 && params.notPrintDocId.includes(continuousid)) {
-                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true);
+                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, true, pageNumber);
                         } else {
-                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position);
+                          PrintStatus/* Print */.Kh.printAllNew(_this6._hoEditorFactoryID, createSvg, _this6.PDF, position, false, pageNumber);
                         }
                       case 1:
                       case "end":
@@ -236701,7 +236784,7 @@ var PrintController = /*#__PURE__*/function () {
               }();
               createSvg = /*#__PURE__*/function () {
                 var _ref4 = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee7() {
-                  var _this6$PDF, name;
+                  var otherPageNumber, i, _this6$PDF, _this6$PDF2, name;
                   return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee7$(_context7) {
                     while (1) switch (_context7.prev = _context7.next) {
                       case 0:
@@ -236753,7 +236836,16 @@ var PrintController = /*#__PURE__*/function () {
                           }));
                           hoEditorFactory.drawTree.paintStatus = beforePrintStatus;
                           hoEditorFactory.vueController.openXml(xml);
-                          (_this6$PDF = _this6.PDF) === null || _this6$PDF === void 0 ? void 0 : _this6$PDF.deletePage(1);
+                          otherPageNumber = _this6.PDF.internal.getNumberOfPages() - pageNumber.value;
+                          if (otherPageNumber >= 2) {
+                            for (i = 0; i < otherPageNumber; i++) {
+                              (_this6$PDF = _this6.PDF) === null || _this6$PDF === void 0 ? void 0 : _this6$PDF.deletePage(1);
+                            }
+                            console.warn("\u5220\u6389".concat(otherPageNumber, "\u9875\u7A7A\u767D\u9875"));
+                          } else if (otherPageNumber <= 1) {
+                            (_this6$PDF2 = _this6.PDF) === null || _this6$PDF2 === void 0 ? void 0 : _this6$PDF2.deletePage(1);
+                            console.warn("\u5220\u63891\u9875\u7A7A\u767D\u9875");
+                          }
                           name = hoEditorFactory.vueController.getDocTitle() ? hoEditorFactory.vueController.getDocTitle() : '电子病历文档';
                           PrintStatus/* Print */.Kh.openDataUriInWindow(_this6.PDF, name, hoEditorFactory.pageProperty.widthPixes, hoEditorFactory.printSilently);
                           _this6.clearJsPDF();
@@ -236769,7 +236861,7 @@ var PrintController = /*#__PURE__*/function () {
                 };
               }();
               createSvg();
-            case 15:
+            case 16:
             case "end":
               return _context8.stop();
           }