bulade-ui 1.1.39 → 1.1.40

package/src/bld-modal/index.js

@@ -1,123 +1,123 @@
-Component({
-  externalClasses: ['custom-class', 'custom-mask-class', 'custom-body-class'],
-
-  options: {
-    addGlobalClass: true,
-  },
-
-  properties: {
-    visible: {
-      type: Boolean,
-      value: false
-    },
-    title: {
-      type: String,
-      value: ''
-    },
-    content: {
-      type: String,
-      value: ''
-    },
-    closeOnClickModal: {
-      type: Boolean,
-      value: true
-    },
-    showConfirmButton: {
-      type: Boolean,
-      value: true
-    },
-    showCancelButton: {
-      type: Boolean,
-      value: true
-    },
-    confirmButtonText: {
-      type: String,
-      value: '确定'
-    },
-    cancelButtonText: {
-      type: String,
-      value: '取消'
-    },
-    confirmTextColor: {
-      type: String,
-      value: '#409EFF'
-    },
-    loading: {
-      type: Boolean,
-      value: false
-    },
-    asyncClose: {
-      type: Boolean,
-      value: false
-    }
-  },
-
-  methods: {
-    _reset() {
-      this.setData({
-        title: '',
-        content: '',
-        showConfirmButton: true,
-        showCancelButton: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        confirmTextColor: '#409EFF',
-        loading: false,
-        asyncClose: false
-      })
-    },
-
-    // 确定
-    onConfirm() {
-      // 异步
-      if (this.data.asyncClose) {
-        this.setData({
-          loading: true
-        })
-        if (this._confirm) {
-          this._confirm()
-        }
-      } else {
-        if (this._confirm) {
-          this.close()
-        }
-      }
-      this.triggerEvent('confirm')
-    },
-
-    onCancel() {
-      if (this.data.loading) return
-
-      this.setData({
-        visible: false
-      })
-      this.triggerEvent('cancel')
-
-      if (this._cancel) {
-        this._cancel()
-        this.close()
-      }
-    },
-
-    onMaskClick() {
-      if (!this.data.closeOnClickModal) return;
-      this.close()
-    },
-
-    _show(options) {
-      this.setData({
-        ...options,
-        visible: true
-      })
-    },
-
-    // 关闭并重置默认参数
-    close() {
-      this.setData({
-        visible: false
-      })
-
-      this.triggerEvent('close')
-    }
-  }
+Component({
+  externalClasses: ['custom-class', 'custom-mask-class', 'custom-body-class'],
+
+  options: {
+    addGlobalClass: true,
+  },
+
+  properties: {
+    visible: {
+      type: Boolean,
+      value: false
+    },
+    title: {
+      type: String,
+      value: ''
+    },
+    content: {
+      type: String,
+      value: ''
+    },
+    closeOnClickModal: {
+      type: Boolean,
+      value: true
+    },
+    showConfirmButton: {
+      type: Boolean,
+      value: true
+    },
+    showCancelButton: {
+      type: Boolean,
+      value: true
+    },
+    confirmButtonText: {
+      type: String,
+      value: '确定'
+    },
+    cancelButtonText: {
+      type: String,
+      value: '取消'
+    },
+    confirmTextColor: {
+      type: String,
+      value: '#409EFF'
+    },
+    loading: {
+      type: Boolean,
+      value: false
+    },
+    asyncClose: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  methods: {
+    _reset() {
+      this.setData({
+        title: '',
+        content: '',
+        showConfirmButton: true,
+        showCancelButton: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        confirmTextColor: '#409EFF',
+        loading: false,
+        asyncClose: false
+      })
+    },
+
+    // 确定
+    onConfirm() {
+      // 异步
+      if (this.data.asyncClose) {
+        this.setData({
+          loading: true
+        })
+        if (this._confirm) {
+          this._confirm()
+        }
+      } else {
+        if (this._confirm) {
+          this.close()
+        }
+      }
+      this.triggerEvent('confirm')
+    },
+
+    onCancel() {
+      if (this.data.loading) return
+
+      this.setData({
+        visible: false
+      })
+      this.triggerEvent('cancel')
+
+      if (this._cancel) {
+        this._cancel()
+        this.close()
+      }
+    },
+
+    onMaskClick() {
+      if (!this.data.closeOnClickModal) return;
+      this.close()
+    },
+
+    _show(options) {
+      this.setData({
+        ...options,
+        visible: true
+      })
+    },
+
+    // 关闭并重置默认参数
+    close() {
+      this.setData({
+        visible: false
+      })
+
+      this.triggerEvent('close')
+    }
+  }
 })

package/src/bld-modal/index.json

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

package/src/bld-modal/index.scss

@@ -1,108 +1,108 @@
-.m-mask {
-  z-index: 1000;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  opacity: 1;
-  visibility: visible;
-  background: var(--color-mask, rgba(0, 0, 0, 0.55));
-  transition: all 0.25s ease-in-out;
-
-  &.is-hidden {
-    opacity: 0;
-    visibility: hidden;
-  }
-}
-
-.m-modal-wrap {
-  z-index: 1001;
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  visibility: visible;
-  transform: translate3d(-50%, -50%, 0);
-
-  &.is-hidden {
-    visibility: hidden;
-  }
-
-  .m-modal {
-    z-index: 9;
-    position: relative;
-    width: 540rpx;
-    transform: scale(.9);
-    opacity: 0;
-    transition: transform 0.2s ease-in-out, opacity .2s ease-in-out;
-
-    &.is-show {
-      opacity: 1;
-      transform: scale(1);
-    }
-
-    .m-modal__content {
-      position: relative;
-      padding-top: 30rpx;
-      height: 100%;
-      border: 0;
-      border-radius: 3rpx;
-      text-align: center;
-      background-color: #fff;
-      background-clip: padding-box;
-      overflow: hidden;
-    }
-
-    .m-modal__title {
-      margin: 0;
-      padding: 12rpx 30rpx 24rpx;
-      font-size: 36rpx;
-      line-height: 1;
-      color: #1c2438;
-      text-align: center;
-    }
-
-    .m-modal__body {
-      max-height: 300rpx;
-      margin-bottom: 30rpx;
-      padding: 20rpx 40rpx;
-      font-size: 28rpx;
-      color: #80848f;
-      line-height: 1.5;
-      overflow: auto;
-      -webkit-overflow-scrolling: touch;
-    }
-
-    .m-modal__btn-group {
-      position: relative;
-      display: flex;
-
-      &::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 1px;
-        transform: scaleY(0.5);
-        background: #ddd;
-      }
-
-      .m-modal__btn {
-        position: relative;
-        flex: 1;
-
-        &.m-modal__btn--cancel::after {
-          content: '';
-          position: absolute;
-          top: 0;
-          right: 0;
-          width: 1px;
-          height: 100%;
-          transform: scaleX(0.5);
-          background: #ddd;
-        }
-      }
-    }
-  }
+.m-mask {
+  z-index: 1000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 1;
+  visibility: visible;
+  background: var(--color-mask, rgba(0, 0, 0, 0.55));
+  transition: all 0.25s ease-in-out;
+
+  &.is-hidden {
+    opacity: 0;
+    visibility: hidden;
+  }
+}
+
+.m-modal-wrap {
+  z-index: 1001;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  visibility: visible;
+  transform: translate3d(-50%, -50%, 0);
+
+  &.is-hidden {
+    visibility: hidden;
+  }
+
+  .m-modal {
+    z-index: 9;
+    position: relative;
+    width: 540rpx;
+    transform: scale(.9);
+    opacity: 0;
+    transition: transform 0.2s ease-in-out, opacity .2s ease-in-out;
+
+    &.is-show {
+      opacity: 1;
+      transform: scale(1);
+    }
+
+    .m-modal__content {
+      position: relative;
+      padding-top: 30rpx;
+      height: 100%;
+      border: 0;
+      border-radius: 3rpx;
+      text-align: center;
+      background-color: #fff;
+      background-clip: padding-box;
+      overflow: hidden;
+    }
+
+    .m-modal__title {
+      margin: 0;
+      padding: 12rpx 30rpx 24rpx;
+      font-size: 36rpx;
+      line-height: 1;
+      color: #1c2438;
+      text-align: center;
+    }
+
+    .m-modal__body {
+      max-height: 300rpx;
+      margin-bottom: 30rpx;
+      padding: 20rpx 40rpx;
+      font-size: 28rpx;
+      color: #80848f;
+      line-height: 1.5;
+      overflow: auto;
+      -webkit-overflow-scrolling: touch;
+    }
+
+    .m-modal__btn-group {
+      position: relative;
+      display: flex;
+
+      &::after {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 1px;
+        transform: scaleY(0.5);
+        background: #ddd;
+      }
+
+      .m-modal__btn {
+        position: relative;
+        flex: 1;
+
+        &.m-modal__btn--cancel::after {
+          content: '';
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 1px;
+          height: 100%;
+          transform: scaleX(0.5);
+          background: #ddd;
+        }
+      }
+    }
+  }
 }

package/src/bld-modal/index.wxml

@@ -1,23 +1,23 @@
-<view class="m-mask custom-mask-class {{ visible ? '' : 'is-hidden' }}" bindtap="onMaskClick"></view>
-
-<view class="m-modal-wrap custom-class {{ visible ? '' : 'is-hidden' }}">
-  <view class="m-modal {{ visible ? 'is-show' : '' }}">
-    <view class="m-modal__content">
-      <view class="m-modal__title" wx:if="{{ title }}">{{ title }}</view>
-      <view class="m-modal__body custom-body-class" wx:if="{{ content }}">{{ content }}</view>
-      <view class="m-modal__body custom-body-class" wx:else>
-        <slot />
-      </view>
-      <view class="m-modal__btn-group">
-        <view class="m-modal__btn m-modal__btn--cancel" wx:if="{{ showCancelButton }}">
-          <m-button full type="ghost" bind:click="onCancel">{{ cancelButtonText }}</m-button>
-        </view>
-        <view class="m-modal__btn" wx:if="{{ showConfirmButton }}">
-          <m-button full type="ghost" loading="{{ loading }}" bind:click="onConfirm" color="{{ confirmTextColor }}">
-            {{ confirmButtonText }}
-          </m-button>
-        </view>
-      </view>
-    </view>
-  </view>
+<view class="m-mask custom-mask-class {{ visible ? '' : 'is-hidden' }}" bindtap="onMaskClick"></view>
+
+<view class="m-modal-wrap custom-class {{ visible ? '' : 'is-hidden' }}">
+  <view class="m-modal {{ visible ? 'is-show' : '' }}">
+    <view class="m-modal__content">
+      <view class="m-modal__title" wx:if="{{ title }}">{{ title }}</view>
+      <view class="m-modal__body custom-body-class" wx:if="{{ content }}">{{ content }}</view>
+      <view class="m-modal__body custom-body-class" wx:else>
+        <slot />
+      </view>
+      <view class="m-modal__btn-group">
+        <view class="m-modal__btn m-modal__btn--cancel" wx:if="{{ showCancelButton }}">
+          <m-button full type="ghost" bind:click="onCancel">{{ cancelButtonText }}</m-button>
+        </view>
+        <view class="m-modal__btn" wx:if="{{ showConfirmButton }}">
+          <m-button full type="ghost" loading="{{ loading }}" bind:click="onConfirm" color="{{ confirmTextColor }}">
+            {{ confirmButtonText }}
+          </m-button>
+        </view>
+      </view>
+    </view>
+  </view>
 </view>

package/src/bld-modal/modal.js

@@ -1,38 +1,38 @@
-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 Modal = options => {
-
-  return new Promise((resolve, reject) => {
-    const { selector = '#modal' } = options
-    const modal = getCtx(selector)
-    modal._reset()
-
-    modal._confirm = resolve
-    modal._cancel = reject
-    modal._show(options)
-
-    return modal
-  })
-}
-
-Modal.alert = options => Modal(Object.assign({
-  showCancelButton: false
-}, options))
-Modal.confirm = options => Modal(options)
-
-Modal.close = (selector = '#modal') => {
-  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 Modal = options => {
+
+  return new Promise((resolve, reject) => {
+    const { selector = '#modal' } = options
+    const modal = getCtx(selector)
+    modal._reset()
+
+    modal._confirm = resolve
+    modal._cancel = reject
+    modal._show(options)
+
+    return modal
+  })
+}
+
+Modal.alert = options => Modal(Object.assign({
+  showCancelButton: false
+}, options))
+Modal.confirm = options => Modal(options)
+
+Modal.close = (selector = '#modal') => {
+  const ctx = getCtx(selector)
+  ctx.close()
+}
+
 export default Modal