优化部分细节问题

belain · Jun 9, 2021 · acbd3fc · acbd3fc
1 parent f1dfa14
commit acbd3fc
Show file tree

Hide file tree

Showing 36 changed files with 215 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,12 @@
 
 #### 更新日志
 
+v2.1.1
+
+更新日期：2020-06-09
+
+1、优化部分细节问题
+
 v2.1.0
 
 更新日期：2020-05-28

diff --git a/dist/css/eadmin.min.css b/dist/css/eadmin.min.css
diff --git a/dist/css/eadmin_light.min.css b/dist/css/eadmin_light.min.css
diff --git a/dist/index.html b/dist/index.html
@@ -6,9 +6,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="renderer" content="webkit">
     <meta name="msapplication-tap-highlight" content="no"> 
-    <title>EAdmin - 开箱即用的后台中台</title>
+    <title>EAdmin - 开箱即用的后台中台UI框架</title>
     <link href="./css/eadmin.min.css" rel="stylesheet">
-    <link href="https://highlightjs.org/static/demo/styles/monokai-sublime.css" rel="stylesheet">
     <link rel="shortcut icon" href=./img/favicon.ico>
 </head>
 
@@ -24,7 +23,7 @@
             <div class="col-4 nav"></div>
             <!-- 个人信息容器 -->
             <div class="col-4">
-                <i class="ri-qq-line"></i>
+                <a href="https://jq.qq.com/?_wv=1027&k=mRjroync" data-native target="_blank"><i class="ri-qq-line"></i></a>
                 <i class="ri-wechat-2-line"></i>
                 <a href="https://github.com/suruibuas/eadmin" data-native target="_blank">
                     <i class="ri-github-line"></i>
@@ -43,7 +42,7 @@
 </body>
 <script src="./js/core/al.load.min.js" init="./js/core/al.init.min.js"></script>
 <script>
-    var module = {
+    let module = {
         // 框架全局配置
         conf : {
             // 启动页
@@ -123,7 +122,7 @@
             'city.js',
             // 模版数据过滤器
             'template-filter.js',
-            // mock数据
+            // 不需要mock数据可删除
             'mock.js'
         ],
         // 默认加载的类库，如果用不到可以在此删除
@@ -146,7 +145,7 @@
             'dropzone',
             // 不需要富文本编辑器可删除
             'quill',
-            // mock
+            // 不需要mock数据可删除
             'mock'
         ],
         // 全部加载完成回调

diff --git a/dist/index_light.html b/dist/index_light.html
@@ -6,9 +6,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="renderer" content="webkit">
     <meta name="msapplication-tap-highlight" content="no"> 
-    <title>EAdmin - 开箱即用的后台中台</title>
+    <title>EAdmin - 开箱即用的后台中台UI框架</title>
     <link href="./css/eadmin_light.min.css" rel="stylesheet">
-    <link href="https://highlightjs.org/static/demo/styles/monokai-sublime.css" rel="stylesheet">
     <link rel="shortcut icon" href=./img/favicon.ico>
 </head>
 
@@ -24,7 +23,9 @@
             <div class="col-4 nav"></div>
             <!-- 个人信息容器 -->
             <div class="col-4">
-                <i class="ri-qq-line"></i>
+                <a href="https://jq.qq.com/?_wv=1027&k=mRjroync" data-native target="_blank">
+                    <i class="ri-qq-line"></i>
+                </a>
                 <i class="ri-wechat-2-line"></i>
                 <a href="https://github.com/suruibuas/eadmin" data-native target="_blank">
                     <i class="ri-github-line"></i>
@@ -120,7 +121,9 @@
             // 城市数据
             'city.js',
             // 模版数据过滤器
-            'template-filter.js'
+            'template-filter.js',
+            // 不需要mock数据可删除
+            'mock.js'
         ],
         // 默认加载的类库，如果用不到可以在此删除
         lib : [
@@ -141,7 +144,9 @@
             // 不需要上传可删除
             'dropzone',
             // 不需要富文本编辑器可删除
-            'quill'
+            'quill',
+            // 不需要mock数据可删除
+            'mock'
         ],
         // 全部加载完成回调
         ready : function(){

diff --git a/dist/js/lib/eadmin.lib.min.js b/dist/js/lib/eadmin.lib.min.js
diff --git a/src/css/dark/common/block.css b/src/css/dark/common/block.css
@@ -26,9 +26,11 @@
 .block-title {
   width: 100%;
   height: 20px;
-  line-height: 20px;
-  margin-bottom: 20px;
+  line-height: 18px;
+  margin-bottom: 10px;
   position: relative;
+  font-size: 16px;
+  color: #cccccc;
 }
 .block-title span {
   background: -moz-linear-gradient(top, #66b5ff, #0084FF);
@@ -44,6 +46,7 @@
 .block-title a {
   float: right;
   color: #66b5ff !important;
+  font-size: 14px;
 }
 .block-box {
   display: flex;
@@ -60,7 +63,7 @@
   position: relative;
 }
 .block-box .block .font-list {
-  margin-top: 20px;
+  margin-top: 18px;
   width: 100%;
 }
 .block-box .block .font-list li {
@@ -203,11 +206,10 @@
   margin-top: 0;
 }
 .block-box .title {
-  font-size: 14px;
+  font-size: 16px;
   color: #cccccc;
   margin-bottom: 0 !important;
-  height: 28px;
-  line-height: 28px;
+  height: 20px;
 }
 .block-box .note {
   margin-top: 5px;

diff --git a/src/css/dark/common/common.css b/src/css/dark/common/common.css
@@ -175,9 +175,24 @@ h6 i {
 .mb20 {
   margin-bottom: 20px !important;
 }
+.ml0 {
+  margin-left: 0 !important;
+}
+.ml10 {
+  margin-left: 10px !important;
+}
+.ml20 {
+  margin-left: 20px !important;
+}
 .mr0 {
   margin-right: 0 !important;
 }
+.mr10 {
+  margin-right: 10px !important;
+}
+.mr20 {
+  margin-right: 20px !important;
+}
 .p0 {
   padding: 0 !important;
 }

diff --git a/src/css/dark/lib/button.css b/src/css/dark/lib/button.css
@@ -36,6 +36,9 @@ button:hover:not(:disabled) {
   transition: border-color 0.2s linear, background-color 0.2s linear, box-shadow 0.2s linear;
   border-color: #0084FF;
 }
+button:active:not(:disabled) {
+  border-color: #005cb3;
+}
 button i {
   font-size: 18px;
 }
@@ -68,6 +71,10 @@ button:disabled {
   background: #0077e6;
   border-color: #0077e6;
 }
+.highlight:active:not(:disabled) {
+  background: #005cb3;
+  border-color: #005cb3;
+}
 .highlight:disabled {
   color: #7886A3;
   background: #30375B;

diff --git a/src/css/dark/lib/form.css b/src/css/dark/lib/form.css
@@ -82,7 +82,7 @@ textarea {
 .icon-input i:not(.add):not(.cut),
 .icon-input-right i:not(.add):not(.cut) {
   position: absolute;
-  top: 1px;
+  top: 0px;
 }
 .icon-input input {
   padding-left: 26px;

diff --git a/src/css/dark/lib/slider.css b/src/css/dark/lib/slider.css
@@ -23,7 +23,7 @@
   background: #30375B;
   cursor: pointer;
   position: relative;
-  margin: 30px 0 5px 0;
+  margin: 20px 0 5px 0;
 }
 .slider .slider-bar {
   border-radius: 5px;

diff --git a/src/css/dark/lib/tab.css b/src/css/dark/lib/tab.css
@@ -43,7 +43,7 @@
   top: -4px;
   font-size: 10px;
   line-height: 14px;
-  padding: 0px 4px;
+  padding: 0px 3px;
 }
 .tab .active {
   background: #1A2042;

diff --git a/src/css/light/common/block.css b/src/css/light/common/block.css
@@ -26,9 +26,11 @@
 .block-title {
   width: 100%;
   height: 20px;
-  line-height: 20px;
-  margin-bottom: 20px;
+  line-height: 18px;
+  margin-bottom: 10px;
   position: relative;
+  font-size: 16px;
+  color: #666;
 }
 .block-title span {
   background: -moz-linear-gradient(top, #66b5ff, #0084FF);
@@ -44,6 +46,7 @@
 .block-title a {
   float: right;
   color: #66b5ff !important;
+  font-size: 14px;
 }
 .block-box {
   display: flex;
@@ -60,7 +63,7 @@
   position: relative;
 }
 .block-box .block .font-list {
-  margin-top: 20px;
+  margin-top: 18px;
   width: 100%;
 }
 .block-box .block .font-list li {
@@ -203,11 +206,10 @@
   margin-top: 0;
 }
 .block-box .title {
-  font-size: 14px;
+  font-size: 16px;
   color: #666;
   margin-bottom: 0 !important;
-  height: 28px;
-  line-height: 28px;
+  height: 20px;
 }
 .block-box .note {
   margin-top: 5px;

diff --git a/src/css/light/common/common.css b/src/css/light/common/common.css
@@ -175,9 +175,24 @@ h6 i {
 .mb20 {
   margin-bottom: 20px !important;
 }
+.ml0 {
+  margin-left: 0 !important;
+}
+.ml10 {
+  margin-left: 10px !important;
+}
+.ml20 {
+  margin-left: 20px !important;
+}
 .mr0 {
   margin-right: 0 !important;
 }
+.mr10 {
+  margin-right: 10px !important;
+}
+.mr20 {
+  margin-right: 20px !important;
+}
 .p0 {
   padding: 0 !important;
 }

diff --git a/src/css/light/lib/button.css b/src/css/light/lib/button.css
@@ -36,6 +36,9 @@ button:hover:not(:disabled) {
   transition: border-color 0.2s linear, background-color 0.2s linear, box-shadow 0.2s linear;
   border-color: #0084FF;
 }
+button:active:not(:disabled) {
+  border-color: #005cb3;
+}
 button i {
   font-size: 18px;
 }
@@ -68,6 +71,10 @@ button:disabled {
   background: #0077e6;
   border-color: #0077e6;
 }
+.highlight:active:not(:disabled) {
+  background: #005cb3;
+  border-color: #005cb3;
+}
 .highlight:disabled {
   color: #BBC5D8;
   background: #DCE8F2;

diff --git a/src/css/light/lib/form.css b/src/css/light/lib/form.css
@@ -82,7 +82,7 @@ textarea {
 .icon-input i:not(.add):not(.cut),
 .icon-input-right i:not(.add):not(.cut) {
   position: absolute;
-  top: 1px;
+  top: 0px;
 }
 .icon-input input {
   padding-left: 26px;

diff --git a/src/css/light/lib/tab.css b/src/css/light/lib/tab.css
@@ -43,7 +43,7 @@
   top: -4px;
   font-size: 10px;
   line-height: 14px;
-  padding: 0px 4px;
+  padding: 0px 3px;
 }
 .tab .active {
   background: #FFF;

diff --git a/src/js/lib/eadmin.form.js b/src/js/lib/eadmin.form.js
@@ -103,7 +103,7 @@ class Form{
 				_this.appendTo(v.group);
 				$(v.html).appendTo(v.group);
 				if (v.val < v.min) _this.val(v.min);
-				if (v.val > v.max) _this.val(v.max);
+				if (v.max > 0 && v.val > v.max) _this.val(v.max);
 			}
 			// 日期选择框处理
 			v.date = _this.data('default-date');

diff --git a/src/js/lib/eadmin.rate.js b/src/js/lib/eadmin.rate.js
@@ -22,7 +22,9 @@ class Rate{
 			// 总分数
 			num 	 : 5,
 			// 回调
-			change   : null
+			change   : null,
+			// 隐藏域
+			bind     : null
 		}
 		// 配置参数
 		this.param = $.extend(_param, param);
@@ -54,6 +56,8 @@ class Rate{
 					</div>`;
 		}
 		this.domCache.html(html);
+		if (this.param.bind != null)
+			this.domCache.after(`<input name="${this.param.bind}" type="hidden" value="${this.param.default}">`);
 	}
 
 	/**
@@ -99,6 +103,8 @@ class Rate{
 			_this.parent().data('level', level);
 			if (_.isFunction(that.param.change))
 				that.param.change(level);
+			if (that.param.bind != null)
+				that.domCache.next('input').val(level);
 		}).
 		// 离开
 		on('mouseleave', function(){