正在显示
2 个修改的文件
包含
31 行增加
和
44 行删除
@@ -4,7 +4,10 @@ | @@ -4,7 +4,10 @@ | ||
4 | <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="25" /> | 4 | <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="25" /> |
5 | </component> | 5 | </component> |
6 | <component name="ChangeListManager"> | 6 | <component name="ChangeListManager"> |
7 | - <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" /> | 7 | + <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
8 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
9 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> | ||
10 | + </list> | ||
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
9 | <option name="TRACKING_ENABLED" value="true" /> | 12 | <option name="TRACKING_ENABLED" value="true" /> |
10 | <option name="SHOW_DIALOG" value="false" /> | 13 | <option name="SHOW_DIALOG" value="false" /> |
@@ -14,11 +17,21 @@ | @@ -14,11 +17,21 @@ | ||
14 | </component> | 17 | </component> |
15 | <component name="FileEditorManager"> | 18 | <component name="FileEditorManager"> |
16 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 19 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
17 | - <file leaf-file-name="add.html" pinned="false" current-in-tab="true"> | 20 | + <file leaf-file-name="add.html" pinned="false" current-in-tab="false"> |
18 | <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> | 21 | <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> |
19 | <provider selected="true" editor-type-id="text-editor"> | 22 | <provider selected="true" editor-type-id="text-editor"> |
20 | <state relative-caret-position="200"> | 23 | <state relative-caret-position="200"> |
21 | - <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> | 24 | + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> |
25 | + <folding /> | ||
26 | + </state> | ||
27 | + </provider> | ||
28 | + </entry> | ||
29 | + </file> | ||
30 | + <file leaf-file-name="video.js" pinned="false" current-in-tab="true"> | ||
31 | + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> | ||
32 | + <provider selected="true" editor-type-id="text-editor"> | ||
33 | + <state relative-caret-position="207"> | ||
34 | + <caret line="29" column="79" lean-forward="false" selection-start-line="29" selection-start-column="79" selection-end-line="29" selection-end-column="79" /> | ||
22 | <folding /> | 35 | <folding /> |
23 | </state> | 36 | </state> |
24 | </provider> | 37 | </provider> |
@@ -123,8 +136,8 @@ | @@ -123,8 +136,8 @@ | ||
123 | </component> | 136 | </component> |
124 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 137 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
125 | <component name="ProjectFrameBounds" extendedState="1"> | 138 | <component name="ProjectFrameBounds" extendedState="1"> |
126 | - <option name="x" value="197" /> | ||
127 | - <option name="y" value="142" /> | 139 | + <option name="x" value="136" /> |
140 | + <option name="y" value="152" /> | ||
128 | <option name="width" value="1642" /> | 141 | <option name="width" value="1642" /> |
129 | <option name="height" value="875" /> | 142 | <option name="height" value="875" /> |
130 | </component> | 143 | </component> |
@@ -176,32 +189,6 @@ | @@ -176,32 +189,6 @@ | ||
176 | <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> | 189 | <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> |
177 | <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" /> | 190 | <item name="view" type="2a2b976b:PhpTreeStructureProvider$1" /> |
178 | </path> | 191 | </path> |
179 | - <path> | ||
180 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
181 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
182 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
183 | - </path> | ||
184 | - <path> | ||
185 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
186 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
187 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
188 | - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
189 | - </path> | ||
190 | - <path> | ||
191 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
192 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
193 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
194 | - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
195 | - <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
196 | - </path> | ||
197 | - <path> | ||
198 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
199 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
200 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
201 | - <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
202 | - <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
203 | - <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
204 | - </path> | ||
205 | </expand> | 192 | </expand> |
206 | <select /> | 193 | <select /> |
207 | </subPane> | 194 | </subPane> |
@@ -335,7 +322,7 @@ | @@ -335,7 +322,7 @@ | ||
335 | <workItem from="1578886287019" duration="125000" /> | 322 | <workItem from="1578886287019" duration="125000" /> |
336 | <workItem from="1578887472055" duration="2928000" /> | 323 | <workItem from="1578887472055" duration="2928000" /> |
337 | <workItem from="1583368540533" duration="14325000" /> | 324 | <workItem from="1583368540533" duration="14325000" /> |
338 | - <workItem from="1583392420452" duration="3816000" /> | 325 | + <workItem from="1583392420452" duration="4556000" /> |
339 | </task> | 326 | </task> |
340 | <task id="LOCAL-00001" summary="调试"> | 327 | <task id="LOCAL-00001" summary="调试"> |
341 | <created>1574145133364</created> | 328 | <created>1574145133364</created> |
@@ -362,7 +349,7 @@ | @@ -362,7 +349,7 @@ | ||
362 | <servers /> | 349 | <servers /> |
363 | </component> | 350 | </component> |
364 | <component name="TimeTrackingManager"> | 351 | <component name="TimeTrackingManager"> |
365 | - <option name="totallyTimeSpent" value="477539000" /> | 352 | + <option name="totallyTimeSpent" value="478279000" /> |
366 | </component> | 353 | </component> |
367 | <component name="TodoView"> | 354 | <component name="TodoView"> |
368 | <todo-panel id="selected-file"> | 355 | <todo-panel id="selected-file"> |
@@ -374,7 +361,7 @@ | @@ -374,7 +361,7 @@ | ||
374 | </todo-panel> | 361 | </todo-panel> |
375 | </component> | 362 | </component> |
376 | <component name="ToolWindowManager"> | 363 | <component name="ToolWindowManager"> |
377 | - <frame x="197" y="142" width="1642" height="875" extended-state="1" /> | 364 | + <frame x="136" y="152" width="1642" height="875" extended-state="1" /> |
378 | <editor active="true" /> | 365 | <editor active="true" /> |
379 | <layout> | 366 | <layout> |
380 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15613148" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 367 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15613148" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
@@ -384,7 +371,7 @@ | @@ -384,7 +371,7 @@ | ||
384 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 371 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
385 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 372 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
386 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 373 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
387 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4729064" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 374 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47289973" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
388 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 375 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
389 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 376 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
390 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 377 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
@@ -745,14 +732,6 @@ | @@ -745,14 +732,6 @@ | ||
745 | </state> | 732 | </state> |
746 | </provider> | 733 | </provider> |
747 | </entry> | 734 | </entry> |
748 | - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> | ||
749 | - <provider selected="true" editor-type-id="text-editor"> | ||
750 | - <state relative-caret-position="257"> | ||
751 | - <caret line="31" column="65" lean-forward="false" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="65" /> | ||
752 | - <folding /> | ||
753 | - </state> | ||
754 | - </provider> | ||
755 | - </entry> | ||
756 | <entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html"> | 735 | <entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html"> |
757 | <provider selected="true" editor-type-id="text-editor"> | 736 | <provider selected="true" editor-type-id="text-editor"> |
758 | <state relative-caret-position="175"> | 737 | <state relative-caret-position="175"> |
@@ -801,7 +780,15 @@ | @@ -801,7 +780,15 @@ | ||
801 | <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> | 780 | <entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html"> |
802 | <provider selected="true" editor-type-id="text-editor"> | 781 | <provider selected="true" editor-type-id="text-editor"> |
803 | <state relative-caret-position="200"> | 782 | <state relative-caret-position="200"> |
804 | - <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> | 783 | + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> |
784 | + <folding /> | ||
785 | + </state> | ||
786 | + </provider> | ||
787 | + </entry> | ||
788 | + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js"> | ||
789 | + <provider selected="true" editor-type-id="text-editor"> | ||
790 | + <state relative-caret-position="207"> | ||
791 | + <caret line="29" column="79" lean-forward="false" selection-start-line="29" selection-start-column="79" selection-end-line="29" selection-end-column="79" /> | ||
805 | <folding /> | 792 | <folding /> |
806 | </state> | 793 | </state> |
807 | </provider> | 794 | </provider> |
此 diff 太大无法显示。
-
请 注册 或 登录 后发表评论