@aks-dev/easyui 1.0.92 → 1.0.93
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-20
|
|
5
|
+
* @LastEditTime: 2022-07-20 15:55:23
|
|
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[] = (props.value || viewModel.photos
|
|
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,18 +138,16 @@ 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.01)
|
|
145
145
|
}
|
|
146
146
|
|
|
147
147
|
})
|
|
148
|
-
|
|
149
148
|
}, [])
|
|
150
149
|
|
|
151
150
|
|
|
152
|
-
console.log({props})
|
|
153
151
|
|
|
154
152
|
if (props.value && props.value?.length > 0) {
|
|
155
153
|
return (
|
|
@@ -195,7 +193,7 @@ const MutiPictureView: React.FC<MutiPictureViewProps> = (props) => {
|
|
|
195
193
|
|
|
196
194
|
const styles = StyleSheet.create({
|
|
197
195
|
container: {
|
|
198
|
-
|
|
196
|
+
flex: 1,
|
|
199
197
|
minHeight: 1,
|
|
200
198
|
backgroundColor: 'transparent',
|
|
201
199
|
display: 'flex',
|
|
@@ -210,7 +208,7 @@ const styles = StyleSheet.create({
|
|
|
210
208
|
position: 'relative',
|
|
211
209
|
justifyContent: 'center',
|
|
212
210
|
alignItems: 'center',
|
|
213
|
-
backgroundColor: '#ededed'
|
|
211
|
+
backgroundColor: '#ededed',
|
|
214
212
|
},
|
|
215
213
|
|
|
216
214
|
del_img_container: {
|