@aks-dev/easyui 1.0.88 → 1.0.89

package/lib/MutiPictureView/MutiPictureView.tsx

@@ -2,7 +2,7 @@
  * @Author: OBKoro1
  * @Date: 2022-04-24 17:38:27
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-08 17:02:04
+ * @LastEditTime: 2022-07-18 19:22:37
  * @FilePath: /@aks-dev/easyui/lib/MutiPictureView/MutiPictureView.tsx
  */
 
@@ -31,7 +31,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
         delIconStyle,
         spacingHorizontal = px2dp(15),
         spacingInner = px2dp(8),
-        editable = true
+        editable = true,
     } = props
     const { viewModel, setViewModel } = bind
     React.useEffect(() => {
@@ -121,7 +121,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
             }]} activeOpacity={0.8} onPress={() => showPhoto(index)}>
                 <Image source={source} style={{ width: '100%', height: '100%' }} resizeMode='cover' />
                 {
-                    editable &&
+                    editable && !props.value &&
                     <TouchableOpacity onPress={() => deletePhoto(index)} style={[styles.del_img_container, delIconStyle]}>
                         <Image source={delIcon ? delIcon : icon_del_image} resizeMode='contain' style={{ width: '100%', height: '100%' }} />
                     </TouchableOpacity>
@@ -139,15 +139,26 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
     React.useEffect(() => {
         containerRef.current?.measure((...args) => {
             // console.log(args)
-            if(args.length > 3){
+            if (args.length > 3) {
                 let _sideLength = (args[2] - spacingHorizontal * 2 - spacingInner * 2) / 3;
                 setSideLength(_sideLength)
             }
-    
+
         })
 
     }, [])
 
+
+    if (props.value && props.value?.length > 0) {
+        return (
+            <View style={[styles.container, props.style]} ref={containerRef as any}>
+                {props.value.map((item, index) => {
+                    return <ItemView key={index} source={typeof item === 'string' ? { uri: item } : item} index={index} />
+                })}
+            </View >
+        )
+    }
+
     return (
         <View style={[styles.container, props.style]} ref={containerRef as any}>
             {viewModel?.photos instanceof Array && viewModel.photos.map((item, index) => {

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-14 15:14:53
+ * @LastEditTime: 2022-07-18 19:21:19
  * @FilePath: /@aks-dev/easyui/lib/MutiPictureView/index.ts
  */
 import { StyleProp, ViewStyle, ImageStyle, ImageSourcePropType } from 'react-native'
@@ -35,12 +35,12 @@ export declare type MutiPictureViewProps = {
     maxCount?: number;
     /**default type is showImagePicker */
     type?: 'showImagePicker' | 'openCamera';
-    style?:StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
     addIcon?: ImageSourcePropType;
     addIconStyle?: StyleProp<ImageStyle>;
-    addText?:string;
-    addTextStyle?:StyleProp<TextStyle>;
-    addIconContainerStyle?:StyleProp<ViewStyle>;
+    addText?: string;
+    addTextStyle?: StyleProp<TextStyle>;
+    addIconContainerStyle?: StyleProp<ViewStyle>;
     delIcon?: ImageSourcePropType;
     delIconStyle?: StyleProp<ImageStyle>;
     /**外边距 */
@@ -48,10 +48,12 @@ export declare type MutiPictureViewProps = {
     /**内边距 */
     spacingInner?: number;
     /**仅仅看看，不增减图片 */
-    editable?:boolean;
+    editable?: boolean;
+    /**这个属性会覆盖bind.viewModel.photos */
+    value?: (string | { uri: string })[];
 }
 
 
-export declare const MutiPictureView:React.FC<MutiPictureViewProps>;
+export declare const MutiPictureView: React.FC<MutiPictureViewProps>;
 
 

package/package.json

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