hoeditor-web 3.0.82 → 3.0.84

package/lib/hoeditor.umd.js

@@ -3625,7 +3625,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 2062:
+/***/ 75336:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3637,7 +3637,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ BarCodes; }
 });
 
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=template&id=77ae51d0&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=template&id=59549e42&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -3667,6 +3667,26 @@ var render = function render() {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
+  }, [_vm._v("标识符")]), _c('a-input', {
+    attrs: {
+      "placeholder": "条形码内容不能为空",
+      "max-length": 20,
+      "show-word-limit": ""
+    },
+    on: {
+      "input": _vm.codeChange
+    },
+    model: {
+      value: _vm.innerIdentifier,
+      callback: function callback($$v) {
+        _vm.innerIdentifier = $$v;
+      },
+      expression: "innerIdentifier"
+    }
+  })], 1), _c('li', {
+    staticClass: "control-item"
+  }, [_c('span', {
+    staticClass: "label"
   }, [_vm._v("条形码内容")]), _c('a-input', {
     attrs: {
       "placeholder": "条形码内容不能为空",
@@ -3740,6 +3760,8 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.test.js
@@ -3757,6 +3779,7 @@ var HOEditorFactorys = __webpack_require__(74089);
 
 
 
+
 /* harmony default export */ var BarCodesvue_type_script_lang_js_ = ({
   name: 'Barcode',
   props: {
@@ -3774,6 +3797,7 @@ var HOEditorFactorys = __webpack_require__(74089);
     return {
       id: '',
       textContent: '',
+      innerIdentifier: '',
       barCodeStyle: 'CODE39',
       textAlign: 'center',
       isDisplayText: false,
@@ -3781,7 +3805,8 @@ var HOEditorFactorys = __webpack_require__(74089);
       textField: '',
       textEslint: /^[a-zA-Z0-9_]+$/,
       animationClassNames: 'control-modal-contents barcode-modal animation-in',
-      barcode: null
+      barcode: null,
+      name: ''
       // dataSource: null
     };
   },
@@ -3790,7 +3815,9 @@ var HOEditorFactorys = __webpack_require__(74089);
     if (this.controlStatus === 'update') {
       var updateNode = this.getBarCodeNode();
       this.id = updateNode.id;
+      this.name = updateNode.name;
       this.textContent = updateNode.textContent;
+      this.innerIdentifier = updateNode.innerIdentifier;
       this.isDisplayText = updateNode.isDisplayText;
       this.$nextTick(function () {
         return _this.codeChange();
@@ -3844,9 +3871,9 @@ var HOEditorFactorys = __webpack_require__(74089);
       // this.dataSource = this.hoEditorProvider.getDataSource();
 
       if (this.controlStatus === 'add') {
-        vueController.insertBarcode(this.controlStatus, this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, "");
+        vueController.insertBarcode(this.controlStatus, this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, '', this.innerIdentifier);
       } else if (this.controlStatus === 'update') {
-        vueController.updateBarcode(this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, "");
+        vueController.updateBarcode(this.id, this.textContent, this.isDisplayText, this.barcode.src, width, height, this.name, this.innerIdentifier);
       }
       this.handleClose();
     },
@@ -3861,10 +3888,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=script&lang=js&
  /* harmony default export */ var barCode_BarCodesvue_type_script_lang_js_ = (BarCodesvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=77ae51d0&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=59549e42&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=77ae51d0&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/barCode/BarCodes.vue?vue&type=style&index=0&id=59549e42&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -5148,7 +5175,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 17237:
+/***/ 49145:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -5170,7 +5197,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// 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/dateDialog/DateDialog.vue?vue&type=template&id=5844e53a&
+;// 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/dateDialog/DateDialog.vue?vue&type=template&id=0a9d2557&
 
 
 
@@ -5439,7 +5466,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=5844e53a&
+;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=template&id=0a9d2557&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__(63442);
@@ -5641,10 +5668,10 @@ var zh_cn = __webpack_require__(83839);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var dateDialog_DateDialogvue_type_script_lang_js_ = (DateDialogvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=5844e53a&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0a9d2557&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=5844e53a&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/dateDialog/DateDialog.vue?vue&type=style&index=0&id=0a9d2557&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -8304,7 +8331,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 47214:
+/***/ 50921:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8320,7 +8347,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/listsource/ListSource.vue?vue&type=template&id=4e58a6fc&scoped=true&
+;// 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/listsource/ListSource.vue?vue&type=template&id=0d496382&scoped=true&
 
 
 var render = function render() {
@@ -8353,27 +8380,6 @@ var render = function render() {
   }, [_c('ul', {
     staticClass: "control-list"
   }, [_c('li', {
-    staticClass: "control-item",
-    staticStyle: {
-      "width": "100%"
-    }
-  }, [_c('span', {
-    staticClass: "label",
-    staticStyle: {
-      "width": "42px"
-    }
-  }, [_vm._v("来源")]), _c('a-input', {
-    attrs: {
-      "placeholder": "来源"
-    },
-    model: {
-      value: _vm.source,
-      callback: function callback($$v) {
-        _vm.source = $$v;
-      },
-      expression: "source"
-    }
-  })], 1), _c('li', {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label",
@@ -8582,7 +8588,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=template&id=4e58a6fc&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=template&id=0d496382&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -8829,10 +8835,10 @@ var appendToBody = __webpack_require__(95677);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=script&lang=js&
  /* harmony default export */ var listsource_ListSourcevue_type_script_lang_js_ = (ListSourcevue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=4e58a6fc&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=0d496382&prod&lang=scss&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=4e58a6fc&prod&lang=scss&scoped=true&
+;// CONCATENATED MODULE: ./src/components/controls/listsource/ListSource.vue?vue&type=style&index=0&id=0d496382&prod&lang=scss&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -8851,7 +8857,7 @@ var component = (0,componentNormalizer/* default */.Z)(
   staticRenderFns,
   false,
   null,
-  "4e58a6fc",
+  "0d496382",
   null
   
 )
@@ -16591,7 +16597,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 61973:
+/***/ 47158:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -16607,7 +16613,7 @@ __webpack_require__.d(__webpack_exports__, {
 var es_array_includes = __webpack_require__(26699);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
 var es_string_includes = __webpack_require__(32023);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=488dae95&
+;// 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/table/TableCellProperty.vue?vue&type=template&id=59ad6eba&
 
 
 var render = function render() {
@@ -16927,7 +16933,8 @@ var render = function render() {
     }
   }), _c('span', {
     staticStyle: {
-      "padding": "0 10px"
+      "padding": "0 10px",
+      "margin-left": "34px"
     }
   }, [_vm._v("下")]), _c('a-checkbox', {
     model: {
@@ -16939,7 +16946,8 @@ var render = function render() {
     }
   }), _c('span', {
     staticStyle: {
-      "padding": "0 10px"
+      "padding": "0 10px",
+      "margin-left": "34px"
     }
   }, [_vm._v("左")]), _c('a-checkbox', {
     model: {
@@ -16951,7 +16959,8 @@ var render = function render() {
     }
   }), _c('span', {
     staticStyle: {
-      "padding": "0 10px"
+      "padding": "0 10px",
+      "margin-left": "34px"
     }
   }, [_vm._v("右")]), _c('a-checkbox', {
     model: {
@@ -17337,7 +17346,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line no-line"
-  }), _c('span', [_vm._v("None")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 1 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17346,7 +17355,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line left-line top-line top-left-one-line"
-  }), _c('span', [_vm._v("TopLeftOneLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 2 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17355,7 +17364,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line left-line top-line top-left-two-line"
-  }), _c('span', [_vm._v("TopLeftTwoLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 3 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17364,7 +17373,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line right-line top-line top-right-one-line"
-  }), _c('span', [_vm._v("TopRightOneLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 4 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17373,7 +17382,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line right-line top-line top-right-two-line"
-  }), _c('span', [_vm._v("TopRightTwoLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 5 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17382,7 +17391,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line left-line bottom-line bottom-left-one-line"
-  }), _c('span', [_vm._v("BottomLeftOneLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 6 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17391,7 +17400,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line left-line bottom-line bottom-left-two-line"
-  }), _c('span', [_vm._v("BottomLeftTwoLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 7 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17400,7 +17409,7 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line right-line bottom-line bottom-right-one-line"
-  }), _c('span', [_vm._v("BottomRightOneLine")])]), _c('li', {
+  })]), _c('li', {
     class: _vm.obliqueSplitLine === 8 ? 'selected' : '',
     on: {
       "click": function click($event) {
@@ -17409,7 +17418,16 @@ var render = function render() {
     }
   }, [_c('span', {
     staticClass: "line right-line bottom-line bottom-right-two-line"
-  }), _c('span', [_vm._v("BottomRightTwoLine")])])])])], 1)], 1), _c('footer', {
+  })]), _c('li', {
+    class: _vm.obliqueSplitLine === 9 ? 'selected' : '',
+    on: {
+      "click": function click($event) {
+        return _vm.setObliqueSplitLine(9);
+      }
+    }
+  }, [_c('span', {
+    staticClass: "line left-right-line left-right-one-line"
+  })])])])], 1)], 1), _c('footer', {
     staticClass: "ho-modal-footer"
   }, [_c('a-button', {
     attrs: {
@@ -17429,7 +17447,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=488dae95&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=template&id=59ad6eba&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js + 3 modules
 var slicedToArray = __webpack_require__(27222);
@@ -17827,10 +17845,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPropertyvue_type_script_lang_js_ = (TableCellPropertyvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=488dae95&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=59ad6eba&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=488dae95&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellProperty.vue?vue&type=style&index=0&id=59ad6eba&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -20847,7 +20865,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 49373:
+/***/ 92675:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -20861,7 +20879,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/textDialog/TextDialog.vue?vue&type=template&id=ad488cea&
+;// 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/textDialog/TextDialog.vue?vue&type=template&id=75c57bb1&
 
 var render = function render() {
   var _vm = this,
@@ -21155,40 +21173,6 @@ var render = function render() {
     staticClass: "control-item"
   }, [_c('span', {
     staticClass: "label"
-  }, [_vm._v("内容只读状态")]), _c('a-select', {
-    staticStyle: {
-      "text-align": "left"
-    },
-    attrs: {
-      "getPopupContainer": function getPopupContainer(triggerNode) {
-        return triggerNode.parentNode;
-      },
-      "placeholder": "请选择",
-      "size": "small"
-    },
-    model: {
-      value: _vm.textParam.readOnlyStatus,
-      callback: function callback($$v) {
-        _vm.$set(_vm.textParam, "readOnlyStatus", $$v);
-      },
-      expression: "textParam.readOnlyStatus"
-    }
-  }, [_c('a-select-option', {
-    attrs: {
-      "value": 2
-    }
-  }, [_vm._v("继承父元素")]), _c('a-select-option', {
-    attrs: {
-      "value": 0
-    }
-  }, [_vm._v("是")]), _c('a-select-option', {
-    attrs: {
-      "value": 1
-    }
-  }, [_vm._v("否")])], 1)], 1), _c('li', {
-    staticClass: "control-item"
-  }, [_c('span', {
-    staticClass: "label"
   }, [_vm._v("固定宽度")]), _c('a-input-number', {
     staticStyle: {
       "width": "120px",
@@ -21375,7 +21359,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=ad488cea&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=template&id=75c57bb1&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -21669,10 +21653,10 @@ var VerifyTip = __webpack_require__(63210);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var textDialog_TextDialogvue_type_script_lang_js_ = (TextDialogvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=ad488cea&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=75c57bb1&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=ad488cea&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/textDialog/TextDialog.vue?vue&type=style&index=0&id=75c57bb1&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -41006,7 +40990,9 @@ var DocController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertBarcode",
-    value: function insertBarcode(operType, curDomRange, id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier) {
+    value: function insertBarcode(operType, curDomRange, id, textContent, isDisplayText, imagePath, width, height,
+    //bandDataSource: string,
+    name, innerIdentifier) {
       var domRange = curDomRange.normalize();
       var startPath = domRange.endPath;
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_76__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
@@ -45744,6 +45730,7 @@ var DomRange = /*#__PURE__*/function () {
         // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
         // const isValidPath = hoEditorFactory.docTree.checkPath(value);
         if (value.indexOf("-") >= 0) {
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_22__/* ["default"].destroy */ .Z.destroy();
           //const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
           ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_22__/* ["default"].warn */ .Z.warn("当前路径s(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。(" + this._startPath + ")");
           this.setSamePath(this._startPath);
@@ -45763,6 +45750,7 @@ var DomRange = /*#__PURE__*/function () {
         // const hoEditorFactory = HOEditorFactorys.instance().getFactory(this._hoEditorFactoryID);
         // const isValidPath = hoEditorFactory.docTree.checkPath(value);
         if (value.indexOf("-") >= 0) {
+          ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_22__/* ["default"].destroy */ .Z.destroy();
           ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_22__/* ["default"].warn */ .Z.warn("当前路径e(" + value + ")异常，请用鼠标点击一下页面(重获路径)再进行之后的操作。(" + this._endPath + ")");
           this.setSamePath(this._endPath);
           return;
@@ -47170,7 +47158,7 @@ var PageProperty = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2020-12-24 16:01:16
- * @LastEditTime: 2023-07-07 11:45:18
+ * @LastEditTime: 2023-07-13 10:31:51
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\TableProperty.ts
@@ -47920,6 +47908,7 @@ var ObliqueSplitLine;
   ObliqueSplitLine[ObliqueSplitLine["BottomLeftTwoLine"] = 6] = "BottomLeftTwoLine";
   ObliqueSplitLine[ObliqueSplitLine["BottomRightOneLine"] = 7] = "BottomRightOneLine";
   ObliqueSplitLine[ObliqueSplitLine["BottomRightTwoLine"] = 8] = "BottomRightTwoLine";
+  ObliqueSplitLine[ObliqueSplitLine["TwoDiagonal"] = 9] = "TwoDiagonal";
 })(ObliqueSplitLine || (ObliqueSplitLine = {}));
 var DiagonalType;
 (function (DiagonalType) {
@@ -65236,7 +65225,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2023-06-30 16:19:32
+ * @LastEditTime: 2023-07-13 09:59:01
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -65314,7 +65303,7 @@ var DownListProperty = /*#__PURE__*/function () {
   // 列表选项互斥
   //private _dynamicLoadList!: boolean;//动态加载列表
   // private _listContent!: string;//列表内容
-  //来源
+  //private _source!: string; //来源
   //列表项目
   //private _specialFormat!: SpecialFormat;//特殊格式
   function DownListProperty() {
@@ -65323,7 +65312,6 @@ var DownListProperty = /*#__PURE__*/function () {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_isMultiLinesDisplay", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_splitCharacter", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_mutexSelect", void 0);
-    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_source", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_58__/* ["default"] */ .Z)(this, "_listItems", void 0);
     DownListProperty.setDefaultImportStyle(this);
   }
@@ -65383,16 +65371,14 @@ var DownListProperty = /*#__PURE__*/function () {
     //         this._listContent = value;
     //     }
     // }
-  }, {
-    key: "source",
-    get: function get() {
-      return this._source;
-    },
-    set: function set(value) {
-      if (this._source !== value) {
-        this._source = value;
-      }
-    }
+    // get source(): string {
+    //     return this._source;
+    // }
+    // set source(value: string) {
+    //     if (this._source !== value) {
+    //         this._source = value;
+    //     }
+    // }
   }, {
     key: "listItems",
     get: function get() {
@@ -65412,7 +65398,7 @@ var DownListProperty = /*#__PURE__*/function () {
       ret._splitCharacter = '';
       //ret._dynamicLoadList = false;
       //ret._listContent = "";
-      ret._source = '';
+      //ret._source = '';
       ret._listItems = '';
       ret._mutexSelect = false;
       //ret._specialFormat = SpecialFormat.none;
@@ -67293,16 +67279,19 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
           }
         }
       }
-      if (hoEditorFactory.drawTree.paintStatus === _editor_draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_28__/* .PaintState.psDesign */ .Dh.psDesign) {
-        var sChildNode = temp.childNodes[0];
-        var eChildNode = temp.childNodes[temp.childNodes.length - 1];
-        if (!(sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j) || sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j && sChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNodeType.mtStart */ .q.mtStart) {
-          throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
-        }
-        if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
-          throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
-        }
+      //if (hoEditorFactory.drawTree.paintStatus === PaintState.psDesign) {
+      var sChildNode = temp.childNodes[0];
+      var eChildNode = temp.childNodes[temp.childNodes.length - 1];
+      if (!(sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j) || sChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j && sChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNodeType.mtStart */ .q.mtStart) {
+        throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
       }
+      if (!(eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j) || eChildNode instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j && eChildNode.MarkNodeType !== _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNodeType.mtEnd */ .q.mtEnd) {
+        throw new Error('经检测，病历元素“' + temp.name + '”的模板格式有问题，无法正常加载，请联系工程师进行处理。');
+      }
+      if (temp.childNodes.length > 3 && temp.childNodes[1] instanceof _MarkNode__WEBPACK_IMPORTED_MODULE_45__/* .MarkNode */ .j) {
+        temp.childNodes.splice(1, 1);
+      }
+      //}
       if (temp.childNodes[1] instanceof _TableFormula__WEBPACK_IMPORTED_MODULE_53__/* .TableFormula */ .N) {
         return temp;
       }
@@ -74236,6 +74225,14 @@ var inherits = __webpack_require__(11651);
 var createSuper = __webpack_require__(19593);
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__(78255);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.includes.js
+var es_array_includes = __webpack_require__(26699);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
+var es_string_includes = __webpack_require__(32023);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
+var es_array_splice = __webpack_require__(40561);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.error.cause.js
 var es_error_cause = __webpack_require__(21703);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
@@ -74553,6 +74550,10 @@ var DrawPageTable = __webpack_require__(15694);
 
 
 
+
+
+
+
 
 
 
@@ -74584,6 +74585,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
     _this._drawPageTable = dPartTable;
     // this._crossShape = null;
     _this._backImg = new createjs.Shape();
+    _this._backImg.name = "backImg";
     _this._topLine = new createjs.Shape();
     _this._bottomLine = new createjs.Shape();
     _this._leftLine = new createjs.Shape();
@@ -74835,7 +74837,7 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
         // this._crossShape.graphics.clear();
         // this._crossShape.x = 0;
         // this._crossShape.y = 0;
-        this._backImg.graphics.setStrokeStyle(1);
+        this._backImg.graphics.clear().setStrokeStyle(1);
         this._backImg.graphics.beginStroke("#000000");
         /*表格边框与边编码，角的编码是0、1、2、3 边的编码是ABCD
          * _____A______*
@@ -74895,7 +74897,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
             this._backImg.graphics.moveTo(0, this._dHeight);
             this._backImg.graphics.lineTo(this._dWidth, this._dHeight / 2);
             break;
+          case TableProperty/* ObliqueSplitLine.TwoDiagonal */.lH.TwoDiagonal:
+            this._backImg.graphics.moveTo(0, 0).lineTo(this.dWidth, this.dHeight);
+            this._backImg.graphics.moveTo(0, this.dHeight).lineTo(this.dWidth, 0);
+            break;
         }
+        this._backImg.graphics.endStroke();
       }
       // if (this._crossShape && !this.contains(this._crossShape)) {
       //   this.addChildAt(this._crossShape, 1);
@@ -75065,10 +75072,159 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       }
       this._backImg.graphics.endStroke();
     }
+  }, {
+    key: "paintCellBorders",
+    value: function paintCellBorders(newHeight, r, c) {
+      if (this._cell.cellProperty.isDrawGridlines) {
+        var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+        var x = 0.5;
+        var y = 0.5;
+        var dWidth = this._dWidth - 0.5;
+        var height = newHeight - 0.5;
+        if (r > this._drawPageTable.startRow) {
+          y = -0.5;
+          height += 0.5;
+        }
+        if (c > 0) {
+          x = -0.5;
+          dWidth = this._dWidth + 0.5;
+        }
+        this._topLine.graphics.clear();
+        this._bottomLine.graphics.clear();
+        this._leftLine.graphics.clear();
+        this._rightLine.graphics.clear();
+        var printGridLines = this._cell.cellProperty.printGridLines;
+        var gridLineDisplay = this._cell.cellProperty.gridLineDisplay;
+        var gridLinesColor = this._cell.cellProperty.gridLinesColor;
+        if (printGridLines || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+          if (gridLineDisplay[0]) {
+            //上边框
+            if (r == 0 || this.dTop == 0) {
+              this._topLine.name = "topLine";
+              this._topLine.graphics.beginStroke(gridLinesColor[0]);
+              if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle.solid */.he.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+                this._topLine.graphics.setStrokeDash([2, 2]);
+              } else {
+                this._topLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
+              }
+              this._topLine.graphics.moveTo(x, y).lineTo(x + dWidth, y);
+              this._topLine.graphics.endStroke();
+              if (!this.children.includes(this._topLine)) {
+                this.addChild(this._topLine);
+              }
+            }
+          } else {
+            if (r > 0) {
+              var topCell = this._cell.table.getMainCell(r - 1, c)[0];
+              var drawPageCells = topCell.drawCell.drawPageCells;
+              if (drawPageCells.length > 0) {
+                for (var i = 0; i < drawPageCells[drawPageCells.length - 1].children.length; i++) {
+                  var child = drawPageCells[drawPageCells.length - 1].children[i];
+                  if (child.name == "bottomLine") {
+                    drawPageCells[drawPageCells.length - 1].children.splice(i, 1);
+                  }
+                }
+              }
+            }
+          }
+          if (gridLineDisplay[1]) {
+            //下边框
+            this._bottomLine.name = "bottomLine";
+            this._bottomLine.graphics.beginStroke(gridLinesColor[1]);
+            if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle.solid */.he.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+              this._bottomLine.graphics.setStrokeDash([2, 2]);
+            } else {
+              this._bottomLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
+            }
+            this._bottomLine.graphics.moveTo(x, y + height).lineTo(x + dWidth, y + height);
+            this._bottomLine.graphics.endStroke();
+            if (!this.children.includes(this._bottomLine)) {
+              this.addChild(this._bottomLine);
+            }
+          } else {
+            if (r < this.cell.table.rowCount - 1) {
+              var bottomCell = this._cell.table.getMainCell(r + 1, c)[0];
+              var _drawPageCells = bottomCell.drawCell.drawPageCells;
+              if (_drawPageCells.length > 0) {
+                for (var _i = 0; _i < _drawPageCells[0].children.length; _i++) {
+                  var _child = _drawPageCells[0].children[_i];
+                  if (_child.name == "topLine") {
+                    _drawPageCells[0].children.splice(_i, 1);
+                  }
+                }
+              }
+            }
+          }
+          if (gridLineDisplay[2]) {
+            //左边框
+            if (c == 0) {
+              this._leftLine.name = "leftLine";
+              this._leftLine.graphics.beginStroke(gridLinesColor[2]);
+              if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle.solid */.he.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+                this._leftLine.graphics.setStrokeDash([2, 2]);
+              } else {
+                this._leftLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
+              }
+              this._leftLine.graphics.moveTo(x, y).lineTo(x, y + height);
+              this._leftLine.graphics.endStroke();
+              if (!this.children.includes(this._leftLine)) {
+                this.addChild(this._leftLine);
+              }
+            }
+          } else {
+            if (c > 0) {
+              var leftCell = this._cell.table.getMainCell(r, c - 1)[0];
+              var _drawPageCells2 = leftCell.drawCell.drawPageCells;
+              if (_drawPageCells2.length > 0) {
+                for (var _i2 = 0; _i2 < _drawPageCells2.length; _i2++) {
+                  var children = _drawPageCells2[_i2].children;
+                  for (var j = 0; j < children.length; j++) {
+                    var _child2 = children[j];
+                    if (_child2.name == "rightLine") {
+                      children.splice(j, 1);
+                    }
+                  }
+                }
+              }
+            }
+          }
+          if (gridLineDisplay[3]) {
+            //右边框
+            this._rightLine.name = "rightLine";
+            this._rightLine.graphics.beginStroke(gridLinesColor[3]);
+            if (printGridLines && this.cell.cellProperty.gridLinesStyle !== TableProperty/* GridLinesStyle.solid */.he.solid || !printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
+              this._rightLine.graphics.setStrokeDash([2, 2]);
+            } else {
+              this._rightLine.graphics.setStrokeStyle(1, 0, 0, undefined, true);
+            }
+            this._rightLine.graphics.moveTo(x + dWidth, y).lineTo(x + dWidth, y + height);
+            this._rightLine.graphics.endStroke();
+            if (!this.children.includes(this._rightLine)) {
+              this.addChild(this._rightLine);
+            }
+          } else {
+            if (c < this.cell.table.colCount - 1) {
+              var rightCell = this._cell.table.getMainCell(r, c + 1)[0];
+              var _drawPageCells3 = rightCell.drawCell.drawPageCells;
+              if (_drawPageCells3.length > 0) {
+                for (var _i3 = 0; _i3 < _drawPageCells3.length; _i3++) {
+                  var _children = _drawPageCells3[_i3].children;
+                  for (var _j = 0; _j < _children.length; _j++) {
+                    var _child3 = _children[_j];
+                    if (_child3.name == "leftLine") {
+                      _children.splice(_j, 1);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   }, {
     key: "paintCellBackground",
     value: function paintCellBackground(newHeight, r, c) {
-      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       this._backImg.x = 0;
       this._backImg.y = 0;
       // this._backImg.uncache();
@@ -75076,171 +75232,12 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
       this._backImg.graphics.beginFill(this._cell.cellProperty.backColor === '#FFFFFF' ? 'transparent' : this._cell.cellProperty.backColor);
       this._backImg.graphics.rect(1, 1, this.dWidth - 1, this.dHeight - 1);
       this._backImg.graphics.endFill();
-      // if (c + this._cell.colSpan <= this._cell.table.colCount - 1) {
-      //   const rightCell = this._cell.table.getMainCell(r, c + this._cell.colSpan)[0];
-      //   this.paintNeerByCellBorder(rightCell, this._dWidth, 0, this._dWidth, this._dHeight);
-      // }
-      // if (r + this._cell.rowSpan <= this._cell.table.rowCount - 1) {
-      //   const bottomCell = this._cell.table.getMainCell(r + this._cell.rowSpan, c)[0];
-      //   this.paintNeerByCellBorder(bottomCell, 0, this._dHeight, this._dWidth, this._dHeight);
-      // }
-      this._backImg.graphics.beginStroke(this._cell.cellProperty.gridLinesColor[0]);
-      if (this._cell.cellProperty.isDrawGridlines) {
-        if (!this._cell.cellProperty.printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
-          this._backImg.graphics.setStrokeDash([2, 2]);
-        }
-        if (this._cell.cellProperty.printGridLines || !this._cell.cellProperty.printGridLines && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPreview */.Dh.psPreview && hoEditorFactory.drawTree.paintStatus !== DrawTree/* PaintState.psPrint */.Dh.psPrint) {
-          var x = 0.5;
-          var y = 0.5;
-          var dWidth = this._dWidth - 0.5;
-          var height = newHeight - 0.5;
-          if (this.cell.cellProperty.gridLinesStyle === TableProperty/* GridLinesStyle.solid */.he.solid) {
-            this._backImg.graphics.setStrokeStyle(0.5);
-          } else {
-            this._backImg.graphics.setStrokeDash([2, 2]);
-          }
-          if (r > this._drawPageTable.startRow) {
-            y = -0.5;
-            height += 0.5;
-          }
-          if (c > 0) {
-            x = -0.5;
-            dWidth = this._dWidth + 0.5;
-          }
-          this._backImg.graphics.drawRect(x, y, dWidth, height);
-          /*
-          const gridLineDisplay = this._cell.cellProperty.gridLineDisplay;
-          const gridLinesColor = this._cell.cellProperty.gridLinesColor;
-          const colNo = this.cell.row.indexOf(this.cell);
-          const rowNo = this.cell.table.rows.indexOf(this.cell.row);
-                    if (gridLineDisplay[0]) {//上边框
-            if (rowNo == 0) {
-              this._topLine.name = "topLine";
-              this._topLine.graphics.clear().beginStroke(gridLinesColor[0]);
-              if (this.cell.cellProperty.gridLinesStyle === GridLinesStyle.solid) {
-                this._topLine.graphics.setStrokeStyle(0.5);
-              } else {
-                this._topLine.graphics.setStrokeDash([2, 2]);
-              }
-              this._topLine.graphics.moveTo(x, y).lineTo(x + dWidth, y);
-              this._topLine.graphics.endStroke();
-              if (!this.contains(this._topLine)) {
-                this.addChild(this._topLine);
-              }
-            }
-          } else {
-            if (rowNo > 0) {
-              const topCell = this._cell.table.getMainCell(rowNo - 1, colNo)[0];
-              const drawPageCells = topCell.drawCell.drawPageCells;
-              if (drawPageCells.length > 0) {
-                for (let i = 0; i < drawPageCells[drawPageCells.length - 1].children.length; i++) {
-                  const child = drawPageCells[drawPageCells.length - 1].children[i];
-                  if (child.name == "bottomLine") {
-                    drawPageCells[drawPageCells.length - 1].children.splice(i, 1);
-                  }
-                }
-              }
-            }
-          }
-          if (gridLineDisplay[1]) {//下边框
-            this._bottomLine.name = "bottomLine";
-            this._bottomLine.graphics.clear().beginStroke(gridLinesColor[1]);
-            if (this.cell.cellProperty.gridLinesStyle === GridLinesStyle.solid) {
-              this._bottomLine.graphics.setStrokeStyle(0.5);
-            } else {
-              this._bottomLine.graphics.setStrokeDash([2, 2]);
-            }
-            this._bottomLine.graphics.moveTo(x, y + height).lineTo(x + dWidth, y + height);
-            this._bottomLine.graphics.endStroke();
-            if (!this.contains(this._bottomLine)) {
-              this.addChild(this._bottomLine);
-            }
-          } else {
-            if (rowNo < this.cell.table.rowCount - 1) {
-              const bottomCell = this._cell.table.getMainCell(rowNo + 1, colNo)[0];
-              const drawPageCells = bottomCell.drawCell.drawPageCells;
-              if (drawPageCells.length > 0) {
-                for (let i = 0; i < drawPageCells[0].children.length; i++) {
-                  const child = drawPageCells[0].children[i];
-                  if (child.name == "topLine") {
-                    drawPageCells[0].children.splice(i, 1);
-                  }
-                }
-              }
-            }
-          }
-          if (gridLineDisplay[2]) {//左边框
-            if (colNo == 0) {
-              this._leftLine.name = "leftLine";
-              this._leftLine.graphics.clear().beginStroke(gridLinesColor[2]);
-              if (this.cell.cellProperty.gridLinesStyle === GridLinesStyle.solid) {
-                this._leftLine.graphics.setStrokeStyle(0.5);
-              } else {
-                this._leftLine.graphics.setStrokeDash([2, 2]);
-              }
-              this._leftLine.graphics.moveTo(x, y).lineTo(x, y + height);
-              this._leftLine.graphics.endStroke();
-              if (!this.contains(this._leftLine)) {
-                this.addChild(this._leftLine);
-              }
-            }
-          } else {
-            if (colNo > 0) {
-              const leftCell = this._cell.table.getMainCell(rowNo, colNo - 1)[0];
-              const drawPageCells = leftCell.drawCell.drawPageCells;
-              if (drawPageCells.length > 0) {
-                for (let i = 0; i < drawPageCells.length; i++) {
-                  const children = drawPageCells[i].children;
-                  for (let j = 0; j < children.length; j++) {
-                    const child = children[j];
-                    if (child.name == "rightLine") {
-                      children.splice(j, 1);
-                    }
-                  }
-                }
-              }
-            }
-          }
-          if (gridLineDisplay[3]) {//右边框
-            this._rightLine.name = "rightLine";
-            this._rightLine.graphics.clear().beginStroke(gridLinesColor[3]);
-            if (this.cell.cellProperty.gridLinesStyle === GridLinesStyle.solid) {
-              this._rightLine.graphics.setStrokeStyle(0.5);
-            } else {
-              this._rightLine.graphics.setStrokeDash([2, 2]);
-            }
-            this._rightLine.graphics.moveTo(x + dWidth, y).lineTo(x + dWidth, y + height);
-            this._rightLine.graphics.endStroke();
-            if (!this.contains(this._rightLine)) {
-              this.addChild(this._rightLine);
-            }
-          } else {
-            if (colNo < this.cell.table.colCount - 1) {
-              const rightCell = this._cell.table.getMainCell(rowNo, colNo + 1)[0];
-              const drawPageCells = rightCell.drawCell.drawPageCells;
-              if (drawPageCells.length > 0) {
-                for (let i = 0; i < drawPageCells.length; i++) {
-                  const children = drawPageCells[i].children;
-                  for (let j = 0; j < children.length; j++) {
-                    const child = children[j];
-                    if (child.name == "leftLine") {
-                      children.splice(j, 1);
-                    }
-                  }
-                }
-              }
-            }
-          }
-          */
-        }
-      }
-
-      this._backImg.graphics.endStroke();
-      if (!this.contains(this._backImg)) {
+      if (!this.children.includes(this._backImg)) {
         this.addChildAt(this._backImg, 0);
       } else {
         this.setChildIndex(this._backImg, 0);
       }
+      this.paintCellBorders(newHeight, r, c);
       if (this._cell.needPaintLineGrid()) this.paintLineGrid();
       this.setBounds(0, 0, this._dWidth, newHeight);
       // this._backImg.cache(0, 0, this._dWidth, newHeight);
@@ -75346,8 +75343,8 @@ var DrawPageCell = /*#__PURE__*/function (_DrawArea) {
             var pageTableIndex = this._cell.table.drawTable.drawPageTables.indexOf(dPageCell._drawPageTable);
             var pageCellIndex = this._cell.drawCell.drawPageCells.length - 1;
             var cellrestHeight = rowHeightArr[pageTableIndex][0];
-            for (var _i = childCount - 1; _i >= 0; _i--) {
-              var dObj = this._cell.drawCell.drawLines[_i];
+            for (var _i4 = childCount - 1; _i4 >= 0; _i4--) {
+              var dObj = this._cell.drawCell.drawLines[_i4];
               if (dObj instanceof DrawLine/* DrawLine */.a || dObj instanceof DrawPageTable/* DrawPageTable */.ox) {
                 while (pageCellIndex > 0 && cellrestHeight < dObj.dHeight) {
                   pageCellIndex -= 1;
@@ -77837,6 +77834,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
   //职称
 
   //日期位置  1放签名右侧  其它：放签名下面
+
   function DrawSignNode(hoeditfactoryID, rootPath, node, number, type, name, imgSrc, imgWidth, imgHeight, cbStyle, fingerPrintSrc, fingerPosition, attribute, customProperty, connectChar, otherProperties) {
     var _this;
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, DrawSignNode);
@@ -77858,6 +77856,7 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_title", "");
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_drawTitle", void 0);
     (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_timePosition", "0");
+    (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_assertThisInitialized_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this), "_exif", null);
     _this._number = number;
     _this._imgSrc = imgSrc;
     _this._type = type;
@@ -77891,7 +77890,11 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
       _this._drawTitle = new createjs.Text(_this.title + _this._connectChar, _this._textStyle, '#000000');
     }
     if (_this._signTime != "") {
-      _this._drawDate = new createjs.Text(_this.signTime.substring(0, 16), _this._textStyle, '#000000');
+      if (_this.attribute === 4) {
+        _this._drawDate = new createjs.Text(_this.signTime, _this._textStyle, '#000000');
+      } else {
+        _this._drawDate = new createjs.Text(_this.signTime.substring(0, 16), _this._textStyle, '#000000');
+      }
     }
     //this._textStyle = cbStyle.;
     var hoeditfactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(hoeditfactoryID);
@@ -78394,106 +78397,109 @@ var DrawSignNode = /*#__PURE__*/function (_DrawCombineNode) {
           var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(drawNode.node.hoEditorFactoryID);
           hoEditorFactory.loadImageCount++;
           image.onload = function () {
-            var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
-            var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
-            // 处理宽高和实际宽高相反的问题  --- 2.0.66版本问题 --2.0.68后版本临时处理  再过几个版本后可以删掉
-            var node = _this3.node;
-            var nodeImageWidth = node.imgWidth;
-            var nodeImageHeight = node.imgHeight;
-            if (image.naturalWidth > image.naturalHeight && nodeImageWidth < nodeImageHeight || image.naturalWidth < image.naturalHeight && node.imgWidth > node.imgHeight) {
-              node.imgWidth = nodeImageHeight;
-              node.imgHeight = nodeImageWidth;
-            }
-            var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
-            if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
-              var cellWidth = node.parentNode.drawCell.dWidth;
-              if (width > cellWidth - 5) {
-                drawNode.dHeight = (cellWidth - 5) * hoEditorFactory.signHeight / width;
-                width = cellWidth - 5;
+            var handleOrientation = function handleOrientation() {
+              var hitWidth = image.naturalWidth !== 0 ? image.naturalWidth : image.width;
+              var hitHeight = image.naturalHeight !== 0 ? image.naturalHeight : image.height;
+              // 处理宽高和实际宽高相反的问题  --- 2.0.66版本问题 --2.0.68后版本临时处理  再过几个版本后可以删掉
+              var node = _this3.node;
+              var nodeImageWidth = node.imgWidth;
+              var nodeImageHeight = node.imgHeight;
+              if (image.naturalWidth > image.naturalHeight && nodeImageWidth < nodeImageHeight || image.naturalWidth < image.naturalHeight && node.imgWidth > node.imgHeight) {
+                node.imgWidth = nodeImageHeight;
+                node.imgHeight = nodeImageWidth;
               }
-            }
-            drawNode.dWidth = width;
-            if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
-              drawNode.dWidth += drawNode._drawAbi02.getMeasuredWidth();
-            }
-            if (drawNode.attribute == 3 && drawNode.title != "") {
-              drawNode.dWidth += drawNode._drawTitle.getMeasuredWidth();
-              if (_this3._drawDate.getMeasuredWidth() > drawNode.dWidth) {
-                drawNode.dWidth = _this3._drawDate.getMeasuredWidth();
+              var width = hitWidth * hoEditorFactory.signHeight / image.naturalHeight; //+ this._drawText.getMeasuredWidth();
+              if (node.parentNode instanceof _editor_dom_treeNode_CellNode__WEBPACK_IMPORTED_MODULE_7__/* .CellNode */ .D) {
+                var cellWidth = node.parentNode.drawCell.dWidth;
+                if (width > cellWidth - 5) {
+                  drawNode.dHeight = (cellWidth - 5) * hoEditorFactory.signHeight / width;
+                  width = cellWidth - 5;
+                }
               }
-            }
-            if (drawNode.attribute === 4) {
-              if (drawNode.title != "") {
+              drawNode.dWidth = width;
+              if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
+                drawNode.dWidth += drawNode._drawAbi02.getMeasuredWidth();
+              }
+              if (drawNode.attribute == 3 && drawNode.title != "") {
                 drawNode.dWidth += drawNode._drawTitle.getMeasuredWidth();
+                if (_this3._drawDate.getMeasuredWidth() > drawNode.dWidth) {
+                  drawNode.dWidth = _this3._drawDate.getMeasuredWidth();
+                }
               }
-              if (_this3.signTime !== "") {
-                if (_this3.timePosition === "1") {
-                  drawNode.dWidth = drawNode.dWidth + drawNode._drawDate.getMeasuredWidth();
-                } else {
-                  drawNode.dWidth = Math.max(drawNode.dWidth, drawNode._drawDate.getMeasuredWidth());
+              if (drawNode.attribute === 4) {
+                if (drawNode.title != "") {
+                  drawNode.dWidth += drawNode._drawTitle.getMeasuredWidth();
+                }
+                if (_this3.signTime !== "") {
+                  if (_this3.timePosition === "1") {
+                    drawNode.dWidth = drawNode.dWidth + drawNode._drawDate.getMeasuredWidth();
+                  } else {
+                    drawNode.dWidth = Math.max(drawNode.dWidth, drawNode._drawDate.getMeasuredWidth());
+                  }
                 }
               }
-            }
-            if (_this3.number === 2) {
-              drawNode.dWidth += _this3._drawText ? _this3._drawText.getMeasuredWidth() : 0;
-            }
-            if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
-              bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
-            } else if (drawNode.attribute === 3 && drawNode.title !== "") {
-              bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight - 4, width / hitWidth, (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight);
-            } else if (drawNode.attribute === 4) {
-              var x = 0;
-              var y = 0;
-              var scaleY = drawNode.dHeight / hitHeight;
-              if (drawNode.title !== "") {
-                x = drawNode._drawTitle.getMeasuredWidth();
-              } else {
-                x = 0;
+              if (_this3.number === 2) {
+                drawNode.dWidth += _this3._drawText ? _this3._drawText.getMeasuredWidth() : 0;
               }
-              if (_this3.signTime === "") {
-                y = -drawNode.dHeight + 5;
-                scaleY = drawNode.dHeight / hitHeight;
-              } else {
-                if (_this3.timePosition === "1") {
+              if (drawNode.attribute === 2 && drawNode.abi02 !== "") {
+                bitmap.setTransform(drawNode._drawAbi02.getMeasuredWidth(), -drawNode.dHeight + 2, width / hitWidth, drawNode.dHeight / hitHeight);
+              } else if (drawNode.attribute === 3 && drawNode.title !== "") {
+                bitmap.setTransform(drawNode._drawTitle.getMeasuredWidth(), -drawNode.dHeight - 4, width / hitWidth, (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight);
+              } else if (drawNode.attribute === 4) {
+                var x = 0;
+                var y = 0;
+                var scaleY = drawNode.dHeight / hitHeight;
+                if (drawNode.title !== "") {
+                  x = drawNode._drawTitle.getMeasuredWidth();
+                } else {
+                  x = 0;
+                }
+                if (_this3.signTime === "") {
                   y = -drawNode.dHeight + 5;
                   scaleY = drawNode.dHeight / hitHeight;
                 } else {
-                  y = -drawNode.dHeight - 4;
-                  scaleY = (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight;
+                  if (_this3.timePosition === "1") {
+                    y = -drawNode.dHeight + 5;
+                    scaleY = drawNode.dHeight / hitHeight;
+                  } else {
+                    y = -drawNode.dHeight - 4;
+                    scaleY = (drawNode.dHeight - drawNode._drawDate.getMeasuredHeight() - 2) / hitHeight;
+                  }
                 }
-              }
-              bitmap.setTransform(x, y, width / hitWidth, scaleY);
-            } else {
-              bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
-            }
-            var hitArea = new createjs.Shape();
-            hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
-            bitmap.hitArea = hitArea;
-            // if (this.attribute !== 4) {
-            //     if (this.imgSrc.indexOf('data:image/') != -1 && this.imgSrc.indexOf('data:image/png') == -1) {
-            //         const canvas = document.createElement('canvas');
-            //         canvas.width = image.naturalWidth;
-            //         canvas.height = image.naturalHeight;
-            //         const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
-            //         ctx.fillStyle = '#FFFFFF';
-            //         ctx.fillRect(0, 0, image.naturalWidth, image.naturalHeight);
-            //         ctx.drawImage(image, 0, 0, image.naturalWidth, image.naturalHeight);
-            //         (this.node as SignNode).imgSrc = canvas.toDataURL('image/png');
-            //     }
-            // }
-            var dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
-            if (dArea) {
-              var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
-              if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
-                hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
+                bitmap.setTransform(x, y, width / hitWidth, scaleY);
               } else {
-                if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
+                bitmap.setTransform(0, -drawNode.dHeight, width / hitWidth, drawNode.dHeight / hitHeight);
+              }
+              var hitArea = new createjs.Shape();
+              hitArea.graphics.beginFill('#000').drawRect(0, 0, drawNode.dWidth, drawNode.dHeight); //这里是图片大小
+              bitmap.hitArea = hitArea;
+              var dArea = hoEditorFactory.drawPageTree.getMainRootArea(drawNode);
+              if (dArea) {
+                var atype = hoEditorFactory.subDocManger.getHeaderFooterType(_this3.node.getNodePath());
+                if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftHead */ .pi.hftHead && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawHeader) {
                   hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
+                } else {
+                  if (atype === _editor_SubDocManger__WEBPACK_IMPORTED_MODULE_9__/* .HeaderFooterType.hftFoot */ .pi.hftFoot && dArea != hoEditorFactory.drawTree.drawPages[dArea.index].drawFooter) {
+                    hoEditorFactory.subDocManger.copySubDocToPages(dArea, dArea.index, atype);
+                  }
                 }
+                hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
+              }
+              hoEditorFactory.loadImageCount--;
+            };
+            if (_this3.imgSrc.includes("data:image/") || _this3.imgSrc.includes(".png")) {
+              handleOrientation();
+            } else {
+              if (!_this3._exif) {
+                _this3._exif = __webpack_require__(29794);
+              }
+              if (_this3._exif) {
+                _this3._exif.getData(image, function (exifdata) {
+                  image.exifdata = exifdata;
+                  handleOrientation();
+                });
               }
-              hoEditorFactory.drawPageTree.updateDrawPage(dArea.index);
             }
-            hoEditorFactory.loadImageCount--;
           };
           image.onerror = function () {
             return hoEditorFactory.loadImageCount--;
@@ -89466,13 +89472,13 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 // }
                 //if(nodes.length == 0) return;
                 if (!(hoEditorFactory.drawTree.paintStatus !== _draw_drawTree_DrawTree__WEBPACK_IMPORTED_MODULE_17__/* .PaintState.psDesign */ .Dh.psDesign && !this._isForceDelete)) {
-                  _context2.next = 38;
+                  _context2.next = 41;
                   break;
                 }
                 n = 0;
               case 14:
                 if (!(n < nodes.length)) {
-                  _context2.next = 37;
+                  _context2.next = 40;
                   break;
                 }
                 node = nodes[n]; // if (node instanceof MarkNode && node.parentNode instanceof TextInputFieldNode && node.MarkNodeType === 1 && !node.parentNode.isAllowDelete) {
@@ -89481,11 +89487,11 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 //   return;
                 // }
                 if (!(node instanceof _dom_treeNode_ControlNode__WEBPACK_IMPORTED_MODULE_30__/* .ControlNode */ .w || node instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re)) {
-                  _context2.next = 26;
+                  _context2.next = 27;
                   break;
                 }
                 if (node.isAllowDelete) {
-                  _context2.next = 26;
+                  _context2.next = 27;
                   break;
                 }
                 tip = "";
@@ -89501,37 +89507,40 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 if (node instanceof _dom_treeNode_DownListNode__WEBPACK_IMPORTED_MODULE_33__/* .DownListNode */ .yF) {
                   tip = "下拉列表";
                 }
+                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].destroy */ .Z.destroy();
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn(tip + "元素已设置为不允许删除。请先右键元素属性设置成允许删除,再进行删除操作。");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 26:
+              case 27:
                 if (!(node instanceof _dom_treeNode_TableFormula__WEBPACK_IMPORTED_MODULE_37__/* .TableFormula */ .N)) {
-                  _context2.next = 30;
+                  _context2.next = 32;
                   break;
                 }
+                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].destroy */ .Z.destroy();
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn("不允许删除表格计算公式");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 30:
+              case 32:
                 if (!(node instanceof _dom_treeNode_SignNode__WEBPACK_IMPORTED_MODULE_35__/* .SignNode */ .N && node.isTemplate && node.number === 0)) {
-                  _context2.next = 34;
+                  _context2.next = 37;
                   break;
                 }
+                ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].destroy */ .Z.destroy();
                 ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_40__/* ["default"].warn */ .Z.warn("该签名元素不允许删除！");
                 this._isError = true;
                 return _context2.abrupt("return");
-              case 34:
+              case 37:
                 n++;
                 _context2.next = 14;
                 break;
-              case 37:
+              case 40:
                 if (nodes.length === 1 && nodes[0] instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && !nodes[0].isAllowDelete && nodes[0].childNodes[1] instanceof _dom_treeNode_MarkNode__WEBPACK_IMPORTED_MODULE_23__/* .MarkNode */ .j) {
                   hoEditorFactory.docTree.curDomRange.setSamePath(this._endPath);
                 }
-              case 38:
+              case 41:
                 pnode = (_currRange$npEnd$node = currRange.npEnd.node) === null || _currRange$npEnd$node === void 0 ? void 0 : _currRange$npEnd$node.parentNode;
                 if (!(pnode && pnode instanceof _dom_treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_22__/* .TextInputFieldNode */ .re && currRange.npEnd.path != hoEditorFactory.docTree.getNodeLastPath(pnode))) {
-                  _context2.next = 44;
+                  _context2.next = 47;
                   break;
                 }
                 //判断当前TextInputField是否可编辑
@@ -89543,19 +89552,19 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   // this._undo.commit();
                 });
                 if (_res[0]) {
-                  _context2.next = 44;
+                  _context2.next = 47;
                   break;
                 }
                 return _context2.abrupt("return");
-              case 44:
+              case 47:
                 changeEvent = new _events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_16__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_14__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, currRange.startPath, ""); //FIXME:deleteRange函数完成后调用这个
                 // hoEditorFactory.docTree.deleteRange(arange.startPath, arange.endPath);
                 if (currRange.npStart.node && currRange.npEnd.node) {
-                  _context2.next = 47;
+                  _context2.next = 50;
                   break;
                 }
                 throw _events_Exception__WEBPACK_IMPORTED_MODULE_24__/* .Exception.NodeNotFound */ .P.NodeNotFound();
-              case 47:
+              case 50:
                 // const [startPath, endPath] = DomRange.skipStartEndTablePath(
                 //   this._hoEditorFactory,
                 //   currRange.startPath,
@@ -89567,17 +89576,17 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                 changeEvent.oldDrawTreeLines = new _draw_SelectRange__WEBPACK_IMPORTED_MODULE_27__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(startPath, endPath);
                 res = this.deleteRange(currRange.endPath, currRange.startPath);
                 if (!(res == 1)) {
-                  _context2.next = 59;
+                  _context2.next = 62;
                   break;
                 }
                 changeEvent.beforeChangePath = startPath;
                 changeEvent.afterChangePath = this._tmp.start;
-                _context2.next = 57;
+                _context2.next = 60;
                 return hoEditorFactory.docTree.change(changeEvent);
-              case 57:
+              case 60:
                 cgEvent = new _events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_20__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _dom_DomRange__WEBPACK_IMPORTED_MODULE_18__/* .DomRange */ .a(this._hoEditorFactoryID, this._tmp.start, this._tmp.start));
                 hoEditorFactory.docTree.selectChange(cgEvent);
-              case 59:
+              case 62:
                 hoEditorFactory.docTree.curDomRange.setSamePath(this._tmp.start);
                 hoEditorFactory.drawTree.moveCaretToPath(this._tmp.start);
                 aNode = currRange.npStart.node;
@@ -89585,12 +89594,12 @@ var NodesDeleteUndoUnit = /*#__PURE__*/function () {
                   pnode = aNode.parentNode;
                 }
                 if (!(aNode && pnode)) {
-                  _context2.next = 66;
+                  _context2.next = 69;
                   break;
                 }
-                _context2.next = 66;
+                _context2.next = 69;
                 return this.ParentRepaint(pnode);
-              case 66:
+              case 69:
               case "end":
                 return _context2.stop();
             }
@@ -90961,20 +90970,26 @@ var TableInsertUndoUnit = /*#__PURE__*/function (_NodeInsertUndoUnit) {
     key: "undo",
     value: function undo() {
       var hoEditorFactory = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID);
+      if (this.prevPara !== null) {
+        var ppParaNode = this.prevPara.previousLeaf();
+        if (ppParaNode) {
+          this.strBeforePath = hoEditorFactory.docTree.getNodeLastPath(ppParaNode);
+        }
+      }
       var changeEvent = new _editor_events_NodeChangeEvent__WEBPACK_IMPORTED_MODULE_8__/* .NodeChangeEvent */ .G(this._hoEditorFactoryID, _editor_dom_DocTree__WEBPACK_IMPORTED_MODULE_4__/* .DocAction.daUndoInsert */ .gk.daUndoInsert, this.strBeforePath, "");
       changeEvent.oldEndPath = this.strAfterPath;
       changeEvent.oldDrawTreeLines = new _editor_draw_SelectRange__WEBPACK_IMPORTED_MODULE_7__/* .SelectRange */ .E(this._hoEditorFactoryID).getRangeDrawTreeLines(this.strBeforePath, this.strAfterPath);
       changeEvent.afterChangePath = this.strBeforePath;
       hoEditorFactory.docTree.deleteNode(this.afterPara);
       hoEditorFactory.docTree.deleteNode(this.node);
-      //hoEditorFactory.docTree.curDomRange.setSamePath(
-      //   changeEvent.afterChangePath
-      // );
       if (this.prevPara) {
         hoEditorFactory.docTree.deleteNode(this.prevPara);
       }
+      changeEvent.repaintImmediate = true;
       hoEditorFactory.docTree.change(changeEvent);
-      //hoEditorFactory.docTree.change(changeEvent);
+      while (!this._undo.atBottom()) {
+        this._undo.undo();
+      }
       var cgEvent = new _editor_events_SelectionChangeEvent__WEBPACK_IMPORTED_MODULE_9__/* .SelectionChangeEvent */ .r(hoEditorFactory.docTree.curDomRange, new _editor_dom_DomRange__WEBPACK_IMPORTED_MODULE_5__/* .DomRange */ .a(this._hoEditorFactoryID, this.strBeforePath, this.strBeforePath));
       hoEditorFactory.docTree.selectChange(cgEvent);
       hoEditorFactory.docTree.curDomRange.setSamePath(this.strBeforePath);
@@ -90994,6 +91009,9 @@ var TableInsertUndoUnit = /*#__PURE__*/function (_NodeInsertUndoUnit) {
       var paraNode;
       if (np.node instanceof _editor_dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_6__/* .ParagraphNode */ .C) {
         paraNode = np.node;
+        if (path !== paraNode.rootPath + "/0") {
+          this.prevPara = paraNode;
+        }
       } else {
         paraNode = new _editor_dom_treeNode_ParagraphNode__WEBPACK_IMPORTED_MODULE_6__/* .ParagraphNode */ .C(this._hoEditorFactoryID, np.roots, this._pnode, _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_10__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).docTree.curParaNo);
         // this._undo.begin();
@@ -93834,6 +93852,1094 @@ __webpack_require__(25994);
 
 /***/ }),
 
+/***/ 29794:
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;__webpack_require__(74916);
+__webpack_require__(4723);
+__webpack_require__(15306);
+__webpack_require__(75505);
+__webpack_require__(87714);
+__webpack_require__(82801);
+__webpack_require__(1174);
+__webpack_require__(18264);
+__webpack_require__(39575);
+__webpack_require__(41539);
+__webpack_require__(66992);
+__webpack_require__(82472);
+__webpack_require__(48675);
+__webpack_require__(92990);
+__webpack_require__(18927);
+__webpack_require__(33105);
+__webpack_require__(35035);
+__webpack_require__(74345);
+__webpack_require__(7174);
+__webpack_require__(63408);
+__webpack_require__(14590);
+__webpack_require__(32846);
+__webpack_require__(44731);
+__webpack_require__(77209);
+__webpack_require__(96319);
+__webpack_require__(58867);
+__webpack_require__(37789);
+__webpack_require__(33739);
+__webpack_require__(29368);
+__webpack_require__(14483);
+__webpack_require__(12056);
+__webpack_require__(3462);
+__webpack_require__(30678);
+__webpack_require__(27462);
+__webpack_require__(33824);
+__webpack_require__(55021);
+__webpack_require__(12974);
+__webpack_require__(15016);
+__webpack_require__(77601);
+__webpack_require__(9653);
+(function () {
+  var debug = false;
+  var root = this;
+  var EXIF = function EXIF(obj) {
+    if (obj instanceof EXIF) return obj;
+    if (!(this instanceof EXIF)) return new EXIF(obj);
+    this.EXIFwrapped = obj;
+  };
+  if (true) {
+    if ( true && module.exports) {
+      exports = module.exports = EXIF;
+    }
+    exports.EXIF = EXIF;
+  } else {}
+  var ExifTags = EXIF.Tags = {
+    // version tags
+    0x9000: 'ExifVersion',
+    // EXIF version
+    0xa000: 'FlashpixVersion',
+    // Flashpix format version
+
+    // colorspace tags
+    0xa001: 'ColorSpace',
+    // Color space information tag
+
+    // image configuration
+    0xa002: 'PixelXDimension',
+    // Valid width of meaningful image
+    0xa003: 'PixelYDimension',
+    // Valid height of meaningful image
+    0x9101: 'ComponentsConfiguration',
+    // Information about channels
+    0x9102: 'CompressedBitsPerPixel',
+    // Compressed bits per pixel
+
+    // user information
+    0x927c: 'MakerNote',
+    // Any desired information written by the manufacturer
+    0x9286: 'UserComment',
+    // Comments by user
+
+    // related file
+    0xa004: 'RelatedSoundFile',
+    // Name of related sound file
+
+    // date and time
+    0x9003: 'DateTimeOriginal',
+    // Date and time when the original image was generated
+    0x9004: 'DateTimeDigitized',
+    // Date and time when the image was stored digitally
+    0x9290: 'SubsecTime',
+    // Fractions of seconds for DateTime
+    0x9291: 'SubsecTimeOriginal',
+    // Fractions of seconds for DateTimeOriginal
+    0x9292: 'SubsecTimeDigitized',
+    // Fractions of seconds for DateTimeDigitized
+
+    // picture-taking conditions
+    0x829a: 'ExposureTime',
+    // Exposure time (in seconds)
+    0x829d: 'FNumber',
+    // F number
+    0x8822: 'ExposureProgram',
+    // Exposure program
+    0x8824: 'SpectralSensitivity',
+    // Spectral sensitivity
+    0x8827: 'ISOSpeedRatings',
+    // ISO speed rating
+    0x8828: 'OECF',
+    // Optoelectric conversion factor
+    0x9201: 'ShutterSpeedValue',
+    // Shutter speed
+    0x9202: 'ApertureValue',
+    // Lens aperture
+    0x9203: 'BrightnessValue',
+    // Value of brightness
+    0x9204: 'ExposureBias',
+    // Exposure bias
+    0x9205: 'MaxApertureValue',
+    // Smallest F number of lens
+    0x9206: 'SubjectDistance',
+    // Distance to subject in meters
+    0x9207: 'MeteringMode',
+    // Metering mode
+    0x9208: 'LightSource',
+    // Kind of light source
+    0x9209: 'Flash',
+    // Flash status
+    0x9214: 'SubjectArea',
+    // Location and area of main subject
+    0x920a: 'FocalLength',
+    // Focal length of the lens in mm
+    0xa20b: 'FlashEnergy',
+    // Strobe energy in BCPS
+    0xa20c: 'SpatialFrequencyResponse',
+    //
+    0xa20e: 'FocalPlaneXResolution',
+    // Number of pixels in width direction per FocalPlaneResolutionUnit
+    0xa20f: 'FocalPlaneYResolution',
+    // Number of pixels in height direction per FocalPlaneResolutionUnit
+    0xa210: 'FocalPlaneResolutionUnit',
+    // Unit for measuring FocalPlaneXResolution and FocalPlaneYResolution
+    0xa214: 'SubjectLocation',
+    // Location of subject in image
+    0xa215: 'ExposureIndex',
+    // Exposure index selected on camera
+    0xa217: 'SensingMethod',
+    // Image sensor type
+    0xa300: 'FileSource',
+    // Image source (3 == DSC)
+    0xa301: 'SceneType',
+    // Scene type (1 == directly photographed)
+    0xa302: 'CFAPattern',
+    // Color filter array geometric pattern
+    0xa401: 'CustomRendered',
+    // Special processing
+    0xa402: 'ExposureMode',
+    // Exposure mode
+    0xa403: 'WhiteBalance',
+    // 1 = auto white balance, 2 = manual
+    0xa404: 'DigitalZoomRation',
+    // Digital zoom ratio
+    0xa405: 'FocalLengthIn35mmFilm',
+    // Equivalent foacl length assuming 35mm film camera (in mm)
+    0xa406: 'SceneCaptureType',
+    // Type of scene
+    0xa407: 'GainControl',
+    // Degree of overall image gain adjustment
+    0xa408: 'Contrast',
+    // Direction of contrast processing applied by camera
+    0xa409: 'Saturation',
+    // Direction of saturation processing applied by camera
+    0xa40a: 'Sharpness',
+    // Direction of sharpness processing applied by camera
+    0xa40b: 'DeviceSettingDescription',
+    //
+    0xa40c: 'SubjectDistanceRange',
+    // Distance to subject
+
+    // other tags
+    0xa005: 'InteroperabilityIFDPointer',
+    0xa420: 'ImageUniqueID' // Identifier assigned uniquely to each image
+  };
+
+  var TiffTags = EXIF.TiffTags = {
+    0x0100: 'ImageWidth',
+    0x0101: 'ImageHeight',
+    0x8769: 'ExifIFDPointer',
+    0x8825: 'GPSInfoIFDPointer',
+    0xa005: 'InteroperabilityIFDPointer',
+    0x0102: 'BitsPerSample',
+    0x0103: 'Compression',
+    0x0106: 'PhotometricInterpretation',
+    0x0112: 'Orientation',
+    0x0115: 'SamplesPerPixel',
+    0x011c: 'PlanarConfiguration',
+    0x0212: 'YCbCrSubSampling',
+    0x0213: 'YCbCrPositioning',
+    0x011a: 'XResolution',
+    0x011b: 'YResolution',
+    0x0128: 'ResolutionUnit',
+    0x0111: 'StripOffsets',
+    0x0116: 'RowsPerStrip',
+    0x0117: 'StripByteCounts',
+    0x0201: 'JPEGInterchangeFormat',
+    0x0202: 'JPEGInterchangeFormatLength',
+    0x012d: 'TransferFunction',
+    0x013e: 'WhitePoint',
+    0x013f: 'PrimaryChromaticities',
+    0x0211: 'YCbCrCoefficients',
+    0x0214: 'ReferenceBlackWhite',
+    0x0132: 'DateTime',
+    0x010e: 'ImageDescription',
+    0x010f: 'Make',
+    0x0110: 'Model',
+    0x0131: 'Software',
+    0x013b: 'Artist',
+    0x8298: 'Copyright'
+  };
+  var GPSTags = EXIF.GPSTags = {
+    0x0000: 'GPSVersionID',
+    0x0001: 'GPSLatitudeRef',
+    0x0002: 'GPSLatitude',
+    0x0003: 'GPSLongitudeRef',
+    0x0004: 'GPSLongitude',
+    0x0005: 'GPSAltitudeRef',
+    0x0006: 'GPSAltitude',
+    0x0007: 'GPSTimeStamp',
+    0x0008: 'GPSSatellites',
+    0x0009: 'GPSStatus',
+    0x000a: 'GPSMeasureMode',
+    0x000b: 'GPSDOP',
+    0x000c: 'GPSSpeedRef',
+    0x000d: 'GPSSpeed',
+    0x000e: 'GPSTrackRef',
+    0x000f: 'GPSTrack',
+    0x0010: 'GPSImgDirectionRef',
+    0x0011: 'GPSImgDirection',
+    0x0012: 'GPSMapDatum',
+    0x0013: 'GPSDestLatitudeRef',
+    0x0014: 'GPSDestLatitude',
+    0x0015: 'GPSDestLongitudeRef',
+    0x0016: 'GPSDestLongitude',
+    0x0017: 'GPSDestBearingRef',
+    0x0018: 'GPSDestBearing',
+    0x0019: 'GPSDestDistanceRef',
+    0x001a: 'GPSDestDistance',
+    0x001b: 'GPSProcessingMethod',
+    0x001c: 'GPSAreaInformation',
+    0x001d: 'GPSDateStamp',
+    0x001e: 'GPSDifferential'
+  };
+
+  // EXIF 2.3 Spec
+  var IFD1Tags = EXIF.IFD1Tags = {
+    0x0100: 'ImageWidth',
+    0x0101: 'ImageHeight',
+    0x0102: 'BitsPerSample',
+    0x0103: 'Compression',
+    0x0106: 'PhotometricInterpretation',
+    0x0111: 'StripOffsets',
+    0x0112: 'Orientation',
+    0x0115: 'SamplesPerPixel',
+    0x0116: 'RowsPerStrip',
+    0x0117: 'StripByteCounts',
+    0x011a: 'XResolution',
+    0x011b: 'YResolution',
+    0x011c: 'PlanarConfiguration',
+    0x0128: 'ResolutionUnit',
+    0x0201: 'JpegIFOffset',
+    // When image format is JPEG, this value show offset to JPEG data stored.(aka "ThumbnailOffset" or "JPEGInterchangeFormat")
+    0x0202: 'JpegIFByteCount',
+    // When image format is JPEG, this value shows data size of JPEG image (aka "ThumbnailLength" or "JPEGInterchangeFormatLength")
+    0x0211: 'YCbCrCoefficients',
+    0x0212: 'YCbCrSubSampling',
+    0x0213: 'YCbCrPositioning',
+    0x0214: 'ReferenceBlackWhite'
+  };
+  var StringValues = EXIF.StringValues = {
+    ExposureProgram: {
+      0: 'Not defined',
+      1: 'Manual',
+      2: 'Normal program',
+      3: 'Aperture priority',
+      4: 'Shutter priority',
+      5: 'Creative program',
+      6: 'Action program',
+      7: 'Portrait mode',
+      8: 'Landscape mode'
+    },
+    MeteringMode: {
+      0: 'Unknown',
+      1: 'Average',
+      2: 'CenterWeightedAverage',
+      3: 'Spot',
+      4: 'MultiSpot',
+      5: 'Pattern',
+      6: 'Partial',
+      255: 'Other'
+    },
+    LightSource: {
+      0: 'Unknown',
+      1: 'Daylight',
+      2: 'Fluorescent',
+      3: 'Tungsten (incandescent light)',
+      4: 'Flash',
+      9: 'Fine weather',
+      10: 'Cloudy weather',
+      11: 'Shade',
+      12: 'Daylight fluorescent (D 5700 - 7100K)',
+      13: 'Day white fluorescent (N 4600 - 5400K)',
+      14: 'Cool white fluorescent (W 3900 - 4500K)',
+      15: 'White fluorescent (WW 3200 - 3700K)',
+      17: 'Standard light A',
+      18: 'Standard light B',
+      19: 'Standard light C',
+      20: 'D55',
+      21: 'D65',
+      22: 'D75',
+      23: 'D50',
+      24: 'ISO studio tungsten',
+      255: 'Other'
+    },
+    Flash: {
+      0x0000: 'Flash did not fire',
+      0x0001: 'Flash fired',
+      0x0005: 'Strobe return light not detected',
+      0x0007: 'Strobe return light detected',
+      0x0009: 'Flash fired, compulsory flash mode',
+      0x000d: 'Flash fired, compulsory flash mode, return light not detected',
+      0x000f: 'Flash fired, compulsory flash mode, return light detected',
+      0x0010: 'Flash did not fire, compulsory flash mode',
+      0x0018: 'Flash did not fire, auto mode',
+      0x0019: 'Flash fired, auto mode',
+      0x001d: 'Flash fired, auto mode, return light not detected',
+      0x001f: 'Flash fired, auto mode, return light detected',
+      0x0020: 'No flash function',
+      0x0041: 'Flash fired, red-eye reduction mode',
+      0x0045: 'Flash fired, red-eye reduction mode, return light not detected',
+      0x0047: 'Flash fired, red-eye reduction mode, return light detected',
+      0x0049: 'Flash fired, compulsory flash mode, red-eye reduction mode',
+      0x004d: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected',
+      0x004f: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light detected',
+      0x0059: 'Flash fired, auto mode, red-eye reduction mode',
+      0x005d: 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
+      0x005f: 'Flash fired, auto mode, return light detected, red-eye reduction mode'
+    },
+    SensingMethod: {
+      1: 'Not defined',
+      2: 'One-chip color area sensor',
+      3: 'Two-chip color area sensor',
+      4: 'Three-chip color area sensor',
+      5: 'Color sequential area sensor',
+      7: 'Trilinear sensor',
+      8: 'Color sequential linear sensor'
+    },
+    SceneCaptureType: {
+      0: 'Standard',
+      1: 'Landscape',
+      2: 'Portrait',
+      3: 'Night scene'
+    },
+    SceneType: {
+      1: 'Directly photographed'
+    },
+    CustomRendered: {
+      0: 'Normal process',
+      1: 'Custom process'
+    },
+    WhiteBalance: {
+      0: 'Auto white balance',
+      1: 'Manual white balance'
+    },
+    GainControl: {
+      0: 'None',
+      1: 'Low gain up',
+      2: 'High gain up',
+      3: 'Low gain down',
+      4: 'High gain down'
+    },
+    Contrast: {
+      0: 'Normal',
+      1: 'Soft',
+      2: 'Hard'
+    },
+    Saturation: {
+      0: 'Normal',
+      1: 'Low saturation',
+      2: 'High saturation'
+    },
+    Sharpness: {
+      0: 'Normal',
+      1: 'Soft',
+      2: 'Hard'
+    },
+    SubjectDistanceRange: {
+      0: 'Unknown',
+      1: 'Macro',
+      2: 'Close view',
+      3: 'Distant view'
+    },
+    FileSource: {
+      3: 'DSC'
+    },
+    Components: {
+      0: '',
+      1: 'Y',
+      2: 'Cb',
+      3: 'Cr',
+      4: 'R',
+      5: 'G',
+      6: 'B'
+    }
+  };
+  function addEvent(element, event, handler) {
+    if (element.addEventListener) {
+      element.addEventListener(event, handler, false);
+    } else if (element.attachEvent) {
+      element.attachEvent('on' + event, handler);
+    }
+  }
+  function imageHasData(img) {
+    return !!img.exifdata;
+  }
+  function base64ToArrayBuffer(base64, contentType) {
+    contentType = contentType || base64.match(/^data\:([^\;]+)\;base64,/im)[1] || ''; // e.g. 'data:image/jpeg;base64,...' => 'image/jpeg'
+    base64 = base64.replace(/^data\:([^\;]+)\;base64,/gim, '');
+    var binary = atob(base64);
+    var len = binary.length;
+    var buffer = new ArrayBuffer(len);
+    var view = new Uint8Array(buffer);
+    for (var i = 0; i < len; i++) {
+      view[i] = binary.charCodeAt(i);
+    }
+    return buffer;
+  }
+  function objectURLToBlob(url, callback) {
+    var http = new XMLHttpRequest();
+    http.open('GET', url, true);
+    http.responseType = 'blob';
+    http.onload = function (e) {
+      if (this.status == 200 || this.status === 0) {
+        callback(this.response);
+      }
+    };
+    http.send();
+  }
+  function getImageData(img, callback) {
+    function handleBinaryFile(binFile) {
+      var data = findEXIFinJPEG(binFile);
+      // img.exifdata = data || {};
+      // var iptcdata = findIPTCinJPEG(binFile);
+      // img.iptcdata = iptcdata || {};
+      // if (EXIF.isXmpEnabled) {
+      //    var xmpdata= findXMPinJPEG(binFile);
+      //    img.xmpdata = xmpdata || {};
+      // }
+      if (callback) {
+        callback(data || {});
+      }
+    }
+    if (img.src) {
+      if (/^data\:/i.test(img.src)) {
+        // Data URI
+        var arrayBuffer = base64ToArrayBuffer(img.src);
+        handleBinaryFile(arrayBuffer);
+      } else if (/^blob\:/i.test(img.src)) {
+        // Object URL
+        var fileReader = new FileReader();
+        fileReader.onload = function (e) {
+          handleBinaryFile(e.target.result);
+        };
+        objectURLToBlob(img.src, function (blob) {
+          fileReader.readAsArrayBuffer(blob);
+        });
+      } else {
+        var http = new XMLHttpRequest();
+        http.onload = function () {
+          if (this.status == 200 || this.status === 0) {
+            handleBinaryFile(http.response);
+          } else {
+            throw 'Could not load image';
+          }
+          http = null;
+        };
+        http.open('GET', img.src, true);
+        http.responseType = 'arraybuffer';
+        http.send(null);
+      }
+    } else if (self.FileReader && (img instanceof self.Blob || img instanceof self.File)) {
+      var fileReader = new FileReader();
+      fileReader.onload = function (e) {
+        if (debug) {}
+        handleBinaryFile(e.target.result);
+      };
+      fileReader.readAsArrayBuffer(img);
+    }
+  }
+  function findEXIFinJPEG(file) {
+    var dataView = new DataView(file);
+    if (debug) {}
+    if (dataView.getUint8(0) != 0xff || dataView.getUint8(1) != 0xd8) {
+      if (debug) {}
+      return false; // not a valid jpeg
+    }
+
+    var offset = 2,
+      length = file.byteLength,
+      marker;
+    while (offset < length) {
+      if (dataView.getUint8(offset) != 0xff) {
+        if (debug) {}
+        return false; // not a valid marker, something is wrong
+      }
+
+      marker = dataView.getUint8(offset + 1);
+      if (debug) {}
+
+      // we could implement handling for other markers here,
+      // but we're only looking for 0xFFE1 for EXIF data
+
+      if (marker == 225) {
+        if (debug) {}
+        return readEXIFData(dataView, offset + 4, dataView.getUint16(offset + 2) - 2);
+
+        // offset += 2 + file.getShortAt(offset+2, true);
+      } else {
+        offset += 2 + dataView.getUint16(offset + 2);
+      }
+    }
+  }
+  /**
+  function findIPTCinJPEG(file) {
+      var dataView = new DataView(file);
+        if (debug) console.log("Got file of length " + file.byteLength);
+      if ((dataView.getUint8(0) != 0xFF) || (dataView.getUint8(1) != 0xD8)) {
+          if (debug) console.log("Not a valid JPEG");
+          return false; // not a valid jpeg
+      }
+        var offset = 2,
+          length = file.byteLength;
+          var isFieldSegmentStart = function(dataView, offset){
+          return (
+              dataView.getUint8(offset) === 0x38 &&
+              dataView.getUint8(offset+1) === 0x42 &&
+              dataView.getUint8(offset+2) === 0x49 &&
+              dataView.getUint8(offset+3) === 0x4D &&
+              dataView.getUint8(offset+4) === 0x04 &&
+              dataView.getUint8(offset+5) === 0x04
+          );
+      };
+        while (offset < length) {
+            if ( isFieldSegmentStart(dataView, offset )){
+                // Get the length of the name header (which is padded to an even number of bytes)
+              var nameHeaderLength = dataView.getUint8(offset+7);
+              if(nameHeaderLength % 2 !== 0) nameHeaderLength += 1;
+              // Check for pre photoshop 6 format
+              if(nameHeaderLength === 0) {
+                  // Always 4
+                  nameHeaderLength = 4;
+              }
+                var startOffset = offset + 8 + nameHeaderLength;
+              var sectionLength = dataView.getUint16(offset + 6 + nameHeaderLength);
+                return readIPTCData(file, startOffset, sectionLength);
+                break;
+            }
+              // Not the marker, continue searching
+          offset++;
+        }
+    }
+  var IptcFieldMap = {
+      0x78 : 'caption',
+      0x6E : 'credit',
+      0x19 : 'keywords',
+      0x37 : 'dateCreated',
+      0x50 : 'byline',
+      0x55 : 'bylineTitle',
+      0x7A : 'captionWriter',
+      0x69 : 'headline',
+      0x74 : 'copyright',
+      0x0F : 'category'
+  };
+  function readIPTCData(file, startOffset, sectionLength){
+      var dataView = new DataView(file);
+      var data = {};
+      var fieldValue, fieldName, dataSize, segmentType, segmentSize;
+      var segmentStartPos = startOffset;
+      while(segmentStartPos < startOffset+sectionLength) {
+          if(dataView.getUint8(segmentStartPos) === 0x1C && dataView.getUint8(segmentStartPos+1) === 0x02){
+              segmentType = dataView.getUint8(segmentStartPos+2);
+              if(segmentType in IptcFieldMap) {
+                  dataSize = dataView.getInt16(segmentStartPos+3);
+                  segmentSize = dataSize + 5;
+                  fieldName = IptcFieldMap[segmentType];
+                  fieldValue = getStringFromDB(dataView, segmentStartPos+5, dataSize);
+                  // Check if we already stored a value with this name
+                  if(data.hasOwnProperty(fieldName)) {
+                      // Value already stored with this name, create multivalue field
+                      if(data[fieldName] instanceof Array) {
+                          data[fieldName].push(fieldValue);
+                      }
+                      else {
+                          data[fieldName] = [data[fieldName], fieldValue];
+                      }
+                  }
+                  else {
+                      data[fieldName] = fieldValue;
+                  }
+              }
+            }
+          segmentStartPos++;
+      }
+      return data;
+  }
+  */
+
+  function readTags(file, tiffStart, dirStart, strings, bigEnd) {
+    var entries = file.getUint16(dirStart, !bigEnd),
+      tags = {},
+      entryOffset,
+      tag,
+      i;
+    for (i = 0; i < entries; i++) {
+      entryOffset = dirStart + i * 12 + 2;
+      tag = strings[file.getUint16(entryOffset, !bigEnd)];
+      if (!tag && debug) {}
+      if (tag) {
+        tags[tag] = readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd);
+      }
+    }
+    return tags;
+  }
+  function readTagValue(file, entryOffset, tiffStart, dirStart, bigEnd) {
+    var type = file.getUint16(entryOffset + 2, !bigEnd),
+      numValues = file.getUint32(entryOffset + 4, !bigEnd),
+      valueOffset = file.getUint32(entryOffset + 8, !bigEnd) + tiffStart,
+      offset,
+      vals,
+      val,
+      n,
+      numerator,
+      denominator;
+    switch (type) {
+      case 1: // byte, 8-bit unsigned int
+      case 7:
+        // undefined, 8-bit byte, value depending on field
+        if (numValues == 1) {
+          return file.getUint8(entryOffset + 8, !bigEnd);
+        } else {
+          offset = numValues > 4 ? valueOffset : entryOffset + 8;
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint8(offset + n);
+          }
+          return vals;
+        }
+      case 2:
+        // ascii, 8-bit byte
+        offset = numValues > 4 ? valueOffset : entryOffset + 8;
+        return getStringFromDB(file, offset, numValues - 1);
+      case 3:
+        // short, 16 bit int
+        if (numValues == 1) {
+          return file.getUint16(entryOffset + 8, !bigEnd);
+        } else {
+          offset = numValues > 2 ? valueOffset : entryOffset + 8;
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint16(offset + 2 * n, !bigEnd);
+          }
+          return vals;
+        }
+      case 4:
+        // long, 32 bit int
+        if (numValues == 1) {
+          return file.getUint32(entryOffset + 8, !bigEnd);
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getUint32(valueOffset + 4 * n, !bigEnd);
+          }
+          return vals;
+        }
+      case 5:
+        // rational = two long values, first is numerator, second is denominator
+        if (numValues == 1) {
+          numerator = file.getUint32(valueOffset, !bigEnd);
+          denominator = file.getUint32(valueOffset + 4, !bigEnd);
+          val = new Number(numerator / denominator);
+          val.numerator = numerator;
+          val.denominator = denominator;
+          return val;
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            numerator = file.getUint32(valueOffset + 8 * n, !bigEnd);
+            denominator = file.getUint32(valueOffset + 4 + 8 * n, !bigEnd);
+            vals[n] = new Number(numerator / denominator);
+            vals[n].numerator = numerator;
+            vals[n].denominator = denominator;
+          }
+          return vals;
+        }
+      case 9:
+        // slong, 32 bit signed int
+        if (numValues == 1) {
+          return file.getInt32(entryOffset + 8, !bigEnd);
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getInt32(valueOffset + 4 * n, !bigEnd);
+          }
+          return vals;
+        }
+      case 10:
+        // signed rational, two slongs, first is numerator, second is denominator
+        if (numValues == 1) {
+          return file.getInt32(valueOffset, !bigEnd) / file.getInt32(valueOffset + 4, !bigEnd);
+        } else {
+          vals = [];
+          for (n = 0; n < numValues; n++) {
+            vals[n] = file.getInt32(valueOffset + 8 * n, !bigEnd) / file.getInt32(valueOffset + 4 + 8 * n, !bigEnd);
+          }
+          return vals;
+        }
+    }
+  }
+
+  /**
+   * Given an IFD (Image File Directory) start offset
+   * returns an offset to next IFD or 0 if it's the last IFD.
+   */
+  function getNextIFDOffset(dataView, dirStart, bigEnd) {
+    //the first 2bytes means the number of directory entries contains in this IFD
+    var entries = dataView.getUint16(dirStart, !bigEnd);
+
+    // After last directory entry, there is a 4bytes of data,
+    // it means an offset to next IFD.
+    // If its value is '0x00000000', it means this is the last IFD and there is no linked IFD.
+
+    return dataView.getUint32(dirStart + 2 + entries * 12, !bigEnd); // each entry is 12 bytes long
+  }
+
+  function readThumbnailImage(dataView, tiffStart, firstIFDOffset, bigEnd) {
+    // get the IFD1 offset
+    var IFD1OffsetPointer = getNextIFDOffset(dataView, tiffStart + firstIFDOffset, bigEnd);
+    if (!IFD1OffsetPointer) {
+      // console.log('******** IFD1Offset is empty, image thumb not found ********');
+      return {};
+    } else if (IFD1OffsetPointer > dataView.byteLength) {
+      // this should not happen
+      // console.log('******** IFD1Offset is outside the bounds of the DataView ********');
+      return {};
+    }
+    // console.log('*******  thumbnail IFD offset (IFD1) is: %s', IFD1OffsetPointer);
+
+    var thumbTags = readTags(dataView, tiffStart, tiffStart + IFD1OffsetPointer, IFD1Tags, bigEnd);
+
+    // EXIF 2.3 specification for JPEG format thumbnail
+
+    // If the value of Compression(0x0103) Tag in IFD1 is '6', thumbnail image format is JPEG.
+    // Most of Exif image uses JPEG format for thumbnail. In that case, you can get offset of thumbnail
+    // by JpegIFOffset(0x0201) Tag in IFD1, size of thumbnail by JpegIFByteCount(0x0202) Tag.
+    // Data format is ordinary JPEG format, starts from 0xFFD8 and ends by 0xFFD9. It seems that
+    // JPEG format and 160x120pixels of size are recommended thumbnail format for Exif2.1 or later.
+
+    if (thumbTags['Compression']) {
+      // console.log('Thumbnail image found!');
+
+      switch (thumbTags['Compression']) {
+        case 6:
+          // console.log('Thumbnail image format is JPEG');
+          if (thumbTags.JpegIFOffset && thumbTags.JpegIFByteCount) {
+            // extract the thumbnail
+            var tOffset = tiffStart + thumbTags.JpegIFOffset;
+            var tLength = thumbTags.JpegIFByteCount;
+            thumbTags['blob'] = new Blob([new Uint8Array(dataView.buffer, tOffset, tLength)], {
+              type: 'image/jpeg'
+            });
+          }
+          break;
+        case 1:
+          break;
+        default:
+      }
+    } else if (thumbTags['PhotometricInterpretation'] == 2) {}
+    return thumbTags;
+  }
+  function getStringFromDB(buffer, start, length) {
+    var outstr = '';
+    for (var n = start; n < start + length; n++) {
+      outstr += String.fromCharCode(buffer.getUint8(n));
+    }
+    return outstr;
+  }
+  function readEXIFData(file, start) {
+    if (getStringFromDB(file, start, 4) != 'Exif') {
+      if (debug) {}
+      return false;
+    }
+    var bigEnd,
+      tags,
+      tag,
+      exifData,
+      gpsData,
+      tiffOffset = start + 6;
+
+    // test for TIFF validity and endianness
+    if (file.getUint16(tiffOffset) == 0x4949) {
+      bigEnd = false;
+    } else if (file.getUint16(tiffOffset) == 0x4d4d) {
+      bigEnd = true;
+    } else {
+      if (debug) {}
+      return false;
+    }
+    if (file.getUint16(tiffOffset + 2, !bigEnd) != 0x002a) {
+      if (debug) {}
+      return false;
+    }
+    var firstIFDOffset = file.getUint32(tiffOffset + 4, !bigEnd);
+    if (firstIFDOffset < 0x00000008) {
+      if (debug) {}
+      return false;
+    }
+    tags = readTags(file, tiffOffset, tiffOffset + firstIFDOffset, TiffTags, bigEnd);
+
+    /**
+    if (tags.ExifIFDPointer) {
+        exifData = readTags(file, tiffOffset, tiffOffset + tags.ExifIFDPointer, ExifTags, bigEnd);
+        console.log(exifData, "22222222222222");
+        for (tag in exifData) {
+            switch (tag) {
+                case 'LightSource':
+                case 'Flash':
+                case 'MeteringMode':
+                case 'ExposureProgram':
+                case 'SensingMethod':
+                case 'SceneCaptureType':
+                case 'SceneType':
+                case 'CustomRendered':
+                case 'WhiteBalance':
+                case 'GainControl':
+                case 'Contrast':
+                case 'Saturation':
+                case 'Sharpness':
+                case 'SubjectDistanceRange':
+                case 'FileSource':
+                    exifData[tag] = StringValues[tag][exifData[tag]];
+                    break;
+                  case 'ExifVersion':
+                case 'FlashpixVersion':
+                    exifData[tag] = String.fromCharCode(exifData[tag][0], exifData[tag][1], exifData[tag][2], exifData[tag][3]);
+                    break;
+                  case 'ComponentsConfiguration':
+                    exifData[tag] =
+                        StringValues.Components[exifData[tag][0]] +
+                        StringValues.Components[exifData[tag][1]] +
+                        StringValues.Components[exifData[tag][2]] +
+                        StringValues.Components[exifData[tag][3]];
+                    break;
+            }
+            tags[tag] = exifData[tag];
+        }
+    }
+    */
+    if (tags.GPSInfoIFDPointer) {
+      gpsData = readTags(file, tiffOffset, tiffOffset + tags.GPSInfoIFDPointer, GPSTags, bigEnd);
+      for (tag in gpsData) {
+        switch (tag) {
+          case 'GPSVersionID':
+            gpsData[tag] = gpsData[tag][0] + '.' + gpsData[tag][1] + '.' + gpsData[tag][2] + '.' + gpsData[tag][3];
+            break;
+        }
+        tags[tag] = gpsData[tag];
+      }
+    }
+
+    // extract thumbnail
+    tags['thumbnail'] = readThumbnailImage(file, tiffOffset, firstIFDOffset, bigEnd);
+    return tags;
+  }
+  /**
+  function findXMPinJPEG(file) {
+      if (!('DOMParser' in self)) {
+          // console.warn('XML parsing not supported without DOMParser');
+          return;
+      }
+      var dataView = new DataView(file);
+        if (debug) console.log('Got file of length ' + file.byteLength);
+      if (dataView.getUint8(0) != 0xff || dataView.getUint8(1) != 0xd8) {
+          if (debug) console.log('Not a valid JPEG');
+          return false; // not a valid jpeg
+      }
+        var offset = 2,
+          length = file.byteLength,
+          dom = new DOMParser();
+        while (offset < length - 4) {
+          if (getStringFromDB(dataView, offset, 4) == 'http') {
+              var startOffset = offset - 1;
+              var sectionLength = dataView.getUint16(offset - 2) - 1;
+              var xmpString = getStringFromDB(dataView, startOffset, sectionLength);
+              var xmpEndIndex = xmpString.indexOf('xmpmeta>') + 8;
+              xmpString = xmpString.substring(xmpString.indexOf('<x:xmpmeta'), xmpEndIndex);
+                var indexOfXmp = xmpString.indexOf('x:xmpmeta') + 10;
+              //Many custom written programs embed xmp/xml without any namespace. Following are some of them.
+              //Without these namespaces, XML is thought to be invalid by parsers
+              xmpString =
+                  xmpString.slice(0, indexOfXmp) +
+                  'xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/" ' +
+                  'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
+                  'xmlns:tiff="http://ns.adobe.com/tiff/1.0/" ' +
+                  'xmlns:plus="http://schemas.android.com/apk/lib/com.google.android.gms.plus" ' +
+                  'xmlns:ext="http://www.gettyimages.com/xsltExtension/1.0" ' +
+                  'xmlns:exif="http://ns.adobe.com/exif/1.0/" ' +
+                  'xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#" ' +
+                  'xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" ' +
+                  'xmlns:crs="http://ns.adobe.com/camera-raw-settings/1.0/" ' +
+                  'xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/" ' +
+                  'xmlns:Iptc4xmpExt="http://iptc.org/std/Iptc4xmpExt/2008-02-29/" ' +
+                  xmpString.slice(indexOfXmp);
+                var domDocument = dom.parseFromString(xmpString, 'text/xml');
+              return xml2Object(domDocument);
+          } else {
+              offset++;
+          }
+      }
+  }
+    function xml2json(xml) {
+      var json = {};
+        if (xml.nodeType == 1) {
+          // element node
+          if (xml.attributes.length > 0) {
+              json['@attributes'] = {};
+              for (var j = 0; j < xml.attributes.length; j++) {
+                  var attribute = xml.attributes.item(j);
+                  json['@attributes'][attribute.nodeName] = attribute.nodeValue;
+              }
+          }
+      } else if (xml.nodeType == 3) {
+          // text node
+          return xml.nodeValue;
+      }
+        // deal with children
+      if (xml.hasChildNodes()) {
+          for (var i = 0; i < xml.childNodes.length; i++) {
+              var child = xml.childNodes.item(i);
+              var nodeName = child.nodeName;
+              if (json[nodeName] == null) {
+                  json[nodeName] = xml2json(child);
+              } else {
+                  if (json[nodeName].push == null) {
+                      var old = json[nodeName];
+                      json[nodeName] = [];
+                      json[nodeName].push(old);
+                  }
+                  json[nodeName].push(xml2json(child));
+              }
+          }
+      }
+        return json;
+  }
+    function xml2Object(xml) {
+      try {
+          var obj = {};
+          if (xml.children.length > 0) {
+              for (var i = 0; i < xml.children.length; i++) {
+                  var item = xml.children.item(i);
+                  var attributes = item.attributes;
+                  for (var idx in attributes) {
+                      var itemAtt = attributes[idx];
+                      var dataKey = itemAtt.nodeName;
+                      var dataValue = itemAtt.nodeValue;
+                        if (dataKey !== undefined) {
+                          obj[dataKey] = dataValue;
+                      }
+                  }
+                  var nodeName = item.nodeName;
+                    if (typeof obj[nodeName] == 'undefined') {
+                      obj[nodeName] = xml2json(item);
+                  } else {
+                      if (typeof obj[nodeName].push == 'undefined') {
+                          var old = obj[nodeName];
+                            obj[nodeName] = [];
+                          obj[nodeName].push(old);
+                      }
+                      obj[nodeName].push(xml2json(item));
+                  }
+              }
+          } else {
+              obj = xml.textContent;
+          }
+          return obj;
+      } catch (e) {
+          console.log(e.message);
+      }
+  }
+   */
+
+  EXIF.getData = function (img, callback) {
+    if ((self.Image && img instanceof self.Image || self.HTMLImageElement && img instanceof self.HTMLImageElement) && !img.complete) return false;
+    if (!imageHasData(img)) {
+      getImageData(img, callback);
+    } else {
+      if (callback) {
+        callback.call(img);
+      }
+    }
+    return true;
+  };
+  /**
+    EXIF.enableXmp = function () {
+      EXIF.isXmpEnabled = true;
+  };
+    EXIF.disableXmp = function () {
+      EXIF.isXmpEnabled = false;
+  };
+  
+  EXIF.getTag = function (img, tag) {
+      if (!imageHasData(img)) return;
+      return img.exifdata[tag];
+  };
+    EXIF.getIptcTag = function (img, tag) {
+      if (!imageHasData(img)) return;
+      return img.iptcdata[tag];
+  };
+    EXIF.getAllTags = function (img) {
+      if (!imageHasData(img)) return {};
+      var a,
+          data = img.exifdata,
+          tags = {};
+      for (a in data) {
+          if (data.hasOwnProperty(a)) {
+              tags[a] = data[a];
+          }
+      }
+      return tags;
+  };
+    EXIF.getAllIptcTags = function (img) {
+      if (!imageHasData(img)) return {};
+      var a,
+          data = img.iptcdata,
+          tags = {};
+      for (a in data) {
+          if (data.hasOwnProperty(a)) {
+              tags[a] = data[a];
+          }
+      }
+      return tags;
+  };
+    EXIF.pretty = function (img) {
+      if (!imageHasData(img)) return '';
+      var a,
+          data = img.exifdata,
+          strPretty = '';
+      for (a in data) {
+          if (data.hasOwnProperty(a)) {
+              if (typeof data[a] == 'object') {
+                  if (data[a] instanceof Number) {
+                      strPretty += a + ' : ' + data[a] + ' [' + data[a].numerator + '/' + data[a].denominator + ']\r\n';
+                  } else {
+                      strPretty += a + ' : [' + data[a].length + ' values]\r\n';
+                  }
+              } else {
+                  strPretty += a + ' : ' + data[a] + '\r\n';
+              }
+          }
+      }
+      return strPretty;
+  };
+    EXIF.readFromBinaryFile = function (file) {
+      return findEXIFinJPEG(file);
+  };
+   */
+
+  if (true) {
+    !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function () {
+      return EXIF;
+    }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+  }
+}).call(this);
+
+/***/ }),
+
 /***/ 77937:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -98068,10 +99174,10 @@ if(image.colorSpace===color_spaces.INDEXED){var objId=this.internal.newObject();
 putStream({data:arrayBufferToBinaryString(new Uint8Array(image.palette)),objectId:objId});out("endobj");}};var putResourcesCallback=function putResourcesCallback(){var images=this.internal.collections[namespace+"images"];for(var i in images){putImage.call(this,images[i]);}};var putXObjectsDictCallback=function putXObjectsDictCallback(){var images=this.internal.collections[namespace+"images"],out=this.internal.write,image;for(var i in images){image=images[i];out("/I"+image.index,image.objectId,"0","R");}};var checkCompressValue=function checkCompressValue(value){if(value&&typeof value==="string")value=value.toUpperCase();return value in jsPDFAPI.image_compression?value:image_compression.NONE;};var initialize=function initialize(){if(!this.internal.collections[namespace+"images"]){this.internal.collections[namespace+"images"]={};this.internal.events.subscribe("putResources",putResourcesCallback);this.internal.events.subscribe("putXobjectDict",putXObjectsDictCallback);}};var getImages=function getImages(){var images=this.internal.collections[namespace+"images"];initialize.call(this);return images;};var getImageIndex=function getImageIndex(){return Object.keys(this.internal.collections[namespace+"images"]).length;};var notDefined=function notDefined(value){return typeof value==="undefined"||value===null||value.length===0;};var generateAliasFromImageData=function generateAliasFromImageData(imageData){if(typeof imageData==="string"||isArrayBufferView(imageData)){return sHashCode(imageData);}else if(isArrayBufferView(imageData.data)){return sHashCode(imageData.data);}return null;};var isImageTypeSupported=function isImageTypeSupported(type){return typeof jsPDFAPI["process"+type.toUpperCase()]==="function";};var isDOMElement=function isDOMElement(object){return (0,esm_typeof/* default */.Z)(object)==="object"&&object.nodeType===1;};var getImageDataFromElement=function getImageDataFromElement(element,format){//if element is an image which uses data url definition, just return the dataurl
 if(element.nodeName==="IMG"&&element.hasAttribute("src")){var src=""+element.getAttribute("src");//is base64 encoded dataUrl, directly process it
 if(src.indexOf("data:image/")===0){return atob(unescape(src).split("base64,").pop());}//it is probably an url, try to load it
-var tmpImageData=jsPDFAPI.loadFile(src,true);if(tmpImageData!==undefined){return tmpImageData;}}if(element.nodeName==="CANVAS"){if(element.width===0||element.height===0){throw new Error("Given canvas must have data. Canvas width: "+element.width+", height: "+element.height);}var mimeType;switch(format){case"PNG":mimeType="image/png";break;case"WEBP":mimeType="image/webp";break;case"JPEG":case"JPG":default:mimeType="image/jpeg";break;}return atob(element.toDataURL(mimeType,1.0).split("base64,").pop());}};var checkImagesForAlias=function checkImagesForAlias(alias){var images=this.internal.collections[namespace+"images"];if(images){for(var e in images){if(alias===images[e].alias){return images[e];}}}};var determineWidthAndHeight=function determineWidthAndHeight(width,height,image){if(!width&&!height){width=-96;height=-96;}if(width<0){width=-1*image.width*72/width/this.internal.scaleFactor;}if(height<0){height=-1*image.height*72/height/this.internal.scaleFactor;}if(width===0){width=height*image.width/image.height;}if(height===0){height=width*image.height/image.width;}return[width,height];};var writeImageToPDF=function writeImageToPDF(x,y,width,height,image,rotation){var dims=determineWidthAndHeight.call(this,width,height,image),coord=this.internal.getCoordinateString,vcoord=this.internal.getVerticalCoordinateString;var images=getImages.call(this);width=dims[0];height=dims[1];images[image.index]=image;if(rotation){rotation*=Math.PI/180;var c=Math.cos(rotation);var s=Math.sin(rotation);//like in pdf Reference do it 4 digits instead of 2
+var tmpImageData=jsPDFAPI.loadFile(src,true);if(tmpImageData!==undefined){return tmpImageData;}}if(element.nodeName==="CANVAS"){if(element.width===0||element.height===0){throw new Error("Given canvas must have data. Canvas width: "+element.width+", height: "+element.height);}var mimeType;switch(format){case"PNG":mimeType="image/png";break;case"WEBP":mimeType="image/webp";break;case"JPEG":case"JPG":default:mimeType="image/jpeg";break;}return atob(element.toDataURL(mimeType,1.0).split("base64,").pop());}};var checkImagesForAlias=function checkImagesForAlias(alias){var images=this.internal.collections[namespace+"images"];if(images){for(var e in images){if(alias===images[e].alias){return images[e];}}}};var determineWidthAndHeight=function determineWidthAndHeight(width,height,image){if(!width&&!height){width=-96;height=-96;}if(width<0){width=-1*image.width*72/width/this.internal.scaleFactor;}if(height<0){height=-1*image.height*72/height/this.internal.scaleFactor;}if(width===0){width=height*image.width/image.height;}if(height===0){height=width*image.height/image.width;}return[width,height];};var writeImageToPDF=function writeImageToPDF(x,y,width,height,image,rotation){var dims=determineWidthAndHeight.call(this,width,height,image),coord=this.internal.getCoordinateString,vcoord=this.internal.getVerticalCoordinateString;var images=getImages.call(this);width=dims[0];height=dims[1];images[image.index]=image;console.log(image.exifdata,'----------------------');if(image.exifdata&&image.exifdata.Orientation){rotation={6:270,8:90,5:180,7:180,2:270,4:90,1:180,3:180}[image.exifdata.Orientation];}if(rotation){rotation*=Math.PI/180;var c=Math.cos(rotation);var s=Math.sin(rotation);//like in pdf Reference do it 4 digits instead of 2
 var f4=function f4(number){return number.toFixed(4);};var rotationTransformationMatrix=[f4(c),f4(s),f4(s*-1),f4(c),0,0,"cm"];}this.internal.write("q");//Save graphics state
-if(rotation){// 自定义修改 修复图片旋转后位置错误问题 水平方向增加自身宽度 减去的 18px 来源未知   垂直方向减去自身高度
-x+=Number(coord(width))+5;y-=height;console.log(width,height,x,y);this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
+if(rotation){if(image.exifdata&&image.exifdata.Orientation){if(image.exifdata.Orientation==8||image.exifdata.Orientation==4){x+=height;y-=width-10;}else if(image.exifdata.Orientation==6||image.exifdata.Orientation==2){y-=width-10;}}else{// 自定义修改 修复图片旋转后位置错误问题 水平方向增加自身宽度 减去的 18px 来源未知   垂直方向减去自身高度
+x+=Number(coord(width))+20;y-=height;}console.log(width,height,x,y,'---------------------');this.internal.write([1,"0","0",1,coord(x),vcoord(y+height),"cm"].join(" "));//Translate
 this.internal.write(rotationTransformationMatrix.join(" "));//Rotate
 this.internal.write([coord(width),"0","0",coord(height),"0","0","cm"].join(" "));//Scale
 }else{this.internal.write([coord(width),"0","0",coord(height),coord(x),vcoord(y+height),"cm"].join(" "));//Translate and Scale
@@ -98185,9 +99291,9 @@ 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;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;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.");}return result;};/**
+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
    * @function
    * @param {string} stringData
@@ -98980,7 +100086,7 @@ 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);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);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;// 自定义修改 处理签名图片打印和普通图片打印
@@ -106826,7 +107932,8 @@ this.createjs=this.createjs||{};(function(){/**
 	 * For example, used for drawing the cache (to prevent it from simply drawing an existing cache back
 	 * into itself).
 	 * @return {Boolean}
-	 **/p.draw=function(ctx,ignoreCache){if(this.DisplayObject_draw(ctx,ignoreCache)){return true;}var img=this.image,rect=this.sourceRect;if(img.getImage){img=img.getImage();}if(!img){return true;}if(rect){// some browsers choke on out of bound values, so we'll fix them:
+	 **/p.draw=function(ctx,ignoreCache){if(this.DisplayObject_draw(ctx,ignoreCache)){return true;}var img=this.image,rect=this.sourceRect;// if (img.getImage) { img = img.getImage(); }
+if(!img){return true;}if(rect){// some browsers choke on out of bound values, so we'll fix them:
 var x1=rect.x,y1=rect.y,x2=x1+rect.width,y2=y1+rect.height,x=0,y=0,w=img.width,h=img.height;if(x1<0){x-=x1;x1=0;}if(x2>w){x2=w;}if(y1<0){y-=y1;y1=0;}if(y2>h){y2=h;}ctx.drawImage(img,x1,y1,x2-x1,y2-y1,x,y,x2-x1,y2-y1);}else{ctx.drawImage(img,0,0);}return true;};//Note, the doc sections below document using the specified APIs (from DisplayObject)  from
 //Bitmap. This is why they have no method implementations.
 /**
@@ -198444,19 +199551,19 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
 var map = {
 	"./ControlModal.vue": 77004,
-	"./barCode/BarCodes.vue": 2062,
+	"./barCode/BarCodes.vue": 75336,
 	"./colorPicker/HoColorPicker.vue": 91351,
 	"./colorPicker/HoColorPickers.vue": 84214,
 	"./commentDialog/CommentDialog.vue": 95513,
 	"./customAttributes/CustomAttributes.vue": 78869,
 	"./dataSource/DataSource.vue": 9238,
-	"./dateDialog/DateDialog.vue": 17237,
+	"./dateDialog/DateDialog.vue": 49145,
 	"./delimiter/Delimiter.vue": 31861,
 	"./expressionForm/ExpressionForm.vue": 44603,
 	"./findReplace/FindReplace.vue": 25918,
 	"./gestation/Gestation.vue": 6251,
 	"./hoprint/HoPrint.vue": 62321,
-	"./listsource/ListSource.vue": 47214,
+	"./listsource/ListSource.vue": 50921,
 	"./localHistory/LocalHistory.vue": 89206,
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
@@ -198471,14 +199578,14 @@ var map = {
 	"./selectDialog/SelectDialog.vue": 59075,
 	"./sign/Sign.vue": 28715,
 	"./table/TableCellPoper.vue": 61917,
-	"./table/TableCellProperty.vue": 61973,
+	"./table/TableCellProperty.vue": 47158,
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
 	"./table/TableFormula.vue": 66591,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 56819,
-	"./textDialog/TextDialog.vue": 49373,
+	"./textDialog/TextDialog.vue": 92675,
 	"./textDialog/TextToLabelDialog.vue": 35791,
 	"./textDialog/VerifyTip.vue": 63210,
 	"./upload/CanvasImageDialog.vue": 94116,
@@ -237833,7 +238940,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.82');
+/* harmony default export */ var version = ('3.0.84');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(36081);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -246626,14 +247733,16 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertBarcode",
-    value: function insertBarcode(operType, id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier) {
+    value: function insertBarcode(operType, id, textContent, isDisplayText, imagePath, width, height,
+    //bandDataSource: string,
+    name, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
       var startPath = _curDomRange.normalize().startPath;
       var endPath = _curDomRange.normalize().endPath;
       var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.insertBarcode */.y.insertBarcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        hoEditorFactory.docController.insertBarcode('add', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier);
+        hoEditorFactory.docController.insertBarcode('add', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
       }
     }
     /**
@@ -246647,14 +247756,14 @@ var VueController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateBarcode",
-    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier) {
+    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
       var _curDomRange = hoEditorFactory.docTree.curDomRange; //获取当前选中区域
       var startPath = _curDomRange.normalize().startPath;
       var endPath = _curDomRange.normalize().endPath;
       var changingEvent = new NodeChangingEvent/* NodeChangingEvent */.Q(DocTree/* DocAction.daInsert */.gk.daInsert, startPath, endPath, NodeChangingEvent/* OperType.updateBarcode */.y.updateBarcode);
       if (hoEditorFactory.docTree.changing(changingEvent)) {
-        HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertBarcode('update', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier);
+        HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).docController.insertBarcode('update', _curDomRange, id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
       }
     }
     /**
@@ -250023,12 +251132,12 @@ var VueController = /*#__PURE__*/function () {
                       }
                     }
                     if (!isNaN(min) && isNaN(max)) {
-                      if (nodeValue >= min) {
+                      if (nodeValue < min) {
                         verifyTipList.push(value.tip);
                       }
                     }
                     if (isNaN(min) && !isNaN(max)) {
-                      if (nodeValue <= max) {
+                      if (nodeValue > max) {
                         verifyTipList.push(value.tip);
                       }
                     }
@@ -254217,7 +255326,7 @@ var ElementController = /*#__PURE__*/function () {
 /*
  * @Author: your name
  * @Date: 2021-07-31 10:10:30
- * @LastEditTime: 2023-03-09 18:32:32
+ * @LastEditTime: 2023-07-13 10:04:37
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\externalCall\NodeController.ts
@@ -254530,9 +255639,9 @@ var NodeController = /*#__PURE__*/function () {
      */
   }, {
     key: "insertBarcode",
-    value: function insertBarcode(id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier) {
+    value: function insertBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.insertBarcode('add', id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier);
+      hoEditorFactory.vueController.insertBarcode('add', id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
     }
     /**
      * 修改条形码
@@ -254545,9 +255654,9 @@ var NodeController = /*#__PURE__*/function () {
      */
   }, {
     key: "updateBarcode",
-    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier) {
+    value: function updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier) {
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
-      hoEditorFactory.vueController.updateBarcode(id, textContent, isDisplayText, imagePath, width, height, bandDataSource, name, innerIdentifier);
+      hoEditorFactory.vueController.updateBarcode(id, textContent, isDisplayText, imagePath, width, height, name, innerIdentifier);
     }
     /**
      * 插入二维码