Merge branch 'dev/gfl_zentaopms_307' into 'master'

* Code for task #91379 .

See merge request easycorp/zentaopms!7449

module/doc/js/view.js

@@ -136,6 +136,39 @@ document.addEventListener('msfullscreenChange', function (e)
 
 $(function()
 {
+    var arrVersionDiff = [];
+    var isVersionDiff  = false;
+    function refreshCheckbox()
+    {
+        var $inputs = $('#docVersionMenu .checkbox-primary input');
+        if(arrVersionDiff.length == 2)
+        {
+            for(var i = 0; i < $inputs.length; i++)
+            {
+                var $input = $($inputs[i]);
+                if(!$input.prop('checked'))
+                {
+                    $input.addClass('disabled');
+                    $input.attr('disabled', true);
+                    $input.closest('.checkbox-primary').addClass('disabled');
+                }
+            }
+        }
+        else if(arrVersionDiff.length < 2)
+        {
+            for(var i = 0; i < $inputs.length; i++)
+            {
+                var $input = $($inputs[i]);
+                if(!$input.prop('checked'))
+                {
+                    $input.removeClass('disabled');
+                    $input.attr('disabled', false);
+                    $input.closest('.checkbox-primary').removeClass('disabled');
+                }
+            }
+        }
+    }
+
     $(document).keydown(function(event)
     {
         if($.cookie('isFullScreen') == 1)
@@ -172,19 +205,45 @@ $(function()
     }).on('click', '#docVersionMenu #changeBtn', function(e)
     {
         $('#docVersionMenu').addClass('diff');
-        e.stopPropagation()
+        e.stopPropagation();
     }).on('click', '#docVersionMenu .drop-bottom', function(e)
     {
         var data = $(e.target).data();
         e.stopPropagation();
         if(data.id == 'cancel')
         {
+            arrVersionDiff = [];
             $('#docVersionMenu').removeClass('diff');
         }
         else if(data.id == 'confirm')
         {
-            $(this.closest('.open .btn-group')).removeClass('open');
+            $(this.closest('.open.btn-group')).removeClass('open');
         }
+    }).on('click', '#docVersionMenu .checkbox-primary', function()
+    {
+        var $input  = $(this).find('input');
+        var isCheck = $input.prop('checked');
+        var data    = $input.data();
+        if(isCheck)
+        {
+            arrVersionDiff.push(data);
+        }
+        else
+        {
+            if(arrVersionDiff[0].version === data.version)
+            {
+                var pushItem = arrVersionDiff[1];
+            }
+            else
+            {
+                var pushItem = arrVersionDiff[0];
+            }
+            var newArr = [];
+            newArr.push(pushItem);
+            arrVersionDiff = newArr;
+        }
+
+        refreshCheckbox()
     });
 
     $('#outline li.has-list').addClass('open in');
@@ -243,7 +302,7 @@ $(function()
     {
         $('#history').addClass('hidden');
         $('#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)');
     $('.outline .outline-toggle i.icon-menu-arrow-left').trigger("click");

module/doc/view/content.html.php

@@ -23,10 +23,10 @@
                   <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>
+                    <li class="li-item"><div class="checkbox-primary"><input type="checkbox" <?php echo "data-id=".$doc->id." data-version=".$version;?> ></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>
+                  <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>