eoss-ui 0.5.60 → 0.5.62

package/packages/toolbar/src/main.vue

@@ -115,10 +115,13 @@ export default {
       this.$emit('tabs', { item: res, index: num });
     },
     hanleReset() {
+      this.reset();
+      this.$emit('reset', this.searchData);
+    },
+    reset() {
       this.$refs.filter && this.$refs.filter.resetFields();
       this.searchData = JSON.parse(JSON.stringify(this.searchValue));
       this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
-      this.$emit('reset', this.searchData);
     },
     hanleCancel() {
       this.show = false;
@@ -134,7 +137,8 @@ export default {
     let filter = [];
 
     this.contents.forEach((items) => {
-      let { config, type, reset, multiCondition, contents, ...other } = items;
+      let { config, type, reset, multiCondition, contents, group, ...other } =
+        items;
       if (type === 'text') {
         text = [
           h(
@@ -151,41 +155,64 @@ export default {
           )
         ];
       }
-      if (type === 'button') {
-        contents.forEach((item) => {
-          if (!item.hide && (item.upload || (item.code && item.ownId))) {
-            buttons.push(
-              h('es-upload', {
-                class: 'el-button',
-                attrs: {
-                  ...item,
-                  method: 'post',
-                  btnSize: 'medium',
-                  showFileList: false,
-                  selectType: item.type ? item.type : ''
+      if (
+        type === 'button' ||
+        type === 'button-group' ||
+        type === 'buttonGroup'
+      ) {
+        if (type === 'button-group' || type === 'buttonGroup' || group) {
+          buttons = [
+            h('es-button-group', {
+              class: 'es-toolbar-button-group',
+              props: {
+                moreText: '更多',
+                size: 'medium',
+                ...other,
+                contents: contents
+              },
+              on: {
+                handleClick: (res) => {
+                  this.handleClick(res.handle);
                 }
-              })
-            );
-          } else {
-            buttons.push(
-              h(
-                'es-button',
-                {
+              }
+            })
+          ];
+        } else {
+          contents.forEach((item) => {
+            if (!item.hide && (item.upload || (item.code && item.ownId))) {
+              buttons.push(
+                h('es-upload', {
+                  class: 'el-button',
                   attrs: {
                     ...item,
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => {
-                      this.handleClick(item);
-                    }
+                    method: 'post',
+                    btnSize: 'medium',
+                    showFileList: false,
+                    selectType: item.type ? item.type : ''
                   }
-                },
-                item.text
-              )
-            );
-          }
-        });
+                })
+              );
+            } else {
+              buttons.push(
+                h(
+                  'es-button',
+                  {
+                    attrs: {
+                      ...item,
+                      size: 'medium'
+                    },
+                    on: {
+                      click: () => {
+                        this.handleClick(item);
+                      }
+                    }
+                  },
+                  item.text
+                )
+              );
+            }
+          });
+        }
       }
       if (type === 'tabs') {
         buttons = buttons.concat([

package/packages/tree-group/src/main.vue

@@ -227,15 +227,22 @@ export default {
       default: '#/empty'
     },
     zoom: false,
+    iframe: Boolean,
+    //点击节点作为table参数
     clickedAsSearch: {
       type: Boolean,
       default: true
     },
+    //选择节点作为table参数
     checkedAsSearch: {
       type: Boolean,
       default: true
     },
-    iframe: Boolean
+    //点击节点清空table搜索参数
+    clickeResetSearch: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     wujieName() {
@@ -467,6 +474,10 @@ export default {
       this.$emit('tab-click', this.tabs[parseInt(this.active, 10)]);
     },
     handleNodeClick(data, node, tabs) {
+      if (this.clickeResetSearch) {
+        let ref = table.ref ? table.ref : 'esDataTable';
+        this.$refs[ref].reset();
+      }
       if (this.clickedAsSearch) {
         this.checkeds = data;
       }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.60',
+  version: '0.5.62',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -314,7 +314,7 @@ const ajax = function ({
               error.message = '未授权，请重新登录';
               break;
             case 403:
-              error.message = '登录过期，请重新登录';
+              error.message = '服务器错误';
               break;
             case 404:
               error.message = '网络请求不存在';
@@ -326,7 +326,7 @@ const ajax = function ({
               error.message = '请求超时';
               break;
             case 500:
-              error.message = '服务器端出错';
+              error.message = '服务器错误';
               break;
             case 501:
               error.message = '网络未实现';
@@ -664,19 +664,23 @@ const dayOfMonth = function (date) {
  * @desc:添加js内容
  * @author huangbo
  * @date 2022年5月7日
- * @param {Function} [fn] - 函数
+ * @param {Function} [callback] - 函数
  * @param {Number} [wait] - 延迟毫秒数
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-const debounce = function (callback, delay) {
-  let timeout = null;
+const debounce = function (callback, wait) {
+  let timeout;
   return function () {
-    clearTimeout(timeout);
-    timeout = setTimeout(callback, delay ? delay : 500);
+    let context = this;
+    let args = arguments;
+    if (timeout) clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      callback.apply(context, args);
+    }, wait || 500);
   };
-
 };
+
 /**
  * delUrlParam
  * @desc:删除url指定参数
@@ -2840,7 +2844,8 @@ const toFunction = function (str) {
  * @param {string} [$color] - 颜色值
  **/
 const updateTheme = function (color, send) {
-  color = color ? color : '#409eff';
+  color = color && startWith(color, '#') ? color : '#409eff';
+
   if (send === undefined) {
     send = true;
   }