Commit 1caac495 authored by 熊成伟's avatar 熊成伟

debug

parent ba62a90d
Pipeline #15264 passed with stages
in 55 seconds
...@@ -2,12 +2,35 @@ ...@@ -2,12 +2,35 @@
<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$/src/components/AddressList/AddressUser.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/img/test/test-2.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/img/test/test-2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/AddressList/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/index.less" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/components/AddressList/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/AddressList/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Adjunct/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Adjunct/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Adjunct/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Adjunct/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/List/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/List/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/List/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/List/index.less" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/StepCard/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/StepCard/index.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/StepCard/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/StepCard/index.less" 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/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/layout/CommonLayout.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/layout/CommonLayout.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/layout/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/layout/index.less" 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/Backlog/Backlog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/AddressBook.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/Adjunct.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/Flow.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/EventProcessing/SubmitDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/EventProcessing/index.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/EventProcessing/index.less" 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/pages/Work/WorkDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/router.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/router.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/variable.less" beforeDir="false" afterPath="$PROJECT_DIR$/src/variable.less" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -20,11 +43,11 @@ ...@@ -20,11 +43,11 @@
</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="true"> <file pinned="false" current-in-tab="false">
<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="47"> <state relative-caret-position="300">
<caret line="13" column="39" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="39" /> <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -33,19 +56,43 @@ ...@@ -33,19 +56,43 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="63" column="50" selection-start-line="63" selection-start-column="50" selection-end-line="63" selection-end-column="50" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="325">
<caret line="14" column="20" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="20" /> <caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"> <entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="50">
<caret line="18" column="59" selection-start-line="18" selection-start-column="59" selection-end-line="18" selection-end-column="59" /> <caret line="2" selection-start-line="2" selection-end-line="2" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -56,8 +103,8 @@ ...@@ -56,8 +103,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/router.js"> <entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348"> <state relative-caret-position="425">
<caret line="39" column="58" selection-start-line="39" selection-start-column="58" selection-end-line="39" selection-end-column="58" /> <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<folding> <folding>
<element signature="e#0#25#0" expanded="true" /> <element signature="e#0#25#0" expanded="true" />
</folding> </folding>
...@@ -65,6 +112,51 @@ ...@@ -65,6 +112,51 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
<folding>
<element signature="e#123#170#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="21" lean-forward="true" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -78,35 +170,35 @@ ...@@ -78,35 +170,35 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>@grayLight</find>
<find>adListBox</find>
<find>footButton</find>
<find>current</find>
<find>footStatus</find>
<find>optionChange</find>
<find>handleScroll</find>
<find>disabled</find>
<find>addStatus</find>
<find>autoprefixer</find>
<find>blank-content</find>
<find>address-content</find>
<find>url</find>
<find>build</find>
<find>dist</find>
<find>operates</find>
<find>useEffect</find>
<find>setOperates</find>
<find>srtTab</find>
<find>this.props</find>
<find>bear</find>
<find>parent</find>
<find>operate</find>
<find>console</find> <find>console</find>
<find>common-content</find> <find>common-content</find>
<find>tabChange</find> <find>tabChange</find>
<find>.am-checkbox.am-checkbox-checked .am-checkbox-inner</find> <find>.am-checkbox.am-checkbox-checked .am-checkbox-inner</find>
<find>content</find> <find>content</find>
<find>map(item</find>
<find>auto-list-item</find>
<find>nth</find>
<find>#</find>
<find>props.match.params</find>
<find>auto-step-content-head</find>
<find>min-height</find>
<find>basic</find>
<find>title</find>
<find>getData</find>
<find>adjunctData</find>
<find>1px solid</find>
<find>overflow</find>
<find>common-layout-content-static</find>
<find>setNodeId</find>
<find>scrollTop</find>
<find>setStart</find>
<find>scroll</find>
<find>scrollTo</find>
<find>setEnd</find> <find>setEnd</find>
<find>endT</find>
<find>setEndT</find>
<find>/blank/work/1</find>
<find>workUrl</find>
<find>checkLog</find> <find>checkLog</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
...@@ -115,6 +207,7 @@ ...@@ -115,6 +207,7 @@
<replace>addCommon</replace> <replace>addCommon</replace>
<replace>status</replace> <replace>status</replace>
<replace>data</replace> <replace>data</replace>
<replace>innerHeight</replace>
</replaceStrings> </replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -123,57 +216,57 @@ ...@@ -123,57 +216,57 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/src/components/TodoCard/index.less" />
<option value="$PROJECT_DIR$/src/components/TodoCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/index.less" />
<option value="$PROJECT_DIR$/src/pages/AddressList/index.less" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Pro.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.jsx" />
<option value="$PROJECT_DIR$/src/utils/urlQuery.js" /> <option value="$PROJECT_DIR$/src/utils/urlQuery.js" />
<option value="$PROJECT_DIR$/src/pages/Work/index.less" /> <option value="$PROJECT_DIR$/src/pages/Work/index.less" />
<option value="$PROJECT_DIR$/src/layout/index.less" />
<option value="$PROJECT_DIR$/src/layout/BlankLayout.jsx" /> <option value="$PROJECT_DIR$/src/layout/BlankLayout.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Com.jsx" /> <option value="$PROJECT_DIR$/src/pages/Communicate/Com.jsx" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" /> <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/config-overrides.js" /> <option value="$PROJECT_DIR$/config-overrides.js" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.less" /> <option value="$PROJECT_DIR$/src/components/LogCard/index.less" />
<option value="$PROJECT_DIR$/default.conf" /> <option value="$PROJECT_DIR$/default.conf" />
<option value="$PROJECT_DIR$/src/pages/Login/index.jsx" /> <option value="$PROJECT_DIR$/src/pages/Login/index.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" /> <option value="$PROJECT_DIR$/src/components/WorkCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" /> <option value="$PROJECT_DIR$/src/components/LogCard/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" /> <option value="$PROJECT_DIR$/src/pages/EventProcessing/Option.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" />
<option value="$PROJECT_DIR$/src/utils/request.js" /> <option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" /> <option value="$PROJECT_DIR$/src/components/AddressList/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/layout/Footer.jsx" /> <option value="$PROJECT_DIR$/src/layout/Footer.jsx" />
<option value="$PROJECT_DIR$/src/index.css" />
<option value="$PROJECT_DIR$/src/pages/Notice/index.less" /> <option value="$PROJECT_DIR$/src/pages/Notice/index.less" />
<option value="$PROJECT_DIR$/src/pages/index.less" /> <option value="$PROJECT_DIR$/src/pages/index.less" />
<option value="$PROJECT_DIR$/src/pages/Empty.jsx" /> <option value="$PROJECT_DIR$/src/pages/Empty.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/components/TopSearch/index.jsx" /> <option value="$PROJECT_DIR$/src/components/TopSearch/index.jsx" />
<option value="$PROJECT_DIR$/src/utils/instance.js" />
<option value="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" /> <option value="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" />
<option value="$PROJECT_DIR$/src/components/useHooks/useDebounce.js" /> <option value="$PROJECT_DIR$/src/components/useHooks/useDebounce.js" />
<option value="$PROJECT_DIR$/src/components/useHooks/useThrottle.js" /> <option value="$PROJECT_DIR$/src/components/useHooks/useThrottle.js" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" /> <option value="$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.jsx" />
<option value="$PROJECT_DIR$/src/components/StepCard/index.less" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx" />
<option value="$PROJECT_DIR$/src/components/List/index.less" />
<option value="$PROJECT_DIR$/src/components/Adjunct/index.less" />
<option value="$PROJECT_DIR$/src/components/Adjunct/index.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx" />
<option value="$PROJECT_DIR$/src/components/AddressList/index.less" /> <option value="$PROJECT_DIR$/src/components/AddressList/index.less" />
<option value="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" /> <option value="$PROJECT_DIR$/src/components/List/index.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/index.less" />
<option value="$PROJECT_DIR$/src/index.css" />
<option value="$PROJECT_DIR$/src/layout/index.less" />
<option value="$PROJECT_DIR$/src/layout/CommonLayout.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" /> <option value="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" />
<option value="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" />
<option value="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" />
<option value="$PROJECT_DIR$/src/pages/Work/Work.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" />
<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/Flow.jsx" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx" />
<option value="$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx" />
<option value="$PROJECT_DIR$/src/router.js" /> <option value="$PROJECT_DIR$/src/router.js" />
<option value="$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx" /> <option value="$PROJECT_DIR$/src/utils/instance.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -207,7 +300,7 @@ ...@@ -207,7 +300,7 @@
<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="utils" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -232,10 +325,10 @@ ...@@ -232,10 +325,10 @@
<recent name="F:\即时通讯\create-react-app\src\pages\WorkDetail" /> <recent name="F:\即时通讯\create-react-app\src\pages\WorkDetail" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="F:\即时通讯\create-react-app\public\img\test" />
<recent name="F:\即时通讯\create-react-app\public\img" /> <recent name="F:\即时通讯\create-react-app\public\img" />
<recent name="F:\即时通讯\create-react-app\src\components\AddressList" /> <recent name="F:\即时通讯\create-react-app\src\components\AddressList" />
<recent name="F:\即时通讯\create-react-app\src\pages" /> <recent name="F:\即时通讯\create-react-app\src\pages" />
<recent name="F:\即时通讯\create-react-app\public\img\test" />
<recent name="F:\即时通讯\create-react-app\src\pages\AddressList" /> <recent name="F:\即时通讯\create-react-app\src\pages\AddressList" />
</key> </key>
</component> </component>
...@@ -268,12 +361,12 @@ ...@@ -268,12 +361,12 @@
<workItem from="1591493817957" duration="11217000" /> <workItem from="1591493817957" duration="11217000" />
<workItem from="1591579020550" duration="32744000" /> <workItem from="1591579020550" duration="32744000" />
<workItem from="1591665260536" duration="37378000" /> <workItem from="1591665260536" duration="37378000" />
<workItem from="1591751569364" duration="16906000" /> <workItem from="1591751569364" duration="38310000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="189843000" /> <option name="totallyTimeSpent" value="211247000" />
</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" />
...@@ -304,50 +397,6 @@ ...@@ -304,50 +397,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="600">
<caret line="24" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build/index.html" />
<entry file="file://$PROJECT_DIR$/src/utils/urlQuery.js" />
<entry file="file://$PROJECT_DIR$/src/layout/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="1" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="24" selection-start-column="24" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="14" selection-start-column="14" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="29" column="7" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="19" column="31" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less"> <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="425">
...@@ -398,13 +447,6 @@ ...@@ -398,13 +447,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="12" selection-start-column="12" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/LogCard/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="548"> <state relative-caret-position="548">
...@@ -416,141 +458,196 @@ ...@@ -416,141 +458,196 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx"> <entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-427"> <state relative-caret-position="825">
<caret column="12" selection-start-column="12" selection-end-column="12" /> <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx"> <entry file="file://$PROJECT_DIR$/config-overrides.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="2350">
<caret column="24" selection-start-column="24" selection-end-column="24" /> <caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils/request.js"> <entry file="file://$PROJECT_DIR$/src/pages/Notice/index.less">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825"> <state relative-caret-position="325">
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" /> <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx"> <entry file="file://$PROJECT_DIR$/src/components/TopSearch/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="325">
<caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" /> <caret line="18" column="5" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="18" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Empty.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="39" lean-forward="true" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less"> <entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2650"> <state relative-caret-position="375">
<caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" /> <caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx"> <entry file="file://$PROJECT_DIR$/src/useHooks/useThrottle.js">
<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="300">
<caret line="14" column="53" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="53" /> <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/index.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
<folding> <folding>
<element signature="e#123#170#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config-overrides.js"> <entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2350"> <state relative-caret-position="375">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" /> <caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="51" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Notice/index.less"> <entry file="file://$PROJECT_DIR$/src/useHooks/useDebounce.js">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/index.css"> <entry file="file://$PROJECT_DIR$/src/components/List/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423"> <state relative-caret-position="475">
<caret line="22" selection-start-line="22" selection-end-line="22" /> <caret line="40" column="20" lean-forward="true" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/index.less"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Basic.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="50">
<caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" /> <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils/instance.js"> <entry file="file://$PROJECT_DIR$/src/components/StepCard/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-733">
<caret line="54" column="14" lean-forward="true" selection-start-line="54" selection-start-column="14" selection-end-line="54" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/StepCard/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-294"> <state relative-caret-position="375">
<caret line="34" column="61" selection-start-line="34" selection-start-column="61" selection-end-line="34" selection-end-column="61" /> <caret line="21" column="64" selection-start-line="21" selection-start-column="54" selection-end-line="21" selection-end-column="64" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/layout/Footer.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Adjunct.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34"> <state relative-caret-position="350">
<caret line="27" column="65" selection-start-line="27" selection-start-column="65" selection-end-line="27" selection-end-column="65" /> <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/TopSearch/index.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Adjunct/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="395">
<caret line="18" column="5" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="18" selection-end-column="5" /> <caret line="37" column="17" lean-forward="true" selection-start-line="37" selection-start-column="1" selection-end-line="37" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Empty.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Adjunct/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="625">
<caret line="6" column="39" lean-forward="true" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" /> <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#43#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx"> <entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressCheckbox.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="100">
<caret line="46" column="31" selection-start-line="46" selection-start-column="31" selection-end-line="46" selection-end-column="31" /> <caret line="12" column="47" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="47" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx"> <entry file="file://$PROJECT_DIR$/src/components/AddressList/index.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/List/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="425">
<caret line="42" column="66" selection-start-line="42" selection-start-column="66" selection-end-line="42" selection-end-column="66" /> <caret line="17" column="14" lean-forward="true" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx"> <entry file="file://$PROJECT_DIR$/src/index.css">
<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="150">
<caret line="77" column="22" selection-start-line="77" selection-start-column="22" selection-end-line="77" selection-end-column="22" /> <caret line="6" column="37" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/index.less">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/layout/Footer.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="27" column="65" selection-start-line="27" selection-start-column="65" selection-end-line="27" selection-end-column="65" />
<folding> <folding>
<element signature="e#0#51#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -565,68 +662,91 @@ ...@@ -565,68 +662,91 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/NoticeTab/index.jsx"> <entry file="file://$PROJECT_DIR$/src/layout/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="125">
<caret line="17" column="58" lean-forward="true" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" /> <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/useHooks/useThrottle.js"> <entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="270">
<caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" /> <caret line="11" column="21" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/variable.less"> <entry file="file://$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="21" column="27" lean-forward="true" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="27" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Communicate/index.less"> <entry file="file://$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="250">
<caret selection-end-column="30" /> <caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="45" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/index.less"> <entry file="file://$PROJECT_DIR$/src/variable.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="420">
<caret lean-forward="true" /> <caret line="83" column="1" selection-start-line="83" selection-start-column="1" selection-end-line="83" selection-end-column="1" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/index.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="409">
<caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" /> <caret line="56" column="86" selection-start-line="56" selection-start-column="86" selection-end-line="56" selection-end-column="86" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/AddressList/AddressUser.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/Work/Work.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="447">
<caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="51" /> <caret line="78" column="44" selection-start-line="78" selection-start-column="37" selection-end-line="78" selection-end-column="44" />
<folding> <folding>
<element signature="e#0#26#0" expanded="true" /> <element signature="e#0#51#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/useHooks/useDebounce.js"> <entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125"> <state relative-caret-position="325">
<caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" /> <caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.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="1656"> <state relative-caret-position="300">
<caret line="76" column="16" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" /> <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -635,32 +755,45 @@ ...@@ -635,32 +755,45 @@
</entry> </entry>
<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="473"> <state relative-caret-position="200">
<caret line="73" column="6" lean-forward="true" selection-start-line="59" selection-start-column="4" selection-end-line="73" selection-end-column="6" /> <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/index.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="275">
<caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> <caret line="11" column="21" lean-forward="true" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Flow.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="275">
<caret line="14" column="20" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="20" /> <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx"> <entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/SubmitDetail.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="275">
<caret line="18" column="59" selection-start-line="18" selection-start-column="59" selection-end-line="18" selection-end-column="59" /> <caret line="11" column="20" lean-forward="true" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
<folding>
<element signature="e#123#170#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/WorkCard/CardItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" selection-start-line="2" selection-end-line="2" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
...@@ -669,20 +802,20 @@ ...@@ -669,20 +802,20 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/router.js"> <entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348"> <state relative-caret-position="425">
<caret line="39" column="58" selection-start-line="39" selection-start-column="58" selection-end-line="39" selection-end-column="58" /> <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<folding> <folding>
<element signature="e#0#25#0" expanded="true" /> <element signature="e#0#25#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/pages/EventProcessing/Process.jsx"> <entry file="file://$PROJECT_DIR$/src/utils/instance.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="47"> <state relative-caret-position="375">
<caret line="13" column="39" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="39" /> <caret line="63" column="50" selection-start-line="63" selection-start-column="50" selection-end-line="63" selection-end-column="50" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
public/img/test/test-2.png

26.1 KB | W: | H:

public/img/test/test-2.png

25.1 KB | W: | H:

public/img/test/test-2.png
public/img/test/test-2.png
public/img/test/test-2.png
public/img/test/test-2.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -8,17 +8,24 @@ const Index = (props) => { ...@@ -8,17 +8,24 @@ const Index = (props) => {
return ( return (
<div className="address-box"> <div className="address-box">
<List> <List>
{data && data.length > 0 && data.map((item, index) => item.XM && ( {data && data.length > 0 && data.map((item, index) => (
<Item key={item.XM} className="sub-checkbox" onChange={(val) => setName(item.XM, val.target.checked)}> <div>
<div> <div className="sub-title">
<img alt="" src="" className=""/> {item.DEPTNAME}
{item.XM || ''} </div>
</div> {item.childrenUser && item.childrenUser.map((child, index) => (
<div className="address-user"> <Item key={child.XM} className="sub-checkbox" onChange={(val) => setName(child.XM, val.target.checked)}>
<img alt="" className='smallIco mr-5' src='/img/tel.png' /> <div>
{item.YDDH || '无'} <img alt="" src="" className=""/>
</div> {child.XM || ''}
</Item> </div>
<div className="address-user">
<img alt="" className='smallIco mr-5' src='/img/tel.png' />
{child.YDDH || '无'}
</div>
</Item>
))}
</div>
))} ))}
</List> </List>
......
...@@ -19,3 +19,7 @@ ...@@ -19,3 +19,7 @@
.address-phone{ .address-phone{
color: rgba(0, 0, 0, 1) !important; color: rgba(0, 0, 0, 1) !important;
} }
.sub-title{
padding: 10px;
border-bottom: 1px solid rgba(239, 239, 239, 1);
}
...@@ -16,16 +16,16 @@ class Index extends PureComponent { ...@@ -16,16 +16,16 @@ class Index extends PureComponent {
this.visibleChange(false) this.visibleChange(false)
} }
render() { render() {
const {type} = this.props; const {type, data} = this.props;
const {visible} = this.state const {visible} = this.state
return ( return (
<div className={`adjunct-card ${type ? 'adjunct-word' : 'adjunct-pdf'}`}> <div className={`adjunct-card ${type ? 'adjunct-word' : 'adjunct-pdf'}`}>
<div className="adjunct-title"> <div className="adjunct-title">
<img alt="" src={type ? '/img/test/test-2.png' : '/img/test/test.png'} className="adjunct-img"/> <img alt="" src={type ? '/img/test/test-2.png' : '/img/test/test.png'} className="adjunct-img"/>
<div> <div className="adjunct-content">
<p className="adjunct-title-1">武汉考察注意政策</p> <p className="adjunct-title-1">{data.FILENAME}</p>
<p className="adjunct-title-2">科技创新委员会</p> <p className="adjunct-title-2">{data.DEPTNAME}</p>
</div> </div>
</div> </div>
<Popover <Popover
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
.adjunct-title{ .adjunct-title{
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center;
} }
.adjunct-img{ .adjunct-img{
width: 33px; width: 33px;
...@@ -32,3 +33,7 @@ ...@@ -32,3 +33,7 @@
font-size:11px; font-size:11px;
color:rgba(152,152,152,1); color:rgba(152,152,152,1);
} }
.adjunct-content{
flex: 1;
//width: 240px;
}
...@@ -4,16 +4,13 @@ import './index.less' ...@@ -4,16 +4,13 @@ import './index.less'
const Index = (props) => { const Index = (props) => {
return ( return (
<div className="auto-list-card"> <div className="auto-list-card">
{props.title && ( {props.listData && props.listData.map((item, index) => (
<div className="auto-list-item auto-list-item-title">{props.title}</div>
)}
{props.listData.map((item, index) => (
<div key={index} className={`auto-list-item ${item.line ? 'auto-list-item-line-feed' : 'auto-list-item-line'}`}> <div key={index} className={`auto-list-item ${item.line ? 'auto-list-item-line-feed' : 'auto-list-item-line'}`}>
<div className="auto-list-title"> <div className="auto-list-title">
{item.title} {item.title}
</div> </div>
<div className="auto-list-content"> <div className="auto-list-content">
{item.content} {item.content || ''}
</div> </div>
</div> </div>
))} ))}
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
padding: 5px 15px; padding: 5px 15px;
min-height: 43px; min-height: 43px;
background: #ffffff; background: #ffffff;
margin-bottom: 1px; border-bottom: 1px solid rgba(248, 248, 248, 1);
//margin-bottom: 1px !important;
} }
.auto-list-card > .auto-list-item:first-child{ .auto-list-card > .auto-list-item:first-child{
border-radius: 6px 6px 0 0; border-radius: 6px 6px 0 0;
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
min-width: 100px; min-width: 100px;
} }
.auto-list-content{ .auto-list-content{
padding: 10px 18px; padding: 10px 0;
font-size: 14px; font-size: 14px;
line-height: 22px; line-height: 22px;
} }
import React from 'react'; import React from 'react';
import './index.less' import './index.less'
const data = [{}, {}, {}, {s: '1'}, {s: '111', result: '11111'}]
const Index = (props) => { const Index = (props) => {
const {data} = props
return ( return (
<div className="auto-step"> <div className="auto-step">
<ul className="auto-step-card"> <ul className="auto-step-card">
{ {
data.map((item, index) => ( data.map((item, index) => (
<li className="auto-step-item" key={index}> <li className="auto-step-item" key={index}>
<div className={`auto-step-item-title ${item.s ? 'step-current' : 'step-success'}`}> <div className={`auto-step-item-title ${index === data.length -1 ? 'step-current' : 'step-success'}`}>
<div className="auto-step-item-title-name">发起申请(拟稿)</div> <div className="auto-step-item-title-name">{item.FLOW_ALIASED}</div>
</div> </div>
<div className={`auto-step-content ${item.s ? '' : 'step-success'}`}> <div className={`auto-step-content ${item.s ? '' : 'step-success'}`}>
<div className="step-content-wrapper"> <div className="step-content-wrapper">
<div className="auto-step-content-flow"> <div className="auto-step-content-flow">
<div className="auto-step-content-head"> <div className="auto-step-content-head">
<img src="/img/test/test-2.png" alt="" className="step-content-head-img"/> <img src="/img/test/test-2.png" alt="" className="step-content-head-img"/>
<span>赵依安</span> <span>{item.FROMUSER_ALIASED}</span>
</div> </div>
<span>2020-04-09 08:44:36</span> <div className="pos-center">{item.SENDDATE}</div>
</div> </div>
{item.result && ( {item.result && (
<div className="auto-step-content-result"> <div className="auto-step-content-result">
......
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
content: ''; content: '';
display: block; display: block;
width: 1px; width: 1px;
min-height: 90px; min-height: 80px;
background-color: rgba(34, 192, 100, 1); background-color: rgba(34, 192, 100, 1);
} }
.auto-step-content::before{ .auto-step-content::before{
content: ''; content: '';
display: block; display: block;
width: 1px; width: 1px;
min-height: 90px; min-height: 80px;
background-color: rgba(228, 228, 228, 1); background-color: rgba(228, 228, 228, 1);
} }
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
} }
.auto-step-content-head{ .auto-step-content-head{
display: flex; display: flex;
align-items: flex-start; align-items: center;
} }
.step-content-head-img{ .step-content-head-img{
width: 30px; width: 30px;
...@@ -92,4 +92,7 @@ ...@@ -92,4 +92,7 @@
padding: 0 15px; padding: 0 15px;
} }
.pos-center{
display: flex;
align-items: center;
}
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import './index.less' import './index.less'
const CardItem = (props) => { const CardItem = (props) => {
const {data, addStatus, type, addCommon, iconAction, workUrl} = props; const {data, addStatus, type, addCommon, iconAction, workUrl} = props;
......
...@@ -11,8 +11,6 @@ body { ...@@ -11,8 +11,6 @@ body {
html, html,
body, body,
#root { #root {
position: fixed;
top: 0; left: 0;right: 0; bottom: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
margin: 0; margin: 0;
......
...@@ -6,21 +6,20 @@ import './index.less' ...@@ -6,21 +6,20 @@ import './index.less'
const CommonLayout = (props) => { const CommonLayout = (props) => {
const resize = (defaultH) => { const resize = (defaultH) => {
const scrollHeight = document.body.scrollHeight; const innerHeight = window.innerHeight;
const footer = document.getElementById("footer"); const footer = document.getElementById("footer");
const content = document.getElementById("common-content") const content = document.getElementById("common-content")
if (footer) { if (footer) {
if (defaultH > scrollHeight) { if (defaultH > innerHeight) {
footer.classList.remove('footer'); footer.classList.remove('footer');
footer.classList.add('footer-static') footer.classList.add('footer-static')
}else { }else {
footer.classList.add('footer') footer.classList.add('footer')
footer.classList.remove('footer-static'); footer.classList.remove('footer-static');
} }
} }
if (content) { if (content) {
if (defaultH > scrollHeight) { if (defaultH > innerHeight) {
content.classList.remove('common-layout-content'); content.classList.remove('common-layout-content');
content.classList.add('common-layout-content-static'); content.classList.add('common-layout-content-static');
}else { }else {
...@@ -33,17 +32,16 @@ const CommonLayout = (props) => { ...@@ -33,17 +32,16 @@ const CommonLayout = (props) => {
}; };
useEffect(() => { useEffect(() => {
const defaultH = document.body.scrollHeight; const defaultH = window.innerHeight;
window.addEventListener('resize', () => resize(defaultH)); window.addEventListener('resize', () => resize(defaultH));
return () => window.removeEventListener('resize', resize); return () => window.removeEventListener('resize', resize);
}, []) }, [])
return ( return (
<div> <div>
<div id="common-content" className="common-layout-content"> <div id="common-content" className="common-layout-content" >
<div> <div>
{props.children} {props.children}
</div> </div>
</div> </div>
<Footer {...props}/> <Footer {...props}/>
</div> </div>
......
.common-layout-content{ .common-layout-content{
position: fixed; padding-bottom: 10px;
top: 0;left: 0;right: 0;bottom: 50px; margin-bottom: 50px;
overflow: auto;
padding-bottom: 10px
} }
.common-layout-content-static{ .common-layout-content-static{
position: fixed; padding-bottom: 10px;
top: 0;left: 0;right: 0;bottom: 10px; margin-bottom: 10px;
overflow: auto;
} }
.footer-tab-icon{ .footer-tab-icon{
......
import React, {useState, useEffect} from 'react'; import React, {useState, useEffect} from 'react';
import {WhiteSpace, WingBlank, ActivityIndicator, Toast} from 'antd-mobile' import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile'
import TodoCard from '../../components/LogCard' import TodoCard from '../../components/LogCard'
import TopSearch from '../../components/TopSearch'; import TopSearch from '../../components/TopSearch';
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Document from 'react-document-title' import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
import useDebounce from '../../useHooks/useDebounce'
const Backlog = (props) => { const Backlog = (props) => {
const [start, setStart] = useState(true);
const [endT, setEndT] = useState(false);
const [t, setT] = useState(false)
useEffect(() => {
setT(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: {nowPage: 1, pageSize: 10},
}).then(res => {
setT(false);
setStart(false)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
}, [])
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState() const [searchWord, setSearchWord] = useState();
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
...@@ -28,7 +46,7 @@ const Backlog = (props) => { ...@@ -28,7 +46,7 @@ const Backlog = (props) => {
}).then(res => { }).then(res => {
setLoading(false); setLoading(false);
let result = end && res.rows ? data.concat(res.rows) : data; let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('当前是最后一页', 1); res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEndT(true);
setEnd(res.rows && res.rows.length >= 10) setEnd(res.rows && res.rows.length >= 10)
setData(result); setData(result);
}); });
...@@ -36,24 +54,24 @@ const Backlog = (props) => { ...@@ -36,24 +54,24 @@ const Backlog = (props) => {
//下拉加载 //下拉加载
const [end, setEnd] = useState(true); const [end, setEnd] = useState(true);
const handleScroll = useDebounce(() => { const handleScroll =() => {
const event = document.getElementById("common-content") let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
const top = event.scrollTop; let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
const scrollHeight = event.scrollHeight; let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
const clientHeight = event.clientHeight;
if (top + clientHeight === scrollHeight) { console.log(scrollTop, scrollHeight, clientHeight, scrollTop + clientHeight === scrollHeight)
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
getData() getData()
} }
}, 500) }
useEffect(() => { useEffect(() => {
window.addEventListener('scroll', handleScroll, true); window.addEventListener('touchmove', handleScroll, true);
return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('touchmove', handleScroll, true);
}, [data]); }, [data]);
//回到顶部 //回到顶部
useEffect(() => { useEffect(() => {
const element = document.getElementById('common-content') window.scrollTo(0, 0)
element.scrollTo(0, 0)
}, []) }, [])
const wordSearch = val => { const wordSearch = val => {
...@@ -61,28 +79,40 @@ const Backlog = (props) => { ...@@ -61,28 +79,40 @@ const Backlog = (props) => {
getData() getData()
}; };
useEffect(() => { useEffect(() => {
getData() !start && getData()
}, [searchWord]); }, [searchWord]);
console.log(loading)
return ( return (
<Document title="待办"> <Document title="待办">
<WingBlank> <WingBlank>
<ActivityIndicator <ActivityIndicator
toast toast
text="加载中..." text="加载中..."
animating={loading} animating={t}
/> />
<WhiteSpace/> <WhiteSpace/>
<TopSearch onSearch={wordSearch}/> <TopSearch onSearch={wordSearch}/>
{ {
data.length > 0 ? data.map((item, index) => ( !start && (
<div key={index}> data.length > 0 ? data.map((item, index) => (
<WhiteSpace/> <div key={index}>
<TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/> <WhiteSpace/>
</div> <TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID)}/>
</div>
)) : <Empty/>
)
)) : <Empty/>
} }
<WhiteSpace/>
{loading && endT && (
<div className="pos-line mb-10">
<ActivityIndicator/>
<WhiteSpace/>
</div>
)}
</WingBlank> </WingBlank>
</Document> </Document>
); );
......
...@@ -8,6 +8,7 @@ import Empty from '../Empty' ...@@ -8,6 +8,7 @@ import Empty from '../Empty'
const AddressBook = (props) => { const AddressBook = (props) => {
const [start, setStart] = useState(true);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [data, setData] = useState([]); const [data, setData] = useState([]);
// const [type, setType] = useState('basic') // const [type, setType] = useState('basic')
...@@ -22,6 +23,7 @@ const AddressBook = (props) => { ...@@ -22,6 +23,7 @@ const AddressBook = (props) => {
method: 'post', method: 'post',
url: '/idtAppServiceV6/oApp/getDeptTree', url: '/idtAppServiceV6/oApp/getDeptTree',
}).then(res => { }).then(res => {
setStart(false)
setLoading(false); setLoading(false);
setData(res) setData(res)
}); });
...@@ -42,9 +44,9 @@ const AddressBook = (props) => { ...@@ -42,9 +44,9 @@ const AddressBook = (props) => {
animating={loading} animating={loading}
/> />
<div className='adMainBox'> <div className='adMainBox'>
{data.length > 0 ? ( { !start && ( data.length > 0 ? (
<AddressList data={data} onCLick={treeClick}/> <AddressList data={data} onCLick={treeClick}/>
): <Empty/>} ): <Empty/>)}
</div> </div>
</div> </div>
......
...@@ -7,6 +7,7 @@ import Empty from '../Empty' ...@@ -7,6 +7,7 @@ import Empty from '../Empty'
const Communicate = (props) => { const Communicate = (props) => {
const [start, setStart] = useState(true);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [data, setData] = useState([]); const [data, setData] = useState([]);
const [title, setTitle] = useState([]) const [title, setTitle] = useState([])
...@@ -18,6 +19,7 @@ const Communicate = (props) => { ...@@ -18,6 +19,7 @@ const Communicate = (props) => {
url: `/idtAppServiceV6/oApp/getSearchAddressBook?deptId=${id}`, url: `/idtAppServiceV6/oApp/getSearchAddressBook?deptId=${id}`,
}).then(res => { }).then(res => {
setLoading(false); setLoading(false);
setStart(false)
setData(res.userList) setData(res.userList)
setTitle(res.deptList) setTitle(res.deptList)
}); });
...@@ -40,7 +42,7 @@ const Communicate = (props) => { ...@@ -40,7 +42,7 @@ const Communicate = (props) => {
{title.length > 0 ? title[0].depts : ''} {title.length > 0 ? title[0].depts : ''}
</div> </div>
<div className='adMainBox'> <div className='adMainBox'>
{data.length > 0 ? <AddressUser data={data}/> : <Empty/>} { !start && (data.length > 0 ? <AddressUser data={data}/> : <Empty/>)}
</div> </div>
</div> </div>
......
...@@ -2,34 +2,26 @@ import React from 'react'; ...@@ -2,34 +2,26 @@ import React from 'react';
import List from '../../components/List' import List from '../../components/List'
import AdjunctList from '../../components/Adjunct' import AdjunctList from '../../components/Adjunct'
const da222 = Array.from(new Array(7)).map((_val, i) => ({
id: `name${i}`,
text: `name${i}`,
}));
const Adjunct = (props) => { const Adjunct = (props) => {
// const [data, setData] = useState([]) const {data} = props
const listData = [ const listData = [
{title: '开始时间', content: '文电科'}, // {title: '开始时间', content: '文电科'},
{title: '结束时间', content: '3'}, // {title: '结束时间', content: '3'},
{title: '天数', content: ''}, // {title: '天数', content: ''},
{title: '乘坐交通工具', content: '武汉'}, // {title: '乘坐交通工具', content: '武汉'},
{title: '备注', line: true, content: '函数是也是对象,是一个属性的集合,所以函数下也有属性,也可以自定义属性。当我们创建一个函数时就默认会有一个prototype属性,这个属性是一个对象(属性的集合)。这个东西就是原型---通过调用构造函数而创建的那个对象实例的原型对象。prototype里也有个属性constructor,指向的是函数本身'}, {title: '附件', line: data.length > 0, content:
{title: '附件', line: true, content:
<div> <div>
{da222.map((item, index) => ( {data.length > 0 ? data.map((item, index) => (
<AdjunctList key={index} {...item}/> <AdjunctList key={index} data={item}/>
))} )) : '无'}
</div> </div>
}, },
] ]
return ( return (
<div> <div>
<List <List listData={listData}/>
listData={listData}
/>
</div> </div>
); );
}; };
......
import React from 'react'; import React from 'react';
import './index.less' import './index.less'
import List from '../../components/List' import List from '../../components/List'
// import axiosRequest from '../../utils/request';
const Basic = (props) => { const Basic = (props) => {
const {data} = props const {data} = props
const personImg = data.map((item, index) => (
<div key={index} className="basic-people-item">
<img className="work-people-img" alt="" src='/img/test/test.png'/>
<div>aaa</div>
</div>
))
const listData = [
{title: '单位(科室)', content: '文电科'},
{title: '人数', content: '3'},
{title: '人员', content: <div className="basic-people-content">{personImg}</div>},
{title: '目的地', content: '武汉'},
{title: '事由', content: '考察'},
];
return ( return (
<div> <div>
<List <List listData={data}/>
title={"6.1日,部门考察工作出差申请"}
listData={listData}
/>
</div> </div>
); );
}; };
......
import React, {useEffect} from 'react'; import React from 'react';
import StepCard from '../../components/StepCard' import StepCard from '../../components/StepCard'
// import axiosRequest from '../../utils/request';
const Flow = (props) => { const Flow = (props) => {
const {data} = props const {data} = props
// const [data, setData] = useState([])
useEffect(() => {
// const {tableId} = props;
// axiosRequest({
// method: 'post',
// url: `/dgbg/MobileGetFlowsByTabId.view?userName=2012012099&clientFlag=123456&tableId=${tableId}`,
// }).then(res => {
// console.log(res)
// setData([])
// });
}, []);
return ( return (
<div> <div>
<StepCard data={data}/> <StepCard data={data}/>
......
...@@ -10,24 +10,85 @@ import Flow from './Flow'; ...@@ -10,24 +10,85 @@ import Flow from './Flow';
import Option from './Option'; import Option from './Option';
const Process = (props) => { const Process = (props) => {
const [templateId, setTemplateId] = useState();
const [tableId, setTableId] = useState();
const [nodeId, setNodeId] = useState();
useEffect(() => { useEffect(() => {
const {id} = props.match.params const {id} = props.match.params
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: `/idtAppServiceV6/oApp/dispatcher?operateId=${id}`, url: `/idtAppServiceV6/oApp/dispatcher?operateId=${id}&formType=form`,
}).then(res => { }).then(res => {
console.log(res) const keys = res.elementList ? Object.keys(res.elementList) : []
setBasic(res.elementList ? keys.map(item => ({title: item})) : [])
setTableId(res.table && res.table.tableId);
setTemplateId(res.property && res.property.templateId)
setNodeId(res.property && res.property.curNodeId)
}); });
}, []) }, []);
//获取basic数据
const [basic, setBasic] = useState([]);
const getBasic = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getData`,
body: {uuid, tableId, templateId}
}).then(res => {
const result = [...basic];
result.map(item => {
item.content = res[item.title]
return null;
});
setBasic(result)
});
}
//获取Flow数据
const [flowData, setFlowData] = useState([]);
const getFlow = uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFlowList`,
body: {uuid, tableId}
}).then(res => {
setFlowData(res)
});
};
const [loading, setLoading] = useState(false); const [adjunctData, setAdjunctData] = useState([]);
const getAdjunct= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/getFiles`,
body: {uuid, fieldName: 'fj', tableId}
}).then(res => {
setAdjunctData(res)
});
};
// const [button, setButton] = useState({})
const getButton= uuid => {
axiosRequest({
method: 'post',
url: `/idtAppServiceV6/oApp/nextNodeList`,
body: {curNodeId: nodeId}
}).then(res => {
console.log(res)
// setAdjunctData(res)
});
};
useEffect(() => {
const {uuid} = props.match.params;
templateId && tableId && getBasic(uuid)
templateId && tableId && getFlow(uuid);
templateId && tableId && getAdjunct(uuid)
getButton()
}, [nodeId]);
// const [tableId, setTableId] = useState()
const [loading, setLoading] = useState(false);
//提交按钮状态 //提交按钮状态
const [disabled, setDisabled] = useState(true) const [disabled, setDisabled] = useState(true);
//提交按钮文字 //提交按钮文字
const [footButton, setFootButton] = useState('确认发送'); const [footButton, setFootButton] = useState('确认发送');
//聚焦 //聚焦
...@@ -84,7 +145,7 @@ const Process = (props) => { ...@@ -84,7 +145,7 @@ const Process = (props) => {
wrapProps, wrapProps,
}, },
(buttonIndex) => { (buttonIndex) => {
buttonIndex < 2 && subUrl(buttonIndex) buttonIndex < BUTTONS.length - 1 && subUrl(buttonIndex)
console.log(buttonIndex) console.log(buttonIndex)
}); });
}; };
...@@ -117,7 +178,12 @@ const Process = (props) => { ...@@ -117,7 +178,12 @@ const Process = (props) => {
useEffect(() => { useEffect(() => {
window.addEventListener('scroll', handleScroll, true); window.addEventListener('scroll', handleScroll, true);
return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('scroll', handleScroll, true);
}, []) }, []);
//回到顶部
useEffect(() => {
window.scrollTo(0, 0)
}, []);
return ( return (
<Document title="待办详情"> <Document title="待办详情">
<div> <div>
...@@ -131,13 +197,13 @@ const Process = (props) => { ...@@ -131,13 +197,13 @@ const Process = (props) => {
<WingBlank> <WingBlank>
<div id="event-basic"/> <div id="event-basic"/>
<WhiteSpace/> <WhiteSpace/>
<Basic data={[]}/> <Basic data={basic}/>
<div id="event-adjunct"/> <div id="event-adjunct"/>
<WhiteSpace/> <WhiteSpace/>
<Adjunct data={[]}/> <Adjunct data={adjunctData}/>
<div id="event-flow"/> <div id="event-flow"/>
<WhiteSpace/> <WhiteSpace/>
<Flow data={[]}/> <Flow data={flowData}/>
<div id="event-option"/> <div id="event-option"/>
<WhiteSpace/> <WhiteSpace/>
<Option onChange={optionChange}/> <Option onChange={optionChange}/>
......
...@@ -5,17 +5,15 @@ import AddressCheckbox from '../../components/AddressList/AddressCheckbox'; ...@@ -5,17 +5,15 @@ import AddressCheckbox from '../../components/AddressList/AddressCheckbox';
const SubmitDetail = (props) => { const SubmitDetail = (props) => {
const [data, setData] = useState([]); const [data, setData] = useState([]);
const [title, setTitle] = useState([]); // const [title, setTitle] = useState([]);
const [disabled, setDisabled] = useState(true); const [disabled, setDisabled] = useState(true);
useEffect(() => { useEffect(() => {
// const {type} = props.match.params // const {type} = props.match.params
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
url: '/idtAppServiceV6/oApp/getSearchAddressBook?deptId=47c2c44d41ba15fa0141ba8b7cad0006' url: `/idtAppServiceV6/oApp/getLeaders?mobileUse=true&nType=1`,
// url: `/idtAppServiceV6/oApp/getLeaders?mobileUse=true&nType=${type}`,
}).then(res => { }).then(res => {
setData(res.userList) setData(res)
setTitle(res.deptList)
}); });
}, []); }, []);
...@@ -34,14 +32,6 @@ const SubmitDetail = (props) => { ...@@ -34,14 +32,6 @@ const SubmitDetail = (props) => {
} }
return ( return (
<div> <div>
<div className='breadBox'>
{title.length > 0 ? title[0].depts : ''}
{/*<span className='currentLink'>科技创新委员会</span>*/}
{/*<span className='symbol'>&gt;</span>*/}
{/*<span>组织架构</span>*/}
{/*<span className='symbol'>&gt;</span>*/}
{/*<span>办公厅</span>*/}
</div>
<div className='adMainBox'> <div className='adMainBox'>
<AddressCheckbox data={data} setName={checkName}/> <AddressCheckbox data={data} setName={checkName}/>
</div> </div>
......
@import '../../variable.less'; @import '../../variable.less';
#event{ #event{
position: fixed; margin-bottom: 50px;
top: 44px;
left: 0;right: 0; bottom: 50px;
overflow: auto;
padding-bottom: 340px; padding-bottom: 340px;
} }
.event-footer{ .event-footer{
...@@ -106,3 +103,7 @@ ...@@ -106,3 +103,7 @@
border-color: @primary !important; border-color: @primary !important;
background: @primary !important; background: @primary !important;
} }
.am-action-sheet-button-list-item .am-action-sheet-cancel-button{
color: red;
}
...@@ -5,16 +5,37 @@ import TopNotice from '../../components/NoticeTab' ...@@ -5,16 +5,37 @@ import TopNotice from '../../components/NoticeTab'
import axiosRequest from '../../utils/request'; import axiosRequest from '../../utils/request';
import Document from 'react-document-title' import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
import useDebounce from '../../useHooks/useDebounce' // import useDebounce from '../../useHooks/useDebounce'
const Notice = (props) => { const Notice = (props) => {
const [loading, setLoading] = useState(false); const [start, setStart] = useState(true);
const [endT, setEndT] = useState(false);
const [t, setT] = useState(false)
useEffect(() => {
setT(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: {nowPage: 1, pageSize: 10},
}).then(res => {
setT(false);
setStart(false)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
}, [])
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState() const [searchWord, setSearchWord] = useState();
const [loading, setLoading] = useState(false);
const [data, setData] = useState([]); const [data, setData] = useState([]);
const getData = () => { const getData = () => {
const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab}; const pageMap ={searchWord, nowPage: current + 1, pageSize: 10};
setLoading(true) setLoading(true)
axiosRequest({ axiosRequest({
method: 'post', method: 'post',
...@@ -23,7 +44,7 @@ const Notice = (props) => { ...@@ -23,7 +44,7 @@ const Notice = (props) => {
}).then(res => { }).then(res => {
setLoading(false); setLoading(false);
let result = end && res.rows ? data.concat(res.rows) : data; let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('当前是最后一页', 1); res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEndT(true);
setEnd(res.rows && res.rows.length >= 10) setEnd(res.rows && res.rows.length >= 10)
setData(result); setData(result);
}); });
...@@ -31,18 +52,18 @@ const Notice = (props) => { ...@@ -31,18 +52,18 @@ const Notice = (props) => {
//下拉加载 //下拉加载
const [end, setEnd] = useState(true) const [end, setEnd] = useState(true)
const handleScroll = useDebounce(() => { const handleScroll = () => {
const event = document.getElementById("common-content") let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
const top = event.scrollTop; let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
const scrollHeight = event.scrollHeight; let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
const clientHeight = event.clientHeight;
if (top + clientHeight === scrollHeight) { if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
getData() getData()
} }
}, 500) }
useEffect(() => { useEffect(() => {
window.addEventListener('scroll', handleScroll, true); window.addEventListener('touchmove', handleScroll, true);
return () => window.removeEventListener('scroll', handleScroll, true); return () => window.removeEventListener('touchmove', handleScroll, true);
}, [data]); }, [data]);
const checkLog = () => { const checkLog = () => {
...@@ -51,8 +72,7 @@ const Notice = (props) => { ...@@ -51,8 +72,7 @@ const Notice = (props) => {
//回到顶部 //回到顶部
useEffect(() => { useEffect(() => {
const element = document.getElementById('common-content') window.scrollTo(0, 0)
element.scrollTo(0, 0)
}, []); }, []);
//tab已读未读切换 //tab已读未读切换
...@@ -86,19 +106,29 @@ const Notice = (props) => { ...@@ -86,19 +106,29 @@ const Notice = (props) => {
<ActivityIndicator <ActivityIndicator
toast toast
text="加载中..." text="加载中..."
animating={loading} animating={t}
/> />
<WhiteSpace/> <WhiteSpace/>
<TopNotice onSearch={setSearchWord} tabChange={tabChange}/> <TopNotice onSearch={setSearchWord} tabChange={tabChange}/>
{ {
data.length > 0 ? data.map((item, index) => ( !start && (
<div key={index}> data.length > 0 ? data.map((item, index) => (
<WhiteSpace/> <div key={index}>
<TodoCard data={item} onClick={checkLog}/> <WhiteSpace/>
</div> <TodoCard data={item} onClick={checkLog}/>
</div>
)) : <Empty/> )) : <Empty/>
)
} }
<WhiteSpace/>
{loading && endT && (
<div className="pos-line mb-10">
<ActivityIndicator/>
<WhiteSpace/>
</div>
)}
</WingBlank> </WingBlank>
</Document> </Document>
); );
......
...@@ -7,6 +7,7 @@ import Document from 'react-document-title' ...@@ -7,6 +7,7 @@ import Document from 'react-document-title'
import Empty from '../Empty' import Empty from '../Empty'
const Work = (props) => { const Work = (props) => {
const [start, setStart] = useState(true);
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [addStatus, setAddStatus] = useState(false); const [addStatus, setAddStatus] = useState(false);
const [operates, setOperates] = useState([]); const [operates, setOperates] = useState([]);
...@@ -23,6 +24,7 @@ const Work = (props) => { ...@@ -23,6 +24,7 @@ const Work = (props) => {
url: '/idtAppServiceV6/oApp/getAllOperate', url: '/idtAppServiceV6/oApp/getAllOperate',
}).then(res => { }).then(res => {
setLoading(false); setLoading(false);
setStart(false)
const result = res ? res.map(item => ({ icon: '', text: item.nodeName })) : [] const result = res ? res.map(item => ({ icon: '', text: item.nodeName })) : []
setOperates(result); setOperates(result);
setData(result) setData(result)
...@@ -53,7 +55,7 @@ const Work = (props) => { ...@@ -53,7 +55,7 @@ const Work = (props) => {
// }; // };
const workUrl = (url) => { const workUrl = (url) => {
props.history.push(url) // props.history.push(url)
} }
return ( return (
...@@ -67,7 +69,7 @@ const Work = (props) => { ...@@ -67,7 +69,7 @@ const Work = (props) => {
<WhiteSpace/> <WhiteSpace/>
<TopSearch onSearch={ workSearch }/> <TopSearch onSearch={ workSearch }/>
<WhiteSpace/> <WhiteSpace/>
{data.length > 0 ? ( { !start && (data.length > 0 ? (
<WorkCard <WorkCard
title="工作详情" title="工作详情"
addCommon={ commonEdit } addCommon={ commonEdit }
...@@ -76,7 +78,7 @@ const Work = (props) => { ...@@ -76,7 +78,7 @@ const Work = (props) => {
workUrl={workUrl} workUrl={workUrl}
iconAction={ itemAdd } iconAction={ itemAdd }
/> />
) : <Empty/>} ) : <Empty/>)}
</WingBlank> </WingBlank>
</Document> </Document>
......
...@@ -8,9 +8,27 @@ import Empty from '../Empty' ...@@ -8,9 +8,27 @@ import Empty from '../Empty'
import useDebounce from '../../useHooks/useDebounce' import useDebounce from '../../useHooks/useDebounce'
const WorkDetail = (props) => { const WorkDetail = (props) => {
const [loading, setLoading] = useState(false); const [start, setStart] = useState(true);
useEffect(() => {
setLoading(true)
axiosRequest({
method: 'post',
url: '/idtAppServiceV6/oApp/getUnDone',
body: {nowPage: 1, pageSize: 10},
}).then(res => {
setLoading(false);
setStart(false)
let result = end && res.rows ? data.concat(res.rows) : data;
res.rows && res.rows.length >= 10 && setCurrent(1);
setEnd(res.rows && res.rows.length >= 10)
setData(result);
});
}, [])
const [current, setCurrent] = useState(0); const [current, setCurrent] = useState(0);
const [searchWord, setSearchWord] = useState() const [searchWord, setSearchWord] = useState();
const [loading, setLoading] = useState(false);
const [data, setData] = useState([]); const [data, setData] = useState([]);
const getData = () => { const getData = () => {
...@@ -32,11 +50,11 @@ const WorkDetail = (props) => { ...@@ -32,11 +50,11 @@ const WorkDetail = (props) => {
//下拉加载 //下拉加载
const [end, setEnd] = useState(true) const [end, setEnd] = useState(true)
const handleScroll = useDebounce(() => { const handleScroll = useDebounce(() => {
const event = document.getElementById("work-content") let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
const top = event.scrollTop; let clientHeight = document.documentElement.clientHeight || document.body.clientHeight;
const scrollHeight = event.scrollHeight; let scrollHeight = document.documentElement.scrollHeight || document.body.scrollHeight;
const clientHeight = event.clientHeight;
if (top + clientHeight === scrollHeight) { if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
getData() getData()
} }
}, 500) }, 500)
...@@ -91,13 +109,16 @@ const WorkDetail = (props) => { ...@@ -91,13 +109,16 @@ const WorkDetail = (props) => {
<WhiteSpace/> <WhiteSpace/>
<TopNotice onSearch={setSearchWord} tabChange={tabChange}/> <TopNotice onSearch={setSearchWord} tabChange={tabChange}/>
{ {
data.length > 0 ? data.map((item, index) => ( !start && (
<div key={index}> data.length > 0 ? data.map((item, index) => (
<WhiteSpace/> <div key={index}>
<TodoCard data={item} onClick={checkLog}/> <WhiteSpace/>
</div> <TodoCard data={item} onClick={checkLog}/>
</div>
)) : <Empty/>
)
)) : <Empty/>
} }
</WingBlank> </WingBlank>
</div> </div>
......
...@@ -16,8 +16,6 @@ import Login from './pages/Login' ...@@ -16,8 +16,6 @@ import Login from './pages/Login'
import NoFound from './pages/NoFound' import NoFound from './pages/NoFound'
const ReactRouter = () => { const ReactRouter = () => {
return ( return (
<Router> <Router>
...@@ -37,7 +35,7 @@ const ReactRouter = () => { ...@@ -37,7 +35,7 @@ const ReactRouter = () => {
<BlankLayout> <BlankLayout>
<Route path="/blank/work/:id" component={WorkDetail}/> <Route path="/blank/work/:id" component={WorkDetail}/>
<Route path="/blank/submit/:type" component={SubmitDetail}/> <Route path="/blank/submit/:type" component={SubmitDetail}/>
<Route path="/blank/info/:id/:UUID" component={Process}/> <Route path="/blank/info/:id/:uuid" component={Process}/>
</BlankLayout> </BlankLayout>
}/> }/>
<Route component={NoFound}/> <Route component={NoFound}/>
......
...@@ -58,8 +58,12 @@ export const createAPI = (baseURL) => { ...@@ -58,8 +58,12 @@ export const createAPI = (baseURL) => {
}, conf.opts)) }, conf.opts))
.then(function (response) { .then(function (response) {
response = response.data; response = response.data;
console.log(response)
if (!response || !response.data) { console.log('response出错, 无返回数据!', response); return false; }; if (!response || !response.data) {
window.location.href = '/login'
console.log('response出错, 无返回数据!', response); return false;
};
if (response.data && response.data.errorMessage) { if (response.data && response.data.errorMessage) {
Toast.fail(response.data.errorMessage); Toast.fail(response.data.errorMessage);
return false; return false;
......
@primary: #0185FB; @primary: #0185FB;
@grayLight:rgba(0,0,0,0.12); @grayLight:rgba(0,0,0,0.12);
/* http://meyerweb.com/eric/tools/css/reset/ /* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126 v2.0 | 20110126
License: none (public domain) License: none (public domain)
*/ */
...@@ -14,8 +14,8 @@ b, u, i, center, ...@@ -14,8 +14,8 @@ b, u, i, center,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td, table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed, article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup, figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary, menu, nav, output, ruby, section, summary,
time, mark, audio, video { time, mark, audio, video {
margin: 0; margin: 0;
...@@ -26,7 +26,7 @@ time, mark, audio, video { ...@@ -26,7 +26,7 @@ time, mark, audio, video {
vertical-align: baseline; vertical-align: baseline;
} }
/* HTML5 display-role reset for older browsers */ /* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure, article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section { footer, header, hgroup, menu, nav, section {
display: block; display: block;
} }
...@@ -81,4 +81,4 @@ table { ...@@ -81,4 +81,4 @@ table {
.icon18{ .icon18{
width:18px; width:18px;
height: 18px; height: 18px;
} }
\ No newline at end of file
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