Merge branch 'develop'

Author: yinLiangDream

@types/tag.d.ts

@@ -19,12 +19,6 @@ export interface IProps {
    * 可选参数 `small`, `normla`
    */
   size?: 'small' | 'normal';
-  /**
-   * 是否可以点击
-   *
-   * 默认值 `false`
-   */
-  canTouch?: boolean;
   /**
    * 点击事件
    */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mp-colorui",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "MP ColorUI 是一款基于 Taro 框架并且联合 Color-UI CSS 库开发的多端 UI 组件库（支持小程序端和H5端）",
   "keywords": [
     "taro",

src/components/accordion/index.tsx

@@ -3,6 +3,7 @@ import {View} from '@tarojs/components';
 
 import {IProps} from '../../../@types/accordion'
 import ClIcon from "../icon";
+import { screenPercent } from '../utils';
 
 export default function ClAccordion(props: IProps) {
   const {open, title, animation, onClick, card} = props;
@@ -24,7 +25,7 @@ export default function ClAccordion(props: IProps) {
   return (
     <View className={`cu-list menu ${card ? 'card-menu' : ''}`} style={{
       overflow: "hidden",
-      height: pxTransform((50 + height) * 2),
+      height: pxTransform(98 + height / screenPercent),
       transition: `all ${animation ? `${props.speed}s` : 0} linear`,
       color: 'black'
     }}>

src/components/radio/index.tsx

@@ -50,11 +50,12 @@ export default function ClRadio(props: IProps) {
 
   const weappComponent = type === 'list' ? renderListComponent() : formOrNormalComponent;
 
-  const RadioComponent = !isWeApp ?
-                         <H5Radio {...props} /> : weappComponent;
+  const RadioComponent = !isWeApp ? <H5Radio {...props} /> : weappComponent;
 
   return (
-    RadioComponent
+    <View>
+      {RadioComponent}
+    </View>
   );
 }
 

src/components/select/index.tsx

@@ -60,10 +60,6 @@ function ClSelect(props: IProps) {
     const value: string = getSelectorValue(index);
     setSelected(value);
   };
-  useMemo(() => {
-    props.mode === 'selector' && setSelected(getSelectorValue(selector.value))
-    props.mode === 'multiSelector' && setMutiSelected(getMutiSelectorValue(mutiSelector.value))
-  }, [props.selector])
   // 多选
   const getMutiSelectorValue = mutiIndex => {
     const value: any[] = [];
@@ -173,7 +169,10 @@ function ClSelect(props: IProps) {
     }
     setTempSelect(tempSelect)
   }
-
+  useMemo(() => {
+    props.mode === 'selector' && setSelected(getSelectorValue(selector.value))
+    props.mode === 'multiSelector' && setMutiSelected(getMutiSelectorValue(mutiSelector.value))
+  }, [props.selector])
   // 单选组件
   const selectorComponent = (
     <Picker

src/components/tag/index.tsx

@@ -15,7 +15,6 @@ export default class ClTag extends Component<IProps, IState> {
   static defaultProps = {
     shape: 'normal',
     size: 'normal',
-    canTouch: false,
     tags: []
   } as IProps;
   onClick(index: number) {

src/pages/index/index.tsx

@@ -23,20 +23,20 @@ import ClSwiperAction from '../../components/swiperAction/index';
 import ClActionSheet from '../../components/actionSheet/index';
 import ClCurtain from '../../components/curtain/index';
 import ClTabs from '../../components/tabs'
+import ClRadio from '../../components/radio';
 
 export default function Index() {
-  const tabs = [...Array(50)].map((key, index) => ({ name: 'tab-' + index, id: 'id-' + index }))
+  const radioGroup = [{
+    key: '男生',
+    value: 'male'
+  }, {
+    key: '女生',
+    value: 'female'
+  }]
+  const [checkedValue, setCheckedValue] = useState('male')
   return (
     <View>
-      <ClVerticalTab tabs={tabs} height={1000}>
-        <View>
-          {tabs.map((item) => (
-            <View id={item.id} key={item.name}>
-              <ClVerticalTabCell>{item.name}</ClVerticalTabCell>
-            </View>
-          ))}
-        </View>
-      </ClVerticalTab>
+      <ClRadio type='normal' title='normal' radioGroup={radioGroup} checkedValue={checkedValue} />
     </View>
   )
 }