Commit 246a9cee authored by 熊成伟's avatar 熊成伟

debug

parent db448486
Pipeline #15299 passed with stages
in 55 seconds
......@@ -2,16 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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/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>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -24,7 +15,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
......@@ -45,11 +36,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
<state relative-caret-position="175">
<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>
......@@ -125,7 +116,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>/blank/work/1</find>
<find>workUrl</find>
<find>scrollTo</find>
<find>setCurrent</find>
......@@ -151,10 +141,11 @@
<find>loadingCount</find>
<find>setLoading</find>
<find>console</find>
<find>loading</find>
<find>setEndT</find>
<find>end</find>
<find>setEnd</find>
<find>loading</find>
<find>document</find>
</findStrings>
<replaceStrings>
<replace>this.props</replace>
......@@ -220,8 +211,8 @@
<option value="$PROJECT_DIR$/src/components/Loading/index.jsx" />
<option value="$PROJECT_DIR$/src/components/Loading/index.less" />
<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/Notice/Notice.jsx" />
</list>
</option>
</component>
......@@ -256,39 +247,12 @@
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
<item name="src" 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" />
</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>
<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="EventProcessing" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
<item name="create-react-app" type="462c0819:PsiDirectoryNode" />
......@@ -296,12 +260,6 @@
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="Notice" 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="utils" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -363,12 +321,12 @@
<workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="37378000" />
<workItem from="1591751569364" duration="40213000" />
<workItem from="1591837824022" duration="33679000" />
<workItem from="1591837824022" duration="34382000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="246829000" />
<option name="totallyTimeSpent" value="247532000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
......@@ -799,20 +757,20 @@
</state>
</provider>
</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">
<state relative-caret-position="350">
<caret line="80" column="14" lean-forward="true" selection-start-line="80" selection-start-column="14" selection-end-line="80" selection-end-column="14" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
<state relative-caret-position="50">
<caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
</state>
</provider>
</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">
<state relative-caret-position="50">
<caret line="2" column="42" selection-start-line="2" selection-start-column="42" selection-end-line="2" selection-end-column="42" />
<state relative-caret-position="175">
<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>
</provider>
</entry>
......
......@@ -49,7 +49,7 @@ const Backlog = (props) => {
let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
if(scrollHeight > clientHeight && scrollTop + clientHeight >= scrollHeight) {
getData(true)
}
}
......
......@@ -44,8 +44,9 @@ const Notice = (props) => {
let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
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)
}
}
......
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