From 3f8e6a5fb1ce408c7cf44a78a159bcee5b26158c Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Tue, 1 Mar 2022 17:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=87=E7=AB=A0=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8HTML=E6=A0=87=E7=AD=BE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=BD=AC=E4=B9=89=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=96=87=E7=AB=A0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Article.php    | 3 +++
 app/admin/controller/Goods.php      | 3 +++
 app/admin/view/article/add.html     | 6 +++++-
 app/admin/view/article/edit.html    | 6 +++++-
 app/admin/view/common/mdeditor.html | 2 +-
 app/admin/view/goods/add.html       | 4 +++-
 app/admin/view/goods/edit.html      | 6 ++++--
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php
index 16e05d9..83d5ded 100644
--- a/app/admin/controller/Article.php
+++ b/app/admin/controller/Article.php
@@ -148,6 +148,9 @@ class Article extends BaseController
     {
         $param = get_params();
         if (request()->isAjax()) {
+			if (isset($param['table-align'])) {
+				unset($param['table-align']);
+			}
 			if (isset($param['docContent-html-code'])) {
 				$param['content'] = $param['docContent-html-code'];
 				$param['md_content'] = $param['docContent-markdown-doc'];
diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php
index fda96bb..d41f373 100644
--- a/app/admin/controller/Goods.php
+++ b/app/admin/controller/Goods.php
@@ -148,6 +148,9 @@ class Goods extends BaseController
     {
         $param = get_params();
         if (request()->isAjax()) {
+			if (isset($param['table-align'])) {
+				unset($param['table-align']);
+			}
 			if (isset($param['docContent-html-code'])) {
 				$param['content'] = $param['docContent-html-code'];
 				$param['md_content'] = $param['docContent-markdown-doc'];
diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html
index c705610..92fb2ea 100644
--- a/app/admin/view/article/add.html
+++ b/app/admin/view/article/add.html
@@ -1,6 +1,10 @@
 {extend name="common/base"/}
 <!-- 主体 -->
 {block name="body"}
+<style type="text/css">
+.editormd-code-toolbar select{display:inline-block}
+.editormd li{list-style: inherit;}
+</style>
 <form class="layui-form body-table">
 	<div class="layui-form-bar" style="padding-bottom:0">
 		<h3 class="h3-title">创建文章</h3>
@@ -101,7 +105,7 @@
 		  <tr>
 			<td colspan="6">
 		<div>
-			<div id="mdContent" style="display:none;"></div>
+			<textarea id="mdContent" style="display:none;"></textarea>
 			<div id="docContent"></div>
 		</div>
 		{include file="common/mdeditor" id="docContent" markdown="mdContent" sub="100" toolbar="[]" /}
diff --git a/app/admin/view/article/edit.html b/app/admin/view/article/edit.html
index cf1affa..1105269 100644
--- a/app/admin/view/article/edit.html
+++ b/app/admin/view/article/edit.html
@@ -1,6 +1,10 @@
 {extend name="common/base"/}
 <!-- 主体 -->
 {block name="body"}
+<style type="text/css">
+.editormd-code-toolbar select{display:inline-block}
+.editormd li{list-style: inherit;}
+</style>
 <form class="layui-form body-table">
 	<div class="layui-form-bar" style="padding-bottom:0">
 		<h3 class="h3-title">编辑文章</h3>
@@ -117,7 +121,7 @@
 		  <tr>
 			<td colspan="6">
 			<div style="margin-top:-2px; margin-right:2px">
-				<div id="mdContent" style="display:none;">{$article.md_content}</div>
+				<textarea id="mdContent" style="display:none;">{$article.md_content|raw}</textarea>
 				<div id="docContent"></div>
 			</div>
 			{include file="common/mdeditor" id="docContent" markdown="mdContent" sub="100" toolbar="[]" /}
diff --git a/app/admin/view/common/mdeditor.html b/app/admin/view/common/mdeditor.html
index 90132a6..52cabc1 100644
--- a/app/admin/view/common/mdeditor.html
+++ b/app/admin/view/common/mdeditor.html
@@ -22,7 +22,7 @@
 			placeholder : "此处开始编写您要发布的内容...",//这里不设置则为默认的
 			path : '/static/mdeditor/lib/',
 			height           : window.innerHeight-editormdSub,
-			markdown         : document.getElementById(editormdMarkdown).innerHTML,
+			markdown         : document.getElementById(editormdMarkdown).value,
 			htmlDecode       : "style,script,iframe",
 			imageUpload: true,
 			imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
diff --git a/app/admin/view/goods/add.html b/app/admin/view/goods/add.html
index 9830009..839d2eb 100644
--- a/app/admin/view/goods/add.html
+++ b/app/admin/view/goods/add.html
@@ -17,6 +17,8 @@
 		top:1px;
 		right:1px;
 	}
+.editormd-code-toolbar select{display:inline-block}
+.editormd li{list-style: inherit;}
 </style>
 <form class="layui-form body-table">
 	<div class="layui-form-bar" style="padding-bottom:0">
@@ -145,7 +147,7 @@
 		  <tr>
 			<td colspan="6">
 		<div>
-			<div id="mdContent" style="display:none;"></div>
+			<textarea id="mdContent" style="display:none;"></textarea>
 			<div id="docContent"></div>
 		</div>
 		{include file="common/mdeditor" id="docContent" markdown="mdContent" sub="100" toolbar="[]" /}
diff --git a/app/admin/view/goods/edit.html b/app/admin/view/goods/edit.html
index 3264f56..743fcd3 100644
--- a/app/admin/view/goods/edit.html
+++ b/app/admin/view/goods/edit.html
@@ -17,6 +17,8 @@
 		top:1px;
 		right:1px;
 	}
+.editormd-code-toolbar select{display:inline-block}
+.editormd li{list-style: inherit;}
 </style>
 <form class="layui-form body-table">
 	<div class="layui-form-bar" style="padding-bottom:0">
@@ -161,8 +163,8 @@
 		  </tr>
 		  <tr>
 			<td colspan="6">
-		<div>
-				<div id="mdContent" style="display:none;">{$goods.md_content}</div>
+			<div>	
+				<textarea id="mdContent" style="display:none;">{$goods.md_content|raw}</textarea>
 				<div id="docContent"></div>
 			</div>
 			{include file="common/mdeditor" id="docContent" markdown="mdContent" sub="100" toolbar="[]" /}