Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
frontend
Project
Project
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
Schedules
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
h5-communicate
frontend
Commits
246a9cee
Commit
246a9cee
authored
Jun 11, 2020
by
熊成伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
db448486
Pipeline
#15299
passed with stages
in 55 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
62 deletions
+21
-62
workspace.xml
.idea/workspace.xml
+18
-60
Backlog.jsx
src/pages/Backlog/Backlog.jsx
+1
-1
Notice.jsx
src/pages/Notice/Notice.jsx
+2
-1
No files found.
.idea/workspace.xml
View file @
246a9cee
...
@@ -2,16 +2,7 @@
...
@@ -2,16 +2,7 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"a6d092de-b4f8-454d-99f5-4dac3ce112e5"
name=
"Default Changelist"
comment=
""
>
<list
default=
"true"
id=
"a6d092de-b4f8-454d-99f5-4dac3ce112e5"
name=
"Default Changelist"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/LogCard/index.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/LogCard/index.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/Skeleton/index.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/Skeleton/index.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/pages/Work/Work.jsx"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/pages/Work/Work.jsx"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/utils/instance.js"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/utils/instance.js"
afterDir=
"false"
/>
</list>
</list>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
<ignored
path=
"$PROJECT_DIR$/.tmp/"
/>
<ignored
path=
"$PROJECT_DIR$/temp/"
/>
<ignored
path=
"$PROJECT_DIR$/temp/"
/>
...
@@ -24,7 +15,7 @@
...
@@ -24,7 +15,7 @@
</component>
</component>
<component
name=
"FileEditorManager"
>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"50"
>
<state
relative-caret-position=
"50"
>
...
@@ -45,11 +36,11 @@
...
@@ -45,11 +36,11 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
350
"
>
<state
relative-caret-position=
"
175
"
>
<caret
line=
"
80"
column=
"14"
lean-forward=
"true"
selection-start-line=
"80"
selection-start-column=
"14"
selection-end-line=
"80"
selection-end-column=
"14
"
/>
<caret
line=
"
46"
column=
"58"
selection-start-line=
"46"
selection-start-column=
"58"
selection-end-line=
"46"
selection-end-column=
"58
"
/>
<folding>
<folding>
<element
signature=
"e#0#49#0"
expanded=
"true"
/>
<element
signature=
"e#0#49#0"
expanded=
"true"
/>
</folding>
</folding>
...
@@ -125,7 +116,6 @@
...
@@ -125,7 +116,6 @@
</component>
</component>
<component
name=
"FindInProjectRecents"
>
<component
name=
"FindInProjectRecents"
>
<findStrings>
<findStrings>
<find>
/blank/work/1
</find>
<find>
workUrl
</find>
<find>
workUrl
</find>
<find>
scrollTo
</find>
<find>
scrollTo
</find>
<find>
setCurrent
</find>
<find>
setCurrent
</find>
...
@@ -151,10 +141,11 @@
...
@@ -151,10 +141,11 @@
<find>
loadingCount
</find>
<find>
loadingCount
</find>
<find>
setLoading
</find>
<find>
setLoading
</find>
<find>
console
</find>
<find>
console
</find>
<find>
loading
</find>
<find>
setEndT
</find>
<find>
setEndT
</find>
<find>
end
</find>
<find>
end
</find>
<find>
setEnd
</find>
<find>
setEnd
</find>
<find>
loading
</find>
<find>
document
</find>
</findStrings>
</findStrings>
<replaceStrings>
<replaceStrings>
<replace>
this.props
</replace>
<replace>
this.props
</replace>
...
@@ -220,8 +211,8 @@
...
@@ -220,8 +211,8 @@
<option
value=
"$PROJECT_DIR$/src/components/Loading/index.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/components/Loading/index.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/components/Loading/index.less"
/>
<option
value=
"$PROJECT_DIR$/src/components/Loading/index.less"
/>
<option
value=
"$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"
/>
<option
value=
"$PROJECT_DIR$/src/pages/Notice/Notice.jsx"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -256,38 +247,11 @@
...
@@ -256,38 +247,11 @@
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"components"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"components"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Loading"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Backlog"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"EventProcessing"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</path>
<path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
...
@@ -296,12 +260,6 @@
...
@@ -296,12 +260,6 @@
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"pages"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Notice"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"Notice"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</path>
<path>
<item
name=
"create-react-app"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"create-react-app"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"src"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"utils"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</expand>
</expand>
<select
/>
<select
/>
</subPane>
</subPane>
...
@@ -363,12 +321,12 @@
...
@@ -363,12 +321,12 @@
<workItem
from=
"1591579020550"
duration=
"32744000"
/>
<workItem
from=
"1591579020550"
duration=
"32744000"
/>
<workItem
from=
"1591665260536"
duration=
"37378000"
/>
<workItem
from=
"1591665260536"
duration=
"37378000"
/>
<workItem
from=
"1591751569364"
duration=
"40213000"
/>
<workItem
from=
"1591751569364"
duration=
"40213000"
/>
<workItem
from=
"1591837824022"
duration=
"3
3679
000"
/>
<workItem
from=
"1591837824022"
duration=
"3
4382
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"24
6829
000"
/>
<option
name=
"totallyTimeSpent"
value=
"24
7532
000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"784"
extended-state=
"6"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1382"
height=
"784"
extended-state=
"6"
/>
...
@@ -799,20 +757,20 @@
...
@@ -799,20 +757,20 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/pages/
Notice/Notice
.jsx"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/
EventProcessing/Process
.jsx"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"350"
>
<state
relative-caret-position=
"50"
>
<caret
line=
"80"
column=
"14"
lean-forward=
"true"
selection-start-line=
"80"
selection-start-column=
"14"
selection-end-line=
"80"
selection-end-column=
"14"
/>
<caret
line=
"2"
column=
"42"
selection-start-line=
"2"
selection-start-column=
"42"
selection-end-line=
"2"
selection-end-column=
"42"
/>
<folding>
<element
signature=
"e#0#49#0"
expanded=
"true"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/pages/
EventProcessing/Process
.jsx"
>
<entry
file=
"file://$PROJECT_DIR$/src/pages/
Notice/Notice
.jsx"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"50"
>
<state
relative-caret-position=
"175"
>
<caret
line=
"2"
column=
"42"
selection-start-line=
"2"
selection-start-column=
"42"
selection-end-line=
"2"
selection-end-column=
"42"
/>
<caret
line=
"46"
column=
"58"
selection-start-line=
"46"
selection-start-column=
"58"
selection-end-line=
"46"
selection-end-column=
"58"
/>
<folding>
<element
signature=
"e#0#49#0"
expanded=
"true"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
...
src/pages/Backlog/Backlog.jsx
View file @
246a9cee
...
@@ -49,7 +49,7 @@ const Backlog = (props) => {
...
@@ -49,7 +49,7 @@ const Backlog = (props) => {
let
scrollTop
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
let
scrollTop
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
let
clientHeight
=
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
;
let
clientHeight
=
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
;
let
scrollHeight
=
document
.
documentElement
.
scrollHeight
||
document
.
body
.
scrollHeight
;
let
scrollHeight
=
document
.
documentElement
.
scrollHeight
||
document
.
body
.
scrollHeight
;
if
(
scrollHeight
>
clientHeight
&&
scrollTop
+
clientHeight
==
=
scrollHeight
)
{
if
(
scrollHeight
>
clientHeight
&&
scrollTop
+
clientHeight
>
=
scrollHeight
)
{
getData
(
true
)
getData
(
true
)
}
}
}
}
...
...
src/pages/Notice/Notice.jsx
View file @
246a9cee
...
@@ -44,8 +44,9 @@ const Notice = (props) => {
...
@@ -44,8 +44,9 @@ const Notice = (props) => {
let
scrollTop
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
let
scrollTop
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
let
clientHeight
=
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
;
let
clientHeight
=
document
.
documentElement
.
clientHeight
||
document
.
body
.
clientHeight
;
let
scrollHeight
=
document
.
documentElement
.
scrollHeight
||
document
.
body
.
scrollHeight
;
let
scrollHeight
=
document
.
documentElement
.
scrollHeight
||
document
.
body
.
scrollHeight
;
// alert(`${scrollTop} ${clientHeight} ${scrollHeight} ${scrollTop + clientHeight >= scrollHeight}`)
if
(
scrollHeight
>
clientHeight
&&
scrollTop
+
clientHeight
==
=
scrollHeight
)
{
if
(
scrollHeight
>
clientHeight
&&
scrollTop
+
clientHeight
>
=
scrollHeight
)
{
getData
(
true
)
getData
(
true
)
}
}
}
}
...
...
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