Commit 171f2f2c by zhaochengxiang

bug fix

parent 9c9cef40
import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'; import React, { useState, useEffect, useRef, useImperativeHandle } from 'react';
import { Spin, Tabs, Anchor, Affix, Button } from 'antd'; import { Spin, Tabs, Anchor, Affix, Button } from 'antd';
import LocalStorage from 'local-storage'; import LocalStorage from 'local-storage';
import { Subject } from 'rxjs';
import ImportActionHeader from './ImportActionHeader'; import ImportActionHeader from './ImportActionHeader';
import { ImportActionTable } from './ImportActionTable'; import { ImportActionTable } from './ImportActionTable';
...@@ -14,6 +15,8 @@ import { dispatch } from '../../../../model'; ...@@ -14,6 +15,8 @@ import { dispatch } from '../../../../model';
import './ImportAction.less' import './ImportAction.less'
export const importActionSubject = new Subject()
const ImportAction = React.forwardRef((props, ref) => { const ImportAction = React.forwardRef((props, ref) => {
const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId } = props; const { action, hints, onChange, form, modelerId, terms, ddl, roughModelerData, versionId, permitCheckOut, catalogId } = props;
...@@ -586,8 +589,11 @@ const ImportAction = React.forwardRef((props, ref) => { ...@@ -586,8 +589,11 @@ const ImportAction = React.forwardRef((props, ref) => {
setActiveValue(val); setActiveValue(val);
var targetElement = container?.querySelector(`.${val}`); // 找到目标元素 var targetElement = container?.querySelector(`.${val}`); // 找到目标元素
if (targetElement) { if (targetElement) {
importActionSubject.next({ type: 'expand', key: val })
setTimeout(() => {
animating.current = true; animating.current = true;
targetElement.scrollIntoView(); targetElement.scrollIntoView();
}, 100)
} }
}}> }}>
<Tabs.TabPane tab='基本信息' key="model-import-action-basic" /> <Tabs.TabPane tab='基本信息' key="model-import-action-basic" />
......
...@@ -5,6 +5,7 @@ import { showMessage } from "../../../../util" ...@@ -5,6 +5,7 @@ import { showMessage } from "../../../../util"
import { dispatch } from '../../../../model' import { dispatch } from '../../../../model'
import './ImportActionComment.less' import './ImportActionComment.less'
import { importActionSubject } from "./ImportAction"
const FC = (props) => { const FC = (props) => {
const { modelerData } = props const { modelerData } = props
...@@ -16,6 +17,18 @@ const FC = (props) => { ...@@ -16,6 +17,18 @@ const FC = (props) => {
const [modal, contextHolder] = Modal.useModal() const [modal, contextHolder] = Modal.useModal()
React.useEffect(() => { React.useEffect(() => {
const $importActionSubject = importActionSubject.subscribe((props) => {
if (props.type === 'expand' && props.key === 'model-import-action-comment') {
setCollapse(false)
}
})
return () => {
$importActionSubject.unsubscribe()
}
}, [])
React.useEffect(() => {
if (modelerData?.id) { if (modelerData?.id) {
getComments() getComments()
} }
......
...@@ -11,6 +11,7 @@ import DebounceInput from './DebounceInput'; ...@@ -11,6 +11,7 @@ import DebounceInput from './DebounceInput';
import DataQuality, { DataQualityFeignTagList } from '../../../QianKun/data-quality' import DataQuality, { DataQualityFeignTagList } from '../../../QianKun/data-quality'
import './ImportActionHeader.less'; import './ImportActionHeader.less';
import { importActionSubject } from './ImportAction';
const { TextArea } = Input; const { TextArea } = Input;
const { Option } = Select; const { Option } = Select;
...@@ -62,6 +63,18 @@ const ImportActionHeader = (props) => { ...@@ -62,6 +63,18 @@ const ImportActionHeader = (props) => {
}) })
useEffect(() => { useEffect(() => {
const $importActionSubject = importActionSubject.subscribe((props) => {
if (props.type === 'expand' && props.key === 'model-import-action-technical') {
setCollapse(false)
}
})
return () => {
$importActionSubject.unsubscribe()
}
}, [])
useEffect(() => {
getDataTypeList(); getDataTypeList();
}, []) }, [])
......
...@@ -12,6 +12,7 @@ import { addEventListenerForSidebar, removeEventListenerForSidebar } from './Hel ...@@ -12,6 +12,7 @@ import { addEventListenerForSidebar, removeEventListenerForSidebar } from './Hel
import { showMessage, highlightSearchContentByTerms, inputWidth } from '../../../../util'; import { showMessage, highlightSearchContentByTerms, inputWidth } from '../../../../util';
import { EditModelContext } from './ContextManage'; import { EditModelContext } from './ContextManage';
import { ValidateTip } from './ImportActionHeader'; import { ValidateTip } from './ImportActionHeader';
import { importActionSubject } from './ImportAction';
const { Option } = Select; const { Option } = Select;
...@@ -366,6 +367,18 @@ const ImportActionIndex = (props) => { ...@@ -366,6 +367,18 @@ const ImportActionIndex = (props) => {
id: MENU_ID, id: MENU_ID,
}); });
useEffect(() => {
const $importActionSubject = importActionSubject.subscribe((props) => {
if (props.type === 'expand' && props.key === 'model-import-action-index') {
setCollapse(false)
}
})
return () => {
$importActionSubject.unsubscribe()
}
}, [])
useClickAway(() => { useClickAway(() => {
save(); save();
}, tableRef); }, tableRef);
......
...@@ -4,6 +4,7 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons' ...@@ -4,6 +4,7 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons'
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { dispatch } from '../../../../model' import { dispatch } from '../../../../model'
import { importActionSubject } from './ImportAction';
export const ImportActionHeaderSubject = new Subject(); export const ImportActionHeaderSubject = new Subject();
...@@ -13,6 +14,18 @@ const FC = (props) => { ...@@ -13,6 +14,18 @@ const FC = (props) => {
const [maintenanceRecords, setMaintenanceRecords] = React.useState() const [maintenanceRecords, setMaintenanceRecords] = React.useState()
React.useEffect(() => { React.useEffect(() => {
const $importActionSubject = importActionSubject.subscribe((props) => {
if (props.type === 'expand' && props.key === 'model-import-action-manage') {
setCollapse(false)
}
})
return () => {
$importActionSubject.unsubscribe()
}
}, [])
React.useEffect(() => {
if (modelerData?.id) { if (modelerData?.id) {
getMaintenanceRecords() getMaintenanceRecords()
} }
......
...@@ -3,6 +3,7 @@ import { Button, Descriptions, Space, Popover } from "antd" ...@@ -3,6 +3,7 @@ import { Button, Descriptions, Space, Popover } from "antd"
import { DownOutlined, UpOutlined, QuestionCircleOutlined } from '@ant-design/icons' import { DownOutlined, UpOutlined, QuestionCircleOutlined } from '@ant-design/icons'
import { Action, ModelerId, PermitCheckOut, Editable, StateId, Holder, ReadOnly } from '../../../../util/constant' import { Action, ModelerId, PermitCheckOut, Editable, StateId, Holder, ReadOnly } from '../../../../util/constant'
import { importActionSubject } from "./ImportAction"
export const inheritanceHistoricalType = 'historical' export const inheritanceHistoricalType = 'historical'
export const inheritanceZipperType = 'zipper' export const inheritanceZipperType = 'zipper'
...@@ -13,6 +14,18 @@ const FC = (props) => { ...@@ -13,6 +14,18 @@ const FC = (props) => {
const [relationModelerDatas, setRelationModelerDatas] = React.useState([]) const [relationModelerDatas, setRelationModelerDatas] = React.useState([])
React.useEffect(() => { React.useEffect(() => {
const $importActionSubject = importActionSubject.subscribe((props) => {
if (props.type === 'expand' && props.key === 'model-import-action-relation') {
setCollapse(false)
}
})
return () => {
$importActionSubject.unsubscribe()
}
}, [])
React.useEffect(() => {
if (modelerData?.inheritedFromEasyDataModelerDataModel) { if (modelerData?.inheritedFromEasyDataModelerDataModel) {
const newRelationModelerDatas = []; const newRelationModelerDatas = [];
......
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