@aks-dev/easyui 1.0.18 → 1.0.21

package/lib/RefreshList/RefreshList.tsx

@@ -16,7 +16,6 @@ import {
 
 
 
-
 export default React.forwardRef((props: RefreshListProps, ref: React.Ref<any>) => {
     const {
         mode = 'FlatList',
@@ -173,10 +172,15 @@ const ListFooterComponent = React.memo((props: RefreshListProps) => {
         case RefreshState.EmptyData:
             if (props.renderListEmptyComponent) return props.renderListEmptyComponent()
             return (
-                <View style={{ width: '100%', height: '100%' }}>
-                    <TouchableOpacity onPress={() => {
-                        reload && reload()
-                    }}>
+                <View style={{
+                    width: '100%', height: '100%',
+                    display: 'flex',
+                    justifyContent: 'center', alignItems: 'center'
+                }}>
+                    <TouchableOpacity style={{ minHeight: 44 }}
+                        onPress={() => {
+                            reload && reload()
+                        }}>
                         <Text style={styles.text}>{RefreshText.EmptyData}</Text>
                     </TouchableOpacity>
                 </View>

package/lib/RefreshList/index.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-04-20 14:56:05
- * @LastEditTime: 2022-04-27 14:22:01
+ * @LastEditTime: 2022-05-16 15:50:31
  * @LastEditors: shiguo
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /@aks/easyui/lib/RefreshList/index.ts
@@ -25,9 +25,9 @@ import { IPropsSwipeListView } from 'react-native-swipe-list-view/types'
 
 type CommonProps = {
     // mode: keyof easyui.Mode;
-    onHeaderRefresh: Function;
+    onHeaderRefresh: (info: any) => void;
     onFooterRefresh: (info: any) => void;
-    reload: Function;
+    reload: () => void;
     refreshState: RefreshState;
     renderListEmptyComponent: () => React.ReactElement;
 }
@@ -73,7 +73,7 @@ export const RefreshText = {
     FooterRefreshing: '下拉可以加载更多',
     Failure: '服务器正在出小差，点击重新加载',
     NoMoreData: '已经全部加载完毕',
-    EmptyData: '加载数据为空',
+    EmptyData: '没有数据',
     Idle: '正在加载更多的数据..',
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.18",
+  "version": "1.0.21",
   "description": "爱科森开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/px2dp.tsx

@@ -1,3 +1,10 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-18 14:32:25
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-05-16 17:43:18
+ * @FilePath: /@aks/easyui/screen/px2dp.tsx
+ */
 import { Dimensions, StatusBar, Platform } from 'react-native';
 
 
@@ -31,7 +38,7 @@ export const isiPhoneX = isIos && (deviceHeight > 736)
 
 export const statusBarHeight = (() => {
     if (isAndroid) {
-        if ((StatusBar.currentHeight || 0) > 20) return 40
+        if ((StatusBar.currentHeight || 0) > 20) return 30
     }
     if (isiPhoneX) return 44
     return 20