From 3b7b5d796bc2000f6c109e51a33d158eca590d7b Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 12 Oct 2020 15:39:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(h5):=20=E4=BC=98=E5=8C=96=20picker=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=A7=E5=B1=8F=E5=B1=95=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/components/app/popup/actionSheet.vue   | 82 ++-----------------
 .../h5/components/app/popup/mixins/popup.js   | 69 ++++++++++++++++
 .../h5/view/components/picker/index.vue       | 74 ++++++++++++++---
 3 files changed, 141 insertions(+), 84 deletions(-)
 create mode 100644 src/platforms/h5/components/app/popup/mixins/popup.js

diff --git a/src/platforms/h5/components/app/popup/actionSheet.vue b/src/platforms/h5/components/app/popup/actionSheet.vue
index 196cb371a..d60cdaf2b 100644
--- a/src/platforms/h5/components/app/popup/actionSheet.vue
+++ b/src/platforms/h5/components/app/popup/actionSheet.vue
@@ -9,13 +9,13 @@
     </transition>
     <div
       :class="{ 'uni-actionsheet_toggle': visible }"
-      :style="actionSheetStyle.content"
+      :style="popupStyle.content"
       class="uni-actionsheet"
     >
       <div class="uni-actionsheet__menu">
-        <div
-          v-if="title"
-          class="uni-actionsheet__title"
+        <div
+          v-if="title"
+          class="uni-actionsheet__title"
         >
           {{ title }}
         </div>
@@ -38,13 +38,16 @@
           取消
         </div>
       </div>
-      <div :style="actionSheetStyle.triangle" />
+      <div :style="popupStyle.triangle" />
     </div>
   </uni-actionsheet>
 </template>
 <script>
+import popup from './mixins/popup'
+
 export default {
   name: 'ActionSheet',
+  mixins: [popup],
   props: {
     title: {
       type: String,
@@ -69,75 +72,6 @@ export default {
       default: false
     }
   },
-  data () {
-    return {
-      width: 0,
-      height: 0,
-      top: top
-    }
-  },
-  computed: {
-    actionSheetStyle () {
-      const style = {}
-      const contentStyle = style.content = {}
-      const triangleStyle = style.triangle = {}
-      const popover = this.popover
-      function getNumber (value) {
-        return Number(value) || 0
-      }
-      if (this.width >= 500 && popover) {
-        Object.assign(triangleStyle, {
-          position: 'absolute',
-          width: '0',
-          height: '0',
-          'margin-left': '-6px',
-          'border-style': 'solid'
-        })
-        const popoverLeft = getNumber(popover.left)
-        const popoverWidth = getNumber(popover.width)
-        const popoverTop = getNumber(popover.top)
-        const popoverHeight = getNumber(popover.height)
-        const center = (popoverLeft + popoverWidth) / 2
-        contentStyle.transform = 'none !important'
-        const contentLeft = Math.max(0, center - 300 / 2)
-        contentStyle.left = `${contentLeft}px`
-        let triangleLeft = Math.max(12, center - contentLeft)
-        triangleLeft = Math.min(300 - 12, triangleLeft)
-        triangleStyle.left = `${triangleLeft}px`
-        const vcl = this.height / 2
-        if (popoverTop + popoverHeight - vcl > vcl - popoverTop) {
-          contentStyle.top = 'auto'
-          contentStyle.bottom = `${this.height - popoverTop + 6}px`
-          triangleStyle.bottom = '-6px'
-          triangleStyle['border-width'] = '6px 6px 0 6px'
-          triangleStyle['border-color'] = '#fcfcfd transparent transparent transparent'
-        } else {
-          contentStyle.top = `${popoverTop + popoverHeight + 6}px`
-          triangleStyle.top = '-6px'
-          triangleStyle['border-width'] = '0 6px 6px 6px'
-          triangleStyle['border-color'] = 'transparent transparent #fcfcfd transparent'
-        }
-      }
-      return style
-    }
-  },
-  mounted () {
-    const fixSize = () => {
-      const {
-        windowWidth,
-        windowHeight,
-        windowTop
-      } = uni.getSystemInfoSync()
-      this.width = windowWidth
-      this.height = windowHeight + windowTop
-      this.top = windowTop
-    }
-    this.$watch('visible', value => value && fixSize())
-    window.addEventListener('resize', fixSize)
-    this.$once('hook:beforeDestroy', () => {
-      window.removeEventListener('resize', fixSize)
-    })
-  },
   methods: {
     _close (tapIndex) {
       this.$emit('close', tapIndex)
diff --git a/src/platforms/h5/components/app/popup/mixins/popup.js b/src/platforms/h5/components/app/popup/mixins/popup.js
new file mode 100644
index 000000000..413ff9e85
--- /dev/null
+++ b/src/platforms/h5/components/app/popup/mixins/popup.js
@@ -0,0 +1,69 @@
+export default {
+  data () {
+    return {
+      popupWidth: 0,
+      popupHeight: 0
+    }
+  },
+  computed: {
+    popupStyle () {
+      const style = {}
+      const contentStyle = style.content = {}
+      const triangleStyle = style.triangle = {}
+      const popover = this.popover
+      function getNumber (value) {
+        return Number(value) || 0
+      }
+      if (this.popupWidth >= 500 && popover) {
+        Object.assign(triangleStyle, {
+          position: 'absolute',
+          width: '0',
+          height: '0',
+          'margin-left': '-6px',
+          'border-style': 'solid'
+        })
+        const popoverLeft = getNumber(popover.left)
+        const popoverWidth = getNumber(popover.width)
+        const popoverTop = getNumber(popover.top)
+        const popoverHeight = getNumber(popover.height)
+        const center = (popoverLeft + popoverWidth) / 2
+        contentStyle.transform = 'none !important'
+        const contentLeft = Math.max(0, center - 300 / 2)
+        contentStyle.left = `${contentLeft}px`
+        let triangleLeft = Math.max(12, center - contentLeft)
+        triangleLeft = Math.min(300 - 12, triangleLeft)
+        triangleStyle.left = `${triangleLeft}px`
+        const vcl = this.popupHeight / 2
+        if (popoverTop + popoverHeight - vcl > vcl - popoverTop) {
+          contentStyle.top = 'auto'
+          contentStyle.bottom = `${this.popupHeight - popoverTop + 6}px`
+          triangleStyle.bottom = '-6px'
+          triangleStyle['border-width'] = '6px 6px 0 6px'
+          triangleStyle['border-color'] = '#fcfcfd transparent transparent transparent'
+        } else {
+          contentStyle.top = `${popoverTop + popoverHeight + 6}px`
+          triangleStyle.top = '-6px'
+          triangleStyle['border-width'] = '0 6px 6px 6px'
+          triangleStyle['border-color'] = 'transparent transparent #fcfcfd transparent'
+        }
+      }
+      return style
+    }
+  },
+  mounted () {
+    const fixSize = () => {
+      const {
+        windowWidth,
+        windowHeight,
+        windowTop
+      } = uni.getSystemInfoSync()
+      this.popupWidth = windowWidth
+      this.popupHeight = windowHeight + windowTop
+    }
+    this.$watch('visible', value => value && fixSize())
+    window.addEventListener('resize', fixSize)
+    this.$once('hook:beforeDestroy', () => {
+      window.removeEventListener('resize', fixSize)
+    })
+  }
+}
diff --git a/src/platforms/h5/view/components/picker/index.vue b/src/platforms/h5/view/components/picker/index.vue
index 5d2a0b362..92ad5fece 100644
--- a/src/platforms/h5/view/components/picker/index.vue
+++ b/src/platforms/h5/view/components/picker/index.vue
@@ -12,12 +12,13 @@
       <transition name="uni-fade">
         <div
           v-show="visible"
-          class="uni-mask"
+          class="uni-mask uni-picker-mask"
           @click="_cancel"
         />
       </transition>
       <div
-        :class="{'uni-picker-toggle':visible}"
+        :class="{ 'uni-picker-toggle': visible }"
+        :style="popupStyle.content"
         class="uni-picker"
       >
         <div
@@ -38,20 +39,21 @@
           </div>
         </div>
         <v-uni-picker-view
-          v-if="visible"
+          v-if="contentVisible"
           :value.sync="valueArray"
           class="uni-picker-content"
         >
           <v-uni-picker-view-column
-            v-for="(rangeItem,index0) in rangeArray"
+            v-for="(rangeItem, index0) in rangeArray"
             :key="index0"
           >
             <div
-              v-for="(item,index) in rangeItem"
+              v-for="(item, index) in rangeItem"
               :key="index"
               class="uni-picker-item"
             >
-              {{ typeof item==='object'?item[rangeKey]||'':item }}{{ units[index0]||'' }}
+              {{ typeof item === "object" ? item[rangeKey] || "" : item
+              }}{{ units[index0] || "" }}
             </div>
           </v-uni-picker-view-column>
         </v-uni-picker-view>
@@ -59,6 +61,7 @@
         <!-- <div v-if="units.length" class="uni-picker-units">
         <div v-for="(item,index) in units" :key="index">{{item}}</div>
         </div>-->
+        <div :style="popupStyle.triangle" />
       </div>
     </div>
     <div>
@@ -70,6 +73,7 @@
 <script>
 import { emitter } from 'uni-mixins'
 import { formatDateTime } from 'uni-shared'
+import popup from '../../../components/app/popup/mixins/popup'
 
 function getDefaultStartValue () {
   if (this.mode === mode.TIME) {
@@ -122,7 +126,7 @@ const fields = {
 }
 export default {
   name: 'Picker',
-  mixins: [emitter],
+  mixins: [emitter, popup],
   props: {
     name: {
       type: String,
@@ -173,6 +177,8 @@ export default {
     return {
       valueSync: null,
       visible: false,
+      contentVisible: false,
+      popover: null,
       valueChangeSource: '',
       timeArray: [],
       dateArray: [],
@@ -221,8 +227,19 @@ export default {
           return []
       }
     }
+
   },
   watch: {
+    visible (val) {
+      if (val) {
+        clearTimeout(this.__contentVisibleDelay)
+        this.contentVisible = val
+      } else {
+        this.__contentVisibleDelay = setTimeout(() => {
+          this.contentVisible = val
+        }, 300)
+      }
+    },
     value () {
       this._setValueSync()
     },
@@ -247,8 +264,7 @@ export default {
           const max = dateArray[2].length
           const day = Number(dateArray[2][valueArray[2]]) || 1
           const realDay = new Date(
-            `${dateArray[0][valueArray[0]]}/${
-            dateArray[1][valueArray[1]]
+            `${dateArray[0][valueArray[0]]}/${dateArray[1][valueArray[1]]
             }/${day}`
           ).getDate()
           if (realDay < day) {
@@ -292,7 +308,7 @@ export default {
     })
   },
   methods: {
-    _show () {
+    _show (event) {
       if (this.disabled) {
         return
       }
@@ -301,6 +317,13 @@ export default {
       $picker.remove();
       (document.querySelector('uni-app') || document.body).appendChild($picker)
       $picker.style.display = 'block'
+      const rect = event.currentTarget.getBoundingClientRect()
+      this.popover = {
+        top: rect.top,
+        left: rect.left,
+        width: rect.width,
+        height: rect.height
+      }
       setTimeout(() => {
         this.visible = true
       }, 20)
@@ -633,4 +656,35 @@ uni-picker[disabled] {
   text-align: center;
   transform: translateX(2em);
 } */
+
+@media screen and (min-width: 500px) {
+  .uni-mask.uni-picker-mask {
+    background: none;
+  }
+  .uni-picker-container .uni-picker {
+    width: 300px;
+    left: 50%;
+    right: auto;
+    top: 50%;
+    bottom: auto;
+    transform: translate(-50%, -50%);
+    opacity: 0;
+    border-radius: 5px;
+    transition: opacity 0.3s, visibility 0.3s;
+    box-shadow: 0px 0 20px 5px rgba(0, 0, 0, 0.3);
+  }
+  .uni-picker-container .uni-picker-header {
+    border-radius: 5px 5px 0 0;
+  }
+  .uni-picker-container .uni-picker-content {
+    /* transform 用于解决 Safari overflow 失效的问题 */
+    transform: translate(0 0);
+    overflow: hidden;
+    border-radius: 0 0 5px 5px;
+  }
+  .uni-picker-container .uni-picker.uni-picker-toggle {
+    opacity: 1;
+    transform: translate(-50%, -50%);
+  }
+}
 </style>
-- 
GitLab