版本管理 ，编辑 新增 兼容模式修改，列表 新增模式显示

.idea/workspace.xml

@@ -24,7 +24,7 @@
       <file leaf-file-name="edit-formpoj.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1411">
+            <state relative-caret-position="2090">
               <caret line="95" column="57" selection-start-line="95" selection-start-column="57" selection-end-line="95" selection-end-column="57" />
               <folding />
             </state>
@@ -34,7 +34,7 @@
       <file leaf-file-name="login-fc.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/login-fc.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="462">
+            <state relative-caret-position="660">
               <caret line="30" column="74" selection-start-line="30" selection-start-column="74" selection-end-line="30" selection-end-column="74" />
               <folding />
             </state>
@@ -44,7 +44,7 @@
       <file leaf-file-name="form-list.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/form-list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4461">
+            <state relative-caret-position="5236">
               <caret line="238" column="49" selection-start-line="238" selection-start-column="49" selection-end-line="238" selection-end-column="49" />
               <folding />
             </state>
@@ -54,7 +54,7 @@
       <file leaf-file-name="formver-list.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/formver-list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="528">
+            <state relative-caret-position="594">
               <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" />
               <folding />
             </state>
@@ -64,7 +64,7 @@
       <file leaf-file-name="style.css" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
+            <state relative-caret-position="638">
               <caret line="83" column="12" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
               <folding />
             </state>
@@ -74,7 +74,7 @@
       <file leaf-file-name="edit-formver.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/edit-formver.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
+            <state relative-caret-position="3740">
               <caret line="187" column="49" selection-start-line="187" selection-start-column="49" selection-end-line="187" selection-end-column="49" />
               <folding>
                 <element signature="n#div#5;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
@@ -87,7 +87,7 @@
       <file leaf-file-name="add-form.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/add-form.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="572">
+            <state relative-caret-position="2068">
               <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
               <folding />
             </state>
@@ -97,7 +97,7 @@
       <file leaf-file-name="edit-formcate.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/edit-formcate.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-22">
+            <state relative-caret-position="4136">
               <caret line="188" column="57" selection-start-line="188" selection-start-column="57" selection-end-line="188" selection-end-column="57" />
               <folding />
             </state>
@@ -173,6 +173,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -207,14 +209,12 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="vcs.Git" />
     <property name="settings.editor.splitter.proportion" value="0.66111654" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../CLDv1.3" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
   </component>
@@ -300,18 +300,20 @@
       <workItem from="1470033171148" duration="684000" />
       <workItem from="1470037226564" duration="1099000" />
       <workItem from="1470362153416" duration="618000" />
-      <workItem from="1479176842396" duration="3028000" />
+      <workItem from="1479176842396" duration="3627000" />
+      <workItem from="1479191397088" duration="497000" />
+      <workItem from="1479203473675" duration="40000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46998000" />
+    <option name="totallyTimeSpent" value="48134000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="71" width="1456" height="886" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14587738" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14587738" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <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="7" side_tool="false" content_ui="tabs" />
@@ -384,13 +386,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="36" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html" />
     <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -535,13 +531,7 @@
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/Desktop/codepress/codepress.html" />
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="36" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/index.html" />
     <entry file="file://$PROJECT_DIR$/css/codemirror/dracula.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
@@ -550,34 +540,10 @@
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/Desktop/codepress/index.html" />
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/css/gss.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/htmlmixed/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="59" column="24" selection-start-line="59" selection-start-column="15" selection-end-line="59" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/xml.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/test.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/css/gss.html" />
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/htmlmixed/index.html" />
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/xml.js" />
+    <entry file="file://$USER_HOME$/Desktop/codemirror/codemirror-5.17.0/mode/xml/test.js" />
     <entry file="file://$PROJECT_DIR$/css/codemirror/material.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="374">
@@ -604,13 +570,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="479">
           <caret line="32" column="59" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/login-fc.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
+        <state relative-caret-position="660">
           <caret line="30" column="74" selection-start-line="30" selection-start-column="74" selection-end-line="30" selection-end-column="74" />
           <folding />
         </state>
@@ -618,7 +583,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/edit-formpoj.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1411">
+        <state relative-caret-position="2090">
           <caret line="95" column="57" selection-start-line="95" selection-start-column="57" selection-end-line="95" selection-end-column="57" />
           <folding />
         </state>
@@ -626,7 +591,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/add-form.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
+        <state relative-caret-position="2068">
           <caret line="94" column="70" selection-start-line="94" selection-start-column="70" selection-end-line="94" selection-end-column="70" />
           <folding />
         </state>
@@ -634,7 +599,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/edit-formcate.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-22">
+        <state relative-caret-position="4136">
           <caret line="188" column="57" selection-start-line="188" selection-start-column="57" selection-end-line="188" selection-end-column="57" />
           <folding />
         </state>
@@ -642,7 +607,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/edit-formver.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
+        <state relative-caret-position="3740">
           <caret line="187" column="49" selection-start-line="187" selection-start-column="49" selection-end-line="187" selection-end-column="49" />
           <folding>
             <element signature="n#div#5;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
@@ -653,7 +618,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/form-list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4461">
+        <state relative-caret-position="5236">
           <caret line="238" column="49" selection-start-line="238" selection-start-column="49" selection-end-line="238" selection-end-column="49" />
           <folding />
         </state>
@@ -661,7 +626,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/formver-list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
+        <state relative-caret-position="594">
           <caret line="27" column="57" selection-start-line="27" selection-start-column="57" selection-end-line="27" selection-end-column="57" />
           <folding />
         </state>
@@ -669,7 +634,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
+        <state relative-caret-position="638">
           <caret line="83" column="12" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
           <folding />
         </state>

edit-server.html

@@ -1,17 +1,17 @@
 <!DOCTYPE html>
-<html lang=zh-cn> 
+<html lang=zh-cn>
 <head>
-  <meta charset=utf-8> 
-  <title>VC</title> 
-  <meta name=description content="VC">   
+  <meta charset=utf-8>
+  <title>VC</title>
+  <meta name=description content="VC">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="renderer" content="webkit">
-  <meta name=copyright content=smartcost.com.cn> 
-  <link rel=stylesheet href=css/bootstrap.css> 
-  <link rel=stylesheet href=css/style.css> 
-  <script src=js/jquery-1.9.1.min.js></script> 
-  <script src=js/bootstrap.js></script> 
-  <script src=js/global.js></script> 
+  <meta name=copyright content=smartcost.com.cn>
+  <link rel=stylesheet href=css/bootstrap.css>
+  <link rel=stylesheet href=css/style.css>
+  <script src=js/jquery-1.9.1.min.js></script>
+  <script src=js/bootstrap.js></script>
+  <script src=js/global.js></script>
 </head>
 <body>
   <div class="side-nav">
@@ -93,10 +93,16 @@
                   </div>
                   <div class="col-xs-3">
                     <div class="input-group">
+                      <div class="input-group-addon">兼容</div>
+                      <select class="form-control input-sm"><option>更高版本</option><option>当前版本</option><select>
+                    </div>
+                  </div>
+                  <div class="col-xs-3">
+                    <div class="input-group">
                       <div class="input-group-addon">软件</div>
                       <input type="text" class="form-control input-sm" value="v3.1.3.234" disabled>
                     </div>
-                  </div>  
+                  </div>
                 </div>
               </div>
               <div class="form-group ">

server-list.html

@@ -1,17 +1,17 @@
 <!DOCTYPE html>
-<html lang=zh-cn> 
+<html lang=zh-cn>
 <head>
-  <meta charset=utf-8> 
-  <title>VC</title> 
-  <meta name=description content="VC">   
+  <meta charset=utf-8>
+  <title>VC</title>
+  <meta name=description content="VC">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="renderer" content="webkit">
-	<meta name=copyright content=smartcost.com.cn> 
-	<link rel=stylesheet href=css/bootstrap.css> 
-	<link rel=stylesheet href=css/style.css> 
-	<script src=js/jquery-1.9.1.min.js></script> 
-	<script src=js/bootstrap.js></script> 
-	<script src=js/global.js></script> 
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/bootstrap.css>
+	<link rel=stylesheet href=css/style.css>
+	<script src=js/jquery-1.9.1.min.js></script>
+	<script src=js/bootstrap.js></script>
+	<script src=js/global.js></script>
 </head>
 <body>
   <div class="side-nav">
@@ -55,7 +55,7 @@
             <td>广东办-刘飞</td>
             <td>2015-10-15 11:23</td>
             <td><span class="text-success">通讯正常<span></td>
-            <td>v1.2 2842783<br>v3.1.3.234</td>
+            <td>v1.2 2842783<br><span class="glyphicon glyphicon-minus" title="当前版本"></span> v3.1.3.234</td>
             <td><a href="edit-server.html" type="button" class="btn btn-info btn-xs">编辑</a> <a type="button" class="btn btn-info btn-xs" href="#update" data-toggle="modal">升级</a></td>
           </tr>
           <tr>
@@ -64,7 +64,7 @@
             <td>广东办-刘飞</td>
             <td>2015-10-15 11:23</td>
             <td><span class="text-warning">通讯异常<span></td>
-            <td>v1.2 2842783<br>v3.1.3.234</td>
+            <td>v1.2 2842783<br><span class="glyphicon glyphicon-eject" title="更高版本"></span> v3.1.3.234</td>
             <td><a href="edit-server.html" type="button" class="btn btn-info btn-xs">编辑</a> <a type="button" class="btn btn-info btn-xs" href="#update" data-toggle="modal">升级</a></td>
           </tr>
           <tr>
@@ -73,7 +73,7 @@
             <td>甘肃办-苟彦刚</td>
             <td>2015-10-15 11:23</td>
             <td><span class="text-danger">关闭<span></td>
-            <td>v1.2 2842783<br>v3.1.3.234</td>
+            <td>v1.2 2842783<br><span class="glyphicon glyphicon-eject" title="更高版本"></span> v3.1.3.234</td>
             <td><a href="edit-server.html" type="button" class="btn btn-info btn-xs">编辑</a> <a type="button" class="btn btn-info btn-xs" href="#update" data-toggle="modal">升级</a></td>
           </tr>
         </tobdy>
@@ -145,7 +145,7 @@
         <div class="form-group">
           <label>升级内容</label>
             <textarea class="form-control" rows="3">客户端软件有新版本，需要更新才能继续使用。</textarea>
-        </div>        
+        </div>
         <div class="alert alert-danger" role="alert">升级前请“禁止客户端登陆”，谨慎填写软件版本。</div>
       </div>
       <div class="modal-footer">
@@ -154,5 +154,5 @@
     </div>
   </div>
 </div>
-<!--弹框-结束-->  
-</body>
+<!--弹框-结束-->
+</body>