Browse Source

fix: toast问题

杨凯旋 5 years ago
parent
commit
192cf9ee56

+ 2 - 2
src/packages/popup/index.js

@@ -1,7 +1,7 @@
 import Popup from "./popup.vue";
 import "./popup.scss";
-import { overlayProps ,getProps} from "./overlay/overlay-manager";
-
+import { getProps} from "./overlay/overlay-manager";
+import { overlayProps } from './overlay/overlay.vue';
 Popup.install = function(Vue) {
   Vue.component(Popup.name, Popup);
 };

+ 3 - 1
src/packages/popup/overlay/overlay-manager.js

@@ -106,7 +106,9 @@ const overlayProps = {
   },
   overlayStyle: {
     type: Object,
-    default: {},
+    default: function () {
+      return null
+    },
   },
   zIndex: {
     type: Number

+ 1 - 1
src/packages/popup/overlay/overlay.vue

@@ -37,7 +37,7 @@ const overlayProps = {
   },
   overlayStyle: {
     type: Object,
-    default: {},
+    default: ()=>{},
   },
   zIndex: {
     type: Number

+ 2 - 1
src/packages/popup/popup.vue

@@ -25,7 +25,8 @@
 import Vue from 'vue';
 import Icon from '../icon/icon.vue';
 import touchMixins from '../../mixins/touch.js';
-import { overlayManager, overlayProps } from './overlay/overlay-manager.js';
+import { overlayManager } from './overlay/overlay-manager.js';
+import { overlayProps } from './overlay/overlay.vue';
 import { on, off } from '../../utils/event';
 import '../icon/icon.scss';
 

+ 4 - 7
src/packages/toast/_toast.js

@@ -37,14 +37,11 @@ function _showToast() {
     instance.visible = true;
   });
 }
-
+ 
 function _getInstance(obj) {
-  let opt = {
-    id: 1,
-    ...currentOptions,
-    ...defaultOptionsMap[obj.type],
-    ...obj
-  };
+  let opt = {id: '0'};
+  Object.assign(opt,currentOptions,defaultOptionsMap[obj.type],obj)
+ 
 
   //有相同id者共用一个实例,否则新增实例
   if (opt['id'] && instanceArr[opt['id']]) {

+ 1 - 1
src/packages/toast/demo.vue

@@ -6,7 +6,7 @@
       <nut-button size="middle" @click.native="textToast2('我传了文案和显示时长两个参数,多行文字默认居中展示', 5000)">长文字提示</nut-button>
       <nut-button size="middle" @click.native="sucToast('操作成功')">成功提示</nut-button>
       <nut-button size="middle" @click.native="failToast('操作失败')">失败提示</nut-button>
-      <nut-button size="middle" @click.native="failToast('操作失败')" color="#fff">警告提示</nut-button>
+      <nut-button size="middle" @click.native="warnToast('操作警告')" >警告提示</nut-button>
     </div>
     <h4>加载提示</h4>
     <div class="demo-content">

+ 4 - 1
src/packages/toast/toast.scss

@@ -1,5 +1,8 @@
 @import '../../styles/animation/rotate';
- 
+.nut-toast{
+  width: 100%;
+  text-align: center;
+}
   .nut-toast-small {
     .nut-toast-inner {
       font-size: $font-size-small;

+ 1 - 0
src/packages/toast/toast.vue

@@ -5,6 +5,7 @@
       :class="toastClass"
       v-model="visible"
       :overlayStyle='{backgroundColor:coverColor}'
+      class="nut-toast"
       :style="{backgroundColor:'transparent'}"
     >
       <div