更新日期选择器默认值赋值

优化表格搜索和自定义分页搜索优化部分样式
belain · Sep 7, 2020 · d8d39af · d8d39af
1 parent 87bd1f4
commit d8d39af
Show file tree

Hide file tree

Showing 22 changed files with 238 additions and 84 deletions.
diff --git a/dist/css/eadmin.min.css b/dist/css/eadmin.min.css
diff --git a/dist/html/datepicker.html b/dist/html/datepicker.html
@@ -133,6 +133,7 @@ <h4 class="title">指定开始和结束日期</h4>
                 <h4 class="title">选择日期范围</h4>
                 <input 
                     id="p9" 
+                    name="p9"
                     type="text" 
                     placeholder="选择时间范围" 
                     data-icon="ri-calendar-2-line|right">
@@ -148,6 +149,7 @@ <h4 class="title">选择日期范围</h4>
                 <h4 class="title">选择日期范围带按钮栏</h4>
                 <input 
                     id="p10" 
+                    name="p10"
                     type="text" 
                     placeholder="选择时间范围" 
                     data-icon="ri-calendar-2-line|right">
@@ -163,6 +165,7 @@ <h4 class="title">选择日期范围带按钮栏</h4>
                 <h4 class="title">选择日期范围带时分秒</h4>
                 <input 
                     id="p11" 
+                    name="p11"
                     type="text" 
                     placeholder="选择日期范围带时分秒" 
                     data-icon="ri-calendar-2-line|right">
@@ -178,6 +181,7 @@ <h4 class="title">选择日期范围带时分秒</h4>
                 <h4 class="title">选择范围并指定开始结束日期</h4>
                 <input 
                     id="p12" 
+                    name="p12"
                     type="text" 
                     placeholder="选择范围并指定开始结束日期" 
                     data-icon="ri-calendar-2-line|right">
@@ -193,6 +197,7 @@ <h4 class="title">选择范围并指定开始结束日期</h4>
                 <h4 class="title">双日历带快捷选择</h4>
                 <input 
                     id="p13" 
+                    name="p13"
                     type="text" 
                     placeholder="双日历带快捷选择" 
                     data-icon="ri-calendar-2-line|right">
@@ -208,12 +213,29 @@ <h4 class="title">双日历带快捷选择</h4>
                 <h4 class="title">带回调方法</h4>
                 <input 
                     id="p14" 
+                    name="p14"
                     type="text" 
                     placeholder="带回调方法" 
                     data-icon="ri-calendar-2-line|right">
             </div>
         </div>
     </div>
+    <!-- 响应盒子，bootstrap -->
+    <div class="col-3">
+        <!-- 容器盒子，具体布局使用 -->
+        <div class="block">
+            <!-- 表单组盒子 -->
+            <div class="form-group">
+                <h4 class="title">有默认值</h4>
+                <input 
+                    id="p15" 
+                    name="p15"
+                    type="text" 
+                    placeholder="有默认值" 
+                    data-icon="ri-calendar-2-line|right">
+            </div>
+        </div>
+    </div>
 </div>
 <script>
     (function(){
@@ -260,8 +282,8 @@ <h4 class="title">带回调方法</h4>
             end   : 20191231,
         });
         Eadmin.datepicker('#p13', {
-            type    : 'date-range',
-            quick   : true
+            type  : 'date-range',
+            quick : true
         });
         Eadmin.datepicker('#p14', {
             change : function(date){
@@ -270,5 +292,8 @@ <h4 class="title">带回调方法</h4>
                 });
             }
         });
+        Eadmin.datepicker('#p15', {
+            default  : [1599235200]
+        });
     })();
 </script>
diff --git a/dist/index.html b/dist/index.html
@@ -43,7 +43,7 @@
             // 关闭input的autocomplete
             'close_autocomplete' : true,
             // 加载页面默认延迟时长，避免页面过快刷新
-            'load_page_timeout'  : 100,
+            'load_page_timeout'  : 0,
             // 自动点击子分类第一个项目
             'auto_click_sub_nav' : true,
             // 下拉菜单默认值

diff --git a/dist/js/framework/eadmin/1.0.1/eadmin.min.js b/dist/js/framework/eadmin/1.0.1/eadmin.min.js
diff --git a/dist/js/lib/eadmin.datepicker.min.js b/dist/js/lib/eadmin.datepicker.min.js
diff --git a/dist/js/lib/eadmin.form.min.js b/dist/js/lib/eadmin.form.min.js
diff --git a/dist/js/lib/eadmin.page.min.js b/dist/js/lib/eadmin.page.min.js
diff --git a/dist/js/lib/eadmin.table.min.js b/dist/js/lib/eadmin.table.min.js
diff --git a/dist/js/lib/eadmin.window.min.js b/dist/js/lib/eadmin.window.min.js
diff --git a/src/css/common/common.css b/src/css/common/common.css
@@ -505,7 +505,7 @@ header .mobile-menu {
   line-height: 1.5;
 }
 .block-box .form-group .error {
-  color: #FF1844;
+  color: #ff6582;
   position: absolute;
   margin-top: 4px;
 }
@@ -669,7 +669,7 @@ h6 i {
  * ================= 遮罩 ==================
  */
 .mask {
-  opacity: 0.8;
+  opacity: 0.6;
   width: 100%;
   height: 100%;
   background: #000;

diff --git a/src/css/lib/form.css b/src/css/lib/form.css
@@ -55,6 +55,7 @@ textarea:disabled {
   cursor: not-allowed;
   background: #BBC5D8;
   border-color: #BBC5D8;
+  color: #586273;
 }
 input:disabled::-webkit-input-placeholder,
 textarea:disabled::-webkit-input-placeholder {

diff --git a/src/css/lib/tab.css b/src/css/lib/tab.css
@@ -19,6 +19,7 @@
  */
 .tab {
   border-bottom: 2px #30375B solid;
+  white-space: nowrap;
 }
 .tab span {
   background: #232B4C;
@@ -43,12 +44,16 @@
   min-height: 200px;
   display: none;
   position: relative;
-  padding-top: 10px;
 }
 .tab-panel .block {
   padding: 0;
   box-shadow: none;
 }
+.tab-panel .block-pb {
+  padding: 20px;
+  background: #232B4C;
+  border: 2px #30375B solid;
+}
 .tab-panel .panel-loading {
   width: 100%;
   height: 100%;

diff --git a/src/css/lib/transfer.css b/src/css/lib/transfer.css
@@ -100,6 +100,7 @@
   border-radius: 5px;
   padding: 6px 8px;
   display: block;
+  height: 32px;
   margin: 0;
 }
 .transfer-operation button i {

diff --git a/src/css/lib/window.css b/src/css/lib/window.css
@@ -72,11 +72,16 @@
   padding: 0;
   box-shadow: none;
 }
+.window .body .block-pb {
+  padding: 20px;
+  background: #232B4C;
+  border: 2px #30375B solid;
+}
 .window .body .form-group .title {
   margin-bottom: 2px;
 }
 .window .btnbar {
-  margin: 7px 15px 7px 0;
+  margin: 7px 15px 10px 0;
   text-align: right;
 }
 .window .btnbar button {

diff --git a/src/js/framework/eadmin/1.0.1/eadmin.js b/src/js/framework/eadmin/1.0.1/eadmin.js
@@ -301,6 +301,7 @@ let eadmin = class Eadmin{
         setTimeout(() => {
             Method = {};
             that.href = that.href == '' ? module.conf.homepage : that.href;
+            $(window).off();
             box.
                 off().
                 load(that.href, () => {