* Code for task #91379 .

module/doc/css/view.css

@@ -82,3 +82,17 @@
 #editorBox > .btn-group > button {margin: 2px 6px 0 4px; color: #838A9D;}
 #editorMenu {max-height: 200px; overflow: auto;}
 #editorMenu > li {color: #838A9D; font-weight: 400; padding: 5px 12px;}
+.doc-version-menu {padding: 10px 5px;}
+#changeBtn > i {font-size: 24px;}
+
+#docVersionMenu > .drop-body {max-height: 200px; overflow-y: auto;}
+#docVersionMenu > .drop-body > li.li-item {display: flex; position: relative;}
+#docVersionMenu > .drop-body > li.li-item > .checkbox-primary {display: none; position: absolute; top: 4px; left: 10px;}
+#docVersionMenu > .drop-body > li > a {flex: 1; padding-left: 20px; height: 30px; display: flex; align-items: center;}
+#docVersionMenu > .drop-bottom > button {margin-right: 10px; display: none;}
+
+#docVersionMenu.diff > .drop-body > li.li-item > .checkbox-primary {display: unset!important;}
+#docVersionMenu.diff > .drop-body > li > a {padding-left:30px!important;}
+#docVersionMenu.diff > .drop-title > #changeBtn {opacity: 0;}
+#docVersionMenu.diff > .drop-bottom > button {display: unset!important;}
+

module/doc/js/view.js

@@ -166,6 +166,25 @@ $(function()
     }).on('click', '.comment-edit-form .btn-hide-form', function()
     {
         $('.comment-edit-form #submit').attr('disabled', false);
+    }).on('click', '#docVersionMenu.diff > .drop-body > li', function(e)
+    {
+        e.stopPropagation();
+    }).on('click', '#docVersionMenu #changeBtn', function(e)
+    {
+        $('#docVersionMenu').addClass('diff');
+        e.stopPropagation()
+    }).on('click', '#docVersionMenu .drop-bottom', function(e)
+    {
+        var data = $(e.target).data();
+        e.stopPropagation();
+        if(data.id == 'cancel')
+        {
+            $('#docVersionMenu').removeClass('diff');
+        }
+        else if(data.id == 'confirm')
+        {
+            $(this.closest('.open .btn-group')).removeClass('open');
+        }
     });
 
     $('#outline li.has-list').addClass('open in');
@@ -198,10 +217,10 @@ $(function()
                 simplemde.togglePreview();
             }
             $('#docExport').attr('href', createLink('doc', exportMethod, 'libID=' + libID + '&moduleID=0&docID=' + docID + '&version=' + $('#content .doc-title .version').data('version')));
+            if($('.files-list').length) $('#content .detail-content.article-content').css('height', 'calc(100vh - 300px)');
         });
     })
 
-
     $('#history').append('<a id="closeBtn" href="###" class="btn btn-link"><i class="icon icon-close"></i></a>');
     $('#hisTrigger').on('click', function()
     {
@@ -226,9 +245,6 @@ $(function()
         $('#hisTrigger').removeClass('text-primary');
     })
     $('#history').find('.btn.pull-right').removeClass('pull-right');
-    if($('.files-list').length)
-    {
-        $('#content .detail-content.article-content').css('height', 'calc(100vh - 300px)');
-    }
+    if($('.files-list').length) $('#content .detail-content.article-content').css('height', 'calc(100vh - 300px)');
     $('.outline .outline-toggle i.icon-menu-arrow-left').trigger("click");
 })

module/doc/lang/zh-cn.php

@@ -170,6 +170,7 @@ $lang->doc->createBook       = '创建手册';
 $lang->doc->browse           = '文档列表';
 $lang->doc->view             = '文档详情';
 $lang->doc->diff             = '对比';
+$lang->doc->cancelDiff       = '取消对比';
 $lang->doc->diffAction       = '对比文档';
 $lang->doc->sort             = '文档排序';
 $lang->doc->manageType       = '维护目录';

module/doc/view/content.html.php

@@ -19,10 +19,14 @@
                   #<?php echo $version;?>
                   <span class="caret"></span>
                 </a>
-                <ul class='dropdown-menu doc-version-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
-                <?php for($version = $doc->version; $version > 0; $version--): ?>
-                  <li><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$version"); ?>'>#<?php echo $version; ?></a></li>
-                <?php endfor; ?>
+                <ul id="docVersionMenu" class='dropdown-menu doc-version-menu' style='width: 250px; overflow-y:auto'>
+                  <li class="drop-title flex-between"><div><?php echo $lang->doc->allDoc?></div> <div id="changeBtn" class="text-primary" style="cursor: pointer; display: flex; align-items: center;"><i class="icon icon-exchange"></i><?php echo $lang->doc->diff?></div></li>
+                  <div class="drop-body menu-active-primary menu-hover-primary">
+                  <?php for($version = $doc->version; $version > 0; $version--):?>
+                    <li class="li-item"><div class="checkbox-primary"><input type="checkbox"></input><label for=""></label></div><a href='javascript:void(0)' data-url='<?php echo $this->createLink('doc', 'view', "docID=$doc->id&version=$version"); ?>'>#<?php echo $version;?></a></li>
+                  <?php endfor;?>
+                  </div>
+                  <li class="drop-bottom"><button data-id="confirm" class="btn btn-primary"><?php echo $lang->confirm?></button><button data-id="cancel" class="btn"><?php echo $lang->doc->cancelDiff?> </button></li>
                 </ul>
               </div>
             </div>