From bbb80ff57336f756770b5cdae833d83e710baa16 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 6 Nov 2020 17:49:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(h5):=20pc=20=E7=AB=AF=E5=8D=95=E5=88=97=20?=
 =?UTF-8?q?picker=20=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=20select=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/components/app/popup/actionSheet.vue   |  8 +-
 .../h5/components/app/popup/mixins/popup.js   |  5 +-
 .../h5/view/components/picker/index.vue       | 74 +++++++++++++++++--
 3 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/src/platforms/h5/components/app/popup/actionSheet.vue b/src/platforms/h5/components/app/popup/actionSheet.vue
index e95863969..83677ddff 100644
--- a/src/platforms/h5/components/app/popup/actionSheet.vue
+++ b/src/platforms/h5/components/app/popup/actionSheet.vue
@@ -40,9 +40,9 @@
       </div>
       <div :style="popupStyle.triangle" />
     </div>
-    <keypress
-      :disable="!visible"
-      @esc="_close(-1)"
+    <keypress
+      :disable="!visible"
+      @esc="_close(-1)"
     />
   </uni-actionsheet>
 </template>
@@ -154,7 +154,7 @@ uni-actionsheet .uni-actionsheet__cell:first-child:before {
   display: none;
 }
 
-@media screen and (min-width: 500px) {
+@media screen and (min-width: 500px) and (min-height: 500px) {
   .uni-mask.uni-actionsheet__mask {
     background: none;
   }
diff --git a/src/platforms/h5/components/app/popup/mixins/popup.js b/src/platforms/h5/components/app/popup/mixins/popup.js
index 47eeaf243..a502935bf 100644
--- a/src/platforms/h5/components/app/popup/mixins/popup.js
+++ b/src/platforms/h5/components/app/popup/mixins/popup.js
@@ -6,6 +6,9 @@ export default {
     }
   },
   computed: {
+    isDesktop () {
+      return this.popupWidth >= 500 && this.popupHeight >= 500
+    },
     popupStyle () {
       const style = {}
       const contentStyle = style.content = {}
@@ -14,7 +17,7 @@ export default {
       function getNumber (value) {
         return Number(value) || 0
       }
-      if (this.popupWidth >= 500 && popover) {
+      if (this.isDesktop && popover) {
         Object.assign(triangleStyle, {
           position: 'absolute',
           width: '0',
diff --git a/src/platforms/h5/view/components/picker/index.vue b/src/platforms/h5/view/components/picker/index.vue
index 46457b3e9..e7e2c4fe2 100644
--- a/src/platforms/h5/view/components/picker/index.vue
+++ b/src/platforms/h5/view/components/picker/index.vue
@@ -7,6 +7,8 @@
     <div
       ref="picker"
       class="uni-picker-container"
+      :class="`uni-${mode}-${selectorTypeComputed}`"
+      @wheel.prevent
       @touchmove.prevent
     >
       <transition name="uni-fade">
@@ -57,10 +59,23 @@
             </div>
           </v-uni-picker-view-column>
         </v-uni-picker-view>
-        <!-- 第二种时间单位展示方式-暂时不用这种 -->
-        <!-- <div v-if="units.length" class="uni-picker-units">
-        <div v-for="(item,index) in units" :key="index">{{item}}</div>
-        </div>-->
+        <div
+          ref="select"
+          class="uni-picker-select"
+        >
+          <div
+            v-for="(item, index) in rangeArray[0]"
+            :key="index"
+            class="uni-picker-item"
+            :class="{ selected: valueArray[0] === index }"
+            @click="
+              valueArray[0] = index;
+              _change();
+            "
+          >
+            {{ typeof item === "object" ? item[rangeKey] || "" : item }}
+          </div>
+        </div>
         <div :style="popupStyle.triangle" />
       </div>
     </div>
@@ -130,6 +145,10 @@ const fields = {
   MONTH: 'month',
   DAY: 'day'
 }
+const selectorType = {
+  PICKER: 'picker',
+  SELECT: 'select'
+}
 export default {
   name: 'Picker',
   components: { keypress },
@@ -178,6 +197,10 @@ export default {
     disabled: {
       type: [Boolean, String],
       default: false
+    },
+    selectorType: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -233,14 +256,21 @@ export default {
         default:
           return []
       }
+    },
+    selectorTypeComputed () {
+      const type = this.selectorType
+      if (Object.values(selectorType).includes(type)) {
+        return type
+      }
+      return String(navigator.vendor).indexOf('Apple') === 0 && navigator.maxTouchPoints > 0 ? selectorType.PICKER : selectorType.SELECT
     }
-
   },
   watch: {
     visible (val) {
       if (val) {
         clearTimeout(this.__contentVisibleDelay)
         this.contentVisible = val
+        this._select()
       } else {
         this.__contentVisibleDelay = setTimeout(() => {
           this.contentVisible = val
@@ -524,6 +554,11 @@ export default {
         this.$el.prepend($picker)
         $picker.style.display = 'none'
       }, 260)
+    },
+    _select () {
+      if (this.mode === mode.SELECTOR && this.selectorTypeComputed === selectorType.SELECT) {
+        this.$refs.select.scrollTop = this.valueArray[0] * 34
+      }
     }
   }
 }
@@ -594,6 +629,7 @@ uni-picker[disabled] {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
+  cursor: pointer;
 }
 
 .uni-picker-container .uni-picker-header {
@@ -664,7 +700,11 @@ uni-picker[disabled] {
   transform: translateX(2em);
 } */
 
-@media screen and (min-width: 500px) {
+.uni-picker-container .uni-picker-select {
+  display: none;
+}
+
+@media screen and (min-width: 500px) and (min-height: 500px) {
   .uni-mask.uni-picker-mask {
     background: none;
   }
@@ -693,5 +733,27 @@ uni-picker[disabled] {
     opacity: 1;
     transform: translate(-50%, -50%);
   }
+  .uni-selector-select .uni-picker-header,
+  .uni-selector-select .uni-picker-content {
+    display: none;
+  }
+  .uni-selector-select .uni-picker-select {
+    display: block;
+    max-height: 300px;
+    overflow: auto;
+    background-color: white;
+    border-radius: 5px;
+    padding: 6px 0;
+  }
+  .uni-selector-select .uni-picker-item {
+    padding: 0 10px;
+    color: #555555;
+  }
+  .uni-selector-select .uni-picker-item:hover {
+    background-color: #f6f6f6;
+  }
+  .uni-selector-select .uni-picker-item.selected {
+    color: #007aff;
+  }
 }
 </style>
-- 
GitLab