eoss-ui 0.5.58 → 0.5.59

package/lib/wxlogin.js

@@ -1974,7 +1974,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isEmpty = function isEmpty(val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]':
+      {
+        return !val.size;
+      }
+    // Plain Object
+    case '[object Object]':
+      {
+        return !Object.keys(val).length;
+      }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -3055,6 +3093,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isEmpty: isEmpty,
   isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.58",
+  "version": "0.5.59",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -62,7 +62,8 @@ export default {
     trigger: {
       type: String,
       default: 'click'
-    }
+    },
+    useCaseCodeKey: String
   },
   computed: {
     btns() {
@@ -86,27 +87,31 @@ export default {
   methods: {
     getBtns() {
       let useCaseCodes = util.getStorage('useCaseCodes');
+      let keyword =
+        this.data && this.useCaseCodeKey
+          ? this.data.row[this.useCaseCodeKey]
+          : null;
       let arry = this.contents.filter((item) => {
         if (Object.prototype.hasOwnProperty.call(item, 'rules')) {
-          if (useCaseCodes && item.useCaseCode) {
+          if (useCaseCodes && (item.useCaseCode || keyword)) {
             return (
-              item.rules(this.data) &&
-              useCaseCodes.indexOf(item.useCaseCode) > -1
+              item.rules(this.data.row) &&
+              useCaseCodes.indexOf(item.useCaseCode || keyword) > -1
             );
           }
-          return item.rules(this.data);
+          return item.rules(this.data.row);
         }
         if (this.rules !== undefined) {
-          if (useCaseCodes && item.useCaseCode) {
+          if (useCaseCodes && (item.useCaseCode || keyword)) {
             return (
-              this.rules(this.data) &&
-              useCaseCodes.indexOf(item.useCaseCode) > -1
+              this.rules(this.data.row) &&
+              useCaseCodes.indexOf(item.useCaseCode || keyword) > -1
             );
           }
-          return this.rules(this.data);
+          return this.rules(this.data.row);
         }
-        if (useCaseCodes && item.useCaseCode) {
-          return useCaseCodes.indexOf(item.useCaseCode) > -1;
+        if (useCaseCodes && (item.useCaseCode || keyword)) {
+          return useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
         }
         return true;
       });

package/packages/flow/src/main.vue

@@ -1335,9 +1335,8 @@ export default {
               if(!this.$refs.commonOpinions.validate()) return
             }
       if (this.beforeSubmit != undefined) {
-        this.beforeSubmit()
+        this.beforeSubmit(0)
           .then((next) => {
-            
             this.showReject = true;
           })
           .catch((e) => {});

package/packages/login/src/main.vue

@@ -410,10 +410,10 @@ export default {
         return {
           placeholder: '请输入手机号',
           rules: [
-            { required: true, message: '手机号不能为空', trigger: 'blur' },
+            { required: true, message: '手机号不能为空', trigger: 'change' },
             {
               ...rules.phone,
-              trigger: 'blur'
+              trigger: 'change'
             }
           ]
         };
@@ -428,7 +428,7 @@ export default {
             {
               required: true,
               message: '请输入邮箱地址',
-              trigger: 'blur'
+              trigger: 'change'
             },
             {
               type: 'email',
@@ -444,7 +444,9 @@ export default {
       default: () => {
         return {
           placeholder: '请输入密码',
-          rules: [{ required: true, message: '密码不能为空', trigger: 'blur' }]
+          rules: [
+            { required: true, message: '密码不能为空', trigger: 'change' }
+          ]
         };
       }
     },

package/src/index.js

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

package/src/utils/util.js

@@ -1911,7 +1911,43 @@ const indexOfObj = function (arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+const isEmpty = function (val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]': {
+      return !val.size;
+    }
+    // Plain Object
+    case '[object Object]': {
+      return !Object.keys(val).length;
+    }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -2999,6 +3035,7 @@ export default {
   hsvTorgb,
   identical,
   indexOfObj,
+  isEmpty,
   isExist,
   isFunction,
   isLogged,