From a199e2d9bb102956b5ed81bea12398da0848924e Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 10 Jun 2020 09:47:15 +0800
Subject: [PATCH] feat(mp-360): Compatible with sysComponents

---
 src/core/vue.js                           |  2 +-
 src/platforms/h5/components/app/index.vue | 50 ++++++++++++++---------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/core/vue.js b/src/core/vue.js
index 95e55e74..9e5820d8 100644
--- a/src/core/vue.js
+++ b/src/core/vue.js
@@ -39,6 +39,6 @@ export default function initVue (Vue) {
     if (~conflictTags.indexOf(tag)) { // svg 部分标签名称与 uni 标签冲突
       return false
     }
-    return oldGetTagNamespace(tag) || false
+    return oldGetTagNamespace(tag)
   }
 }
diff --git a/src/platforms/h5/components/app/index.vue b/src/platforms/h5/components/app/index.vue
index 4478264f..c4eef7d3 100644
--- a/src/platforms/h5/components/app/index.vue
+++ b/src/platforms/h5/components/app/index.vue
@@ -6,25 +6,32 @@
       <router-view :key="key" />
     </keep-alive>
     <!-- </transition> -->
-    <tab-bar
-      v-if="hasTabBar"
-      v-show="showTabBar"
+    <tab-bar
+      v-if="hasTabBar"
+      v-show="showTabBar"
       v-bind="tabBar"
     />
-    <toast
-      v-if="$options.components.Toast"
+    <toast
+      v-if="$options.components.Toast"
       v-bind="showToast"
     />
-    <action-sheet
-      v-if="$options.components.ActionSheet"
-      v-bind="showActionSheet"
+    <action-sheet
+      v-if="$options.components.ActionSheet"
+      v-bind="showActionSheet"
       @close="_onActionSheetClose"
     />
-    <modal
-      v-if="$options.components.Modal"
-      v-bind="showModal"
+    <modal
+      v-if="$options.components.Modal"
+      v-bind="showModal"
       @close="_onModalClose"
     />
+    <template v-if="sysComponents&&sysComponents.length">
+      <component
+        :is="item"
+        v-for="(item, index) in sysComponents"
+        :key="index"
+      />
+    </template>
   </uni-app>
 </template>
 <script>
@@ -56,7 +63,8 @@ export default {
     return {
       transitionName: 'fade',
       hideTabBar: false,
-      tabBar: __uniConfig.tabBar || {}
+      tabBar: __uniConfig.tabBar || {},
+      sysComponents: this.$sysComponents
     }
   },
   computed: {
@@ -79,7 +87,8 @@ export default {
       if (uni.canIUse('css.var')) {
         const windowBottomValue = !newVal ? (TABBAR_HEIGHT) : 0
         const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '')
-        const windowBottom = windowBottomValue && envMethod ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px`
+        const windowBottom = windowBottomValue && envMethod
+          ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px`
         document.documentElement.style.setProperty('--window-bottom', windowBottom)
         console.debug(`uni.${windowBottom ? 'showTabBar' : 'hideTabBar'}：--window-bottom=${windowBottom}`)
       }
@@ -111,10 +120,11 @@ export default {
 
 <style>
   @import "~uni-core/view/index.css";
-	uni-app {
-		display: block;
-		box-sizing: border-box;
-		width: 100%;
-		height: 100%;
-	}
-</style>
+
+  uni-app {
+    display: block;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+  }
+</style>
-- 
GitLab