eoss-ui 0.5.74 → 0.5.76

package/lib/eoss-ui.common.js

@@ -620,6 +620,35 @@ var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
   return workdays;
 };
 
+/**
+ * chunkToChinese
+ * @desc 将四位数的整数转换为中文大写
+ * @param {number} chunk - 数字
+ **/
+function chunkToChinese(chunk) {
+  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+  var capitalDigits = ['', '拾', '佰', '仟'];
+
+  var result = '';
+  var digitIndex = 0;
+
+  while (chunk > 0) {
+    var digit = chunk % 10;
+    if (digit > 0) {
+      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+    } else {
+      // 当前数字是零，需要判断是否需要添加零
+      if (result.charAt(0) !== '零') {
+        result = '零' + result;
+      }
+    }
+    chunk = Math.floor(chunk / 10);
+    digitIndex++;
+  }
+
+  return result;
+}
+
 /**
  * concatenate
  * @desc 指定连接符合并文本
@@ -1815,6 +1844,31 @@ var getWeekday = function getWeekday(date) {
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
 
+/**
+ * getZoom
+ * @desc 获取缩放比
+ * @param {number} n - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
+ **/
+var getZoom = function getZoom() {
+  var ratio = 0;
+  var screen = window.screen;
+  var ua = navigator.userAgent.toLowerCase();
+  if (window.devicePixelRatio !== undefined) {
+    ratio = window.devicePixelRatio;
+  } else if (~ua.indexOf('msie')) {
+    if (screen.deviceXDPI && screen.logicalXDPI) {
+      ratio = screen.deviceXDPI / screen.logicalXDPI;
+    }
+  } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+    ratio = window.outerWidth / window.innerWidth;
+  }
+
+  if (ratio) {
+    ratio = Math.round(ratio * 100);
+  }
+
+  return ratio / 100;
+};
 /**
  * handlerUrl
  * @desc:更新url参数中的时间戳
@@ -2249,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -2557,32 +2636,53 @@ var rmbToCapital = function rmbToCapital(number) {
 
   return result;
 };
-
-// 辅助函数，将四位数的整数转换为中文大写
-function chunkToChinese(chunk) {
-  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-  var capitalDigits = ['', '拾', '佰', '仟'];
-
-  var result = '';
-  var digitIndex = 0;
-
-  while (chunk > 0) {
-    var digit = chunk % 10;
-    if (digit > 0) {
-      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+/**
+ * setScale
+ * @desc 设置缩放
+ * @param {number} width - 分辨率宽度
+ * @param {number} height - 分辨率高度
+ **/
+var setScale = function setScale() {
+  var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1920;
+  var height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1080;
+
+  var n = 1;
+  var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+  var zoom = getZoom();
+  if (isMac) {
+    n = 2;
+  } else {
+    n = 1;
+  }
+  if (zoom === 1) {
+    document.body.style.removeProperty('transform');
+    document.body.style.removeProperty('width');
+    document.body.style.removeProperty('height');
+    document.body.style.removeProperty('transform-origin');
+    return;
+  }
+  if (Math.abs(parseInt(width - window.innerWidth * zoom / n, 10)) > 15 && window.innerWidth * zoom / n !== width) {
+    var scale = 'scale(' + window.innerWidth * zoom / width / zoom + ',' + window.innerHeight * zoom / height / zoom + ')';
+    document.body.style.transform = scale;
+    document.body.style.width = width + 'px';
+    document.body.style.height = height + 'px';
+    document.body.style.transformOrigin = '0 0';
+  } else {
+    if (isMac) {
+      var _scale = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     } else {
-      // 当前数字是零，需要判断是否需要添加零
-      if (result.charAt(0) !== '零') {
-        result = '零' + result;
-      }
+      var _scale2 = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale2;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     }
-    chunk = Math.floor(chunk / 10);
-    digitIndex++;
   }
-
-  return result;
-}
-
+};
 /**
  * sendMessage
  * @desc:向iframe发送信息
@@ -3104,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,
@@ -3118,6 +3219,7 @@ var watermark = function watermark(option) {
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
   setFavicon: setFavicon,
+  setScale: setScale,
   setStorage: setStorage,
   socket: socket,
   startWith: startWith,
@@ -6707,8 +6809,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
-var mainvue_type_template_id_7b641b60_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=f80417f8&
+var mainvue_type_template_id_f80417f8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7018,11 +7120,11 @@ var mainvue_type_template_id_7b641b60_render = function () {
     1
   )
 }
-var mainvue_type_template_id_7b641b60_staticRenderFns = []
-mainvue_type_template_id_7b641b60_render._withStripped = true
+var mainvue_type_template_id_f80417f8_staticRenderFns = []
+mainvue_type_template_id_f80417f8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=f80417f8&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 var childrenvue_type_template_id_44b7ff61_render = function () {
@@ -9424,7 +9526,8 @@ var mainvue_type_script_lang_js_components, _watch;
         pageSize: 20,
         totalCount: 0
       },
-      wheres: {},
+      searchWhere: {},
+      advanceWhere: {},
       tableHeight: 'auto',
       styles: {},
       selected: null,
@@ -9438,6 +9541,9 @@ var mainvue_type_script_lang_js_components, _watch;
   },
 
   computed: {
+    wheres: function wheres() {
+      return data_table_src_mainvue_type_script_lang_js_extends({}, this.searchWhere, this.advanceWhere);
+    },
     params: function params() {
       return data_table_src_mainvue_type_script_lang_js_extends({}, this.param || {}, this.searchValue || {}, this.advanceValue || {});
     },
@@ -9451,12 +9557,14 @@ var mainvue_type_script_lang_js_components, _watch;
     theads: {
       get: function get() {
         var thead = [];
+        var addfilter = false;
         var types = this.theadData.filter(function (item) {
           return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
         }).map(function (item) {
           return item.type;
         });
         if (this.dragSort && !types.includes('sort')) {
+          addfilter = true;
           thead.push({
             type: 'sort',
             key: 'es-sort'
@@ -9470,8 +9578,12 @@ var mainvue_type_script_lang_js_components, _watch;
             fixed: 'left',
             selectable: this.selectable,
             reserveSelection: this.reserveSelection,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-checkbox'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.numbers && !types.includes('index')) {
           var index = 1;
@@ -9487,9 +9599,12 @@ var mainvue_type_script_lang_js_components, _watch;
             align: 'center',
             fixed: 'left',
             index: index,
-            filterIcon: this.filter ? 'es-icon-biao' : undefined,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-index'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.theadData.length) {
           thead = [].concat(thead, this.theadData);
@@ -10287,18 +10402,19 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('next', res);
     },
     hanleSearch: function hanleSearch(data) {
-      this.wheres = this.response !== undefined ? this.response({
+      this.searchWhere = this.response !== undefined ? this.response({
         type: 'search',
         data: JSON.parse(JSON.stringify(data))
       }) : data;
       if (this.url && this.executeSearch) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('search', this.wheres);
+      this.$emit('search', this.searchWhere);
     },
     hanleReset: function hanleReset() {
+      this.searchWhere = {};
+      this.advanceWhere = {};
       if (this.url) {
-        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset', this.params);
@@ -10307,21 +10423,20 @@ var mainvue_type_script_lang_js_components, _watch;
       var data = _ref.data,
           show = _ref.show;
 
-      var where = this.response !== undefined ? this.response({
+      this.advanceWhere = this.response !== undefined ? this.response({
         type: 'filter',
         data: JSON.parse(JSON.stringify(data))
       }) : data;
-      this.wheres = data_table_src_mainvue_type_script_lang_js_extends({}, this.wheres, where);
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('submit', { data: where, where: this.wheres, show: show });
+      this.$emit('submit', {
+        data: this.advanceWhere,
+        where: this.wheres,
+        show: show
+      });
     },
     hanleCancel: function hanleCancel() {
-      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
-      //   this.wheres = {};
-      //   this.getTableData();
-      // }
       this.$emit('cancel', this.params);
     },
     handleTabs: function handleTabs(_ref2) {
@@ -10455,8 +10570,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7b641b60_render,
-  mainvue_type_template_id_7b641b60_staticRenderFns,
+  mainvue_type_template_id_f80417f8_render,
+  mainvue_type_template_id_f80417f8_staticRenderFns,
   false,
   null,
   null,
@@ -43925,8 +44040,8 @@ flow_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_group = (flow_group_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
-var mainvue_type_template_id_74518680_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=644e2900&
+var mainvue_type_template_id_644e2900_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43952,7 +44067,7 @@ var mainvue_type_template_id_74518680_render = function () {
                     _vm.currentUserHasPresetInfoAuth) ||
                   (item.type != "splitReading" && item.type != "preset"),
                 expression:
-                  "\n      (item.type == 'splitReading' &&\n        splitReadingData &&\n        splitReadingData.length > 0) ||\n      (item.type == 'preset' && presetData && presetData.length > 0 && currentUserHasPresetInfoAuth) ||\n      (item.type != 'splitReading' && item.type != 'preset')\n    ",
+                  "\n      (item.type == 'splitReading' &&\n        splitReadingData &&\n        splitReadingData.length > 0) ||\n      (item.type == 'preset' &&\n        presetData &&\n        presetData.length > 0 &&\n        currentUserHasPresetInfoAuth) ||\n      (item.type != 'splitReading' && item.type != 'preset')\n    ",
               },
             ],
             key: index,
@@ -44122,11 +44237,11 @@ var mainvue_type_template_id_74518680_render = function () {
     2
   )
 }
-var mainvue_type_template_id_74518680_staticRenderFns = []
-mainvue_type_template_id_74518680_render._withStripped = true
+var mainvue_type_template_id_644e2900_staticRenderFns = []
+mainvue_type_template_id_644e2900_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=644e2900&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=script&lang=js&
 var flow_list_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -44219,6 +44334,9 @@ var flow_list_src_mainvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
 
 
 
@@ -44461,7 +44579,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           showOverflowTooltip: true,
           key: 'blyj',
           render: function render(h, params) {
-            return h('span', {}, params.row.doresult || params.row.handleInfo);
+            return h('span', {}, [params.row.doresult ? params.row.doresult + (params.row.handleInfo ? '&' : '') : '', h('span', { style: { color: '#A5A5A5', marginLeft: '2px' } }, params.row.handleInfo || '')]);
           }
         }, {
           label: '验签',
@@ -44580,7 +44698,7 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           key: 'blyj',
           showOverflowTooltip: true,
           render: function render(h, params) {
-            return h('span', {}, params.row.doresult || params.row.handleInfo);
+            return h('span', {}, [params.row.doresult ? params.row.doresult + (params.row.handleInfo ? '&' : '') : '', h('span', { style: { color: '#A5A5A5', marginLeft: '2px' } }, params.row.handleInfo || '')]);
           }
         }, {
           label: '验签',
@@ -45171,8 +45289,8 @@ var flow_list_src_mainvue_type_script_lang_js_components;
 
 var flow_list_src_main_component = normalizeComponent(
   packages_flow_list_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_74518680_render,
-  mainvue_type_template_id_74518680_staticRenderFns,
+  mainvue_type_template_id_644e2900_render,
+  mainvue_type_template_id_644e2900_staticRenderFns,
   false,
   null,
   null,
@@ -46340,6 +46458,8 @@ var input_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 
 
 
@@ -46572,26 +46692,34 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           }, [content]);
         }
       }
+
+      var _$attrs = this.$attrs,
+          prefix = _$attrs.prefix,
+          suffix = _$attrs.suffix,
+          prepend = _$attrs.prepend,
+          append = _$attrs.append,
+          attrs = mainvue_type_script_lang_js_objectWithoutProperties(_$attrs, ['prefix', 'suffix', 'prepend', 'append']);
+
       if (this.$slots.prefix) {
         doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));
-      } else if (this.$attrs.prefix) {
+      } else if (prefix) {
         this.renderd(doms, h, 'prefix');
         cls.push('es-input-button-prefix');
       }
       if (this.$slots.suffix) {
         doms.push(h('template', { slot: 'suffix' }, this.$slots.suffix));
-      } else if (this.$attrs.suffix) {
+      } else if (suffix) {
         this.renderd(doms, h, 'suffix');
         cls.push('es-input-button-suffix');
       }
       if (this.$slots.prepend) {
         doms.push(h('template', { slot: 'prepend' }, this.$slots.prepend));
-      } else if (this.$attrs.prepend) {
+      } else if (prepend) {
         this.renderd(doms, h, 'prepend');
       }
       if (this.$slots.append) {
         doms.push(h('template', { slot: 'append' }, this.$slots.append));
-      } else if (this.$attrs.append) {
+      } else if (append) {
         this.renderd(doms, h, 'append');
       }
       if (this.fetchSuggestions || this.url || this.data.length > 0) {
@@ -46600,7 +46728,7 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           props: {
             rules: this.rule
           },
-          attrs: input_src_mainvue_type_script_lang_js_extends({}, this.$attrs, {
+          attrs: input_src_mainvue_type_script_lang_js_extends({}, attrs, {
             fetchSuggestions: this.fetchSuggestions ? this.fetchSuggestions : this.getData,
             triggerOnFocus: this.focusShow,
             value: this.model
@@ -46618,7 +46746,7 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
         domProps: {
           value: this.model
         },
-        attrs: input_src_mainvue_type_script_lang_js_extends({}, this.$attrs),
+        attrs: input_src_mainvue_type_script_lang_js_extends({}, attrs),
         on: input_src_mainvue_type_script_lang_js_extends({}, this.$listeners),
         directives: [{
           name: 'show',
@@ -47479,8 +47607,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=249fae96&
-var mainvue_type_template_id_249fae96_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=0b26efc4&
+var mainvue_type_template_id_0b26efc4_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47512,7 +47640,10 @@ var mainvue_type_template_id_249fae96_render = function () {
                 },
               ],
               staticClass: "es-login",
-              class: { "es-simple": _vm.mode == "simple" },
+              class: {
+                "es-simple": _vm.mode == "simple",
+                "es-adaptive": !_vm.isScale,
+              },
               style: _vm.transform,
               attrs: {
                 "element-loading-text": "登录中...",
@@ -47531,24 +47662,21 @@ var mainvue_type_template_id_249fae96_render = function () {
                 "div",
                 {
                   staticClass: "es-login-main",
+                  class: {
+                    "es-switchs": _vm.switchs > 2,
+                  },
                   style: _vm.getBackground(_vm.loginMainImg),
                 },
                 [
-                  _vm.loginTitleImg
-                    ? _c("div", { staticClass: "es-login-title-image" }, [
-                        _c("img", {
-                          staticClass: "es-login-title-img",
-                          attrs: { src: _vm.loginTitleImg },
-                        }),
-                      ])
-                    : _vm._e(),
                   _vm.switchs > 1
                     ? _c(
                         "div",
                         {
                           class: {
                             "es-login-switch": _vm.switchs == 2,
-                            "es-login-switchs": _vm.switchs > 2,
+                            "es-login-switchs":
+                              _vm.switchs > 2 ||
+                              (_vm.switchs == 2 && _vm.loginTitleImg),
                           },
                         },
                         _vm._l(_vm.icons, function (item, index) {
@@ -47580,6 +47708,14 @@ var mainvue_type_template_id_249fae96_render = function () {
                         0
                       )
                     : _vm._e(),
+                  _vm.loginTitleImg
+                    ? _c("div", { staticClass: "es-login-title-image" }, [
+                        _c("img", {
+                          staticClass: "es-login-title-img",
+                          attrs: { src: _vm.loginTitleImg },
+                        }),
+                      ])
+                    : _vm._e(),
                   _c(
                     "div",
                     { staticClass: "es-login-form-box" },
@@ -47590,7 +47726,7 @@ var mainvue_type_template_id_249fae96_render = function () {
                             _c(
                               "el-form",
                               {
-                                ref: "login",
+                                ref: "login" + _vm.active,
                                 staticClass: "es-login-form",
                                 attrs: { model: _vm.formData },
                               },
@@ -47807,9 +47943,10 @@ var mainvue_type_template_id_249fae96_render = function () {
                                                       rawName: "v-show",
                                                       value:
                                                         _vm.imgCode &&
-                                                        _vm.active == 0,
+                                                        (_vm.active == "0" ||
+                                                          _vm.active == "12"),
                                                       expression:
-                                                        "imgCode && active == 0",
+                                                        "imgCode && (active == '0' || active == '12')",
                                                     },
                                                   ],
                                                   staticClass: "es-img-code",
@@ -48007,6 +48144,7 @@ var mainvue_type_template_id_249fae96_render = function () {
                                       attrs: {
                                         content: _vm.identifyingId,
                                         logo: _vm.qrimg,
+                                        auto: "",
                                       },
                                     })
                                   : _vm._e(),
@@ -48018,7 +48156,7 @@ var mainvue_type_template_id_249fae96_render = function () {
                                         _c("es-wxlogin", {
                                           attrs: {
                                             href: "data:text/css;base64,LmltcG93ZXJCb3ggLnFyY29kZSB7CiAgICB3aWR0aDogMTAwJSAhaW1wb3J0YW50OwogICAgYm94LXNpemluZzogYm9yZGVyLWJveCAhaW1wb3J0YW50OwogICAgbWFyZ2luOiAwICFpbXBvcnRhbnQ7Cn0KCi5pbXBvd2VyQm94IC5pbmZvLAouaW1wb3dlckJveCAudGl0bGUgewogICAgZGlzcGxheTogbm9uZSAhaW1wb3J0YW50Owp9",
-                                            height: "300px",
+                                            auto: "",
                                             appid: _vm.wechatAppid,
                                             scope: _vm.wechatScope,
                                             redirect_uri: _vm.redirectUri,
@@ -48039,7 +48177,7 @@ var mainvue_type_template_id_249fae96_render = function () {
                             _c(
                               "el-form",
                               {
-                                ref: "login",
+                                ref: "login" + _vm.active,
                                 staticClass: "es-login-form es-login-verify",
                                 attrs: { model: _vm.formData },
                               },
@@ -48410,11 +48548,11 @@ var mainvue_type_template_id_249fae96_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_249fae96_staticRenderFns = []
-mainvue_type_template_id_249fae96_render._withStripped = true
+var mainvue_type_template_id_0b26efc4_staticRenderFns = []
+mainvue_type_template_id_0b26efc4_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=249fae96&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=0b26efc4&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=579bc87d&
 var resetPasswordvue_type_template_id_579bc87d_render = function () {
@@ -49327,6 +49465,21 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
 
 
 
@@ -49521,7 +49674,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     scanIntervalTime: {
       type: Number,
       default: 1500
-    }
+    },
+    isScale: Boolean
   },
   computed: {
     transform: function transform() {
@@ -49714,9 +49868,16 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     };
   },
   beforeCreate: function beforeCreate() {
+    this.setScale = Object(external_throttle_debounce_["debounce"])(300, function () {
+      utils_util["a" /* default */].setScale();
+    });
     utils_util["a" /* default */].removeStorage(['remind', 'ssId', 'token', 'Authorization', 'deviceUnique', 'userId', 'userName', 'useCaseCodes']);
   },
   created: function created() {
+    if (this.isScale) {
+      utils_util["a" /* default */].setScale();
+      window.addEventListener('resize', this.setScale);
+    }
     this.code = utils_util["a" /* default */].getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -49886,8 +50047,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
     },
     switchLogin: function switchLogin(res) {
-      //this.$refs.login && this.$refs.login.resetFields();
-      this.$refs.login && this.$refs.login.clearValidate();
+      var _this3 = this;
+
       if (res != 1) {
         this.active = res.type;
         this.title = res.name;
@@ -49895,12 +50056,16 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
+      this.$nextTick(function () {
+        var ref = 'login' + _this3.active;
+        _this3.$refs[ref] && _this3.$refs[ref].clearValidate();
+      });
     },
     isShow: function isShow(res) {
       return this.loginModel.indexOf(res) > -1;
     },
     getLogin: function getLogin() {
-      var _this3 = this;
+      var _this4 = this;
 
       var config = utils_util["a" /* default */].getStorage('initLogin');
       if (config) {
@@ -49914,9 +50079,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             key: 'initLogin',
             value: JSON.stringify(res.results)
           });
-          _this3.setConfig(res.results);
+          _this4.setConfig(res.results);
         } else {
-          _this3.$message({
+          _this4.$message({
             message: res.msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 2000
@@ -49924,7 +50089,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
@@ -49954,7 +50119,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.setup = res.setup;
       this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
-      document.title = res.subsystemName;
+      if (res.subsystemName) {
+        document.title = res.subsystemName;
+      }
       this.app = res.appName || res.subsystemName;
       if (res.qrimg || res.qrImg) {
         this.qrimg = res.qrimg || res.qrImg;
@@ -50030,7 +50197,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       return this.imageCode;
     },
     getCode: function getCode() {
-      var _this4 = this;
+      var _this5 = this;
 
       if (this.countdown) {
         return false;
@@ -50071,14 +50238,14 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
       this.countdown = 60;
       this.timer = setInterval(function () {
-        if (_this4.countdown > 0) {
-          _this4.countdown--;
-          _this4.disabled = true;
-          _this4.btnText = '重新获取' + _this4.countdown + 's';
+        if (_this5.countdown > 0) {
+          _this5.countdown--;
+          _this5.disabled = true;
+          _this5.btnText = '重新获取' + _this5.countdown + 's';
         } else {
-          _this4.btnText = '重新获取';
-          _this4.disabled = false;
-          _this4.submit = false;
+          _this5.btnText = '重新获取';
+          _this5.disabled = false;
+          _this5.submit = false;
         }
       }, 1000);
       utils_util["a" /* default */].ajax({
@@ -50086,66 +50253,66 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         url: this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
         data: data
       }).then(function (res) {
-        _this4.$message({
+        _this5.$message({
           message: res.msg,
           duration: 2000,
           type: res.rCode == 0 ? 'success' : 'error'
         });
 
         if (res.rCode === 2) {
-          _this4.btnText = '获取验证码';
-          _this4.disabled = false;
-          _this4.countdown = 0;
-          clearInterval(_this4.timer);
+          _this5.btnText = '获取验证码';
+          _this5.disabled = false;
+          _this5.countdown = 0;
+          clearInterval(_this5.timer);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
     handleLogin: function handleLogin() {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.submit) {
         return false;
       }
       this.$refs['login'].validate(function (valid) {
         if (valid) {
-          _this5.submit = true;
+          _this6.submit = true;
           var param = utils_util["a" /* default */].getParams() || {};
-          var data = _this5.active == '0' ? {
-            username: _this5.formData.username,
-            password: _this5.secret && _this5.isEncrypt ? utils_util["a" /* default */].esmEncrypt({
-              data: _this5.formData.password,
-              key: _this5.secret
-            }) : _this5.formData.password,
-            identifyingCode: _this5.formData.identifyingCode,
-            identifyingId: _this5.identifyingId
-          } : _this5.active == '12' ? {
-            username: _this5.formData.username,
-            password: _this5.secret && _this5.isEncrypt ? utils_util["a" /* default */].esmEncrypt({
-              data: _this5.formData.password,
-              key: _this5.secret
-            }) : _this5.formData.password,
-            targetType: _this5.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
-            verificationCode: _this5.formData.identifyingCode
+          var data = _this6.active == '0' ? {
+            username: _this6.formData.username,
+            password: _this6.secret && _this6.isEncrypt ? utils_util["a" /* default */].esmEncrypt({
+              data: _this6.formData.password,
+              key: _this6.secret
+            }) : _this6.formData.password,
+            identifyingCode: _this6.formData.identifyingCode,
+            identifyingId: _this6.identifyingId
+          } : _this6.active == '12' ? {
+            username: _this6.formData.username,
+            password: _this6.secret && _this6.isEncrypt ? utils_util["a" /* default */].esmEncrypt({
+              data: _this6.formData.password,
+              key: _this6.secret
+            }) : _this6.formData.password,
+            targetType: _this6.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
+            verificationCode: _this6.formData.identifyingCode
           } : {
-            target: _this5.formData.target,
-            verificationCode: _this5.formData.verificationCode,
-            targetType: _this5.active == '6' ? 'SMS' : 'EMAIL'
+            target: _this6.formData.target,
+            verificationCode: _this6.formData.verificationCode,
+            targetType: _this6.active == '6' ? 'SMS' : 'EMAIL'
           };
-          if (_this5.onLogin) {
-            if (_this5.active == '0') {
-              _this5.onLogin(login_src_mainvue_type_script_lang_js_extends({}, param, data), _this5.getImgCode, _this5.handleRemember);
+          if (_this6.onLogin) {
+            if (_this6.active == '0') {
+              _this6.onLogin(login_src_mainvue_type_script_lang_js_extends({}, param, data), _this6.getImgCode, _this6.handleRemember);
             } else {
-              _this5.onLogin(login_src_mainvue_type_script_lang_js_extends({}, param, data));
+              _this6.onLogin(login_src_mainvue_type_script_lang_js_extends({}, param, data));
             }
           } else {
-            _this5.handleUserLogin(login_src_mainvue_type_script_lang_js_extends({}, param, _this5.param, data));
+            _this6.handleUserLogin(login_src_mainvue_type_script_lang_js_extends({}, param, _this6.param, data));
           }
         } else {
-          _this5.submit = false;
+          _this6.submit = false;
           return false;
         }
       });
@@ -50161,7 +50328,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
     },
     handleUserLogin: function handleUserLogin(data) {
-      var _this6 = this;
+      var _this7 = this;
 
       var extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
       utils_util["a" /* default */].ajax({
@@ -50169,68 +50336,68 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         url: this.active == '0' ? this.actionUrl : this.active == '12' ? this.doTwoFactorLogin : this.doCodeLogin,
         data: extUserBindHandleId ? login_src_mainvue_type_script_lang_js_extends({}, data, { extUserBindHandleId: extUserBindHandleId }) : data
       }).then(function (res) {
-        _this6.submit = false;
+        _this7.submit = false;
         if (res.rCode == 0) {
           utils_util["a" /* default */].removeStorage('extUserBindHandleId');
-          _this6.handleRemember();
+          _this7.handleRemember();
           var results = res.results;
-          _this6.handleResults(results);
-          if (_this6.onSuccess) {
-            _this6.onSuccess(res);
+          _this7.handleResults(results);
+          if (_this7.onSuccess) {
+            _this7.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this6.$message({
+          _this7.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this6.btnText = '获取验证码';
-              _this6.disabled = false;
-              _this6.countdown = 0;
-              clearInterval(_this6.timer);
-              _this6.getImgCode();
+              _this7.btnText = '获取验证码';
+              _this7.disabled = false;
+              _this7.countdown = 0;
+              clearInterval(_this7.timer);
+              _this7.getImgCode();
             }
           });
-          _this6.onError(res);
+          _this7.onError(res);
         }
       }).catch(function (err) {
-        _this6.submit = false;
+        _this7.submit = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     },
     caLogin: function caLogin(signedData) {
-      var _this7 = this;
+      var _this8 = this;
 
       utils_util["a" /* default */].ajax({
         method: 'post',
         url: this.caAction,
         data: { identifyingId: this.identifyingId, signedData: signedData }
       }).then(function (res) {
-        _this7.submit = false;
+        _this8.submit = false;
         if (res.rCode == 0) {
           var results = res.results;
-          _this7.handleResults(results);
-          if (_this7.onSuccess) {
-            _this7.onSuccess(res);
+          _this8.handleResults(results);
+          if (_this8.onSuccess) {
+            _this8.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this7.$message({
+          _this8.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this7.getImgCode();
+              _this8.getImgCode();
             }
           });
-          _this7.onError(res);
+          _this8.onError(res);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this7.$message.error(err.message);
+          _this8.$message.error(err.message);
         }
       });
     },
@@ -50247,17 +50414,17 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
     //获取app登录信息
     loginInfo: function loginInfo(res) {
-      var _this8 = this;
+      var _this9 = this;
 
       clearTimeout(this.interval);
       if (res) {
         this.interval = setTimeout(function () {
-          _this8.initRequestLoginInfo();
+          _this9.initRequestLoginInfo();
         }, this.scanIntervalTime);
       }
     },
     initRequestLoginInfo: function initRequestLoginInfo() {
-      var _this9 = this;
+      var _this10 = this;
 
       if (this.identifyingId == '') {
         return false;
@@ -50272,21 +50439,21 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this9.interval);
-            _this9.handleResults(results, 3);
+            clearTimeout(_this10.interval);
+            _this10.handleResults(results, 3);
           } else {
-            _this9.loginInfo(true);
+            _this10.loginInfo(true);
           }
         }
       }).catch(function (err) {
-        clearTimeout(_this9.interval);
+        clearTimeout(_this10.interval);
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
     handleResults: function handleResults(results, type) {
-      var _this10 = this;
+      var _this11 = this;
 
       switch (results.statusCode) {
         case 0:
@@ -50307,15 +50474,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             type: 'success',
             duration: 1500,
             onClose: function onClose() {
-              if (_this10.toUrl) {
-                window.location.href = _this10.toUrl;
-              } else if (results.doorIndex && _this10.doorIndex) {
+              if (_this11.toUrl) {
+                window.location.href = _this11.toUrl;
+              } else if (results.doorIndex && _this11.doorIndex) {
                 window.location.href = results.doorIndex;
               } else {
                 if (window.location.href.indexOf('login.html') > -1) {
                   window.location.href = './main.html';
                 } else {
-                  _this10.$router.push({ name: 'main' });
+                  _this11.$router.push({ name: 'main' });
                 }
               }
             }
@@ -50327,11 +50494,11 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             //cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this10.operationCheckCode = results.checkCode;
-            if (typeof _this10.forget === 'string') {
-              utils_util["a" /* default */].win.open(_this10.forgetUrl);
+            _this11.operationCheckCode = results.checkCode;
+            if (typeof _this11.forget === 'string') {
+              utils_util["a" /* default */].win.open(_this11.forgetUrl);
             } else {
-              _this10.showResetPassword = true;
+              _this11.showResetPassword = true;
             }
           }).catch(function (e) {});
           break;
@@ -50372,13 +50539,13 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
               type: 'error',
               duration: 1500,
               onClose: function onClose() {
-                if (_this10.code) {
+                if (_this11.code) {
                   window.location.href = utils_util["a" /* default */].delUrlParam({ key: 'code' });
                   if (window.location.hash) {
                     location.reload();
                   }
                 } else {
-                  _this10.getImgCode();
+                  _this11.getImgCode();
                 }
               }
             });
@@ -50388,15 +50555,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
     },
     handleAssistance: function handleAssistance(data) {
-      var _this11 = this;
+      var _this12 = this;
 
       clearTimeout(this.doAssistance);
       this.doAssistance = setTimeout(function () {
-        _this11.doAssistanceLogin(data);
+        _this12.doAssistanceLogin(data);
       }, this.scanIntervalTime);
     },
     doAssistanceLogin: function doAssistanceLogin(data) {
-      var _this12 = this;
+      var _this13 = this;
 
       utils_util["a" /* default */].ajax({
         method: 'post',
@@ -50406,19 +50573,19 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this12.doAssistance);
-            _this12.handleResults(results, 3);
+            clearTimeout(_this13.doAssistance);
+            _this13.handleResults(results, 3);
           } else {
-            _this12.handleAssistance(data);
+            _this13.handleAssistance(data);
           }
         } else {
-          clearTimeout(_this12.doAssistance);
-          _this12.$message.error(res.msg);
+          clearTimeout(_this13.doAssistance);
+          _this13.$message.error(res.msg);
         }
       }).catch(function (err) {
-        clearTimeout(_this12.doAssistance);
+        clearTimeout(_this13.doAssistance);
         if (err.message && err.message !== 'canceled') {
-          _this12.$message.error(err.message);
+          _this13.$message.error(err.message);
         }
       });
     },
@@ -50435,6 +50602,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
   },
   beforeDestroy: function beforeDestroy() {
+    window.removeEventListener('resize', this.setScale);
     document.removeEventListener('keyup', this.doLogin);
     document.removeEventListener('keydown', this.forbiddenTab);
   }
@@ -50451,8 +50619,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_249fae96_render,
-  mainvue_type_template_id_249fae96_staticRenderFns,
+  mainvue_type_template_id_0b26efc4_render,
+  mainvue_type_template_id_0b26efc4_staticRenderFns,
   false,
   null,
   null,
@@ -57393,8 +57561,8 @@ player_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var player = (player_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
-var mainvue_type_template_id_28375a46_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=338a3a1e&
+var mainvue_type_template_id_338a3a1e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -57402,24 +57570,33 @@ var mainvue_type_template_id_28375a46_render = function () {
     "div",
     { ref: "qrcode", staticClass: "es-qrcode-box", attrs: { id: "qrcode" } },
     [
-      _c("img", {
-        ref: "qrcodeImg",
-        staticClass: "es-qrcode-img",
-        attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
-      }),
-      _c("canvas", {
-        ref: "canvas",
-        staticClass: "canvas",
-        attrs: { width: _vm._width, height: _vm._height },
-      }),
-    ]
+      _vm.mwidth && _vm.mheight
+        ? [
+            _c("img", {
+              ref: "qrcodeImg",
+              staticClass: "es-qrcode-img",
+              attrs: {
+                width: _vm.mwidth,
+                height: _vm.mheight,
+                alt: "二维码图片",
+              },
+            }),
+            _c("canvas", {
+              ref: "canvas",
+              staticClass: "canvas",
+              attrs: { width: _vm.mwidth, height: _vm.mheight },
+            }),
+          ]
+        : _vm._e(),
+    ],
+    2
   )
 }
-var mainvue_type_template_id_28375a46_staticRenderFns = []
-mainvue_type_template_id_28375a46_render._withStripped = true
+var mainvue_type_template_id_338a3a1e_staticRenderFns = []
+mainvue_type_template_id_338a3a1e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
+// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=338a3a1e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=script&lang=js&
 //
@@ -57447,6 +57624,8 @@ mainvue_type_template_id_28375a46_render._withStripped = true
 //
 //
 //
+//
+//
 
 
 var QRCode = __webpack_require__(24);
@@ -57459,8 +57638,14 @@ var QRCode = __webpack_require__(24);
     },
     logo: String,
     text: String,
-    width: Number,
-    height: Number,
+    width: {
+      type: Number,
+      default: 300
+    },
+    height: {
+      type: Number,
+      default: 300
+    },
     auto: Boolean,
     option: {
       type: Object,
@@ -57475,22 +57660,12 @@ var QRCode = __webpack_require__(24);
       }
     }
   },
-  computed: {
-    _width: function _width() {
-      if (this.auto) {
-        return this.$refs.qrcode.offsetWidth;
-      }
-      return this.width ? this.width : 300;
-    },
-    _height: function _height() {
-      if (this.auto) {
-        return this.$refs.qrcode.offsetHeight;
-      }
-      return this.height ? this.height : 300;
-    }
-  },
+  computed: {},
   data: function data() {
-    return {};
+    return {
+      mwidth: 0,
+      mheight: 0
+    };
   },
 
   watch: {
@@ -57514,6 +57689,16 @@ var QRCode = __webpack_require__(24);
   mounted: function mounted() {
     var _this2 = this;
 
+    if (this.auto) {
+      var h = this.$refs.qrcode.offsetHeight - parseInt(utils_util["a" /* default */].getStyle(this.$refs.qrcode, 'padding-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(this.$refs.qrcode, 'padding-bottom'), 10);
+      if (h > 0) {
+        this.mwidth = h;
+        this.mheight = h;
+      }
+    } else {
+      this.mwidth = this.width;
+      this.mheight = this.height;
+    }
     this.$nextTick(function () {
       _this2.createQRCode();
     });
@@ -57527,8 +57712,8 @@ var QRCode = __webpack_require__(24);
       //let qrcodeLogo = this.$refs.qrcodeLogo;
       var canvas = this.$refs.canvas;
       var option = utils_util["a" /* default */].extend({}, this.option, {
-        width: this._width,
-        height: this._height
+        width: this.mwidth,
+        height: this.mheight
       });
       if (!qrcodeImg) {
         return false;
@@ -57540,12 +57725,12 @@ var QRCode = __webpack_require__(24);
           var ctx = canvas.getContext('2d');
           setTimeout(function () {
             //获取图片
-            ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
+            ctx.drawImage(qrcodeImg, 0, 0, _this3.mwidth, _this3.mheight);
             if (_this3.logo && _this3.logo.indexOf('.') > -1) {
               var logo = new Image();
               logo.src = _this3.logo;
               //设置logo大小
-              var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
+              var logoPosition = (_this3.mwidth - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
               /* ctx.fillStyle = "#fff";
               ctx.beginPath();
@@ -57570,8 +57755,8 @@ var QRCode = __webpack_require__(24);
               var fpadd = 10; //规定内间距
               ctx.font = 'bold 16px Arial';
               var tw = ctx.measureText(_this3.text).width; //文字真实宽度
-              var ftop = (_this3._height - 16) / 2; //根据字体大小计算文字top
-              var fleft = (_this3._width - tw) / 2; //根据字体大小计算文字left
+              var ftop = (_this3.mheight - 16) / 2; //根据字体大小计算文字top
+              var fleft = (_this3.mwidth - tw) / 2; //根据字体大小计算文字left
               var tp = 16 / 2; //字体边距为字体大小的一半可以自己设置
               ctx.fillStyle = '#fff';
               ctx.fillRect(fleft - tp / 2, ftop - tp / 2, tw + tp, 16 + tp);
@@ -57600,8 +57785,8 @@ var QRCode = __webpack_require__(24);
 
 var qr_code_src_main_component = normalizeComponent(
   packages_qr_code_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_28375a46_render,
-  mainvue_type_template_id_28375a46_staticRenderFns,
+  mainvue_type_template_id_338a3a1e_render,
+  mainvue_type_template_id_338a3a1e_staticRenderFns,
   false,
   null,
   null,
@@ -58567,6 +58752,8 @@ var select_src_mainvue_type_script_lang_js_extends = Object.assign || function (
 
 var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+function src_mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 
 
 
@@ -59158,26 +59345,34 @@ var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           });
         }
       }
+
+      var _$attrs = this.$attrs,
+          prefix = _$attrs.prefix,
+          suffix = _$attrs.suffix,
+          prepend = _$attrs.prepend,
+          append = _$attrs.append,
+          attrs = src_mainvue_type_script_lang_js_objectWithoutProperties(_$attrs, ['prefix', 'suffix', 'prepend', 'append']);
+
       if (this.$slots.prefix) {
         doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));
-      } else if (this.$attrs.prefix) {
+      } else if (prefix) {
         this.renderd(doms, h, 'prefix');
         cls.push('es-select-button-prefix');
       }
       if (this.$slots.suffix) {
         doms.push(h('template', { slot: 'suffix' }, this.$slots.suffix));
-      } else if (this.$attrs.suffix) {
+      } else if (suffix) {
         this.renderd(doms, h, 'suffix');
         cls.push('es-select-button-suffix');
       }
       if (this.$slots.prepend) {
         doms.push(h('template', { slot: 'prepend' }, this.$slots.prepend));
-      } else if (this.$attrs.prepend) {
+      } else if (prepend) {
         this.renderd(doms, h, 'prepend');
       }
       if (this.$slots.append) {
         doms.push(h('template', { slot: 'append' }, this.$slots.append));
-      } else if (this.$attrs.append) {
+      } else if (append) {
         this.renderd(doms, h, 'append');
       }
       if (!this.models && this.results.length && this.defaultValue) {
@@ -59197,7 +59392,7 @@ var select_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
           name: 'show',
           value: this.display
         }],
-        props: select_src_mainvue_type_script_lang_js_extends({}, this.$attrs, {
+        props: select_src_mainvue_type_script_lang_js_extends({}, attrs, {
           multiple: this.multiple,
           valueType: this.valueType,
           valueKey: this.valKey,
@@ -66670,8 +66865,8 @@ tips_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var tips = (tips_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=4df0cd89&
-var mainvue_type_template_id_4df0cd89_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=49d73969&
+var mainvue_type_template_id_49d73969_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -66867,11 +67062,11 @@ var mainvue_type_template_id_4df0cd89_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_4df0cd89_staticRenderFns = []
-mainvue_type_template_id_4df0cd89_render._withStripped = true
+var mainvue_type_template_id_49d73969_staticRenderFns = []
+mainvue_type_template_id_49d73969_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=4df0cd89&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=49d73969&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=script&lang=js&
 //
@@ -67224,6 +67419,18 @@ mainvue_type_template_id_4df0cd89_render._withStripped = true
           this.$refs.oaTree.filter(val);
         }
       }
+    },
+    param: {
+      deep: true,
+      handler: function handler() {
+        this.getTreeData();
+      }
+    },
+    where: {
+      deep: true,
+      handler: function handler() {
+        this.getTreeData();
+      }
     }
   },
   beforeCreate: function beforeCreate() {
@@ -67258,7 +67465,7 @@ mainvue_type_template_id_4df0cd89_render._withStripped = true
     getTreeDatas: function getTreeDatas(param) {
       var _this2 = this;
 
-      var params = utils_util["a" /* default */].extend({}, this.param, this.where, param);
+      var params = utils_util["a" /* default */].extend({}, this.param, this.where, param || {});
       if (!this.url || !this.isRemote) return;
       this.loading = true;
       utils_util["a" /* default */].ajax({
@@ -67572,8 +67779,8 @@ mainvue_type_template_id_4df0cd89_render._withStripped = true
 
 var tree_src_main_component = normalizeComponent(
   packages_tree_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4df0cd89_render,
-  mainvue_type_template_id_4df0cd89_staticRenderFns,
+  mainvue_type_template_id_49d73969_render,
+  mainvue_type_template_id_49d73969_staticRenderFns,
   false,
   null,
   null,
@@ -67590,8 +67797,8 @@ tree_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_tree = (tree_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=3f239eaa&
-var mainvue_type_template_id_3f239eaa_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=6ec7befa&
+var mainvue_type_template_id_6ec7befa_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -67772,7 +67979,10 @@ var mainvue_type_template_id_3f239eaa_render = function () {
                             "es-button",
                             _vm._g(
                               _vm._b(
-                                { key: index, attrs: { size: "small" } },
+                                {
+                                  key: item.id || index,
+                                  attrs: { size: "small" },
+                                },
                                 "es-button",
                                 item,
                                 false
@@ -67814,12 +68024,14 @@ var mainvue_type_template_id_3f239eaa_render = function () {
                   _vm._g(
                     _vm._b(
                       {
-                        key: _vm.count,
                         ref: _vm.table.ref ? _vm.table.ref : "esDataTable",
-                        attrs: { size: "mini", param: _vm.param },
+                        attrs: { size: "mini", param: _vm.params },
                       },
                       "es-data-table",
-                      Object.assign({}, { close: true }, _vm.table),
+                      _vm.handleExclAttribute({
+                        data: Object.assign({}, { close: true }, _vm.table),
+                        attrs: ["param"],
+                      }),
                       false
                     ),
                     Object.assign({}, _vm.$listeners, _vm.table.events)
@@ -67941,11 +68153,11 @@ var mainvue_type_template_id_3f239eaa_render = function () {
     2
   )
 }
-var mainvue_type_template_id_3f239eaa_staticRenderFns = []
-mainvue_type_template_id_3f239eaa_render._withStripped = true
+var mainvue_type_template_id_6ec7befa_staticRenderFns = []
+mainvue_type_template_id_6ec7befa_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=3f239eaa&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=6ec7befa&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=script&lang=js&
 var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -68133,6 +68345,10 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
 //
 //
 //
+//
+//
+//
+//
 
 
 /* harmony default export */ var tree_group_src_mainvue_type_script_lang_js_ = ({
@@ -68224,14 +68440,6 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
           return 'wujie';
         }
       }
-    },
-    param: function param() {
-      if (this.params) {
-        return this.params;
-      } else if (this.table && Object.prototype.hasOwnProperty.call(this.table, 'param')) {
-        return this.table.param;
-      }
-      return undefined;
     }
   },
   watch: {
@@ -68251,32 +68459,23 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
         }
       }
     },
+    'table.param': {
+      immediate: true,
+      deep: true,
+      handler: function handler(val, old) {
+        if (!utils_util["a" /* default */].isObjectEqual(val, old)) {
+          this.params = JSON.parse(JSON.stringify(val || {}));
+        }
+      }
+    },
     checkeds: {
       deep: true,
       handler: function handler() {
         var params = this.setParams();
         if (params) {
-          if (this.table && Object.prototype.hasOwnProperty.call(this.table, 'param')) {
-            this.params = utils_util["a" /* default */].extend(true, this.table.param, params);
-          } else {
-            this.params = params;
-          }
+          this.params = tree_group_src_mainvue_type_script_lang_js_extends({}, this.params, params);
         }
       }
-    },
-    //监听table，变化后重新加载，解决点击树节点后改变table对象导致的样式错乱问题
-    table: {
-      handler: function handler(val, oldVal) {
-        if (val && val.param) {
-          this.params = tree_group_src_mainvue_type_script_lang_js_extends({}, this.params, val.param);
-        }
-        if (oldVal && val && val.url !== oldVal.url) {
-          this.count++;
-        }
-      },
-
-      deep: true,
-      immediate: true
     }
   },
   data: function data() {
@@ -68284,7 +68483,6 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
       active: '0',
       checkeds: null,
       params: null,
-      count: 0,
       wjprops: {}
     };
   },
@@ -68292,6 +68490,15 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
   mounted: function mounted() {},
 
   methods: {
+    handleExclAttribute: function handleExclAttribute(_ref) {
+      var data = _ref.data,
+          attrs = _ref.attrs;
+
+      return utils_util["a" /* default */].exclAttribute({
+        data: data,
+        attrs: attrs
+      });
+    },
     getUrl: function getUrl(url, param, res) {
       var urls = url.split('?');
       if (urls[0].indexOf('.js') > 0) {
@@ -68501,8 +68708,8 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
 
 var tree_group_src_main_component = normalizeComponent(
   packages_tree_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3f239eaa_render,
-  mainvue_type_template_id_3f239eaa_staticRenderFns,
+  mainvue_type_template_id_6ec7befa_render,
+  mainvue_type_template_id_6ec7befa_staticRenderFns,
   false,
   null,
   null,
@@ -68522,7 +68729,7 @@ tree_group_src_main.install = function (Vue) {
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/toolbar/src/main.vue?vue&type=script&lang=js&
 var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
-function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+function toolbar_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
 /* harmony default export */ var toolbar_src_mainvue_type_script_lang_js_ = ({
   name: 'EsToolbar',
@@ -68673,7 +68880,8 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
           multiCondition = items.multiCondition,
           contents = items.contents,
           group = items.group,
-          other = mainvue_type_script_lang_js_objectWithoutProperties(items, ['config', 'type', 'reset', 'multiCondition', 'contents', 'group']);
+          events = items.events,
+          other = toolbar_src_mainvue_type_script_lang_js_objectWithoutProperties(items, ['config', 'type', 'reset', 'multiCondition', 'contents', 'group', 'events']);
 
       if (type === 'text') {
         text = [h('div', { class: 'es-toolbar-text' }, Array.isArray(contents) ? contents.map(function (item) {
@@ -68824,7 +69032,7 @@ function mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { var ta
             model: _this2.advancedData,
             contents: contents
           }),
-          on: {
+          on: events ? events : {
             submit: _this2.hanleSubmit,
             reset: _this2.hanleCancel
           }
@@ -74832,27 +75040,28 @@ wujie_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var wujie = (wujie_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=template&id=6da39de6&
-var mainvue_type_template_id_6da39de6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=template&id=18c0a641&
+var mainvue_type_template_id_18c0a641_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "div",
     {
+      ref: "wxqrcode",
       staticClass: "es-wx-qrcode",
-      style: { width: _vm.width, height: _vm.height },
+      style: { width: _vm.mwidth, height: _vm.mheight },
       attrs: { id: "wxqrcode" },
     },
     [
-      _vm.src
+      _vm.src && _vm.mwidth && _vm.mheight
         ? _c("iframe", {
             attrs: {
               frameborder: "0",
               allowTransparency: "true",
               scrolling: "no",
-              width: _vm.width,
-              height: _vm.height,
+              width: _vm.mwidth,
+              height: _vm.mheight,
               src: _vm.src,
             },
           })
@@ -74860,11 +75069,11 @@ var mainvue_type_template_id_6da39de6_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_6da39de6_staticRenderFns = []
-mainvue_type_template_id_6da39de6_render._withStripped = true
+var mainvue_type_template_id_18c0a641_staticRenderFns = []
+mainvue_type_template_id_18c0a641_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=template&id=6da39de6&
+// CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=template&id=18c0a641&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
 //
@@ -74884,6 +75093,7 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -74897,7 +75107,7 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
       default: false
     },
     appid: {
-      required: true,
+      //required: true,
       type: String
     },
     scope: {
@@ -74905,7 +75115,7 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
       type: [String, Array]
     },
     redirect_uri: {
-      required: true,
+      //required: true,
       type: String
     },
     state: String,
@@ -74928,8 +75138,9 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
     },
     height: {
       type: String,
-      default: '400px'
+      default: '300px'
     },
+    auto: Boolean,
     param: {
       type: Object,
       default: function _default() {
@@ -74939,16 +75150,29 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
   },
   data: function data() {
     return {
-      src: ''
+      src: '',
+      mwidth: 0,
+      mheight: 0
     };
   },
 
   computed: {},
   watch: {},
-  created: function created() {
+  created: function created() {},
+  mounted: function mounted() {
+    if (this.auto) {
+      var parent = this.$refs.wxqrcode.parentNode;
+      var h = parent.offsetHeight - parseInt(utils_util["a" /* default */].getStyle(parent, 'padding-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(parent, 'padding-bottom'), 10);
+      if (h > 0) {
+        this.mwidth = h + 'px';
+        this.mheight = h + 'px';
+      }
+    } else {
+      this.mwidth = this.width;
+      this.mheight = this.height;
+    }
     this.wxLogin();
   },
-  mounted: function mounted() {},
 
   methods: {
     wxLogin: function wxLogin() {
@@ -74983,8 +75207,8 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
 
 var wxlogin_src_main_component = normalizeComponent(
   packages_wxlogin_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6da39de6_render,
-  mainvue_type_template_id_6da39de6_staticRenderFns,
+  mainvue_type_template_id_18c0a641_render,
+  mainvue_type_template_id_18c0a641_staticRenderFns,
   false,
   null,
   null,
@@ -75073,7 +75297,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.74',
+  version: '0.5.76',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,