From a7e69e597cc970513d928c5842ae8d572a7a7efe Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Tue, 24 Mar 2020 16:23:33 +0800
Subject: [PATCH] =?UTF-8?q?update:=20<page-meta>,=20<navigation-bar>=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20pages=20=E5=B1=9E=E6=80=A7=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/navigation-bar.vue             | 77 +++++++++++++++++++
 .../uni-cli-shared/components/page-meta.vue   | 26 ++++++-
 2 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/packages/uni-cli-shared/components/navigation-bar.vue b/packages/uni-cli-shared/components/navigation-bar.vue
index c8b3ab71..2e69a19f 100644
--- a/packages/uni-cli-shared/components/navigation-bar.vue
+++ b/packages/uni-cli-shared/components/navigation-bar.vue
@@ -3,12 +3,64 @@
 </template>
 
 <script>
+const attrs = [
+  'titleIcon',
+  'titleIconRadius',
+  'subtitleText',
+  'subtitleSize',
+  'subtitleColor',
+  'subtitleOverflow',
+  'titleAlign',
+  'backgroundImage',
+  'backgroundRepeat',
+  'blurEffect'
+]
 export default {
   props: {
     title: {
       type: String,
       default: ''
     },
+    titleIcon: {
+      type: String,
+      default: ''
+    },
+    titleIconRadius: {
+      type: String,
+      default: ''
+    },
+    subtitleText: {
+      type: String,
+      default: ''
+    },
+    subtitleSize: {
+      type: String,
+      default: ''
+    },
+    subtitleColor: {
+      type: String,
+      default: ''
+    },
+    subtitleOverflow: {
+      type: String,
+      default: ''
+    },
+    titleAlign: {
+      type: String,
+      default: ''
+    },
+    backgroundImage: {
+      type: String,
+      default: ''
+    },
+    backgroundRepeat: {
+      type: String,
+      default: ''
+    },
+    blurEffect: {
+      type: String,
+      default: ''
+    },
     loading: {
       type: Boolean,
       default: false
@@ -31,6 +83,7 @@ export default {
     }
   },
   created () {
+    const page = getCurrentPages()[0]
     this.$watch('title', () => {
       this.setNavigationBarTitle()
     })
@@ -46,6 +99,21 @@ export default {
     () => {
       this.setNavigationBarColor()
     })
+    // #ifdef APP-PLUS
+    this._webview = page.$getAppWebview()
+    attrs.forEach(key => {
+      let titleNView = {}
+      if (this[key] || this[key].length > 0){
+        titleNView[key] = this[key]
+      }
+      this.setTitleNView(titleNView)
+      this.$watch(key, (val) => {
+        let titleStyle = {}
+        titleStyle[key] = val
+        this.setTitleNView(titleStyle)
+      })
+    })
+    // #endif
   },
   beforeMount () {
     this.title && this.setNavigationBarTitle()
@@ -70,6 +138,15 @@ export default {
           timingFunc: this.colorAnimationTimingFunc
         }
       })
+    },
+    setTitleNView (titleNView) {
+      const webview = this._webview
+      const style = webview.getStyle()
+      if (style && style.titleNView) {
+        webview.setStyle({
+          titleNView: titleNView
+        })
+      }
     }
   }
 }
diff --git a/packages/uni-cli-shared/components/page-meta.vue b/packages/uni-cli-shared/components/page-meta.vue
index b291ca9b..730e70c0 100644
--- a/packages/uni-cli-shared/components/page-meta.vue
+++ b/packages/uni-cli-shared/components/page-meta.vue
@@ -53,6 +53,10 @@ export default {
     pageStyle: {
       type: String,
       default: ''
+    },
+    enablePullDownRefresh: {
+      type: [Boolean, String],
+      default: false
     },
     rootFontSize: {
       type: String,
@@ -77,7 +81,17 @@ export default {
     // 父节点一定是 page
     this.$pageVm.$on('hook:onPageScroll', evt => {
       this.$emit('scroll', evt)
-    })
+    })
+
+    // #ifdef APP-PLUS
+    this._currentWebview = page.$getAppWebview()
+    if (this.enablePullDownRefresh) {
+      this.setPullDownRefresh(this._currentWebview, true)
+    }
+    this.$watch('enablePullDownRefresh', (val) => {
+      this.setPullDownRefresh(this._currentWebview, val)
+    })
+    // #endif
 
     // props
 
@@ -112,7 +126,15 @@ export default {
     this.backgroundTextStyle && this.setBackgroundTextStyle()
     this.scrollTop && this.pageScrollTo()
   },
-  methods: {
+  methods: {
+    setPullDownRefresh (webview, enabled) {
+      webview.setStyle({
+        pullToRefresh: {
+          support: enabled,
+          style: plus.os.name === 'Android' ? 'circle' : 'default'
+        }
+      })
+    },
     setPageMeta () {
       // h5 和 app-plus 设置 rootFontSize
       // #ifdef H5 || APP-PLUS
-- 
GitLab