@cloudbase/weda-ui 1.0.21 → 2.0.9

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/style/weda-ui.wxss

@@ -40,3 +40,17 @@ page .weda-ui {
 .weda-ui.weda-picker .weui-btn_primary:not(.weui-btn_disabled):active {
   background-color: var(--weui-TAG-TEXT-BLUE);
 }
+
+.weda-ui .weui-cell {
+  font-size: 16px; /* 修改默认weui的17为16 */
+}
+
+.weui-cells__group_form .weui-cell::before, .weui-cells__group_form .weui-cells::before {
+  left: 16px;
+  right: 16px;
+}
+
+.weui-cells__group_form .weui-cells::after {
+    left: 16px;
+    right: 16px;
+}

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/button/index.tsx

@@ -8,13 +8,13 @@ import './index.css';
 
 // 不用 react-weui 而直接用底层实现的原因是 react-weui 不能支持表单类型
 const Button = ({
-  text = '按钮',
-  size = 'default',
-  type = 'primary',
+  text,
+  size,
+  type,
   contentSlot,
   formType,
-  loading = false,
-  disabled = false,
+  loading,
+  disabled,
   events = ({} as Record<string, unknownFunction>),
   className,
   style,
@@ -61,7 +61,7 @@ const Button = ({
 return (
   <ConfigProvider classPrefix="wedatea2td">
     <TeaButton
-      loading={loading} 
+      loading={loading}
       onClick={onClick}
       disabled={disabled}
       htmlType={formType}
@@ -112,4 +112,4 @@ export interface PropsType extends CommonPropsType {
   contentSlot?: string;
 }
 
-export default Button;
+export default Button;

package/src/web/components/calendar/index.jsx

@@ -19,7 +19,7 @@ const isShowWeekend = true; // 是否显示周末
 export default function Calendar({
   className,
   style,
-  initVisible = true,
+  initVisible,
   initValue,
   configData = [],
 }) {

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

@@ -50,15 +50,15 @@ export interface PropsType extends CommonPropsType {
 export default function Carousel({
   className,
   style = {},
-  autoplay = true,
-  circular = true,
-  vertical = false,
+  autoplay,
+  circular,
+  vertical,
   indicatorDots,
-  indicatorColor = 'rgba(200, 200, 200, 0.9)',
-  indicatorActiveColor = 'rgba(0, 0, 0, 0.9)',
-  duration = 500,
-  interval = 5000,
-  current = 0,
+  indicatorColor,
+  indicatorActiveColor,
+  duration,
+  interval,
+  current,
   events = {},
   id,
   images,

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/form/index.css

@@ -5,4 +5,8 @@
 .wedatea2td-form > .gsd-h5-react-formitem,
 .wedatea2td-form > div > .gsd-h5-react-formitem {
   padding-left: 32px;
-}
+}
+
+.weda-ui.weda-form-pc, .weda-ui.gsd-h5-react-form-pc {
+  padding-left: 24px;
+}

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

@@ -22,6 +22,8 @@ export default function Form({
     'weda-ui': true,
     'weda-form': true,
     'weui-form': platform === 'h5',
+    'weda-form-pc': platform === 'pc',
+    'gsd-h5-react-form-pc': platform === 'pc',
     [className]: className,
   });
   if(platform === 'pc') {
@@ -45,4 +47,4 @@ export default function Form({
 
 export interface PropsType extends CommonFormPropsType {
   contentSlot?: any;
-}
+}

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

@@ -4,7 +4,28 @@
   font-family: SimSun;
   font-size: 12px;
   color: #f60;
+  align-self: flex-start;
 }
+
+.weda-ui .weui-cells__group_form .weui-cells {
+  margin: 0;
+}
+.weda-formcells.weui-flex .weda-formcells__label {
+  width: 130px;
+}
+.weui-cells__group_form .weui-cell {
+  padding: 16px 16px;
+}
+
+.weda-formcells__content.weui-flex__item .weui-cell_form {
+  padding: 0;
+}
+
+.weda-formcells__content.weui-flex__item .weui-cell_form {
+  padding-right: 16px;
+}
+
+
 /* formcell 在 form container 外部兼容 and 独立 layout 适配 */
 
 .weda-formcells__pc.vertical .wedatea2td-form__controls,
@@ -68,4 +89,4 @@
 /*formcell end*/
 
 
-/* formcell 在 form container 外部兼容 */
+/* formcell 在 form container 外部兼容 */

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={
+            <>
+              {label}
+              {requiredFlag && <span className="weda-formcells__flag">*</span>}
+            </>
+          }
         >
           {children}
         </TeaForm.Item>
@@ -59,10 +64,10 @@ export default function FormCell({
               'weui-cell': true,
             })}
           >
+            <label>{label}</label>
             {requiredFlag ? (
               <label className="weda-formcells__flag">*</label>
             ) : null}
-            <label>{label}</label>
           </div>
         ) : null}
         <div

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

@@ -7,22 +7,17 @@
 /*
 把weui-cell 的padding还回到input
 */
-.weda-ui.weda-input input.weui-input {
-    padding: 28px 16px;
+.weda-ui input.weui-input {
+    padding: 28px 0;
 }
 
-.weda-ui.weda-input .weui-cell.weda-formcells__label {
-    padding: 16px;
-}
-.weda-ui.weda-input .weda-formcells__label.weui-cell label {
-    padding: 0;
-}
-.weda-ui.weda-input .weui-cell {
+.weda-ui.weda-input .weui-flex__item .weui-cell_form {
     padding: 0;
+    padding-right: 16px;
 }
 
-.weda-ui.weda-input .weui-btn_input-clear {
-    padding-right: 16px;
+.weda-ui.weda-input .weui-cell_form {
+  padding: 0 16px;
 }
 
 /**
@@ -38,4 +33,4 @@
 }
 /**
  * END
- */
+ */

package/src/web/components/form/location/components/LocationH5/index.css

@@ -1,7 +1,3 @@
-.weda-ui_form-location {
-  padding: 1.14286rem 0;
-}
-
 .form-location-warp {
   display: flex;
   white-space: nowrap;
@@ -10,7 +6,9 @@
 .form-location-label {
   display: flex;
   align-items: center;
-  padding: 0 1.14286rem;
+  padding: 16px;
+  width: 130px;
+
 }
 .form-location-label > span {
   margin-right: 0.28571rem;
@@ -19,8 +17,7 @@
   color: #f60;
 }
 
-.form-location-con {
-  padding-left: 1.14286rem;
+.weda-ui .form-location-con {
   display: flex;
   align-items: center;
 }

package/src/web/components/form/location/components/LocationH5/location.h5.jsx

@@ -329,8 +329,8 @@ export default function LocationH5(props) {
       <div className="form-location-warp">
         {labelVisible && (
           <div className="form-location-label">
-            {requiredFlag && <span>*</span>}
             {label}
+            {requiredFlag && <span>*</span>}
           </div>
         )}
         <div className="form-location-con">

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 }
   ) => {