eoss-mobiles 0.2.62 → 0.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.62",
+  "version": "0.2.63",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/grid/src/main.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="em-grid" @click="showHide = false">
-    <van-grid v-bind="$attrs" v-on="$listeners" :border="border" :column-num="columnNum">
+    <van-grid
+      v-bind="$attrs"
+      v-on="$listeners"
+      :border="border"
+      :column-num="columnNum"
+    >
       <draggable
         v-if="draggable"
         v-model="newData"
@@ -102,7 +107,7 @@
       >
         <!-- @mousedown.stop="onMouseDown(item)"
         @mouseup.stop="onMouseUp($event, item)" -->
-      <!-- <div
+        <!-- <div
         :style="`display: inline-block;width:${100 / columnNum}%`"
         class="van-grid-item"
         :class="{'border-none':!border}"
@@ -114,74 +119,73 @@
         <div
           class="van-grid-item__content van-grid-item__content--center van-hairline"
         > -->
-          <i
-            class="van-icon  van-grid-item__icon"
-            :class="
-              item.icon.startsWith('http') && item.icon.indexOf('/') != -1
-                ? ''
-                : `van-icon-${item.icon}`
-            "
+        <i
+          class="van-icon  van-grid-item__icon"
+          :class="
+            item.icon.startsWith('http') && item.icon.indexOf('/') != -1
+              ? ''
+              : `van-icon-${item.icon}`
+          "
+          :style="{
+            fontSize:
+              item.iconSize || $attrs['icon-size']
+                ? item.iconSize || $attrs['icon-size']
+                : ''
+          }"
+        >
+          <em-image
+            v-if="item.icon.startsWith('http') || item.icon.indexOf('/') != -1"
+            class="van-icon__image"
+            :src="item.icon"
+            :error-icon="errorIcon"
             :style="{
-              fontSize:
+              width:
+                item.iconSize || $attrs['icon-size']
+                  ? item.iconSize || $attrs['icon-size']
+                  : '',
+              height:
                 item.iconSize || $attrs['icon-size']
                   ? item.iconSize || $attrs['icon-size']
                   : ''
             }"
-          >
-            <img
-              v-if="
-                item.icon.startsWith('http') || item.icon.indexOf('/') != -1
-              "
-              class="van-icon__image"
-              :src="item.icon"
-              :style="{
-                width:
-                  item.iconSize || $attrs['icon-size']
-                    ? item.iconSize || $attrs['icon-size']
-                    : '',
-                height:
-                  item.iconSize || $attrs['icon-size']
-                    ? item.iconSize || $attrs['icon-size']
-                    : ''
-              }"
-            />
-            <div
-              v-show="item.dot"
-              :style="{ background: item.dotColor || '' }"
-              class="van-info van-info--dot"
-            ></div>
-            <div
-              class="van-info"
-              :style="{ background: badgeColor || '' }"
-              v-show="item.badge"
-            >
-              {{
-                maxBadge &&
-                !isNaN(item.badge) &&
-                Number(maxBadge) < Number(item.badge)
-                  ? maxBadge + '+'
-                  : item.badge
-              }}
-            </div>
-          </i>
-          <em-popover
-            v-model="item.showPopover"
-            :placement="placement"
-            @select="popoverSelect($event,item)"
-            :theme="popoverTheme"
-            :actions="popoverActions"
-          ></em-popover>
-          <span class="van-grid-item__text">{{ item.text }}</span>
-          <van-icon
-            v-if="showHide && item.menuType != 'add'"
-            @click.stop="handleHide(item)"
-            name="clear"
-            size="20px"
-            class="em-grid-del"
           />
-          <div v-if="item.showMenu" class="em-grid-select-box">
-            <van-icon size="30px" color="#fff" name="success" />
+          <div
+            v-show="item.dot"
+            :style="{ background: item.dotColor || '' }"
+            class="van-info van-info--dot"
+          ></div>
+          <div
+            class="van-info"
+            :style="{ background: badgeColor || '' }"
+            v-show="item.badge"
+          >
+            {{
+              maxBadge &&
+              !isNaN(item.badge) &&
+              Number(maxBadge) < Number(item.badge)
+                ? maxBadge + '+'
+                : item.badge
+            }}
           </div>
+        </i>
+        <em-popover
+          v-model="item.showPopover"
+          :placement="placement"
+          @select="popoverSelect($event, item)"
+          :theme="popoverTheme"
+          :actions="popoverActions"
+        ></em-popover>
+        <span class="van-grid-item__text">{{ item.text }}</span>
+        <van-icon
+          v-if="showHide && item.menuType != 'add'"
+          @click.stop="handleHide(item)"
+          name="clear"
+          size="20px"
+          class="em-grid-del"
+        />
+        <div v-if="item.showMenu" class="em-grid-select-box">
+          <van-icon size="30px" color="#fff" name="success" />
+        </div>
         <!-- </div>
       </div> -->
       </van-grid-item>
@@ -272,24 +276,28 @@ export default {
     },
     popoverActions: {
       type: Array,
-      default: () => [{ text: '隐藏菜单',type:'hideMenu' }]
+      default: () => [{ text: '隐藏菜单', type: 'hideMenu' }]
     },
     isTouch: {
       type: Boolean,
       default: false
     },
-    placement:{
-      type:String,
-      default:'top'
+    placement: {
+      type: String,
+      default: 'top'
+    },
+    popoverTheme: {
+      type: String,
+      default: 'dark'
     },
-    popoverTheme:{
-      type:String,
-      default:'dark'
+    border: {
+      type: Boolean,
+      default: true
     },
-    border:{
-      type:Boolean,
-      default:true
-    }   
+    errorIcon: {
+      type: String,
+      default: ''
+    }
   },
   data() {
     return {
@@ -322,10 +330,10 @@ export default {
   },
   methods: {
     popoverSelect(val, item) {
-      if(val.type == 'hideMenu'){
-        this.handleHide(item)
-      }else{
-        this.$emit('touchSelect',{action:val,data:item})
+      if (val.type == 'hideMenu') {
+        this.handleHide(item);
+      } else {
+        this.$emit('touchSelect', { action: val, data: item });
       }
     },
     onMouseDown(item) {
@@ -457,8 +465,8 @@ export default {
           return;
         }
         this.timer = setTimeout(() => {
-        this.$emit('click', val, event);
-        this.targetStop && event.stopPropagation();
+          this.$emit('click', val, event);
+          this.targetStop && event.stopPropagation();
         }, 300);
       } else {
         this.$emit('click', val, event);

package/src/index.js

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