@aks-dev/easyui 1.0.114 → 1.0.115
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: OBKoro1
|
|
3
3
|
* @Date: 2022-04-24 17:38:27
|
|
4
4
|
* @LastEditors: shiguo
|
|
5
|
-
* @LastEditTime: 2022-
|
|
5
|
+
* @LastEditTime: 2022-11-10 11:37:13
|
|
6
6
|
* @FilePath: /@aks-dev/easyui/lib/MutiPictureView/MutiPictureView.tsx
|
|
7
7
|
*/
|
|
8
8
|
|
|
@@ -27,6 +27,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
27
27
|
addIcon,
|
|
28
28
|
addIconStyle,
|
|
29
29
|
addIconContainerStyle,//borderWidth: 1, borderStyle: 'dashed', borderColor: assets.color_A3A9CC 虚线框
|
|
30
|
+
itemContainerStyle,
|
|
30
31
|
delIcon,
|
|
31
32
|
delIconStyle,
|
|
32
33
|
spacingHorizontal = px2dp(15),
|
|
@@ -113,7 +114,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
113
114
|
const ItemView: React.FC<{ source: ImageSourcePropType, index: number }> = ({ source, index }) => {
|
|
114
115
|
|
|
115
116
|
return (
|
|
116
|
-
<TouchableOpacity style={[styles.item_container, {
|
|
117
|
+
<TouchableOpacity style={[styles.item_container,itemContainerStyle, {
|
|
117
118
|
marginTop: index < 3 ? 0 : spacingInner,
|
|
118
119
|
marginLeft: index % 3 == 0 ? spacingHorizontal : spacingInner,
|
|
119
120
|
width: sideLength,
|
|
@@ -167,7 +168,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
167
168
|
|
|
168
169
|
{
|
|
169
170
|
!(viewModel?.photos?.length == maxCount) && editable && (
|
|
170
|
-
<TouchableOpacity style={[styles.item_container, {
|
|
171
|
+
<TouchableOpacity style={[styles.item_container, itemContainerStyle,{
|
|
171
172
|
marginTop: (viewModel?.photos?.length || 0) >= 3 ? spacingInner : 0,
|
|
172
173
|
marginLeft: (viewModel?.photos?.length || 0) % 3 == 0 ? spacingHorizontal : spacingInner,
|
|
173
174
|
width: sideLength,
|
|
@@ -199,7 +200,7 @@ const styles = StyleSheet.create({
|
|
|
199
200
|
display: 'flex',
|
|
200
201
|
flexDirection: 'row',
|
|
201
202
|
flexWrap: 'wrap',
|
|
202
|
-
borderRadius: px2dp(10),
|
|
203
|
+
// borderRadius: px2dp(10),
|
|
203
204
|
},
|
|
204
205
|
item_container: {
|
|
205
206
|
overflow: 'hidden',
|
|
@@ -3,7 +3,7 @@ import { TextStyle } from 'react-native';
|
|
|
3
3
|
* @Author: shiguo
|
|
4
4
|
* @Date: 2022-04-24 17:38:32
|
|
5
5
|
* @LastEditors: shiguo
|
|
6
|
-
* @LastEditTime: 2022-
|
|
6
|
+
* @LastEditTime: 2022-11-10 11:36:31
|
|
7
7
|
* @FilePath: /@aks-dev/easyui/lib/MutiPictureView/index.ts
|
|
8
8
|
*/
|
|
9
9
|
import { StyleProp, ViewStyle, ImageStyle, ImageSourcePropType } from 'react-native'
|
|
@@ -41,6 +41,7 @@ export declare type MutiPictureViewProps = {
|
|
|
41
41
|
addText?: string;
|
|
42
42
|
addTextStyle?: StyleProp<TextStyle>;
|
|
43
43
|
addIconContainerStyle?: StyleProp<ViewStyle>;
|
|
44
|
+
itemContainerStyle?: StyleProp<ViewStyle>;
|
|
44
45
|
delIcon?: ImageSourcePropType;
|
|
45
46
|
delIconStyle?: StyleProp<ImageStyle>;
|
|
46
47
|
/**外边距 */
|