bulade-ui 1.1.39 → 1.1.40

package/src/bld-toast/index.js

@@ -1,114 +1,114 @@
-const defaults_data = {
-  visible: false,
-  show: false,
-  mask: false,
-  ghost: true,
-  message: '',
-  position: 'middle', //top middle bottom
-  duration: 20000,
-  image: '',
-  icon: '',
-  iconColor: '#fff',
-  iconSize: 80,
-  type: '',
-  zIndex: -1
-}
-
-Component({
-  externalClasses: ['custom-class'],
-
-  options: {
-    addGlobalClass: true,
-  },
-
-  data: {
-    ...defaults_data,
-    transformStyle: '',
-  },
-
-  ready() {
-    if (wx.canIUse('getWindowInfo')) {
-      const windowInfo = wx.getWindowInfo()
-      this.computedBarH(windowInfo)
-    } else {
-      // 该方法为同步
-      wx.getSystemInfo({
-        success: (windowInfo) => {
-          this.computedBarH(windowInfo)
-        }
-      })
-    }
-  },
-
-  methods: {
-    computedBarH(windowInfo) {
-      const {
-        screenHeight,
-        windowHeight,
-        statusBarHeight
-      } = windowInfo;
-
-      // 自定义导航栏
-      if (screenHeight === windowHeight) {
-        let customBarH = 44;
-        let capsule = wx.getMenuButtonBoundingClientRect();
-        if (capsule) {
-          customBarH = capsule.bottom - statusBarHeight + 4;
-        }
-
-        defaults_data.top = customBarH + statusBarHeight + 'px'
-        this.setData({
-          top: customBarH + statusBarHeight + 'px'
-        })
-      }
-    },
-
-    open(options) {
-      const {
-        type = '',
-        icon = '',
-        image = '',
-        duration = 20000,
-        position = 'middle',
-        mask = false,
-        ghost = true,
-        zIndex = 2001
-      } = options
-
-      this.setData({
-        ...options,
-        type,
-        icon,
-        image,
-        mask,
-        ghost,
-        position,
-        visible: true,
-        zIndex
-      }, () => {
-        this.setData({
-          show: true
-        })
-      })
-
-      if (this.timer) clearTimeout(this.timer)
-
-      if (duration) {
-        this.timer = setTimeout(() => {
-          this.close()
-          this.timer = null
-        }, duration)
-      }
-    },
-
-    handleHide() {
-
-    },
-
-    close() {
-      this.setData({
-        ...defaults_data
-      })
-    }
-  }
+const defaults_data = {
+  visible: false,
+  show: false,
+  mask: false,
+  ghost: true,
+  message: '',
+  position: 'middle', //top middle bottom
+  duration: 20000,
+  image: '',
+  icon: '',
+  iconColor: '#fff',
+  iconSize: 80,
+  type: '',
+  zIndex: -1
+}
+
+Component({
+  externalClasses: ['custom-class'],
+
+  options: {
+    addGlobalClass: true,
+  },
+
+  data: {
+    ...defaults_data,
+    transformStyle: '',
+  },
+
+  ready() {
+    if (wx.canIUse('getWindowInfo')) {
+      const windowInfo = wx.getWindowInfo()
+      this.computedBarH(windowInfo)
+    } else {
+      // 该方法为同步
+      wx.getSystemInfo({
+        success: (windowInfo) => {
+          this.computedBarH(windowInfo)
+        }
+      })
+    }
+  },
+
+  methods: {
+    computedBarH(windowInfo) {
+      const {
+        screenHeight,
+        windowHeight,
+        statusBarHeight
+      } = windowInfo;
+
+      // 自定义导航栏
+      if (screenHeight === windowHeight) {
+        let customBarH = 44;
+        let capsule = wx.getMenuButtonBoundingClientRect();
+        if (capsule) {
+          customBarH = capsule.bottom - statusBarHeight + 4;
+        }
+
+        defaults_data.top = customBarH + statusBarHeight + 'px'
+        this.setData({
+          top: customBarH + statusBarHeight + 'px'
+        })
+      }
+    },
+
+    open(options) {
+      const {
+        type = '',
+        icon = '',
+        image = '',
+        duration = 20000,
+        position = 'middle',
+        mask = false,
+        ghost = true,
+        zIndex = 2001
+      } = options
+
+      this.setData({
+        ...options,
+        type,
+        icon,
+        image,
+        mask,
+        ghost,
+        position,
+        visible: true,
+        zIndex
+      }, () => {
+        this.setData({
+          show: true
+        })
+      })
+
+      if (this.timer) clearTimeout(this.timer)
+
+      if (duration) {
+        this.timer = setTimeout(() => {
+          this.close()
+          this.timer = null
+        }, duration)
+      }
+    },
+
+    handleHide() {
+
+    },
+
+    close() {
+      this.setData({
+        ...defaults_data
+      })
+    }
+  }
 })

package/src/bld-toast/index.json

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "bld-icon": "../bld-icon/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "bld-icon": "../bld-icon/index"
+  }
 }

package/src/bld-toast/index.scss

@@ -1,112 +1,112 @@
-.m-toast__mask {
-	z-index: 2000;
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	background-color: var(--color-mask, rgba(0, 0, 0, 0.55));
-}
-
-.m-toast__wrap {
-	opacity: 0;
-	z-index: 2001;
-	position: fixed;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	transition: opacity 0.15s ease-in;
-
-	&.m-toast--top {
-		top: 110rpx;
-		animation: toast-top 0.25s ease-in-out;
-	}
-
-	&.m-toast--middle {
-		top: 45%;
-	}
-
-	&.m-toast--bottom {
-		bottom: 110rpx;
-		animation: toast-bottom 0.25s ease-in-out;
-	}
-
-	&.m-toast--show {
-		opacity: 1;
-	}
-
-	.m-toast {
-		margin: 0 auto;
-		padding: 24rpx 40rpx;
-		color: #fff;
-		font-size: 28rpx;
-		line-height: 28rpx;
-		text-align: center;
-		border-radius: 4rpx;
-		box-sizing: border-box;
-		background: rgba(0, 0, 0, 0.75);
-
-		.m-toast__icon {
-			padding: 30rpx 0 60rpx;
-		}
-
-		.m-toast__image {
-			padding-bottom: 20rpx;
-
-			.m-toast__image__inner {
-				max-width: 160rpx;
-				max-height: 160rpx;
-			}
-		}
-
-		.m-toast__loading {
-			display: inline-block;
-			margin: 26rpx 36rpx 36rpx;
-			width: 54rpx;
-			height: 54rpx;
-			border-radius: 50%;
-			border: 6rpx solid #fff;
-			border-left-color: transparent;
-			vertical-align: middle;
-			background: 0 0;
-			animation: btn-spinner 0.8s linear infinite;
-		}
-	}
-
-	@keyframes toast-top {
-		0% {
-			top: 40rpx;
-		}
-
-		60% {
-			top: 130rpx;
-		}
-
-		100% {
-			top: 110rpx;
-		}
-	}
-
-	@keyframes toast-bottom {
-		0% {
-			bottom: 40rpx;
-		}
-
-		60% {
-			bottom: 130rpx;
-		}
-
-		100% {
-			bottom: 110rpx;
-		}
-	}
-
-	@keyframes btn-spinner {
-		0% {
-			transform: rotate(0);
-		}
-
-		100% {
-			transform: rotate(360deg);
-		}
-	}
+.m-toast__mask {
+	z-index: 2000;
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: var(--color-mask, rgba(0, 0, 0, 0.55));
+}
+
+.m-toast__wrap {
+	opacity: 0;
+	z-index: 2001;
+	position: fixed;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	transition: opacity 0.15s ease-in;
+
+	&.m-toast--top {
+		top: 110rpx;
+		animation: toast-top 0.25s ease-in-out;
+	}
+
+	&.m-toast--middle {
+		top: 45%;
+	}
+
+	&.m-toast--bottom {
+		bottom: 110rpx;
+		animation: toast-bottom 0.25s ease-in-out;
+	}
+
+	&.m-toast--show {
+		opacity: 1;
+	}
+
+	.m-toast {
+		margin: 0 auto;
+		padding: 24rpx 40rpx;
+		color: #fff;
+		font-size: 28rpx;
+		line-height: 28rpx;
+		text-align: center;
+		border-radius: 4rpx;
+		box-sizing: border-box;
+		background: rgba(0, 0, 0, 0.75);
+
+		.m-toast__icon {
+			padding: 30rpx 0 60rpx;
+		}
+
+		.m-toast__image {
+			padding-bottom: 20rpx;
+
+			.m-toast__image__inner {
+				max-width: 160rpx;
+				max-height: 160rpx;
+			}
+		}
+
+		.m-toast__loading {
+			display: inline-block;
+			margin: 26rpx 36rpx 36rpx;
+			width: 54rpx;
+			height: 54rpx;
+			border-radius: 50%;
+			border: 6rpx solid #fff;
+			border-left-color: transparent;
+			vertical-align: middle;
+			background: 0 0;
+			animation: btn-spinner 0.8s linear infinite;
+		}
+	}
+
+	@keyframes toast-top {
+		0% {
+			top: 40rpx;
+		}
+
+		60% {
+			top: 130rpx;
+		}
+
+		100% {
+			top: 110rpx;
+		}
+	}
+
+	@keyframes toast-bottom {
+		0% {
+			bottom: 40rpx;
+		}
+
+		60% {
+			bottom: 130rpx;
+		}
+
+		100% {
+			bottom: 110rpx;
+		}
+	}
+
+	@keyframes btn-spinner {
+		0% {
+			transform: rotate(0);
+		}
+
+		100% {
+			transform: rotate(360deg);
+		}
+	}
 }

package/src/bld-toast/index.wxml

@@ -1,27 +1,27 @@
-<view 
-  class="m-toast__mask" 
-  style="{{ 'z-index:' + zIndex + ';' + ghost ? 'opacity: 0' : '' }}" 
-  wx:if="{{ visible && mask }}" 
-  bindtap="handleHide"
-></view>
-
-<view 
-  class="custom-class m-toast__wrap m-toast--{{ position }} {{ show ? 'm-toast--show' : '' }}" 
-  style="z-index: {{ zIndex }};{{ position === 'top' ? transformStyle : '' }}" 
-  hidden="{{ !visible }}"
->
-  <view class="m-toast">
-
-    <view wx:if="{{ icon }}" class="m-toast__icon">
-      <bld-icon size="{{ iconSize }}" name="{{ icon }}" color="{{ iconColor }}" />
-    </view>
-
-    <view wx:elif="{{ image }}" class="m-toast__image">
-      <image class="m-toast__image__inner" src="{{ image }}" />
-    </view>
-
-    <view wx:if="{{ type === 'loading' }}" class="m-toast__loading"></view>
-    <view wx:if="{{ message }}">{{ message }}</view>
-    
-  </view>
+<view 
+  class="m-toast__mask" 
+  style="{{ 'z-index:' + zIndex + ';' + ghost ? 'opacity: 0' : '' }}" 
+  wx:if="{{ visible && mask }}" 
+  bindtap="handleHide"
+></view>
+
+<view 
+  class="custom-class m-toast__wrap m-toast--{{ position }} {{ show ? 'm-toast--show' : '' }}" 
+  style="z-index: {{ zIndex }};{{ position === 'top' ? transformStyle : '' }}" 
+  hidden="{{ !visible }}"
+>
+  <view class="m-toast">
+
+    <view wx:if="{{ icon }}" class="m-toast__icon">
+      <bld-icon size="{{ iconSize }}" name="{{ icon }}" color="{{ iconColor }}" />
+    </view>
+
+    <view wx:elif="{{ image }}" class="m-toast__image">
+      <image class="m-toast__image__inner" src="{{ image }}" />
+    </view>
+
+    <view wx:if="{{ type === 'loading' }}" class="m-toast__loading"></view>
+    <view wx:if="{{ message }}">{{ message }}</view>
+    
+  </view>
 </view>

package/src/bld-toast/toast.js

@@ -1,35 +1,35 @@
-function getCtx(selector) {
-  const pages = getCurrentPages()
-  const ctx = pages[pages.length - 1]
-  const componentCtx = ctx.selectComponent(selector)
-  if (!componentCtx) {
-    console.error('无法找到对应的组件，请按文档说明使用组件')
-    return null
-  }
-  return componentCtx
-}
-
-
-const Toast = options => {
-  const {
-    selector = '#toast'
-  } = options
-  const ctx = getCtx(selector)
-
-  if (typeof options === "string") {
-    options = {
-      message: options,
-      position: 'bottom'
-    }
-  }
-  ctx.open(options)
-
-  return ctx
-}
-
-Toast.close = (selector = '#toast') => {
-  const ctx = getCtx(selector)
-  ctx.close()
-}
-
+function getCtx(selector) {
+  const pages = getCurrentPages()
+  const ctx = pages[pages.length - 1]
+  const componentCtx = ctx.selectComponent(selector)
+  if (!componentCtx) {
+    console.error('无法找到对应的组件，请按文档说明使用组件')
+    return null
+  }
+  return componentCtx
+}
+
+
+const Toast = options => {
+  const {
+    selector = '#toast'
+  } = options
+  const ctx = getCtx(selector)
+
+  if (typeof options === "string") {
+    options = {
+      message: options,
+      position: 'bottom'
+    }
+  }
+  ctx.open(options)
+
+  return ctx
+}
+
+Toast.close = (selector = '#toast') => {
+  const ctx = getCtx(selector)
+  ctx.close()
+}
+
 export default Toast