From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
PAMapp/components/popUpFrame.vue | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/PAMapp/components/popUpFrame.vue b/PAMapp/components/popUpFrame.vue
index f08993c..cfa9821 100644
--- a/PAMapp/components/popUpFrame.vue
+++ b/PAMapp/components/popUpFrame.vue
@@ -1,44 +1,59 @@
<template>
<div>
+
<Ui-Drawer :isVisible.sync="isUseDrawer"
@closeDrawer="closePopUp"
:size="drawerSize">
<slot></slot>
</Ui-Drawer>
+
<Ui-Dialog :isVisible.sync="isUseDialog"
@closeDialog="closePopUp"
:width="dialogWidth">
<slot></slot>
</Ui-Dialog>
+
</div>
</template>
<script lang="ts">
- import { Vue, Component, Prop,Emit, Watch, PropSync} from 'vue-property-decorator';
- import { isMobileDevice } from '../assets/ts/device';
+ import { Vue, Component, Prop, Emit, PropSync} from 'vue-property-decorator';
+ import UtilsService from '~/shared/services/utils.service';
+
@Component
export default class PopUpFrame extends Vue {
- @PropSync('isOpen',{type:Boolean,default:false}) syncIsOpen!:boolean;
- @Prop({default:'auto'}) drawerSize!:string; // element UI drawer default size
- @Prop({default:'50%'}) dialogWidth!:string; // element UI dialog default width
- private get isUseDrawer() : boolean {
- return this.syncIsOpen && isMobileDevice();
- }
- private set isUseDrawer(value: boolean) {
- this.$emit('update:isOpen',value);
- }
+ @PropSync('isOpen',{type:Boolean,default:false})
+ syncIsOpen!:boolean;
- private get isUseDialog() : boolean {
- return this.syncIsOpen && !isMobileDevice();
- }
-
- private set isUseDialog(value: boolean) {
- this.$emit('update:isOpen',value);
- }
+ @Prop({default:'auto'})
+ drawerSize!:string; // element UI drawer default size
+
+ @Prop({default:'50%'})
+ dialogWidth!:string; // element UI dialog default width
+
+ //////////////////////////////////////////////////////////////////////
@Emit('closePopUp') closePopUp() {
- return;
+ return;
+ }
+
+ //////////////////////////////////////////////////////////////////////
+
+ get isUseDrawer() : boolean {
+ return this.syncIsOpen && UtilsService.isMobileDevice();
+ }
+
+ set isUseDrawer(value: boolean) {
+ this.syncIsOpen = value
+ }
+
+ get isUseDialog() : boolean {
+ return this.syncIsOpen && !UtilsService.isMobileDevice();
+ }
+
+ set isUseDialog(value: boolean) {
+ this.syncIsOpen = value
}
}
</script>
--
Gitblit v1.8.0