|
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="5b620213-6142-4839-a88c-acb9f130e070" 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$/webmain/home/desktop/footer.php" beforeDir="false" afterPath="$PROJECT_DIR$/webmain/home/desktop/footer.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -12,82 +12,123 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/index.php">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/we/logn/lognAction.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
|
|
|
+ <state relative-caret-position="189">
|
|
|
+ <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/index/indexscript.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="147">
|
|
|
- <caret line="7" column="2" lean-forward="true" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
|
|
|
+ <state relative-caret-position="443">
|
|
|
+ <caret line="448" column="25" selection-start-line="448" selection-start-column="25" selection-end-line="448" selection-end-column="25" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#font#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="e#0#6#0" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="e#259#265#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/webmain/home/index/indexAction.php">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/home/index/rock_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-22">
|
|
|
- <caret line="2" column="4" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
|
|
|
+ <state relative-caret-position="415">
|
|
|
+ <caret line="49" column="53" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="53" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/webmain/system/upgrade/rock_upgrade_install.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/home/desktop/footer.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1550">
|
|
|
- <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="6" column="30" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/webmain/flow/page/rock_page.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/model/flow/flow.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="365">
|
|
|
- <caret line="175" column="58" selection-start-line="175" selection-start-column="53" selection-end-line="175" selection-end-column="58" />
|
|
|
+ <state relative-caret-position="233">
|
|
|
+ <caret line="273" column="28" selection-start-line="273" selection-start-column="28" selection-end-line="273" selection-end-column="28" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/include/Action.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/include/Model.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-3121">
|
|
|
- <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
|
|
|
+ <state relative-caret-position="30">
|
|
|
+ <caret line="16" column="18" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/webmain/flow/input/rock_input_daoru.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/flow/input/inputAction.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2583">
|
|
|
- <caret line="123" column="46" selection-start-line="123" selection-start-column="46" selection-end-line="123" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="453" column="42" selection-start-line="453" selection-start-column="42" selection-end-line="453" selection-end-column="42" />
|
|
|
+ <folding>
|
|
|
+ <element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#td#0;n#!!top" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/webmain/main/flow/tpl_flow_input.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/webmain/flow/input/tpl_input_lu.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="255">
|
|
|
- <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 relative-caret-position="-1520">
|
|
|
+ <caret line="44" column="8" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="8" />
|
|
|
<folding>
|
|
|
- <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
- <element signature="e#70#76#1" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#input#0;n#span#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="e#6989#6995#0" expanded="true" />
|
|
|
+ <element signature="e#6996#7002#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/include/Action.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
@@ -171,6 +212,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -186,36 +228,44 @@
|
|
|
<path>
|
|
|
<item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="upload" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="flow" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="upload" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="2021-12" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="flow" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="input" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="index" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="xinhu" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="xinhu" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="webmain" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="login" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="index" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -256,12 +306,13 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="37313000" />
|
|
|
+ <option name="totallyTimeSpent" value="37378000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
|
+ <editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21173105" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22031474" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -428,12 +479,11 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/webmain/model/flow/flow.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="592">
|
|
|
- <caret line="2241" column="58" selection-start-line="2241" selection-start-column="58" selection-end-line="2241" selection-end-column="58" />
|
|
|
+ <state relative-caret-position="233">
|
|
|
+ <caret line="273" column="28" selection-start-line="273" selection-start-column="28" selection-end-line="273" selection-end-column="28" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#td#1;n#tr#0;n#!!top" expanded="true" />
|
|
|
- <element signature="n#style#0;n#div#0;n#td#2;n#tr#0;n#!!top" expanded="true" />
|
|
|
+ <element signature="n#style#0;n#div#0;n#td#0;n#tr#0;n#!!top" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -450,8 +500,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/include/Model.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="656">
|
|
|
- <caret line="181" column="6" selection-start-line="181" selection-start-column="6" selection-end-line="181" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="30">
|
|
|
+ <caret line="16" column="18" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -471,8 +521,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/webmain/flow/input/tpl_input_lu.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1668">
|
|
|
- <caret line="19" column="33" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="33" />
|
|
|
+ <state relative-caret-position="-1520">
|
|
|
+ <caret line="44" column="8" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="8" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#input#0;n#span#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
<element signature="e#6989#6995#0" expanded="true" />
|
|
@@ -536,8 +586,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/webmain/index/indexscript.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="121">
|
|
|
- <caret line="393" column="13" selection-start-line="393" selection-start-column="13" selection-end-line="393" selection-end-column="13" />
|
|
|
+ <state relative-caret-position="443">
|
|
|
+ <caret line="448" column="25" selection-start-line="448" selection-start-column="25" selection-end-line="448" selection-end-column="25" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
|
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
|
|
@@ -685,8 +735,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/webmain/flow/input/inputAction.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="22176">
|
|
|
- <caret line="1056" column="22" lean-forward="true" selection-start-line="1056" selection-start-column="22" selection-end-line="1056" selection-end-column="22" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="453" column="42" selection-start-line="453" selection-start-column="42" selection-end-line="453" selection-end-column="42" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#div#0;n#div#0;n#!!top" expanded="true" />
|
|
|
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
|
|
@@ -731,8 +781,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/include/Action.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-3121">
|
|
|
- <caret line="16" column="11" selection-start-line="16" selection-start-column="11" selection-end-line="16" selection-end-column="11" />
|
|
|
+ <state relative-caret-position="260">
|
|
|
+ <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|