Merge remote-tracking branch 'origin/master'

data-room-ui/packages/BigScreenDesign/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="(!pageLoading) && hasPermission"
+    v-if="hasPermission"
     class="bs-page-design-wrap"
   >
     <PageTopSetting
@@ -237,6 +237,7 @@ export default {
   //   })
   // },
   created () {
+    this.changePageLoading(true)
     this.permission()
     /**
        * 以下是为了解决在火狐浏览器上推拽时弹出tab页到搜索问题

data-room-ui/packages/BigScreenRun/index.vue

@@ -1,35 +1,37 @@
 <template>
-  <div
+  <div v-if="hasPermission">
-    v-if="!pageLoading"
-    class="bs-preview-wrap"
-    :style="previewWrapStyle"
-  >
     <div
-      v-if="hasPermission"
+      v-loading="pageLoading"
-      class="bs-render-wrap render-theme-wrap"
+      element-loading-background="#151A26"
-      :style="renderStyle"
+      class="bs-preview-wrap"
+      :style="previewWrapStyle"
     >
       <div
-        v-for="chart in chartList"
+        class="bs-render-wrap render-theme-wrap"
-        :key="chart.code"
+        :style="renderStyle"
-        :style="{
-          position: 'absolute',
-          width: chart.w + 'px',
-          height: chart.h + 'px',
-          left: chart.x + 'px',
-          top: chart.y + 'px',
-          zIndex: chart.z || 0
-        }"
       >
-        <RenderCard
+        <div
-          ref="RenderCardRef"
+          v-for="chart in chartList"
-          :key="chart.key"
+          :key="chart.code"
-          :config="chart"
+          :style="{
-        />
+            position: 'absolute',
+            width: chart.w + 'px',
+            height: chart.h + 'px',
+            left: chart.x + 'px',
+            top: chart.y + 'px',
+            zIndex: chart.z || 0
+          }"
+        >
+          <RenderCard
+            ref="RenderCardRef"
+            :key="chart.key"
+            :config="chart"
+          />
+        </div>
       </div>
     </div>
-    <NotPermission v-else />
   </div>
+  <NotPermission v-else />
 </template>
 <script>
 import { get } from 'data-room-ui/js/utils/http'