From c8721e83134864ef155de2314ff1d478e9997d43 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 26 Feb 2020 10:04:26 +0800
Subject: [PATCH] Complete tasks #6904,#6899.

---
 module/block/css/dashboard.css    |  1 +
 module/repo/css/view.css          |  1 +
 module/repo/js/common.js          | 11 ++++++++++
 module/webhook/model.php          |  1 +
 module/webhook/view/bind.html.php | 36 +++++++++++++++++++++++++++++--
 5 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css
index 1511c7145d..6d6324f9c5 100644
--- a/module/block/css/dashboard.css
+++ b/module/block/css/dashboard.css
@@ -25,3 +25,4 @@ body {padding-bottom: 20px;}
 
 #dashboard .block-sm .hide-in-sm {display: none;}
 #dashboard .block-dynamic .panel-body{overflow-x:hidden;}
+.modal-body{padding: 10px 20px 20px 20px;}
diff --git a/module/repo/css/view.css b/module/repo/css/view.css
index 1fc8387c42..dd3546b13b 100644
--- a/module/repo/css/view.css
+++ b/module/repo/css/view.css
@@ -12,3 +12,4 @@ tr,th,td {border-bottom:none;}
 .repoCode .image {text-align:center; padding-top:10px;}
 .panel .panel-heading .action .input-group {margin-top:-6px; margin-right:-10px;}
 .body-modal .panel-actions {right:30px;}
+.icon-angle-left{transform: rotateY(180deg);}
diff --git a/module/repo/js/common.js b/module/repo/js/common.js
index 65f666b25f..27bcc83365 100644
--- a/module/repo/js/common.js
+++ b/module/repo/js/common.js
@@ -83,4 +83,15 @@ $(function()
             }
         });
     }
+
+    if($("main").is(".hide-sidebar")){
+        $(".sidebar-toggle").children().attr("class", "icon icon-angle-left");
+    }else
+    {
+        $("#sidebar").bind("click", function ()
+        {
+            $(".sidebar-toggle").children().attr("class", "icon icon-angle-left");
+            $(this).unbind();
+        });
+    }
 })
diff --git a/module/webhook/model.php b/module/webhook/model.php
index 820c9b5a50..c8b11c0095 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -218,6 +218,7 @@ class webhookModel extends model
             ->remove('allParams, allActions')
             ->get();
         $webhook->params  = $this->post->params ? implode(',', $this->post->params) . ',text' : 'text';
+
         if($webhook->type == 'dingapi')
         {
             $webhook->secret = array();
diff --git a/module/webhook/view/bind.html.php b/module/webhook/view/bind.html.php
index ecd042b55f..2f5c995631 100644
--- a/module/webhook/view/bind.html.php
+++ b/module/webhook/view/bind.html.php
@@ -11,6 +11,7 @@
           <th class='text-left'><?php echo $lang->user->account?></th>
           <th class='w-200px text-left'><?php echo $lang->user->realname?></th>
           <th class='w-200px'><?php echo $webhook->type == 'dingapi' ? $lang->webhook->dingUserid : $lang->webhook->wechatUserid;?></th>
+          <th class='w-100px'><?php echo $lang->actions;?></th>
           <th class='w-100px'><?php echo $webhook->type == 'dingapi' ? $lang->webhook->dingBindStatus : $lang->webhook->wechatBindStatus;?></th>
         </tr>
         </thead>
@@ -33,7 +34,9 @@
               $userid = $dingUsers[$user->realname];
           }
           ?>
-          <td><?php echo html::select("userid[{$user->account}]", $useridPairs, $userid, 'class="form-control"')?></td>
+<!--          <td>--><?php //echo html::select("userid[{$user->account}]", $useridPairs, 0, 'class="form-control"')?><!--</td>-->
+          <td ><?php echo '<span class="label label-badge label-primary label-outline">' . $useridPairs[$userid] . '</span>'; echo html::input("userid[{$user->account}]", $userid, 'class="form-control hidden"');?></td>
+          <td class='text-center c-actions'><?php echo '<button class="btn bind" type="button" data-value="userid[' . $user->account . ']"><i class="icon-common-edit icon-edit"></i></button>';?></td>
           <td class='text-center'><?php echo zget($lang->webhook->dingBindStatusList, $bindStatus, '');?></td>
         </tr>
         <?php $inputVars += 1;?>
@@ -50,14 +53,43 @@
       </div>
       <?php endif;?>
     </form>
+    <div class="content" id="user-list">
+      <?php echo html::select("userid", $useridPairs, 0, 'class="form-control" id="user-select"')?>
+      <div class='table-footer'>
+          <?php echo html::submitButton($lang->save, '', 'btn btn-primary btn-select');?>
+          <?php echo html::submitButton($lang->cancel, '', 'btn btn-close');?>
+      </div>
+      <script>
+        $(".btn-close").click(function(){myModalTrigger.close()});
+        $(".btn-select").click(function()
+          {
+              var inputValue1 = $("#user-select option:selected").val();
+              var spanValue = $("#user-select option:selected").text();
+              var inputName = $("#save-input").children('input').eq(0).attr("name");
+              setInput(inputName, inputValue1, spanValue);
+              myModalTrigger.close()
+          });
+      </script>
+    </div>
+    <div id="save-input"></div>
   </div>
 </div>
 <script>
+var myModalTrigger = myModalTrigger = new $.zui.ModalTrigger({title:"<?php echo $lang->webhook->bind;?>", custom:$('#user-list').html(), height:"auto"});
+$(function () {$("#user-list").html("");});
+$(".bind").on("click",function()
+{
+  var inputName = this.getAttribute("data-value");
+  $("#save-input").html();
+  $("#save-input").html("<input type='hidden' name='" + inputName + "' value=''>");
+  myModalTrigger.show();
+});
+function setInput(setName, setValue1, spanValue){$("input[name='" + setName + "']").attr("value", setValue1); $("input[name='" + setName + "']").prev().html(spanValue);}
 <?php if(common::judgeSuhosinSetting($inputVars)):?>
 $(function()
 {
     $('.table-footer').before("<div class='alert alert-info'><?php echo  extension_loaded('suhosin') ? trim(sprintf($lang->suhosinInfo, $inputVars)) : trim(sprintf($lang->maxVarsInfo, $inputVars));?></div>")
-})
+});
 <?php endif;?>
 </script>
 <?php include '../../common/view/footer.html.php';?>