@aks-dev/easyui 1.0.91 → 1.0.94
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-07-
|
|
5
|
+
* @LastEditTime: 2022-07-20 16:59:12
|
|
6
6
|
* @FilePath: /@aks-dev/easyui/lib/MutiPictureView/MutiPictureView.tsx
|
|
7
7
|
*/
|
|
8
8
|
|
|
@@ -84,7 +84,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
84
84
|
|
|
85
85
|
const showPhoto = (index: number) => {
|
|
86
86
|
Keyboard.dismiss()
|
|
87
|
-
let imgs: any[] = viewModel.photos?.filter((it) => { return (typeof it === 'string' && it.indexOf('http') >= 0) || typeof it == 'object' }) || []
|
|
87
|
+
let imgs: any[] = (props.value || viewModel.photos)?.filter((it) => { return (typeof it === 'string' && it.indexOf('http') >= 0) || typeof it == 'object' }) || []
|
|
88
88
|
let images: any[] = []
|
|
89
89
|
// console.log('viewModel', viewModel, imgs)
|
|
90
90
|
imgs.forEach(it => {
|
|
@@ -138,15 +138,15 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
138
138
|
|
|
139
139
|
React.useEffect(() => {
|
|
140
140
|
containerRef.current?.measure((...args) => {
|
|
141
|
-
// console.log(args)
|
|
141
|
+
// console.log('measure', args[2])
|
|
142
142
|
if (args.length > 3) {
|
|
143
|
-
let _sideLength = (args[2] - spacingHorizontal * 2 - spacingInner * 2) / 3;
|
|
144
|
-
setSideLength(_sideLength)
|
|
143
|
+
let _sideLength = +((args[2] - spacingHorizontal * 2 - spacingInner * 2) / 3).toFixed(1);
|
|
144
|
+
setSideLength(_sideLength - 0.1)
|
|
145
145
|
}
|
|
146
146
|
|
|
147
147
|
})
|
|
148
|
+
})
|
|
148
149
|
|
|
149
|
-
}, [])
|
|
150
150
|
|
|
151
151
|
|
|
152
152
|
if (props.value && props.value?.length > 0) {
|
|
@@ -193,7 +193,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
193
193
|
|
|
194
194
|
const styles = StyleSheet.create({
|
|
195
195
|
container: {
|
|
196
|
-
|
|
196
|
+
flex: 1,
|
|
197
197
|
minHeight: 1,
|
|
198
198
|
backgroundColor: 'transparent',
|
|
199
199
|
display: 'flex',
|
|
@@ -208,7 +208,7 @@ const styles = StyleSheet.create({
|
|
|
208
208
|
position: 'relative',
|
|
209
209
|
justifyContent: 'center',
|
|
210
210
|
alignItems: 'center',
|
|
211
|
-
backgroundColor: '#ededed'
|
|
211
|
+
backgroundColor: '#ededed',
|
|
212
212
|
},
|
|
213
213
|
|
|
214
214
|
del_img_container: {
|