Commit 9f382d94 by zhaochengxiang

删除错误提示或者警告

parent 9b17601c
......@@ -28,6 +28,7 @@ const _Logout = ({session, isHome, location}) => session ?
<span className="ml-2">{`${session.userDName}/${session.userName}`}</span>
</Fragment>
}
key="User"
>
<Menu.Item key="SignOut"
onClick={e => dispatchLatest({type: 'user.signout', callback: e => {
......
......@@ -15,7 +15,7 @@ const AssetItem = (props) => {
const _type = elementGroup.type||'';
return (
<div>
<div key={index}>
<div className='flex' style={{ alignItems: 'center', padding: '15px 0' }}>
<div style={{ width: 3, height: 14, backgroundColor: '#0069AC', marginRight: 5 }} />
<span style={{ fontWeight: 'bold', color: '#464646' }}>{_type||''}</span>
......
......@@ -93,7 +93,6 @@ const AssetTree = (props) => {
let newData = [...data];
if (!showCustom) {
console.log('test');
newData = (newData||[]).filter(item => item.type!=='custom');
}
......
......@@ -165,8 +165,6 @@ const UpdateTaskModal = (props) => {
},
};
console.log(currentDatabase)
return (
<Modal
className='update-task-modal'
......
......@@ -200,9 +200,11 @@ const EditModel = (props) => {
)
} else if (action === 'flow') {
actionsBtn = (
<Button type='primary' onClick={onHistory} danger>
版本历史
</Button>
<Space>
<Button type='primary' onClick={onHistory} danger>
版本历史
</Button>
</Space>
);
}
......
......@@ -83,7 +83,8 @@ const ExportOtherModal = (props) => {
return (
<Radio
value={item.key}
value={item.key}
key={index}
>
{item.name}
</Radio>
......
......@@ -76,7 +76,7 @@ const onDragOver = (event) => {
*/
const throttleOnDragOver = throttle(onDragOver, 150);
const addEventListenerForSidebar = (elementId) => {
export const addEventListenerForSidebar = (elementId) => {
// In Chrome the scrolling works.
if (navigator.userAgent.indexOf("Chrome") === -1) {
sidebarElement = document.getElementById(elementId);
......@@ -89,18 +89,10 @@ const throttleOnDragOver = throttle(onDragOver, 150);
}
};
const removeEventListenerForSidebar = () => {
export const removeEventListenerForSidebar = () => {
isScrolling = false;
if (sidebarElement) {
sidebarElement.removeEventListener("dragover", throttleOnDragOver);
}
};
/*------------------------------------------------*/
/* EXPORTS
/*------------------------------------------------*/
export default {
addEventListenerForSidebar,
removeEventListenerForSidebar
};
......@@ -5,7 +5,7 @@ import { DndProvider, useDrag, useDrop } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import update from 'immutability-helper';
import Helper from './Help';
import { addEventListenerForSidebar, removeEventListenerForSidebar } from './Help';
import { showMessage, highlightSearchContentByTerms } from '../../../../util';
const { Option } = Select;
......@@ -240,11 +240,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
() => ({
type,
item: () => {
Helper.addEventListenerForSidebar("containerId");
addEventListenerForSidebar("containerId");
return { index };
},
end: (_, __) => {
Helper.removeEventListenerForSidebar();
removeEventListenerForSidebar();
},
collect: monitor => ({
isDragging: monitor.isDragging(),
......
......@@ -7,7 +7,7 @@ import update from 'immutability-helper';
import { generateUUID, highlightSearchContentByTerms, showMessage } from '../../../../util';
import { dispatch, dispatchLatest } from '../../../../model';
import Helper from './Help';
import { addEventListenerForSidebar, removeEventListenerForSidebar } from './Help';
import { AppContext } from '../../../../App';
import './ImportActionTable.less';
......@@ -207,11 +207,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
() => ({
type,
item: () => {
Helper.addEventListenerForSidebar("containerId");
addEventListenerForSidebar("containerId");
return { index };
},
end: (_, __) => {
Helper.removeEventListenerForSidebar();
removeEventListenerForSidebar();
},
collect: monitor => ({
isDragging: monitor.isDragging(),
......
......@@ -253,7 +253,7 @@ class Model extends React.Component {
}, 1000);
}
if (wordData && (wordData.msg||''!=='')) {
if (wordData && ((wordData.msg||'')!=='')) {
showNotifaction('提示', wordData.msg, 5);
}
......
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