From 75b940a7b1f76c9b006ca9b2a5c2ab9e87986934 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 24 Dec 2019 13:27:58 +0800
Subject: [PATCH] fix: remove other attrs

---
 src/core/view/components/textarea/index.vue   | 22 +-------
 .../app-plus/view/components/map/index.vue    |  4 +-
 .../app-plus/view/components/video/index.vue  |  4 +-
 .../h5/view/components/audio/index.vue        | 22 +++-----
 .../h5/view/components/video/index.vue        | 54 +++----------------
 5 files changed, 18 insertions(+), 88 deletions(-)

diff --git a/src/core/view/components/textarea/index.vue b/src/core/view/components/textarea/index.vue
index 18fc6bc8e..43bab8d5c 100644
--- a/src/core/view/components/textarea/index.vue
+++ b/src/core/view/components/textarea/index.vue
@@ -1,20 +1,7 @@
 <template>
   <uni-textarea
-    :value="_checkEmpty(value)"
-    :maxlength="maxlengthNumber"
-    :placeholder="_checkEmpty(placeholder)"
-    :disabled="disabled"
-    :focus="focus"
-    :auto-focus="autoFocus"
-    :placeholder-class="_checkEmpty(placeholderClass)"
-    :placeholder-style="_checkEmpty(placeholderStyle)"
-    :auto-height="autoHeight"
-    :cursor="cursorNumber"
-    :selection-start="selectionStartNumber"
-    :selection-end="selectionEndNumber"
     @change.stop
-    v-on="$listeners"
-  >
+    v-on="$listeners">
     <div class="uni-textarea-wrapper">
       <div
         v-show="!(composition||valueSync.length)"
@@ -41,6 +28,7 @@
         :maxlength="maxlengthNumber"
         :autofocus="autoFocus"
         :class="{'uni-textarea-textarea-ios': isIOS}"
+        :style="{'overflow-y': autoHeight? 'hidden':'auto'}"
         class="uni-textarea-textarea"
         @compositionstart="_compositionstart"
         @compositionend="_compositionend"
@@ -286,9 +274,6 @@ export default {
     },
     _resetFormData () {
       this.valueSync = ''
-    },
-    _checkEmpty (str) {
-      return str || false
     }
   }
 }
@@ -306,9 +291,6 @@ uni-textarea {
 uni-textarea[hidden] {
   display: none;
 }
-uni-textarea[auto-height] .uni-textarea-textarea {
-  overflow-y: hidden;
-}
 .uni-textarea-wrapper,
 .uni-textarea-placeholder,
 .uni-textarea-line,
diff --git a/src/platforms/app-plus/view/components/map/index.vue b/src/platforms/app-plus/view/components/map/index.vue
index ce2468626..4f9f0988a 100644
--- a/src/platforms/app-plus/view/components/map/index.vue
+++ b/src/platforms/app-plus/view/components/map/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <uni-map
-    v-bind="attrs"
-    v-on="$listeners">
+  <uni-map v-on="$listeners">
     <div
       ref="container"
       class="uni-map-container" />
diff --git a/src/platforms/app-plus/view/components/video/index.vue b/src/platforms/app-plus/view/components/video/index.vue
index 0da0d50c0..3b3677fa2 100644
--- a/src/platforms/app-plus/view/components/video/index.vue
+++ b/src/platforms/app-plus/view/components/video/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <uni-video
-    v-bind="attrs"
-    v-on="$listeners">
+  <uni-video v-on="$listeners">
     <div
       ref="container"
       class="uni-video-container" />
diff --git a/src/platforms/h5/view/components/audio/index.vue b/src/platforms/h5/view/components/audio/index.vue
index bdcf76d5a..00c401709 100644
--- a/src/platforms/h5/view/components/audio/index.vue
+++ b/src/platforms/h5/view/components/audio/index.vue
@@ -1,25 +1,19 @@
 <template>
   <uni-audio
     :id="id"
-    :src="src"
-    :loop="loop"
-    :controls="controls"
-    :poster="poster"
-    :name="name"
-    :author="author"
     v-on="$listeners"
   >
-    <audio
-      ref="audio"
-      :loop="loop"
+    <audio
+      ref="audio"
+      :loop="loop"
       style="display:none;"/>
     <div class="uni-audio-default">
-      <div
-        :style="'background-image: url('+$getRealPath(poster)+');'"
+      <div
+        :style="'background-image: url('+$getRealPath(poster)+');'"
         class="uni-audio-left">
-        <div
-          :class="{play:!playing,pause:playing}"
-          class="uni-audio-button"
+        <div
+          :class="{play:!playing,pause:playing}"
+          class="uni-audio-button"
           @click="trigger"/>
       </div>
       <div class="uni-audio-right">
diff --git a/src/platforms/h5/view/components/video/index.vue b/src/platforms/h5/view/components/video/index.vue
index 210b5193f..86956dd92 100644
--- a/src/platforms/h5/view/components/video/index.vue
+++ b/src/platforms/h5/view/components/video/index.vue
@@ -1,29 +1,6 @@
 <template>
   <uni-video
     :id="id"
-    :src="src"
-    :initial-time="initialTime"
-    :duration="duration"
-    :controls="controls"
-    :danmu-list="danmuList"
-    :danmu-btn="danmuBtn"
-    :enable-danmu="enableDanmu"
-    :autoplay="autoplay"
-    :loop="loop"
-    :muted="muted"
-    :page-gesture="pageGesture"
-    :direction="direction"
-    :show-progress="showProgress"
-    :show-fullscreen-btn="showFullscreenBtn"
-    :show-play-btn="showPlayBtn"
-    :show-center-play-btn="showCenterPlayBtn"
-    :enable-progress-gesture="enableProgressGesture"
-    :object-fit="objectFit"
-    :poster="poster"
-    :x5-video-player-type="x5VideoPlayerType"
-    :x5-video-player-fullscreen="x5VideoPlayerFullscren"
-    :x5-video-orientation="x5VideoOrientation"
-    :x5-playsinline="x5Playsinline"
     v-on="$listeners"
   >
     <div
@@ -43,10 +20,7 @@
         :loop="loop"
         :src="srcSync"
         :poster="poster"
-        :x5-video-player-type="x5VideoPlayerType"
-        :x5-video-player-fullscreen="x5VideoPlayerFullscren"
-        :x5-video-orientation="x5VideoOrientation"
-        :x5-playsinline="x5Playsinline"
+        v-bind="$attrs"
         class="uni-video-video"
         webkit-playsinline
         playsinline
@@ -71,12 +45,12 @@
             <div class="uni-video-progress">
               <div
                 :style="{width:buffered*100+'%'}"
-                class="uni-video-progress-buffered"/>
+                class="uni-video-progress-buffered" />
               <div
                 ref="ball"
                 :style="{left:progress+'%'}"
                 class="uni-video-ball">
-                <div class="uni-video-inner"/>
+                <div class="uni-video-inner" />
               </div>
             </div>
           </div>
@@ -99,14 +73,14 @@
         v-show="start&&enableDanmuSync"
         ref="danmu"
         style="z-index: 0;"
-        class="uni-video-danmu"/>
+        class="uni-video-danmu" />
       <div
         v-if="!start"
         class="uni-video-cover"
         @click.stop>
         <div
           class="uni-video-cover-play-button"
-          @click.stop="play"/>
+          @click.stop="play" />
         <p class="uni-video-cover-duration">{{ (duration||durationTime)|getTime }}</p>
       </div>
       <div
@@ -148,7 +122,7 @@
     <div
       style="position: absolute; top: 0; width: 100%; height: 100%; overflow: hidden; pointer-events: none;"
     >
-      <slot/>
+      <slot />
     </div>
   </uni-video>
 </template>
@@ -267,22 +241,6 @@ export default {
     showPlayBtn: {
       type: [Boolean, String],
       default: true
-    },
-    x5VideoPlayerType: {
-      type: [Boolean, String],
-      default: false
-    },
-    x5VideoPlayerFullscren: {
-      type: [Boolean, String],
-      default: false
-    },
-    x5VideoOrientation: {
-      type: [Boolean, String],
-      default: false
-    },
-    x5Playsinline: {
-      type: [Boolean, String],
-      default: false
     }
   },
   data () {
-- 
GitLab