eoss-ui 0.5.48 → 0.5.50

package/lib/eoss-ui.common.js

@@ -150,6 +150,7 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  * @param {String} [publicKey] - sm2加密公钥
  * @param {Array} [secret] - 要加密的字段属性名称，默认所有
+ * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
 var pendingRequest = new Map();
@@ -185,7 +186,9 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading,
       publicKey = _ref.publicKey,
-      secret = _ref.secret;
+      secret = _ref.secret,
+      _ref$encodes = _ref.encodes,
+      encodes = _ref$encodes === undefined ? ['cd'] : _ref$encodes;
 
   var header = headers || {};
   if (!method) {
@@ -415,6 +418,17 @@ var ajax = function ajax(_ref) {
   if (!mix) {
     if (method === 'get') {
       data = {};
+      // params = qs.stringify(params, {arrayFormat: 'brackets'});
+      if (encodes && encodes.length) {
+        var other = {};
+        for (var i in params) {
+          if (encodes.includes(i)) {
+            other[i] = encodeURIComponent(params[i]);
+            delete params[i];
+          }
+        }
+        url = urlJoinParams({ url: url, param: other });
+      }
     } else {
       params = {};
     }
@@ -431,10 +445,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var i in params) {
-          if (params[i] !== '' && params[i] !== null) {
-            params[i] = esmEncrypt({
-              data: params[i],
+        for (var _i in params) {
+          if (params[_i] !== '' && params[_i] !== null) {
+            params[_i] = esmEncrypt({
+              data: params[_i],
               key: publicKey
             });
           }
@@ -452,10 +466,10 @@ var ajax = function ajax(_ref) {
           }
         });
       } else {
-        for (var _i in data) {
-          if (data[_i] !== '' && data[_i] !== null) {
-            data[_i] = esmEncrypt({
-              data: data[_i],
+        for (var _i2 in data) {
+          if (data[_i2] !== '' && data[_i2] !== null) {
+            data[_i2] = esmEncrypt({
+              data: data[_i2],
               key: publicKey
             });
           }
@@ -502,10 +516,10 @@ var arrUnique = function arrUnique(data, key) {
     }
   } else {
     var obj = {};
-    for (var _i2 = 0; _i2 < data.length; _i2++) {
-      if (!obj[data[_i2][key]]) {
-        newArr.push(data[_i2]);
-        obj[data[_i2][key]] = true;
+    for (var _i3 = 0; _i3 < data.length; _i3++) {
+      if (!obj[data[_i3][key]]) {
+        newArr.push(data[_i3]);
+        obj[data[_i3][key]] = true;
       }
     }
   }
@@ -984,12 +998,12 @@ var exportXls = function exportXls(_ref6) {
     }
     tbody += '</tr>';
   }
-  for (var _i3 in others) {
-    fields.splice(_i3, 0, others[_i3][0]);
-    aligns.splice(_i3, 0, others[_i3][1]);
+  for (var _i4 in others) {
+    fields.splice(_i4, 0, others[_i4][0]);
+    aligns.splice(_i4, 0, others[_i4][1]);
   }
 
-  var _loop2 = function _loop2(_i4) {
+  var _loop2 = function _loop2(_i5) {
     tbody += '<tr>';
 
     var _loop3 = function _loop3(_x2) {
@@ -997,9 +1011,9 @@ var exportXls = function exportXls(_ref6) {
       var valueKey = keys[fields[_x2]] && keys[fields[_x2]].valueKey ? keys[fields[_x2]].valueKey : 'value';
       var labelKey = keys[fields[_x2]] && keys[fields[_x2]].labelKey ? keys[fields[_x2]].labelKey : 'name';
       if (option[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
           field = [];
-          data[_i4][fields[_x2]].forEach(function (ele) {
+          data[_i5][fields[_x2]].forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1009,9 +1023,9 @@ var exportXls = function exportXls(_ref6) {
             });
           });
           field = field.join(' ');
-        } else if (typeof data[_i4][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
+        } else if (typeof data[_i5][fields[_x2]] === 'string' && keys[fields[_x2]] && keys[fields[_x2]].multiple) {
           field = [];
-          data[_i4][fields[_x2]].split(',').forEach(function (ele) {
+          data[_i5][fields[_x2]].split(',').forEach(function (ele) {
             option[fields[_x2]].forEach(function (item) {
               // eslint-disable-next-line eqeqeq
               if (item[valueKey] == ele) {
@@ -1024,24 +1038,24 @@ var exportXls = function exportXls(_ref6) {
         } else {
           option[fields[_x2]].forEach(function (item) {
             // eslint-disable-next-line eqeqeq
-            if (item[valueKey] == data[_i4][fields[_x2]]) {
+            if (item[valueKey] == data[_i5][fields[_x2]]) {
               field = item[labelKey];
               return;
             }
           });
         }
-      } else if (_typeof(data[_i4][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
-        if (Array.isArray(data[_i4][fields[_x2]])) {
-          data[_i4][fields[_x2]].forEach(function (item) {
+      } else if (_typeof(data[_i5][fields[_x2]]) === 'object' && keys[fields[_x2]]) {
+        if (Array.isArray(data[_i5][fields[_x2]])) {
+          data[_i5][fields[_x2]].forEach(function (item) {
             field = [];
             field.push({}.toString.call(item) === '[object Object]' ? item[labelKey] : item);
           });
           field = field.join(' ');
         } else {
-          field = data[_i4][fields[_x2]][labelKey];
+          field = data[_i5][fields[_x2]][labelKey];
         }
       } else {
-        field = data[_i4][fields[_x2]];
+        field = data[_i5][fields[_x2]];
       }
       tbody += '<td align="' + aligns[_x2] + '">' + field + '</td>';
     };
@@ -1052,8 +1066,8 @@ var exportXls = function exportXls(_ref6) {
     tbody += '</tr>';
   };
 
-  for (var _i4 = 0; _i4 < data.length; _i4++) {
-    _loop2(_i4);
+  for (var _i5 = 0; _i5 < data.length; _i5++) {
+    _loop2(_i5);
   }
   if (!name) {
     name = 'table_' + new Date().getTime();
@@ -1509,8 +1523,8 @@ var getRgb = function getRgb($color) {
       $color = colorNew;
     }
     // 处理六位的颜色值，转为RGB
-    for (var _i5 = 1; _i5 < 7; _i5 += 2) {
-      rgb.push(parseInt('0x' + $color.slice(_i5, _i5 + 2), 16));
+    for (var _i6 = 1; _i6 < 7; _i6 += 2) {
+      rgb.push(parseInt('0x' + $color.slice(_i6, _i6 + 2), 16));
     }
   } else {
     rgb = $color.replace(/(?:\(|\)|rgb|RGB)*/g, '').split(',');
@@ -2599,22 +2613,22 @@ var setStorage = function setStorage(_ref14) {
         localStorage.setItem(key[i], value);
       }
     } else {
-      for (var _i6 in key) {
-        var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        localStorage.setItem(_i6, val);
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
       }
     }
   } else {
     if (typeof key === 'string') {
       sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
-      for (var _i7 in key) {
-        sessionStorage.setItem(key[_i7], value);
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
       }
     } else {
-      for (var _i8 in key) {
-        var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        sessionStorage.setItem(_i8, _val);
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
       }
     }
   }
@@ -2832,17 +2846,18 @@ var toFunction = function toFunction(str) {
  * @date 2022年5月7日
  * @param {string} [$color] - 颜色值
  **/
-var updateTheme = function updateTheme($color, send) {
-  $color = $color ? $color : '#409eff';
+var updateTheme = function updateTheme(color, send) {
+  color = color ? color : '#409eff';
   if (send === undefined) {
     send = true;
   }
-  document.documentElement.style.setProperty('--theme-primary', $color);
+  localStorage.setItem('theme', color);
+  document.documentElement.style.setProperty('--theme-primary', color);
   for (var i = 1; i < 11; i++) {
     if (i === 6) {
-      document.documentElement.style.setProperty('--theme-primary-light-' + i, $color);
+      document.documentElement.style.setProperty('--theme-primary-light-' + i, color);
     } else {
-      var light = getColor($color, i);
+      var light = getColor(color, i);
       document.documentElement.style.setProperty('--theme-primary-light-' + i, light);
     }
   }
@@ -6255,8 +6270,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=3b2cc05b&
-var mainvue_type_template_id_3b2cc05b_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=34453930&
+var mainvue_type_template_id_34453930_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6521,11 +6536,11 @@ var mainvue_type_template_id_3b2cc05b_render = function () {
     1
   )
 }
-var mainvue_type_template_id_3b2cc05b_staticRenderFns = []
-mainvue_type_template_id_3b2cc05b_render._withStripped = true
+var mainvue_type_template_id_34453930_staticRenderFns = []
+mainvue_type_template_id_34453930_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=3b2cc05b&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=34453930&
 
 // 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=29bcbc72&
 var childrenvue_type_template_id_29bcbc72_render = function () {
@@ -8664,6 +8679,7 @@ var mainvue_type_script_lang_js_components, _watch;
       type: String,
       default: 'get'
     },
+    isEncodeURI: Boolean,
     format: {
       type: Boolean,
       default: true
@@ -8842,6 +8858,12 @@ var mainvue_type_script_lang_js_components, _watch;
     isJoin: {
       type: Boolean,
       default: true
+    },
+    ajaxConfig: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
     }
   },
   data: function data() {
@@ -9330,13 +9352,13 @@ var mainvue_type_script_lang_js_components, _watch;
         }
       }
       this.tableLoading = true;
-      utils_util["a" /* default */].ajax({
+      utils_util["a" /* default */].ajax(data_table_src_mainvue_type_script_lang_js_extends({}, this.ajaxConfig, {
         url: this.url,
         method: this.method,
         format: this.format,
         params: reqData,
         data: reqData
-      }).then(function (res) {
+      })).then(function (res) {
         _this7.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
           var results = _this7.parseData !== undefined ? _this7.parseData(res.results || res.data || res) : res.results || res.data;
@@ -9460,13 +9482,13 @@ var mainvue_type_script_lang_js_components, _watch;
         }
       }
       var keys = Object.keys(params);
-      utils_util["a" /* default */].ajax({
+      utils_util["a" /* default */].ajax(data_table_src_mainvue_type_script_lang_js_extends({}, handle.ajaxConfig || {}, {
         url: handle.action,
         data: keys.length == 1 && handle.format === false ? params[keys[0]].split(',') : params,
         params: keys.length == 1 && handle.format === false ? params[keys[0]].split(',') : params,
         method: handle.method,
         format: handle.format
-      }).then(function (res) {
+      })).then(function (res) {
         _this8.changeLoading(false);
         if (res.rCode === 0) {
           _this8.$message({
@@ -9838,8 +9860,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_3b2cc05b_render,
-  mainvue_type_template_id_3b2cc05b_staticRenderFns,
+  mainvue_type_template_id_34453930_render,
+  mainvue_type_template_id_34453930_staticRenderFns,
   false,
   null,
   null,
@@ -13307,8 +13329,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=7d054bca&
-var mainvue_type_template_id_7d054bca_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=0ffe101a&
+var mainvue_type_template_id_0ffe101a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13345,6 +13367,14 @@ var mainvue_type_template_id_7d054bca_render = function () {
                 "element-loading-spinner": "el-icon-loading",
                 "element-loading-background": "rgba(0, 0, 0, 0.65)",
               },
+              on: {
+                keyup: function ($event) {
+                  if (!("button" in $event) && $event.keyCode !== 13) {
+                    return null
+                  }
+                  return _vm.handleEnter($event)
+                },
+              },
             },
             "el-form",
             _vm.$attrs,
@@ -24224,11 +24254,11 @@ var mainvue_type_template_id_7d054bca_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_7d054bca_staticRenderFns = []
-mainvue_type_template_id_7d054bca_render._withStripped = true
+var mainvue_type_template_id_0ffe101a_staticRenderFns = []
+mainvue_type_template_id_0ffe101a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7d054bca&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=0ffe101a&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -28129,6 +28159,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 //
 //
 //
+//
 
 
 
@@ -28301,7 +28332,14 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
     },
     zoom: false,
     showMsg: true,
-    validated: Function
+    validated: Function,
+    enterSubmit: Boolean,
+    ajaxConfig: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    }
   },
   data: function data() {
     return {
@@ -28591,6 +28629,7 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
     this.$nextTick(function () {
       !_this3.height && _this3.getHeight();
+      _this3.$refs.esForm.$el.addEventListener('keyup', _this3.handleEnter);
     });
   },
 
@@ -29081,13 +29120,13 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
                       loading = utils_util["a" /* default */].loading(_this11.$loading, handle.loadingText ? handle.loadingText + '...' : '提交中...');
                     }
                     _context3.next = 10;
-                    return utils_util["a" /* default */].ajax({
+                    return utils_util["a" /* default */].ajax(form_src_mainvue_type_script_lang_js_extends({}, _this11.ajaxConfig, {
                       url: src_mainvue_type_script_lang_js_typeof(_this11.action) === 'object' ? _this11.action[_this11.actionType] : _this11.action,
                       format: handle.format || _this11.format,
                       data: form_src_mainvue_type_script_lang_js_extends({}, models, param),
                       method: _this11.method,
                       loading: loading
-                    }).then(function (res) {
+                    })).then(function (res) {
                       loading && loading.close();
                       if (res.rCode === 0) {
                         _this11.showMsg && _this11.$message.success(res.msg || res.message || '成功！');
@@ -29163,13 +29202,13 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
                     loading = utils_util["a" /* default */].loading(_this11.$loading, handle.loadingText ? handle.loadingText + '...' : '提交中...');
                   }
                   _context4.next = 9;
-                  return utils_util["a" /* default */].ajax({
+                  return utils_util["a" /* default */].ajax(form_src_mainvue_type_script_lang_js_extends({}, _this11.ajaxConfig, {
                     url: src_mainvue_type_script_lang_js_typeof(_this11.action) === 'object' ? _this11.action[_this11.actionType] : _this11.action,
                     format: handle.format || _this11.format,
                     data: form_src_mainvue_type_script_lang_js_extends({}, models, param),
                     method: _this11.method,
                     loading: loading
-                  }).then(function (res) {
+                  })).then(function (res) {
                     loading && loading.close();
                     if (res.rCode === 0) {
                       _this11.showMsg && _this11.$message.success(res.msg || res.message || '成功！');
@@ -29353,7 +29392,23 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
         data: data,
         attrs: attrs
       });
+    },
+    handleEnter: function handleEnter() {
+      if (!this.enterSubmit) {
+        return;
+      }
+      if (utils_util["a" /* default */].win.event == undefined) {
+        var key = e.keyCode;
+      } else {
+        var key = utils_util["a" /* default */].win.event.keyCode;
+      }
+      if (key == 13) {
+        this.handleClick({ event: 'submit' });
+      }
     }
+  },
+  beforeDestroy: function beforeDestroy() {
+    this.$refs.esForm.$el.removeEventListener('keyup', this.handleEnter);
   }
 });
 // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=script&lang=js&
@@ -29368,8 +29423,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7d054bca_render,
-  mainvue_type_template_id_7d054bca_staticRenderFns,
+  mainvue_type_template_id_0ffe101a_render,
+  mainvue_type_template_id_0ffe101a_staticRenderFns,
   false,
   null,
   null,
@@ -48816,8 +48871,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=679ec798&
-var mainvue_type_template_id_679ec798_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=4ac8ec54&
+var mainvue_type_template_id_4ac8ec54_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -49243,14 +49298,14 @@ var mainvue_type_template_id_679ec798_render = function () {
     1
   )
 }
-var mainvue_type_template_id_679ec798_staticRenderFns = []
-mainvue_type_template_id_679ec798_render._withStripped = true
+var mainvue_type_template_id_4ac8ec54_staticRenderFns = []
+mainvue_type_template_id_4ac8ec54_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=679ec798&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=4ac8ec54&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=e93353b8&
-var userinfovue_type_template_id_e93353b8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
+var userinfovue_type_template_id_fc09aaf8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -49266,11 +49321,11 @@ var userinfovue_type_template_id_e93353b8_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_e93353b8_staticRenderFns = []
-userinfovue_type_template_id_e93353b8_render._withStripped = true
+var userinfovue_type_template_id_fc09aaf8_staticRenderFns = []
+userinfovue_type_template_id_fc09aaf8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=e93353b8&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
 //
@@ -49316,10 +49371,10 @@ userinfovue_type_template_id_e93353b8_render._withStripped = true
         job: '',
         orgName: '',
         depName: '',
-        idcard: '',
+        idCard: '',
         phone: '',
         email: '',
-        officetel: '',
+        officeTel: '',
         oldpassword: '',
         password: '',
         notify: []
@@ -49505,10 +49560,10 @@ userinfovue_type_template_id_e93353b8_render._withStripped = true
           _this2.results = results.simpleUserInfo;
           _this2.values.orgName = results.simpleUserInfo.orgName;
           _this2.values.depName = results.simpleUserInfo.depName;
-          _this2.values.idcard = results.simpleUserInfo.idcard;
+          _this2.values.idCard = results.simpleUserInfo.idCard;
           _this2.values.phone = results.simpleUserInfo.phone;
           _this2.values.email = results.simpleUserInfo.email;
-          _this2.values.officetel = results.simpleUserInfo.officetel;
+          _this2.values.officeTel = results.simpleUserInfo.officeTel;
           if (results.userScanBindImgUrl) {
             _this2.userScanBindImgUrl = results.userScanBindImgUrl;
             _this2.qrcode = utils_util["a" /* default */].getStorage('host') + results.userScanBindImgUrl;
@@ -49584,7 +49639,7 @@ userinfovue_type_template_id_e93353b8_render._withStripped = true
         url: api["Wb" /* updateUserInfo */],
         params: {
           email: this.values.email,
-          officeTel: this.values.officetel,
+          officeTel: this.values.officeTel,
           phone: this.values.phone,
           oldPassword: this.secret && initLogin && initLogin.secret && this.values.oldpassword ? utils_util["a" /* default */].esmEncrypt({
             data: this.values.oldpassword,
@@ -49690,8 +49745,8 @@ userinfovue_type_template_id_e93353b8_render._withStripped = true
 
 var userinfo_component = normalizeComponent(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_e93353b8_render,
-  userinfovue_type_template_id_e93353b8_staticRenderFns,
+  userinfovue_type_template_id_fc09aaf8_render,
+  userinfovue_type_template_id_fc09aaf8_staticRenderFns,
   false,
   null,
   null,
@@ -52053,7 +52108,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             if (typeof id === 'string') {
               this.isTabs = false;
             }
-            if (item.pid === 'root') {
+            if (item.pid === 'root' || Array.isArray(id)) {
               return [item.id].concat(id);
             } else if (typeof id === 'string') {
               return [item.id, id];
@@ -53054,8 +53109,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_679ec798_render,
-  mainvue_type_template_id_679ec798_staticRenderFns,
+  mainvue_type_template_id_4ac8ec54_render,
+  mainvue_type_template_id_4ac8ec54_staticRenderFns,
   false,
   null,
   null,
@@ -64374,8 +64429,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=ad13099c&
-var mainvue_type_template_id_ad13099c_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=6991bbb6&
+var mainvue_type_template_id_6991bbb6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -64410,20 +64465,11 @@ var mainvue_type_template_id_ad13099c_render = function () {
                 _vm._v(_vm._s(_vm.title)),
               ])
             : _vm._e(),
-          _vm.showSearch || _vm.$slots.filtrate
+          _vm.showSearch || _vm.$slots.filtrate || _vm.$slots.button
             ? _c(
                 "div",
                 { staticClass: "es-tree-search" },
                 [
-                  _c(
-                    "div",
-                    {
-                      staticClass: "es-tree-filtrate",
-                      class: { "es-tree-hasfiltrate": _vm.$slots.filtrate },
-                    },
-                    [_vm._t("filtrate")],
-                    2
-                  ),
                   _vm.showSearch
                     ? [
                         _vm.search.type && _vm.search.type === "select"
@@ -64490,6 +64536,22 @@ var mainvue_type_template_id_ad13099c_render = function () {
                             ),
                       ]
                     : _vm._e(),
+                  _vm.$slots.filtrate
+                    ? _c(
+                        "div",
+                        { staticClass: "es-tree-filtrate" },
+                        [_vm._t("filtrate")],
+                        2
+                      )
+                    : _vm._e(),
+                  _vm.$slots.button
+                    ? _c(
+                        "div",
+                        { staticClass: "es-tree-button" },
+                        [_vm._t("button")],
+                        2
+                      )
+                    : _vm._e(),
                 ],
                 2
               )
@@ -64564,11 +64626,11 @@ var mainvue_type_template_id_ad13099c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_ad13099c_staticRenderFns = []
-mainvue_type_template_id_ad13099c_render._withStripped = true
+var mainvue_type_template_id_6991bbb6_staticRenderFns = []
+mainvue_type_template_id_6991bbb6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=ad13099c&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=6991bbb6&
 
 // 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&
 //
@@ -64656,6 +64718,9 @@ mainvue_type_template_id_ad13099c_render._withStripped = true
 //
 //
 //
+//
+//
+//
 
 
 
@@ -65256,8 +65321,8 @@ mainvue_type_template_id_ad13099c_render._withStripped = true
 
 var tree_src_main_component = normalizeComponent(
   packages_tree_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_ad13099c_render,
-  mainvue_type_template_id_ad13099c_staticRenderFns,
+  mainvue_type_template_id_6991bbb6_render,
+  mainvue_type_template_id_6991bbb6_staticRenderFns,
   false,
   null,
   null,
@@ -65274,8 +65339,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=074a6d7c&
-var mainvue_type_template_id_074a6d7c_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=4e84bbcc&
+var mainvue_type_template_id_4e84bbcc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -65447,6 +65512,27 @@ var mainvue_type_template_id_074a6d7c_render = function () {
                         1
                       )
                     : _vm._e(),
+                  _vm.buttons
+                    ? _c(
+                        "template",
+                        { slot: "button" },
+                        _vm._l(_vm.buttons, function (item, index) {
+                          return _c(
+                            "es-button",
+                            _vm._g(
+                              _vm._b(
+                                { key: index, attrs: { size: "small" } },
+                                "es-button",
+                                item,
+                                false
+                              ),
+                              item.events
+                            )
+                          )
+                        }),
+                        1
+                      )
+                    : _vm._e(),
                 ],
                 2
               ),
@@ -65604,11 +65690,11 @@ var mainvue_type_template_id_074a6d7c_render = function () {
     2
   )
 }
-var mainvue_type_template_id_074a6d7c_staticRenderFns = []
-mainvue_type_template_id_074a6d7c_render._withStripped = true
+var mainvue_type_template_id_4e84bbcc_staticRenderFns = []
+mainvue_type_template_id_4e84bbcc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=074a6d7c&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=4e84bbcc&
 
 // 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; };
@@ -65787,6 +65873,15 @@ 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_ = ({
@@ -65819,6 +65914,7 @@ var tree_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
     },
     triggerType: Array,
     enterprise: [Object, Boolean],
+    buttons: Array,
     table: Object,
     form: Object,
     tabs: Array,
@@ -66143,8 +66239,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_074a6d7c_render,
-  mainvue_type_template_id_074a6d7c_staticRenderFns,
+  mainvue_type_template_id_4e84bbcc_render,
+  mainvue_type_template_id_4e84bbcc_staticRenderFns,
   false,
   null,
   null,
@@ -70554,8 +70650,8 @@ form_src_table.install = function (Vue) {
 };
 
 /* harmony default export */ var table_form = (form_src_table);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=3d54363f&
-var mainvue_type_template_id_3d54363f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=6ac7d26c&
+var mainvue_type_template_id_6ac7d26c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -70596,6 +70692,7 @@ var mainvue_type_template_id_3d54363f_render = function () {
               preview: _vm.preview,
               exclude: _vm.excludes,
               download: _vm.isDownload,
+              deleted: _vm.isRemove,
               icons: _vm._icons,
               picture: _vm._picture,
               "before-upload": _vm.handleBeforeUpload,
@@ -70934,11 +71031,11 @@ var mainvue_type_template_id_3d54363f_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_3d54363f_staticRenderFns = []
-mainvue_type_template_id_3d54363f_render._withStripped = true
+var mainvue_type_template_id_6ac7d26c_staticRenderFns = []
+mainvue_type_template_id_6ac7d26c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=3d54363f&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=6ac7d26c&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -71142,6 +71239,7 @@ var mainvue_type_script_lang_js_props;
 //
 //
 //
+//
 
 
 
@@ -71455,10 +71553,11 @@ var mainvue_type_script_lang_js_props;
       return this.readonly || (this.elForm || {}).readonly;
     },
     isRemove: function isRemove() {
-      if (this.remove || this.deleted) {
-        return true;
+      console.log(this.remove, this.deleted, 999);
+      if (this.remove == false || this.deleted == false) {
+        return false;
       }
-      return false;
+      return true;
     },
     isSort: function isSort() {
       return this.dragSort && !this.isDisabled && this.isReadonly;
@@ -72024,8 +72123,8 @@ var mainvue_type_script_lang_js_props;
 
 var upload_src_main_component = normalizeComponent(
   packages_upload_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3d54363f_render,
-  mainvue_type_template_id_3d54363f_staticRenderFns,
+  mainvue_type_template_id_6ac7d26c_render,
+  mainvue_type_template_id_6ac7d26c_staticRenderFns,
   false,
   null,
   null,
@@ -72501,7 +72600,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.48',
+  version: '0.5.50',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,