@cloudbase/weda-ui 1.0.21 → 2.0.9

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.css

@@ -1,3 +1,14 @@
+.weda-ui .weui-cell.weui-check__label {
+  padding: 16px;
+}
+
+.weda-ui .weui-flex__item .weui-cell.weui-check__label {
+  padding-left: 0;
+}
+
+
+
+
 .year-picker__overlay {
   width: 300px;
 }

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

@@ -1,3 +1,7 @@
 .weda-textarea textarea {
   height: 8.6rem;
 }
+
+.weda-ui .weda-textarea .weui-cell_form {
+  padding: 16px;
+}

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

@@ -45,7 +45,7 @@ export default function Textarea({
   // 两次默认值不同时, 需要刷新value
   const [value, setValue] = useSyncValue(defaultValue);
   const counter = React.useMemo(() => (value?.length || 0), [value]);
-  
+
   const onChange = function (e) {
     const text = typeof e === 'string' ? e : e.target.value;
     setValue(text);
@@ -111,4 +111,4 @@ export interface PropsType extends CommonFormPropsType {
   focus?: boolean;
   counterVisible?: boolean;
   size?: 's' | 'm' | 'l' | 'full';
-}
+}

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

@@ -79,6 +79,30 @@
   display: flex;
   justify-content: space-between;
 }
-.weui-uploader.horizontal .weui-uploader__bd {
-  padding-left: 2.28571rem;
+
+.weui-uploader.horizontal .weda-formcells__label {
+  width: 130px;
+}
+
+.weda-ui .weui-uploader__hd {
+  display: block;
+}
+
+.weui-uploader__label {
+  display: flex;
+  flex: 1;
+}
+.weui-uploader.vertical .weui-uploader__title {
+  flex: unset;
+}
+
+.weda-ui .weui-uploader.horizontal .weui-uploader__bd {
+  padding: 16px 0;
+}
+.weda-ui .weui-uploader.vertical .weui-uploader__bd {
+  padding: 16px;
+}
+
+.weui-uploader__hd.vertical {
+  padding-bottom: 0;
 }

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

@@ -130,65 +130,55 @@ export function ImageUploaderH5({
   }, [fileIdList, single, maxUploadCount]);
   return (
     <div className={cls} id={id} style={style}>
-      <div className="weui-cell">
-        <div className="weui-cell__bd">
-          <div className={classNames('weui-uploader', layout)}>
-            <div className={classNames('weui-uploader__hd', layout)}>
-              {requiredFlag && (
-                <label className="weda-formcells__flag">*</label>
-              )}
-              <p className="weui-uploader__title">{title}</p>
-              <div className="weui-uploader__info">
-                <span id="uploadCount">{fileIdList.length}</span>
-                {`/${finalMaxImgCount}`}
-              </div>
-            </div>
-            <div className="weui-uploader__bd">
-              <ul className="weui-uploader__files" id="uploaderFiles">
-                {(fileIdList ?? []).map((f) => (
-                  <SingleImage key={f} src={f} deleteBySrc={deleteFile} />
-                ))}
-                {uploading && (
-                  <li className="weui-uploader__file weui-uploader__file_status">
-                    <div className="weui-uploader__file-content">
-                      {progress}%
-                    </div>
-                  </li>
-                )}
-              </ul>
-              {showAdd && (
-                <div className="weui-uploader__input-box">
-                  <input
-                    id="uploaderInput"
-                    className="weui-uploader__input"
-                    type="file"
-                    accept={accepts.join(',')}
-                    multiple
-                    onChange={(e) => {
-                      const files = [...e.target.files];
-                      if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-                        weui.alert('请上传不超过10M的图片');
-                        return false;
-                      }
+      <div className={classNames('weui-uploader', layout)}>
+        <div className={classNames('weui-uploader__hd', layout)}>
+          <UploaderLabel layout={layout} title={title} currentCount={fileIdList.length} maxCount={finalMaxImgCount} requiredFlag={requiredFlag} />
+        </div>
 
-                      if (files.length > finalMaxImgCount) {
-                        // 防止一下子选择过多文件
-                        weui.alert(
-                          `最多只能上传${finalMaxImgCount}张图片，请重新选择`
-                        );
-                        return false;
-                      }
-                      if (fileIdList.length + files.length > finalMaxImgCount) {
-                        weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
-                        return false;
-                      }
-                      files.forEach((f) => uploadToTcb(f));
-                    }}
-                  />
+        <div className="weui-uploader__bd">
+          <ul className="weui-uploader__files" id="uploaderFiles">
+            {(fileIdList ?? []).map((f) => (
+              <SingleImage key={f} src={f} deleteBySrc={deleteFile} />
+            ))}
+            {uploading && (
+              <li className="weui-uploader__file weui-uploader__file_status">
+                <div className="weui-uploader__file-content">
+                  {progress}%
                 </div>
-              )}
+              </li>
+            )}
+          </ul>
+          {showAdd && (
+            <div className="weui-uploader__input-box">
+              <input
+                id="uploaderInput"
+                className="weui-uploader__input"
+                type="file"
+                accept={accepts.join(',')}
+                multiple
+                onChange={(e) => {
+                  const files = [...e.target.files];
+                  if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
+                    weui.alert('请上传不超过10M的图片');
+                    return false;
+                  }
+
+                  if (files.length > finalMaxImgCount) {
+                    // 防止一下子选择过多文件
+                    weui.alert(
+                      `最多只能上传${finalMaxImgCount}张图片，请重新选择`
+                    );
+                    return false;
+                  }
+                  if (fileIdList.length + files.length > finalMaxImgCount) {
+                    weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
+                    return false;
+                  }
+                  files.forEach((f) => uploadToTcb(f));
+                }}
+              />
             </div>
-          </div>
+          )}
         </div>
       </div>
     </div>
@@ -260,3 +250,38 @@ export interface H5UploaderProps extends CommonFormPropsType {
   single?: boolean; // 单张上传还是多张上传，对应 onChange 参数为字符串还是字符串数组，value 在处理过程统一转为字符串数组;
   onChange?: (v: any) => void;
 }
+
+const UploaderLabel = ({layout, title, currentCount, maxCount, requiredFlag}) => {
+  if(layout === 'horizontal') {
+    return (
+      <React.Fragment>
+        <div className='weda-formcells__label weui-cell'>
+          <div>
+            <p className="weui-uploader__title">{title}</p>
+            <div className="weui-uploader__info">
+              <span id="uploadCount">{currentCount}</span>
+              {`/${maxCount}`}
+            </div>
+          </div>
+          {requiredFlag && (
+              <label className="weda-formcells__flag">*</label>
+          )}
+        </div>
+      </React.Fragment>
+    )
+  }
+  return (
+    <div className='weda-formcells__label weui-cell'>
+      <div className='weui-uploader__label'>
+        <p className="weui-uploader__title">{title}</p>
+        {requiredFlag && (
+                <label className="weda-formcells__flag">*</label>
+        )}
+      </div>
+      <div className="weui-uploader__info">
+        <span id="uploadCount">{currentCount}</span>
+        {`/${maxCount}`}
+      </div>
+    </div>
+  )
+}

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

@@ -76,9 +76,6 @@
   display: flex;
   justify-content: space-between;
 }
-.weui-uploader.horizontal .weui-uploader__bd {
-  padding-left: 2.28571rem;
-}
 
 /* ----上传文件----  pc */
 .weda-upload-file-pc .weda-upload-file-pc__file-item {
@@ -230,7 +227,8 @@
 
 .weda-upload-file-mobile .weda-upload-file-mobile__hd {
   width: 100%;
-  padding: 24px 20px 8px 20px;
+  padding: 16px;
+  padding-left: 0;
   display: flex;
   background-color: #fff;
 }

package/src/web/components/image/index.css

@@ -35,11 +35,11 @@
   color: white;
 }
 
-.weda-image.weda-image-error {
-  position: relative;
-  display: inline-block;
+.weda-image.weda-image-error,
+.weda-image:not([src]) {
+  position: relative !important;
+  display: inline-block !important;
 }
-
 .weda-image:not([src]):before,
 .weda-image-error::before {
     content: '';
@@ -49,4 +49,4 @@
     top: 0;
     width: 100%;
     height: 100%;
-}
+}

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

@@ -23,12 +23,12 @@ export default function Image({
   events = {},
   style = {},
   // 组件属性
-  src = defaultSrc,
-  alt = '[图片]',
-  mode = 'scaleToFill',
-  lazyLoad = false,
-  imgPreview = false,
-  maskClosable = true,
+  src,
+  alt,
+  mode,
+  lazyLoad,
+  imgPreview,
+  maskClosable,
   fit,
 }: PropsType) {
   const [isError, setIsError] = useState(false);
@@ -102,4 +102,3 @@ function getObjectFitByWxImageMode(mode: TMode): React.CSSProperties['objectFit'
   const item = array.find((item) => item.mode === mode);
   return item?.h5;
 }
- 

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

@@ -23,14 +23,14 @@ export interface PropsType extends CommonPropsType {
 // 所有绝对地址直接交由浏览器，新开窗口交由浏览器
 // 当前窗口相对地址交给平台
 export default function Link({
-  content = '这是一个链接',
+  content,
   url = '',
   events = {},
   style,
   className,
   contentSlot,
   params = [], // TODO 格式定义,
-  isOpenInNewWindow = false,
+  isOpenInNewWindow,
 }: PropsType) {
   url = url.trim();
   const cls = classNames({

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 });
           }
         });
@@ -63,9 +50,9 @@ export default function ListView(props: IListView) {
     orderBy,
     orderType,
     where,
-    template = 'simpleList',
+    template,
     pageSize = 5,
-    pagination = 'loadMoreButton',
+    pagination,
     events,
     className,
     children,
@@ -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;
     }