Commit 57fdd1e2 by zhaochengxiang

bug fix

parent c56806f9
...@@ -577,10 +577,9 @@ const ImportAction = React.forwardRef((props, ref) => { ...@@ -577,10 +577,9 @@ const ImportAction = React.forwardRef((props, ref) => {
return ( return (
<Spin spinning={loading}> <Spin spinning={loading}>
{ {
(action==='detail' && ((modelerData||{}).optionList||[]).findIndex(item => item.enabled && item.name==='查看') === -1) ? <div style={{ padding: '10px 20px' }}> (action==='detail' && ((modelerData||{}).optionList||[]).findIndex(item => item.enabled && item.name==='查看') === -1) ? <div style={{ padding: '10px 20px', height: 60 }}>
{loading?'':'暂无权限'} {loading?'':'暂无权限'}
</div> : <div className='import-action'> </div> : <div className='import-action'>
<div style={{ position: 'sticky', top: 0 }}>
<Tabs activeKey={activeValue} centered onChange={(val) => { <Tabs activeKey={activeValue} centered onChange={(val) => {
setActiveValue(val); setActiveValue(val);
var targetElement = container?.querySelector(`.${val}`); // 找到目标元素 var targetElement = container?.querySelector(`.${val}`); // 找到目标元素
...@@ -596,52 +595,51 @@ const ImportAction = React.forwardRef((props, ref) => { ...@@ -596,52 +595,51 @@ const ImportAction = React.forwardRef((props, ref) => {
<Tabs.TabPane tab='管理信息' key="model-import-action-manage" /> <Tabs.TabPane tab='管理信息' key="model-import-action-manage" />
<Tabs.TabPane tab='关联对象' key="model-import-action-relation" /> <Tabs.TabPane tab='关联对象' key="model-import-action-relation" />
</Tabs> </Tabs>
</div> <div ref={setContainer} style={{ height: action==='edit-inherite-modal'?'60vh':'calc(100vh - 44px - 64px - 82px)', overflow: 'auto', padding: '20px 20px 0' }}>
<div ref={setContainer} style={{ height: action==='edit-inherite-modal'?'60vh':'calc(100vh - 44px - 64px - 82px)', overflow: 'auto', padding: '20px 20px 0' }}> <ImportActionHeader
<ImportActionHeader form={form}
form={form} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'} modelerData={modelerData||{}}
modelerData={modelerData||{}} constraints={constraints}
constraints={constraints} templates={templates}
templates={templates} validateReports={validateReports}
validateReports={validateReports} onTemplateChange={onTemplateChange}
onTemplateChange={onTemplateChange} onConstraintChange={onConstraintChange}
onConstraintChange={onConstraintChange} onChange={onHeaderChange}
onChange={onHeaderChange} terms={terms}
terms={terms} supportedPartitionTypes={supportedPartitionTypes}
supportedPartitionTypes={supportedPartitionTypes} />
/> <ImportActionTable
<ImportActionTable modelerData={modelerData||{}}
modelerData={modelerData||{}} constraint={constraint}
constraint={constraint} template={template}
template={template} validateReports={validateReports}
validateReports={validateReports} supportedDatatypes={supportedDatatypes}
supportedDatatypes={supportedDatatypes} onChange={onTableChange}
onChange={onTableChange} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'} action={action}
action={action} originAction={getQueryParam(Action, props?.location?.search)}
originAction={getQueryParam(Action, props?.location?.search)} terms={terms}
terms={terms} />
/> <ImportActionIndex
<ImportActionIndex modelerData={modelerData||{}}
modelerData={modelerData||{}} constraint={constraint}
constraint={constraint} template={template}
template={template} types={supportedIndextypes}
types={supportedIndextypes} validateReports={validateReports}
validateReports={validateReports} onChange={onIndexChange}
onChange={onIndexChange} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'} terms={terms}
terms={terms} />
/> <ImportActionManage
<ImportActionManage form={form}
form={form} modelerData={modelerData||{}}
modelerData={modelerData||{}} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'} />
/> <ImportActionRelation
<ImportActionRelation modelerData={modelerData} action={action}
modelerData={modelerData} action={action} />
/> </div>
</div>
</div> </div>
} }
</Spin> </Spin>
......
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