Skip to content

C
cms_sys
Commit dda8a9ae authored by 铭飞's avatar 铭飞 Committed by Gitee
Browse files
Options

!198 5.0样式 

Merge pull request !198 from 田彬杰/5.0.0
parents 96693c07 c8d047dc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 394 additions and 400 deletions
doc/4.7.1-to-4.7.2-mysql.sql 0 → 100644
View file @ dda8a9ae
UPDATE `model` SET `model_icon` = 'icon-neirongguanli' WHERE `model_id` = 1;
UPDATE `model` SET `model_icon` = 'icon-huiyuanzhongxin' WHERE `model_id` = 22;
UPDATE `model` SET `model_icon` = 'icon-quanxianguanli' WHERE `model_id` = 23;
UPDATE `model` SET `model_icon` = 'icon-xitongguanli' WHERE `model_id` = 84;
UPDATE `model` SET `model_icon` = 'icon-zidingyiguanli' WHERE `model_id` = 104;
UPDATE `mdiy_tag_sql` SET `tag_sql`='<#assign _typeid=\"\"/>\r\n<#if column?? && column.categoryId gt 0>\r\n <#assign _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n</#if>\r\nselect \r\n @rownum := @rownum + 1 AS typeindex,\r\n category_id as id,\r\n category_id as typeid,\r\n category_title as typetitle,\r\n (select count(*) from category c where c.category_categoryid=typeid and c.del=0) as childsize,\r\n <#--返回父id集合-->\r\n category_parent_id as pids,\r\n <#--栏目选中的样式-->\r\n IF(<#if column?? && column.categoryId gt 0>${column.categoryId}<#else>${_typeid}</#if> = category_id ,\"${class!\'\'}\",\"\") as class,\r\n <#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n <#else>\r\n CONCAT(column_path,\"/index.html\") as typelink,\r\n </#if>\r\n column_keyword as typekeyword,\r\n column_diy_url as typeurl,\r\n column_flag as flag,\r\n column_descrip as typedescrip,\r\n category_smallimg as typelitpic \r\n from (SELECT @rownum := 0) r,category \r\n LEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n category.del=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and category.category_appid=${appId}\r\n </#if>\r\n <#--根据模块编号查询分类-->\r\n <#if column?? && column.categoryModelId?has_content>\r\n and category_modelid=${column.categoryModelId}\r\n </#if>\r\n <#--栏目属性-->\r\n <#if flag?? && flag != \'\'>\r\n and bc.column_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n </#if>\r\n <#if noflag?? && noflag != \'\'>\r\n and bc.column_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n </#if>\r\n<#if type?has_content>\r\n <#--顶级栏目（单个）-->\r\n <#if type==\"top\">\r\n and category_id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from category where category_id = ${_typeid})\r\n <#elseif type==\"nav\">\r\n and(category_categoryid=0 or category_categoryid is null)\r\n <#--同级栏目（多个）-->\r\n <#elseif type==\"level\">\r\n and\r\n <#if _typeid?has_content>\r\n category_categoryid=(select category_categoryid from category where category_id=${_typeid})\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--当前栏目（单个）-->\r\n <#elseif type==\"self\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--当前栏目的所属栏目（多个）-->\r\n <#elseif type==\"path\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},</#if>${_typeid})\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目（多个）-->\r\n <#elseif type==\"son\">\r\n and \r\n <#if _typeid?has_content>\r\n category_categoryid=${_typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--上一级栏目没有则取当前栏目（单个）-->\r\n <#elseif type==\"parent\">\r\n and \r\n <#if _typeid?has_content>\r\n <#if column?? && column.categoryCategoryId?? && column.categoryCategoryId!=0>\r\n category_id=${column.categoryCategoryId}\r\n <#else>\r\n category_id=${_typeid}\r\n </#if>\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目或同级栏目（多个）-->\r\n <#elseif type==\"sonOrLevel\">\r\n and \r\n <#if _typeid?has_content>\r\n category_categoryid= if((SELECT count(*) FROM category\r\n LEFT JOIN basic_column bc ON bc.column_category_id = category.category_id \r\n WHERE category_categoryid=${_typeid})>0,${_typeid},(select category_categoryid from category where category_id=${_typeid}))\r\n <#else>\r\n 1=1\r\n </#if>\r\n </#if>\r\n<#else> <#--默认son-->\r\n and\r\n <#if _typeid?has_content>\r\n category_categoryid=${_typeid}\r\n <#else>\r\n (category_categoryid=0 or category_categoryid is null)\r\n </#if>\r\n</#if>\r\n<#if order?? >\r\n <#if order==\"desc\"> desc</#if>\r\n <#if order==\"asc\"> asc</#if>\r\n </#if>' WHERE (`id`='6')
\ No newline at end of file
doc/db-mcms-mysql-4.7.2.sql 0 → 100644
View file @ dda8a9ae
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/历史/4.7.0-to-4.7.1-mysql.sql 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
doc/历史/db-mcms-mysql-4.7.1.sql 0 → 100644
View file @ dda8a9ae
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/application.yml
View file @ dda8a9ae
server: server:
port: 4027 port: 4027
servlet.context-path: /ms-mcms servlet.context-path: /ms-mcms
servlet.session.timeout: 60M servlet.session.timeout: 60M
logging: logging:
level: level:
net.mingsoft: trace net.mingsoft: trace
ms: ms:
manager: manager:
path: /ms path: /ms
view-path: /WEB-INF/manager view-path: /WEB-INF/manager
upload: upload:
path: upload path: upload
mapping: /upload/** mapping: /upload/**
denied: .exe,.jsp denied: .exe,.jsp
multipart: multipart:
#最大上传文件大小 单位：KB #最大上传文件大小 单位：KB
max-file-size: 10240 max-file-size: 10240
#文件暂存临时目录 #文件暂存临时目录
upload-temp-dir: temp upload-temp-dir: temp
#临时文件大小 #临时文件大小
max-in-memory-size: 10240 max-in-memory-size: 10240
#总上传最大大小 单位：KB -1禁用 #总上传最大大小 单位：KB -1禁用
max-request-size: -1 max-request-size: -1
spring: spring:
profiles: profiles:
active: dev active: dev
mvc: mvc:
pathmatch: pathmatch:
use-suffix-pattern: true use-suffix-pattern: true
devtools: devtools:
restart: restart:
enabled: true enabled: true
additional-paths: src/main/java additional-paths: src/main/java
exclude: static/**,WEB-INF/** exclude: static/**,WEB-INF/**
servlet: servlet:
multipart: multipart:
max-request-size: 100MB max-request-size: 100MB
enabled: false enabled: false
freemarker: freemarker:
suffix: .ftl suffix: .ftl
charset: UTF-8 charset: UTF-8
content-type: text/html content-type: text/html
allow-request-override: true allow-request-override: true
allow-session-override: true allow-session-override: true
expose-request-attributes: true expose-request-attributes: true
expose-session-attributes: true expose-session-attributes: true
expose-spring-macro-helpers: true expose-spring-macro-helpers: true
prefer-file-system-access: false prefer-file-system-access: false
template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
settings: settings:
template_update_delay: 1 template_update_delay: 1
default_encoding: UTF-8 default_encoding: UTF-8
classic_compatible: true classic_compatible: true
date_format: yyyy-MM-dd date_format: yyyy-MM-dd
time_format: HH:mm:ss time_format: HH:mm:ss
datetime_format: yyyy-MM-dd HH:mm:ss datetime_format: yyyy-MM-dd HH:mm:ss
auto_import: /include/macro.ftl as ms auto_import: /include/macro.ftl as ms
number_format: 0.## number_format: 0.##
mybatis: mybatis:
mapper-locations: classpath*:**/dao/*.xml mapper-locations: classpath*:**/dao/*.xml
configuration: configuration:
database-id: mysql database-id: mysql
\ No newline at end of file
src/main/webapp/WEB-INF/manager/cms/category/form.ftl
View file @ dda8a9ae
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-form-item label="栏目管理名称" prop="categoryTitle"> <el-form-item label="栏目管理名称" prop="categoryTitle">
<template slot='label'>栏目管理名称 <template slot='label'>栏目管理名称
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" > <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typetitle/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typetitle/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typetitle/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<el-form-item label="栏目管理关键字" prop="categoryKeyword"> <el-form-item label="栏目管理关键字" prop="categoryKeyword">
<template slot='label'>栏目关键字 <template slot='label'>栏目关键字
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" > <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typekeyword/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typekeyword/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typekeyword/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typekeyword/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<el-form-item label="栏目管理描述" prop="categoryDescrip"> <el-form-item label="栏目管理描述" prop="categoryDescrip">
<template slot='label'>栏目描述 <template slot='label'>栏目描述
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" > <el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{field.typedescrip/}</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/nei-rong-biao-qian-ms-field.html" target="_blank">{ms:field.typedescrip/}</a>
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typedescrip/]</a> <a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typedescrip/]</a>
<i class="el-icon-question" slot="reference"></i> <i class="el-icon-question" slot="reference"></i>
</el-popover> </el-popover>
...@@ -185,7 +185,13 @@ ...@@ -185,7 +185,13 @@
<div slot="tip" class="el-upload__tip">最多上传1张图片</div> <div slot="tip" class="el-upload__tip">最多上传1张图片</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="自定义链接" prop="categoryDiyUrl"> <el-form-item prop="categoryDiyUrl">
<template slot='label'>自定义链接
<el-popover slot="label" placement="top-start" title="提示" trigger="hover" >
<a href="http://doc.ms.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">[field.typeurl/]</a>
<i class="el-icon-question" slot="reference"></i>
</el-popover>
</template>
<el-input <el-input
:disabled="false" :disabled="false"
......
src/main/webapp/static/ms-admin/4.7.2/css/app.css 0 → 100644
View file @ dda8a9ae
body {
margin: 0;
padding: 0;
background: #eee !important;
}
a:link,a:visited,a:active{text-decoration: none; color:#409EFF;}
.ms-container {
margin: 12px;
height: 100%;
padding: 14px 14px 0 14px;
background: #fff;
}
.ms-header {
padding: 10px;
margin: 0;
border-bottom: 1px solid #ddd;
background: #fff;
height: 50px
}
.ms-pagination {
padding: 20px 0 0;
text-align: right;
}
.ms-fr {
float: right;
}
.ms-tr {
text-align: right;
}
.el-button+.el-button {
margin-left: 0
}
.ms-select{
display: block;
}
.ms-datetimerange{
width: 100% !important;
}
#index .ms-search{
padding: 20px 0;
background: #fff;
}
#index .ms-search .ms-search-footer{
line-height: 60px;
text-align: center;
}
#index .ms-table-pagination {
height: calc(100% - 75px);
}
#myPageTop {
width: 252px;
}
#myPageTop input {
width: 242px;
}
.el-button .iconfont {
font-size: 12px;
margin-right: 5px;
}
#form .ms-container{
height:calc(100vh - 74px);
}
#index .ms-container{
height: calc(100vh - 74px);
}
[v-cloak]{
display: none;
}
/* 滚动条样式重写*/
.el-table__body-wrapper::-webkit-scrollbar{
width:6px;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: rgba(144,147,153,.5);
}
\ No newline at end of file
src/main/webapp/static/ms-admin/4.7.2/css/index.css 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
src/main/webapp/static/ms-admin/4.7.2/css/login.css 0 → 100644
View file @ dda8a9ae
/*
*这里的值严格按照UI设计图标注值来进行设置
*/
/*
*颜色
*/
/*
*页面的边距
*/
/*
*字体
*/
/*
*头像
*/
/*
* 按钮
*/
/*
*对常见的多行样式进行了方法封装，方便调用，加快开发效率
*/
html,
body {
min-height: 100vh;
width: 100vw;
background-color: #eee;
margin: 0;
display: flex;
font-weight: initial !important;
font-size: 14px !important;
color: #333 !important;
}
html *,
body * {
text-decoration: none !important;
font-family: Verdana, Arial, Helvetica, sans-serif;
box-sizing: border-box;
}
.ms-ellipsis {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: block;
}
.ms-align-center {
display: flex;
align-items: center;
}
input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
color: #aaa;
resize: none;
}
*::-webkit-scrollbar {
width: 8px;
height: 8px;
}
/*定义滚动条轨道 内阴影+圆角*/
*::-webkit-scrollbar-track {
border-radius: 10px;
/*滚动条的背景区域的圆角*/
background-color: #eee;
/*滚动条的背景颜色*/
}
/*定义滑块 内阴影+圆角*/
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
background-color: #ddd;
/*滚动条的背景颜色*/
}
.ms-container {
margin: 12px;
height: calc(100% - 24px);
padding: 14px 14px 0 14px;
background: #fff;
}
.ms-header {
padding: 10px;
margin: 0;
border-bottom: 1px solid #ddd;
background: #fff;
height: 50px;
}
.ms-pagination {
padding: 20px 0;
text-align: right;
}
.ms-fr {
float: right;
}
.ms-tr {
text-align: right;
}
.ms-weixin-content {
width: calc(100% - 140px);
}
.ms-weixin-dialog .el-dialog__header {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
border-bottom: 1px solid #ddd;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
font-size: 14px;
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
border-top: 1px solid #ddd;
padding: 15px !important;
}
.login {
width: 100vw;
height: 100vh;
}
.login .ms-admin-login-container {
height: 100%;
background: url('../images/login-bg.jpg') center no-repeat;
background-size: cover;
}
.login .ms-admin-login-container .ms-admin-login-main {
display: flex;
justify-content: center;
align-items: center;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp {
display: flex;
justify-content: center;
align-items: center;
width: 680px;
height: 320px;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp > img {
flex: 1;
display: inline-block;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form {
flex: 1;
height: 320px;
background: #fff;
padding: 20px 54px;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 {
line-height: 1;
font-weight: initial;
font-size: 12px;
color: #999999;
margin: 0 0 20px 0;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 span {
font-weight: initial;
font-size: 16px;
color: #0099ff;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item {
margin-bottom: 20px;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item > div {
margin-left: 0 !important;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-form-item__content,
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-input,
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item input {
height: 34px !important;
line-height: 34px !important;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content {
display: flex;
justify-content: space-between;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input__inner,
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input {
width: 110px;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content > img {
width: 66px;
height: 34px;
margin: 0 6px;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p {
display: flex;
justify-content: space-between;
line-height: 1;
flex-direction: column;
margin: 0;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(1) {
font-weight: initial;
font-size: 10px;
color: #999999;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(2) {
font-weight: initial;
font-size: 10px;
color: #0099ff;
cursor: pointer;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-form-item__content,
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-input,
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout input {
height: auto !important;
line-height: 1px !important;
}
.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-login-btn {
width: 100%;
height: 34px;
line-height: 5px;
}
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css 0 → 100644
View file @ dda8a9ae
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.js 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
src/main/webapp/static/ms-admin/4.7.2/js/ms.upload.js 0 → 100644
View file @ dda8a9ae
This diff is collapsed.
src/main/webapp/static/ms-admin/5.0.0/css/index.css
View file @ dda8a9ae
...@@ -226,7 +226,7 @@ textarea::-webkit-input-placeholder { ...@@ -226,7 +226,7 @@ textarea::-webkit-input-placeholder {
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
} }
.ms-admin-logo > img { .ms-admin-logo img {
padding: 14px 0; padding: 14px 0;
width: 50px; width: 50px;
} }
...@@ -234,10 +234,6 @@ textarea::-webkit-input-placeholder { ...@@ -234,10 +234,6 @@ textarea::-webkit-input-placeholder {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.ms-admin-logo > div img {
margin-top: -10px;
margin-left: 3px;
}
.ms-admin-logo > div span { .ms-admin-logo > div span {
margin-top: -6px; margin-top: -6px;
position: absolute; position: absolute;
...@@ -419,7 +415,7 @@ textarea::-webkit-input-placeholder { ...@@ -419,7 +415,7 @@ textarea::-webkit-input-placeholder {
z-index: 0; z-index: 0;
} }
.ms-admin-container > .ms-admin-main .ms-admin-tabs { .ms-admin-container > .ms-admin-main .ms-admin-tabs {
height: 100%; height: calc(100vh - 50px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
......
src/main/webapp/static/plugins/ms/1.0.0/ms.http.js
View file @ dda8a9ae
(function() { (function() {
axios.defaults.timeout = 1000 * 60; axios.defaults.timeout = 1000 * 60;
axios.defaults.baseURL = ''; axios.defaults.baseURL = '';
//http request 拦截器 //http request 拦截器
axios.interceptors.request.use( axios.interceptors.request.use(
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
axios.interceptors.response.use( axios.interceptors.response.use(
function(response) { function(response) {
//登录失效 //登录失效
if (response.data.bizCode == "401") { if (response.data.bizCode == "401" && ms.isLoginRedirect) {
window.parent.location.href = ms.base + "/" + ms.login + "?backurl=" + encodeURIComponent(window.parent.location.href); window.parent.location.href = ms.base + "/" + ms.login + "?backurl=" + encodeURIComponent(window.parent.location.href);
return; return;
} }
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
} }
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
ajax().get(url, { ajax().get(url, {
params: params params: params
}) })
.then(function(response) { .then(function(response) {
resolve(response.data); resolve(response.data);
}) })
...@@ -170,4 +170,5 @@ ...@@ -170,4 +170,5 @@
window.ms = {}; window.ms = {};
} }
window.ms.http = http; window.ms.http = http;
window.ms.isLoginRedirect = true;
}()); }());
\ No newline at end of file
src/main/webapp/static/skin/manager/4.5.7/js/ms.manager.min.js deleted 100644 → 0
View file @ 96693c07
ms.manager={initMenu:function(e){$("#ms-menu-parent-tmpl").tmpl(e).appendTo(".ms-menu"),$(".ms-menu-parent").each(function(s){var n=new Array;for(i=0;i<e.length;i++)e[i].modelModelId==$(this).data("model-id")&&n.push(e[i]);$("#ms-menu-child-tmpl").tmpl(n).appendTo($(this).find("ul:first"))}),$('[data-toggle="tooltip"]').tooltip(),$("body").delegate(".ms-menu-parent > div","click",function(){$(this).siblings(".ms-menu-child").hasClass("openMenuChild")?($(this).removeClass("nav-title"),$(this).addClass("ms-menu-parent-header"),$(this).siblings(".ms-menu-child").slideUp(),$(this).siblings(".ms-menu-child").removeClass("openMenuChild")):($(".ms-menu-parent").children("div").removeClass("nav-title"),$(".ms-menu-parent").children("div").addClass("ms-menu-parent-header"),$(".ms-menu-child").slideUp(),$(".ms-menu-child").removeClass("openMenuChild"),$(this).addClass("nav-title"),$(this).removeClass("ms-menu-parent-header"),$(this).siblings(".ms-menu-child").slideDown(),$(this).siblings(".ms-menu-child").addClass("openMenuChild"),$(this).siblings(".ms-menu-child > li").click(function(){$(this).siblings(".ms-menu-child").show(),$(".ms-menu-parent").siblings(".ms-menu-child > li >a").css("color","#e4e4e4"),$(this).siblings(".ms-menu-child > li > a").css("color","#1CAF9A")}))})}},$(function(){$("body").delegate(".ms-menu-parent","mouseover",function(){$(this).children("div").addClass("nav-title"),$(this).children("div").removeClass("ms-menu-parent-header")}),$("body").delegate(".ms-menu-parent","mouseout",function(){$(this).children(".ms-menu-child").hasClass("openMenuChild")?($(this).children("div").addClass("nav-title"),$(this).children("div").removeClass("ms-menu-parent-header")):($(this).children("div").removeClass("nav-title"),$(this).children("div").addClass("ms-menu-parent-header"))}),$('[data-toggle="tooltip"]').tooltip()});
\ No newline at end of file
src/main/webapp/static/skin/manager/4.5.7/js/ms.page.js deleted 100644 → 0
View file @ 96693c07
//后台分页js
(function($){
var methods = {
init: function(options) {
var o = $.extend({
items: 1,//总数量
itemsOnPage: 1,//每页显示数量
pages: 1,//总页数
displayedPages: 5,//显示页数
edges: 3,//边界显示页数
currentPage: 1,
hrefTextPrefix: '#page-',//分页链接地址的的前缀
hrefTextSuffix: '',
prevText: '上一页',//上一页显示文字
nextText: '下一页',
ellipseText: '&hellip;',
cssStyle: 'light-theme',//分页使用的样式
labelMap: [],//分页显示的信息
selectOnClick: true,
onPageClick: function(pageNumber, event) {
//点击分页进行的操作
},
onInit: function() {
//初始化时进行的操作
}
}, options || {});
var self = this;
o.pages = o.pages ? o.pages : Math.ceil(o.items / o.itemsOnPage) ? Math.ceil(o.items / o.itemsOnPage) : 1;
o.currentPage = o.currentPage - 1;
o.halfDisplayed = o.displayedPages / 2;
this.each(function() {
self.addClass(o.cssStyle).data('pagination', o);
methods._draw.call(self);
});
o.onInit();
return this;
},
selectPage: function(page) {
methods._selectPage.call(this, page - 1);
return this;
},
prevPage: function() {
var o = this.data('pagination');
if (o.currentPage > 0) {
methods._selectPage.call(this, o.currentPage - 1);
}
return this;
},
nextPage: function() {
var o = this.data('pagination');
if (o.currentPage < o.pages - 1) {
methods._selectPage.call(this, o.currentPage + 1);
}
return this;
},
getPagesCount: function() {
return this.data('pagination').pages;
},
getCurrentPage: function () {
return this.data('pagination').currentPage + 1;
},
destroy: function(){
this.empty();
return this;
},
drawPage: function (page) {
var o = this.data('pagination');
o.currentPage = page - 1;
this.data('pagination', o);
methods._draw.call(this);
return this;
},
redraw: function(){
methods._draw.call(this);
return this;
},
disable: function(){
var o = this.data('pagination');
o.disabled = true;
this.data('pagination', o);
methods._draw.call(this);
return this;
},
enable: function(){
var o = this.data('pagination');
o.disabled = false;
this.data('pagination', o);
methods._draw.call(this);
return this;
},
updateItems: function (newItems) {
var o = this.data('pagination');
o.items = newItems;
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._draw.call(this);
},
updateItemsOnPage: function (itemsOnPage) {
var o = this.data('pagination');
o.itemsOnPage = itemsOnPage;
o.pages = methods._getPages(o);
this.data('pagination', o);
methods._selectPage.call(this, 0);
return this;
},
_draw: function() {
var o = this.data('pagination'),
interval = methods._getInterval(o),
i,
tagName;
methods.destroy.call(this);
tagName = (typeof this.prop === 'function') ? this.prop('tagName') : this.attr('tagName');
var $panel = tagName === 'UL' ? this : $('<ul></ul>').appendTo(this);
//上一页
if (o.prevText) {
methods._appendItem.call(this, o.currentPage - 1, {text: o.prevText, classes: 'prev'});
}
// 开始位置的分页
if (interval.start > 0 && o.edges > 0) {
var end = Math.min(o.edges, interval.start);
for (i = 0; i < end; i++) {
methods._appendItem.call(this, i);
}
if (o.edges < interval.start && (interval.start - o.edges != 1)) {
$panel.append('<li class="disabled"><a>' + o.ellipseText + '</a></span></li>');
} else if (interval.start - o.edges == 1) {
methods._appendItem.call(this, o.edges);
}
}
// 中间段的分页显示
for (i = interval.start; i < interval.end; i++) {
methods._appendItem.call(this, i);
}
//结束的分页显示
if (interval.end < o.pages && o.edges > 0) {
if (o.pages - o.edges > interval.end && (o.pages - o.edges - interval.end != 1)) {
$panel.append('<li class="disabled"><a>' + o.ellipseText + '</a></li>');
} else if (o.pages - o.edges - interval.end == 1) {
methods._appendItem.call(this, interval.end++);
}
var begin = Math.max(o.pages - o.edges, interval.end);
for (i = begin; i < o.pages; i++) {
methods._appendItem.call(this, i);
}
}
// Generate Next link
if (o.nextText) {
methods._appendItem.call(this, o.currentPage + 1, {text: o.nextText, classes: 'next'});
}
},
//获取总页数
_getPages: function(o) {
var pages = Math.ceil(o.items / o.itemsOnPage);
return pages || 1;
},
//获取中间显示的页数
_getInterval: function(o) {
return {
start: Math.ceil(o.currentPage > o.halfDisplayed ? Math.max(Math.min(o.currentPage - o.halfDisplayed, (o.pages - o.displayedPages)), 0) : 0),
end: Math.ceil(o.currentPage > o.halfDisplayed ? Math.min(o.currentPage + o.halfDisplayed, o.pages) : Math.min(o.displayedPages, o.pages))
};
},
_appendItem: function(pageIndex, opts) {
var self = this, options, $link, o = self.data('pagination'), $linkWrapper = $('<li></li>'), $ul = self.find('ul');
pageIndex = pageIndex < 0 ? 0 : (pageIndex < o.pages ? pageIndex : o.pages - 1);
options = {
text: pageIndex + 1,
classes: ''
};
if (o.labelMap.length && o.labelMap[pageIndex]) {
options.text = o.labelMap[pageIndex];
}
options = $.extend(options, opts || {});
if (pageIndex == o.currentPage || o.disabled) {
if (o.disabled) {
$linkWrapper.addClass('disabled');
} else {
if (!options.classes) {
$linkWrapper.addClass('active');
}
}
$link = $('<a target="_self">' + (options.text) + '</a>');
} else {
$link = $('<a target="_self" href="' + o.hrefTextPrefix + (pageIndex + 1) + o.hrefTextSuffix + '" class="page-link">' + (options.text) + '</a>');
$link.click(function(event){
return methods._selectPage.call(self, pageIndex, event);
});
}
if (options.classes) {
$link.addClass(options.classes);
}
$linkWrapper.append($link);
if ($ul.length) {
$ul.append($linkWrapper);
} else {
self.append($linkWrapper);
}
},
_selectPage: function(pageIndex, event) {
var o = this.data('pagination');
o.currentPage = pageIndex;
if (o.selectOnClick) {
methods._draw.call(this);
}
return o.onPageClick(pageIndex + 1, event);
}
};
$.fn.pagination = function(method) {
// Method calling logic
if (methods[method] && method.charAt(0) != '_') {
return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
} else if (typeof method === 'object' || !method) {
return methods.init.apply(this, arguments);
} else {
$.error('Method ' + method + ' does not exist on jQuery.pagination');
}
};
})(jQuery);
src/main/webapp/static/skin/manager/4.5.7/js/ms.web.js deleted 100644 → 0
View file @ 96693c07
This diff is collapsed.
src/main/webapp/static/skin/manager/4.6.0/css/login.css deleted 100644 → 0
View file @ 96693c07
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #eee;
}
.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin .checkbox {
font-weight: normal;
}
.form-signin .form-control {
position: relative;
height: auto;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.form-signin input[name="verify"] {
margin-bottom:10px;
width:60%;
float:left;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.form-signin .checkimage {
width: 70px;
height:33px;
float: left;
margin: 5px 25px;
}
src/main/webapp/static/skin/manager/4.6.0/css/ms.mstore.min.css deleted 100644 → 0
View file @ 96693c07
.ms-upgrader-number,.topDiv{display:none}.ms-text2-hide,.ms-text3-hide,.ms-text8-hide{-webkit-box-orient:vertical}.ms-text-hide,.ms-text2-hide,.ms-text3-hide,.ms-text8-hide{text-overflow:ellipsis}.email-login,.weixin-login{position:absolute;top:15%;left:32%}html{height:100%}::-webkit-scrollbar{width:7px;height:7px}::-webkit-scrollbar-thumb{background-color:rgba(50,50,50,.3)}::-webkit-scrollbar-thumb:hover{background-color:rgba(50,50,50,.6)}::-webkit-scrollbar-track{background-color:rgba(50,50,50,.1)}::-webkit-scrollbar-track:hover{background-color:rgba(50,50,50,.2)}.topDiv{height:125px;width:100%}.ms-text-hide{word-break:keep-all;white-space:nowrap;overflow:hidden}.ms-text2-hide{display:-webkit-box;-webkit-line-clamp:2}.ms-text3-hide{display:-webkit-box;-webkit-line-clamp:3}.ms-text8-hide{display:-webkit-box;-webkit-line-clamp:8}.email-login{width:472px;border:1px solid #eaeaea;padding-top:20px;background:#fff;box-shadow:0 0 15px -5px #888}.email-login form{width:300px;margin:0 auto}.email-login .title{font-size:20px;text-align:center;margin-bottom:15px}.email-login .email-login-tit{margin-right:-15px;margin-left:-15px}.fixed-filter,.fixed-top{background:#fff;position:fixed}#login_container{margin:0 auto;width:472px;background:url(http://static.ming-soft.net/images/scorback.jpg)no-repeat #fcfcfc;text-align:center;padding-top:51px}.small-font{font-size:12px}.padding-clear{padding:0}.pageNav{text-align:right;margin-bottom:30px;padding-right:8px;overflow:hidden}.fixed-top{top:-10px;z-index:1000;left:0;margin-left:-15px;padding-left:15px}.fixed-filter{top:42px;z-index:1000;width:100%;left:0;box-shadow:0 5px 10px #d3d3d3}.mstore-content{overflow:auto;padding:15px;min-width:1100px}.mstore-content .free-font{color:#1E8BDD;font-weight:700}.mstore-content .price-font{color:#FB803C;font-weight:700}.mstore-content .glyphicon-star,.mstore-content .glyphicon-star-empty{color:#fb803c}.mstore-content .glyphicon-heart{color:#d9534f}.mstore-content .carousel{height:240px}.mstore-content .item img{margin:0 auto;max-width:100%}.mstore-content .group-button-active{background-color:#e6e6e6}.mstore-content .mswidth{width:100%}.mstore-content .content-new{margin-top:15px;border:1px solid #ddd;overflow:hidden;border-bottom:0}.mstore-content .content-new .new-upload{width:78%;float:left}.mstore-content .content-new .new-upload .table-title{padding:10px;height:40px;border-bottom:1px solid #ddd;border-right:1px #ddd solid;clear:both;font-weight:700;font-size:18px}.mstore-content .content-new .new-upload ul li{height:260px;border-radius:0;margin:0;border-left:none;border-top:none;float:left;cursor:pointer}.mstore-content .content-new .new-upload ul li .pic{display:block;height:74%;overflow:hidden;margin-bottom:5px}.mstore-content .content-new .new-upload ul li .share-info{min-width:220px;width:80%;float:left}.mstore-content .content-new .new-upload ul li .share-info .share-title{margin:5px 0}.mstore-content .content-new .new-upload ul li .share-user{width:40px;float:right;height:62px;overflow:hidden}.mstore-content .content-new .new-upload ul li .share-user img{width:100%}.mstore-content .content-new .new-upload ul li .share-user p{font-size:12px;line-height:25px}.mstore-content .content-new .order-user-list{width:22%;float:left;overflow:hidden;height:520px}.mstore-content .content-new .order-user-list .list-title{border-bottom:1px solid #ddd;margin:10px;padding-bottom:10px;font-weight:700}.mstore-content .order-user{width:33%;max-width:90px;float:left;height:95px;overflow:hidden;line-height:38px}.mstore-content .order-user p{font-size:12px}.mstore-content .content-people{border:1px solid #ddd;overflow:hidden;border-top:0}.mstore-content .content-people .solve-user-list{width:78%;float:left}.mstore-content .content-people .solve-user-list .table-title{padding:10px;height:40px;border-bottom:1px solid #ddd;border-right:1px #ddd solid;clear:both;font-weight:700;font-size:18px}.mstore-content .content-people .solve-user-list .solve-user-detail{border-radius:0;margin:0;border-left:none;height:295px;border-top:none;border-bottom:none}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-head{width:50px;float:left;padding-right:5px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-info{float:left}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-user-info .solve-heart{margin-top:5px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-descrip{height:60%;overflow:hidden;width:100%;padding:5px;line-height:23px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-bottom{position:absolute;bottom:10px;right:10px}.mstore-content .content-people .solve-user-list .solve-user-detail .solve-bottom .solve-btn{padding:0 10px}.mstore-content .content-people .download-top{width:22%;float:left}.mstore-content .content-people .download-top .list-title{border-bottom:1px solid #ddd;margin:10px;padding-bottom:10px;font-weight:700}.mstore-content .content-people .download-top .download-info{width:100%;margin-bottom:9px;float:left}.mstore-content .content-people .download-top .download-info .download-head{width:40px;float:left;margin:0 10px}.mstore-content .content-people .download-top .download-info strong{cursor:pointer}.mstore-content .model-all{margin:10px 0}.mstore-content .model-filter{margin-bottom:10px;padding:10px 15px}.mstore-content .nav-pills li{cursor:pointer}.mstore-content .nav-pills li a{padding:1px 20px}.mstore-content .share-detail{padding:0 5px}.mstore-content .share-detail .thumbnail{height:260px;cursor:pointer;margin-bottom:10px}.mstore-content .share-detail .pic{display:block;height:74%;overflow:hidden;margin-bottom:5px}.mstore-content .share-detail .pic .tit{position:absolute;padding:5px;top:5px;right:10px;text-align:center;color:#fff;background:#868686}.mstore-content .share-detail .pic .describe{color:#666;line-height:25px;margin-top:4px;font-size:12px;text-decoration:none}.mstore-content .share-detail .pic .describe:hover,.mstore-content .share-detail .pic:hover{text-decoration:none}.mstore-content .share-detail .share-info{width:70%;float:left}.mstore-content .share-detail .share-info .share-title{margin:5px 0}.mstore-content .share-detail .share-user{width:40px;float:right;height:62px;overflow:hidden}.mstore-content .share-detail .share-user img{width:100%}.mstore-content .share-detail .share-user p{font-size:12px;line-height:25px}.mstore-content .share-detail-user{margin-bottom:10px;overflow:hidden}.mstore-content .share-detail-user img{width:50px;height:50px;margin-right:10px}.mstore-content .read-more{margin-left:20px;color:#fff}.mstore-content .comment-info{border-bottom:1px dotted #ddd;padding-bottom:15px}.mstore-content .comment-info .comment-name{color:#337ab7;font-size:14px;font-weight:700}.mstore-content #detail-comment{max-height:500px;overflow-y:auto}
\ No newline at end of file
src/main/webapp/static/skin/manager/4.6.0/js/ms.web.js deleted 100644 → 0
View file @ 96693c07
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment