@aks-dev/easyui 1.0.71 → 1.0.74

package/lib/Badge/Badge.tsx

@@ -2,38 +2,39 @@
  * @Author: shiguo
  * @Date: 2022-04-21 14:40:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-04-26 14:05:59
- * @FilePath: /@aks/easy/lib/Badge/Badge.tsx
+ * @LastEditTime: 2022-07-08 15:40:21
+ * @FilePath: /@aks-dev/easyui/lib/Badge/Badge.tsx
  */
 import React from 'react'
 import { View, Text, } from 'react-native'
-import {px2dp} from '../../screen/px2dp'
-import {px2sp} from '../../screen/px2sp'
+import { px2dp } from '../../screen/px2dp'
+import { px2sp } from '../../screen/px2sp'
 
 
 import type { BadgeProps } from '.'
 
 
 
-export const Badge: React.FC<BadgeProps> = (props) => {
-    return (
-
-        <View style={
-            [
-                {
-                    flexGrow: 0, flexShrink: 1, zIndex: 1,
-                    paddingHorizontal: px2dp(4),
-                    height: px2dp(16), minWidth: px2dp(16), borderRadius: px2dp(8),
-                    justifyContent: 'center', alignItems: 'center', backgroundColor: 'red'
-                },
-                props.style
-            ]
-        } >
-
-
-            <Text style={{ fontSize: px2sp(12), color: 'white', lineHeight: px2dp(16), textAlign: 'center' }}> {props.count > 99 ? '+99' : props.count} </Text>
-
-        </View>
-    )
-}
+export const Badge: React.FC<BadgeProps>
+    = (props) => {
+        if (isNaN(+props.count) || Number(props.count) == 0) return <View />
+        return (
+
+            <View style={
+                [
+                    {
+                        flexGrow: 0, flexShrink: 1, zIndex: 1,
+                        // paddingHorizontal: px2dp(0),
+                        height: px2dp(16), minWidth: px2dp(16), borderRadius: px2dp(8),
+                        justifyContent: 'center', alignItems: 'center',
+                        backgroundColor: 'red'
+                    },
+                    props.style
+                ]
+            } >
+                <Text style={{ fontSize: px2sp(12), color: 'white', textAlign: 'center' }}> {props.count > 99 ? '+99' : props.count} </Text>
+
+            </View>
+        )
+    }
 

package/lib/Badge/index.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-21 14:43:14
  * @LastEditors: shiguo
- * @LastEditTime: 2022-04-26 10:49:39
- * @FilePath: /@aks/easy/lib/Badge/index.ts
+ * @LastEditTime: 2022-07-08 15:40:30
+ * @FilePath: /@aks-dev/easyui/lib/Badge/index.ts
  */
 import *  as React from 'react'
 import { StyleProp, ViewStyle } from 'react-native'
@@ -13,9 +13,9 @@ import { StyleProp, ViewStyle } from 'react-native'
 
 
 export declare type BadgeProps = {
-    count: number;
+    count: number | string;
     style?: StyleProp<ViewStyle>
 }
 
-export declare const Badge : React.FC<BadgeProps>
+export declare const Badge: React.FC<BadgeProps>
 

package/lib/MutiPictureView/MutiPictureView.tsx

@@ -2,8 +2,8 @@
  * @Author: OBKoro1
  * @Date: 2022-04-24 17:38:27
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 10:59:12
- * @FilePath: /@aks/easyui/lib/MutiPictureView/MutiPictureView.tsx
+ * @LastEditTime: 2022-07-08 16:52:06
+ * @FilePath: /@aks-dev/easyui/lib/MutiPictureView/MutiPictureView.tsx
  */
 
 import * as React from 'react'
@@ -139,8 +139,11 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
     React.useEffect(() => {
         containerRef.current?.measure((...args) => {
             // console.log(args)
-            let _sideLength = (args[2] - spacingHorizontal * 2 - spacingInner * 2) / 3
-            setSideLength(_sideLength)
+            if(args.length > 3){
+                let _sideLength = (args[2] - spacingHorizontal * 2 - spacingInner * 2) / 3;
+                setSideLength(_sideLength)
+            }
+    
         })
 
     }, [])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.71",
+  "version": "1.0.74",
   "description": "移动端App开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",