【权限】权限点功能整改，树形表格整改

code-doc/src/main/resources/template/js/sysdevelopdoc/sysdevelopdoclist.js

@@ -6,25 +6,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1553740371701');
-	
-	treeGrid.render({
+
+	tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: reqBasePath + 'sysdevelopdoc001',
-        cellMinWidth: 100,
         where: {typeName: $("#typeName").val()},
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'title',//以树形式显示的字段
         cols: [[
             {field:'title', width:200, title: '目录'},
             {field:'contentNum', width:80, title: '文档数'},
@@ -35,10 +30,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    },
-        isPage:false
-    });
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+    }, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'title',
+	});
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'del') { //删除
@@ -164,7 +162,7 @@ layui.config({
     });
 	
 	function loadTable(){
-    	treeGrid.query("messageTable", {where:{typeName: $("#typeName").val()}});
+		tableTree.reload("messageTable", {where:{typeName: $("#typeName").val()}});
     }
     
     exports('sysdevelopdoclist', {});

common/src/main/resources/template/js/sysEveModelType/sysEveModelTypeList.js

@@ -6,24 +6,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1637420150374');
 
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-		idField: 'id',
 	    url: reqBasePath + 'sysevemodeltype001',
 	    where: getTableParams(),
-		treeId: 'id',//树形id字段名称
-		treeUpId: 'parentId',//树形父id字段名称
-		treeShowName: 'typeName',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 			{ field: 'typeName', title: '名称',  width: 360 },
@@ -33,13 +29,16 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 130, toolbar: '#tableBar'}
 	    ]],
-		isPage: false,
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'parentId',
+		title: 'typeName',
 	});
 
-	treeGrid.on('tool(messageTable)', function (obj) {
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if(layEvent === 'delet'){ // 删除
@@ -101,7 +100,7 @@ layui.config({
 	});
     
     function loadTable(){
-		treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
     
     function getTableParams(){

dsform/src/main/resources/template/js/dsFormPageType/dsFormPageTypeList.js

@@ -6,24 +6,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1636280749353');
 
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-		idField: 'id',
 	    url: flowableBasePath + 'dsformpagetype001',
 	    where: getTableParams(),
-		treeId: 'id',//树形id字段名称
-		treeUpId: 'parentId',//树形父id字段名称
-		treeShowName: 'typeName',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 			{ field: 'typeName', title: '中文名称', width: 180 },
@@ -35,13 +31,16 @@ layui.config({
 			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 130, toolbar: '#tableBar'}
 	    ]],
-		isPage: false,
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'parentId',
+		title: 'typeName',
 	});
 
-	treeGrid.on('tool(messageTable)', function (obj) {
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if(layEvent === 'delet'){ // 删除
@@ -103,7 +102,7 @@ layui.config({
 	});
     
     function loadTable(){
-		treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
     
     function getTableParams(){

erp/src/main/resources/template/js/materialCategory/materialCategoryList.js

@@ -6,24 +6,19 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1568558491168');
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    idField: 'id',
 	    url: flowableBasePath + 'materialcategory001',
-	    cellMinWidth: 100,
 	    where: getTableParams(),
-	    treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 	        { field: 'name', title: '名称', align: 'left', width: 360 },
@@ -31,13 +26,16 @@ layui.config({
 	        { field: 'remark', title: '备注', align: 'left', width: 200 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 250, toolbar: '#tableBar'}
 	    ]],
-	    isPage:false,
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'name',
 	});
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'edit') { //编辑
@@ -109,7 +107,7 @@ layui.config({
 	form.render();
 	form.on('submit(formSearch)', function (data) {
 		if (winui.verifyForm(data.elem)) {
-			refreshloadTable();
+			loadTable();
 		}
 		return false;
 	});
@@ -120,13 +118,9 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
     
-    function refreshloadTable(){
-    	treeGrid.query("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
     function getTableParams(){
     	return {
     		name: $("#name").val()

knowlg/src/main/resources/template/js/knowledgetype/knowledgetypelist.js

@@ -5,24 +5,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1568476869775');
-	treeGrid.render({
+
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    idField: 'id',
 	    url: reqBasePath + 'knowledgetype001',
-	    cellMinWidth: 100,
 	    where: getTableParams(),
-	    treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 	        { field: 'name', title: '名称',  width: 360 },
@@ -45,9 +41,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'name',
 	});
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'edit') { //编辑
@@ -138,12 +138,12 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
 
     function getTableParams(){
     	return {
-			name:$("#name").val()
+			name: $("#name").val()
 		};
 	}
     

message/src/main/resources/template/js/sysnoticetype/sysnoticetypelist.js

@@ -5,25 +5,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1561106812907');
 	// 公告类型列表
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    idField: 'id',
 	    url: reqBasePath + 'noticetype001',
-	    cellMinWidth: 100,
 	    where: {name:$("#name").val(),parentId:$("#firstType").val()},
-	    treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 	        { field: 'name', title: '类型名称', align: 'center', width: 120 },
@@ -49,16 +44,19 @@ layui.config({
 	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 180 },
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar'}
 	    ]],
-	    isPage:false,
 	    done: function(){
 	    	matchingLanguage();
 	    	if(!loadFirstType){
 	    		initFirstType();
 	    	}
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'name',
 	});
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+
+	tableTree.on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'edit') { //编辑
@@ -98,8 +96,7 @@ layui.config({
 	});
 	
 	form.render();
-	
-	
+
 	$("body").on("click", "#formSearch", function() {
 		loadTable();
 	});
@@ -190,7 +187,7 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where:{name:$("#name").val(),parentId:$("#firstType").val()}});
+		tableTree.reload("messageTable", {where:{name:$("#name").val(),parentId:$("#firstType").val()}});
     }
     
     exports('sysnoticetypelist', {});

organization/src/main/resources/template/js/companyjob/companyjoblist.js

@@ -6,11 +6,11 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	var selTemplate = getFileContent('tpl/template/select-option.tpl')
 	
 	authBtn('1552962689111');
@@ -47,16 +47,12 @@ layui.config({
 	}
 	
 	function initLoadTable(){
-		treeGrid.render({
+		tableTree.render({
 		    id: 'messageTable',
 		    elem: '#messageTable',
 		    method: 'post',
-		    idField: 'id',
 		    url: reqBasePath + 'companyjob001',
 		    where: getTableParams(),
-		    treeId: 'id',//树形id字段名称
-        	treeUpId: 'pId',//树形父id字段名称
-        	treeShowName: 'jobName',//以树形式显示的字段
 		    cols: [[
 		        { field: 'jobName', title: '职位名称', width: 180 },
 		        { field: 'id', title: '职位简介', width: 80, align: 'center', templet: function (d) {
@@ -68,14 +64,17 @@ layui.config({
 		        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], width: 150 },
 		        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 		    ]],
-		    isPage:false,
 		    done: function(){
 		    	matchingLanguage();
 		    }
+		}, {
+			keyId: 'id',
+			keyPid: 'pId',
+			title: 'jobName',
 		});
 	}
 
-	treeGrid.on('tool(messageTable)', function (obj) {
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
 		var data = obj.data;
 		var layEvent = obj.event;
 		if (layEvent === 'del') { //删除
@@ -99,7 +98,7 @@ layui.config({
 	form.render();
 	form.on('submit(formSearch)', function (data) {
         if (winui.verifyForm(data.elem)) {
-        	refreshTable();
+			loadTable();
         }
         return false;
 	});
@@ -160,13 +159,9 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
     
-    function refreshTable(){
-    	treeGrid.query("messageTable", {page: {curr: 1}, where: getTableParams()});
-    }
-
     function getTableParams(){
     	return {
     		companyId: $("#companyId").val(),

organization/src/main/resources/template/js/companymation/companymationlist.js

@@ -6,25 +6,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1552959308337');
 	// 公司列表
-	treeGrid.render({
+	tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: reqBasePath + 'companymation001',
-        cellMinWidth: 100,
         where:{companyName: $("#companyName").val()},
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'companyName',//以树形式显示的字段
         cols: [[
             { field: 'companyName', width: 300, title: '公司名称'},
             { field: 'companyDesc', width: 80, title: '公司简介', align: 'center', templet: function (d) {
@@ -55,9 +50,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
-    });
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+    }, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'companyName',
+	});
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'del') { //删除
@@ -128,7 +127,7 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where:{companyName: $("#companyName").val()}});
+		tableTree.reload("messageTable", {where:{companyName: $("#companyName").val()}});
     }
     
     exports('companymationlist', {});

pro/src/main/resources/template/js/protask/protasklist.js

@@ -9,32 +9,24 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'form', 'laydate', 'treeGrid'], function (exports) {
+}).define(['window', 'jquery', 'winui', 'form', 'laydate', 'tableTreeDj'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 
 	authBtn('1574644930825');
 	
-	//任务开始时间
-	laydate.render({
-		elem: '#startTime', //指定元素
-		range: '~'
-	});
+	// 任务开始时间
+	laydate.render({elem: '#startTime', range: '~'});
 
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    idField: 'id',
 	    url: flowableBasePath + 'protask011',
-	    cellMinWidth: 100,
 	    where: getTableParams(),
-	    treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'taskName',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: 2},
 	        { field: 'taskName', title: '名称', rowspan: 2, width: 200, templet: function (d) {
@@ -80,9 +72,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'taskName',
 	});
 
-	treeGrid.on('tool(messageTable)', function (obj) {
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'details'){ //详情
@@ -263,7 +259,7 @@ layui.config({
 	form.render();
 	form.on('submit(formSearch)', function (data) {
 		if (winui.verifyForm(data.elem)) {
-			treeGrid.query("messageTable", {page: {curr: 1}, where: getTableParams()});
+			loadTable();
 		}
 		return false;
 	});
@@ -274,12 +270,12 @@ layui.config({
     });
 
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
 
     function getTableParams(){
 		var theStartTime = "", theEndTime = "";
-		if(!isNull($("#startTime").val())){
+		if (!isNull($("#startTime").val())) {
 			theStartTime = $("#startTime").val().split('~')[0].trim() + ' 00:00:00';
 			theEndTime = $("#startTime").val().split('~')[1].trim() + ' 23:59:59';
 		}

pro/src/main/resources/template/js/protaskall/protasklist.js

@@ -6,30 +6,22 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'form', 'laydate', 'treeGrid'], function (exports) {
+}).define(['window', 'jquery', 'winui', 'form', 'laydate', 'tableTreeDj'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
 		laydate = layui.laydate,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 
-	//任务开始时间
-	laydate.render({
-		elem: '#startTime', //指定元素
-		range: '~'
-	});
+	// 任务开始时间
+	laydate.render({elem: '#startTime', range: '~'});
 
-	treeGrid.render({
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    idField: 'id',
 	    url: flowableBasePath + 'protask001',
-	    cellMinWidth: 100,
 	    where: getTableParams(),
-	    treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'taskName',//以树形式显示的字段
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: 2},
 	        { field: 'taskName', title: '名称', rowspan: 2, width: 200, templet: function (d) {
@@ -75,9 +67,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'taskName',
 	});
 
-	treeGrid.on('tool(messageTable)', function (obj) {
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'details'){ //详情
@@ -104,7 +100,7 @@ layui.config({
 	form.render();
 	form.on('submit(formSearch)', function (data) {
 		if (winui.verifyForm(data.elem)) {
-			treeGrid.query("messageTable", {page: {curr: 1}, where: getTableParams()});
+			loadTable();
 		}
 		return false;
 	});
@@ -115,12 +111,12 @@ layui.config({
     });
 
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
 
     function getTableParams(){
 		var theStartTime = "", theEndTime = "";
-		if(!isNull($("#startTime").val())){
+		if (!isNull($("#startTime").val())) {
 			theStartTime = $("#startTime").val().split('~')[0].trim() + ' 00:00:00';
 			theEndTime = $("#startTime").val().split('~')[1].trim() + ' 23:59:59';
 		}

report/src/main/resources/template/js/reportModelType/reportModelTypeList.js

@@ -6,25 +6,20 @@ layui.config({
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window',
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
-        treeGrid = layui.treeGrid;
+        tableTree = layui.tableTreeDj;
 
     authBtn('1635086167509');
 
-    treeGrid.render({
+    tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: reportBasePath + 'reportmodeltype001',
-        cellMinWidth: 100,
         where: getTableParams(),
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'parentId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
         cols: [[
             { field: 'name', width: 300, title: '名称'},
             { field: 'createName', title: '创建人', align: 'left', width: 100 },
@@ -35,11 +30,14 @@ layui.config({
         ]],
         done: function(){
             matchingLanguage();
-        },
-        isPage:false
+        }
+    }, {
+        keyId: 'id',
+        keyPid: 'parentId',
+        title: 'name',
     });
 
-    treeGrid.on('tool(messageTable)', function (obj) {
+    tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'del') { //删除
@@ -101,7 +99,7 @@ layui.config({
     });
 
     function loadTable(){
-        treeGrid.query("messageTable", {where: getTableParams()});
+        tableTree.reload("messageTable", {where: getTableParams()});
     }
 
     function getTableParams(){

school/src/main/resources/template/js/schoolgrademation/schoolgrademationlist.js

@@ -6,11 +6,11 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1586314893391');
 
@@ -22,17 +22,12 @@ layui.config({
 	});
 
 	function initTable(){
-		treeGrid.render({
+		tableTree.render({
 	        id: 'messageTable',
 	        elem: '#messageTable',
 	        method: 'post',
-	        idField: 'id',
 	        url: schoolBasePath + 'grademation001',
-	        cellMinWidth: 100,
 	        where: getTableParams(),
-	        treeId: 'id',//树形id字段名称
-	        treeUpId: 'pId',//树形父id字段名称
-	        treeShowName: 'gradeName',//以树形式显示的字段
 	        cols: [[
 	            { field: 'gradeName', width: 150, title: '年级名称'},
 	            { field: 'schoolName', width: 200, title: '所属学校'},
@@ -40,13 +35,16 @@ layui.config({
 		        { field:'typeName', width: 120, title: '年级状态'},
 	            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	        ]],
-	        isPage:false,
 		    done: function(){
 		    	matchingLanguage();
 		    }
-	    });
-		
-		treeGrid.on('tool(messageTable)', function (obj) {
+	    }, {
+			keyId: 'id',
+			keyPid: 'pId',
+			title: 'gradeName',
+		});
+
+		tableTree.getTable().on('tool(messageTable)', function (obj) {
 	        var data = obj.data;
 	        var layEvent = obj.event;
 	        if (layEvent === 'del') { //删除
@@ -130,7 +128,7 @@ layui.config({
 	}
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
 
 	function getTableParams() {

school/src/main/resources/template/js/schoolmation/schoolmationlist.js

@@ -6,27 +6,20 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1585824465120');
-	
-	
-	treeGrid.render({
+
+	tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: schoolBasePath + 'schoolmation001',
-        cellMinWidth: 100,
-        where:{schoolName: $("#schoolName").val()},
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'schoolName',//以树形式显示的字段
+        where: {schoolName: $("#schoolName").val()},
         cols: [[
             { field: 'schoolName', width: 300, title: '学校名称'},
             { field: 'schoolDesc', width: 80, title: '学校简介', align: 'center', templet: function (d) {
@@ -37,13 +30,16 @@ layui.config({
 	        { field:'powerName', width: 120, align: 'center', title: '数据权限'},
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
         ]],
-        isPage:false,
 	    done: function(){
 	    	matchingLanguage();
 	    }
-    });
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+    }, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'schoolName',
+	});
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'del') { //删除
@@ -64,7 +60,6 @@ layui.config({
 	
 	form.render();
 	form.on('submit(formSearch)', function (data) {
-    	
         if (winui.verifyForm(data.elem)) {
         	loadTable();
         }
@@ -115,7 +110,7 @@ layui.config({
     });
     
     function loadTable(){
-    	treeGrid.query("messageTable", {where:{schoolName: $("#schoolName").val()}});
+		tableTree.reload("messageTable", {where:{schoolName: $("#schoolName").val()}});
     }
     
     exports('schoolmationlist', {});

userauth/src/main/resources/template/js/sysevemenuauthpoint/sysevemenuauthpointadd.js → userauth/src/main/resources/template/js/sysEveMenuAuthPoint/sysEveMenuAuthPointAdd.js

@@ -19,7 +19,7 @@ layui.config({
         			authMenu: $("#authMenu").val(),
         			menuId: parent.menuId
 	        	};
-	        	AjaxPostUtil.request({url: reqBasePath + "sysevemenuauthpoint002", params: params, type: 'json', callback: function (json) {
+	        	AjaxPostUtil.request({url: reqBasePath + "writeSysEveMenuAuthPointMation", params: params, type: 'json', callback: function (json) {
 					parent.layer.close(index);
 					parent.refreshCode = '0';
 	 	   		}});

userauth/src/main/resources/template/js/sysevemenuauthpoint/sysevemenuauthpointedit.js → userauth/src/main/resources/template/js/sysEveMenuAuthPoint/sysEveMenuAuthPointEdit.js

@@ -20,10 +20,12 @@ layui.config({
 					var params = {
 						authMenuName: $("#authMenuName").val(),
 						authMenu: $("#authMenu").val(),
-						rowId: parent.rowId,
-						menuId: parent.menuId
+						menuId: parent.menuId,
+						parentId: json.bean.parentId,
+						type: json.bean.type,
+						id: parent.rowId
 					};
-					AjaxPostUtil.request({url: reqBasePath + "sysevemenuauthpoint004", params: params, type: 'json', callback: function (json) {
+					AjaxPostUtil.request({url: reqBasePath + "writeSysEveMenuAuthPointMation", params: params, type: 'json', callback: function (json) {
 						parent.layer.close(index);
 						parent.refreshCode = '0';
 					}});
@@ -32,11 +34,9 @@ layui.config({
 			});
    		}});
 
-	    
-	    //取消
+	    // 取消
 	    $("body").on("click", "#cancle", function() {
 	    	parent.layer.close(index);
 	    });
 	});
-	    
 });
\ No newline at end of file

userauth/src/main/resources/template/js/sysevemenuauthpoint/sysevemenuauthpointlist.js → userauth/src/main/resources/template/js/sysEveMenuAuthPoint/sysEveMenuAuthPointList.js

@@ -7,27 +7,22 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
-		table = layui.table;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1552958039634');
 	
 	menuId = parent.menuId;
-	
-	table.render({
+
+	tableTree.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
 	    url: reqBasePath + 'sysevemenuauthpoint001',
 	    where: getTableParams(),
-	    even: true,
-	    page: true,
-	    limits: getLimits(),
-    	limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers'},
 	        { field: 'authMenuName', title: '权限点名称', width: 120 },
@@ -39,9 +34,13 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
+	}, {
+		keyId: 'id',
+		keyPid: 'parentId',
+		title: 'authMenuName',
 	});
-	
-	table.on('tool(messageTable)', function (obj) {
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'del') { //删除
@@ -51,15 +50,7 @@ layui.config({
         }
     });
 	
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-        	refreshTable();
-        }
-        return false;
-	});
-	
-	//删除
+	// 删除
 	function del(data, obj){
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
@@ -70,13 +61,13 @@ layui.config({
 		});
 	}
 	
-	//编辑权限点
+	// 编辑权限点
 	function edit(data){
 		rowId = data.id;
 		_openNewWindows({
-			url: "../../tpl/sysevemenuauthpoint/sysevemenuauthpointedit.html", 
+			url: "../../tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointEdit.html",
 			title: "编辑权限点",
-			pageId: "sysevemenuauthpointedit",
+			pageId: "sysEveMenuAuthPointEdit",
 			area: ['500px', '300px'],
 			callBack: function(refreshCode){
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -84,32 +75,36 @@ layui.config({
 			}});
 	}
 	
-	//刷新数据
-    $("body").on("click", "#reloadTable", function() {
-    	loadTable();
-    });
-    
-    //新增权限点
+    // 新增权限点
     $("body").on("click", "#addBean", function() {
     	_openNewWindows({
-			url: "../../tpl/sysevemenuauthpoint/sysevemenuauthpointadd.html", 
+			url: "../../tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointAdd.html",
 			title: "新增权限点",
-			pageId: "sysevemenuauthpointadd",
+			pageId: "sysEveMenuAuthPointAdd",
 			area: ['500px', '300px'],
 			callBack: function(refreshCode){
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
 				loadTable();
 			}});
     });
-    
+
+	form.render();
+	form.on('submit(formSearch)', function (data) {
+		if (winui.verifyForm(data.elem)) {
+			loadTable();
+		}
+		return false;
+	});
+
+	// 刷新数据
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+
     function loadTable(){
-    	table.reload("messageTable", {where: getTableParams()});
-    }
-    
-    function refreshTable(){
-    	table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
+		tableTree.reload("messageTable", {where: getTableParams()});
     }
-    
+
     function getTableParams(){
     	return {
     		authMenuName: $("#authMenuName").val(),
@@ -119,5 +114,5 @@ layui.config({
 		};
 	}
     
-    exports('sysevemenuauthpointlist', {});
+    exports('sysEveMenuAuthPointList', {});
 });

userauth/src/main/resources/template/js/sysevemenu/sysevemenulist.js

@@ -127,17 +127,8 @@ layui.config({
 				details(data);
 			}
 	    });
-		
 	}
 	
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-        	table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
-        }
-        return false;
-	});
-	
 	/********* tree 处理   start *************/
 	var trees = {};
 	var treeDoms = $("ul.fsTree");
@@ -264,29 +255,37 @@ layui.config({
     function authpoint(data){
 		menuId = data.id;
 		_openNewWindows({
-			url: "../../tpl/sysevemenuauthpoint/sysevemenuauthpointlist.html", 
+			url: "../../tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointList.html",
 			title: systemLanguage["com.skyeye.authorityPointPage"][languageType],
-			pageId: "sysevemenuauthpoint",
+			pageId: "sysEveMenuAuthPointList",
 			area: ['90vw', '90vh'],
 			callBack: function(refreshCode){
 				loadTable();
 			}});
 	}
+
+	form.render();
+	form.on('submit(formSearch)', function (data) {
+		if (winui.verifyForm(data.elem)) {
+			table.reload("messageTable", {page: {curr: 1}, where: getTableParams()});
+		}
+		return false;
+	});
     
     function loadTable(){
     	table.reload("messageTable", {where: getTableParams()});
     }
     
     function getTableParams(){
-    	return {
-    		menuName:$("#menuName").val(),
-    		menuUrl:$("#menuUrl").val(),
-    		parentId:parentId,
-    		menuLevel:$("#menuLevel").val(),
-    		desktopId:$("#desktop").val(),
-    		isShare:$("#isShare").val(),
-    		parentMenuName:$("#parentMenuName").val()
-    	};
+		return {
+			menuName: $("#menuName").val(),
+			menuUrl: $("#menuUrl").val(),
+			parentId: parentId,
+			menuLevel: $("#menuLevel").val(),
+			desktopId: $("#desktop").val(),
+			isShare: $("#isShare").val(),
+			parentMenuName: $("#parentMenuName").val()
+		};
     }
     
     exports('sysevemenulist', {});

userauth/src/main/resources/template/js/syswintype/syswintypelist.js

@@ -6,11 +6,11 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+		tableTree = layui.tableTreeDj;
 	
 	authBtn('1552962225700');
 	
@@ -21,18 +21,13 @@ layui.config({
         }
         return false;
 	});
-	
-	treeGrid.render({
+
+	tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: reqBasePath + 'sysevewintype001',
-        cellMinWidth: 100,
         where: {typeName: $("#typeName").val(), state: $("#state").val()},
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
         cols: [[
             { field:'name', width:300, title: '分类名称'},
             { field:'stateName', width:100, title: '状态'},
@@ -40,13 +35,16 @@ layui.config({
             { field:'orderBy', width:100, title: '排序'},
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
         ]],
-        isPage:false,
 	    done: function(){
 	    	matchingLanguage();
 	    }
-    });
-	
-	treeGrid.on('tool(messageTable)', function (obj) {
+    }, {
+		keyId: 'id',
+		keyPid: 'pId',
+		title: 'name',
+	});
+
+	tableTree.getTable().on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'edit') { //编辑
@@ -148,7 +146,7 @@ layui.config({
     });
 	
 	function loadTable(){
-    	treeGrid.query("messageTable", {where:{typeName: $("#typeName").val(), state: $("#state").val()}});
+		tableTree.reload("messageTable", {where:{typeName: $("#typeName").val(), state: $("#state").val()}});
     }
     
     exports('syswintypelist', {});

userauth/src/main/resources/template/js/tarea/tarea.js

@@ -4,12 +4,11 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'treeGrid', 'jquery', 'winui', 'form'], function (exports) {
+}).define(['window', 'tableTreeDj', 'jquery', 'winui', 'form'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
-		treeGrid = layui.treeGrid;
+        tableTree = layui.tableTreeDj;
 	
 	form.render();
 	form.on('submit(formSearch)', function (data) {
@@ -18,18 +17,13 @@ layui.config({
         }
         return false;
 	});
-	
-	treeGrid.render({
+
+    tableTree.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        idField: 'id',
         url: reqBasePath + 'systarea001',
-        cellMinWidth: 100,
         where: {addressName: $("#addressName").val()},
-        treeId: 'id',//树形id字段名称
-        treeUpId: 'pId',//树形父id字段名称
-        treeShowName: 'name',//以树形式显示的字段
         cols: [[
             {field:'name', width:300, title: '区域名称'},
             {field:'id', width:100, title: 'id'},
@@ -39,15 +33,19 @@ layui.config({
 	    done: function(){
 	    	matchingLanguage();
 	    }
+    }, {
+        keyId: 'id',
+        keyPid: 'pId',
+        title: 'name',
     });
 	
-	//刷新数据
+	// 刷新数据
     $("body").on("click", "#reloadTable", function() {
     	loadTable();
     });
 	
 	function loadTable(){
-    	treeGrid.query("messageTable", {where:{addressName: $("#addressName").val()}});
+        tableTree.reload("messageTable", {where:{addressName: $("#addressName").val()}});
     }
     
     exports('tarea', {});

userauth/src/main/resources/template/tpl/sysevemenuauthpoint/sysevemenuauthpointadd.html → userauth/src/main/resources/template/tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointAdd.html

@@ -32,7 +32,7 @@
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
    	<script type="text/javascript">
-        layui.config({base: '../../js/sysevemenuauthpoint/'}).use('sysevemenuauthpointadd');
+        layui.config({base: '../../js/sysEveMenuAuthPoint/'}).use('sysEveMenuAuthPointAdd');
     </script>
 </body>
 </html>
\ No newline at end of file

userauth/src/main/resources/template/tpl/sysevemenuauthpoint/sysevemenuauthpointedit.html → userauth/src/main/resources/template/tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointEdit.html

@@ -32,7 +32,7 @@
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
    	<script type="text/javascript">
-        layui.config({base: '../../js/sysevemenuauthpoint/'}).use('sysevemenuauthpointedit');
+        layui.config({base: '../../js/sysEveMenuAuthPoint/'}).use('sysEveMenuAuthPointEdit');
     </script>
 </body>
 </html>
\ No newline at end of file

userauth/src/main/resources/template/tpl/sysevemenuauthpoint/sysevemenuauthpointlist.html → userauth/src/main/resources/template/tpl/sysEveMenuAuthPoint/sysEveMenuAuthPointList.html

@@ -38,7 +38,7 @@
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
-			{{# if(auth('1552957965516')){ }}
+			{{# if(auth('1552958039634')){ }}
             	<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
 			{{# } }}
 			{{# if(d.useNum == 0 && auth('1552958005402')){ }}
@@ -49,7 +49,7 @@
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">
-        layui.config({base: '../../js/sysevemenuauthpoint/'}).use('sysevemenuauthpointlist');
+        layui.config({base: '../../js/sysEveMenuAuthPoint/'}).use('sysEveMenuAuthPointList');
     </script>
 </body>
 </html>
\ No newline at end of file

web/src/main/resources/template/assets/lib/layui/layui.js

@@ -273,7 +273,7 @@ function isNull(str){
 			zclip: 'jquery.zclip',//复制插件
 			swiper: 'swiper/swiper.min',//滚动插件
 			tableSelect: 'tableSelect',//tableSelect 下拉表格选择器
-			treeGrid: 'treetable/treeGrid',//树表格
+			tableTreeDj: 'treetable/tableTreeDj',//树表格
 			g6: 'flowchart/g6.min',//流程图
 			g6Plugins: 'flowchart/g6-plugins.min',//流程图
 			dtree: 'dtree/dtree',//