eoss-ui 0.5.58 → 0.5.60

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.60",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.89",
+    "eoss-element": "^0.2.91",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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/calendar/src/main.vue

@@ -2,9 +2,17 @@
   <div class="es-calendar">
     <div class="es-calendar-title" v-show="showTitle">
       <i class="es-calendar-prev es-icon-pointer-left" @click="prev"></i>
-      <div class="es-title" @click="resetDate">
+      <div class="es-title">
         <slot name="title" :year="year" :month="month">
-          {{ year }}年{{ month }}月
+          <es-date-picker
+            class="es-calendar-picker"
+            v-model="value"
+            type="month"
+            placeholder="选择日期时间"
+            format="yyyy年M月"
+            @change="handleChange"
+          >
+          </es-date-picker>
         </slot>
       </div>
       <i class="es-calendar-next es-icon-pointer-right" @click="next"></i>
@@ -111,8 +119,9 @@ export default {
   },
   data() {
     return {
+      value: '',
       year: '',
-      _month: '',
+      month: '',
       weeks: ['日', '一', '二', '三', '四', '五', '六'],
       weekDate: [],
       week7: '',
@@ -158,9 +167,10 @@ export default {
       this.daysList = daysList;
       this.year = year;
       this.month = month;
-      if (!this.weekDate.length) {
-        this.weekDate = weekDate;
-      }
+      this.value = `${year}年${month}月`;
+      //if (!this.weekDate.length) {
+      this.weekDate = weekDate;
+      //}
       this.$emit('init', dates);
       return dates;
     },
@@ -237,6 +247,15 @@ export default {
       let res = this.init(`${year}/${month}/${date}`);
       this.$emit('next', res, 'month');
     },
+    handleChange(val) {
+      let dates = val.replace('月', '').split('年');
+      let year = dates[0];
+      let month = dates[1];
+      month = month.padStart(2, '0');
+      let date = '01';
+      let res = this.init(`${year}/${month}/${date}`);
+      this.$emit('change', res);
+    },
     //获取当月或指定日期所在月天数
     getDays(res) {
       const date = res ? new Date(res) : new Date();

package/packages/card/src/main.vue

@@ -1,28 +1,65 @@
 <template>
-  <el-card class="es-card" v-bind="$attrs">
+  <el-card
+    class="es-card"
+    :class="{ 'es-card-border-none': !border }"
+    v-bind="$attrs"
+  >
     <template slot="header">
-      <div
-        class="es-card-header"
-        :class="{ 'es-card-ornament-hide': !show }"
-        v-if="header || tabs"
-      >
-        <template v-if="header">
-          <template v-if="isObject">
-            <i
-              v-if="header.icon"
-              class="es-header-icon"
-              :class="header.icon"
-            ></i>
-            <span v-if="header.text" class="es-header-text">{{
-              header.text
-            }}</span>
-            <i
-              v-if="header.icons"
-              class="es-header-icons"
-              :class="header.icons"
-            ></i>
+      <div class="es-card-header" :class="modeClass">
+        <slot name="header">
+          <template v-if="header">
+            <template v-if="isObject">
+              <i
+                v-if="header.icon"
+                class="es-header-icon"
+                :class="header.icon"
+              ></i>
+              <span v-if="header.text" class="es-header-text">{{
+                header.text
+              }}</span>
+              <i
+                v-if="header.icons"
+                class="es-header-icons"
+                :class="header.icons"
+              ></i>
+              <el-menu
+                v-if="header.tabs"
+                slot="suffix"
+                class="es-card-menu"
+                mode="horizontal"
+                :default-active="active"
+                @select="handleSelect"
+              >
+                <template v-for="(item, index) in tabs">
+                  <el-menu-item
+                    v-if="typeof item === 'string'"
+                    :key="index"
+                    :index="String(index)"
+                  >
+                    {{ item }}
+                  </el-menu-item>
+                  <el-menu-item
+                    v-else
+                    :key="index"
+                    :index="item.id ? item.id : String(index)"
+                  >
+                    <el-badge
+                      :value="item.tips"
+                      :max="max"
+                      :is-dot="isDot"
+                      :hidden="!item.tips || item.tips == '0'"
+                    >
+                      {{ item.name || item.label }}
+                    </el-badge>
+                  </el-menu-item>
+                </template>
+              </el-menu>
+            </template>
+            <span v-else class="es-header-text">{{ header }}</span>
+          </template>
+          <template>
             <el-menu
-              v-if="header.tabs"
+              v-if="tabs"
               slot="suffix"
               class="es-card-menu"
               mode="horizontal"
@@ -54,45 +91,9 @@
               </template>
             </el-menu>
           </template>
-          <span v-else class="es-header-text">{{ header }}</span>
-        </template>
-        <template>
-          <el-menu
-            v-if="tabs"
-            slot="suffix"
-            class="es-card-menu"
-            mode="horizontal"
-            :default-active="active"
-            @select="handleSelect"
-          >
-            <template v-for="(item, index) in tabs">
-              <el-menu-item
-                v-if="typeof item === 'string'"
-                :key="index"
-                :index="String(index)"
-              >
-                {{ item }}
-              </el-menu-item>
-              <el-menu-item
-                v-else
-                :key="index"
-                :index="item.id ? item.id : String(index)"
-              >
-                <el-badge
-                  :value="item.tips"
-                  :max="max"
-                  :is-dot="isDot"
-                  :hidden="!item.tips || item.tips == '0'"
-                >
-                  {{ item.name || item.label }}
-                </el-badge>
-              </el-menu-item>
-            </template>
-          </el-menu>
-        </template>
-        <slot name="suffix"></slot>
+          <slot name="suffix"></slot>
+        </slot>
       </div>
-      <slot v-else name="header"></slot>
     </template>
     <slot></slot>
   </el-card>
@@ -106,6 +107,14 @@ export default {
       type: Boolean,
       default: true
     },
+    mode: {
+      type: String,
+      default: 'bar'
+    },
+    border: {
+      type: Boolean,
+      default: true
+    },
     header: [String, Object],
     tabs: Array,
     defaultActive: String,
@@ -130,6 +139,9 @@ export default {
         }
         return this.defaultActive;
       }
+    },
+    modeClass() {
+      return this.show ? `es-card-ornament-${this.mode}` : '';
     }
   },
   data() {

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/form/src/main.vue

@@ -587,6 +587,14 @@
                           }
                         "
                       ></es-icons>
+                      <component
+                        v-else-if="item.type === 'component'"
+                        v-model="models[item.name]"
+                        v-bind="
+                          handleExclAttribute({ data: item, attrs: ['value'] })
+                        "
+                        v-on="item.events"
+                      ></component>
                       <es-input
                         v-else
                         v-bind="
@@ -831,6 +839,17 @@
                                     }
                                   "
                                 ></es-icons>
+                                <component
+                                  v-else-if="inline.type === 'component'"
+                                  v-model="models[inline.name]"
+                                  v-bind="
+                                    handleExclAttribute({
+                                      data: inline,
+                                      attrs: ['value']
+                                    })
+                                  "
+                                  v-on="inline.events"
+                                ></component>
                                 <es-input
                                   v-else
                                   v-bind="
@@ -1068,6 +1087,17 @@
                                 }
                               "
                             ></es-icons>
+                            <component
+                              v-else-if="inline.type === 'component'"
+                              v-model="models[inline.name]"
+                              v-bind="
+                                handleExclAttribute({
+                                  data: inline,
+                                  attrs: ['value']
+                                })
+                              "
+                              v-on="inline.events"
+                            ></component>
                             <es-input
                               v-else
                               v-bind="
@@ -1513,6 +1543,17 @@
                       }
                     "
                   ></es-icons>
+                  <component
+                    v-else-if="item.type === 'component'"
+                    v-model="models[item.name]"
+                    v-bind="
+                      handleExclAttribute({
+                        data: item,
+                        attrs: ['value']
+                      })
+                    "
+                    v-on="item.events"
+                  ></component>
                   <es-input
                     v-else
                     v-bind="
@@ -1729,6 +1770,17 @@
                                 }
                               "
                             ></es-icons>
+                            <component
+                              v-else-if="inline.type === 'component'"
+                              v-model="models[inline.name]"
+                              v-bind="
+                                handleExclAttribute({
+                                  data: inline,
+                                  attrs: ['value']
+                                })
+                              "
+                              v-on="inline.events"
+                            ></component>
                             <es-input
                               v-else
                               v-bind="
@@ -1925,6 +1977,17 @@
                             }
                           "
                         ></es-icons>
+                        <component
+                          v-else-if="item.inline.type === 'component'"
+                          v-model="models[item.inline.name]"
+                          v-bind="
+                            handleExclAttribute({
+                              data: item.inline,
+                              attrs: ['value']
+                            })
+                          "
+                          v-on="item.inline.events"
+                        ></component>
                         <es-input
                           v-else
                           v-bind="
@@ -2485,6 +2548,17 @@
                         }
                       "
                     ></es-icons>
+                    <component
+                      v-else-if="item.type === 'component'"
+                      v-model="models[item.name]"
+                      v-bind="
+                        handleExclAttribute({
+                          data: item,
+                          attrs: ['value']
+                        })
+                      "
+                      v-on="item.events"
+                    ></component>
                     <es-input
                       v-else
                       v-bind="
@@ -2725,6 +2799,17 @@
                                   }
                                 "
                               ></es-icons>
+                              <component
+                                v-else-if="inline.type === 'component'"
+                                v-model="models[inline.name]"
+                                v-bind="
+                                  handleExclAttribute({
+                                    data: inline,
+                                    attrs: ['value']
+                                  })
+                                "
+                                v-on="inline.events"
+                              ></component>
                               <es-input
                                 v-else
                                 v-bind="
@@ -2943,6 +3028,17 @@
                               }
                             "
                           ></es-icons>
+                          <component
+                            v-else-if="item.inline.type === 'component'"
+                            v-model="models[item.inline.name]"
+                            v-bind="
+                              handleExclAttribute({
+                                data: item.inline,
+                                attrs: ['value']
+                              })
+                            "
+                            v-on="item.inline.events"
+                          ></component>
                           <es-input
                             v-else
                             v-bind="
@@ -3366,6 +3462,17 @@
                     }
                   "
                 ></es-icons>
+                <component
+                  v-else-if="item.type === 'component'"
+                  v-model="models[item.name]"
+                  v-bind="
+                    handleExclAttribute({
+                      data: item,
+                      attrs: ['value']
+                    })
+                  "
+                  v-on="item.events"
+                ></component>
                 <es-input
                   v-else
                   v-bind="handleExclAttribute({ data: item, attrs: ['value'] })"
@@ -3598,6 +3705,17 @@
                               }
                             "
                           ></es-icons>
+                          <component
+                            v-else-if="inline.type === 'component'"
+                            v-model="models[inline.name]"
+                            v-bind="
+                              handleExclAttribute({
+                                data: inline,
+                                attrs: ['value']
+                              })
+                            "
+                            v-on="inline.events"
+                          ></component>
                           <es-input
                             v-else
                             v-bind="
@@ -3794,6 +3912,17 @@
                           }
                         "
                       ></es-icons>
+                      <component
+                        v-else-if="item.inline.type === 'component'"
+                        v-model="models[item.inline.name]"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item.inline,
+                            attrs: ['value']
+                          })
+                        "
+                        v-on="item.inline.events"
+                      ></component>
                       <es-input
                         v-else
                         v-bind="

package/packages/form/src/table.vue

@@ -431,6 +431,17 @@
                         }
                       "
                     ></es-icons>
+                    <component
+                      v-else-if="item.type === 'component'"
+                      v-model="models[item.name]"
+                      v-bind="
+                        handleExclAttribute({
+                          data: item,
+                          attrs: ['value']
+                        })
+                      "
+                      v-on="item.events"
+                    ></component>
                     <es-input
                       v-else
                       v-bind="
@@ -707,6 +718,17 @@
                                   }
                                 "
                               ></es-icons>
+                              <component
+                                v-else-if="inline.type === 'component'"
+                                v-model="models[inline.name]"
+                                v-bind="
+                                  handleExclAttribute({
+                                    data: inline,
+                                    attrs: ['value']
+                                  })
+                                "
+                                v-on="inline.events"
+                              ></component>
                               <es-input
                                 v-else
                                 v-bind="
@@ -915,6 +937,17 @@
                               }
                             "
                           ></es-icons>
+                          <component
+                            v-else-if="item.inline.type === 'component'"
+                            v-model="models[item.inline.name]"
+                            v-bind="
+                              handleExclAttribute({
+                                data: item.inline,
+                                attrs: ['value']
+                              })
+                            "
+                            v-on="item.inline.events"
+                          ></component>
                           <es-input
                             v-else
                             v-bind="item.inline"

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' }
+          ]
         };
       }
     },