From 297b3c42b1d699439c64ea41e522d8b2205ae573 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 20 Mar 2015 18:02:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=9A=84=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=9A=E8=A2=AB=E5=85=A8=E5=B1=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=A6=86=E7=9B=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/table/table.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index 4033b6ae3..634e9b7fc 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -245,6 +245,10 @@ KindEditor.plugin('table', function(K) {
 						if (bgColor !== '') {
 							style += 'background-color:' + bgColor + ';';
 						}
+                        if (border !== ''){
+                            style += 'border:'+border+'px solid;';
+                        }
+
 						var html = '<table';
 						if (style !== '') {
 							html += ' style="' + style + '"';
@@ -271,7 +275,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:solid windowtext 1.0px;" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}