Commit 0c6cb4a5 by zhaochengxiang

规范查看默认展示当前使用的规范

parent 8bdeaf06
......@@ -59,7 +59,8 @@ const ImportActionHeader = (props) => {
const [ bindingLoadRangeList, setBindingLoadRangeList ] = useState(null);
const [isCollapse, setCollapse] = useState(true)
const [ruleParams, setRuleParams] = useState({
visible: false
visible: false,
defaultSelectedId: undefined,
})
useEffect(() => {
......@@ -321,7 +322,10 @@ const ImportActionHeader = (props) => {
constraints={constraints}
onChange={onConstraintChange}
onDetail={() => {
setRuleParams({ visible: true })
setRuleParams({
visible: true,
defaultSelectedId: modelerData?.easyDataModelerModelingConstraint?.id,
})
}}
/> : <div className='flex' style={{ alignItems: 'flex-start' }}>
<div className='word-wrap mr-2'>
......@@ -329,7 +333,10 @@ const ImportActionHeader = (props) => {
</div>
<div style={{ flex: 1, minWidth: 30 }}>
<a onClick={() => {
setRuleParams({ visible: true })
setRuleParams({
visible: true,
defaultSelectedId: modelerData?.easyDataModelerModelingConstraint?.id,
})
}}>查看</a>
</div>
</div>
......@@ -528,7 +535,10 @@ const ImportActionHeader = (props) => {
<Rule
{...ruleParams}
onCancel={() => {
setRuleParams({ visible: false })
setRuleParams({
visible: false,
defaultSelectedId: undefined,
})
}}
/>
</div>
......
......@@ -4,7 +4,7 @@ import { Modal } from "antd"
import RuleCURD from './rule'
const FC = (props) => {
const { visible, onCancel } = props
const { visible, defaultSelectedId, onCancel } = props
const close = () => {
onCancel?.()
......@@ -20,7 +20,7 @@ const FC = (props) => {
centered destroyOnClose
onCancel={() => { close() }}
>
<RuleCURD readonly={true} />
<RuleCURD readonly={true} defaultSelectedId={defaultSelectedId} />
</Modal>
)
}
......
......@@ -11,7 +11,7 @@ import Version from './rule-catalog-version'
import { showMessage } from '../../../../util'
const FC = (props) => {
const { onClick, readonly } = props
const { onClick, readonly, defaultSelectedId } = props
const [loading, setLoading] = React.useState(false)
const [data, setData] = React.useState()
const [selectedNode, setSelectedNode] = React.useState()
......@@ -57,7 +57,14 @@ const FC = (props) => {
setLoading(false);
setData(data)
if ((data??[]).length > 0 && !selectedNode) {
if (defaultSelectedId && (data??[]).length > 0 && !selectedNode) {
const index = (data??[]).findIndex(item => item.id === defaultSelectedId)
if (index !== -1) {
onTreeSelect([data[index].id], { selectedNodes: [data[index]]})
} else {
onTreeSelect([data[0].id], { selectedNodes: [data[0]]})
}
} else if ((data??[]).length > 0 && !selectedNode) {
onTreeSelect([data[0].id], { selectedNodes: [data[0]]})
}
},
......
......@@ -10,7 +10,7 @@ import Separate from '../../AssetManage/Component/Separate'
import '../../AssetManage/index.less'
const FC = (props) => {
const { readonly = false } = props
const { readonly = false, defaultSelectedId } = props
const [node, setNode] = React.useState()
const onTreeClick = (value) => {
......@@ -21,7 +21,7 @@ const FC = (props) => {
<div className='asset-manage'>
<div className='left' style={{ width: 230}}
>
<Tree onClick={onTreeClick} {...props} />
<Tree onClick={onTreeClick} defaultSelectedId={defaultSelectedId} {...props} />
</div>
<div className='middle'>
<List node={node} {...props} />
......
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