Commit f0d9f677 authored by XieZhiXiong's avatar XieZhiXiong

chore: 隔绝样式影响、补充属性

parent ecbf0961
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 14:54:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-07 16:36:14
* @LastEditTime: 2021-08-10 16:42:18
* @Description:
*/
import React from 'react';
......@@ -20,7 +20,7 @@ const AddressRadioGroupFormilyItem = connect()((props) => {
...rest
} = props;
return (
<div style={{ flex: 1 }}>
<div style={{ flex: 1, overflow: 'hidden' }}>
<AddressRadioGroup
addressType={addressType}
isDefault={isDefault}
......
......@@ -6,6 +6,7 @@
&-input {
flex: 1;
overflow: hidden;
}
&-action {
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 10:28:06
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 10:20:55
* @LastEditTime: 2021-08-10 16:55:26
* @Description: 地址选择 FormItem
*/
import React, { useState, useEffect, useMemo, useRef } from 'react';
......@@ -148,7 +148,7 @@ const AddressSelect: React.FC<IProps> = (props) => {
triggerChange(undefined);
}
if (isDefaultAddress && defaultItem) {
if (isDefaultAddress && defaultItem && !disabled) {
const { shipperName, receiverName, ...rest } = defaultItem;
const next = {
name: shipperName || receiverName,
......@@ -427,12 +427,17 @@ const AddressSelect: React.FC<IProps> = (props) => {
}}
>
<div className={styles['address-select']}>
<Select
options={options}
value={value?.id}
onChange={handleSelectChange}
disabled={disabled}
/>
<div className={styles['address-select-input']}>
<Select
options={options}
value={value?.id}
onChange={handleSelectChange}
disabled={disabled}
style={{
width: '100%',
}}
/>
</div>
<Button
onClick={() => handleVisibleDrawer(true)}
className={styles['address-select-action']}
......
This diff is collapsed.
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 11:26:43
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-05 11:30:21
* @LastEditTime: 2021-08-10 16:49:14
* @Description:
*/
import React from 'react';
......@@ -15,12 +15,16 @@ const CustomAddressSelect = connect()((props) => {
value,
onChange,
addressType,
isDefault,
disabled,
...rest
} = props;
return (
<div style={{ flex: 1 }}>
<div style={{ flex: 1, overflow: 'hidden' }}>
<AddressSelect
addressType={addressType}
isDefault={isDefault}
disabled={disabled}
value={value}
onChange={onChange}
{...rest}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment