fix style problem

pull/12869/head
root 4 years ago
parent 331e8369e0
commit cb1c60a59d

@ -75,14 +75,14 @@ function DataList({
/>
{searchLoading ? (
<View>
<Spinner style={style.spinner} color={style.spinner.color} />
<Spinner style={styles.spinner} color={styles.spinner.color} />
</View>
) : (
<Icon style={{ fontSize: 20, marginRight: 15 }} name="ios-search" />
)}
</InputGroup>
</Item>
<View style={style.container}>
<View style={styles.container}>
<List
showsVerticalScrollIndicator
scrollEnabled

@ -30,7 +30,7 @@ function FormButtons({
};
return (
<View style={style.container}>
<View style={styles.container}>
{isShowRemove ? (
<Button
abpButton

@ -11,14 +11,14 @@ import {
function Loading({ style, loading, opacity }) {
return loading ? (
<View style={style.container}>
<View style={styles.container}>
<View
style={{
...style.backdrop,
...styles.backdrop,
opacity: opacity || 0.6,
}}
/>
<Spinner style={style.spinner} color={style.spinner.color} />
<Spinner style={styles.spinner} color={styles.spinner.color} />
</View>
) : null;
}

@ -5,9 +5,9 @@ import { StyleSheet } from 'react-native';
function LoadingButton({ loading = false, style, children, ...props }) {
return (
<Button style={style.button} {...props}>
<Button style={styles.button} {...props}>
{children}
{loading ? <Spinner style={style.spinner} color={style.spinner.color || 'white'} /> : null}
{loading ? <Spinner style={styles.spinner} color={styles.spinner.color || 'white'} /> : null}
</Button>
);
}

@ -45,15 +45,15 @@ function TenantBox({ style, tenant = {}, setTenant, showTenantSelection, toggleT
return (
<>
<Segment style={style.container}>
<Segment style={styles.container}>
<View>
<Text style={style.title}>{i18n.t('AbpUiMultiTenancy::Tenant')}</Text>
<Text style={style.tenant}>
<Text style={styles.title}>{i18n.t('AbpUiMultiTenancy::Tenant')}</Text>
<Text style={styles.tenant}>
{tenant.name ? tenant.name : i18n.t('AbpUiMultiTenancy::NotSelected')}
</Text>
</View>
<Button
style={{ ...style.switchButton, display: !showTenantSelection ? 'flex' : 'none' }}
style={{ ...styles.switchButton, display: !showTenantSelection ? 'flex' : 'none' }}
onPress={() => toggleTenantSelection()}>
<Text style={{ color: '#fff' }}>{i18n.t('AbpUiMultiTenancy::Switch')}</Text>
</Button>
@ -64,12 +64,12 @@ function TenantBox({ style, tenant = {}, setTenant, showTenantSelection, toggleT
<Label abpLabel>{i18n.t('AbpUiMultiTenancy::Name')}</Label>
<Input abpInput value={tenantName} onChangeText={setTenantName} autoCapitalize = 'none'/>
</InputGroup>
<Text style={style.hint}>{i18n.t('AbpUiMultiTenancy::SwitchTenantHint')}</Text>
<Text style={styles.hint}>{i18n.t('AbpUiMultiTenancy::SwitchTenantHint')}</Text>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
<Button abpButton light style={style.button} onPress={() => toggleTenantSelection()}>
<Button abpButton light style={styles.button} onPress={() => toggleTenantSelection()}>
<Text>{i18n.t('AbpAccount::Cancel')}</Text>
</Button>
<Button abpButton style={style.button} onPress={() => findTenant()}>
<Button abpButton style={styles.button} onPress={() => findTenant()}>
<Text>{i18n.t('AbpAccount::Save')}</Text>
</Button>
</View>

Loading…
Cancel
Save