Merge branch 'dev' into alpha

src/core/view/components/input/index.vue

@@ -16,6 +16,7 @@
         v-text="placeholder"
       />
       <input
+        v-if="!disabled || !fixColor"
         ref="input"
         v-model="valueSync"
         v-keyboard
@@ -33,6 +34,17 @@
         @compositionend="_onComposition"
         @keyup.stop="_onKeyup"
       >
+      <input
+        v-if="disabled && fixColor"
+        ref="input"
+        :value="valueSync"
+        tabindex="-1"
+        :readonly="disabled"
+        :type="inputType"
+        :maxlength="maxlength"
+        :step="step"
+        class="uni-input-input"
+      >
     </div>
   </uni-input>
 </template>
@@ -91,7 +103,9 @@ export default {
     return {
       composing: false,
       wrapperHeight: 0,
-      cachedValue: ''
+      cachedValue: '',
+      // Safari 14 以上修正禁用状态颜色
+      fixColor: String(navigator.vendor).indexOf('Apple') === 0 && CSS.supports('image-orientation:from-image')
     }
   },
   computed: {
@@ -285,12 +299,12 @@ uni-input[hidden] {
 }
 
 .uni-input-input {
+  position: relative;
   display: block;
   height: 100%;
   background: none;
   color: inherit;
   opacity: 1;
-  -webkit-text-fill-color: currentcolor;
   font: inherit;
   line-height: inherit;
   letter-spacing: inherit;
@@ -313,4 +327,9 @@ uni-input[hidden] {
 .uni-input-input[type="number"] {
   -moz-appearance: textfield;
 }
+
+.uni-input-input:disabled {
+  /* 用于重置iOS14以下禁用状态文字颜色 */
+  -webkit-text-fill-color: currentcolor;
+}
 </style>

src/core/view/components/textarea/index.vue

@@ -5,7 +5,7 @@
   >
     <div class="uni-textarea-wrapper">
       <div
-        v-show="!(composition||valueSync.length)"
+        v-show="!(composition || valueSync.length)"
         ref="placeholder"
         :style="placeholderStyle"
         :class="placeholderClass"
@@ -19,7 +19,7 @@
       />
       <div class="uni-textarea-compute">
         <div
-          v-for="(item,index) in valueCompute"
+          v-for="(item, index) in valueCompute"
           :key="index"
           v-text="item.trim() ? item : '.'"
         />
@@ -29,14 +29,15 @@
         />
       </div>
       <textarea
+        v-if="!disabled || !fixColor"
         ref="textarea"
         v-model="valueSync"
         v-keyboard
         :disabled="disabled"
         :maxlength="maxlengthNumber"
         :autofocus="autoFocus || focus"
-        :class="{'uni-textarea-textarea-fix-margin': fixMargin}"
-        :style="{'overflow-y': autoHeight? 'hidden':'auto'}"
+        :class="{ 'uni-textarea-textarea-fix-margin': fixMargin }"
+        :style="{ 'overflow-y': autoHeight ? 'hidden' : 'auto' }"
         class="uni-textarea-textarea"
         @compositionstart="_compositionstart"
         @compositionend="_compositionend"
@@ -45,6 +46,17 @@
         @blur="_blur"
         @touchstart.passive="_touchstart"
       />
+      <textarea
+        v-if="disabled && fixColor"
+        ref="textarea"
+        :value="valueSync"
+        tabindex="-1"
+        :readonly="disabled"
+        :maxlength="maxlengthNumber"
+        :class="{ 'uni-textarea-textarea-fix-margin': fixMargin }"
+        :style="{ 'overflow-y': autoHeight ? 'hidden' : 'auto' }"
+        class="uni-textarea-textarea"
+      />
     </div>
   </uni-textarea>
 </template>
@@ -114,7 +126,9 @@ export default {
       height: 0,
       focusChangeSource: '',
       // iOS 13 以下版本需要修正边距
-      fixMargin: String(navigator.platform).indexOf('iP') === 0 && String(navigator.vendor).indexOf('Apple') === 0 && window.matchMedia(DARK_TEST_STRING).media !== DARK_TEST_STRING
+      fixMargin: String(navigator.platform).indexOf('iP') === 0 && String(navigator.vendor).indexOf('Apple') === 0 && window.matchMedia(DARK_TEST_STRING).media !== DARK_TEST_STRING,
+      // Safari 14 以上修正禁用状态颜色
+      fixColor: String(navigator.vendor).indexOf('Apple') === 0 && CSS.supports('image-orientation:from-image')
     }
   },
   computed: {
@@ -340,7 +354,6 @@ uni-textarea[hidden] {
   background: none;
   color: inherit;
   opacity: 1;
-  -webkit-text-fill-color: currentcolor;
   font: inherit;
   line-height: inherit;
   letter-spacing: inherit;
@@ -355,4 +368,8 @@ uni-textarea[hidden] {
   right: 0;
   margin: 0 -3px;
 }
+.uni-textarea-textarea:disabled {
+  /* 用于重置iOS14以下禁用状态文字颜色 */
+  -webkit-text-fill-color: currentcolor;
+}
 </style>

src/platforms/app-plus/service/api/media/get-image-info.js

 import {
   warpPlusMethod
 } from '../util'
+import {
+  TEMP_PATH
+} from '../constants'
 
-export const getImageInfo = warpPlusMethod('io', 'getImageInfo')
+export const getImageInfo = warpPlusMethod('io', 'getImageInfo', options => {
+  options.savePath = options.filename = TEMP_PATH + '/download/'
+  return options
+})

src/platforms/app-plus/view/components/web-view/index.vue

@@ -34,7 +34,8 @@ const insertHTMLWebView = ({
       const title = webview.getTitle()
       parentWebview.setStyle({
         titleNView: {
-          titleText: (!title || title === 'null') ? '' : title
+          // iOS titleText 为空字符串时 按钮会隐藏
+          titleText: (!title || title === 'null') ? ' ' : title
         }
       })
     })

src/platforms/h5/components/app/layout.vue

@@ -330,7 +330,8 @@ export default {
   }
 
   uni-main {
-    flex: 1;
+    flex: 1;
+    width: 100%;
   }
 
   uni-top-window+uni-content {