全面修改Id为Guid类型,为2.0版做准备

This commit is contained in:
yubaolee
2016-09-02 18:05:17 +08:00
parent a8fd59e247
commit 574f5f9e1f
327 changed files with 10071 additions and 18206 deletions

View File

@@ -53,7 +53,7 @@ $(document).ready(function () {
//待选的树
var ztree = function () {
var moduleIds;
var moduleIds = new Array();
var zTreeObj;
var setting = {
view: {
@@ -84,10 +84,8 @@ var ztree = function () {
function zTreeCheck(e, treeId, treeNode) {
var nodes = zTreeObj.getCheckedNodes(true);
if (nodes.length == 0) {
moduleIds = null;
} else {
moduleIds = '[' + nodes.map(function (e) { return e.Id; }).join(",") + ']';
if (nodes.length != 0) {
moduleIds = nodes.map(function(e) { return e.Id; });
}
}
function zTreeOnClick(event, treeId, treeNode) {
@@ -110,7 +108,7 @@ var ztree = function () {
//已分配的机构
var selected = function () {
var moduleIds;
var moduleIds = new Array();
var zTreeObj;
var setting = {
view: {
@@ -141,10 +139,8 @@ var selected = function () {
function zTreeCheck(e, treeId, treeNode) {
var nodes = zTreeObj.getCheckedNodes(true);
if (nodes.length == 0) {
moduleIds = null;
} else {
moduleIds = '[' + nodes.map(function (e) { return e.Id; }).join(",") + ']';
if (nodes.length != 0) {
moduleIds = nodes.map(function (e) { return e.Id; });
}
}
function zTreeOnClick(event, treeId, treeNode) {

View File

@@ -49,7 +49,7 @@ $(document).ready(function () {
//grid列表模块
function DialogList() {
var selectedId = 0; //选中的ID
var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID
var url = '/ModuleElementManager/LoadWithAccess?tId=';
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,

View File

@@ -53,7 +53,7 @@ $(document).ready(function () {
//待选的树
var ztree = function () {
var moduleIds;
var moduleIds = new Array();
var zTreeObj;
var setting = {
view: {
@@ -84,10 +84,8 @@ var ztree = function () {
function zTreeCheck(e, treeId, treeNode) {
var nodes = zTreeObj.getCheckedNodes(true);
if (nodes.length == 0) {
moduleIds = null;
} else {
moduleIds = '[' + nodes.map(function (e) { return e.Id; }).join(",") + ']';
if (nodes.length != 0) {
moduleIds = nodes.map(function (e) { return e.Id; });
}
}
function zTreeOnClick(event, treeId, treeNode) {
@@ -110,7 +108,7 @@ var ztree = function () {
//已分配的机构
var selected = function () {
var moduleIds;
var moduleIds = new Array();
var zTreeObj;
var setting = {
view: {
@@ -141,10 +139,8 @@ var selected = function () {
function zTreeCheck(e, treeId, treeNode) {
var nodes = zTreeObj.getCheckedNodes(true);
if (nodes.length == 0) {
moduleIds = null;
} else {
moduleIds = '[' + nodes.map(function (e) { return e.Id; }).join(",") + ']';
if (nodes.length != 0) {
moduleIds = nodes.map(function (e) { return e.Id; });
}
}
function zTreeOnClick(event, treeId, treeNode) {

View File

@@ -52,7 +52,7 @@ $(document).ready(function () {
//grid列表模块
function DialogList() {
var selectedId = 0; //选中的ID
var selectedId = '00000000-0000-0000-0000-000000000000'; //选中的ID
var url = '/ResourceManager/LoadWithAccess?cId=';
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,

View File

@@ -14,7 +14,7 @@
//grid列表模块
function MainGrid() {
var url = '/CategoryManager/Load?parentId=';
var selectedId = 0; //ztree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -193,7 +193,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
$("#SortNo").val(0);
parentTree.show();
},

View File

@@ -0,0 +1,190 @@
//左边分类导航树
var ztree = function () {
var url = '/OrgManager/LoadOrg';
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) {
list.reload(treeNode.Id);
}
}
};
var load = function () {
$.getJSON(url, function (json) {
var zTreeObj = $.fn.zTree.init($("#tree"), setting, json);
var firstId; //tree的第一个ID
if (json.length > 0) {
firstId = json[0].Id;
} else {
firstId = -1;
}
list.reload(firstId);
zTreeObj.expandAll(true);
});
};
load();
return {
reload: load
}
}();
//grid列表模块
function MainGrid() {
var url = '/GoodsApplies/Load?parentId=';
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
target: $(this),
columns: [
{
name: 'Id',
label: '数据ID',
width: 100
, hide: true
},
{
name: 'Name',
label: '产品名称',
width: 100
},
{
name: 'Number',
label: '产品数量',
width: 100
},
{
name: 'Price',
label: '产品单价',
width: 100
},
{
name: 'Status',
label: '出库/入库',
width: 100
, align: 'center',
items: [{ '0': '出库' }, { '1': '入库' }],
},
{
name: 'User',
label: '可见范围(测试资源使用)',
width: 100,
items: [{ '': '全部可见' }, { 'ADMIN': '管理员可见' },{'DEV':'开发可见'}],
},
{
name: 'Time',
label: '操作时间',
width: 100
},
{
name: 'OrgId',
label: '组织ID',
width: 100
},
],
dataUrl: url + selectedId,
fullGrid: true,
showLinenumber: true,
showCheckboxcol: true,
paging: true,
filterMult: false,
showTfoot: false,
});
this.reload = function (id) {
if (id != undefined) selectedId = id;
this.maingrid.datagrid('reload', { dataUrl: url + selectedId });
};
};
MainGrid.prototype = new Grid();
var list = new MainGrid();
//添加(编辑)对话框
var editDlg = function () {
var update = false;
var show = function () {
BJUI.dialog({ id: 'editDlg', title: '编辑对话框', target: '#editDlg' });
$("#btnSave").on("click", function () {
editDlg.save();
});
}
return {
add: function () { //弹出添加
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val('00000000-0000-0000-0000-000000000000');
},
update: function (ret) { //弹出编辑框
update = true;
show();
$('#Id').val(ret.Id);
$('#Name').val(ret.Name);
$('#Number').val(ret.Number);
},
save: function () { //编辑-->保存
$('#editForm').isValid(function (v) {
if (!v) return; //验证没通过
$("#editForm").bjuiajax('ajaxForm', {
reload: false,
callback: function (json) {
if (json.statusCode != "200") {
$(this).alertmsg('warn', json.message);
return;
}
list.reload();
ztree.reload();
}
});
});
}
};
}();
//删除
function del() {
var selected = list.getSelectedObj();
if (selected == null) return;
$.getJSON('/GoodsApplies/Delete?Id=' + selected.Id, function (data) {
if (data.statusCode == "200") {
list.reload();
ztree.reload();
}
else {
$(this).alertmsg('warn', data.message);
}
});
}
//自定义的编辑按钮
function edit() {
var selected = list.getSelectedObj();
if (selected == null) {
return;
}
editDlg.update(selected);
}
function add() {
editDlg.add();
}
function refresh() {
list.reload();
}
//@@ sourceURL=StockManager.js

View File

@@ -36,9 +36,9 @@ Grid.prototype.getSelectedMany = function () {
//返回选择多行的属性JSON默认选择id属性如果选择其他属性可重写
Grid.prototype.getSelectedProperties = function (propName) {
var selected = this.selectObjs();
if (selected == null) return null;
var ids = selected.map(function (elem) { return elem[propName]; }).join(",");
ids = '[' + ids + ']'; //拼成一个JSON
return ids;
var result = new Array();
if (selected != null) {
result = selected.map(function (elem) { return elem[propName] ; });
}
return result;
};

View File

@@ -56,12 +56,16 @@ var thisDlg = function () {
filterThead: false,
target: $(this),
columns: [
{
name: 'Id',
label: '流水号',
width: 100
, hide: true
},
{
name: 'Id',
label: '流水号',
hide: true
},
{
name: 'ModuleId',
label: '功能模块Id',
hide: true
},
{
name: 'DomId',
label: 'DOM ID',
@@ -77,11 +81,7 @@ var thisDlg = function () {
label: '类型',
width: 100
},
{
name: 'ModuleId',
label: '功能模块Id',
width: 100
},
{
name: 'Attr',
label: '元素附加属性',
@@ -120,7 +120,7 @@ var thisDlg = function () {
paging: false,
filterMult: false,
showTfoot: false,
});
var getSelectDatas = function () {
@@ -162,10 +162,9 @@ var editEleDlg = function () {
update = false;
show();
$("#editElementForm")[0].reset(); //reset方法只能通过dom调用
$.CurrentDialog.find("#Id").val(0);
$.CurrentDialog.find("#Id").val('00000000-0000-0000-0000-000000000000');
$.CurrentDialog.find("#Sort").val('0');
$.CurrentDialog.find("#ModuleId").val(moduleId);
},
update: function (ret) { //弹出编辑框
update = true;
@@ -175,7 +174,6 @@ var editEleDlg = function () {
$.CurrentDialog.find('#Name').val(ret.Name);
$.CurrentDialog.find('#Type').selectpicker('val', ret.Type);
$.CurrentDialog.find('#ModuleId').val(ret.ModuleId);
$.CurrentDialog.find('#Attr').val(ret.Attr);
$.CurrentDialog.find('#Script').val(ret.Script);
$.CurrentDialog.find('#Icon').selectpicker('val', ret.Icon);
$.CurrentDialog.find('#Class').selectpicker('val', ret.Class);

View File

@@ -15,7 +15,7 @@
//grid列表模块
function MainGrid() {
var url = '/ModuleManager/Load?orgId=';
var selectedId = 0; //ztree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -215,7 +215,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show()
},

View File

@@ -44,7 +44,7 @@ var ztree = function () {
//grid列表模块
function MainGrid() {
var url = '/OrgManager/LoadChildren?Id=';
var selectedId = 0; //ztree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -196,7 +196,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show()
},

View File

@@ -2,7 +2,7 @@
//grid列表模块
function MainGrid() {
var url = '/ResourceManager/Load?categoryId=';
var selectedId = 0; //ztree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -179,7 +179,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show();
},

View File

@@ -44,7 +44,7 @@ var orgtree = function () {
//grid列表模块
function MainGrid() {
var url = '/RoleManager/Load?orgId=';
var selectedId = 0; //orgtree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //orgtree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -178,7 +178,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show();
},

View File

@@ -43,7 +43,7 @@ var ztree = function () {
//grid列表模块
function MainGrid() {
var url = '/StockManager/Load?parentId=';
var selectedId = 0; //ztree选中的模块
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -52,8 +52,12 @@ function MainGrid() {
{
name: 'Id',
label: '数据ID',
width: 100
, hide: true
hide: true
},
{
name: 'OrgId',
label: '组织ID',
hide:true
},
{
name: 'Name',
@@ -78,7 +82,7 @@ function MainGrid() {
items: [{ '0': '出库' }, { '1': '入库' }],
},
{
name: 'User',
name: 'Viewable',
label: '可见范围(测试资源使用)',
width: 100,
items: [{ '': '全部可见' }, { 'ADMIN': '管理员可见' },{'DEV':'开发可见'}],
@@ -87,12 +91,7 @@ function MainGrid() {
name: 'Time',
label: '操作时间',
width: 100
},
{
name: 'OrgId',
label: '组织ID',
width: 100
},
}
],
dataUrl: url + selectedId,
fullGrid: true,
@@ -192,7 +191,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show();
},
update: function (ret) { //弹出编辑框
@@ -203,7 +202,7 @@ var editDlg = function () {
$('#Number').val(ret.Number);
$('#Price').val(ret.Price);
$('#Status').selectpicker('val', ret.Status);
$('#User').selectpicker('val', ret.User);
$('#Viewable').selectpicker('val', ret.Viewable);
$('#Time').val(ret.Time);
$('#OrgId').val(ret.OrgId);
parentTree.show();

View File

@@ -40,7 +40,7 @@ $(document).ready(function () {
//grid列表模块
function UserRolesList() {
var selectedId = 0; //选中的ID
var selectedId = '00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $.CurrentDialog.find('#maingrid').datagrid({
showToolbar: false,
filterThead: false,

View File

@@ -44,7 +44,7 @@ var maintree = function () {
//grid列表模块
function MainGrid() {
var url = '/UserManager/Load?orgId=';
var selectedId = 0; //ztree选中的模块
var selectedId ='00000000-0000-0000-0000-000000000000'; //ztree选中的模块
this.maingrid = $('#maingrid').datagrid({
showToolbar: false,
filterThead: false,
@@ -188,7 +188,7 @@ var editDlg = function () {
update = false;
show();
$.CurrentDialog.find("form")[0].reset(); //reset方法只能通过dom调用
$("#Id").val(0);
$("#Id").val('00000000-0000-0000-0000-000000000000');
parentTree.show();
},