Browse Source

Merge branch 'dev/v1.2.11_wmh' of jianyu/jy-docs into feature/v1.2.11

wenmenghao 1 year ago
parent
commit
660e378eda
2 changed files with 12 additions and 1 deletions
  1. 7 1
      jydocs-mobile/src/views/Home.vue
  2. 5 0
      jydocs-mobile/src/views/details/details.vue

+ 7 - 1
jydocs-mobile/src/views/Home.vue

@@ -126,7 +126,7 @@
         </div>
       </van-list>
     </div>
-    <screenPopup ref="screenPopup" v-model="tabsActive" :list="tabslist"></screenPopup>
+    <screenPopup ref="screenPopup" v-model="tabsActive" :list="tabslist" @change="popChange"></screenPopup>
   </div>
 </template>
 <script lang="ts">
@@ -325,6 +325,12 @@ export default class extends Vue {
     await this.getList()
   }
 
+  popChange (val: any) {
+    this.$nextTick(() => {
+      this.tabChange(val)
+    })
+  }
+
   openScreen () {
     (this.$refs.screenPopup as any).show = true
   }

+ 5 - 0
jydocs-mobile/src/views/details/details.vue

@@ -740,6 +740,11 @@ export default class extends Vue {
   }
   .excel_{
     height: 500px;
+    ::v-deep{
+      .x-spreadsheet-overlayer{
+        z-index: 0;
+      }
+    }
   }
   .doc_{
     ::v-deep{