Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
ShopXO
提交
9cc6ce50
ShopXO
项目概览
飞鱼0526
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9cc6ce50
编写于
11月 29, 2020
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
动态表格列表数据优化
上级
5e73292d
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
116 addition
and
53 deletion
+116
-53
application/admin/view/default/agreement/nav.html
application/admin/view/default/agreement/nav.html
+1
-1
application/admin/view/default/agreement/register.html
application/admin/view/default/agreement/register.html
+5
-5
application/admin/view/default/appconfig/app.html
application/admin/view/default/appconfig/app.html
+4
-4
application/admin/view/default/appconfig/base.html
application/admin/view/default/appconfig/base.html
+4
-4
application/admin/view/default/appconfig/nav.html
application/admin/view/default/appconfig/nav.html
+1
-1
application/admin/view/default/email/index.html
application/admin/view/default/email/index.html
+4
-4
application/admin/view/default/email/message.html
application/admin/view/default/email/message.html
+4
-4
application/admin/view/default/email/nav.html
application/admin/view/default/email/nav.html
+2
-2
application/admin/view/default/navigation/index.html
application/admin/view/default/navigation/index.html
+3
-3
application/admin/view/default/navigation/nav.html
application/admin/view/default/navigation/nav.html
+1
-1
application/admin/view/default/public/module/form.html
application/admin/view/default/public/module/form.html
+2
-2
application/admin/view/default/public/module/form_table.html
application/admin/view/default/public/module/form_table.html
+1
-1
application/admin/view/default/seo/index.html
application/admin/view/default/seo/index.html
+1
-1
application/admin/view/default/sms/index.html
application/admin/view/default/sms/index.html
+5
-5
application/admin/view/default/sms/message.html
application/admin/view/default/sms/message.html
+4
-4
application/admin/view/default/sms/nav.html
application/admin/view/default/sms/nav.html
+2
-2
application/admin/view/default/warehouse/index.html
application/admin/view/default/warehouse/index.html
+2
-2
application/index/view/default/public/module/bare_form.html
application/index/view/default/public/module/bare_form.html
+2
-2
application/index/view/default/public/module/form.html
application/index/view/default/public/module/form.html
+2
-2
application/index/view/default/public/module/form_table.html
application/index/view/default/public/module/form_table.html
+1
-1
application/index/view/default/public/module/user_form.html
application/index/view/default/public/module/user_form.html
+2
-2
public/static/admin/default/css/common.css
public/static/admin/default/css/common.css
+16
-0
public/static/admin/default/js/common.js
public/static/admin/default/js/common.js
+44
-0
public/static/common/css/common.css
public/static/common/css/common.css
+3
-0
未找到文件。
application/admin/view/default/agreement/nav.html
浏览文件 @
9cc6ce50
<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>
...
...
application/admin/view/default/agreement/register.html
浏览文件 @
9cc6ce50
...
...
@@ -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>
...
...
application/admin/view/default/appconfig/app.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/appconfig/base.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/appconfig/nav.html
浏览文件 @
9cc6ce50
<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>
...
...
application/admin/view/default/email/index.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/email/message.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/email/nav.html
浏览文件 @
9cc6ce50
<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"
>
×
</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
application/admin/view/default/navigation/index.html
浏览文件 @
9cc6ce50
<!--
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" /}}
...
...
application/admin/view/default/navigation/nav.html
浏览文件 @
9cc6ce50
<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>
...
...
application/admin/view/default/public/module/form.html
浏览文件 @
9cc6ce50
...
...
@@ -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-botto
m"
>
<div
class=
"
form-table-operate-bottom am-nbfc am-margin-top-s
m"
>
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}
...
...
application/admin/view/default/public/module/form_table.html
浏览文件 @
9cc6ce50
<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>
...
...
application/admin/view/default/seo/index.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
×
</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>
...
...
application/admin/view/default/sms/index.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/sms/message.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
...
...
application/admin/view/default/sms/nav.html
浏览文件 @
9cc6ce50
<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"
>
×
</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
application/admin/view/default/warehouse/index.html
浏览文件 @
9cc6ce50
...
...
@@ -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"
>
×
</button>
<p>
1. 权重数值越大代表权重越高、扣除库存按照权重依次扣除)
</p>
...
...
application/index/view/default/public/module/bare_form.html
浏览文件 @
9cc6ce50
...
...
@@ -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-botto
m"
>
<div
class=
"
form-table-operate-bottom am-nbfc am-margin-top-s
m"
>
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}
...
...
application/index/view/default/public/module/form.html
浏览文件 @
9cc6ce50
...
...
@@ -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-botto
m"
>
<div
class=
"
form-table-operate-bottom am-nbfc am-margin-top-s
m"
>
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}
...
...
application/index/view/default/public/module/form_table.html
浏览文件 @
9cc6ce50
<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>
...
...
application/index/view/default/public/module/user_form.html
浏览文件 @
9cc6ce50
...
...
@@ -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-botto
m"
>
<div
class=
"
form-table-operate-bottom am-nbfc am-margin-top-s
m"
>
{{block name="form_operate_bottom"}}
{{include file="public/module/form_operate_bottom" /}}
{{/block}}
...
...
public/static/admin/default/css/common.css
浏览文件 @
9cc6ce50
...
...
@@ -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
public/static/admin/default/js/common.js
浏览文件 @
9cc6ce50
...
...
@@ -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
public/static/common/css/common.css
浏览文件 @
9cc6ce50
...
...
@@ -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
;
}
/**
* 表格-搜索条件
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录