Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
9f382d94
Commit
9f382d94
authored
Nov 04, 2021
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除错误提示或者警告
parent
9b17601c
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
21 deletions
+14
-21
index.js
src/layout/index.js
+1
-0
AssetItem.jsx
src/view/Manage/AssetManage/Component/AssetItem.jsx
+1
-1
AssetTree.jsx
src/view/Manage/AssetManage/Component/AssetTree.jsx
+0
-1
UpdateTaskModal.jsx
...iew/Manage/DatasourceManage/Component/UpdateTaskModal.jsx
+0
-2
EditModel.jsx
src/view/Manage/Model/Component/EditModel.jsx
+2
-0
ExportOtherModal.jsx
src/view/Manage/Model/Component/ExportOtherModal.jsx
+1
-0
Help.js
src/view/Manage/Model/Component/Help.js
+2
-10
ImportActionIndex.jsx
src/view/Manage/Model/Component/ImportActionIndex.jsx
+3
-3
ImportActionTable.jsx
src/view/Manage/Model/Component/ImportActionTable.jsx
+3
-3
index.jsx
src/view/Manage/Model/index.jsx
+1
-1
No files found.
src/layout/index.js
View file @
9f382d94
...
@@ -28,6 +28,7 @@ const _Logout = ({session, isHome, location}) => session ?
...
@@ -28,6 +28,7 @@ const _Logout = ({session, isHome, location}) => session ?
<
span
className
=
"ml-2"
>
{
`
${
session
.
userDName
}
/
${
session
.
userName
}
`
}
<
/span
>
<
span
className
=
"ml-2"
>
{
`
${
session
.
userDName
}
/
${
session
.
userName
}
`
}
<
/span
>
<
/Fragment
>
<
/Fragment
>
}
}
key
=
"User"
>
>
<
Menu
.
Item
key
=
"SignOut"
<
Menu
.
Item
key
=
"SignOut"
onClick
=
{
e
=>
dispatchLatest
({
type
:
'user.signout'
,
callback
:
e
=>
{
onClick
=
{
e
=>
dispatchLatest
({
type
:
'user.signout'
,
callback
:
e
=>
{
...
...
src/view/Manage/AssetManage/Component/AssetItem.jsx
View file @
9f382d94
...
@@ -15,7 +15,7 @@ const AssetItem = (props) => {
...
@@ -15,7 +15,7 @@ const AssetItem = (props) => {
const
_type
=
elementGroup
.
type
||
''
;
const
_type
=
elementGroup
.
type
||
''
;
return
(
return
(
<
div
>
<
div
key=
{
index
}
>
<
div
className=
'flex'
style=
{
{
alignItems
:
'center'
,
padding
:
'15px 0'
}
}
>
<
div
className=
'flex'
style=
{
{
alignItems
:
'center'
,
padding
:
'15px 0'
}
}
>
<
div
style=
{
{
width
:
3
,
height
:
14
,
backgroundColor
:
'#0069AC'
,
marginRight
:
5
}
}
/>
<
div
style=
{
{
width
:
3
,
height
:
14
,
backgroundColor
:
'#0069AC'
,
marginRight
:
5
}
}
/>
<
span
style=
{
{
fontWeight
:
'bold'
,
color
:
'#464646'
}
}
>
{
_type
||
''
}
</
span
>
<
span
style=
{
{
fontWeight
:
'bold'
,
color
:
'#464646'
}
}
>
{
_type
||
''
}
</
span
>
...
...
src/view/Manage/AssetManage/Component/AssetTree.jsx
View file @
9f382d94
...
@@ -93,7 +93,6 @@ const AssetTree = (props) => {
...
@@ -93,7 +93,6 @@ const AssetTree = (props) => {
let
newData
=
[...
data
];
let
newData
=
[...
data
];
if
(
!
showCustom
)
{
if
(
!
showCustom
)
{
console
.
log
(
'test'
);
newData
=
(
newData
||
[]).
filter
(
item
=>
item
.
type
!==
'custom'
);
newData
=
(
newData
||
[]).
filter
(
item
=>
item
.
type
!==
'custom'
);
}
}
...
...
src/view/Manage/DatasourceManage/Component/UpdateTaskModal.jsx
View file @
9f382d94
...
@@ -165,8 +165,6 @@ const UpdateTaskModal = (props) => {
...
@@ -165,8 +165,6 @@ const UpdateTaskModal = (props) => {
},
},
};
};
console
.
log
(
currentDatabase
)
return
(
return
(
<
Modal
<
Modal
className=
'update-task-modal'
className=
'update-task-modal'
...
...
src/view/Manage/Model/Component/EditModel.jsx
View file @
9f382d94
...
@@ -200,9 +200,11 @@ const EditModel = (props) => {
...
@@ -200,9 +200,11 @@ const EditModel = (props) => {
)
)
}
else
if
(
action
===
'flow'
)
{
}
else
if
(
action
===
'flow'
)
{
actionsBtn
=
(
actionsBtn
=
(
<
Space
>
<
Button
type=
'primary'
onClick=
{
onHistory
}
danger
>
<
Button
type=
'primary'
onClick=
{
onHistory
}
danger
>
版本历史
版本历史
</
Button
>
</
Button
>
</
Space
>
);
);
}
}
...
...
src/view/Manage/Model/Component/ExportOtherModal.jsx
View file @
9f382d94
...
@@ -84,6 +84,7 @@ const ExportOtherModal = (props) => {
...
@@ -84,6 +84,7 @@ const ExportOtherModal = (props) => {
return
(
return
(
<
Radio
<
Radio
value=
{
item
.
key
}
value=
{
item
.
key
}
key=
{
index
}
>
>
{
item
.
name
}
{
item
.
name
}
</
Radio
>
</
Radio
>
...
...
src/view/Manage/Model/Component/Help.js
View file @
9f382d94
...
@@ -76,7 +76,7 @@ const onDragOver = (event) => {
...
@@ -76,7 +76,7 @@ const onDragOver = (event) => {
*/
*/
const
throttleOnDragOver
=
throttle
(
onDragOver
,
150
);
const
throttleOnDragOver
=
throttle
(
onDragOver
,
150
);
const
addEventListenerForSidebar
=
(
elementId
)
=>
{
export
const
addEventListenerForSidebar
=
(
elementId
)
=>
{
// In Chrome the scrolling works.
// In Chrome the scrolling works.
if
(
navigator
.
userAgent
.
indexOf
(
"Chrome"
)
===
-
1
)
{
if
(
navigator
.
userAgent
.
indexOf
(
"Chrome"
)
===
-
1
)
{
sidebarElement
=
document
.
getElementById
(
elementId
);
sidebarElement
=
document
.
getElementById
(
elementId
);
...
@@ -89,18 +89,10 @@ const throttleOnDragOver = throttle(onDragOver, 150);
...
@@ -89,18 +89,10 @@ const throttleOnDragOver = throttle(onDragOver, 150);
}
}
};
};
const
removeEventListenerForSidebar
=
()
=>
{
export
const
removeEventListenerForSidebar
=
()
=>
{
isScrolling
=
false
;
isScrolling
=
false
;
if
(
sidebarElement
)
{
if
(
sidebarElement
)
{
sidebarElement
.
removeEventListener
(
"dragover"
,
throttleOnDragOver
);
sidebarElement
.
removeEventListener
(
"dragover"
,
throttleOnDragOver
);
}
}
};
};
/*------------------------------------------------*/
/* EXPORTS
/*------------------------------------------------*/
export
default
{
addEventListenerForSidebar
,
removeEventListenerForSidebar
};
src/view/Manage/Model/Component/ImportActionIndex.jsx
View file @
9f382d94
...
@@ -5,7 +5,7 @@ import { DndProvider, useDrag, useDrop } from 'react-dnd';
...
@@ -5,7 +5,7 @@ import { DndProvider, useDrag, useDrop } from 'react-dnd';
import
{
HTML5Backend
}
from
'react-dnd-html5-backend'
;
import
{
HTML5Backend
}
from
'react-dnd-html5-backend'
;
import
update
from
'immutability-helper'
;
import
update
from
'immutability-helper'
;
import
Helper
from
'./Help'
;
import
{
addEventListenerForSidebar
,
removeEventListenerForSidebar
}
from
'./Help'
;
import
{
showMessage
,
highlightSearchContentByTerms
}
from
'../../../../util'
;
import
{
showMessage
,
highlightSearchContentByTerms
}
from
'../../../../util'
;
const
{
Option
}
=
Select
;
const
{
Option
}
=
Select
;
...
@@ -240,11 +240,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
...
@@ -240,11 +240,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
()
=>
({
()
=>
({
type
,
type
,
item
:
()
=>
{
item
:
()
=>
{
Helper
.
addEventListenerForSidebar
(
"containerId"
);
addEventListenerForSidebar
(
"containerId"
);
return
{
index
};
return
{
index
};
},
},
end
:
(
_
,
__
)
=>
{
end
:
(
_
,
__
)
=>
{
Helper
.
removeEventListenerForSidebar
();
removeEventListenerForSidebar
();
},
},
collect
:
monitor
=>
({
collect
:
monitor
=>
({
isDragging
:
monitor
.
isDragging
(),
isDragging
:
monitor
.
isDragging
(),
...
...
src/view/Manage/Model/Component/ImportActionTable.jsx
View file @
9f382d94
...
@@ -7,7 +7,7 @@ import update from 'immutability-helper';
...
@@ -7,7 +7,7 @@ import update from 'immutability-helper';
import
{
generateUUID
,
highlightSearchContentByTerms
,
showMessage
}
from
'../../../../util'
;
import
{
generateUUID
,
highlightSearchContentByTerms
,
showMessage
}
from
'../../../../util'
;
import
{
dispatch
,
dispatchLatest
}
from
'../../../../model'
;
import
{
dispatch
,
dispatchLatest
}
from
'../../../../model'
;
import
Helper
from
'./Help'
;
import
{
addEventListenerForSidebar
,
removeEventListenerForSidebar
}
from
'./Help'
;
import
{
AppContext
}
from
'../../../../App'
;
import
{
AppContext
}
from
'../../../../App'
;
import
'./ImportActionTable.less'
;
import
'./ImportActionTable.less'
;
...
@@ -207,11 +207,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
...
@@ -207,11 +207,11 @@ const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) =>
()
=>
({
()
=>
({
type
,
type
,
item
:
()
=>
{
item
:
()
=>
{
Helper
.
addEventListenerForSidebar
(
"containerId"
);
addEventListenerForSidebar
(
"containerId"
);
return
{
index
};
return
{
index
};
},
},
end
:
(
_
,
__
)
=>
{
end
:
(
_
,
__
)
=>
{
Helper
.
removeEventListenerForSidebar
();
removeEventListenerForSidebar
();
},
},
collect
:
monitor
=>
({
collect
:
monitor
=>
({
isDragging
:
monitor
.
isDragging
(),
isDragging
:
monitor
.
isDragging
(),
...
...
src/view/Manage/Model/index.jsx
View file @
9f382d94
...
@@ -253,7 +253,7 @@ class Model extends React.Component {
...
@@ -253,7 +253,7 @@ class Model extends React.Component {
}, 1000);
}, 1000);
}
}
if (wordData && (
wordData.msg||''
!=='')) {
if (wordData && (
(wordData.msg||'')
!=='')) {
showNotifaction('提示', wordData.msg, 5);
showNotifaction('提示', wordData.msg, 5);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment