website 新增md编辑器

Examples/website/FreeSql.Site.UI/Areas/Admin/Controllers/DocumentController.cs

@@ -80,36 +80,34 @@ namespace FreeSql.Site.UI.Areas.Admin.Controllers
             });
         }
 
-        // GET: Documents/Create
-        public ActionResult DocContentCreate()
-        {
-
-            return View();
-        }
-
         // POST: Documents/Create
         [HttpPost]
-        [ValidateAntiForgeryToken]
-        public ActionResult DocContentCreate(IFormCollection collection)
+        //[ValidateAntiForgeryToken]
+        public ActionResult DocContentCreate([FromBody]DocumentContent model)
         {
-            try
+            var resdata = AutoException.Excute<long>((result) =>
             {
-                // TODO: Add insert logic here
-                return RedirectToAction(nameof(Index));
-            }
-            catch
-            {
-                return View();
-            }
+                result.Data = DocumentContentDAL.Insert(model);
+                if (result.Data == 0)
+                {
+                    throw new Exception("数据新增异常，JSON:" + Newtonsoft.Json.JsonConvert.SerializeObject(model));
+                }
+            }, false);
+            return Json(resdata);
         }
 
         [HttpPost]
         [ValidateAntiForgeryToken]
         public ActionResult DocContentDelete(int id, IFormCollection collection)
         {
-            bool flag = false;
-            flag = DocumentContentDAL.Delete(id);
-            return Json(flag);
+            var resdata = AutoException.Excute<long>((result) =>
+            {
+                if (!DocumentContentDAL.Delete(id))
+                {
+                    throw new Exception("数据删除异常，ID:" + id);
+                }
+            }, false);
+            return Json(resdata);
         }
 
         #endregion 

Examples/website/FreeSql.Site.UI/Areas/Admin/Shared/_Layout.cshtml

@@ -7,9 +7,24 @@
 
     <environment include="Development">
         <link href="~/layui/css/layui.css" rel="stylesheet" />
-        <link rel="stylesheet" href="https://cdn.bootcss.com/highlight.js/9.11.0/styles/github.min.css" />
+        <link href="~/lib/editormd/css/editormd.min.css" rel="stylesheet" />
+        <link href="~/lib/editormd/css/editormd.preview.min.css" rel="stylesheet" />
+
+        <link href="~/css/admin.css" rel="stylesheet" />
         <script src="~/lib/jquery/dist/jquery.js"></script>
-        <script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
+        <script src="~/js/common.js"></script>
+        @*<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>*@
+        <script src="~/lib/editormd/src/editormd.js"></script>
+
+        <!-- 页面markdown解析成HTML需要的js -->
+        <script src="~/lib/editormd/lib/marked.min.js"></script>
+        <script src="~/lib/editormd/lib/prettify.min.js"></script>
+        <script src="~/lib/editormd/lib/raphael.min.js"></script>
+        <script src="~/lib/editormd/lib/underscore.min.js"></script>
+        <script src="~/lib/editormd/lib/sequence-diagram.min.js"></script>
+        <script src="~/lib/editormd/lib/flowchart.min.js"></script>
+        <script src="~/lib/editormd/lib/jquery.flowchart.min.js"></script>
+
         <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
         <script src="https://cdn.bootcss.com/highlight.js/9.13.1/highlight.min.js"></script>
         <script src="~/layui/layui.js"></script>
@@ -48,7 +63,7 @@
         <partial name="_CookieConsentPartial" />
         @RenderBody()
 
-        <div class="layui-footer">
+        <div class="layui-footer footer">
             <!-- 底部固定区域 -->
             © FreeSql.com - 底部固定区域
         </div>

Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocContent.cshtml

@@ -3,88 +3,90 @@
     ViewBag.Title = ".NET文档园 .NET开源ORM - 首页";
 }
 @using FreeSql.Site.UI.Areas.BBS.Models;
-
+<script>
+    var dialog_Paramters = { height: 660, width: 1100 };
+</script>
 <table class="layui-hide" id="test" lay-filter="test"></table>
 
 <script type="text/html" id="docContentEdit">
-    <form class="layui-form" action="">
-        <div class="layui-form-item">
-            <label class="layui-form-label">输入框</label>
-            <div class="layui-input-block">
-                <input type="text" name="username" lay-verify="title" autocomplete="off" placeholder="请输入标题" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">密码框</label>
-            <div class="layui-input-block">
-                <input type="password" name="password" placeholder="请输入密码" autocomplete="off" class="layui-input">
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="layui-form-label">选择框</label>
-            <div class="layui-input-block">
-                <select name="interest" lay-filter="aihao">
-                    <option value=""></option>
-                    <option value="0">写作</option>
-                    <option value="1">阅读</option>
-                    <option value="2">游戏</option>
-                    <option value="3">音乐</option>
-                    <option value="4">旅行</option>
-                </select>
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="layui-form-label">复选框</label>
-            <div class="layui-input-block">
-                <input type="checkbox" name="like[write]" title="写作">
-                <input type="checkbox" name="like[read]" title="阅读">
-                <input type="checkbox" name="like[daze]" title="发呆">
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="layui-form-label">开关</label>
-            <div class="layui-input-block">
-                <input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
-            </div>
-        </div>
-
-        <div class="layui-form-item">
-            <label class="layui-form-label">单选框</label>
-            <div class="layui-input-block">
-                <input type="radio" name="sex" value="男" title="男" checked="">
-                <input type="radio" name="sex" value="女" title="女">
-            </div>
-        </div>
-        <div class="layui-form-item layui-form-text">
-            <label class="layui-form-label">文本域</label>
-            <div class="layui-input-block">
-                <textarea placeholder="请输入内容" class="layui-textarea" name="desc"></textarea>
-            </div>
-        </div>
-
-        @*<div class="layui-form-item">
+    <form class="layui-form" action="" id="frm_DocContentEdit">
+        <div class="form-module-content">
+            <div class="layui-form-item">
+                <label class="layui-form-label">文章分类</label>
                 <div class="layui-input-block">
-                    <button class="layui-btn" id="btnSubmit">立即提交</button>
+                    <select name="interest" lay-filter="aihao">
+                        <option value=""></option>
+                        <option value="0">使用</option>
+                        <option value="1">新增</option>
+                        <option value="2">修改</option>
+                        <option value="3">删除</option>
+                        <option value="4">查询</option>
+                        <option value="5">高级应用</option>
+                    </select>
                 </div>
-            </div>*@
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">文章标题</label>
+                <div class="layui-input-block">
+                    <input type="text" name="DocTitle" lay-verify="title" autocomplete="off" placeholder="请输入标题" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">摘要</label>
+                <div class="layui-input-block">
+                    <input type="text" name="DocAbstract" lay-verify="title" autocomplete="off" placeholder="请输入标题" class="layui-input">
+                </div>
+            </div>
+
+            @*<div class="layui-form-item">
+                    <label class="layui-form-label">文章分类</label>
+                    <div class="layui-input-block">
+                        <input type="checkbox" name="like[write]" title="写作">
+                        <input type="checkbox" name="like[read]" title="阅读">
+                        <input type="checkbox" name="like[daze]" title="发呆">
+                    </div>
+                </div>*@
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">状态</label>
+                <div class="layui-input-block">
+                    <input type="radio" name="status" value="1" title="启用" checked="">
+                    <input type="radio" name="status" value="0" title="关闭">
+                </div>
+            </div>
+            <div class="layui-form-item layui-form-text">
+                <label class="layui-form-label">文本域</label>
+                <div class="layui-input-block" id="md_DocContent">
+                    <textarea style="display:none;" placeholder="请输入内容" name="DocContent"></textarea>
+                </div>
+            </div>
+
+        </div>
+        <div class="form-module-footer">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
     </form>
 </script>
+
 <script type="text/html" id="toolbarDemo">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-sm" lay-event="getCheckData">获取选中行数据</button>
-        <button class="layui-btn layui-btn-sm" lay-event="getCheckLength">获取选中数目</button>
-        <button class="layui-btn layui-btn-sm" lay-event="isAll">验证是否全选</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="delete">删除</button>
+        <button class="layui-btn layui-btn-sm" lay-event="update">编辑</button>
+        <div style="float:right;border:0px solid red;">
+            <input type="text" name="search_txt" lay-verify="title" autocomplete="off" placeholder="标题" class="layui-input" style="height: 30px;width:160px;float:left;">
+            <a href="#" style="line-height:30px;margin-left:8px;">高级查询</a>
+        </div>
     </div>
 </script>
-
 <script type="text/html" id="barDemo">
     <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
 <script>
+    var testEditor;
     layui.use(['form', 'layedit', 'laydate', 'table'], function () {
         var table = layui.table;
         var form = layui.form
@@ -110,31 +112,40 @@
             , cols: [[
                 { type: 'checkbox', fixed: 'left' }
                 , { field: 'ID', title: 'ID', width: 80, fixed: 'left', unresize: true, sort: true }
-                , { field: 'DocTitle', title: '标题', width: 150, edit: 'text' }
+                , { field: 'DocTitle', title: '标题', edit: 'text' }
                 , { field: 'Status', title: '状态', width: 80, edit: 'text', sort: true }
                 , { field: 'WatchCount', title: '阅读量市', width: 100 }
-                , { field: 'StarCount', title: '获赞数' }
-                , { field: 'CreateDt', title: '创建时间', width: 80, sort: true }
-                , { field: 'UpdateDt', title: '修改时间', width: 120 }
+                , { field: 'StarCount', title: '获赞数', width: 100 }
+                , { field: 'CreateDt', title: '创建时间', width: 160, sort: true }
+                , { field: 'UpdateDt', title: '修改时间', width: 160 }
                 , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
             ]]
             , page: true
         });
 
-        //头工具栏事件
+        //监听事件
         table.on('toolbar(test)', function (obj) {
             var checkStatus = table.checkStatus(obj.config.id);
             switch (obj.event) {
-                case 'getCheckData':
-                    var data = checkStatus.data;
-                    layer.alert(JSON.stringify(data));
+                case 'add':
+                    dialogWindow.open({
+                        type: 1,
+                        maxmin: true,
+                        title: "编辑[文档]",
+                        area: ['1100px', '660px'],
+                        shadeClose: false, //点击遮罩关闭
+                        content: $("#docContentEdit").html(),
+                        submit: {
+                            url: "/Admin/Document/DocContentCreate",
+                            data: JSON.stringify(data.field),
+                        }
+                    }, form);
                     break;
-                case 'getCheckLength':
-                    var data = checkStatus.data;
-                    layer.msg('选中了：' + data.length + ' 个');
+                case 'delete':
+                    layer.msg('删除');
                     break;
-                case 'isAll':
-                    layer.msg(checkStatus.isAll ? '全选' : '未全选');
+                case 'update':
+                    layer.msg('编辑');
                     break;
             };
         });
@@ -142,6 +153,7 @@
         //监听行工具事件
         table.on('tool(test)', function (obj) {
             var data = obj.data;
+            debugger
             //console.log(obj)
             if (obj.event === 'del') {
                 layer.confirm('确定要删除吗？', function (index) {
@@ -162,21 +174,18 @@
                     });
                 });
             } else if (obj.event === 'edit') {
-                layer.open({
+                dialogWindow.open({
                     type: 1,
                     maxmin: true,
-                    title: "编辑",
-                    area: ['600px', '360px'],
-                    shadeClose: true, //点击遮罩关闭
+                    title: "编辑[文档]",
+                    area: ['1100px', '660px'],
+                    shadeClose: false, //点击遮罩关闭
                     content: $("#docContentEdit").html(),
-                    btn: ['保存', '修改状态', '取消'],
-                    yes: function () {
-                        alert('提交');
-                    },
-                    success: function (layero, index) {
-                        form.render();
+                    submit: {
+                        url: "/Admin/Document/DocContentCreate",
+                        data: JSON.stringify(data.field),
                     }
-                });
+                }, form);
                 //form.render();
                 //layer.prompt({
                 //    formType: 2
@@ -190,6 +199,49 @@
             }
         });
 
+        //先简单封装下
+        var dialogWindow = {
+            open: function (options, form) {
+                var base_options = {
+                    type: 1,
+                    maxmin: true,
+                    title: "编辑",
+                    area: ['1100px', '660px'],
+                    shadeClose: false //点击遮罩关闭
+                };
+                var new_options = $.extend(base_options, options);
+                new_options.success = function (layero, index) {
+                    form.render();
+                    $(".form-module-content").height(dialog_Paramters.height - 110);
+                    testEditor = editormd("md_DocContent", {
+                        width: "96%",
+                        height: 640,
+                        syncScrolling: "single",
+                        path: "../../lib/editormd/lib/"
+                    });
+                    //监听提交
+                    form.on('submit(formDemo)', function (data) {
+                        debugger
+                        $.ajax({
+                            type: 'POST',
+                            url: options.submit.url,//"/Admin/Document/DocContentCreate",
+                            data: JSON.stringify(data.field),
+                            contentType: "application/json; charset=utf-8",
+                            dataType: "json",
+                            success: function (e) {
+                                alert(JSON.stringify(e));
+                            }
+                        });
+                        return false;
+                    });
+                }
+                layer.open(new_options);
+            },
+            close: function () {
+
+            }
+        };
+
         $(document).on('click', '#btnSubmit', function () {
             layer.msg('响应点击事件');
         });

Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/DocType.cshtml

@@ -3,77 +3,125 @@
 
     //Layout = "~/Areas/Admin/Shared/_Layout.cshtml";
 }
-<form class="layui-form" action="">
-    <div class="layui-form-item">
-        <label class="layui-form-label">输入框</label>
-        <div class="layui-input-block">
-            <input type="text" name="title" required lay-verify="required" placeholder="请输入标题" autocomplete="off" class="layui-input">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">密码框</label>
-        <div class="layui-input-inline">
-            <input type="password" name="password" required lay-verify="required" placeholder="请输入密码" autocomplete="off" class="layui-input">
-        </div>
-        <div class="layui-form-mid layui-word-aux">辅助文字</div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">选择框</label>
-        <div class="layui-input-block">
-            <select name="city" lay-verify="required">
-                <option value=""></option>
-                <option value="0">北京</option>
-                <option value="1">上海</option>
-                <option value="2">广州</option>
-                <option value="3">深圳</option>
-                <option value="4">杭州</option>
-            </select>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">复选框</label>
-        <div class="layui-input-block">
-            <input type="checkbox" name="like[write]" title="写作">
-            <input type="checkbox" name="like[read]" title="阅读" checked>
-            <input type="checkbox" name="like[dai]" title="发呆">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">开关</label>
-        <div class="layui-input-block">
-            <input type="checkbox" name="switch" lay-skin="switch">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">单选框</label>
-        <div class="layui-input-block">
-            <input type="radio" name="sex" value="男" title="男">
-            <input type="radio" name="sex" value="女" title="女" checked>
-        </div>
-    </div>
-    <div class="layui-form-item layui-form-text">
-        <label class="layui-form-label">文本域</label>
-        <div class="layui-input-block">
-            <textarea name="desc" placeholder="请输入内容" class="layui-textarea"></textarea>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <div class="layui-input-block">
-            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
-            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-        </div>
-    </div>
-</form>
 
-<script>
-    //Demo
-    layui.use('form', function () {
-        var form = layui.form;
-        form.render();
-        //监听提交
-        form.on('submit(formDemo)', function (data) {
-            layer.msg(JSON.stringify(data.field));
-            return false;
+<div id="myeditor" style="display: none">
+    <!-- 富文本编辑器 -->
+    <div id="test-editormd"></div>
+</div>
+
+<div id="markdownToHTML" style="margin-left: 100px">
+    <textarea id="content" style="display:none;" placeholder="markdown语言"></textarea>
+</div>
+
+<div class="layui-btn-container" style="margin: 10px">
+    <button id="showEditor" class="layui-btn">显示编辑器</button>
+    <button id="getMarkdownContent" class="layui-btn">获取Markdown源码</button>
+    <button id="getHtmlContent" class="layui-btn">获取Html源码</button>
+    <button id="showHTML" class="layui-btn">Markdown解析成HTML</button>
+</div>
+
+
+<script type="text/javascript">
+    layui.use(['layer', 'jquery'], function () {
+        var layer = layui.layer
+            , $ = layui.jquery;
+
+        var testEditor;
+        $('#showEditor').on('click', function () {
+            // 弹出框
+            layer.open({
+                type: 1
+                , content: $('#myeditor')
+                , btn: '关闭全部'
+                , btnAlign: 'c' //按钮居中
+                , shade: 0 //不显示遮罩
+                , area: ['800px', '600px']
+                , yes: function () {
+                    layer.closeAll();
+                },
+                success: function () {
+                    testEditor = editormd("test-editormd", {
+                        width: "90%",
+                        height: 740,
+                        path: "../../lib/editormd/lib/",
+                        theme: "default",
+                        previewTheme: "default",
+                        editorTheme: "default",
+                        //markdown : md,             // 初始化编辑区的内容
+                        codeFold: true,
+                        //syncScrolling : false,
+                        saveHTMLToTextarea: true,    // 保存 HTML 到 Textarea
+                        searchReplace: true,
+                        //watch : false,                // 关闭实时预览
+                        htmlDecode: "style,script,iframe|on*",            // 开启 HTML 标签解析，为了安全性，默认不开启
+                        //toolbar  : false,             //关闭工具栏
+                        //previewCodeHighlight : false, // 关闭预览 HTML 的代码块高亮，默认开启
+                        emoji: true,
+                        taskList: true,
+                        tocm: true,         // Using [TOCM]
+                        tex: true,                   // 开启科学公式TeX语言支持，默认关闭
+                        flowChart: true,             // 开启流程图支持，默认关闭
+                        sequenceDiagram: true,       // 开启时序/序列图支持，默认关闭,
+                        //dialogLockScreen : false,   // 设置弹出层对话框不锁屏，全局通用，默认为true
+                        //dialogShowMask : false,     // 设置弹出层对话框显示透明遮罩层，全局通用，默认为true
+                        //dialogDraggable : false,    // 设置弹出层对话框不可拖动，全局通用，默认为true
+                        //dialogMaskOpacity : 0.4,    // 设置透明遮罩层的透明度，全局通用，默认值为0.1
+                        //dialogMaskBgColor : "#000", // 设置透明遮罩层的背景颜色，全局通用，默认为#fff
+                        imageUpload: true,
+                        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
+                        imageUploadURL: "./php/upload.php", // 文件上传路径，返回值为图片加载的路径
+                        onload: function () {
+                            // 加载后富文本编辑器成功后的回调
+                            console.log('onload', this);
+                            //this.fullscreen();
+                            //this.unwatch();
+                            //this.watch().fullscreen();
+
+                            //this.setMarkdown("#PHP");
+                            //this.width("100%");
+                            //this.height(480);
+                            //this.resize("100%", 640);
+
+                            // 异步请求md文件，用于编辑时的数据回显
+                            $.get('test.md', function (md) {
+                                testEditor.setMarkdown(md);
+                            });
+                        }
+                    });
+                }
+            });
+        });
+
+        // 获取markdown源码
+        $('#getMarkdownContent').on('click', function () {
+            var mdContent = $('.editormd-markdown-textarea').val();
+            console.log(mdContent);
+            var content = testEditor.getMarkdown();
+            console.log(content);
+        });
+        // 获取解析后的html
+        $('#getHtmlContent').on('click', function () {
+            var content = testEditor.getHTML();
+
+            console.log(content);
+        });
+
+        // 页面解析markdown为html进行显示
+        $('#showHTML').on('click', function () {
+            // 模拟从数据库中取内容
+            $.get('test.md', function (md) {
+                // 给textarea赋值
+                $('#content').val(md);
+                // 解析
+                editormd.markdownToHTML("markdownToHTML", {
+                    htmlDecode: "style,script,iframe",
+                    emoji: true,  // 解析表情
+                    taskList: true,  // 解析列表
+                    tex: true,  // 默认不解析
+                    flowChart: true,  // 默认不解析
+                    sequenceDiagram: true  // 默认不解析
+                });
+            });
         });
     });
 </script>

Examples/website/FreeSql.Site.UI/Areas/Admin/Views/Document/Index.cshtml

@@ -9,8 +9,8 @@
             <li class="layui-nav-item layui-nav-itemed">
                 <a class="" href="javascript:;">文档管理</a>
                 <dl class="layui-nav-child menu-item">
-                    <dd><a href="javascript:void(0);" datajson="{}" path="/Admin/Document/DocContent">文档分类</a></dd>
-                    <dd><a href="javascript:void(0);" datajson="{}" path="/Admin/Document/DocType">文档内容</a></dd>
+                    <dd><a href="javascript:void(0);" datajson="{}" path="/Admin/Document/DocContent">文档内容</a></dd>
+                    <dd><a href="javascript:void(0);" datajson="{}" path="/Admin/Document/DocType">文档分类</a></dd>
                     <dd><a href="/Doc/Documents/Index" target="_blank">查看文档</a></dd>
                 </dl>
             </li>
@@ -26,30 +26,14 @@
 </div>
 
 <script>
-    //Demo
-    
-    var showLoading = function (obj) {
-
-        var index = layer.msg(obj.msg, {
-            icon: 16,
-            shade: 0.1,
-            shadeClose: false,
-        });
-        return index;
-    };
-
-    var closeLoading = function (index) {
-        layer.close(index);
-    };
-
     $(".menu-item>dd>a").click(function () {
         var path_item = $(this).attr("path");
         var path_json = $(this).attr("datajson");
 
-        var index = showLoading({ msg: "数据加载中......" });
+        var index = freejs.showLoading({ msg: "数据加载中......" });
         $("#page_content").load(path_item, $.parseJSON(path_json), function () {
             //初始化绑定页面的时间，例如时间控件
-            closeLoading(index);
+            freejs.closeLoading(index);
             index = -1;
             layui.use('form', function () {
                 var form = layui.form;
@@ -59,7 +43,7 @@
 
         //如果出现长时间未关闭，定时关闭loading
         setTimeout(function () {
-            if (index >= 0) closeLoading(index);
+            if (index >= 0) freejs.closeLoading(index);
         }, 5000);
     });