@aks-dev/easyui 1.0.114 → 1.0.116

package/lib/MutiPictureView/MutiPictureView.tsx

@@ -2,7 +2,7 @@
  * @Author: OBKoro1
  * @Date: 2022-04-24 17:38:27
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-20 16:59:12
+ * @LastEditTime: 2022-11-10 12:15:48
  * @FilePath: /@aks-dev/easyui/lib/MutiPictureView/MutiPictureView.tsx
  */
 
@@ -27,11 +27,14 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
         addIcon,
         addIconStyle,
         addIconContainerStyle,//borderWidth: 1, borderStyle: 'dashed', borderColor: assets.color_A3A9CC  虚线框
+        itemContainerStyle,
+        emptyPlaceHolderStyle,
         delIcon,
         delIconStyle,
         spacingHorizontal = px2dp(15),
         spacingInner = px2dp(8),
         editable = true,
+        showEmptyPlaceHolder = false
     } = props
     const { viewModel, setViewModel } = bind
     React.useEffect(() => {
@@ -113,7 +116,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
     const ItemView: React.FC<{ source: ImageSourcePropType, index: number }> = ({ source, index }) => {
 
         return (
-            <TouchableOpacity style={[styles.item_container, {
+            <TouchableOpacity style={[styles.item_container, itemContainerStyle, {
                 marginTop: index < 3 ? 0 : spacingInner,
                 marginLeft: index % 3 == 0 ? spacingHorizontal : spacingInner,
                 width: sideLength,
@@ -167,7 +170,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
 
             {
                 !(viewModel?.photos?.length == maxCount) && editable && (
-                    <TouchableOpacity style={[styles.item_container, {
+                    <TouchableOpacity style={[styles.item_container, itemContainerStyle, {
                         marginTop: (viewModel?.photos?.length || 0) >= 3 ? spacingInner : 0,
                         marginLeft: (viewModel?.photos?.length || 0) % 3 == 0 ? spacingHorizontal : spacingInner,
                         width: sideLength,
@@ -179,6 +182,17 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
 
                 )
             }
+            {
+                showEmptyPlaceHolder && maxCount - (viewModel.photos?.length || 0) - 1 > 0 &&
+                Array.from({ length: maxCount - (viewModel.photos?.length || 0) - 1 }, (_, k) =>
+                    <View key={`sg-showEmptyPlaceHolder-${k}`} style={[styles.empty_place_container, emptyPlaceHolderStyle, itemContainerStyle, {
+                        marginTop: k + 1 + (viewModel.photos?.length || 0) > 2 ? spacingInner : 0,
+                        marginLeft: (k + 1 + (viewModel.photos?.length || 0)) % 3 == 0 ? spacingHorizontal : spacingInner,
+                        width: sideLength,
+                        height: sideLength,
+                    }]} />
+                )
+            }
         </View >
 
     )
@@ -199,7 +213,7 @@ const styles = StyleSheet.create({
         display: 'flex',
         flexDirection: 'row',
         flexWrap: 'wrap',
-        borderRadius: px2dp(10),
+        // borderRadius: px2dp(10),
     },
     item_container: {
         overflow: 'hidden',
@@ -218,6 +232,12 @@ const styles = StyleSheet.create({
         width: px2dp(24),
         height: px2dp(24)
     },
+    empty_place_container: {
+        borderRadius: px2dp(10),
+        backgroundColor: '#ededed',
+        borderColor: '#cccccc',
+        borderWidth: .75,
+    }
 })
 
 

package/lib/MutiPictureView/index.ts

@@ -3,7 +3,7 @@ import { TextStyle } from 'react-native';
  * @Author: shiguo
  * @Date: 2022-04-24 17:38:32
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-18 19:21:19
+ * @LastEditTime: 2022-11-10 12:15:56
  * @FilePath: /@aks-dev/easyui/lib/MutiPictureView/index.ts
  */
 import { StyleProp, ViewStyle, ImageStyle, ImageSourcePropType } from 'react-native'
@@ -41,6 +41,7 @@ export declare type MutiPictureViewProps = {
     addText?: string;
     addTextStyle?: StyleProp<TextStyle>;
     addIconContainerStyle?: StyleProp<ViewStyle>;
+    itemContainerStyle?: StyleProp<ViewStyle>;
     delIcon?: ImageSourcePropType;
     delIconStyle?: StyleProp<ImageStyle>;
     /**外边距 */
@@ -51,6 +52,9 @@ export declare type MutiPictureViewProps = {
     editable?: boolean;
     /**这个属性会覆盖bind.viewModel.photos */
     value?: (string | { uri: string })[];
+    /**default false 空视图占位 */
+    showEmptyPlaceHolder?: boolean;
+    emptyPlaceHolderStyle?: StyleProp<ViewStyle>;
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",