-
-
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/OpenAuth.Mvc/js/droptree.js b/OpenAuth.Mvc/js/droptree.js
index bc20dc22..e1754d07 100644
--- a/OpenAuth.Mvc/js/droptree.js
+++ b/OpenAuth.Mvc/js/droptree.js
@@ -80,16 +80,17 @@ layui.define(['jquery', 'layer'], function (exports) {
Class.prototype.config = {
text: 'Name',
key: 'Id',
- parentKey: 'ParentId'
+ parentKey: 'ParentId',
+ selectedMulti: true //默认是多选
};
//加载数据
Class.prototype.render = function () {
var that = this;
var setting = {
- view: { selectedMulti: true },
+ view: { selectedMulti: that.config.selectedMulti },
check: {
- enable: true,
+ enable: that.config.selectedMulti,
chkStyle: "checkbox",
chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
},
@@ -145,11 +146,12 @@ layui.define(['jquery', 'layer'], function (exports) {
});
}
- exports('droptree', function (url, name, id) {
+ exports('droptree', function (url, name, id, selectedMulti) {
var options = {
nameDOM: name, //显示的文本框ID，如："#catetoryName"
idDOM: id, //隐藏的文本框，如："#categoryId"
- url: url
+ url: url,
+ selectedMulti: selectedMulti //是否为多选
}
inst = new Class(options);
return inst;
diff --git a/OpenAuth.Mvc/js/orgs.js b/OpenAuth.Mvc/js/orgs.js
new file mode 100644
index 00000000..6e2f7887
--- /dev/null
+++ b/OpenAuth.Mvc/js/orgs.js
@@ -0,0 +1,163 @@
+layui.config({
+ base: "/js/"
+}).use(['form','vue', 'ztree', 'layer', 'jquery', 'table','droptree','openauth'], function () {
+ var form = layui.form,
+ //layer = (parent == undefined || parent.layer === undefined )? layui.layer : parent.layer,
+ layer = layui.layer,
+ $ = layui.jquery;
+ var table = layui.table;
+ var openauth = layui.openauth;
+ layui.droptree("/UserSession/GetOrgs", "#ParentName", "#ParentId", false);
+
+ //主列表加载，可反复调用进行刷新
+ var config= {}; //table的参数，如搜索key，点击tree的id
+ var mainList = function (options) {
+ if (options != undefined) {
+ $.extend(config, options);
+ }
+ table.reload('mainList', {
+ url: '/OrgManager/LoadChildren',
+ where: config
+ });
+ }
+ //左边树状机构列表
+ var ztree = function () {
+ var url = '/UserSession/GetOrgs';
+ var zTreeObj;
+ var setting = {
+ view: { selectedMulti: false },
+ data: {
+ key: {
+ name: 'Name',
+ title: 'Name'
+ },
+ simpleData: {
+ enable: true,
+ idKey: 'Id',
+ pIdKey: 'ParentId',
+ rootPId: 'null'
+ }
+ },
+ callback: {
+ onClick: function (event, treeId, treeNode) {
+ mainList({ orgId: treeNode.Id });
+ }
+ }
+ };
+ var load = function () {
+ $.getJSON(url, function (json) {
+ zTreeObj = $.fn.zTree.init($("#tree"), setting, json);
+ mainList({ orgId: json[0].Id });
+ zTreeObj.expandAll(true);
+ });
+ };
+ load();
+ return {
+ reload: load
+ }
+ }();
+
+ //添加（编辑）对话框
+ var editDlg = function() {
+ var vm = new Vue({
+ el: "#formEdit"
+ });
+ var update = false; //是否为更新
+ var show = function (data) {
+ var title = update ? "编辑信息" : "添加";
+ layer.open({
+ title: title,
+ area: ["500px", "400px"],
+ type: 1,
+ content: $('#divEdit'),
+ success: function() {
+ vm.$set('$data', data);
+ },
+ end: mainList
+ });
+ var url = "/OrgManager/AddOrUpdate";
+ if (update) {
+ url = "/OrgManager/AddOrUpdate"; //暂时和添加一个地址
+ }
+ //提交数据
+ form.on('submit(formSubmit)',
+ function(data) {
+ $.post(url,
+ data.field,
+ function(data) {
+ layer.msg(data.Message);
+ },
+ "json");
+ return false;
+ });
+ }
+ return {
+ add: function() { //弹出添加
+ update = false;
+ show({
+ Id: ''
+ });
+ },
+ update: function(data) { //弹出编辑框
+ update = true;
+ show(data);
+ }
+ };
+ }();
+
+ //监听表格内部按钮
+ table.on('tool(list)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'detail') { //查看
+ layer.msg('ID：' + data.Id + ' 的查看操作');
+ }
+ });
+
+
+ //监听页面主按钮操作
+ var active = {
+ btnDel: function () { //批量删除
+ var checkStatus = table.checkStatus('mainList')
+ , data = checkStatus.data;
+ openauth.del("/OrgManager/Delete",
+ data.map(function (e) { return e.Id; }),
+ mainList);
+ }
+ , btnAdd: function () { //添加
+ editDlg.add();
+ }
+ , btnEdit: function () { //编辑
+ var checkStatus = table.checkStatus('mainList')
+ , data = checkStatus.data;
+ if (data.length != 1) {
+ layer.msg("请选择编辑的行，且同时只能编辑一行");
+ return;
+ }
+ editDlg.update(data[0]);
+ }
+
+ , search: function () { //搜索
+ mainList({ key: $('#key').val() });
+ }
+ , btnRefresh: function() {
+ mainList();
+ }
+ , btnAccessModule: function () {
+ var index = layer.open({
+ title: "为用户分配模块",
+ type: 2,
+ content: "newsAdd.html",
+ success: function(layero, index) {
+
+ }
+ });
+ }
+ };
+
+ $('.toolList .layui-btn').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+
+ //监听页面主按钮操作 end
+})
\ No newline at end of file
diff --git a/OpenAuth.Repository/OrgRepository.cs b/OpenAuth.Repository/OrgRepository.cs
index aff5bc19..37d1560b 100644
--- a/OpenAuth.Repository/OrgRepository.cs
+++ b/OpenAuth.Repository/OrgRepository.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using OpenAuth.Domain;
using OpenAuth.Domain.Interface;
@@ -44,7 +42,7 @@ namespace OpenAuth.Repository
public IEnumerable
GetSubOrgs(string orgId)
{
string cascadeId = "0.";
- if (orgId != string.Empty)
+ if (!string.IsNullOrEmpty(orgId))
{
var org = FindSingle(u => u.Id == orgId);
if (org == null)