Kaynağa Gözat

群组界面

dgf 8 yıl önce
ebeveyn
işleme
7a06fcfe6f

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
dist/web12345-new/app-1c7bf992dc.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 1
dist/web12345-new/app-2a5025f567.css


+ 3 - 1
dist/web12345-new/app-c4cba6450c.js

@@ -428,7 +428,6 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
         } else {
             alert("您的设备不支持图片预览功能,如需该功能请升级您的设备!");
         };
-
         //获取文件
         var file = fileDom.files[0];
         var imageType = /^image\//;
@@ -444,6 +443,8 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
             // var img = document.getElementById("preview");
             // //图片路径设置为读取的图片
             // img.src = e.target.result;
+            console.log(file);
+            console.log(e);
             var img = new Image,
                 width = 1080, //image resize
                 quality = 0.9, //image quality
@@ -456,6 +457,7 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
                 canvas.height = width * (img.height / img.width);
                 drawer.drawImage(img, 0, 0, canvas.width, canvas.height);
                 img.src = canvas.toDataURL("image/jpeg", quality);
+                console.log(img);
                 if (imgNum == 0) {
                     $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" class="thumbnail images"><img onClick="angular.element(this).scope().imgView(event)" src="' + img.src + '"></a>');
                     angular.element(".images").addClass("one");

+ 2 - 2
dist/web12345-new/index.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="../bower_components/animate.css/animate.min.css">
     <link rel="stylesheet" href="../bower_components/swiper/dist/css/swiper.min.css">
-    <link rel="stylesheet" href="app-2a5025f567.css">
+    <link rel="stylesheet" href="app-1c7bf992dc.css">
 
     <!-- jQuery文件。务必在bootstrap.min.js 之前引入 -->
     <!--<script src="js/jquery.min.js"></script>-->
@@ -23,7 +23,7 @@
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
     <script src="../bower_components/angular-animate/angular-animate.min.js"></script>
 
-    <script src="app-c4cba6450c.js"></script>
+    <script src="app-7395cc9769.js"></script>
 </head>
 
 <body ng-app="app">

+ 45 - 32
talkview/src/js/controller/groupsinfoController.js

@@ -9,20 +9,45 @@ angular.module('appMessage').controller('GroupsinfoController', ['$scope', funct
         { loginName: "0578+0+lssdgf", displayName: "戴国峰", manger: 1 },
         { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
         { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
+        { loginName: "0578+0+lsszlg", displayName: "郑连根", manger: 2 },
+        { loginName: "0578+0+lsslzy", displayName: "蓝梓洋", manger: 2 },
     ];
 
     $scope.$on('$viewContentLoaded', function() {
-        var tbody = $("#content>tbody")[0];
+        var tbody = $("#content>table>tbody")[0];
         var rMenu = $("#rMenu")[0];
         tbody.oncontextmenu = function() { return false }; //禁止鼠标右键菜单显示
         rMenu.oncontextmenu = function() { return false };
-        console.log(tbody);
+        //console.log(tbody);
         tbody.onmouseup = function(e) {
             if (e.button === 2) { //如果button=1(鼠标左键),button=2(鼠标右键),button=0(鼠标中间键)
                 console.log(e);
                 console.log(e.clientX, e.clientY);
-                rMenu.style.top = e.clientY + 'px'; //鼠标点击时给右键菜单定位X、Y轴坐标
-                rMenu.style.left = e.clientX + 'px';
+                if (e.clientX > 390 && e.clientY > 350) {
+                    rMenu.style.top = (e.clientY - 5) - 130 + 'px'; //鼠标点击时给右键菜单定位X、Y轴坐标
+                    rMenu.style.left = (e.clientX + 10) - 115 + 'px';
+                } else if (e.clientX > 390) {
+                    rMenu.style.top = (e.clientY - 5) + 'px';
+                    rMenu.style.left = (e.clientX + 10) - 115 + 'px';
+                } else if (e.clientY > 350) {
+                    rMenu.style.top = (e.clientY - 5) - 130 + 'px';
+                    rMenu.style.left = (e.clientX + 10) + 'px';
+                } else if (e.clientX <= 390 && e.clientY <= 350) {
+                    rMenu.style.top = (e.clientY - 5) + 'px';
+                    rMenu.style.left = (e.clientX + 10) + 'px';
+                }
                 rMenu.style.display = 'block';
             } else {
                 rMenu.style.display = 'none';
@@ -31,16 +56,16 @@ angular.module('appMessage').controller('GroupsinfoController', ['$scope', funct
     });
 
     $scope.searchUser = function() {
-        var users = $("#content>tbody>tr");
+        var users = $("#content>table>tbody>tr");
         //console.log(users);
         if ($scope.searchName !== "") {
-            $("#content>tbody>tr").addClass("hide");
+            users.addClass("hide");
             for (var i = 0, len = users.length; i < len; i++) {
                 if (users[i].firstElementChild.nextElementSibling.firstElementChild.value.indexOf($scope.searchName) !== -1 || users[i].firstElementChild.nextElementSibling.nextElementSibling.firstElementChild.value.indexOf($scope.searchName) !== -1)
                     $(users[i]).removeClass("hide");
             }
         } else if ($scope.searchName == "")
-            $("#content>tbody>tr").removeClass("hide");
+            users.removeClass("hide");
     };
 
     $scope.getMangerIco = function(user) {
@@ -52,35 +77,23 @@ angular.module('appMessage').controller('GroupsinfoController', ['$scope', funct
             return '';
     };
 
-    $scope.actived = function($event) {
-        var activeClick = $($event.target);
-        //console.log(activeClick);
-        if (activeClick[0].nodeName == "A") {
-            angular.element(".Li").removeClass("activeBackground");
-            angular.element(".Aa").removeClass("activeColor");
-            activeClick.addClass("activeColor");
-        } else if (activeClick[0].nodeName == "LI") {
-            angular.element(".Aa").removeClass("activeColor");
-            angular.element(".Li").removeClass("activeBackground");
-            activeClick.addClass("activeBackground");
-        } else {
-            angular.element(".Aa").removeClass("activeColor");
-            angular.element(".Li").removeClass("activeBackground");
-            $(activeClick[0].parentElement).addClass("activeBackground");
-            $(activeClick[0].parentElement.parentElement).addClass("activeBackground");
-        }
-    };
-
     $scope.activeTable = function($event) {
+        $scope.rMouseEvent = $event;
         var activeClick = $($event.target);
-        //console.log(activeClick);
-        $("#content>tbody>tr").removeClass("activebcolor");
-        $(activeClick[0].parentElement).addClass("activebcolor");
-        $(activeClick[0].parentElement.parentElement).addClass("activebcolor");
+        //console.log($event);
+        if ($event.button == 0 || $event.button == 2) {
+            $("#content>table>tbody>tr").removeClass("activebcolor");
+            $(activeClick[0].parentElement).addClass("activebcolor");
+            $(activeClick[0].parentElement.parentElement).addClass("activebcolor");
+        }
     };
 
-    $scope.rMouseClick = function(e) {
-        console.log("右键菜单");
+    $scope.userView = function() {
+        var userObj = $scope.rMouseEvent.currentTarget;
+        var loginName = userObj.firstElementChild.nextElementSibling.firstElementChild.value;
+        var userName = userObj.firstElementChild.nextElementSibling.nextElementSibling.firstElementChild.value;
+        console.log(loginName, userName);
+        $("#rMenu")[0].style.display = 'none';
     };
 
 }]);

+ 37 - 19
talkview/src/less/app.main.less

@@ -1008,6 +1008,7 @@ body {
     ::-webkit-scrollbar { width: 0px;}
     width: 500px;
     height: 500px;
+    overflow: hidden;
     margin: 0px auto;
     background: #FFF;
     #tablist {
@@ -1170,6 +1171,7 @@ body {
                 }
             }
             #form2 {
+                ::-webkit-scrollbar { width: 5px;}
                 margin: 20px auto;
                 line-height: normal;
                 white-space: nowrap; /* 自适应宽度,不换行*/
@@ -1197,6 +1199,9 @@ body {
                 #tableForm {
                     margin-top: 20px;
                     #content {
+                        height: 340px;
+                        overflow-y: auto;
+                        margin-right: 0px;
                         tr {
                             line-height: 24px;
                             .glyphicon-remove {
@@ -1210,15 +1215,28 @@ body {
                                 }
                             }
                         }
-                        >tbody>tr:hover >td>input {
+                        td>img {
+                            padding-bottom: 2px;
+                        }
+                        td>input {
+                            border: none;
+                            outline: none;
+                            color: #666;
+                            background: #FFF;
+                            width: 92%;
+                            white-space: nowrap;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                        }
+                        tbody>tr:hover >td>input {
                             overflow: hidden;
                             background: #EEE;
                         }
-                        >tbody>tr:hover {
+                        tbody>tr:hover {
                             overflow: hidden;
                             background: #EEE;
                         }
-                        >tbody >.activebcolor {
+                        tbody >.activebcolor {
                             overflow: hidden;
                             background: #EEE;
                             >td>input {
@@ -1230,19 +1248,6 @@ body {
                             }
                         }
                     }
-                    td>img {
-                        padding-bottom: 2px;
-                    }
-                    td>input {
-                        border: none;
-                        outline: none;
-                        color: #666;
-                        background: #FFF;
-                        width: 92%;
-                        white-space: nowrap;
-                        overflow: hidden;
-                        text-overflow: ellipsis;
-                    }
                 }
             }
         }
@@ -1250,9 +1255,22 @@ body {
            position:absolute;
            display: none;
            width:100px;
-           height:150px;
-           background: #FFF;
-           border:1px solid #ddd;
+           font-size: 12px;
+           color: #000;
+           text-align: center;
+           border-top: 1px solid #ddd;
+           border-radius: 4px;
+           box-shadow: 0px 1px 1px #888;
+           >.list-group-item {
+               border: none;
+               line-height: 20px;
+               padding: 5px 15px;
+               cursor: default;
+               &:hover,&:focus {
+                   background-color: #5bc0de;
+                   color: #FFF;
+               }
+           }
         }
         .modal .modal-dialog {
             top: 200px;

+ 28 - 23
talkview/src/templates/groupsInfo.html

@@ -55,26 +55,28 @@
                         </thead>
                     </table>
                     <div style="border-top:solid 1px #ddd;width:500px;margin:5px auto;"></div>
-                    <table id="content">
-                        <thead>
-                            <tr>
-                                <th style="width:40px;"></th>
-                                <th style="width:150px"></th>
-                                <th style="width:220px"></th>
-                                <th style="width:90px"></th>
-                            </tr>
-                        </thead>
-                        <tbody ng-mouseup="rMouseClick($event)">
-                            <tr ng-click="activeTable($event)" ng-repeat="user in groupUsers track by $index">
-                                <td style="text-align:center;"><img ng-src="{{getMangerIco(user)}}" alt=""></td>
-                                <td><input type="text" readonly="readonly" ng-value="user.loginName"></td>
-                                <td><input type="text" readonly="readonly" ng-value="user.displayName"></td>
-                                <td>
-                                    <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
+                    <div id="content">
+                        <table>
+                            <thead>
+                                <tr>
+                                    <th style="width:40px;"></th>
+                                    <th style="width:150px"></th>
+                                    <th style="width:220px"></th>
+                                    <th style="width:90px"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr ng-mouseup="activeTable($event)" ng-repeat="user in groupUsers track by $index">
+                                    <td style="text-align:center;"><img ng-src="{{getMangerIco(user)}}" alt=""></td>
+                                    <td><input type="text" readonly="readonly" ng-value="user.loginName"></td>
+                                    <td><input type="text" readonly="readonly" ng-value="user.displayName"></td>
+                                    <td>
+                                        <a class="glyphicon glyphicon-remove" data-toggle="modal" data-target="#delModal"></a>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </form>
         </div>
@@ -101,9 +103,12 @@
             </form>
         </div>
         <!--menu-->
-        <div id="rMenu">
-            <p>确定</p>
-            <p>关闭</p>
+        <div class="list-group" id="rMenu">
+            <a href="#" class="list-group-item" ng-click="userView()">查看资料</a>
+            <a href="#" class="list-group-item">发送消息</a>
+            <a href="#" class="list-group-item">设为管理员</a>
+            <a href="#" class="list-group-item">取消管理员</a>
+            <a href="#" class="list-group-item">删除该成员</a>
         </div>
         <!--OK-->
         <div class="modal fade" id="okModal" tabindex="-2" role="dialog" data-backdrop="static" aria-labelledby="okModalLabel" aria-hidden="true">

+ 3 - 1
web12345-new/src/js/controller/webController.js

@@ -95,7 +95,6 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
         } else {
             alert("您的设备不支持图片预览功能,如需该功能请升级您的设备!");
         };
-
         //获取文件
         var file = fileDom.files[0];
         var imageType = /^image\//;
@@ -111,6 +110,8 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
             // var img = document.getElementById("preview");
             // //图片路径设置为读取的图片
             // img.src = e.target.result;
+            console.log(file);
+            console.log(e);
             var img = new Image,
                 width = 1080, //image resize
                 quality = 0.9, //image quality
@@ -123,6 +124,7 @@ angular.module('app').controller('WebController', ['$scope', '$timeout', functio
                 canvas.height = width * (img.height / img.width);
                 drawer.drawImage(img, 0, 0, canvas.width, canvas.height);
                 img.src = canvas.toDataURL("image/jpeg", quality);
+                console.log(img);
                 if (imgNum == 0) {
                     $("#imgpreview").append('<a data-toggle="modal" data-target="#viewModal" class="thumbnail images"><img onClick="angular.element(this).scope().imgView(event)" src="' + img.src + '"></a>');
                     angular.element(".images").addClass("one");