hoeditor-web 3.1.78 → 3.1.80

package/lib/hoeditor.umd.js

@@ -15853,7 +15853,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 8494:
+/***/ 1545:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15869,7 +15869,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
-;// 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/sign/Sign.vue?vue&type=template&id=9c073ac8&
+;// 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/sign/Sign.vue?vue&type=template&id=5d84ec10&
 
 
 var render = function render() {
@@ -16268,6 +16268,18 @@ var render = function render() {
       },
       expression: "isHigher"
     }
+  })], 1) : _vm._e(), _vm.signType !== 1 ? _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
+  }, [_vm._v("允许补充编辑")]), _c('a-checkbox', {
+    model: {
+      value: _vm.additionsEditor,
+      callback: function callback($$v) {
+        _vm.additionsEditor = $$v;
+      },
+      expression: "additionsEditor"
+    }
   })], 1) : _vm._e()], 2), _vm.signType >= 9 ? _c('div', {
     staticClass: "section-right"
   }, [_c('div', {
@@ -16370,7 +16382,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=9c073ac8&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=template&id=5d84ec10&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -16456,13 +16468,14 @@ var SignNode = __webpack_require__(24701);
       animationClassNames: 'control-modal-contents sign-modal animation-in',
       isDisplayTitle: false,
       isHigher: false,
+      additionsEditor: false,
       isDisplayTime: false,
       timePosition: '0',
       dateTimeList: [],
       associatedElement: '',
       modifyProps: {},
       unwatchProps: [],
-      watchProps: ['name', 'signType', 'signFormat', 'connectMode', 'connectChar', 'isFront', 'signTimeFormat', 'customFormatContent', 'isDisplayTitle', 'isDisplayTime', 'timePosition', 'associatedElement', 'isHigher']
+      watchProps: ['name', 'signType', 'signFormat', 'connectMode', 'connectChar', 'isFront', 'signTimeFormat', 'customFormatContent', 'isDisplayTitle', 'isDisplayTime', 'timePosition', 'associatedElement', 'isHigher', 'additionsEditor']
     };
   },
   mounted: function mounted() {
@@ -16480,7 +16493,7 @@ var SignNode = __webpack_require__(24701);
     if (this.controlStatus === 'update') {
       var node = this.getCurrentSelectNode();
       if (node) {
-        var _node$otherProperties, _node$otherProperties2, _node$otherProperties3, _node$otherProperties4, _node$otherProperties5, _node$otherProperties6, _node$otherProperties7;
+        var _node$otherProperties, _node$otherProperties2, _node$otherProperties3, _node$otherProperties4, _node$otherProperties5, _node$otherProperties6, _node$otherProperties7, _node$otherProperties8, _node$otherProperties9;
         this.name = node.name;
         if (node.attribute == 2) {
           this.signType = 2; // 自定义多人签名(带职称)
@@ -16507,8 +16520,9 @@ var SignNode = __webpack_require__(24701);
         // this.customSignFormatList = node.customSignFormatList ? node.customSignFormatList : [];
         this.isDisplayTitle = ((_node$otherProperties = node.otherProperties) === null || _node$otherProperties === void 0 ? void 0 : _node$otherProperties.isDisplayTitle) === 'true' | ((_node$otherProperties2 = node.otherProperties) === null || _node$otherProperties2 === void 0 ? void 0 : _node$otherProperties2.isDisplayTitle) === true ? true : false;
         this.isHigher = ((_node$otherProperties3 = node.otherProperties) === null || _node$otherProperties3 === void 0 ? void 0 : _node$otherProperties3.isHigher) === 'true' | ((_node$otherProperties4 = node.otherProperties) === null || _node$otherProperties4 === void 0 ? void 0 : _node$otherProperties4.isHigher) === true ? true : false;
-        this.isDisplayTime = ((_node$otherProperties5 = node.otherProperties) === null || _node$otherProperties5 === void 0 ? void 0 : _node$otherProperties5.isDisplayTime) === 'true' | ((_node$otherProperties6 = node.otherProperties) === null || _node$otherProperties6 === void 0 ? void 0 : _node$otherProperties6.isDisplayTime) === true ? true : false;
-        this.timePosition = ((_node$otherProperties7 = node.otherProperties) === null || _node$otherProperties7 === void 0 ? void 0 : _node$otherProperties7.timePosition) == '1' ? '1' : '0';
+        this.additionsEditor = ((_node$otherProperties5 = node.otherProperties) === null || _node$otherProperties5 === void 0 ? void 0 : _node$otherProperties5.additionsEditor) === 'true' | ((_node$otherProperties6 = node.otherProperties) === null || _node$otherProperties6 === void 0 ? void 0 : _node$otherProperties6.additionsEditor) === true ? true : false;
+        this.isDisplayTime = ((_node$otherProperties7 = node.otherProperties) === null || _node$otherProperties7 === void 0 ? void 0 : _node$otherProperties7.isDisplayTime) === 'true' | ((_node$otherProperties8 = node.otherProperties) === null || _node$otherProperties8 === void 0 ? void 0 : _node$otherProperties8.isDisplayTime) === true ? true : false;
+        this.timePosition = ((_node$otherProperties9 = node.otherProperties) === null || _node$otherProperties9 === void 0 ? void 0 : _node$otherProperties9.timePosition) == '1' ? '1' : '0';
         this.associatedElement = node.associatedElement ? node.associatedElement : '';
         list.forEach(function (v) {
           if (v.nodeType == 8 && (!associatedElementList.includes(v.dataId) || node.associatedElement == v.dataId)) {
@@ -16609,28 +16623,33 @@ var SignNode = __webpack_require__(24701);
         if (this.signType === 9) {
           // 自定义医生签名
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义医生签名', 1, this.signFormat, this.signTimeFormat, customProperty, this.connectMode, this.isFront, this.allowEditSignTime, 0, '', {
-            isHigher: this.isHigher
+            isHigher: this.isHigher,
+            additionsEditor: this.additionsEditor
           }, this.associatedElement);
         } else if (this.signType === 2) {
           // 多人签名（默认带职称）
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {
-            isHigher: this.isHigher
+            isHigher: this.isHigher,
+            additionsEditor: this.additionsEditor
           }, this.associatedElement);
         } else if (this.signType === 3) {
           // 自定义多人签名（默认带出职称和日期）
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（默认带出职称和日期）', 0, '', '', customProperty, '', undefined, undefined, this.signType, this.connectChar, {
-            isHigher: this.isHigher
+            isHigher: this.isHigher,
+            additionsEditor: this.additionsEditor
           }, this.associatedElement);
         } else if (this.signType === 4) {
           // 自定义多人签名（职称，连接符可选）
           this.vueController.insertEmptySignNode(this.name ? this.name : '自定义多人签名（职称，连接符可选）', 0, '', this.signTimeFormat, customProperty, this.connectMode, undefined, undefined, this.signType, this.connectChar, (0,objectSpread2/* default */.Z)({
             isDisplayTitle: this.isDisplayTitle,
+            additionsEditor: this.additionsEditor,
             isHigher: this.isHigher
           }, otherProperty), this.associatedElement);
         } else {
           var name = this.name ? this.name : this.signType == 1 ? '患者签名' : '医生签名';
           var otherProperties = {
-            isHigher: this.isHigher
+            isHigher: this.isHigher,
+            additionsEditor: this.additionsEditor
           };
           if (this.signType == 1) {
             otherProperties = {};
@@ -16645,7 +16664,8 @@ var SignNode = __webpack_require__(24701);
         var signType = this.signType == 9 ? 1 : 0; // 自定义签名的signType=1 其他签名 signType=0
         var _otherProperties = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, node.otherProperties), {}, {
           isDisplayTitle: this.isDisplayTitle,
-          isHigher: this.isHigher
+          isHigher: this.isHigher,
+          additionsEditor: this.additionsEditor
         }, otherProperty);
         if (Object.keys(this.modifyProps).length) {
           var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorFactoryId);
@@ -16668,10 +16688,10 @@ var SignNode = __webpack_require__(24701);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=script&lang=js&
  /* harmony default export */ var sign_Signvue_type_script_lang_js_ = (Signvue_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/sign/Sign.vue?vue&type=style&index=0&id=9c073ac8&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/sign/Sign.vue?vue&type=style&index=0&id=5d84ec10&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=9c073ac8&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/sign/Sign.vue?vue&type=style&index=0&id=5d84ec10&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -24671,7 +24691,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 92682:
+/***/ 86559:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -24685,7 +24705,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/upload/HoFabric.vue?vue&type=template&id=2d0c0396&
+;// 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/upload/HoFabric.vue?vue&type=template&id=515347a9&
 
 var render = function render() {
   var _vm = this,
@@ -24988,7 +25008,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=template&id=2d0c0396&
+;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=template&id=515347a9&
 
 // EXTERNAL MODULE: ./node_modules/ant-design-vue/es/message/style/index.js + 1 modules
 var style = __webpack_require__(94310);
@@ -25068,6 +25088,8 @@ var CircleSvgIcon = {
     };
   }
 };
+// EXTERNAL MODULE: ./src/components/controls/upload/HoFabricConfig.ts
+var HoFabricConfig = __webpack_require__(3573);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/upload/HoFabric.vue?vue&type=script&lang=js&
 
 
@@ -25082,6 +25104,7 @@ var CircleSvgIcon = {
 
 
 
+
 /* harmony default export */ var HoFabricvue_type_script_lang_js_ = ({
   name: 'HoFabric',
   data: function data() {
@@ -25163,9 +25186,9 @@ var CircleSvgIcon = {
       //边框线条选择数据
       borderWidth: 2,
       //所有图形边框的宽度
-      borderColor: '#1e90ff',
+      borderColor: '#F00',
       //所有图形边框的颜色
-      fontSize: 20,
+      fontSize: '35',
       textObj: '',
       //存储绘制文字对象
       // backStack: [], //所有的绘画对象栈
@@ -25703,6 +25726,9 @@ var CircleSvgIcon = {
     if (!this.fabric) {
       this.fabric = (__webpack_require__(86357).fabric);
     }
+    var config = HoFabricConfig/* HoFabricConfig */.G.instance();
+    this.fontSize = config.fontSize;
+    this.borderColor = config.borderColor;
   },
   mounted: function mounted() {
     var _this4 = this;
@@ -25785,10 +25811,10 @@ var CircleSvgIcon = {
 });
 ;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=script&lang=js&
  /* harmony default export */ var upload_HoFabricvue_type_script_lang_js_ = (HoFabricvue_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/upload/HoFabric.vue?vue&type=style&index=0&id=2d0c0396&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/upload/HoFabric.vue?vue&type=style&index=0&id=515347a9&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=style&index=0&id=2d0c0396&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/upload/HoFabric.vue?vue&type=style&index=0&id=515347a9&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -32378,6 +32404,46 @@ var getCellNode = function getCellNode(nodes) {
 
 /***/ }),
 
+/***/ 3573:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   G: function() { return /* binding */ HoFabricConfig; }
+/* harmony export */ });
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(70280);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(66298);
+/* harmony import */ var D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(78255);
+
+
+
+var HoFabricConfig = /*#__PURE__*/function () {
+  function HoFabricConfig() {
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, HoFabricConfig);
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, "fontSize", '35');
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(this, "borderColor", "#F00");
+  }
+  (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(HoFabricConfig, [{
+    key: "setConfig",
+    value: function setConfig(value) {
+      this.fontSize = value.fontSize ? value.fontSize : '35';
+      this.borderColor = value.borderColor ? value.borderColor : '35';
+    }
+  }], [{
+    key: "instance",
+    value: function instance() {
+      if (!this._instance) {
+        this._instance = new HoFabricConfig();
+      }
+      return this._instance;
+    }
+  }]);
+  return HoFabricConfig;
+}();
+(0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z)(HoFabricConfig, "_instance", void 0);
+
+/***/ }),
+
 /***/ 95677:
 /***/ (function(__unused_webpack_module, __webpack_exports__) {
 
@@ -40800,11 +40866,12 @@ var DocController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertSignNode",
-    value: function insertSignNode(domRange, type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc, fingerPosition) {
+    value: function insertSignNode(domRange, type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc, fingerPosition, otherProperties, signType) {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_78__/* .HOEditorFactorys */ .b.instance().getFactory(this._hoEditorFactoryID);
       var startPath = domRange.startPath;
       var parentNode = hoEditorFactory.docTree.getParentNode(startPath);
-      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntSign, 1, type, name, 0, '医师签名', signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition);
+      var attribute = signType ? signType : 0;
+      var signNode = new _treeNode_SignNode__WEBPACK_IMPORTED_MODULE_85__/* .SignNode */ .N(this._hoEditorFactoryID, domRange.npStart.roots, parentNode, _treeNode_BaseNode__WEBPACK_IMPORTED_MODULE_26__/* .NodeType */ .Jq.ntSign, 1, type, name, 0, '医师签名', signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, false, hoEditorFactory.docTree.curStyleIndex, undefined, undefined, undefined, fingerPrintSrc, fingerPosition, attribute, undefined, otherProperties);
       //插入该表达式节点
       hoEditorFactory.undoService.begin();
       hoEditorFactory.undoService.add(new _undoRedo_NodeInsertUndoUnit__WEBPACK_IMPORTED_MODULE_27__/* .NodeInsertUndoUnit */ .R(this._hoEditorFactoryID, startPath, signNode));
@@ -41432,6 +41499,9 @@ 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);
+    //元素修改记录
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(this, "_redrawHiddenParas", 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);
@@ -41458,6 +41528,7 @@ var DocTree = /*#__PURE__*/function () {
     //this._comments = new Array<Comment>();
     this._userHistories = new Array();
     this._elementChangeRecords = new Map();
+    this._redrawHiddenParas = [];
     // this._docProperty = new DocProperty(this);
     // this._curUserIndex = -1;
     //this._curOnSelectedComment = null;
@@ -41621,6 +41692,16 @@ var DocTree = /*#__PURE__*/function () {
         this._elementChangeRecords = value;
       }
     }
+  }, {
+    key: "redrawHiddenParas",
+    get: function get() {
+      return this._redrawHiddenParas;
+    },
+    set: function set(value) {
+      if (value !== this._redrawHiddenParas) {
+        this._redrawHiddenParas = value;
+      }
+    }
   }, {
     key: "docProperty",
     get: function get() {
@@ -43364,6 +43445,7 @@ var DocTree = /*#__PURE__*/function () {
       this._curOnDragNode = null;
       this._userHistories = new Array();
       this._elementChangeRecords = new Map();
+      this._redrawHiddenParas = [];
       var curPath = this._mainNodes[0].getNodePath();
       this._curDomRange = new _DomRange__WEBPACK_IMPORTED_MODULE_24__/* .DomRange */ .a(this._hoEditorFactoryID, curPath, curPath);
     }
@@ -67014,6 +67096,10 @@ var BaseNode = __webpack_require__(62358);
 var DrawDownListNode = __webpack_require__(93541);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/TextInputFieldNode.ts
 var TextInputFieldNode = __webpack_require__(90161);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawRadioAndCheckBox.ts
+var DrawRadioAndCheckBox = __webpack_require__(88666);
+// EXTERNAL MODULE: ./src/editor/draw/drawNode/DrawRadioAndCheckBoxPrint.ts
+var DrawRadioAndCheckBoxPrint = __webpack_require__(91757);
 ;// CONCATENATED MODULE: ./src/editor/draw/DrawLine.ts
 
 
@@ -67036,6 +67122,8 @@ var TextInputFieldNode = __webpack_require__(90161);
 
 
 
+
+
 
 
 
@@ -67373,6 +67461,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
           dWidth = dItem.dWidth;
           iCount += dItem.charCount;
           maxFontHeight = Math.max(maxFontHeight, dItem.dHeight);
+        } else if (dItem instanceof DrawRadioAndCheckBox/* DrawRadioAndCheckBox */.e || dItem instanceof DrawRadioAndCheckBoxPrint/* DrawRadioAndCheckBoxPrint */.w) {
+          dWidth = dItem.dWidth;
+          iCount += dItem.charCount;
+          maxFontHeight = Math.max(maxFontHeight, dItem.dHeight);
         } else {
           dWidth = this.drawItems[i].dWidth;
           iCount += 1;
@@ -67664,9 +67756,10 @@ var DrawLine = /*#__PURE__*/function (_DrawContainer) {
           this.drawItems[j].refresh(tmp);
           var dwidth = this.drawItems[j].dWidth;
           //((this.drawItems[j] as unknown) as DrawInfos).dHeight = this._dHeight;
-          this.drawItems[j].x = usedWidth; // + 1;
+          this.drawItems[j].x = usedWidth;
           this.drawItems[j].y = bottompos;
-          usedWidth += this.drawItems[j].dWidth + charSpace;
+          usedWidth += dwidth + charSpace;
+          // + 1;
           // this._charSpace;
         }
       }
@@ -68685,12 +68778,12 @@ var StagePosition = /*#__PURE__*/function () {
 /* 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_array_splice_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(40561);
 /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(54747);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(68309);
-/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(57658);
-/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(57658);
+/* harmony import */ var core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_push_js__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(54747);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(68309);
+/* harmony import */ var core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_function_name_js__WEBPACK_IMPORTED_MODULE_15__);
 /* harmony import */ var _DrawLine__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(96635);
 /* harmony import */ var _drawNode_DrawRect__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(34311);
 /* harmony import */ var _drawNode_DrawTable__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(74298);
@@ -69282,11 +69375,13 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       // }
       var restHeight = Infinity;
       if (this.allowAcrossPage) restHeight = this.maxHeight - dTop;
+      var mark = false;
       while (nextDline < dlines.length) {
         var dline = dlines[nextDline];
         var hidden = dline.paragraphNode.customProperty.hidden;
         if (hoEditorFactory.drawTree.paintStatus !== _drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_26__/* .PaintState */ .Dh.psDesign && hidden && hidden.toString() === "true") {
           nextDline += 1;
+          mark = true;
           continue;
         }
         // const pagePos = hoEditorFactory.drawTree.getDrawLinePagePos(dline);
@@ -69398,6 +69493,10 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
       this._docHeight -= aTop;
       this.paintFrontGround();
       this.paintBackground();
+      if (mark && dlines.length > 0 && dlines[0].parent instanceof _drawNode_DrawPageCell__WEBPACK_IMPORTED_MODULE_24__/* .DrawPageCell */ .k) {
+        dlines[0].parent.cell.drawCell.needUpdate = true;
+        hoEditorFactory.docTree.redrawHiddenParas.push(dlines[0].parent.cell.table);
+      }
       // drawPage.repaint();
       return [isFull, dTop, restHeight];
     }
@@ -75783,7 +75882,13 @@ 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), "_dBox", 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), "_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);
+    (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), "_charCount", void 0);
     _this._controlStyle = controlStyle;
+    if (node.isTransToText) {
+      _this._charCount = 1;
+    } else {
+      _this._charCount = node.text.length + 1;
+    }
     //this._name = name;
     _this._isSelected = isSelected;
     _this._boxAlign = boxAlign;
@@ -75870,6 +75975,11 @@ var DrawRadioAndCheckBox = /*#__PURE__*/function (_DrawCombineNode) {
         this._text = value;
       }
     }
+  }, {
+    key: "charCount",
+    get: function get() {
+      return this._charCount;
+    }
   }, {
     key: "textStyle",
     get: function get() {
@@ -76040,6 +76150,12 @@ 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), "_dBox", 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), "_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);
+    (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), "_charCount", void 0);
+    if (node.isTransToText) {
+      _this._charCount = 1;
+    } else {
+      _this._charCount = node.text.length + 1;
+    }
     _this._controlStyle = controlStyle;
     //this._name = name;
     _this._isSelected = isSelected;
@@ -76114,6 +76230,11 @@ var DrawRadioAndCheckBoxPrint = /*#__PURE__*/function (_DrawCombineNode) {
         this._text = value;
       }
     }
+  }, {
+    key: "charCount",
+    get: function get() {
+      return this._charCount;
+    }
   }, {
     key: "textStyle",
     get: function get() {
@@ -81206,7 +81327,7 @@ var RectNode = __webpack_require__(67800);
 var DrawSelect = /*#__PURE__*/function (_createjs$Shape) {
   (0,inherits/* default */.Z)(DrawSelect, _createjs$Shape);
   var _super = (0,createSuper/* default */.Z)(DrawSelect);
-  function DrawSelect(hoEditorFactoryID, pageIndex, dline, left, right, inSameRect, startParent, endParent, color) {
+  function DrawSelect(hoEditorFactoryID, pageIndex, dline, left, right, inSameRect, startParent, endParent, color, isMultiRange) {
     var _this;
     (0,classCallCheck/* default */.Z)(this, DrawSelect);
     _this = _super.call(this);
@@ -81232,7 +81353,7 @@ var DrawSelect = /*#__PURE__*/function (_createjs$Shape) {
     _this._startParent = startParent;
     _this._endParent = endParent;
     _this._color = color;
-    _this.updateShape();
+    _this.updateShape(isMultiRange);
     return _this;
   }
   (0,createClass/* default */.Z)(DrawSelect, [{
@@ -81266,7 +81387,7 @@ var DrawSelect = /*#__PURE__*/function (_createjs$Shape) {
     }
   }, {
     key: "updateShape",
-    value: function updateShape() {
+    value: function updateShape(isMultiRange) {
       if (!this._bChanged) {
         return;
       }
@@ -81300,7 +81421,7 @@ var DrawSelect = /*#__PURE__*/function (_createjs$Shape) {
       //     left;
       // }
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      if (hoEditorFactory.drawTree.paintStatus == PaintState.psPreview) {
+      if (hoEditorFactory.drawTree.paintStatus == PaintState.psPreview && !isMultiRange) {
         //打印预览时，变更样式
         width = hoEditorFactory.pageProperty.widthPixes;
         this._color = "green";
@@ -84744,7 +84865,7 @@ var DrawTree = /*#__PURE__*/function () {
             }
             var color = hoeditorfacotry.option.getColorByLevel(15);
             if (dPage && dPage.selectContainer) {
-              var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, color);
+              var shape = new DrawSelect(this._hoEditorFactoryID, dPage.pageIndex, dnextDline, left, right, bInSameRect, aRange.spStart.dline.paragraphNode.parentNode, aRange.spEnd.dline.paragraphNode.parentNode, color, true);
               //shape.alpha = 0.3;
               dPage.selectContainer.addChild(shape);
               if (dPages.indexOf(dPage) < 0) {
@@ -166440,7 +166561,7 @@ var map = {
 	"./qrCode/QrCode.vue": 59805,
 	"./radioCheckBox/RadioCheckbox.vue": 22876,
 	"./selectDialog/SelectDialog.vue": 32497,
-	"./sign/Sign.vue": 8494,
+	"./sign/Sign.vue": 1545,
 	"./table/TableCellPoper.vue": 97628,
 	"./table/TableCellPoper1.vue": 44645,
 	"./table/TableCellProperty.vue": 63689,
@@ -166454,7 +166575,7 @@ var map = {
 	"./textDialog/TextToLabelDialog.vue": 2355,
 	"./textDialog/VerifyTip.vue": 74618,
 	"./upload/CanvasImageDialog.vue": 40061,
-	"./upload/HoFabric.vue": 92682,
+	"./upload/HoFabric.vue": 86559,
 	"./upload/UploadImageDialog.vue": 12625,
 	"./upload/hoFabricRight.vue": 94185,
 	"./verifyTip/VerifyTip.vue": 23664
@@ -203761,7 +203882,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// 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/HoDocs.vue?vue&type=template&id=b6d65e5c&
+;// 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/HoDocs.vue?vue&type=template&id=45b99f15&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -203888,8 +204009,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=c9703c12&
-var HoDocvue_type_template_id_c9703c12_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=436915e3&
+var HoDocvue_type_template_id_436915e3_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -204090,7 +204211,7 @@ var HoDocvue_type_template_id_c9703c12_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_c9703c12_staticRenderFns = [];
+var HoDocvue_type_template_id_436915e3_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -207081,7 +207202,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.78');
+/* harmony default export */ var version = ('3.1.80');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -207529,23 +207650,59 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
       if (type !== 'dblclick') return false;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorProvider.activeDocId);
       var paintStatus = hoEditorFactory.drawTree.paintStatus;
-      if (paintStatus === 5 || paintStatus == 2) {
+      if (paintStatus == DrawTree/* PaintState */.Dh.psPreview) {
         return false;
       }
       this.domRange = {
         startPath: hoEditorFactory.docTree.curDomRange.normalize().startPath,
         endPath: hoEditorFactory.docTree.curDomRange.normalize().endPath
       };
+      if (paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+        var otherProperties = (node === null || node === void 0 ? void 0 : node.otherProperties) || {};
+        if (node instanceof SignNode/* SignNode */.N && (otherProperties.additionsEditor == 'true' || otherProperties.additionsEditor == true)) {
+          if (node.fingerPrintSrc || node.imgSrc && !node.fingerPrintSrc && node.customProperty && !node.customProperty.vaq01) return false;
+          this.$emit('dblNodeClick', {
+            setActiveDoc: this.setActiveDocIndex,
+            node: this.getCurrentSelectNode,
+            type: 'sign',
+            paintStatus: paintStatus
+          });
+          this.poperType = '';
+        } else if ((node instanceof TextNode/* TextNode */.R || node instanceof MarkNode/* MarkNode */.j) && node.parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
+          // 文本域
+          var parentNode = node.parentNode;
+          var customProperty = (parentNode === null || parentNode === void 0 ? void 0 : parentNode.customProperty) || {};
+          if (Number(parentNode.inputFieldType) === 0 && (customProperty.additionsEditor == 'true' || customProperty.additionsEditor == true)) {
+            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;
+      }
       var _hoEditorFactory$vueC2 = hoEditorFactory.vueController.getDomRange().inSameTable(),
         _hoEditorFactory$vueC3 = (0,esm_slicedToArray/* default */.Z)(_hoEditorFactory$vueC2, 2),
         isInTable = _hoEditorFactory$vueC3[0],
         tableNode = _hoEditorFactory$vueC3[1];
-      if (paintStatus == 1 && isInTable) {
+      if (paintStatus == DrawTree/* PaintState */.Dh.psEdit && isInTable) {
         var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
         if (!result) return;
       }
       if (node instanceof SignNode/* SignNode */.N) {
-        if (paintStatus === 0 && !node.imgSrc && !node.fingerPrintSrc) {
+        if (paintStatus === DrawTree/* PaintState */.Dh.psDesign && !node.imgSrc && !node.fingerPrintSrc) {
           this.hoEditorProvider.setControlProperty('sign', 'update', '');
           return;
         }
@@ -207560,10 +207717,10 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
         this.poperType = '';
         return;
       } else {
-        if (paintStatus === 4) {
+        if (paintStatus === DrawTree/* PaintState */.Dh.psReview) {
           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) {
+            var _parentNode = node.parentNode;
+            if (Number(_parentNode.inputFieldType) === 0) {
               this.$emit('dblNodeClick', {
                 setActiveDoc: this.setActiveDocIndex,
                 node: this.getCurrentSelectNode,
@@ -207578,7 +207735,7 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           return false;
         }
         if (node instanceof DateTimeNode/* DateTimeNode */.Z) {
-          if (paintStatus === 0) {
+          if (paintStatus === DrawTree/* PaintState */.Dh.psDesign) {
             this.hoEditorProvider.setControlProperty('date', 'update', '');
             this.hoEditorProvider.setUpdateNodeValue(node);
             return;
@@ -207592,9 +207749,9 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           this.createDownListProper(node, paintStatus, pageIndex);
         } 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) {
+          var _parentNode2 = node.parentNode;
+          if (Number(_parentNode2.inputFieldType) === 0) {
+            if (_parentNode2.canModifyContent) {
               this.$emit('dblNodeClick', {
                 setActiveDoc: this.setActiveDocIndex,
                 node: this.getCurrentSelectNode,
@@ -207612,17 +207769,17 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
             this.hoEditorProvider.setUpdateNodeValue(this.getCurrentSelectNode());
             return false;
           }
-          if (_parentNode.readOnlyStatus === 0 && _parentNode.text.replace(/\s*/g, '') !== '') {
+          if (_parentNode2.readOnlyStatus === 0 && _parentNode2.text.replace(/\s*/g, '') !== '') {
             return false;
           }
-          if (Number(_parentNode.inputFieldType) === 2) {
-            if (paintStatus === 0) {
+          if (Number(_parentNode2.inputFieldType) === 2) {
+            if (paintStatus === DrawTree/* PaintState */.Dh.psDesign) {
               this.hoEditorProvider.setControlProperty('date', 'update', '');
               return;
             }
             this.poperType = 'datePoper';
-          } else if (Number(_parentNode.inputFieldType) === 1) {
-            this.createInputProper(node, _parentNode, paintStatus, pageIndex);
+          } else if (Number(_parentNode2.inputFieldType) === 1) {
+            this.createInputProper(node, _parentNode2, paintStatus, pageIndex);
           }
         } 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);
@@ -207667,8 +207824,8 @@ var defaultHeight = Math.floor(1122 * scaleXY) % 2 === 1 ? Math.floor(1122 * sca
           index--;
           flag = parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.inputFieldType == 1 && parentNode.downListProperty.listItems.includes('<元素>');
           if (!flag) {
-            var _parentNode2;
-            parentNode = (_parentNode2 = parentNode) === null || _parentNode2 === void 0 ? void 0 : _parentNode2.parentNode;
+            var _parentNode3;
+            parentNode = (_parentNode3 = parentNode) === null || _parentNode3 === void 0 ? void 0 : _parentNode3.parentNode;
           }
         }
       }
@@ -208022,10 +208179,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=c9703c12&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=436915e3&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=c9703c12&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=436915e3&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -208038,8 +208195,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_c9703c12_render,
-  HoDocvue_type_template_id_c9703c12_staticRenderFns,
+  HoDocvue_type_template_id_436915e3_render,
+  HoDocvue_type_template_id_436915e3_staticRenderFns,
   false,
   null,
   null,
@@ -212481,15 +212638,31 @@ var StructureConvert = /*#__PURE__*/function () {
       if (pageSettings) {
         //   const pageProperty = new PageProperty(this._hoEditorFactory);
         var pageProperty = hoEditorFactory.pageProperty;
-        pageProperty.printDirection = Number(pageSettings.printDirection);
         pageProperty.borderColor = pageSettings.borderColor;
         pageProperty.isPaintBorder = pageSettings.isPaintBorder == 'true' ? true : false;
         pageProperty.paintRowLine = Number(pageSettings.paintRowLine);
-        pageProperty.pageSize = pageSettings.pageSize;
         // pageProperty.commentWidthMm = Number(pageSettings.commentWidthMm);
         //   pageProperty.commentWidthMm = pageProperty.commentWidthMm;
-        pageProperty.widthMm = Number(pageSettings.widthMm);
-        pageProperty.heightMm = Number(pageSettings.heightMm);
+        var widthMm = Number(pageSettings.widthMm);
+        var heightMm = Number(pageSettings.heightMm);
+        var isA5 = hoEditorFactory.vueController.isA5(widthMm, heightMm);
+        if (isA5) {
+          pageProperty.pageSize = 'A5';
+          if (widthMm > heightMm) {
+            pageProperty.widthMm = 210;
+            pageProperty.heightMm = 148;
+            pageProperty.printDirection = 1;
+          } else {
+            pageProperty.widthMm = 148;
+            pageProperty.heightMm = 210;
+            pageProperty.printDirection = 0;
+          }
+        } else {
+          pageProperty.widthMm = widthMm;
+          pageProperty.heightMm = heightMm;
+          pageProperty.printDirection = Number(pageSettings.printDirection);
+          pageProperty.pageSize = pageSettings.pageSize;
+        }
         pageProperty.source = pageSettings.source;
         pageProperty.topMarginMm = Number(pageSettings.topMarginMm);
         pageProperty.bottomMarginMm = Number(pageSettings.bottomMarginMm);
@@ -213311,6 +213484,12 @@ var StructureConvert = /*#__PURE__*/function () {
           area.addChild(container);
           hoEditorFactory.drawPageTree.updateDrawPage(area.index);
         }
+        var tables = hoEditorFactory.docTree.redrawHiddenParas;
+        if (tables.length > 0) {
+          for (var m = 0; m < tables.length; m++) {
+            tables[m].update();
+          }
+        }
         /*
         //错别字检测
         let errors = [];
@@ -214519,6 +214698,8 @@ var hoCreateHistory = {
   }
 };
 
+// EXTERNAL MODULE: ./src/components/controls/upload/HoFabricConfig.ts
+var HoFabricConfig = __webpack_require__(3573);
 ;// CONCATENATED MODULE: ./src/editor/VueController.ts
 
 
@@ -214629,6 +214810,7 @@ var hoCreateHistory = {
 
 
 
+
 
 
 var VueController = /*#__PURE__*/function () {
@@ -217000,6 +217182,9 @@ var VueController = /*#__PURE__*/function () {
     key: "insertText",
     value: function insertText(text) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+        return;
+      }
       var result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
       if (result) {
         //hoEditorFactory.docController.keyBoardInput(text);
@@ -217527,20 +217712,26 @@ var VueController = /*#__PURE__*/function () {
               return _context.abrupt("return");
             case 2:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+              if (!(hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly)) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return");
+            case 5:
               if (!strHtml.includes('<MedicalExpress>')) {
-                _context.next = 8;
+                _context.next = 10;
                 break;
               }
               strHtml = strHtml.replace("<span>", "").replace("</span>", "");
               nodes = this.text2MedicalExpress(strHtml, hoEditorFactory.docTree.curDomRange.npEnd.node, 0);
               hoEditorFactory.docController.parseNodeData(nodes);
               return _context.abrupt("return");
-            case 8:
+            case 10:
               strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, '</上标>', '<上标/>');
               strHtml = hoEditorFactory.unitConvert.replaceAll(strHtml, '</下标>', '<下标/>');
               result = hoEditorFactory.editController.canIsEdit(hoEditorFactory);
               if (!result) {
-                _context.next = 43;
+                _context.next = 45;
                 break;
               }
               _nodes = hoEditorFactory.htmlConverter.parseHtmlString(strHtml);
@@ -217562,23 +217753,23 @@ var VueController = /*#__PURE__*/function () {
                 }
               }
               if (!(value && keyValue && listItems)) {
-                _context.next = 42;
+                _context.next = 44;
                 break;
               }
               startPath = hoEditorFactory.docTree.curDomRange.normalize().startPath;
               parentNode = hoEditorFactory.docTree.getParentNode(startPath);
               if (!(parentNode instanceof TextInputFieldNode/* TextInputFieldNode */.re && parentNode.inputFieldType == 1 && parentNode.insCheckSyncUpdateList)) {
-                _context.next = 42;
+                _context.next = 44;
                 break;
               }
               downListProperty = parentNode.downListProperty;
               if (!downListProperty.allowMultiSelected) {
-                _context.next = 42;
+                _context.next = 44;
                 break;
               }
               arr = downListProperty.listItems ? JSON.parse(downListProperty.listItems) : [];
               if (!clear) {
-                _context.next = 36;
+                _context.next = 38;
                 break;
               }
               parentNode.value = '';
@@ -217592,12 +217783,12 @@ var VueController = /*#__PURE__*/function () {
               if (!canModifyContent) {
                 parentNode.canModifyContent = true;
               }
-              _context.next = 34;
+              _context.next = 36;
               return hoEditorFactory.docController.deleteRange(range, true, 'update');
-            case 34:
+            case 36:
               parentNode.canModifyContent = canModifyContent;
               hoEditorFactory.docTree.curDomRange.setSamePath(spath);
-            case 36:
+            case 38:
               parentNode.text = strHtml;
               parentNode.value = parentNode.value ? parentNode.value + ',' + value : value;
               parentNode.keyValue = parentNode.keyValue ? parentNode.keyValue + ',' + keyValue : keyValue;
@@ -217606,9 +217797,9 @@ var VueController = /*#__PURE__*/function () {
               if (_nodes[_nodes.length - 1] instanceof ParagraphNode/* ParagraphNode */.C) {
                 _nodes.splice(_nodes.length - 1, 1);
               }
-            case 42:
+            case 44:
               hoEditorFactory.docController.parseNodeData(_nodes);
-            case 43:
+            case 45:
             case "end":
               return _context.stop();
           }
@@ -219111,14 +219302,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertSignNode",
-    value: function insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
+    value: function insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, otherProperties, signType) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var curDomRange = hoEditorFactory.docTree.curDomRange.normalize();
       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.insertSign);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.insertSignNode(curDomRange, type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
+        hoEditorFactory.docController.insertSignNode(curDomRange, type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, '', 0, otherProperties, signType);
       }
     }
     /**
@@ -219598,6 +219789,9 @@ var VueController = /*#__PURE__*/function () {
     key: "updateElementById",
     value: function updateElementById(id, eleJson, name) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+        return;
+      }
       var node = this.getNodeByID('all', id);
       if (!node && name) {
         node = this.getNodesByName('all', false, name)[0];
@@ -220425,6 +220619,11 @@ var VueController = /*#__PURE__*/function () {
       }
       DrawConfig/* DrawConfig */.f.instance().transformScale = scaleXY;
     }
+  }, {
+    key: "setFabricConfig",
+    value: function setFabricConfig(value) {
+      HoFabricConfig/* HoFabricConfig */.G.instance().setConfig(value);
+    }
     /**
      * 根据节点名称和文本查询并设置高亮区域
      * @param items name 元素名称  text 高亮文本
@@ -220904,7 +221103,11 @@ var VueController = /*#__PURE__*/function () {
           node = node.previousLeaf();
         }
         whileText = this.getCaretPreviousNode(node);
-        text = whileText + text;
+        if (whileText) {
+          text = whileText + text;
+        } else {
+          text = "";
+        }
       }
       if (text.length < 3) {
         console.error("\u7B7E\u540D\u5143\u7D20\u524D\u6587\u672C\u5173\u952E\u5B57\u3010".concat(text, "\u3011,\u67E5\u8BE2\u8282\u70B9\u6B21\u6570\u3010").concat(count, "\u3011"));
@@ -223059,6 +223262,17 @@ var VueController = /*#__PURE__*/function () {
       }
       return "\n        <html>\n        <head>\n            <style>\n                html, body {\n                    padding: 0;\n                    margin: 0;\n                    background: #f2f4f7;\n                }\n                #hoEmrContent {\n                    margin: 20px auto;\n                    background: #fff;\n                    box-shadow: 0px 2px 12px 0px #c7cacf;\n                }\n            </style>\n        </head>\n        <body>\n            <div id=\"hoEmrContent\" style='width: ".concat(hoEditorFactory.pageProperty.widthPixes, "px; padding: ").concat(padding, ";'>\n                ").concat(content, "\n            </div>\n        </body>\n        </html>");
     }
+  }, {
+    key: "isA5",
+    value: function isA5(widthMm, heightMm) {
+      var A5_WIDTH = 210;
+      var A5_HEIGHT = 148;
+      var TOLERANCE = 5; // 误差值
+      // 检查宽度和高度是否在允许的误差范围内
+      var isWidthValid = Math.abs(widthMm - A5_WIDTH) <= TOLERANCE || Math.abs(widthMm - A5_HEIGHT) <= TOLERANCE;
+      var isHeightValid = Math.abs(heightMm - A5_HEIGHT) <= TOLERANCE || Math.abs(heightMm - A5_WIDTH) <= TOLERANCE;
+      return isWidthValid && isHeightValid;
+    }
   }]);
   return VueController;
 }();
@@ -224240,6 +224454,7 @@ var EditController = /*#__PURE__*/function () {
 
 
 
+
 var ElementController = /*#__PURE__*/function () {
   function ElementController(hoEditorFactoryID) {
     (0,esm_classCallCheck/* default */.Z)(this, ElementController);
@@ -224312,11 +224527,18 @@ var ElementController = /*#__PURE__*/function () {
     value: function updateTextInputFieldValue(node, text, customProperty, keyValue, value) {
       var _this = this;
       if (node.text === text && customProperty == undefined) return;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+        var _customProperty = (node === null || node === void 0 ? void 0 : node.customProperty) || {};
+        if (_customProperty.additionsEditor != true && _customProperty.additionsEditor != "true") {
+          return;
+        }
+      }
       var hPromise = Promise.resolve();
       hPromise = hPromise.then(function (res) {
         return new Promise( /*#__PURE__*/function () {
           var _ref = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee(resolve) {
-            var hoEditorFactory, dArea;
+            var _hoEditorFactory, dArea;
             return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
@@ -224328,10 +224550,10 @@ var ElementController = /*#__PURE__*/function () {
                   return node.setFieldText(text, customProperty, keyValue, value);
                 case 3:
                   if (node.rootPath.includes("header")) {
-                    hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(_this._hoEditorFactoryID);
-                    dArea = hoEditorFactory.drawPageTree.getMainRootArea(node.EndMarkNode.drawNodes[0]);
+                    _hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(_this._hoEditorFactoryID);
+                    dArea = _hoEditorFactory.drawPageTree.getMainRootArea(node.EndMarkNode.drawNodes[0]);
                     node.update(0);
-                    hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea ? dArea.index : 0, SubDocManger/* HeaderFooterType */.pi.hftHead, false, false);
+                    _hoEditorFactory.subDocManger.updateAllSameSubDoc(dArea ? dArea.index : 0, SubDocManger/* HeaderFooterType */.pi.hftHead, false, false);
                   }
                   _context.next = 7;
                   break;
@@ -224370,6 +224592,10 @@ var ElementController = /*#__PURE__*/function () {
     key: "updateDateTimeText",
     value: function updateDateTimeText(node, text) {
       if (node.text === text) return;
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
+      if (hoEditorFactory.drawTree.paintStatus === DrawTree/* PaintState */.Dh.psReadOnly) {
+        return;
+      }
       node.setDateTimeText(text);
     }
     /**
@@ -224445,7 +224671,7 @@ var ElementController = /*#__PURE__*/function () {
     key: "insertSignNode",
     value: function insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty, fingerPrintSrc);
+      hoEditorFactory.vueController.insertSignNode(type, name, signor, signTime, signTimeFormat, imgSrc, imgWidth, imgHeight, customProperty);
     }
     /**
     * 更新签名
@@ -228601,7 +228827,7 @@ function unzipSync(data) {
 /** @license
  *
  * jsPDF - PDF Document creation from JavaScript
- * Version 2.4.0 Built on 2021-09-14T10:30:30.230Z
+ * Version 2.5.1 Built on 2021-09-14T10:30:30.230Z
  *                      CommitID 00000000
  *
  * Copyright (c) 2010-2021 James Hall <james@parall.ax>, https://github.com/MrRio/jsPDF
@@ -228990,7 +229216,7 @@ objectNumber=0;contentLength=0;content=[];offsets=[];additionalObjects=[];rootDi
    * @memberof jsPDF#
    * @name getR2L
    */API.__private__.getR2L=API.getR2L=function(){return R2L;};var zoomMode;// default: 1;
-var setZoomMode=API.__private__.setZoomMode=function(zoom){var validZoomModes=[undefined,null,"fullwidth","fullheight","fullpage","original"];if(/^\d*\.?\d*%$/.test(zoom)){zoomMode=zoom;}else if(!isNaN(zoom)){zoomMode=parseInt(zoom,10);}else if(validZoomModes.indexOf(zoom)!==-1){zoomMode=zoom;}else{throw new Error('zoom must be Integer (e.g. 2), a percentage Value (e.g. 300%) or fullwidth, fullheight, fullpage, original. "'+zoom+'" is not recognized.');}};API.__private__.getZoomMode=function(){return zoomMode;};var pageMode;// default: 'UseOutlines';
+var setZoomMode=API.__private__.setZoomMode=function(zoom){var validZoomModes=[undefined,null,"fullwidth","fullheight","fullpage","original"];if(/^(?:\d+\.\d*|\d*\.\d+|\d+)%$/.test(zoom)){zoomMode=zoom;}else if(!isNaN(zoom)){zoomMode=parseInt(zoom,10);}else if(validZoomModes.indexOf(zoom)!==-1){zoomMode=zoom;}else{throw new Error('zoom must be Integer (e.g. 2), a percentage Value (e.g. 300%) or fullwidth, fullheight, fullpage, original. "'+zoom+'" is not recognized.');}};API.__private__.getZoomMode=function(){return zoomMode;};var pageMode;// default: 'UseOutlines';
 var setPageMode=API.__private__.setPageMode=function(pmode){var validPageModes=[undefined,null,"UseNone","UseOutlines","UseThumbs","FullScreen"];if(validPageModes.indexOf(pmode)==-1){throw new Error('Page mode must be one of UseNone, UseOutlines, UseThumbs, or FullScreen. "'+pmode+'" is not recognized.');}pageMode=pmode;};API.__private__.getPageMode=function(){return pageMode;};var layoutMode;// default: 'continuous';
 var setLayoutMode=API.__private__.setLayoutMode=function(layout){var validLayoutModes=[undefined,null,"continuous","single","twoleft","tworight","two"];if(validLayoutModes.indexOf(layout)==-1){throw new Error('Layout mode must be one of continuous, single, twoleft, tworight. "'+layout+'" is not recognized.');}layoutMode=layout;};API.__private__.getLayoutMode=function(){return layoutMode;};/**
    * Set the display mode options of the page like zoom and layout.
@@ -229324,7 +229550,7 @@ if(bch>>8){/* something left after dividing by 256 second time */throw new Error
      */return to8bitStream(text,flags).replace(/\\/g,"\\\\").replace(/\(/g,"\\(").replace(/\)/g,"\\)");};var beginPage=API.__private__.beginPage=function(format){pages[++page]=[];pagesContext[page]={objId:0,contentsObjId:0,userUnit:Number(userUnit),artBox:null,bleedBox:null,cropBox:null,trimBox:null,mediaBox:{bottomLeftX:0,bottomLeftY:0,topRightX:Number(format[0]),topRightY:Number(format[1])}};_setPage(page);setOutputDestination(pages[currentPage]);};var _addPage=function _addPage(parmFormat,parmOrientation){var dimensions,width,height;orientation=parmOrientation||orientation;if(typeof parmFormat==="string"){dimensions=getPageFormat(parmFormat.toLowerCase());if(Array.isArray(dimensions)){width=dimensions[0];height=dimensions[1];}}if(Array.isArray(parmFormat)){width=parmFormat[0]*scaleFactor;height=parmFormat[1]*scaleFactor;}if(isNaN(width)){width=format[0];height=format[1];}if(width>14400||height>14400){jspdf_console.warn("A page in a PDF can not be wider or taller than 14400 userUnit. jsPDF limits the width/height to 14400");width=Math.min(14400,width);height=Math.min(14400,height);}format=[width,height];switch(orientation.substr(0,1)){case"l":if(height>width){format=[height,width];}break;case"p":if(width>height){format=[height,width];}break;}beginPage(format);// Set line width
 setLineWidth(lineWidth);// Set draw color
 out(strokeColor);// resurrecting non-default line caps, joins
-if(lineCapID!==0){out(lineCapID+" J");}if(lineJoinID!==0){out(lineJoinID+" j");}events.publish("addPage",{pageNumber:page});};var _deletePage=function _deletePage(n){if(n>0&&n<=page){pages.splice(n,1);pagesContext.splice(n,1);page--;if(currentPage>page){currentPage=page;}jspdf_console.log(page,'delete page');this.setPage(currentPage);}};var _setPage=function _setPage(n){if(n>0&&n<=page){currentPage=n;}};var getNumberOfPages=API.__private__.getNumberOfPages=API.getNumberOfPages=function(){return pages.length-1;};/**
+if(lineCapID!==0){out(lineCapID+" J");}if(lineJoinID!==0){out(lineJoinID+" j");}events.publish("addPage",{pageNumber:page});};var _deletePage=function _deletePage(n){if(n>0&&n<=page){pages.splice(n,1);pagesContext.splice(n,1);page--;if(currentPage>page){currentPage=page;}this.setPage(currentPage);}};var _setPage=function _setPage(n){if(n>0&&n<=page){currentPage=n;}};var getNumberOfPages=API.__private__.getNumberOfPages=API.getNumberOfPages=function(){return pages.length-1;};/**
    * Returns a document-specific font key - a label assigned to a
    * font name + font type combination at the time the font was added
    * to the font inventory.
@@ -229345,7 +229571,10 @@ if(!zoomMode)zoomMode="fullwidth";switch(zoomMode){case"fullwidth":out("/OpenAct
        * UseThumbs    : Thumbnail images visible
        * FullScreen   : Full-screen mode, with no menu bar, window controls, or any other window visible
        */out("/PageMode /"+pageMode);}events.publish("putCatalog");out(">>");out("endobj");};var putTrailer=API.__private__.putTrailer=function(){out("trailer");out("<<");out("/Size "+(objectNumber+1));// Root and Info must be the last and second last objects written respectively
-out("/Root "+objectNumber+" 0 R");out("/Info "+(objectNumber-1)+" 0 R");if(encryptionOptions!==null){out("/Encrypt "+encryption.oid+" 0 R");}out("/ID [ <"+fileId+"> <"+fileId+"> ]");out(">>");};var putHeader=API.__private__.putHeader=function(){out("%PDF-"+pdfVersion);out("%\xBA\xDF\xAC\xE0");};var putXRef=API.__private__.putXRef=function(){var p="0000000000";out("xref");out("0 "+(objectNumber+1));out("0000000000 65535 f ");for(var i=1;i<=objectNumber;i++){var offset=offsets[i];if(typeof offset==="function"){out((p+offsets[i]()).slice(-10)+" 00000 n ");}else{if(typeof offsets[i]!=="undefined"){out((p+offsets[i]).slice(-10)+" 00000 n ");}else{out("0000000000 00000 n ");}}}};var buildDocument=API.__private__.buildDocument=function(){resetDocument();setOutputDestination(content);events.publish("buildDocument");putHeader();putPages();putAdditionalObjects();putResources();if(encryptionOptions!==null)putEncryptionDict();putInfo();putCatalog();var offsetOfXRef=contentLength;putXRef();putTrailer();out("startxref");out(""+offsetOfXRef);out("%%EOF");setOutputDestination(pages[currentPage]);return content.join("\n");};var getBlob=API.__private__.getBlob=function(data){return new Blob([getArrayBuffer(data)],{type:"application/pdf"});};/**
+out("/Root "+objectNumber+" 0 R");out("/Info "+(objectNumber-1)+" 0 R");if(encryptionOptions!==null){out("/Encrypt "+encryption.oid+" 0 R");}out("/ID [ <"+fileId+"> <"+fileId+"> ]");out(">>");};var putHeader=API.__private__.putHeader=function(){out("%PDF-"+pdfVersion);out("%\xBA\xDF\xAC\xE0");};var putXRef=API.__private__.putXRef=function(){var p="0000000000";out("xref");out("0 "+(objectNumber+1));out("0000000000 65535 f ");for(var i=1;i<=objectNumber;i++){var offset=offsets[i];if(typeof offset==="function"){out((p+offsets[i]()).slice(-10)+" 00000 n ");}else{if(typeof offsets[i]!=="undefined"){out((p+offsets[i]).slice(-10)+" 00000 n ");}else{out("0000000000 00000 n ");}}}};var buildDocument=API.__private__.buildDocument=function(){resetDocument();setOutputDestination(content);events.publish("buildDocument");putHeader();putPages();putAdditionalObjects();putResources();if(encryptionOptions!==null)putEncryptionDict();putInfo();putCatalog();var offsetOfXRef=contentLength;putXRef();putTrailer();out("startxref");out(""+offsetOfXRef);out("%%EOF");setOutputDestination(pages[currentPage]);// var contentString = content.join("\n");
+// content = 0;
+// return contentString;
+return content.join("\n");};var getBlob=API.__private__.getBlob=function(data){return new Blob([getArrayBuffer(data)],{type:"application/pdf"});};/**
    * Generates the PDF document.
    *
    * If `type` argument is undefined, output is raw body of resulting PDF returned as a string.
@@ -229373,7 +229602,7 @@ if(typeof globalObject.URL!=="undefined"&&typeof globalObject.URL.createObjectUR
    * Used to see if a supplied hotfix was requested when the pdf instance was created.
    * @param {string} hotfixName - The name of the hotfix to check.
    * @returns {boolean}
-   */var hasHotfix=function hasHotfix(hotfixName){return Array.isArray(hotfixes)===true&&hotfixes.indexOf(hotfixName)>-1;};switch(unit){case"pt":scaleFactor=1;break;case"mm":scaleFactor=72/25.4;break;case"cm":scaleFactor=72/2.54;break;case"in":scaleFactor=72;break;case"px":if(hasHotfix("px_scaling")==true){scaleFactor=72/96;}else{scaleFactor=96/72;}break;case"pc":scaleFactor=12;break;case"em":scaleFactor=12;break;case"ex":scaleFactor=6;break;default:throw new Error("Invalid unit: "+unit);}var encryption=null;setCreationDate();setFileId();var getEncryptor=function getEncryptor(objectId){if(encryptionOptions!==null){return encryption.encryptor(objectId,0);}return function(data){return data;};};//---------------------------------------
+   */var hasHotfix=function hasHotfix(hotfixName){return Array.isArray(hotfixes)===true&&hotfixes.indexOf(hotfixName)>-1;};switch(unit){case"pt":scaleFactor=1;break;case"mm":scaleFactor=72/25.4;break;case"cm":scaleFactor=72/2.54;break;case"in":scaleFactor=72;break;case"px":if(hasHotfix("px_scaling")==true){scaleFactor=72/96;}else{scaleFactor=96/72;}break;case"pc":scaleFactor=12;break;case"em":scaleFactor=12;break;case"ex":scaleFactor=6;break;default:if(typeof unit==="number"){scaleFactor=unit;}else{throw new Error("Invalid unit: "+unit);}}var encryption=null;setCreationDate();setFileId();var getEncryptor=function getEncryptor(objectId){if(encryptionOptions!==null){return encryption.encryptor(objectId,0);}return function(data){return data;};};//---------------------------------------
 // Public API
 var getPageInfo=API.__private__.getPageInfo=API.getPageInfo=function(pageNumberOneBased){if(isNaN(pageNumberOneBased)||pageNumberOneBased%1!==0){throw new Error("Invalid argument passed to jsPDF.getPageInfo");}var objId=pagesContext[pageNumberOneBased].objId;return{objId:objId,pageNumber:pageNumberOneBased,pageContext:pagesContext[pageNumberOneBased]};};var getPageInfoByObjId=API.__private__.getPageInfoByObjId=function(objId){if(isNaN(objId)||objId%1!==0){throw new Error("Invalid argument passed to jsPDF.getPageInfoByObjId");}for(var pageNumber in pagesContext){if(pagesContext[pageNumber].objId===objId){break;}}return getPageInfo(pageNumber);};var getCurrentPageInfo=API.__private__.getCurrentPageInfo=API.getCurrentPageInfo=function(){return{objId:pagesContext[currentPage].objId,pageNumber:currentPage,pageContext:pagesContext[currentPage]};};/**
    * Adds (and transfers the focus to) new page to the PDF document.
@@ -229440,6 +229669,7 @@ var getPageInfo=API.__private__.getPageInfo=API.getPageInfo=function(pageNumberO
    * @param {number|Matrix} [options.angle=0] - Rotate the text clockwise or counterclockwise. Expects the angle in degree.
    * @param {number} [options.rotationDirection=1] - Direction of the rotation. 0 = clockwise, 1 = counterclockwise.
    * @param {number} [options.charSpace=0] - The space between each letter.
+   * @param {number} [options.horizontalScale=1] - Horizontal scale of the text as a factor of the regular size.
    * @param {number} [options.lineHeightFactor=1.15] - The lineheight of each line.
    * @param {Object} [options.flags] - Flags for to8bitStream.
    * @param {boolean} [options.flags.noBOM=true] - Don't add BOM to Unicode-text.
@@ -229471,7 +229701,7 @@ var getPageInfo=API.__private__.getPageInfo=API.getPageInfo=function(pageNumberO
      *    T* (line two) Tj
      *    T* (line three) Tj
      *   ET
-     */options=options||{};var scope=options.scope||this;var payload,da,angle,align,charSpace,maxWidth,flags;// Pre-August-2012 the order of arguments was function(x, y, text, flags)
+     */options=options||{};var scope=options.scope||this;var payload,da,angle,align,charSpace,maxWidth,flags,horizontalScale;// Pre-August-2012 the order of arguments was function(x, y, text, flags)
 // in effort to make all calls have similar signature like
 //   function(data, coordinates... , miscellaneous)
 // this method had its args flipped.
@@ -229494,11 +229724,12 @@ while(len--){curDa=sa.shift();if(typeof curDa!=="string"||Array.isArray(curDa)&&
 //later code.
 if(typeof text==="string"){if(text.match(/[\r?\n]/)){text=[text.replace(/\r\n|\r|\n/g,'')];// 自定义修改 处理打印回车的问题
 }else{text=[text];}}//baseline
-var height=activeFontSize/scope.internal.scaleFactor;var descent=height*(lineHeightFactor-1);switch(options.baseline){case"bottom":y-=descent;break;case"top":y+=height-descent;break;case"hanging":y+=height-2*descent;break;case"middle":y+=height/2-descent;break;}//multiline
+var height=activeFontSize/scope.internal.scaleFactor;// var descent = height * (lineHeightFactor - 1);
+var descent=height*(lineHeight-1);switch(options.baseline){case"bottom":y-=descent;break;case"top":y+=height-descent;break;case"hanging":y+=height-2*descent;break;case"middle":y+=height/2-descent;break;}//multiline
 maxWidth=options.maxWidth||0;if(maxWidth>0){if(typeof text==="string"){text=scope.splitTextToSize(text,maxWidth);}else if(Object.prototype.toString.call(text)==="[object Array]"){text=text.reduce(function(acc,textLine){return acc.concat(scope.splitTextToSize(textLine,maxWidth));},[]);}}//creating Payload-Object to make text byRef
 payload={text:text,x:x,y:y,options:options,mutex:{pdfEscape:pdfEscape,activeFontKey:activeFontKey,fonts:fonts,activeFontSize:activeFontSize}};events.publish("preProcessText",payload);text=payload.text;options=payload.options;//angle
 angle=options.angle;if(transformationMatrix instanceof Matrix===false&&angle&&typeof angle==="number"){angle*=Math.PI/180;if(options.rotationDirection===0){angle=-angle;}if(apiMode===ApiMode.ADVANCED){angle=-angle;}var c=Math.cos(angle);var s=Math.sin(angle);transformationMatrix=new Matrix(c,s,-s,c,0,0);}else if(angle&&angle instanceof Matrix){transformationMatrix=angle;}if(apiMode===ApiMode.ADVANCED&&!transformationMatrix){transformationMatrix=identityMatrix;}//charSpace
-charSpace=options.charSpace||activeCharSpace;if(typeof charSpace!=="undefined"){xtra+=hpf(scale(charSpace))+" Tc\n";this.setCharSpace(this.getCharSpace()||0);}//lang
+charSpace=options.charSpace||activeCharSpace;if(typeof charSpace!=="undefined"){xtra+=hpf(scale(charSpace))+" Tc\n";this.setCharSpace(this.getCharSpace()||0);}horizontalScale=options.horizontalScale;if(typeof horizontalScale!=="undefined"){xtra+=hpf(horizontalScale*100)+" Tz\n";}//lang
 var lang=options.lang;var renderingMode=-1;var parmRenderingMode=typeof options.renderingMode!=="undefined"?options.renderingMode:options.stroke;var pageContext=scope.internal.getCurrentPageInfo().pageContext;switch(parmRenderingMode){case 0:case false:case"fill":renderingMode=0;break;case 1:case true:case"stroke":renderingMode=1;break;case 2:case"fillThenStroke":renderingMode=2;break;case 3:case"invisible":renderingMode=3;break;case 4:case"fillAndAddForClipping":renderingMode=4;break;case 5:case"strokeAndAddPathForClipping":renderingMode=5;break;case 6:case"fillThenStrokeAndAddToPathForClipping":renderingMode=6;break;case 7:case"addToPathForClipping":renderingMode=7;break;}var usedRenderingMode=typeof pageContext.usedRenderingMode!=="undefined"?pageContext.usedRenderingMode:-1;//if the coder wrote it explicitly to use a specific
 //renderingMode, then use it
 if(renderingMode!==-1){xtra+=renderingMode+" Tr\n";//otherwise check if we used the rendering Mode already
@@ -229894,6 +230125,14 @@ curveTo(x2,y2,x3,y3,x4,y4);}}if(closed){close();}putStyle(style);return this;};/
    */API.addFont=function(postScriptName,fontName,fontStyle,fontWeight,encoding){var encodingOptions=["StandardEncoding","MacRomanEncoding","Identity-H","WinAnsiEncoding"];if(arguments[3]&&encodingOptions.indexOf(arguments[3])!==-1){//IE 11 fix
 encoding=arguments[3];}else if(arguments[3]&&encodingOptions.indexOf(arguments[3])==-1){fontStyle=combineFontStyleAndFontWeight(fontStyle,fontWeight);}encoding=encoding||"Identity-H";return addFont.call(this,postScriptName,fontName,fontStyle,encoding);};var lineWidth=options.lineWidth||0.200025;// 2mm
 /**
+   * Gets the line width, default: 0.200025.
+   *
+   * @function
+   * @instance
+   * @returns {number} lineWidth
+   * @memberof jsPDF#
+   * @name getLineWidth
+   */var getLineWidth=API.__private__.getLineWidth=API.getLineWidth=function(){return lineWidth;};/**
    * Sets line width for upcoming lines.
    *
    * @param {number} width Line width (in units declared at inception of PDF document).
@@ -229902,7 +230141,7 @@ encoding=arguments[3];}else if(arguments[3]&&encodingOptions.indexOf(arguments[3
    * @returns {jsPDF}
    * @memberof jsPDF#
    * @name setLineWidth
-   */var setLineWidth=API.__private__.setLineWidth=API.setLineWidth=function(width){out(hpf(scale(width))+" w");return this;};/**
+   */var setLineWidth=API.__private__.setLineWidth=API.setLineWidth=function(width){lineWidth=width;out(hpf(scale(width))+" w");return this;};/**
    * Sets the dash pattern for upcoming lines.
    *
    * To reset the settings simply call the method without any parameters.
@@ -230273,7 +230512,7 @@ eventname=newEvents[i][0];handler_and_args=newEvents[i][1];events.subscribe.appl
    * Object exposing internal API to plugins
    * @public
    * @ignore
-   */API.internal={pdfEscape:pdfEscape,getStyle:getStyle,getFont:getFontEntry,getFontSize:getFontSize,getCharSpace:getCharSpace,getTextColor:getTextColor,getLineHeight:getLineHeight,getLineHeightFactor:getLineHeightFactor,write:write,getHorizontalCoordinate:getHorizontalCoordinate,getVerticalCoordinate:getVerticalCoordinate,getCoordinateString:getHorizontalCoordinateString,getVerticalCoordinateString:getVerticalCoordinateString,collections:{},newObject:newObject,newAdditionalObject:newAdditionalObject,newObjectDeferred:newObjectDeferred,newObjectDeferredBegin:newObjectDeferredBegin,getFilters:getFilters,putStream:putStream,events:events,scaleFactor:scaleFactor,pageSize:{getWidth:function getWidth(){return getPageWidth(currentPage);},setWidth:function setWidth(value){setPageWidth(currentPage,value);},getHeight:function getHeight(){return getPageHeight(currentPage);},setHeight:function setHeight(value){setPageHeight(currentPage,value);}},encryptionOptions:encryptionOptions,encryption:encryption,getEncryptor:getEncryptor,output:output,getNumberOfPages:getNumberOfPages,pages:pages,out:out,f2:f2,f3:f3,getPageInfo:getPageInfo,getPageInfoByObjId:getPageInfoByObjId,getCurrentPageInfo:getCurrentPageInfo,getPDFVersion:getPdfVersion,Point:Point,Rectangle:Rectangle,Matrix:Matrix,hasHotfix:hasHotfix//Expose the hasHotfix check so plugins can also check them.
+   */API.internal={pdfEscape:pdfEscape,getStyle:getStyle,getFont:getFontEntry,getFontSize:getFontSize,getCharSpace:getCharSpace,getTextColor:getTextColor,getLineHeight:getLineHeight,getLineHeightFactor:getLineHeightFactor,getLineWidth:getLineWidth,write:write,getHorizontalCoordinate:getHorizontalCoordinate,getVerticalCoordinate:getVerticalCoordinate,getCoordinateString:getHorizontalCoordinateString,getVerticalCoordinateString:getVerticalCoordinateString,collections:{},newObject:newObject,newAdditionalObject:newAdditionalObject,newObjectDeferred:newObjectDeferred,newObjectDeferredBegin:newObjectDeferredBegin,getFilters:getFilters,putStream:putStream,events:events,scaleFactor:scaleFactor,pageSize:{getWidth:function getWidth(){return getPageWidth(currentPage);},setWidth:function setWidth(value){setPageWidth(currentPage,value);},getHeight:function getHeight(){return getPageHeight(currentPage);},setHeight:function setHeight(value){setPageHeight(currentPage,value);}},encryptionOptions:encryptionOptions,encryption:encryption,getEncryptor:getEncryptor,output:output,getNumberOfPages:getNumberOfPages,pages:pages,out:out,f2:f2,f3:f3,getPageInfo:getPageInfo,getPageInfoByObjId:getPageInfoByObjId,getCurrentPageInfo:getCurrentPageInfo,getPDFVersion:getPdfVersion,Point:Point,Rectangle:Rectangle,Matrix:Matrix,hasHotfix:hasHotfix//Expose the hasHotfix check so plugins can also check them.
 };Object.defineProperty(API.internal.pageSize,"width",{get:function get(){return getPageWidth(currentPage);},set:function set(value){setPageWidth(currentPage,value);},enumerable:true,configurable:true});Object.defineProperty(API.internal.pageSize,"height",{get:function get(){return getPageHeight(currentPage);},set:function set(value){setPageHeight(currentPage,value);},enumerable:true,configurable:true});//////////////////////////////////////////////////////
 // continuing initialization of jsPDF Document object
 //////////////////////////////////////////////////////
@@ -230305,7 +230544,7 @@ addFonts.call(API,standardFonts);activeFontKey="F1";_addPage(format,orientation)
  * @name version
  * @type {string}
  * @memberof jsPDF#
- */jsPDF.version="2.4.0";var jsPDFAPI=jsPDF.API;var scaleFactor=1;var pdfEscape=function pdfEscape(value){return value.replace(/\\/g,"\\\\").replace(/\(/g,"\\(").replace(/\)/g,"\\)");};var pdfUnescape=function pdfUnescape(value){return value.replace(/\\\\/g,"\\").replace(/\\\(/g,"(").replace(/\\\)/g,")");};var f2=function f2(number){return number.toFixed(2);// Ie, %.2f
+ */jsPDF.version="2.5.1";var jsPDFAPI=jsPDF.API;var scaleFactor=1;var pdfEscape=function pdfEscape(value){return value.replace(/\\/g,"\\\\").replace(/\(/g,"\\(").replace(/\)/g,"\\)");};var pdfUnescape=function pdfUnescape(value){return value.replace(/\\\\/g,"\\").replace(/\\\(/g,"(").replace(/\\\)/g,")");};var f2=function f2(number){return number.toFixed(2);// Ie, %.2f
 };var f5=function f5(number){return number.toFixed(5);// Ie, %.2f
 };jsPDFAPI.__acroform__={};var inherit=function inherit(child,parent){child.prototype=Object.create(parent.prototype);child.prototype.constructor=child;};var scale=function scale(x){return x*scaleFactor;};var createFormXObject=function createFormXObject(formObject){var xobj=new AcroFormXObject();var height=AcroFormAppearance.internal.getHeight(formObject)||0;var width=AcroFormAppearance.internal.getWidth(formObject)||0;xobj.BBox=[0,0,Number(f2(width)),Number(f2(height))];return xobj;};/**
  * Bit-Operations
@@ -230962,7 +231201,8 @@ var imageData,format,x,y,w,h,alias,compression,rotation,posX,posY;imageData=argu
 var filter=this.internal.getFilters();if(compression===undefined&&filter.indexOf("FlateEncode")!==-1){compression="SLOW";}// 自定义修改 调整 addImage 方法的 compression值压缩图片
 compression='SLOW';if(isNaN(x)||isNaN(y)){throw new Error("Invalid coordinates passed to jsPDF.addImage");}// if(posX) x += posX;
 // if(posY) y += posY;
-initialize.call(this);var image=processImageData.call(this,imageData,format,alias,compression);writeImageToPDF.call(this,x,y,w,h,image,rotation);return this;};var processImageData=function processImageData(imageData,format,alias,compression){var result,dataAsBinaryString;var exifdata=imageData.exifdata;if(typeof imageData==="string"&&getImageFileTypeByImageData(imageData)===UNKNOWN){imageData=unescape(imageData);var tmpImageData=convertBase64ToBinaryString(imageData,false);if(tmpImageData!==""){imageData=tmpImageData;}else{tmpImageData=jsPDFAPI.loadFile(imageData,true);if(tmpImageData!==undefined){imageData=tmpImageData;}}}if(isDOMElement(imageData)){imageData=getImageDataFromElement(imageData,format);}format=getImageFileTypeByImageData(imageData,format);if(!isImageTypeSupported(format)){throw new Error("addImage does not support files of type '"+format+"', please ensure that a plugin for '"+format+"' support is added.");}// now do the heavy lifting
+initialize.call(this);var image=processImageData.call(this,imageData,format,alias,compression);writeImageToPDF.call(this,x,y,w,h,image,rotation);return this;};var processImageData=function processImageData(imageData,format,alias,compression){var result,dataAsBinaryString;// 自定义修改 处理图片自带的exif信息（旋转角度）
+var exifdata=imageData.exifdata;if(typeof imageData==="string"&&getImageFileTypeByImageData(imageData)===UNKNOWN){imageData=unescape(imageData);var tmpImageData=convertBase64ToBinaryString(imageData,false);if(tmpImageData!==""){imageData=tmpImageData;}else{tmpImageData=jsPDFAPI.loadFile(imageData,true);if(tmpImageData!==undefined){imageData=tmpImageData;}}}if(isDOMElement(imageData)){imageData=getImageDataFromElement(imageData,format);}format=getImageFileTypeByImageData(imageData,format);if(!isImageTypeSupported(format)){throw new Error("addImage does not support files of type '"+format+"', please ensure that a plugin for '"+format+"' support is added.");}// now do the heavy lifting
 if(notDefined(alias)){alias=generateAliasFromImageData(imageData);}result=checkImagesForAlias.call(this,alias);if(!result){if(supportsArrayBuffer()){// no need to convert if imageData is already uint8array
 if(!(imageData instanceof Uint8Array)&&format!=="RGBA"){dataAsBinaryString=imageData;imageData=binaryStringToUint8Array(imageData);}}result=this["process"+format.toUpperCase()](imageData,getImageIndex.call(this),alias,checkCompressValue(compression),dataAsBinaryString);}if(!result){throw new Error("An unknown error occurred whilst processing the image.");}result.exifdata=exifdata;return result;};/**
    * @name convertBase64ToBinaryString
@@ -231575,7 +231815,9 @@ Context2D.prototype.arcTo=function(x1,y1,x2,y2,radius){throw new Error("arcTo no
    * @param w {Number} The width of the rectangle, in pixels
    * @param h {Number} The height of the rectangle, in pixels
    * @description The rect() method creates a rectangle.
-   */Context2D.prototype.rect=function(x,y,w,h){if(isNaN(x)||isNaN(y)||isNaN(w)||isNaN(h)){jspdf_console.error("jsPDF.context2d.rect: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.rect");}this.moveTo(x,y);this.lineTo(x+w,y);this.lineTo(x+w,y+h);this.lineTo(x,y+h);this.lineTo(x,y);this.lineTo(x+w,y);this.lineTo(x,y);};/**
+   */Context2D.prototype.rect=function(x,y,w,h){if(isNaN(x)||isNaN(y)||isNaN(w)||isNaN(h)){jspdf_console.error("jsPDF.context2d.rect: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.rect");}this.moveTo(x,y);this.lineTo(x+w,y);this.lineTo(x+w,y+h);this.lineTo(x,y+h);this.lineTo(x,y);// this.lineTo(x + w, y);
+// this.lineTo(x, y);
+};/**
    * Draws a "filled" rectangle
    *
    * @name fillRect
@@ -231713,26 +231955,7 @@ putText.call(this,{text:text,x:x,y:y,scale:scale,renderingMode:"stroke",angle:de
    * @param e {Number} Horizontal moving
    * @param f {Number} Vertical moving
    * @description Each object on the canvas has a current transformation matrix.<br /><br />The transform() method replaces the current transformation matrix. It multiplies the current transformation matrix with the matrix described by:<br /><br /><br /><br />a    c    e<br /><br />b    d    f<br /><br />0    0    1<br /><br />In other words, the transform() method lets you scale, rotate, move, and skew the current context.
-   */Context2D.prototype.transform=function(a,b,c,d,e,f){if(isNaN(a)||isNaN(b)||isNaN(c)||isNaN(d)||isNaN(e)||isNaN(f)){jspdf_console.error("jsPDF.context2d.transform: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.transform");}// console.log("开始变换",a,b,c,d,e,f);
-// if (isNaN(a)){
-//   a=0;
-// }
-// if (isNaN(b)){
-//   b=0;
-// }
-// if (isNaN(c)){
-//   d=0;
-// }
-// if (isNaN(d)){
-//   d=0;
-// }
-// if (isNaN(e)){
-//   e=0;
-// }
-// if (isNaN(f)){
-//   f=0;
-// }
-// 自定义修改 处理打印图片报错
+   */Context2D.prototype.transform=function(a,b,c,d,e,f){if(isNaN(a)||isNaN(b)||isNaN(c)||isNaN(d)||isNaN(e)||isNaN(f)){jspdf_console.error("jsPDF.context2d.transform: Invalid arguments",arguments);throw new Error("Invalid arguments passed to jsPDF.context2d.transform");}// 自定义修改 处理打印图片报错
 a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isNaN(f)?0:f;var matrix=new Matrix(a,b,c,d,e,f);this.ctx.transform=this.ctx.transform.multiply(matrix);// console.log("this.transform值",this.ctx.transform);
 };/**
    * Resets the current transform to the identity matrix. Then runs transform()
@@ -231759,7 +231982,8 @@ a=isNaN(a)?1:a;b=isNaN(b)?0:b;c=isNaN(c)?0:c;d=isNaN(d)?1:d;e=isNaN(e)?0:e;f=isN
    * @param y {Number} The y coordinate where to place the image on the canvas
    * @param width {Number} Optional. The width of the image to use (stretch or reduce the image)
    * @param height {Number} Optional. The height of the image to use (stretch or reduce the image)
-   */Context2D.prototype.drawImage=function(img,sx,sy,swidth,sheight,x,y,width,height){var imageProperties=this.pdf.getImageProperties(img);if(img.exifdata){imageProperties.exifdata=img.exifdata;}var factorX=1;var factorY=1;var clipFactorX=1;var clipFactorY=1;if(typeof swidth!=="undefined"&&typeof width!=="undefined"){clipFactorX=width/swidth;clipFactorY=height/sheight;factorX=imageProperties.width/swidth*width/swidth;factorY=imageProperties.height/sheight*height/sheight;}//is sx and sy are set and x and y not, set x and y with values of sx and sy
+   */Context2D.prototype.drawImage=function(img,sx,sy,swidth,sheight,x,y,width,height){var imageProperties=this.pdf.getImageProperties(img);// 自定义修改 设置exif信息
+if(img.exifdata){imageProperties.exifdata=img.exifdata;}var factorX=1;var factorY=1;var clipFactorX=1;var clipFactorY=1;if(typeof swidth!=="undefined"&&typeof width!=="undefined"){clipFactorX=width/swidth;clipFactorY=height/sheight;factorX=imageProperties.width/swidth*width/swidth;factorY=imageProperties.height/sheight*height/sheight;}//is sx and sy are set and x and y not, set x and y with values of sx and sy
 if(typeof x==="undefined"){x=sx;y=sy;sx=0;sy=0;}if(typeof swidth!=="undefined"&&typeof width==="undefined"){width=swidth;height=sheight;}if(typeof swidth==="undefined"&&typeof width==="undefined"){width=imageProperties.width;height=imageProperties.height;}var decomposedTransformationMatrix=this.ctx.transform.decompose();// console.log("transform.decompose",decomposedTransformationMatrix.scale);
 // 自定义修改 修复图片旋转角度错误问题
 var angle=rad2deg(decomposedTransformationMatrix.rotate.rotation);var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);if(!swidth){swidth=width;}if(!sheight){sheight=height;}var xRect;// 自定义修改 处理签名图片打印和普通图片打印
@@ -231774,7 +231998,15 @@ this.pdf.addImage(img,"JPEG",xRect.x+this.posX,xRect.y+this.posY,xRect.w,xRect.h
    * @private
    * @ignore
    */var drawPaths=function drawPaths(rule,isClip){if(rule==="stroke"&&!isClip&&isStrokeTransparent.call(this)){return;}if(rule!=="stroke"&&!isClip&&isFillTransparent.call(this)){return;}var moves=[];//var alpha = (this.ctx.fillOpacity < 1) ? this.ctx.fillOpacity : this.ctx.globalAlpha;
-var delta;var xPath=this.path;for(var i=0;i<xPath.length;i++){var pt=xPath[i];switch(pt.type){case"begin":moves.push({begin:true});break;case"close":moves.push({close:true});break;case"mt":moves.push({start:pt,deltas:[],abs:[]});break;case"lt":var iii=moves.length;if(!isNaN(xPath[i-1].x)){delta=[pt.x-xPath[i-1].x,pt.y-xPath[i-1].y];if(iii>0){for(iii;iii>=0;iii--){if(moves[iii-1].close!==true&&moves[iii-1].begin!==true){moves[iii-1].deltas.push(delta);moves[iii-1].abs.push(pt);break;}}}}break;case"bct":delta=[pt.x1-xPath[i-1].x,pt.y1-xPath[i-1].y,pt.x2-xPath[i-1].x,pt.y2-xPath[i-1].y,pt.x-xPath[i-1].x,pt.y-xPath[i-1].y];moves[moves.length-1].deltas.push(delta);break;case"qct":var x1=xPath[i-1].x+2.0/3.0*(pt.x1-xPath[i-1].x);var y1=xPath[i-1].y+2.0/3.0*(pt.y1-xPath[i-1].y);var x2=pt.x+2.0/3.0*(pt.x1-pt.x);var y2=pt.y+2.0/3.0*(pt.y1-pt.y);var x3=pt.x;var y3=pt.y;delta=[x1-xPath[i-1].x,y1-xPath[i-1].y,x2-xPath[i-1].x,y2-xPath[i-1].y,x3-xPath[i-1].x,y3-xPath[i-1].y];moves[moves.length-1].deltas.push(delta);break;case"arc":moves.push({deltas:[],abs:[],arc:true});if(Array.isArray(moves[moves.length-1].abs)){moves[moves.length-1].abs.push(pt);}break;}}var style;if(!isClip){if(rule==="stroke"){style="stroke";}else{style="fill";}}else{style=null;}for(var k=0;k<moves.length;k++){if(moves[k].arc){var arcs=moves[k].abs;for(var ii=0;ii<arcs.length;ii++){var arc=arcs[ii];if(arc.type==="arc"){drawArc.call(this,arc.x,arc.y,arc.radius,arc.startAngle,arc.endAngle,arc.counterclockwise,undefined,isClip);}else{drawLine.call(this,arc.x,arc.y);}}putStyle.call(this,style);this.pdf.internal.out("h");}if(!moves[k].arc){if(moves[k].close!==true&&moves[k].begin!==true){var x=moves[k].start.x;var y=moves[k].start.y;drawLines.call(this,moves[k].deltas,x,y);}}}if(style){putStyle.call(this,style);}if(isClip){doClip.call(this);}};var getBaseline=function getBaseline(y){var height=this.pdf.internal.getFontSize()/this.pdf.internal.scaleFactor;var descent=height*(this.pdf.internal.getLineHeightFactor()-1);switch(this.ctx.textBaseline){case"bottom":return y-descent;case"top":return y+height-descent;case"hanging":return y+height-2*descent;case"middle":return y+height/2-descent;case"ideographic":// TODO not implemented
+var delta;var xPath=this.path;for(var i=0;i<xPath.length;i++){var pt=xPath[i];switch(pt.type){case"begin":moves.push({begin:true});break;case"close":moves.push({close:true});break;case"mt":moves.push({start:pt,deltas:[],abs:[]});break;case"lt":var iii=moves.length;if(xPath[i-1]&&!isNaN(xPath[i-1].x)){delta=[pt.x-xPath[i-1].x,pt.y-xPath[i-1].y];if(iii>0){for(iii;iii>=0;iii--){if(moves[iii-1].close!==true&&moves[iii-1].begin!==true){moves[iii-1].deltas.push(delta);moves[iii-1].abs.push(pt);break;}}}}break;case"bct":delta=[pt.x1-xPath[i-1].x,pt.y1-xPath[i-1].y,pt.x2-xPath[i-1].x,pt.y2-xPath[i-1].y,pt.x-xPath[i-1].x,pt.y-xPath[i-1].y];moves[moves.length-1].deltas.push(delta);break;case"qct":var x1=xPath[i-1].x+2.0/3.0*(pt.x1-xPath[i-1].x);var y1=xPath[i-1].y+2.0/3.0*(pt.y1-xPath[i-1].y);var x2=pt.x+2.0/3.0*(pt.x1-pt.x);var y2=pt.y+2.0/3.0*(pt.y1-pt.y);var x3=pt.x;var y3=pt.y;delta=[x1-xPath[i-1].x,y1-xPath[i-1].y,x2-xPath[i-1].x,y2-xPath[i-1].y,x3-xPath[i-1].x,y3-xPath[i-1].y];moves[moves.length-1].deltas.push(delta);break;case"arc":moves.push({deltas:[],abs:[],arc:true});if(Array.isArray(moves[moves.length-1].abs)){moves[moves.length-1].abs.push(pt);}break;}}var style;if(!isClip){if(rule==="stroke"){style="stroke";}else{style="fill";}}else{style=null;}var began=false;for(var k=0;k<moves.length;k++){if(moves[k].arc){var arcs=moves[k].abs;for(var ii=0;ii<arcs.length;ii++){var arc=arcs[ii];if(arc.type==="arc"){drawArc.call(this,arc.x,arc.y,arc.radius,arc.startAngle,arc.endAngle,arc.counterclockwise,undefined,isClip,!began);}else{drawLine.call(this,arc.x,arc.y);}}// putStyle.call(this, style);
+began=true;}else if(moves[k].close===true){this.pdf.internal.out("h");began=false;}else if(moves[k].begin!==true){var x=moves[k].start.x;var y=moves[k].start.y;drawLines.call(this,moves[k].deltas,x,y);began=true;}//   if (!moves[k].arc) {
+//     if (moves[k].close !== true && moves[k].begin !== true) {
+//       var x = moves[k].start.x;
+//       var y = moves[k].start.y;
+//       drawLines.call(this, moves[k].deltas, x, y);
+//     }
+//   }
+}if(style){putStyle.call(this,style);}if(isClip){doClip.call(this);}};var getBaseline=function getBaseline(y){var height=this.pdf.internal.getFontSize()/this.pdf.internal.scaleFactor;var descent=height*(this.pdf.internal.getLineHeightFactor()-1);switch(this.ctx.textBaseline){case"bottom":return y-descent;case"top":return y+height-descent;case"hanging":return y+height-2*descent;case"middle":return y+height/2-descent;case"ideographic":// TODO not implemented
 return y;case"alphabetic":default:return y;}};var getTextBottom=function getTextBottom(yBaseLine){var height=this.pdf.internal.getFontSize()/this.pdf.internal.scaleFactor;var descent=height*(this.pdf.internal.getLineHeightFactor()-1);return yBaseLine+descent;};Context2D.prototype.createLinearGradient=function createLinearGradient(){var canvasGradient=function canvasGradient(){};canvasGradient.colorStops=[];canvasGradient.addColorStop=function(offset,color){this.colorStops.push([offset,color]);};canvasGradient.getColor=function(){if(this.colorStops.length===0){return"#000000";}return this.colorStops[0][1];};canvasGradient.isCanvasGradient=true;return canvasGradient;};Context2D.prototype.createPattern=function createPattern(){return this.createLinearGradient();};Context2D.prototype.createRadialGradient=function createRadialGradient(){return this.createLinearGradient();};/**
    *
    * @param x Edge point X
@@ -231785,7 +232017,9 @@ return y;case"alphabetic":default:return y;}};var getTextBottom=function getText
    * @param counterclockwise
    * @param style
    * @param isClip
-   */var drawArc=function drawArc(x,y,r,a1,a2,counterclockwise,style,isClip){var curves=createArc.call(this,r,a1,a2,counterclockwise);for(var i=0;i<curves.length;i++){var curve=curves[i];if(i===0){doMove.call(this,curve.x1+x,curve.y1+y);}drawCurve.call(this,x,y,curve.x2,curve.y2,curve.x3,curve.y3,curve.x4,curve.y4);}if(!isClip){putStyle.call(this,style);}else{doClip.call(this);}};var putStyle=function putStyle(style){switch(style){case"stroke":this.pdf.internal.out("S");break;case"fill":this.pdf.internal.out("f");break;}};var doClip=function doClip(){this.pdf.clip();this.pdf.discardPath();};var doMove=function doMove(x,y){this.pdf.internal.out(getHorizontalCoordinateString(x)+" "+getVerticalCoordinateString(y)+" m");};var putText=function putText(options){var textAlign;switch(options.align){case"right":case"end":textAlign="right";break;case"center":textAlign="center";break;case"left":case"start":default:textAlign="left";break;}var textDimensions=this.pdf.getTextDimensions(options.text);var yBaseLine=getBaseline.call(this,options.y);var yBottom=getTextBottom.call(this,yBaseLine);var yTop=yBottom-textDimensions.h;var pt=this.ctx.transform.applyToPoint(new Point(options.x,yBaseLine));var decomposedTransformationMatrix=this.ctx.transform.decompose();var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);var baselineRect=this.ctx.transform.applyToRectangle(new Rectangle(options.x,yBaseLine,textDimensions.w,textDimensions.h));var textBounds=matrix.applyToRectangle(new Rectangle(options.x,yTop,textDimensions.w,textDimensions.h));var pageArray=getPagesByPath.call(this,textBounds);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath,oldSize,oldLineWidth;options.text=options.text.replace(/[\t]/g,' ');// 自定义修改 修复打印不了tab键的问题
+   */var drawArc=function drawArc(x,y,r,a1,a2,counterclockwise,style,isClip,includeMove){// http://hansmuller-flex.blogspot.com/2011/10/more-about-approximating-circular-arcs.html
+var curves=createArc.call(this,r,a1,a2,counterclockwise);for(var i=0;i<curves.length;i++){var curve=curves[i];if(i===0){// doMove.call(this, curve.x1 + x, curve.y1 + y);
+if(includeMove){doMove.call(this,curve.x1+x,curve.y1+y);}else{drawLine.call(this,curve.x1+x,curve.y1+y);}}drawCurve.call(this,x,y,curve.x2,curve.y2,curve.x3,curve.y3,curve.x4,curve.y4);}if(!isClip){putStyle.call(this,style);}else{doClip.call(this);}};var putStyle=function putStyle(style){switch(style){case"stroke":this.pdf.internal.out("S");break;case"fill":this.pdf.internal.out("f");break;}};var doClip=function doClip(){this.pdf.clip();this.pdf.discardPath();};var doMove=function doMove(x,y){this.pdf.internal.out(getHorizontalCoordinateString(x)+" "+getVerticalCoordinateString(y)+" m");};var putText=function putText(options){var textAlign;switch(options.align){case"right":case"end":textAlign="right";break;case"center":textAlign="center";break;case"left":case"start":default:textAlign="left";break;}var textDimensions=this.pdf.getTextDimensions(options.text);var yBaseLine=getBaseline.call(this,options.y);var yBottom=getTextBottom.call(this,yBaseLine);var yTop=yBottom-textDimensions.h;var pt=this.ctx.transform.applyToPoint(new Point(options.x,yBaseLine));var decomposedTransformationMatrix=this.ctx.transform.decompose();var matrix=new Matrix();matrix=matrix.multiply(decomposedTransformationMatrix.translate);matrix=matrix.multiply(decomposedTransformationMatrix.skew);matrix=matrix.multiply(decomposedTransformationMatrix.scale);var baselineRect=this.ctx.transform.applyToRectangle(new Rectangle(options.x,yBaseLine,textDimensions.w,textDimensions.h));var textBounds=matrix.applyToRectangle(new Rectangle(options.x,yTop,textDimensions.w,textDimensions.h));var pageArray=getPagesByPath.call(this,textBounds);var pages=[];for(var ii=0;ii<pageArray.length;ii+=1){if(pages.indexOf(pageArray[ii])===-1){pages.push(pageArray[ii]);}}sortPages(pages);var clipPath,oldSize,oldLineWidth;options.text=options.text.replace(/[\t]/g,' ');// 自定义修改 修复打印不了tab键的问题
 if(this.autoPaging){var min=pages[0];var max=pages[pages.length-1];for(var i=min;i<max+1;i++){this.pdf.setPage(i);var topMargin=i===1?this.posY+this.margin[0]:this.margin[0];var firstPageHeight=this.pdf.internal.pageSize.height-this.posY-this.margin[0]-this.margin[2];var pageHeightMinusBottomMargin=this.pdf.internal.pageSize.height-this.margin[2];var pageHeightMinusMargins=pageHeightMinusBottomMargin-this.margin[0];var pageWidthMinusRightMargin=this.pdf.internal.pageSize.width-this.margin[1];var pageWidthMinusMargins=pageWidthMinusRightMargin-this.margin[3];var previousPageHeightSum=i===1?0:firstPageHeight+(i-2)*pageHeightMinusMargins;var acharSpace=options.charSpace?parseFloat(options.charSpace):0.0;//自定义修改
 if(this.ctx.clip_path.length!==0){var tmpPaths=this.path;clipPath=JSON.parse(JSON.stringify(this.ctx.clip_path));this.path=pathPositionRedo(clipPath,this.posX+this.margin[3],-1*previousPageHeightSum+topMargin);drawPaths.call(this,"fill",true);this.path=tmpPaths;}var textBoundsOnPage=pathPositionRedo([JSON.parse(JSON.stringify(textBounds))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];if(options.scale>=0.01){oldSize=this.pdf.internal.getFontSize();this.pdf.setFontSize(oldSize*options.scale);oldLineWidth=this.lineWidth;this.lineWidth=oldLineWidth*options.scale;}var doSlice=this.autoPaging!=="text";if(doSlice||textBoundsOnPage.y+textBoundsOnPage.h<=pageHeightMinusBottomMargin){if(doSlice||textBoundsOnPage.y>=topMargin&&textBoundsOnPage.x<=pageWidthMinusRightMargin){var croppedText=doSlice?options.text:this.pdf.splitTextToSize(options.text,options.maxWidth||pageWidthMinusRightMargin-textBoundsOnPage.x)[0];var baseLineRectOnPage=pathPositionRedo([JSON.parse(JSON.stringify(baselineRect))],this.posX+this.margin[3],-previousPageHeightSum+topMargin+this.ctx.prevPageLastElemOffset)[0];var needsClipping=doSlice&&(i>min||i<max)&&hasMargins.call(this);if(needsClipping){this.pdf.saveGraphicsState();this.pdf.rect(this.margin[3],this.margin[0],pageWidthMinusMargins,pageHeightMinusMargins,null).clip().discardPath();}this.pdf.text(croppedText,baseLineRectOnPage.x,baseLineRectOnPage.y,{angle:options.angle,align:textAlign,renderingMode:options.renderingMode,charSpace:acharSpace// 自定义修改
 });if(needsClipping){this.pdf.restoreGraphicsState();}}}else{// This text is the last element of the page, but it got cut off due to the margin
@@ -231958,7 +232192,7 @@ var options=Object.assign({},this.opt.html2canvas);delete options.onrendered;ret
 var onRendered=this.opt.html2canvas.onrendered||function(){};onRendered(canvas);this.prop.canvas=canvas;document.body.removeChild(this.prop.overlay);});};Worker.prototype.toContext2d=function toContext2d(){// Set up function prerequisites.
 var prereqs=[function checkContainer(){return document.body.contains(this.prop.container)||this.toContainer();}];// Fulfill prereqs then create the canvas.
 return this.thenList(prereqs).then(loadHtml2Canvas).then(function toContext2d_main(html2canvas){// Handle old-fashioned 'onrendered' argument.
-var pdf=this.opt.jsPDF;var fontFaces=this.opt.fontFaces;var scale=typeof this.opt.width==="number"&&!isNaN(this.opt.width)&&typeof this.opt.windowWidth==="number"&&!isNaN(this.opt.windowWidth)?this.opt.width/this.opt.windowWidth:1;var options=Object.assign({async:true,allowTaint:true,scale:scale,scrollX:this.opt.scrollX||0,scrollY:this.opt.scrollY||0,backgroundColor:"#ffffff",imageTimeout:15000,logging:true,proxy:null,removeContainer:true,foreignObjectRendering:false,useCORS:false},this.opt.html2canvas);delete options.onrendered;pdf.context2d.autoPaging=typeof this.opt.autoPaging==="undefined"?true:this.opt.autoPaging;pdf.context2d.posX=this.opt.x;pdf.context2d.posY=this.opt.y;pdf.context2d.margin=this.opt.margin;pdf.context2d.fontFaces=fontFaces;if(fontFaces){for(var i=0;i<fontFaces.length;++i){var font=fontFaces[i];var src=font.src.find(function(src){return src.format==="truetype";});if(src){pdf.addFont(src.url,font.ref.name,font.ref.style);}}}options.windowHeight=options.windowHeight||0;options.windowHeight=options.windowHeight==0?Math.max(this.prop.container.clientHeight,this.prop.container.scrollHeight,this.prop.container.offsetHeight):options.windowHeight;return html2canvas(this.prop.container,options);}).then(function toContext2d_post(canvas){// Handle old-fashioned 'onrendered' argument.
+var pdf=this.opt.jsPDF;var fontFaces=this.opt.fontFaces;var scale=typeof this.opt.width==="number"&&!isNaN(this.opt.width)&&typeof this.opt.windowWidth==="number"&&!isNaN(this.opt.windowWidth)?this.opt.width/this.opt.windowWidth:1;var options=Object.assign({async:true,allowTaint:true,scale:scale,scrollX:this.opt.scrollX||0,scrollY:this.opt.scrollY||0,backgroundColor:"#ffffff",imageTimeout:15000,logging:true,proxy:null,removeContainer:true,foreignObjectRendering:false,useCORS:false},this.opt.html2canvas);delete options.onrendered;pdf.context2d.autoPaging=typeof this.opt.autoPaging==="undefined"?true:this.opt.autoPaging;pdf.context2d.posX=this.opt.x;pdf.context2d.posY=this.opt.y;pdf.context2d.margin=this.opt.margin;pdf.context2d.fontFaces=fontFaces;if(fontFaces){for(var i=0;i<fontFaces.length;++i){var font=fontFaces[i];var src=font.src.find(function(src){return src.format==="truetype";});if(src){pdf.addFont(src.url,font.ref.name,font.ref.style);}}}options.windowHeight=options.windowHeight||0;options.windowHeight=options.windowHeight==0?Math.max(this.prop.container.clientHeight,this.prop.container.scrollHeight,this.prop.container.offsetHeight):options.windowHeight;return html2canvas(this.prop.container,options);}).then(function toContext2d_post(canvas){this.opt.jsPDF.context2d.restore(true);// Handle old-fashioned 'onrendered' argument.
 var onRendered=this.opt.html2canvas.onrendered||function(){};onRendered(canvas);this.prop.canvas=canvas;document.body.removeChild(this.prop.overlay);});};Worker.prototype.toImg=function toImg(){// Set up function prerequisites.
 var prereqs=[function checkCanvas(){return this.prop.canvas||this.toCanvas();}];// Fulfill prereqs then create the image.
 return this.thenList(prereqs).then(function toImg_main(){var imgData=this.prop.canvas.toDataURL("image/"+this.opt.image.type,this.opt.image.quality);this.prop.img=document.createElement("img");this.prop.img.src=imgData;});};Worker.prototype.toPdf=function toPdf(){// Set up function prerequisites.
@@ -232701,7 +232935,8 @@ var rgbOut=new Uint8Array(length/4*3);var alphaOut=new Uint8Array(length/4);var
    * @param {Object} options
    * @returns {Array}
    */var getCharWidthsArray=API.getCharWidthsArray=function(text,options){options=options||{};var activeFont=options.font||this.internal.getFont();var fontSize=options.fontSize||this.internal.getFontSize();var charSpace=options.charSpace||this.internal.getCharSpace();var widths=options.widths?options.widths:activeFont.metadata.Unicode.widths;var widthsFractionOf=widths.fof?widths.fof:1;var kerning=options.kerning?options.kerning:activeFont.metadata.Unicode.kerning;var kerningFractionOf=kerning.fof?kerning.fof:1;var doKerning=options.doKerning===false?false:true;var kerningValue=0;var i;var length=text.length;var char_code;var prior_char_code=0;//for kerning
-var default_char_width=widths[0]||widthsFractionOf;var output=[];for(i=0;i<length;i++){char_code=text.charCodeAt(i);if(typeof activeFont.metadata.widthOfString==="function"){output.push((activeFont.metadata.widthOfGlyph(activeFont.metadata.characterToGlyph(char_code))+charSpace*(1000/fontSize)||0)/1000);}else{if(doKerning&&(0,esm_typeof/* default */.Z)(kerning[char_code])==="object"&&!isNaN(parseInt(kerning[char_code][prior_char_code],10))){kerningValue=kerning[char_code][prior_char_code]/kerningFractionOf;}else{kerningValue=0;}output.push((widths[char_code]||default_char_width)/widthsFractionOf+kerningValue);}prior_char_code=char_code;}return output;};/**
+var default_char_width=widths[0]||widthsFractionOf;var output=[];for(i=0;i<length;i++){char_code=text.charCodeAt(i);if(typeof activeFont.metadata.widthOfString==="function"){output.push((activeFont.metadata.widthOfGlyph(activeFont.metadata.characterToGlyph(char_code))+charSpace*(1000/fontSize)||0)/1000);}else{if(doKerning&&(0,esm_typeof/* default */.Z)(kerning[char_code])==="object"&&!isNaN(parseInt(kerning[char_code][prior_char_code],10))){kerningValue=kerning[char_code][prior_char_code]/kerningFractionOf;}else{kerningValue=0;}var charSpacewidth=(charSpace*(1000/fontSize)||0)/1000*this.internal.scaleFactor;var currentCharWidth=(widths[char_code]||default_char_width)/widthsFractionOf+kerningValue;output.push(currentCharWidth+charSpacewidth);// output.push((widths[char_code] || default_char_width) / widthsFractionOf + kerningValue);
+}prior_char_code=char_code;}return output;};/**
    * Returns a widths of string in a given font, if the font size is set as 1 point.
    *
    * In other words, this is "proportional" value. For 1 unit of font size, the length
@@ -233053,7 +233288,8 @@ ctx.fillRect(0,0,canvas.width,canvas.height);var options={ignoreMouse:true,ignor
 return ar.join("");}else{t=t.toString(16);ar.push(padz[4-t.length],t);}}return ar.join("");};var toUnicodeCmap=function toUnicodeCmap(map){var code,codes,range,unicode,unicodeMap,_i,_len;unicodeMap="/CIDInit /ProcSet findresource begin\n12 dict begin\nbegincmap\n/CIDSystemInfo <<\n  /Registry (Adobe)\n  /Ordering (UCS)\n  /Supplement 0\n>> def\n/CMapName /Adobe-Identity-UCS def\n/CMapType 2 def\n1 begincodespacerange\n<0000><ffff>\nendcodespacerange";codes=Object.keys(map).sort(function(a,b){return a-b;});range=[];for(_i=0,_len=codes.length;_i<_len;_i++){code=codes[_i];if(range.length>=100){unicodeMap+="\n"+range.length+" beginbfchar\n"+range.join("\n")+"\nendbfchar";range=[];}if(map[code]!==undefined&&map[code]!==null&&typeof map[code].toString==="function"){unicode=("0000"+map[code].toString(16)).slice(-4);code=("0000"+(+code).toString(16)).slice(-4);range.push("<"+code+"><"+unicode+">");}}if(range.length){unicodeMap+="\n"+range.length+" beginbfchar\n"+range.join("\n")+"\nendbfchar\n";}unicodeMap+="endcmap\nCMapName currentdict /CMap defineresource pop\nend\nend";return unicodeMap;};var identityHFunction=function identityHFunction(options){var font=options.font;var out=options.out;var newObject=options.newObject;var putStream=options.putStream;if(font.metadata instanceof jsPDF.API.TTFFont&&font.encoding==="Identity-H"){//Tag with Identity-H
 var widths=font.metadata.Unicode.widths;var data=font.metadata.subset.encode(font.metadata.glyIdsUsed,1);var pdfOutput=data;var pdfOutput2="";for(var i=0;i<pdfOutput.length;i++){pdfOutput2+=String.fromCharCode(pdfOutput[i]);}var fontTable=newObject();putStream({data:pdfOutput2,addLength1:true,objectId:fontTable});out("endobj");var cmap=newObject();var cmapData=toUnicodeCmap(font.metadata.toUnicode);putStream({data:cmapData,addLength1:true,objectId:cmap});out("endobj");var fontDescriptor=newObject();out("<<");out("/Type /FontDescriptor");out("/FontName /"+toPDFName(font.fontName));out("/FontFile2 "+fontTable+" 0 R");out("/FontBBox "+jsPDF.API.PDFObject.convert(font.metadata.bbox));out("/Flags "+font.metadata.flags);out("/StemV "+font.metadata.stemV);out("/ItalicAngle "+font.metadata.italicAngle);out("/Ascent "+font.metadata.ascender);out("/Descent "+font.metadata.decender);out("/CapHeight "+font.metadata.capHeight);out(">>");out("endobj");var DescendantFont=newObject();out("<<");out("/Type /Font");out("/BaseFont /"+toPDFName(font.fontName));out("/FontDescriptor "+fontDescriptor+" 0 R");out("/W "+jsPDF.API.PDFObject.convert(widths));out("/CIDToGIDMap /Identity");out("/DW 1000");out("/Subtype /CIDFontType2");out("/CIDSystemInfo");out("<<");out("/Supplement 0");out("/Registry (Adobe)");out("/Ordering ("+font.encoding+")");out(">>");out(">>");out("endobj");font.objectNumber=newObject();out("<<");out("/Type /Font");out("/Subtype /Type0");out("/ToUnicode "+cmap+" 0 R");out("/BaseFont /"+toPDFName(font.fontName));out("/Encoding /"+font.encoding);out("/DescendantFonts ["+DescendantFont+" 0 R]");out(">>");out("endobj");font.isAlreadyPutted=true;}};jsPDFAPI.events.push(["putFont",function(args){identityHFunction(args);}]);var winAnsiEncodingFunction=function winAnsiEncodingFunction(options){var font=options.font;var out=options.out;var newObject=options.newObject;var putStream=options.putStream;if(font.metadata instanceof jsPDF.API.TTFFont&&font.encoding==="WinAnsiEncoding"){//Tag with WinAnsi encoding
 var data=font.metadata.rawData;var pdfOutput=data;var pdfOutput2="";for(var i=0;i<pdfOutput.length;i++){pdfOutput2+=String.fromCharCode(pdfOutput[i]);}var fontTable=newObject();putStream({data:pdfOutput2,addLength1:true,objectId:fontTable});out("endobj");var cmap=newObject();var cmapData=toUnicodeCmap(font.metadata.toUnicode);putStream({data:cmapData,addLength1:true,objectId:cmap});out("endobj");var fontDescriptor=newObject();out("<<");out("/Descent "+font.metadata.decender);out("/CapHeight "+font.metadata.capHeight);out("/StemV "+font.metadata.stemV);out("/Type /FontDescriptor");out("/FontFile2 "+fontTable+" 0 R");out("/Flags 96");out("/FontBBox "+jsPDF.API.PDFObject.convert(font.metadata.bbox));out("/FontName /"+toPDFName(font.fontName));out("/ItalicAngle "+font.metadata.italicAngle);out("/Ascent "+font.metadata.ascender);out(">>");out("endobj");font.objectNumber=newObject();for(var j=0;j<font.metadata.hmtx.widths.length;j++){font.metadata.hmtx.widths[j]=parseInt(font.metadata.hmtx.widths[j]*(1000/font.metadata.head.unitsPerEm));//Change the width of Em units to Point units.
-}out("<</Subtype/TrueType/Type/Font/ToUnicode "+cmap+" 0 R/BaseFont/"+toPDFName(font.fontName)+"/FontDescriptor "+fontDescriptor+" 0 R"+"/Encoding/"+font.encoding+" /FirstChar 29 /LastChar 255 /Widths "+jsPDF.API.PDFObject.convert(font.metadata.hmtx.widths)+">>");out("endobj");font.isAlreadyPutted=true;}};jsPDFAPI.events.push(["putFont",function(args){winAnsiEncodingFunction(args);}]);var utf8TextFunction=function utf8TextFunction(args){var text=args.text||"";var x=args.x;var y=args.y;var options=args.options||{};var mutex=args.mutex||{};var pdfEscape=mutex.pdfEscape;var activeFontKey=mutex.activeFontKey;var fonts=mutex.fonts;var key=activeFontKey;var str="",s=0,cmapConfirm;var strText="";var encoding=fonts[key].encoding;if(fonts[key].encoding!=="Identity-H"){return{text:text,x:x,y:y,options:options,mutex:mutex};}strText=text;key=activeFontKey;if(Array.isArray(text)){strText=text[0];}var textArr=(0,esm_toConsumableArray/* default */.Z)(strText);for(s=0;s<textArr.length;s+=1){if(fonts[key].metadata.hasOwnProperty("cmap")){cmapConfirm=fonts[key].metadata.cmap.unicode.codeMap[textArr[s].codePointAt()];/*
+}out("<</Subtype/TrueType/Type/Font/ToUnicode "+cmap+" 0 R/BaseFont/"+toPDFName(font.fontName)+"/FontDescriptor "+fontDescriptor+" 0 R"+"/Encoding/"+font.encoding+" /FirstChar 29 /LastChar 255 /Widths "+jsPDF.API.PDFObject.convert(font.metadata.hmtx.widths)+">>");out("endobj");font.isAlreadyPutted=true;}};jsPDFAPI.events.push(["putFont",function(args){winAnsiEncodingFunction(args);}]);var utf8TextFunction=function utf8TextFunction(args){var text=args.text||"";var x=args.x;var y=args.y;var options=args.options||{};var mutex=args.mutex||{};var pdfEscape=mutex.pdfEscape;var activeFontKey=mutex.activeFontKey;var fonts=mutex.fonts;var key=activeFontKey;var str="",s=0,cmapConfirm;var strText="";var encoding=fonts[key].encoding;if(fonts[key].encoding!=="Identity-H"){return{text:text,x:x,y:y,options:options,mutex:mutex};}strText=text;key=activeFontKey;if(Array.isArray(text)){strText=text[0];}// 自定义修改 处理带生僻字的字符串解构
+var textArr=(0,esm_toConsumableArray/* default */.Z)(strText);for(s=0;s<textArr.length;s+=1){if(fonts[key].metadata.hasOwnProperty("cmap")){cmapConfirm=fonts[key].metadata.cmap.unicode.codeMap[textArr[s].codePointAt()];/*
              if (Object.prototype.toString.call(text) === '[object Array]') {
                 var i = 0;
                // for (i = 0; i < text.length; i += 1) {
@@ -236744,6 +236980,7 @@ var commondata = __webpack_require__(76285);
 
 
 
+
 /* harmony default export */ var HoDocsvue_type_script_lang_js_ = ({
   name: 'HoDocs',
   components: {
@@ -237577,6 +237814,13 @@ var commondata = __webpack_require__(76285);
      * 关闭弹出层
      */
     closeControlModal: function closeControlModal() {
+      if (this.hoEditorProvider.controlType == "edit-image") {
+        var config = HoFabricConfig/* HoFabricConfig */.G.instance();
+        this.$emit("closeHoEditorModal", 'edit-image', {
+          fontSize: config.fontSize,
+          borderColor: config.borderColor
+        });
+      }
       this.hoEditorProvider.setControlProperty('', 'add', '');
       this.modalStatusObject.type = '';
       this.modalStatusObject.operate = '';
@@ -237781,10 +238025,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_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/HoDocs.vue?vue&type=style&index=0&id=b6d65e5c&prod&lang=less&media=print&
+;// 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/HoDocs.vue?vue&type=style&index=0&id=45b99f15&prod&lang=less&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=b6d65e5c&prod&lang=less&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=45b99f15&prod&lang=less&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -239569,8 +239813,8 @@ var UpdateDocument_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var UpdateDocument = (UpdateDocument_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=a218f044&
-var PageSettingvue_type_template_id_a218f044_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/PageSetting.vue?vue&type=template&id=43e8d8c6&
+var PageSettingvue_type_template_id_43e8d8c6_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -239812,35 +240056,6 @@ var PageSettingvue_type_template_id_a218f044_render = function render() {
       }
     }, [_vm._v(_vm._s(style[0]))]);
   }), 1)], 1), _c('li', {
-    staticClass: "control-item"
-  }, [_c('span', {
-    staticClass: "label",
-    staticStyle: {
-      "width": "64px"
-    }
-  }, [_vm._v("来源(S)")]), _c('a-select', {
-    staticStyle: {
-      "width": "100%"
-    },
-    attrs: {
-      "getPopupContainer": function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      },
-      "size": "small",
-      "placeholder": "请选择来源"
-    },
-    model: {
-      value: _vm.property.source,
-      callback: function callback($$v) {
-        _vm.$set(_vm.property, "source", $$v);
-      },
-      expression: "property.source"
-    }
-  }, [_c('a-select-option', {
-    attrs: {
-      "value": "0"
-    }
-  }, [_vm._v("自动选择")])], 1)], 1), _c('li', {
     staticClass: "control-item paper-item"
   }, [_c('span', {
     staticClass: "label",
@@ -240075,7 +240290,7 @@ var PageSettingvue_type_template_id_a218f044_render = function render() {
     }
   }, [_vm._v("取消")])], 1)])]);
 };
-var PageSettingvue_type_template_id_a218f044_staticRenderFns = [];
+var PageSettingvue_type_template_id_43e8d8c6_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./src/components/mixins/appendToBody.ts
 var appendToBody = __webpack_require__(95677);
@@ -240223,10 +240438,10 @@ var HoColorPicker = __webpack_require__(10306);
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_PageSettingvue_type_script_lang_js_ = (PageSettingvue_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/toolbar/PageSetting.vue?vue&type=style&index=0&id=a218f044&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/toolbar/PageSetting.vue?vue&type=style&index=0&id=43e8d8c6&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=a218f044&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue?vue&type=style&index=0&id=43e8d8c6&prod&lang=less&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/PageSetting.vue
 
@@ -240239,8 +240454,8 @@ var HoColorPicker = __webpack_require__(10306);
 
 var PageSetting_component = (0,componentNormalizer/* default */.Z)(
   toolbar_PageSettingvue_type_script_lang_js_,
-  PageSettingvue_type_template_id_a218f044_render,
-  PageSettingvue_type_template_id_a218f044_staticRenderFns,
+  PageSettingvue_type_template_id_43e8d8c6_render,
+  PageSettingvue_type_template_id_43e8d8c6_staticRenderFns,
   false,
   null,
   null,