edit

assets/lib/kindeditor/kindeditor-all-min.js

@@ -260,7 +260,7 @@ K.options = {
 	minWidth : 650,
 	minHeight : 100,
 	minChangeSize : 50,
-	zIndex : 99991015,
+	zIndex : 19850426,
 	items : [
 		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
 		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',

assets/lib/layui/upload.js

@@ -6,6 +6,7 @@ var showUploadUrl;
 var showUploadType = 1;
 var showUploadCall = false;
 var showUploadThis = false;
+var showUploadIndex = false;
 var xhrOnProgress=function(fun) {
 	xhrOnProgress.onprogress = fun; //绑定监听
  //使用闭包实现监听绑
@@ -46,7 +47,7 @@ function showUpload(i,e,key,url,assets)
 			$.getJSON(url, {json:1,key:key,cur:cur}, function(t)
 			{
 				config.content = t.data;
-				layer.open(config);
+				showUploadIndex = layer.open(config);
 			})
 		})
 	});
@@ -73,7 +74,7 @@ function editorShowUpload(cur, url, title, func, self)
 		$.getJSON(url, {json:1,cur:cur}, function(t)
 		{
 			config.content = t.data;
-			layer.open(config);
+			showUploadIndex = layer.open(config);
 		})
 	});
 }
@@ -91,7 +92,12 @@ function showUploadFilesSet(e, name, url, id)
 		loadUploadSet(showUploadE, value, {name:name,url:url});
 	} else if (showUploadType == 2) {
 		showUploadCall.call(showUploadThis, url, name, id);
-		layer.closeAll();
+		if (showUploadIndex) {
+			layer.close(showUploadIndex);
+			showUploadIndex = false;
+		} else {
+			layer.closeAll();
+		}
 	}
 }
 

assets/lib/manage/main.js

@@ -1710,7 +1710,7 @@ function updateMsg(id)
 	$("#"+id).submit();
 }
 
-function showAlert(msg, func, title)
+function showAlert(msg, func, title, index)
 {
 	if (!title) {
 		title = $("#dever-name").html() + '提醒您';
@@ -1724,14 +1724,22 @@ function showAlert(msg, func, title)
 	var config = {
 	  type: 0,
 	  title: title,
-	  shade: 0,
+	  shade: 0.1,
 	  shadeClose : true,
 	  content: msg
 	};
 
+	config.scrollbar = false;
+
 	if (type == 1) {
-		//config.type = 1;
+		if (index) {
+			config.zIndex = index;
+			config.type = 1;
+			config.btn = ['确定'];
+		}
 		config.area = '800px';
+		//config.type = 1;
+		
 	}
 
 	if (func) {
@@ -1743,7 +1751,7 @@ function showAlert(msg, func, title)
 	var index = layer.open(config);
 }
 
-function fastEdit(e, url, title, col)
+function fastEdit(e, url, title, col, index)
 {
 	var func = function()
 	{
@@ -1759,7 +1767,13 @@ function fastEdit(e, url, title, col)
 		var valid = $(t).find('#valid').prop("outerHTML");
 		html = html + valid;
 		html = html.replace('left: 740px', 'left:583px;')
-		showAlert(html, func, title);
+		if (index == 1) {
+			showAlert(html, func, title, 19850422);
+		} else {
+			showAlert(html, func, title);
+		}
+		
+		$('#layui-layer-content').css('overflow-x', 'hidden');
 		$('#update_button').hide();
 		layui.use(['formSelects'], function(){
 			$("select").each(function()