切换分支前的一次提交

.idea/workspace.xml

@@ -16,39 +16,99 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="188" column="27" lean-forward="true" selection-start-line="188" selection-start-column="27" selection-end-line="188" selection-end-column="27" />
-              <folding>
-                <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
-                <element signature="e#5141#5825#0" />
-                <element signature="e#5878#5928#0" expanded="true" />
-                <element signature="e#6795#6819#0" />
-                <element signature="e#9076#9550#0" />
-                <element signature="e#9657#10408#0" />
-                <element signature="e#8718#8758#0" />
-                <element signature="e#9716#10264#0" />
-                <element signature="e#9786#10090#0" />
-                <element signature="e#9811#10076#0" />
-                <element signature="e#9874#10016#0" />
-                <element signature="e#10119#10253#0" />
-                <element signature="e#10144#10239#0" />
-                <element signature="n#style#0;n#!!top" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5256488">
+      <split-first>
+        <leaf>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="713">
+                  <caret line="280" selection-start-line="280" selection-end-line="280" />
+                  <folding>
+                    <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                    <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
+                    <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
+                    <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
+                    <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
+                    <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
+                    <element signature="e#5141#5825#0" />
+                    <element signature="n#script#0;n#!!top" />
+                    <element signature="e#6773#11152#0" />
+                    <element signature="e#6795#6819#0" />
+                    <element signature="e#6999#7504#0" />
+                    <element signature="e#6480#6984#0" />
+                    <element signature="e#7523#10578#0" />
+                    <element signature="e#8978#10568#0" />
+                    <element signature="e#9076#9550#0" />
+                    <element signature="e#9122#9312#0" />
+                    <element signature="e#9317#9505#0" />
+                    <element signature="e#9657#10408#0" />
+                    <element signature="e#9813#9861#0" />
+                    <element signature="e#10103#10151#0" />
+                    <element signature="e#8717#9452#0" />
+                    <element signature="e#8793#8983#0" />
+                    <element signature="e#8988#9274#0" />
+                    <element signature="e#8718#8758#0" />
+                    <element signature="e#8759#8949#0" />
+                    <element signature="e#8954#9238#0" />
+                    <element signature="e#9716#10264#0" />
+                    <element signature="e#9786#10090#0" />
+                    <element signature="e#9811#10076#0" />
+                    <element signature="e#9874#10016#0" />
+                    <element signature="e#10119#10253#0" />
+                    <element signature="e#10144#10239#0" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-609">
+                  <caret line="31" column="6" lean-forward="true" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="475">
+                  <caret line="208" column="11" lean-forward="true" selection-start-line="208" selection-start-column="11" selection-end-line="208" selection-end-column="11" />
+                  <folding>
+                    <element signature="e#168#206#0" />
+                    <element signature="e#321#580#0" />
+                    <element signature="e#487#574#0" />
+                    <element signature="e#744#1149#0" />
+                    <element signature="e#957#993#0" />
+                    <element signature="e#1049#1141#0" />
+                    <element signature="e#1191#2978#0" />
+                    <element signature="e#1307#1727#0" />
+                    <element signature="e#1577#1717#0" />
+                    <element signature="e#1771#1902#0" />
+                    <element signature="e#1947#2076#0" />
+                    <element signature="e#2121#2260#0" />
+                    <element signature="e#2309#2438#0" />
+                    <element signature="e#2479#2970#0" />
+                    <element signature="e#2606#2810#0" />
+                    <element signature="e#2853#2960#0" />
+                    <element signature="e#3217#3277#0" />
+                    <element signature="e#3405#4584#0" />
+                    <element signature="e#4641#4724#0" />
+                    <element signature="e#4755#4793#0" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -141,7 +201,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
     <option name="width" value="1100" />
@@ -173,6 +233,21 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="renderer" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="renderer" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="electron-app" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="renderer" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="less" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="electron-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="electron-app" type="462c0819:PsiDirectoryNode" />
@@ -267,12 +342,12 @@
       <workItem from="1586829063648" duration="36119000" />
       <workItem from="1586915969493" duration="21883000" />
       <workItem from="1586943118080" duration="1709000" />
-      <workItem from="1587002338084" duration="8984000" />
+      <workItem from="1587002338084" duration="9718000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="199336000" />
+    <option name="totallyTimeSpent" value="200070000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -284,10 +359,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.018440465" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12697576" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -482,44 +557,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/utils/sliceColor.js" />
-    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-          <folding>
-            <element signature="e#168#206#0" />
-            <element signature="e#234#4728#0" />
-            <element signature="e#321#580#0" />
-            <element signature="e#487#574#0" />
-            <element signature="e#613#4610#0" />
-            <element signature="e#744#1149#0" />
-            <element signature="e#957#993#0" />
-            <element signature="e#1049#1141#0" />
-            <element signature="e#1191#2978#0" />
-            <element signature="e#1307#1727#0" />
-            <element signature="e#1577#1717#0" />
-            <element signature="e#1771#1902#0" />
-            <element signature="e#1947#2076#0" />
-            <element signature="e#2121#2260#0" />
-            <element signature="e#2309#2438#0" />
-            <element signature="e#2479#2970#0" />
-            <element signature="e#2606#2810#0" />
-            <element signature="e#2853#2960#0" />
-            <element signature="e#3017#4604#0" />
-            <element signature="e#3217#3277#0" />
-            <element signature="e#3315#4595#0" />
-            <element signature="e#3405#4584#0" />
-            <element signature="e#3604#4572#0" />
-            <element signature="e#3786#3863#0" />
-            <element signature="e#3921#4558#0" />
-            <element signature="e#4106#4262#0" />
-            <element signature="e#4328#4542#0" />
-            <element signature="e#4641#4724#0" />
-            <element signature="e#4755#4793#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/utils/storageUtils.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -3116,13 +3153,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="58" lean-forward="true" selection-start-line="7" selection-start-column="58" selection-end-line="7" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/EnityTopology.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -3562,31 +3592,79 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/EnitySignalPreviewList.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-609">
+          <caret line="31" column="6" lean-forward="true" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/Admin.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="188" column="27" lean-forward="true" selection-start-line="188" selection-start-column="27" selection-end-line="188" selection-end-column="27" />
+        <state relative-caret-position="713">
+          <caret line="280" selection-start-line="280" selection-end-line="280" />
           <folding>
             <element signature="n#div#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#1;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#label#0;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="n#div#2;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
-            <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" />
+            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#0;n#template#0;n#!!top" expanded="true" />
             <element signature="n#div#4;n#div#0;n#div#0;n#template#0;n#!!top" />
             <element signature="e#5141#5825#0" />
-            <element signature="e#5878#5928#0" expanded="true" />
+            <element signature="n#script#0;n#!!top" />
+            <element signature="e#6773#11152#0" />
             <element signature="e#6795#6819#0" />
+            <element signature="e#6999#7504#0" />
+            <element signature="e#6480#6984#0" />
+            <element signature="e#7523#10578#0" />
+            <element signature="e#8978#10568#0" />
             <element signature="e#9076#9550#0" />
+            <element signature="e#9122#9312#0" />
+            <element signature="e#9317#9505#0" />
             <element signature="e#9657#10408#0" />
+            <element signature="e#9813#9861#0" />
+            <element signature="e#10103#10151#0" />
+            <element signature="e#8717#9452#0" />
+            <element signature="e#8793#8983#0" />
+            <element signature="e#8988#9274#0" />
             <element signature="e#8718#8758#0" />
+            <element signature="e#8759#8949#0" />
+            <element signature="e#8954#9238#0" />
             <element signature="e#9716#10264#0" />
             <element signature="e#9786#10090#0" />
             <element signature="e#9811#10076#0" />
             <element signature="e#9874#10016#0" />
             <element signature="e#10119#10253#0" />
             <element signature="e#10144#10239#0" />
-            <element signature="n#style#0;n#!!top" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/assets/less/admin.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="208" column="11" lean-forward="true" selection-start-line="208" selection-start-column="11" selection-end-line="208" selection-end-column="11" />
+          <folding>
+            <element signature="e#168#206#0" />
+            <element signature="e#321#580#0" />
+            <element signature="e#487#574#0" />
+            <element signature="e#744#1149#0" />
+            <element signature="e#957#993#0" />
+            <element signature="e#1049#1141#0" />
+            <element signature="e#1191#2978#0" />
+            <element signature="e#1307#1727#0" />
+            <element signature="e#1577#1717#0" />
+            <element signature="e#1771#1902#0" />
+            <element signature="e#1947#2076#0" />
+            <element signature="e#2121#2260#0" />
+            <element signature="e#2309#2438#0" />
+            <element signature="e#2479#2970#0" />
+            <element signature="e#2606#2810#0" />
+            <element signature="e#2853#2960#0" />
+            <element signature="e#3217#3277#0" />
+            <element signature="e#3405#4584#0" />
+            <element signature="e#4641#4724#0" />
+            <element signature="e#4755#4793#0" />
           </folding>
         </state>
       </provider>

src/renderer/components/Admin.vue

@@ -271,10 +271,14 @@
 </script>
 
 <style lang="less">
+    // 容器样式
     .containers {
         width: 100%;
         height: 981px;
         background-color: #333;
+
+        // 信号源列表项样式
+
     }
 </style>