修复富文本编辑器BUG

表格按钮增加disabled属性优化部分样式
belain · Sep 15, 2020 · bfc4912 · bfc4912
1 parent 9b18fd0
commit bfc4912
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 13 deletions.
diff --git a/dist/css/eadmin.min.css b/dist/css/eadmin.min.css
diff --git a/dist/index.html b/dist/index.html
@@ -39,7 +39,7 @@
         // 框架全局配置
         conf : {
             // 启动页
-            'homepage'           : './demo/pic.html',
+            'homepage'           : './html/editor.html',
             // 关闭input的autocomplete
             'close_autocomplete' : true,
             // 加载页面默认延迟时长，避免页面过快刷新

diff --git a/dist/js/lib/eadmin.editor.min.js b/dist/js/lib/eadmin.editor.min.js
diff --git a/dist/js/lib/eadmin.table.min.js b/dist/js/lib/eadmin.table.min.js
diff --git a/src/css/common/common.css b/src/css/common/common.css
@@ -464,6 +464,12 @@ header .mobile-menu {
 .block-box .block-data i {
   font-size: 20px;
 }
+.block-box .block-data-small {
+  padding: 10px 20px;
+}
+.block-box .block-data-small .data {
+  margin-top: 0;
+}
 .block-box .block-href {
   transition: background-color 0.2s linear;
   text-align: center;
@@ -496,7 +502,6 @@ header .mobile-menu {
 }
 .block-box .form-group {
   position: relative;
-  min-height: 64px;
 }
 .block-box .form-group > span {
   display: block;
@@ -696,7 +701,10 @@ h6 i {
   margin-top: 20px;
 }
 .mb0 {
-  margin-bottom: 0;
+  margin-bottom: 0 !important;
+}
+.mb10 {
+  margin-bottom: 10px;
 }
 .mb20 {
   margin-bottom: 20px;

diff --git a/src/css/lib/status.css b/src/css/lib/status.css
@@ -24,8 +24,8 @@
 }
 .status i {
   border-radius: 50px;
-  width: 10px;
-  height: 10px;
+  width: 8px;
+  height: 8px;
   position: absolute;
   top: 6px;
   left: 0;

diff --git a/src/js/lib/eadmin.editor.js b/src/js/lib/eadmin.editor.js
@@ -19,7 +19,7 @@ class Editor{
             attr('id', this.dom.replace('#', '')).
             data('store', this.storeKey).
             addClass('editor').
-            after(`<input type="hidden" name="${this.domCache.data('name')}" value="${_default}">`);
+            after(`<input type="hidden" name="${this.domCache.data('name')}">`);
 		// 默认参数
 		let _param   = {
             // 编辑器名称，后端取值保存数据库使用
@@ -128,6 +128,10 @@ class Editor{
             placeholder : this.param.placeholder,
             readonly : this.param.readonly
         });
+        this.domCache.
+            next().
+            next("input[type='hidden']").
+            val(this.quill.root.innerHTML);
         let file = this.domCache.next("input[type='file']");
         this.quill.
             getModule('toolbar').

diff --git a/src/js/lib/eadmin.table.js b/src/js/lib/eadmin.table.js
@@ -1002,8 +1002,10 @@ class Table{
 								{
 									url = b.open.url;
 								}
+								let disabled = b.disabled === true ? ' disabled' : '';
 								_html += `<button 
 											id="${id}" 
+											${disabled}
 											data-row="${row_key}" 
 											data-key="${btn_key}" 
 											data-window-url="${url}" 

diff --git a/src/less/common/common.less b/src/less/common/common.less
@@ -550,6 +550,14 @@ header
             font-size: 20px;
         }
     }
+    .block-data-small
+    {
+        padding: 10px 20px;
+        .data
+        {
+            margin-top: 0;
+        }
+    }
     .block-href
     {
         .animate(background-color);
@@ -590,7 +598,6 @@ header
     .form-group
     {
         position: relative;
-        min-height: 64px;
         >span
         {
             display: block;
@@ -832,7 +839,11 @@ h6
 }
 .mb0
 {
-    margin-bottom: 0;
+    margin-bottom: 0 !important;
+}
+.mb10
+{
+    margin-bottom: 10px;
 }
 .mb20
 {

diff --git a/src/less/lib/status.less b/src/less/lib/status.less
@@ -14,8 +14,8 @@
     i
     {
         .border-radius(50px);
-        width: 10px;
-        height: 10px;
+        width: 8px;
+        height: 8px;
         position: absolute;
         top: 6px;
         left: 0;