@cloudbase/weda-ui 0.2.17 → 2.0.8

package/src/mp/components/listView/index.js

@@ -1,17 +1,6 @@
-const isNull = (val) => [undefined, null].includes(val);
-const REL_DICT = {
-  equal: 'eq', // 等于
-  unequal: 'neq', // 不等于
-  include: 'search', // 包含
-  exclude: '_exclude', // 不包含
-  begin_with: '_begin_with', // 开头是
-  greater: 'gt', // 大于
-  greater_or_equal: 'gte', // 大于等于
-  less: 'lt', // 小于
-  less_or_equal: 'lte', // 小于等于
-  in: 'in', // 多选值
-  not_in: 'nin', // 不在多选值
-};
+import { REL_DICT } from '../../utils/constant';
+import { isNil } from '../../utils/lodash';
+
 const ORDERTYPE = ['asc', 'desc'];
 const getWhereList = (where) => {
   let result = [];
@@ -28,7 +17,7 @@ const getWhereList = (where) => {
             rel = 'regex';
             val = `^((?!${val}).)*$`;
           }
-          if (item2?.logic !== 'or' && item2?.key && rel && !isNull(val)) {
+          if (item2?.logic !== 'or' && item2?.key && rel && !isNil(val)) {
             result.push({ key: item2.key, rel, val });
           }
         });
@@ -114,7 +103,7 @@ Component({
       const tcbParams = {};
 
       // tcb分页参数
-      if (!isNull(pageNo) && !isNull(pageSize)) {
+      if (!isNil(pageNo) && !isNil(pageSize)) {
         tcbParams['pageNo'] = pageNo;
         tcbParams['pageSize'] = pageSize;
       }
@@ -127,34 +116,40 @@ Component({
       const whereEffected = [].concat(getWhereList(where));
       whereEffected.length > 0 && (tcbParams['where'] = whereEffected);
       // tcb结果和事件
-      const data = await callDataSource({
-        dataSourceName,
-        methodName,
-        params: tcbParams,
-      });
-      let records = data?.records || [];
-      let total = data?.total || 0;
-      if (
-        ['loadMoreButton', 'bottomLoad'].includes(this.properties.pagination) &&
-        !isReLoad
-      ) {
-        records = [...this.data.records, ...records]; // TODO 可能存在单次 setData 数据量过大引起小程序性能问题
-      }
-      this.setData(
-        {
-          total,
-          records,
-          loading: false,
-          isReLoad: false,
-          pageStr: `${total > 0 ? pageNo : 0}/${
-            Math.ceil(total / pageSize) || 0
-          }`,
-        },
-        () => {
-          this._handleEvents(data);
-          setTimeout(() => this._firstScreenLoadMore(), 150);
+      try {
+        const data = await callDataSource({
+          dataSourceName,
+          methodName,
+          params: tcbParams,
+        });
+        let records = data?.records || [];
+        let total = data?.total || 0;
+        if (
+          ['loadMoreButton', 'bottomLoad'].includes(
+            this.properties.pagination
+          ) &&
+          !isReLoad
+        ) {
+          records = [...this.data.records, ...records]; // TODO 可能存在单次 setData 数据量过大引起小程序性能问题
         }
-      );
+        this.setData(
+          {
+            total,
+            records,
+            loading: false,
+            isReLoad: false,
+            pageStr: `${total > 0 ? pageNo : 0}/${
+              Math.ceil(total / pageSize) || 0
+            }`,
+          },
+          () => {
+            this._handleEvents(data);
+            setTimeout(() => this._firstScreenLoadMore(), 150);
+          }
+        );
+      } catch (e) {
+        this.setData({ loading: false });
+      }
     },
     /**
      * 下一页

package/src/mp/components/listView/index.wxml

@@ -5,7 +5,7 @@
     <slot></slot>
   </view>
 
-  <view class="weda-list-view__more">
+  <view class="weda-list-view__more {{'weda-list-view__more-' + pagination}}">
     <!-- 加载更多 -->
     <block wx:if="{{pagination==='loadMoreButton' && pageSize * pageNo < total}}">
       <view class="weda-list-view__more-text" bindtap="handleNext">加载更多</view>

package/src/mp/components/listView/index.wxss

@@ -34,6 +34,11 @@
   background: #fff;
 }
 
+.weda-list-view__containor
+  .weda-list-view__more.weda-list-view__more-bottomLoad {
+  background: transparent;
+}
+
 .weda-list-view__bottom-load {
   padding-top: 1px;
 }

package/src/mp/components/lottery/index.js

@@ -0,0 +1,270 @@
+Component({
+  /** 页面的初始数据 */
+  data: {
+    lotteryList: [
+      {
+        src: '',
+        desc: '',
+        actived: true,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: true,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+      {
+        src: '',
+        desc: '',
+        actived: false,
+        selected: false,
+      },
+    ],
+    dotList: [
+      {
+        single: true,
+        position: 'left-top',
+        direction: '',
+        list: [],
+      },
+      {
+        single: true,
+        position: 'left-bottom',
+        direction: '',
+        list: [],
+      },
+      {
+        single: true,
+        position: 'right-top',
+        direction: '',
+        list: [],
+      },
+      {
+        single: true,
+        position: 'right-bottom',
+        direction: '',
+        list: [],
+      },
+      {
+        single: false,
+        position: 'top',
+        direction: 'horizontal',
+        list: ['1', '2', '3', '4', '5'],
+      },
+      {
+        single: false,
+        position: 'bottom',
+        direction: 'horizontal',
+        list: ['1', '2', '3', '4', '5'],
+      },
+      {
+        single: false,
+        position: 'left',
+        direction: 'vertical',
+        list: ['1', '2', '3', '4', '5'],
+      },
+      {
+        single: false,
+        position: 'right',
+        direction: 'vertical',
+        list: ['1', '2', '3', '4', '5'],
+      },
+    ],
+    btnActived: false,
+    clickLotteryEnable: true,
+    checkedIndex: -1,
+  },
+  options: {
+    virtualHost: true,
+  },
+  properties: {
+    id: {
+      type: String,
+      value: '',
+    },
+    className: {
+      type: String,
+      value: '',
+    },
+    style: {
+      type: String,
+      value: '',
+    },
+    prizeResult: {
+      type: String,
+      value: '',
+    },
+    enablePrize: {
+      value: true,
+      type: Boolean,
+    },
+    prizeList: {
+      type: Array,
+      value: [],
+    },
+  },
+  methods: {
+    clickLotteryButton: function () {
+      const { lotteryList } = this.data;
+      const { prizeResult, enablePrize, clickLotteryEnable } = this.properties;
+      //是否正在抽奖
+      if (clickLotteryEnable) {
+        this.setData({
+          clickLotteryEnable: false,
+        });
+      } else {
+        return;
+      }
+      //支持抽奖
+      if (!enablePrize) {
+        return;
+      }
+      //触发外部事件
+      this.triggerEvent('clickLotteryButton');
+      //动画旋转次数
+      let count = 0;
+      //是否超时
+      let isTimeout = false;
+      //开启循环抽奖
+      let intervalId = setInterval(() => {
+        //再次获取抽奖结果
+        let prizeResultNew = this.properties.prizeResult;
+        if (prizeResultNew == null || !this.properties.enablePrize) {
+          //如果是禁止，立马停止
+          clearInterval();
+          this.setData({
+            clickLotteryEnable: true,
+          });
+          return;
+        }
+        //触发抽奖动画
+        let index = count % lotteryList.length;
+        let tempList = [];
+        lotteryList.forEach((item, i) => {
+          if (index === i) {
+            item.actived = true;
+          } else {
+            item.actived = false;
+          }
+          item.selected = false;
+          tempList.push(item);
+          //如果超时，则终止
+          if (isTimeout) {
+            let reg = /^\+?[1-9]\d*$/;
+            if (!reg.test(prizeResult)) {
+              isTimeout = false;
+              clearInterval(intervalId);
+              wx.showToast({
+                title: '网络异常',
+                icon: 'none',
+              });
+            }
+            if (index === parseInt(prizeResultNew) - 1) {
+              isTimeout = false;
+              this.setData({
+                checkedIndex: index,
+              });
+              clearInterval(intervalId);
+              setTimeout(() => {
+                this.triggerEvent('finishLottery', {
+                  prize: prizeResultNew,
+                  result: lotteryList[i],
+                });
+              }, 600);
+            }
+            setTimeout(() => {
+              //防止暴力点击误触，影响抽奖可用次数结果，延迟1.5s，才可点击
+              this.setData({
+                clickLotteryEnable: true,
+              });
+            }, 1500);
+          }
+        });
+        let checkedIndex = this.data.checkedIndex;
+        this.setData({
+          btnActived: checkedIndex < 0,
+          lotteryList:
+            checkedIndex < 0
+              ? tempList
+              : tempList.map((item, index) => {
+                  if (index === checkedIndex) {
+                    item.selected = true;
+                  } else {
+                    item.selected = false;
+                  }
+                  item.actived = false;
+                  return item;
+                }),
+        });
+        //设置默认数据
+        this.setData({
+          checkedIndex: -1,
+        });
+        count++;
+      }, 150);
+      setTimeout(() => {
+        isTimeout = true;
+      }, 3000);
+    },
+  },
+  observers: {
+    prizeList: function (prizeList) {
+      //获取初始化默认数据，数据不足8条设置默认，超过8条获取前8条
+      let list = [];
+      for (let i = 0; i < 8; i++) {
+        if (i < prizeList.length) {
+          let prize = prizeList[i];
+          list.push({
+            idx: i + 1,
+            selected: false,
+            actived: false,
+            desc: prize.title,
+            src: prize.image,
+          });
+        } else {
+          list.push({
+            idx: i + 1,
+            selected: false,
+            actived: false,
+            desc: '',
+            src: '',
+          });
+        }
+      }
+      this.setData({
+        lotteryList: list,
+      });
+    },
+  },
+});

package/src/mp/components/lottery/index.wxml

@@ -0,0 +1,43 @@
+<view class="weda-lottery">
+  <view class="weda-lottery__wrap">
+    <block wx:for="{{dotList}}" wx:key="dotIndex" wx:for-item="dot">
+      <view wx-if="{{dot.single}}" class="weda-lottery__dot-single weda-lottery__dot-{{dot.position}}"></view>
+      <block wx-if="{{!dot.single}}">
+        <view class="weda-lottery__dot-{{dot.position}}">
+          <view class="weda-lottery__dot weda-lottery__dot-{{dot.direction}}">
+            <block wx:for="{{dot.list}}" wx:key="index" wx:for-item="item">
+              <view class="weda-lottery__dot-item"></view>
+            </block>
+          </view>
+        </view>
+      </block>
+    </block>
+    <view class="weda-lottery__inner">
+      <view class="weda-lottery__inner-wrap">
+        <view class="weda-lottery__list">
+          <block wx:for="{{lotteryList}}" wx:key="index" wx:for-item="item">
+            <view key="{{index}}" class="weda-lottery__turntable-item {{item.actived ? 'is-actived' : ''}}, {{item.selected ? 'is-selected' : ''}}">
+              <view class="weda-lottery__turntable-cell">
+                <view class="weda-lottery__turntable-cell-image" wx-if="{{item.src}}">
+                  <image mode="aspectFit" src="{{item.src}}" alt="{{item.desc}}" class="weda-lottery__turntable-cell-icon"></image>
+                </view>
+                <view class="weda-lottery__turntable-cell-desc" wx-if="{{item.desc}}">
+                  {{item.desc}}
+                </view>
+              </view>
+            </view>
+          </block>
+        </view>
+        <view class="weda-lottery__turntable-btn {{btnActived ? 'is-actived' : ''}}">
+          <view class="weda-lottery__btn-inner" bindtap="{{clickLotteryEnable ? 'clickLotteryButton' : ''}}">
+            <view class="weda-lottery__btn">
+              <view class="weda-lottery__btn-image">
+                <text class="weda-lottery__btn-text">开始抽奖</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>