From 31844791209dfccfc466b53133d56598165778a6 Mon Sep 17 00:00:00 2001
From: yubao <yubaolee@163.com>
Date: Sun, 3 Sep 2017 00:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Mvc/js/droptree.js |  2 +-
 OpenAuth.Mvc/js/openauth.js |  4 +++
 OpenAuth.Mvc/js/users.js    | 65 +++++++++++++++++--------------------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/OpenAuth.Mvc/js/droptree.js b/OpenAuth.Mvc/js/droptree.js
index faf24ffc..66458ebd 100644
--- a/OpenAuth.Mvc/js/droptree.js
+++ b/OpenAuth.Mvc/js/droptree.js
@@ -129,7 +129,7 @@ layui.define(['jquery', 'layer'], function (exports) {
 
     function onBodyDown(event) {
         if (!(event.target.id == "menuContent" || $(event.target).parents("#menuContent").length > 0)) {
-            hideMenu();
+            inst.hideMenu();
         }
     }
 
diff --git a/OpenAuth.Mvc/js/openauth.js b/OpenAuth.Mvc/js/openauth.js
index abcffeab..607301be 100644
--- a/OpenAuth.Mvc/js/openauth.js
+++ b/OpenAuth.Mvc/js/openauth.js
@@ -30,6 +30,10 @@ layui.define(['jquery', 'layer'], function (exports) {
 
         //删除
         , del: function (url, dataids, callback) {
+            if (dataids == undefined || dataids == "" || dataids.length == 0) {
+                layer.msg("至少选择一条记录");
+                return;
+            }
             layer.confirm('真的删除么', function (index) {
                 $.post(url, { ids: dataids },
                     function (data) {
diff --git a/OpenAuth.Mvc/js/users.js b/OpenAuth.Mvc/js/users.js
index e9e4a3b3..9be3e493 100644
--- a/OpenAuth.Mvc/js/users.js
+++ b/OpenAuth.Mvc/js/users.js
@@ -4,14 +4,25 @@ layui.config({
     var form = layui.form,
 		layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
 		$ = layui.jquery;
-    var dataurl = '/UserManager/Load';
     var table = layui.table;
     var openauth = layui.openauth;
     var droptree = layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
    
+    //主列表加载，可反复调用进行刷新
+    var config= {};  //table的参数，如搜索key，点击tree的id
+    var mainList = function (options) {
+        if (options != undefined) {
+            $.extend(config, options);
+        }
+        table.reload('mainList', {
+            url: '/UserManager/Load',
+            where: config
+        });
+    }
     //左边树状机构列表
     var ztree = function () {
         var url = '/UserSession/GetOrgs';
+        var zTreeObj;
         var setting = {
             view: { selectedMulti: false },
             data: {
@@ -28,30 +39,18 @@ layui.config({
             },
             callback: {
                 onClick: function (event, treeId, treeNode) {
-                    table.reload('mainList', {
-                        where: {
-                            url:dataurl,
-                            orgId: treeNode.Id
-                        }
-                    });
+                    mainList({ orgId: treeNode.Id });
                 }
             }
         };
         var load = function () {
             $.getJSON(url, function (json) {
-                var zTreeObj = $.fn.zTree.init($("#tree"), setting, json);
-                table.reload('mainList', {
-                    url: dataurl,
-                    where: {
-                        orgId: json[0].Id
-                    } //设定异步数据接口的额外参数
-                    //,height: 300
-                });
+                zTreeObj = $.fn.zTree.init($("#tree"), setting, json);
+                mainList({ orgId: json[0].Id });
                 zTreeObj.expandAll(true);
             });
         };
         load();
-
         return {
             reload: load
         }
@@ -69,39 +68,35 @@ layui.config({
     //监听表格内部按钮
     table.on('tool(list)', function (obj) {
         var data = obj.data;
-        if (obj.event === 'detail') {
+        if (obj.event === 'detail') {      //查看
             layer.msg('ID：' + data.Id + ' 的查看操作');
 
         } else if (obj.event === 'del') {  //删除
             openauth.del("/UserManager/Delete", data.Id, obj.del);
-        } else if (obj.event === 'edit') {
+        } else if (obj.event === 'edit') {  //编辑
             layer.alert('编辑行：<br>' + JSON.stringify(data));
         }
     });
 
     //监听页面主按钮操作
     var active = {
-        del: function () { //批量删除
+        del: function () {      //批量删除
             var checkStatus = table.checkStatus('mainList')
                 , data = checkStatus.data;
-            layer.alert(JSON.stringify(data));
-        }, addData: function () {  //添加
-            var index = layui.layer.open({
-                title: "添加",
-                area: ["500px", "400px"],
-                type: "1",
-                content: $('#formEdit')
-            });
-        }, search: function () {  //搜索
-            var key = $('#key');
-
-            table.reload('mainList', {
-                where: {
-                    url: dataurl,
-                    key: key.val()
-                }
+            openauth.del("/UserManager/Delete", data.map(function (e) { return e.Id; }), mainList);
+        }
+        , addData: function () {  //添加
+            var index = layer.open({
+                title: "添加"
+                ,area: ["500px", "400px"]
+                ,type: "1"
+                ,content: $('#formEdit')
+                ,end:mainList
             });
         }
+        , search: function () {   //搜索
+            mainList({ key: $('#key').val() });
+        }      
     };
 
     $('.toolList .layui-btn').on('click', function () {