* finish task #10.

c510585c · Catouse · c54a2456 · c510585c · c510585c · c510585c
5 changed file
--- a/assets/kindeditor/kindeditor-all.js
+++ b/assets/kindeditor/kindeditor-all.js
@@ -6539,7 +6539,6 @@ KindEditor.lang({
        'SimHei': '黑体',
        'Source Han Sans': '思源黑体',
        'Source Han Serif': '思源宋体',
-        'Microsoft YaHei': '微软雅黑',
        'Arial': 'Arial',
        'Arial Black': 'Arial Black',
        'Times New Roman': 'Times New Roman',
@@ -9990,10 +9989,10 @@ KindEditor.plugin('table', function (K) {
            $table.toggleClass('table-striped', !!setting.stripedRows);
            onUpdateSetting && onUpdateSetting('stripedRows', setting.stripedRows);
        }
-        if (setting.hoverRows !== undefined) {
-            $table.toggleClass('table-hover', !!setting.hoverRows);
-            onUpdateSetting && onUpdateSetting('hoverRows', setting.hoverRows);
-        }
+        // if (setting.hoverRows !== undefined) {
+        //     $table.toggleClass('table-hover', !!setting.hoverRows);
+        //     onUpdateSetting && onUpdateSetting('hoverRows', setting.hoverRows);
+        // }
        if (setting.autoWidth !== undefined) {
            $table.toggleClass('table-auto', !!setting.autoWidth);
            onUpdateSetting && onUpdateSetting('autoWidth', setting.autoWidth);
@@ -10049,7 +10048,7 @@ KindEditor.plugin('table', function (K) {
                '<label>{tableStyle}</label>',
                '<div class="checkbox" style="margin: 0 0 5px"><label><input type="checkbox" name="header"> {addHeaderRow}</label></div>',
                '<div class="checkbox" style="margin: 0 0 5px"><label><input type="checkbox" name="stripedRows"> {stripedRows}</label></div>',
-                '<div class="checkbox" style="margin: 0 0 5px"><label><input type="checkbox" name="hoverRows"> {hoverRows}</label></div>',
+                // '<div class="checkbox" style="margin: 0 0 5px"><label><input type="checkbox" name="hoverRows"> {hoverRows}</label></div>',
            '</div>',
            '<div class="form-group">',
                '<label>{autoChangeTableWidth}</label>',

--- a/docs/examples/kindeditor.html
+++ b/docs/examples/kindeditor.html
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="description" content="ZUI，一个简单灵活的前端框架。">
+<meta name="author" content="Zentao">
+<title>ZUI - KindEditor 例子</title>
+<link href="../../dist/css/zui.css" rel="stylesheet">
+</head>
+
+<body style="padding: 20px">
+<div class="has-padding" id="contextmenuExample">
+<textarea id="content" name="content" class="form-control kindeditor" style="height:500px;">Hello, world!</textarea>
+</div>
+
+<script src="../../assets/jquery.js"></script>
+<script src="../../dist/js/zui.js"></script>
+<link href="../../dist/lib/kindeditor/kindeditor.css" rel="stylesheet">
+<script src="../../dist/lib/kindeditor/kindeditor.js"></script>
+<script>
+$(function() {
+    var K = window.KindEditor;
+    if(K) {
+        K.create('textarea.kindeditor', {
+            basePath: '../../dist/lib/kindeditor/',
+            allowFileManager : true,
+            bodyClass : 'article-content',
+            cssPath: '../../dist/css/zui.css',
+        });
+
+        K.create('textarea.kindeditorSimple', {
+            basePath: '../../dist/lib/kindeditor/',
+            bodyClass : 'article-content',
+            cssPath: '../../dist/css/zui.css',
+            resizeType : 1,
+            allowPreviewEmoticons : false,
+            allowImageUpload : false,
+            items : [
+                'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'italic', 'underline',
+                'removeformat', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist',
+                'insertunorderedlist', '|', 'emoticons', 'image', 'link'
+            ]
+        });
+    }
+});
+</script>
+</body>
+</html>
--- a/docs/part/javascript-htmleditor.md
+++ b/docs/part/javascript-htmleditor.md
@@ -90,7 +90,8 @@ KindEditor.create('textarea.kindeditor', {
 ```js
 KindEditor.create('textarea.kindeditorSimple', {
    basePath: '/dist/lib/kindeditor/',
-    bodyClass : 'article-content',
+    bodyClass : 'article-content',     // 确保编辑器内的内容也应用 ZUI 排版样式
+    cssPath: '/dist/css/zui.css', // 确保编辑器内的内容也应用 ZUI 排版样式
    resizeType : 1,
    allowPreviewEmoticons : false,
    allowImageUpload : false,
@@ -113,12 +114,14 @@ function afterPageLoad() {
            K.create('textarea.kindeditor', {
                basePath: 'dist/lib/kindeditor/',
                allowFileManager : true,
-                bodyClass : 'article-content'
+                bodyClass : 'article-content',
+                cssPath: '/dist/css/zui.css'
            });

            K.create('textarea.kindeditorSimple', {
                basePath: '/dist/lib/kindeditor/',
                bodyClass : 'article-content',
+                cssPath: '/dist/css/zui.css',
                resizeType : 1,
                allowPreviewEmoticons : false,
                allowImageUpload : false,

--- a/src/js/kindeditor/kindeditor.js
+++ b/src/js/kindeditor/kindeditor.js
--- a/zui.json
+++ b/zui.json
@@ -1029,7 +1029,7 @@
      "name": "Kindeditor",
      "src": {
        "less": ["~/modules/kindeditor.less"],
-        "js": ["assets/kindeditor/kindeditor-all.js"],
+        "js": ["~/kindeditor/kindeditor.js"],
        "resource": ["assets/kindeditor//themes/**/*", "assets/kindeditor//lang/**/*", "assets/kindeditor//plugins.zip", "assets/kindeditor//README.md"]
      },
      "ver": "1.0.0",