Commit 0de68f83 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 仓位文案修改,品牌商品详情返回按钮焦点区域控制处理,处理没有参数NiceForm异常问题

parent 070a05f5
......@@ -120,9 +120,11 @@ const NiceForm: React.FC<NiceFormProps> = props => {
useEffect(() => {
let paginationInfo: currentStateType = getCurrentState();
reset.actions.setFormState(
state => (state.values = paginationInfo.queryParams),
);
if(paginationInfo?.queryParams) {
reset.actions.setFormState(
state => (state.values = paginationInfo.queryParams),
);
}
}, [])
return (
......
......@@ -11,9 +11,27 @@ interface IProps {
const ReutrnEle: React.FC<IProps> = (props) => {
const { description, logoSrc } = props
const bubbles = (e: any) => {
let ev = e || window.event;
if(ev && ev.stopPropagation) {
ev.stopPropagation();
} else {
ev.cancelBubble = true;
}
}
return <>
<span style={{ fontSize: 12, color: '#909399FF' }}><ArrowLeftOutlined /> {logoSrc ? <img src={logoSrc} style={{ width: 48, height: 48, margin: '0 0 0 14px' }} /> : description}</span>
<span style={{ fontSize: 12, color: '#909399FF' }}>
<ArrowLeftOutlined />
{
logoSrc
?
<img src={logoSrc} style={{ width: 48, height: 48, margin: '0 0 0 14px', cursor: 'default' }} onClick={bubbles} />
:
description
}
</span>
</>
}
export default ReutrnEle
\ No newline at end of file
export default ReutrnEle
......@@ -218,7 +218,7 @@ const AddRepository:React.FC<{}> = (props) => {
<Tabs.TabPane key='tab1' tab='仓位设置'>
<PositionSetting onFieldChange={onPublicFieldChange} addSchemaAction={addSchemaAction} schema={repositTabOneSchema} formSubmit={formSubmit}/>
</Tabs.TabPane>
<Tabs.TabPane key='tab2' tab='库存调入\调'>
<Tabs.TabPane key='tab2' tab='库存调入\调'>
<Tabs defaultActiveKey='tab2-1' tabPosition='left'>
<Tabs.TabPane tab='库存调入' key="tab2-1">
{/* 使用formProvider 共享两个表单中的值 */}
......
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