From 9cc6ce50835a859549066e8c45c7fb6e3e1e1f28 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 29 Nov 2020 16:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/agreement/nav.html     |  2 +-
 .../view/default/agreement/register.html      | 10 ++---
 .../admin/view/default/appconfig/app.html     |  8 ++--
 .../admin/view/default/appconfig/base.html    |  8 ++--
 .../admin/view/default/appconfig/nav.html     |  2 +-
 .../admin/view/default/email/index.html       |  8 ++--
 .../admin/view/default/email/message.html     |  8 ++--
 application/admin/view/default/email/nav.html |  4 +-
 .../admin/view/default/navigation/index.html  |  6 +--
 .../admin/view/default/navigation/nav.html    |  2 +-
 .../view/default/public/module/form.html      |  4 +-
 .../default/public/module/form_table.html     |  2 +-
 application/admin/view/default/seo/index.html |  2 +-
 application/admin/view/default/sms/index.html | 10 ++---
 .../admin/view/default/sms/message.html       |  8 ++--
 application/admin/view/default/sms/nav.html   |  4 +-
 .../admin/view/default/warehouse/index.html   |  4 +-
 .../view/default/public/module/bare_form.html |  4 +-
 .../view/default/public/module/form.html      |  4 +-
 .../default/public/module/form_table.html     |  2 +-
 .../view/default/public/module/user_form.html |  4 +-
 public/static/admin/default/css/common.css    | 16 +++++++
 public/static/admin/default/js/common.js      | 44 +++++++++++++++++++
 public/static/common/css/common.css           |  3 ++
 24 files changed, 116 insertions(+), 53 deletions(-)

diff --git a/application/admin/view/default/agreement/nav.html b/application/admin/view/default/agreement/nav.html
index 1aee21f70..aa7469616 100644
--- a/application/admin/view/default/agreement/nav.html
+++ b/application/admin/view/default/agreement/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
+<ul class="am-nav am-nav-pills table-nav second-nav">
     <li {{if $nav_type eq 'register'}}class="am-active"{{/if}} data-type="register">
         <a href="{{:MyUrl('admin/agreement/index', ['nav_type'=>'register'])}}">用户注册协议</a>
     </li>
diff --git a/application/admin/view/default/agreement/register.html b/application/admin/view/default/agreement/register.html
index 8b425db5e..76d30195f 100644
--- a/application/admin/view/default/agreement/register.html
+++ b/application/admin/view/default/agreement/register.html
@@ -2,16 +2,16 @@
 
 <!-- right content start  -->
 <div class="content-right">
+    <!-- table nav start -->
+    {{include file="agreement/nav" /}}
+    <!-- table nav end -->
+
     <div class="content">
-        <!-- table nav start -->
-        {{include file="agreement/nav" /}}
-        <!-- table nav end -->
-        
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/agreement/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/agreement/index', ['type'=>$nav_type])}}">
             <div class="am-form-group">
                 <div class="am-cf">
-                    <label>{{$data.common_agreement_userregister.name}}<span class="am-form-group-label-tips">{{$data.common_agreement_userregister.describe}}</span></label>
+                    <label><span class="am-form-group-label-tips am-margin-left-0">{{$data.common_agreement_userregister.describe}}</span></label>
                     <a href="{{:MyUrl('index/agreement/index', ['document'=>'userregister'])}}" target="_blank" class="am-fr">查看详情</a>
                 </div>
                 <textarea class="am-radius am-validate" name="{{$data.common_agreement_userregister.only_tag}}" maxlength="105000" id="editor-tag" data-validation-message="{{$data.common_agreement_userregister.error_tips}}">{{if !empty($data)}}{{$data.common_agreement_userregister.value|raw}}{{/if}}</textarea>
diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html
index ef1e93c5a..ffee14baa 100644
--- a/application/admin/view/default/appconfig/app.html
+++ b/application/admin/view/default/appconfig/app.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
-    <div class="content">
-        <!-- table nav start -->
-        {{include file="appconfig/nav" /}}
-        <!-- table nav end -->
+    <!-- table nav start -->
+    {{include file="appconfig/nav" /}}
+    <!-- table nav end -->
 
+    <div class="content">
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'app'])}}" enctype="multipart/form-data">
             <div class="am-form-group">
diff --git a/application/admin/view/default/appconfig/base.html b/application/admin/view/default/appconfig/base.html
index 0d8efa43c..73133dc07 100755
--- a/application/admin/view/default/appconfig/base.html
+++ b/application/admin/view/default/appconfig/base.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
-	<div class="content">
-		<!-- table nav start -->
-        {{include file="appconfig/nav" /}}
-        <!-- table nav end -->
+    <!-- table nav start -->
+    {{include file="appconfig/nav" /}}
+    <!-- table nav end -->
 
+	<div class="content">
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/appconfig/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/appconfig/index')}}">
 			<div class="am-form-group">
diff --git a/application/admin/view/default/appconfig/nav.html b/application/admin/view/default/appconfig/nav.html
index f7bfb8c21..6ee310296 100644
--- a/application/admin/view/default/appconfig/nav.html
+++ b/application/admin/view/default/appconfig/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
+<ul class="am-nav am-nav-pills table-nav second-nav">
     <li {{if $nav_type eq 'base'}}class="am-active"{{/if}} data-type="base">
         <a href="{{:MyUrl('admin/appconfig/index', ['nav_type'=>'base'])}}">基础配置</a>
     </li>
diff --git a/application/admin/view/default/email/index.html b/application/admin/view/default/email/index.html
index a210f80c3..1c575e5a9 100755
--- a/application/admin/view/default/email/index.html
+++ b/application/admin/view/default/email/index.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
+	<!-- table nav start -->
+	{{include file="email/nav"" /}}
+	<!-- table nav end -->
+
 	<div class="content">
-		<!-- table nav start -->
-		{{include file="email/nav" /}}
-		<!-- table nav end -->
-		
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/email/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/email/index', ['type'=>'email'])}}">
 			<div class="am-form-group">
diff --git a/application/admin/view/default/email/message.html b/application/admin/view/default/email/message.html
index e621936e7..38f651237 100755
--- a/application/admin/view/default/email/message.html
+++ b/application/admin/view/default/email/message.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
+	<!-- table nav start -->
+	{{include file="email/nav"" /}}
+	<!-- table nav end -->
+
 	<div class="content">
-		<!-- table nav start -->
-		{{include file="email/nav" /}}
-		<!-- table nav end -->
-		
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/email/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/email/index', ['type'=>'message'])}}">
 			<div class="am-form-group">
diff --git a/application/admin/view/default/email/nav.html b/application/admin/view/default/email/nav.html
index 784799bc1..7cb89222b 100755
--- a/application/admin/view/default/email/nav.html
+++ b/application/admin/view/default/email/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
+<ul class="am-nav am-nav-pills table-nav second-nav">
 	<li {{if $nav_type eq 'email'}}class="am-active"{{/if}} data-type="email">
 		<a href="{{:MyUrl('admin/email/index', ['type'=>'email'])}}">邮箱设置</a>
 	</li>
@@ -7,7 +7,7 @@
 	</li>
 </ul>
 
-<div class="am-alert am-alert-warning am-radius" data-am-alert>
+<div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
     <button type="button" class="am-close">&times;</button>
     <p class="am-text-xs">参考相关邮箱配置教程 <a href="https://ask.shopxo.net/article/41" class="am-margin-left-sm" target="_blank">点击去看教程 <i class="am-icon-external-link"></i></a> </p>
 </div>
\ No newline at end of file
diff --git a/application/admin/view/default/navigation/index.html b/application/admin/view/default/navigation/index.html
index cc2b9927e..dbe4f7bf8 100755
--- a/application/admin/view/default/navigation/index.html
+++ b/application/admin/view/default/navigation/index.html
@@ -1,8 +1,8 @@
-<!-- table nav start -->
-{{block name="form_navigation"}}
+<!-- content nav start -->
+{{block name="form_content_top"}}
 	{{include file="navigation/nav" /}}
 {{/block}}
-<!-- table nav end -->
+<!-- content nav end -->
 
 <!-- 继承公共的 form -->
 {{extend name="public/module/form" /}}
diff --git a/application/admin/view/default/navigation/nav.html b/application/admin/view/default/navigation/nav.html
index 93ba60a6a..651f4b3e4 100755
--- a/application/admin/view/default/navigation/nav.html
+++ b/application/admin/view/default/navigation/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
+<ul class="am-nav am-nav-pills table-nav second-nav">
 	<li {{if $nav_type eq 'header'}}class="am-active"{{/if}} data-type="header">
 		<a href="{{:MyUrl('admin/navigation/index', ['nav_type'=>'header'])}}">中间导航</a>
 	</li>
diff --git a/application/admin/view/default/public/module/form.html b/application/admin/view/default/public/module/form.html
index d9f657d9a..6ac33ec2d 100644
--- a/application/admin/view/default/public/module/form.html
+++ b/application/admin/view/default/public/module/form.html
@@ -58,7 +58,7 @@
                 <!-- nav end -->
 
                 <!-- top operate start -->
-                <div class="form-table-operate-top">
+                <div class="form-table-operate-top am-nbfc">
                     {{block name="form_operate_top"}}
                         {{include file="public/module/form_operate_top" /}}
                     {{/block}}
@@ -70,7 +70,7 @@
                 <!-- form table end -->
 
                 <!-- bottom operate start -->
-                <div class="am-margin-top-sm form-table-operate-bottom">
+                <div class="form-table-operate-bottom am-nbfc am-margin-top-sm">
                     {{block name="form_operate_bottom"}}
                         {{include file="public/module/form_operate_bottom" /}}
                     {{/block}}
diff --git a/application/admin/view/default/public/module/form_table.html b/application/admin/view/default/public/module/form_table.html
index 8fbb333e8..97e50d79c 100644
--- a/application/admin/view/default/public/module/form_table.html
+++ b/application/admin/view/default/public/module/form_table.html
@@ -1,4 +1,4 @@
-<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm" data-md5-key="{{$form_md5_key}}">
+<div class="am-scrollable-horizontal am-table-scrollable-horizontal" data-md5-key="{{$form_md5_key}}">
     <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap form-table-data-list">
         <thead>
             <tr>
diff --git a/application/admin/view/default/seo/index.html b/application/admin/view/default/seo/index.html
index bca356069..b43f4f93b 100755
--- a/application/admin/view/default/seo/index.html
+++ b/application/admin/view/default/seo/index.html
@@ -3,7 +3,7 @@
 <!-- right content start  -->
 <div class="content-right">
 	<div class="content">
-		<div class="am-alert am-alert-warning am-radius" data-am-alert>
+		<div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
 		    <button type="button" class="am-close">&times;</button>
 		    <p class="am-text-xs">参考伪静态配置教程 <a href="https://ask.shopxo.net/article/6" class="am-margin-left-sm" target="_blank">点击去看教程 <i class="am-icon-external-link"></i></a> </p>
 		</div>
diff --git a/application/admin/view/default/sms/index.html b/application/admin/view/default/sms/index.html
index 66755b20f..b7441c174 100755
--- a/application/admin/view/default/sms/index.html
+++ b/application/admin/view/default/sms/index.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
-	<div class="content">
-		<!-- table nav start -->
-		{{include file="sms/nav"" /}}
-		<!-- table nav end -->
-		
+	<!-- table nav start -->
+	{{include file="sms/nav"" /}}
+	<!-- table nav end -->
+
+	<div class="content">		
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/sms/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/sms/index', ['type'=>'sms'])}}">
 			<div class="am-form-group">
diff --git a/application/admin/view/default/sms/message.html b/application/admin/view/default/sms/message.html
index 98104cc07..f6db6634c 100755
--- a/application/admin/view/default/sms/message.html
+++ b/application/admin/view/default/sms/message.html
@@ -2,11 +2,11 @@
 
 <!-- right content start  -->
 <div class="content-right">
+	<!-- table nav start -->
+	{{include file="sms/nav"" /}}
+	<!-- table nav end -->
+
 	<div class="content">
-		<!-- table nav start -->
-		{{include file="sms/nav" /}}
-		<!-- table nav end -->
-		
 		<!-- form start -->
 		<form class="am-form form-validation view-save" action="{{:MyUrl('admin/sms/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/sms/index', ['type'=>'message'])}}">
 			<div class="am-form-group">
diff --git a/application/admin/view/default/sms/nav.html b/application/admin/view/default/sms/nav.html
index 6635909f4..0547df254 100755
--- a/application/admin/view/default/sms/nav.html
+++ b/application/admin/view/default/sms/nav.html
@@ -1,4 +1,4 @@
-<ul class="am-nav am-nav-pills table-nav am-margin-bottom-sm">
+<ul class="am-nav am-nav-pills table-nav second-nav">
 	<li {{if $nav_type eq 'sms'}}class="am-active"{{/if}} data-type="sms">
 		<a href="{{:MyUrl('admin/sms/index', ['type'=>'sms'])}}">短信设置</a>
 	</li>
@@ -7,7 +7,7 @@
 	</li>
 </ul>
 
-<div class="am-alert am-alert-warning am-radius" data-am-alert>
+<div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
     <button type="button" class="am-close">&times;</button>
     <p class="am-text-xs">阿里云短信管理地址 <a href="https://www.aliyun.com/acts/alicomcloud/new-discount?userCode=iub0dy6g" class="am-margin-left-sm" target="_blank">点击去阿里云购买短信 <i class="am-icon-external-link"></i></a> </p>
 </div>
\ No newline at end of file
diff --git a/application/admin/view/default/warehouse/index.html b/application/admin/view/default/warehouse/index.html
index f40bdf079..8f812c504 100644
--- a/application/admin/view/default/warehouse/index.html
+++ b/application/admin/view/default/warehouse/index.html
@@ -8,8 +8,8 @@
     {__block__}
 {{/block}}
 
-<!-- 扩展信息 -->
-{{block name="form_extend"}}
+<!-- 底部提示信息 -->
+{{block name="form_operate_bottom"}}
     <div class="am-alert am-alert-warning" data-am-alert>
         <button type="button" class="am-close">&times;</button>
         <p>1. 权重数值越大代表权重越高、扣除库存按照权重依次扣除）</p>
diff --git a/application/index/view/default/public/module/bare_form.html b/application/index/view/default/public/module/bare_form.html
index 312161514..ed490cbcc 100644
--- a/application/index/view/default/public/module/bare_form.html
+++ b/application/index/view/default/public/module/bare_form.html
@@ -9,7 +9,7 @@
             <!-- nav end -->
 
             <!-- top operate start -->
-            <div class="form-table-operate-top">
+            <div class="form-table-operate-top am-nbfc">
                 {{block name="form_operate_top"}}
                    {{include file="public/module/form_operate_top" /}}
                 {{/block}}
@@ -21,7 +21,7 @@
             <!-- form table end -->
 
             <!-- bottom operate start -->
-            <div class="am-margin-top-sm form-table-operate-bottom">
+            <div class="form-table-operate-bottom am-nbfc am-margin-top-sm">
                 {{block name="form_operate_bottom"}}
                     {{include file="public/module/form_operate_bottom" /}}
                 {{/block}}
diff --git a/application/index/view/default/public/module/form.html b/application/index/view/default/public/module/form.html
index 1251d2266..edbe8b514 100644
--- a/application/index/view/default/public/module/form.html
+++ b/application/index/view/default/public/module/form.html
@@ -66,7 +66,7 @@
                 <!-- nav end -->
 
                 <!-- top operate start -->
-                <div class="form-table-operate-top">
+                <div class="form-table-operate-top am-nbfc">
                     {{block name="form_operate_top"}}
                        {{include file="public/module/form_operate_top" /}}
                     {{/block}}
@@ -78,7 +78,7 @@
                 <!-- form table end -->
 
                 <!-- bottom operate start -->
-                <div class="am-margin-top-sm form-table-operate-bottom">
+                <div class="form-table-operate-bottom am-nbfc am-margin-top-sm">
                     {{block name="form_operate_bottom"}}
                         {{include file="public/module/form_operate_bottom" /}}
                     {{/block}}
diff --git a/application/index/view/default/public/module/form_table.html b/application/index/view/default/public/module/form_table.html
index 9422783f5..57a48e79b 100644
--- a/application/index/view/default/public/module/form_table.html
+++ b/application/index/view/default/public/module/form_table.html
@@ -1,4 +1,4 @@
-<div class="am-scrollable-horizontal am-table-scrollable-horizontal am-margin-top-sm" data-md5-key="{{$form_md5_key}}">
+<div class="am-scrollable-horizontal am-table-scrollable-horizontal" data-md5-key="{{$form_md5_key}}">
     <table class="am-table am-table-striped am-table-hover am-table-bordered am-text-nowrap form-table-data-list">
         <thead>
             <tr>
diff --git a/application/index/view/default/public/module/user_form.html b/application/index/view/default/public/module/user_form.html
index dfc7d2b2d..543d318d6 100644
--- a/application/index/view/default/public/module/user_form.html
+++ b/application/index/view/default/public/module/user_form.html
@@ -74,7 +74,7 @@
                         <!-- nav end -->
 
                         <!-- top operate start -->
-                        <div class="form-table-operate-top">
+                        <div class="form-table-operate-top am-nbfc">
                             {{block name="form_operate_top"}}
                                {{include file="public/module/form_operate_top" /}}
                             {{/block}}
@@ -86,7 +86,7 @@
                         <!-- form table end -->
 
                         <!-- bottom operate start -->
-                        <div class="am-margin-top-sm form-table-operate-bottom">
+                        <div class="form-table-operate-bottom am-nbfc am-margin-top-sm">
                             {{block name="form_operate_bottom"}}
                                 {{include file="public/module/form_operate_bottom" /}}
                             {{/block}}
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index fff188572..0235aeb94 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -611,4 +611,20 @@ table.am-table .am-btn-danger:hover {
 }
 #parameters-quick-container .am-dropdown-content {
     width: 260px;
+}
+
+/**
+ * 动态数据列表
+ */
+.content-right,
+.form-table-content {
+    height: 100%;
+}
+.form-validation-search {
+    height: calc(100% - 85px);
+}
+.am-table-scrollable-horizontal {
+    max-height: calc(100% - 50px);
+    overflow-x: auto;
+    overflow-y: auto;
 }
\ No newline at end of file
diff --git a/public/static/admin/default/js/common.js b/public/static/admin/default/js/common.js
index c11748dc5..dea9c47df 100644
--- a/public/static/admin/default/js/common.js
+++ b/public/static/admin/default/js/common.js
@@ -45,6 +45,40 @@ function ParametersItemHtmlCreated(type, name, value)
     });
 }
 
+/**
+ * 动态数据表格高度处理
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-11-29
+ * @desc    description
+ */
+function FormTableHeightHandle()
+{
+    // 表格内容
+    if($('.am-table-scrollable-horizontal').length > 0)
+    {
+        // 页面右侧总内容容器高度
+        var height = $('.content-right .content-top').outerHeight(true) || 0;
+        if(height > 0)
+        {
+            height += 10;
+        }
+        $('.content-right').css('height', 'calc(100% - '+height+'px)');
+
+        // 内容高度
+        var height_top = $('.form-table-operate-top').outerHeight(true) || 0;
+        var height_bottom = $('.form-table-operate-bottom').outerHeight(true) || 0;
+        $('.am-table-scrollable-horizontal').css('max-height', 'calc(100% - '+(height_top+height_bottom)+'px)');
+    }
+    // 表格内容外围高度
+    if($('.form-validation-search').length > 0)
+    {
+        var height = $('.form-table-content .am-pagination').outerHeight(true) || 0;
+        $('.form-validation-search').css('height', 'calc(100% - '+height+'px)');
+    }
+}
+
 $(function()
 {
     // 商品参数添加
@@ -186,4 +220,14 @@ $(function()
     {
         $parameters_table.find('tbody').html('');
     });
+
+
+    // 浏览器窗口实时事件
+    $(window).resize(function()
+    {
+        // 动态数据表格高度处理
+        FormTableHeightHandle();
+    });
+    // 动态数据表格高度处理
+    FormTableHeightHandle();
 });
\ No newline at end of file
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index a473aed21..ad7cead17 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -612,6 +612,9 @@ button.colorpicker-submit img {
 .form-table-operate-top > .am-btn:not(:last-child) {
     margin-right: 10px;
 }
+.form-table-operate-top .am-btn {
+    margin-bottom: 10px;
+}
 
 /**
  * 表格-搜索条件