@cloudbase/weda-ui 1.0.21 → 1.0.24

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

@@ -0,0 +1,317 @@
+.weda-lottery {
+  width: 100%;
+  height: 652rpx;
+  position: relative;
+}
+
+.weda-lottery .weda-lottery__wrap {
+  position: relative;
+  width: 100%;
+  height: 652rpx;
+  background: #FF465C;
+  border: 2rpx solid rgba(255, 255, 255, 0.6);
+  box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__dot-top {
+  position: absolute;
+  top: 8rpx;
+  left: calc((100% - 434rpx) / 2);
+}
+
+.weda-lottery .weda-lottery__dot-bottom {
+  position: absolute;
+  bottom: 8rpx;
+  left: calc((100% - 434rpx) / 2);
+}
+
+.weda-lottery .weda-lottery__dot-left {
+  position: absolute;
+  left: 8rpx;
+  top: calc((100% - 434rpx) / 2);
+}
+
+.weda-lottery .weda-lottery__dot-right {
+  position: absolute;
+  right: 8rpx;
+  top: calc((100% - 434rpx) / 2);
+}
+
+.weda-lottery .weda-lottery__dot {
+  display: flex;
+}
+
+.weda-lottery .weda-lottery__dot-horizontal {
+  flex-direction: row;
+}
+
+.weda-lottery .weda-lottery__dot-vertical {
+  flex-direction: column;
+}
+
+.weda-lottery .weda-lottery__dot .weda-lottery__dot-item,
+.weda-lottery .weda-lottery__dot-single {
+  width: 18rpx;
+  height: 18rpx;
+  box-shadow: 0px 0px 8rpx rgba(255, 255, 255, 0.3);
+  border-radius: 50%;
+  background: #FFFFFF;
+}
+
+.weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(odd) {
+  background: #FFEE52;
+}
+
+.weda-lottery .weda-lottery__dot .weda-lottery__dot-item:nth-child(even) {
+  background: #FFFFFF
+}
+
+.weda-lottery .weda-lottery__dot-horizontal .weda-lottery__dot-item {
+  margin-right: 86rpx;
+}
+
+.weda-lottery .weda-lottery__dot-horizontal .weda-lottery__dot-item:last-child {
+  margin-right: 0;
+}
+
+.weda-lottery .weda-lottery__dot-vertical .weda-lottery__dot-item {
+  margin-bottom: 86rpx;
+}
+
+.weda-lottery .weda-lottery__dot-vertical .weda-lottery__dot-item:last-child {
+  margin-bottom: 0;
+}
+
+.weda-lottery .weda-lottery__dot-left-top {
+  position: absolute;
+  top: 18rpx;
+  left: 12rpx;
+}
+
+.weda-lottery .weda-lottery__dot-right-top {
+  position: absolute;
+  top: 18rpx;
+  right: 12rpx;
+}
+
+.weda-lottery .weda-lottery__dot-left-bottom {
+  position: absolute;
+  left: 12rpx;
+  bottom: 18rpx;
+}
+
+.weda-lottery .weda-lottery__dot-right-bottom {
+  position: absolute;
+  right: 12rpx;
+  bottom: 18rpx;
+}
+
+.weda-lottery .weda-lottery__inner {
+  padding: 36rpx;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__inner-wrap {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  background: linear-gradient(180deg, #DD0D00 0%, #D80027 100%);
+  border: 2rpx solid rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0px 0px 8rpx rgba(255, 255, 255, 0.5);
+  border-radius: 20rpx;
+  height: 100%;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__list {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item {
+  position: absolute;
+  width: calc((100% - 64rpx) / 3);
+  height: calc((100% - 64rpx) / 3);
+  font-size: 0;
+  text-align: center;
+  background: #FFF8EE;
+  box-shadow: inset 0px -4rpx 0px #FFDDBD;
+  border-radius: 16rpx;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-actived {
+  background: #FFF8EE;
+  box-shadow: 0px 0px 12rpx #FFFFFF;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-selected {
+  background: #FF6666;
+  box-shadow: inset 0px -4rpx 0px #FFA4A4;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:first-child {
+  top: 16rpx;
+  left: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(2) {
+  top: 16rpx;
+  left: calc((100% - 64rpx) / 3 + 32rpx);
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(3) {
+  top: 16rpx;
+  right: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(4) {
+  top: calc((100% - 64rpx) / 3 + 32rpx);
+  right: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(5) {
+  bottom: 16rpx;
+  right: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(6) {
+  bottom: 16rpx;
+  left: calc((100% - 64rpx) / 3 + 32rpx);
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(7) {
+  bottom: 16rpx;
+  left: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item:nth-child(8) {
+  bottom: calc((100% - 64rpx) / 3 + 32rpx);
+  left: 16rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell {
+  width: 100%;
+  height: 100%;
+  max-width: 100%;
+  max-height: 100%;
+  box-sizing: border-box;
+  border-width: 8rpx;
+  border-style: solid;
+  border-color: transparent;
+  border-radius: 16rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 16rpx 5rpx 16rpx 5rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-actived .weda-lottery__turntable-cell {
+  border-color: #FFE05F;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell-image {
+  height: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell-icon {
+  display: block;
+  width: 80rpx;
+  height: 80rpx;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-cell-desc {
+  margin-top: 12rpx;
+  font-weight: 400;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  text-align: center;
+  color: #BA0000;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  width: 100%;
+}
+
+.weda-lottery .weda-lottery__inner .weda-lottery__turntable-item.is-selected .weda-lottery__turntable-cell-desc {
+  color: #FFFFFF;
+}
+
+.weda-lottery .weda-lottery__turntable-btn {
+  z-index: 2;
+  position: absolute;
+  width: calc((100% - 64rpx) / 3);
+  height: calc((100% - 64rpx) / 3);
+  top: calc((100% - 64rpx) / 3 + 32rpx);
+  left: calc((100% - 64rpx) / 3 + 32rpx);
+  background: linear-gradient(180deg, #FFEE81 0%, #FFD646 100%);
+  box-shadow: inset 0px -4rpx 0px #FF7A00;
+  border-radius: 50%;
+}
+
+.weda-lottery .weda-lottery__turntable-btn.is-actived {
+  background: linear-gradient(180deg, #FFEE81 0%, #FFD646 100%);
+  box-shadow: inset 0px 4rpx 0px #FFFFFF;
+}
+
+.weda-lottery .weda-lottery__btn-inner {
+  padding: 18rpx;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__btn {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(180deg, #FF922D 0%, #FF3C76 100%);
+  box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.weda-lottery .weda-lottery__turntable-btn.is-actived .weda-lottery__btn {
+  background: linear-gradient(180deg, #FF922D 0%, #FF3C76 100%);
+  box-shadow: inset 0px 0px 16rpx rgba(234, 27, 53, 0.5);
+}
+
+.weda-lottery .weda-lottery__btn-image {
+  padding: 22rpx 30rpx;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.weda-lottery .weda-lottery__btn-image  .weda-lottery__btn-text {
+  font-weight: 600;
+  font-size: 18px;
+  line-height: 22px;
+  text-align: center;
+  color: #FFFFFF;
+  text-shadow: 0px 0.5px 0px #E42B27;
+  max-height: 100%;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  width: 100%;
+  height: 100%;
+}
+
+.weda-lottery .weda-lottery__turntable-btn.is-actived .weda-lottery__btn-image {
+  opacity: 0.6;
+}

package/src/mp/components/wxOpenApi/phone/index.js

@@ -84,7 +84,7 @@ Component({
         this.triggerEvent('phonefail', { errMsg: '获取手机号失败' });
         return;
       }
-      const parseData = destr(res?.Data) ?? {};
+      const parseData = destr(res?.Data) || {};
       const { phone_info } = parseData;
       if (!phone_info) {
         this.triggerEvent('phonefail', { errMsg: '获取手机号失败' });

package/src/mp/index.json

@@ -40,11 +40,12 @@
     "GraphicCard": "components/graphicCard/index",
     "UserInfo": "components/wxOpenApi/userInfo/index",
     "Phone": "components/wxOpenApi/phone/index",
-    "PhoneCode": "components/wxOpenApi/phoneCode/index",
-    "Share": "components/wxOpenApi/share/index"
+    "Share": "components/wxOpenApi/share/index",
+    "Lottery": "components/lottery/index",
+    "PhoneCode": "components/wxOpenApi/phoneCode/index"
   },
   "actions": {
     "showToast": "actions/showToast/index",
     "showModal": "actions/showModal/index"
   }
-}
+}

package/src/mp/utils/constant.js

@@ -3,3 +3,18 @@ export const TitleType = {
   TOP: 'top',
   NONE: 'none',
 };
+
+export const REL_DICT = {
+  equal: 'eq', // 等于
+  unequal: 'neq', // 不等于
+  include: 'search', // 包含
+  exclude: '_exclude', // 不包含
+  begin_with: '_begin_with', // 开头是
+  greater: 'gt', // 大于
+  greater_or_equal: 'gte', // 大于等于
+  bigger_or_equal: 'gte', //大于等于
+  less: 'lt', // 小于
+  less_or_equal: 'lte', // 小于等于
+  in: 'in', // 多选值
+  not_in: 'nin', // 不在多选值
+};

package/src/mp/utils/lodash.js

@@ -0,0 +1,2 @@
+// https://github.com/lodash/lodash/blob/4.17.15/lodash.js#L11973
+export const isNil = (val) => val == null;

package/src/web/components/chart/common/config/line.js

@@ -47,4 +47,4 @@ const getConfig = () => {
   return lineH5;
 };
 
-module.exports = getConfig;
+export default getConfig;

package/src/web/components/form/checkbox/index.tsx

@@ -67,6 +67,12 @@ export default function Checkbox({
     }
   }, []);
 
+  useEffect(() => {
+    if (format !== 'x-enum') {
+      setOption(range)
+    }
+  }, [range]);
+
   const fetchData = async (param:
     { OptNameList?: object, PageIndex?: number, PageSize?: number }
   ) => {

package/src/web/components/form/formcell/index.tsx

@@ -14,13 +14,13 @@ export default function FormCell({
   children,
   multiCell,
   requiredFlag,
-  size
+  size,
 }: PropsType) {
   const platform = usePlatform();
   const isFlex = layout !== 'vertical';
 
-  if(platform === 'pc') {
-    return (  
+  if (platform === 'pc') {
+    return (
       <ConfigProvider classPrefix="wedatea2td">
         <TeaForm.Item
           style={style}
@@ -31,9 +31,14 @@ export default function FormCell({
             'weda-formcells__pc': !!label,
             'weda-formcells__full-width': size === 'full',
             [layout]: layout,
-            [className]: [className]
+            [className]: [className],
           })}
-          label={label}
+          label={
+            <>
+              {requiredFlag && <span className="weda-formcells__flag">*</span>}
+              {label}
+            </>
+          }
         >
           {children}
         </TeaForm.Item>

package/src/web/components/form/radio/index.tsx

@@ -63,6 +63,12 @@ export default function Radio({
     }
   }, []);
 
+  useEffect(() => {
+    if (format !== 'x-enum') {
+      setOption(range)
+    }
+  }, [range]);
+
   const fetchData = async (param:
     { OptNameList?: object, PageIndex?: number, PageSize?: number }
   ) => {

package/src/web/components/form/select/h5.tsx

@@ -3,31 +3,12 @@ import weui from '../../../utils/weui';
 import classNames from '../../../utils/classnames';
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { regionPicker,getRegionTree,getAreaCode } from './region/index';
-import { PropsType } from './index';
-import { defaultProps } from './index';
+import { PropsType , defaultProps , moment } from './index';
 import { timePicker, yearPicker, monthPicker } from './time';
-import { moment } from './index';
 import { callDataSource, callWedaApi } from '../../../utils/tcb';
 import destr from 'destr';
-
-
-
-
-const REL_DICT = {
-  equal: 'eq', // 等于
-  unequal: 'neq', // 不等于
-  include: 'search', // 包含
-  exclude: '_exclude', // 不包含
-  begin_with: '_begin_with', // 开头是
-  greater: 'gt', // 大于
-  greater_or_equal: 'gte', // 大于等于
-  bigger_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';
 
 export default function Select({
   // 系统属性
@@ -322,7 +303,7 @@ export default function Select({
       },
     });
   };
-  const isNull = (val) => [undefined, null].includes(val);
+
   const getWhereList = (where) => {
     let result = [];
     Array.isArray(where) &&
@@ -338,7 +319,7 @@ export default function Select({
               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 });
             }
           });

package/src/web/components/form/select/index.tsx

@@ -13,26 +13,13 @@ import {
 import isObjectEqual from '../../../utils/isObjectEqual';
 import { getRegionTree,getAreaCode } from './region';
 import { renderDecorator } from '../renderDecorator';
-import { CommonFormPropsType } from '../types';
+import type { CommonFormPropsType } from '../types';
 import YearPicker from './year';
 import { callDataSource, callWedaApi } from '../../../utils/tcb';
 import destr from 'destr';
+import { REL_DICT } from '../../../utils/constant';
+import { isNil } from '../../../utils/lodash';
 
-const REL_DICT = {
-  equal: 'eq', // 等于
-  unequal: 'neq', // 不等于
-  include: 'search', // 包含
-  exclude: '_exclude', // 不包含
-  begin_with: '_begin_with', // 开头是
-  greater: 'gt', // 大于
-  greater_or_equal: 'gte', // 大于等于
-  bigger_or_equal: 'gte', //大于等于
-  less: 'lt', // 小于
-  less_or_equal: 'lte', // 小于等于
-  in: 'in', // 多选值
-  not_in: 'nin', // 不在多选值
-};
-const isNull = (val) => [undefined, null].includes(val);
 const getWhereList = (where) => {
   let result = [];
   Array.isArray(where) &&
@@ -48,7 +35,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 });
           }
         });

package/src/web/components/form/tips/index.css

@@ -0,0 +1,4 @@
+.weda-form .weui-cells__tips_warn {
+  color: #fa5151;
+  color: var(--weui-RED);
+}

package/src/web/components/form/tips/index.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 
 import classNames from '../../../utils/classnames';
 import { CommonPropsType } from '../../../types';
+import './index.css';
 
 export default function Tips({
   // 系统属性
@@ -10,7 +11,7 @@ export default function Tips({
   tips = '表单提示',
   type = 'normal',
   id,
-  style
+  style,
 }: PropsType) {
   const cls = classNames({
     'weda-ui': true,
@@ -21,7 +22,7 @@ export default function Tips({
   });
 
   return (
-    <div className={cls} id={id} style={style} >
+    <div className={cls} id={id} style={style}>
       {tips}
     </div>
   );
@@ -30,4 +31,4 @@ export default function Tips({
 export interface PropsType extends CommonPropsType {
   tips?: string;
   type?: 'warn' | 'normal';
-}
+}

package/src/web/components/index.js

@@ -86,6 +86,7 @@ export { default as Phone } from './phone';
 export { default as PhoneCode } from './phoneCode';
 export { default as Share } from './share';
 
+export { default as Lottery } from './lottery';
 // open
 // import Auth from './auth';
 

package/src/web/components/listView/index.tsx

@@ -11,24 +11,11 @@ import { isInIde } from '../../utils/platform';
 import classNames from '../../utils/classnames';
 import isequal from 'lodash.isequal';
 import './index.css';
+import { REL_DICT } from '../../utils/constant';
+import { isNil } from '../../utils/lodash';
 
-const REL_DICT = {
-  equal: 'eq', // 等于
-  unequal: 'neq', // 不等于
-  include: 'search', // 包含
-  exclude: '_exclude', // 不包含
-  begin_with: '_begin_with', // 开头是
-  greater: 'gt', // 大于
-  greater_or_equal: 'gte', // 大于等于
-  bigger_or_equal: 'gte', //大于等于
-  less: 'lt', // 小于
-  less_or_equal: 'lte', // 小于等于
-  in: 'in', // 多选值
-  not_in: 'nin', // 不在多选值
-};
 const ORDERTYPE = ['asc', 'desc'];
 const BLOCK_NAME = 'weda-list-view';
-const isNull = (val) => [undefined, null].includes(val);
 const getIdeMockData = (length = 3) => Array.from({ length }).map((d) => ({}));
 const getWhereList = (where) => {
   let result = [];
@@ -45,7 +32,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 });
           }
         });
@@ -185,7 +172,7 @@ export default function ListView(props: IListView) {
     const { orderBy, orderType, pageNo, pageSize, where } = params || {};
     const tcbParams = {};
     // tcb分页参数
-    if (!isNull(pageNo) && !isNull(pageSize)) {
+    if (!isNil(pageNo) && !isNil(pageSize)) {
       tcbParams['pageNo'] = pageNo;
       tcbParams['pageSize'] = pageSize;
     }