eoss-mobiles 0.2.46 → 0.2.48

package/package.json

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

package/packages/grid/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="em-grid" @click="showHide = false">
-    <van-grid v-bind="$attrs" v-on="$listeners" :column-num="columnNum">
+    <van-grid v-bind="$attrs" v-on="$listeners" :border="border" :column-num="columnNum">
       <draggable
         v-if="draggable"
         v-model="newData"
@@ -91,28 +91,29 @@
           </div>
         </transition-group>
       </draggable>
-      <!-- <van-grid-item
+      <van-grid-item
         v-bind="item"
         v-for="(item, index) of newData"
         :key="index"
         :class="{ 'em-grid-ellipsis': textEllipsis }"
         :style="`width:${100 / columnNum}%;`"
-        @mousedown.stop="onMouseDown(item)"
-        @mouseup.stop="onMouseUp($event, item)"
+        @click.stop="goView($event, item)"
         v-show="newData && newData.length > 0 && !draggable"
-      > -->
-      <div
+      >
+        <!-- @mousedown.stop="onMouseDown(item)"
+        @mouseup.stop="onMouseUp($event, item)" -->
+      <!-- <div
         :style="`display: inline-block;width:${100 / columnNum}%`"
         class="van-grid-item"
+        :class="{'border-none':!border}"
         v-for="item of newData"
-        @mousedown.stop="onMouseDown(item)"
-        @mouseup.stop="onMouseUp($event, item)"
+        @click.stop="goView($event, item)"
         v-show="newData && newData.length > 0 && !draggable"
         :key="item.id"
       >
         <div
           class="van-grid-item__content van-grid-item__content--center van-hairline"
-        >
+        > -->
           <i
             class="van-icon  van-grid-item__icon"
             :class="
@@ -181,9 +182,9 @@
           <div v-if="item.showMenu" class="em-grid-select-box">
             <van-icon size="30px" color="#fff" name="success" />
           </div>
-        </div>
-      </div>
-      <!-- </van-grid-item> -->
+        <!-- </div>
+      </div> -->
+      </van-grid-item>
       <slot v-show="newData && newData.length == 0" />
     </van-grid>
     <em-popup style="width:80%;height:50%" v-if="show" v-model="show">
@@ -284,6 +285,10 @@ export default {
     popoverTheme:{
       type:String,
       default:'dark'
+    },
+    border:{
+      type:Boolean,
+      default:true
     }   
   },
   data() {
@@ -435,26 +440,26 @@ export default {
         this.show = true;
         return;
       }
-      // const currentTime = new Date().getTime();
-      // const tapLength = currentTime - this.lastTapTime;
-      // this.lastTapTime = currentTime;
+      const currentTime = new Date().getTime();
+      const tapLength = currentTime - this.lastTapTime;
+      this.lastTapTime = currentTime;
       // if (tapLength > 300) {
       //   return;
       // }
       if (this.isHideMenu) {
-        // if (tapLength < 300) {
-        //   this.handleDoubleClick(val);
-        //   clearTimeout(this.timer);
-        //   return;
-        // }
-        // if (this.showHide) {
-        //   this.showHide = false;
-        //   return;
-        // }
-        // this.timer = setTimeout(() => {
+        if (tapLength < 300) {
+          this.handleDoubleClick(val);
+          clearTimeout(this.timer);
+          return;
+        }
+        if (this.showHide) {
+          this.showHide = false;
+          return;
+        }
+        this.timer = setTimeout(() => {
         this.$emit('click', val, event);
         this.targetStop && event.stopPropagation();
-        // }, 300);
+        }, 300);
       } else {
         this.$emit('click', val, event);
         this.targetStop && event.stopPropagation();

package/packages/picker/src/main.vue

@@ -328,10 +328,10 @@ export default {
   },
   methods: {
     handleClick(val) {
-       if (this.disabled || this.readonly) return;
       if (this.linkTag) {
         this.$emit('tagClick', val);
       } else {
+        if (this.disabled || this.readonly) return;
         this.showPicker = true;
       }
     },

package/packages/theme-chalk/lib/grid.css

@@ -1 +1 @@
-.em-grid-popup,.em-grid-popup-button{display:-webkit-box;display:-ms-flexbox}.em-grid-del{position:absolute;top:5px;right:5px}.em-grid-popup{padding:10px;height:100%;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.em-grid-popup-label{text-align:center;font-size:16px;color:#000;font-weight:700;margin-bottom:10px}.em-grid-popup-content{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.em-grid-popup-button{display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:10px}.em-grid-select-box{position:absolute;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.6);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.em-grid .van-popup{border-radius:5px}
+.em-grid-popup,.em-grid-popup-button{display:-webkit-box;display:-ms-flexbox}.em-grid-del{position:absolute;top:5px;right:5px}.em-grid-popup{padding:10px;height:100%;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.em-grid-popup-label{text-align:center;font-size:16px;color:#000;font-weight:700;margin-bottom:10px}.em-grid-popup-content{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.em-grid-popup-button{display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;margin-top:10px}.em-grid-select-box{position:absolute;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.6);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.em-grid .van-popup{border-radius:5px}.em-grid .border-none .van-grid-item__content::after{border:none}