何书鹏 / anttest · 提交

转到一个项目

作者 Karson
提交 678be2f3a9d6953ec91b7bd70597ae6f21f7ccfa 1 个父辈 ebf38b47 master

修复selectpage树状显示的bug 

修复后台表格图片点击弹出新窗口的BUG
优化后台站点名称、用户昵称头像的显示渲染
优化后台宽度自适应
增强后台管理员安全鉴权
内嵌 并排对比
正在显示 21 个修改的文件 包含 760 行增加 和 699 行删除
... ... @@ -23,6 +23,7 @@ CREATE TABLE `fa_admin` (
`email` varchar(100) NOT NULL DEFAULT '' COMMENT '电子邮箱',
`loginfailure` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '失败次数',
`logintime` int(10) DEFAULT NULL COMMENT '登录时间',
`loginip` varchar(50) DEFAULT NULL COMMENT '登录IP',
`createtime` int(10) DEFAULT NULL COMMENT '创建时间',
`updatetime` int(10) DEFAULT NULL COMMENT '更新时间',
`token` varchar(59) NOT NULL DEFAULT '' COMMENT 'Session标识',
... ...
... ... @@ -6,6 +6,7 @@ use app\common\controller\Backend;
use app\common\library\Email;
use app\common\model\Config as ConfigModel;
use think\Exception;
use think\Validate;
/**
* 系统配置
... ... @@ -50,8 +51,8 @@ class Config extends Backend
if (in_array($value['type'], ['select', 'selects', 'checkbox', 'radio'])) {
$value['value'] = explode(',', $value['value']);
}
$value['content'] = json_decode($value['content'], TRUE);
$value['tip'] = htmlspecialchars($value['tip']);
$value['content'] = json_decode($value['content'], true);
$value['tip'] = htmlspecialchars($value['tip']);
$siteList[$v['group']]['list'][] = $value;
}
$index = 0;
... ... @@ -106,7 +107,7 @@ class Config extends Backend
* 编辑
* @param null $ids
*/
public function edit($ids = NULL)
public function edit($ids = null)
{
if ($this->request->isPost()) {
$row = $this->request->post("row/a");
... ... @@ -136,11 +137,15 @@ class Config extends Backend
}
}
/**
* 删除
* @param string $ids
*/
public function del($ids = "")
{
$name = $this->request->request('name');
$name = $this->request->post('name');
$config = ConfigModel::getByName($name);
if ($config) {
if ($name && $config) {
try {
$config->delete();
$this->refreshFile();
... ... @@ -160,17 +165,19 @@ class Config extends Backend
{
$config = [];
foreach ($this->model->all() as $k => $v) {
$value = $v->toArray();
if (in_array($value['type'], ['selects', 'checkbox', 'images', 'files'])) {
$value['value'] = explode(',', $value['value']);
}
if ($value['type'] == 'array') {
$value['value'] = (array)json_decode($value['value'], TRUE);
$value['value'] = (array)json_decode($value['value'], true);
}
$config[$value['name']] = $value['value'];
}
file_put_contents(APP_PATH . 'extra' . DS . 'site.php', '<?php' . "\n\nreturn " . var_export($config, true) . ";");
file_put_contents(
APP_PATH . 'extra' . DS . 'site.php',
'<?php' . "\n\nreturn " . var_export($config, true) . ";"
);
}
/**
... ... @@ -181,7 +188,6 @@ class Config extends Backend
{
$params = $this->request->post("row/a");
if ($params) {
$config = $this->model->get($params);
if (!$config) {
return $this->success();
... ... @@ -200,19 +206,25 @@ class Config extends Backend
public function emailtest()
{
$row = $this->request->post('row/a');
\think\Config::set('site', array_merge(\think\Config::get('site'), $row));
$receiver = $this->request->request("receiver");
$email = new Email;
$result = $email
->to($receiver)
->subject(__("This is a test mail"))
->message('<div style="min-height:550px; padding: 100px 55px 200px;">' . __('This is a test mail content') . '</div>')
->send();
if ($result) {
$this->success();
$receiver = $this->request->post("receiver");
if ($receiver) {
if (!Validate::is($receiver, "email")) {
$this->error(__('Please input correct email'));
}
\think\Config::set('site', array_merge(\think\Config::get('site'), $row));
$email = new Email;
$result = $email
->to($receiver)
->subject(__("This is a test mail"))
->message('<div style="min-height:550px; padding: 100px 55px 200px;">' . __('This is a test mail content') . '</div>')
->send();
if ($result) {
$this->success();
} else {
$this->error($email->getError());
}
} else {
$this->error($email->getError());
return $this->error(__('Invalid parameters'));
}
}
}
... ...
... ... @@ -22,23 +22,22 @@ class Profile extends Backend
{
//设置过滤方法
$this->request->filter(['strip_tags']);
if ($this->request->isAjax())
{
if ($this->request->isAjax()) {
$model = model('AdminLog');
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$total = $model
->where($where)
->where('admin_id', $this->auth->id)
->order($sort, $order)
->count();
->where($where)
->where('admin_id', $this->auth->id)
->order($sort, $order)
->count();
$list = $model
->where($where)
->where('admin_id', $this->auth->id)
->order($sort, $order)
->limit($offset, $limit)
->select();
->where($where)
->where('admin_id', $this->auth->id)
->order($sort, $order)
->limit($offset, $limit)
->select();
$result = array("total" => $total, "rows" => $list);
... ... @@ -52,18 +51,18 @@ class Profile extends Backend
*/
public function update()
{
if ($this->request->isPost())
{
if ($this->request->isPost()) {
$params = $this->request->post("row/a");
$params = array_filter(array_intersect_key($params, array_flip(array('email', 'nickname', 'password', 'avatar'))));
$params = array_filter(array_intersect_key(
$params,
array_flip(array('email', 'nickname', 'password', 'avatar'))
));
unset($v);
if (isset($params['password']))
{
if (isset($params['password'])) {
$params['salt'] = Random::alnum();
$params['password'] = md5(md5($params['password']) . $params['salt']);
}
if ($params)
{
if ($params) {
$admin = Admin::get($this->auth->id);
$admin->save($params);
//因为个人资料面板读取的Session显示，修改自己资料后同时更新Session
... ... @@ -74,5 +73,4 @@ class Profile extends Backend
}
return;
}
}
... ...
... ... @@ -44,5 +44,5 @@ return [
'Timezone' => '时区',
'Language' => '语言',
'View more' => '查看更多',
'Security tips' => '<i class="fa fa-warning"></i> 安全提示：你正在使用默认的后台登录入口，为了你的网站安全，建议你修改后台登录入口，<a href="https://forum.fastadmin.net/thread/7640" target="_blank">点击查看修改方法</a>',
'Security tips' => '<i class="fa fa-warning"></i> 安全提示：你正在使用默认的后台登录入口，为了你的网站安全，强烈建议你修改后台登录入口，<a href="https://forum.fastadmin.net/thread/7640" target="_blank">点击查看修改方法</a>',
];
... ...
... ... @@ -57,4 +57,5 @@ return [
'This is a test mail content' => '这是一封来自FastAdmin校验邮件,用于校验邮件配置是否正常!',
'This is a test mail' => '这是一封来自FastAdmin的邮件',
'Please input your email' => '请输入测试接收者邮箱',
'Please input correct email' => '请输入正确的邮箱地址',
];
... ...
... ... @@ -30,9 +30,9 @@ class Auth extends \fast\Auth
/**
* 管理员登录
*
* @param string $username 用户名
* @param string $password 密码
* @param int $keeptime 有效时长
* @param string $username 用户名
* @param string $password 密码
* @param int $keeptime 有效时长
* @return boolean
*/
public function login($username, $password, $keeptime = 0)
... ... @@ -58,6 +58,7 @@ class Auth extends \fast\Auth
}
$admin->loginfailure = 0;
$admin->logintime = time();
$admin->loginip = request()->ip(0, false);
$admin->token = Random::uuid();
$admin->save();
Session::set("admin", $admin->toArray());
... ... @@ -101,6 +102,11 @@ class Auth extends \fast\Auth
if ($key != md5(md5($id) . md5($keeptime) . md5($expiretime) . $admin->token)) {
return false;
}
$ip = request()->ip(0, false);
//IP有变动
if ($admin->loginip != $ip) {
return false;
}
Session::set("admin", $admin->toArray());
//刷新自动登录的时效
$this->keeplogin($keeptime);
... ... @@ -113,7 +119,7 @@ class Auth extends \fast\Auth
/**
* 刷新保持登录的Cookie
*
* @param int $keeptime
* @param int $keeptime
* @return boolean
*/
protected function keeplogin($keeptime = 0)
... ... @@ -178,6 +184,9 @@ class Auth extends \fast\Auth
return false;
}
}
if (!isset($admin['loginip']) || $admin['loginip'] != request()->ip(0, false)) {
return false;
}
$this->logined = true;
return true;
}
... ... @@ -258,10 +267,17 @@ class Auth extends \fast\Auth
foreach ($groups as $k => $v) {
$groupIds[] = $v['id'];
}
$originGroupIds = $groupIds;
foreach ($groups as $k => $v) {
if (in_array($v['pid'], $originGroupIds)) {
$groupIds = array_diff($groupIds, [$v['id']]);
unset($groups[$k]);
}
}
// 取出所有分组
$groupList = \app\admin\model\AuthGroup::where(['status' => 'normal'])->select();
$objList = [];
foreach ($groups as $K => $v) {
foreach ($groups as $k => $v) {
if ($v['rules'] === '*') {
$objList = $groupList;
break;
... ... @@ -295,7 +311,6 @@ class Auth extends \fast\Auth
field('uid,group_id')
->where('group_id', 'in', $groupIds)
->select();
foreach ($authGroupList as $k => $v) {
$childrenAdminIds[] = $v['uid'];
}
... ... @@ -340,7 +355,7 @@ class Auth extends \fast\Auth
/**
* 获取左侧和顶部菜单栏
*
* @param array $params URL对应的badge数据
* @param array $params URL对应的badge数据
* @param string $fixedPage 默认页
* @return array
*/
... ... @@ -435,18 +450,36 @@ class Auth extends \fast\Auth
$selectParentIds = $tree->getParentsIds($select_id, true);
}
foreach ($topList as $index => $item) {
$childList = Tree::instance()->getTreeMenu($item['id'], '<li class="@class" pid="@pid"><a href="@url@addtabs" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>', $select_id, '', 'ul', 'class="treeview-menu"');
$childList = Tree::instance()->getTreeMenu(
$item['id'],
'<li class="@class" pid="@pid"><a href="@url@addtabs" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>',
$select_id,
'',
'ul',
'class="treeview-menu"'
);
$current = in_array($item['id'], $selectParentIds);
$url = $childList ? 'javascript:;' : url($item['url']);
$addtabs = $childList || !$url ? "" : (stripos($url, "?") !== false ? "&" : "?") . "ref=addtabs";
$childList = str_replace('" pid="' . $item['id'] . '"', ' treeview ' . ($current ? '' : 'hidden') . '" pid="' . $item['id'] . '"', $childList);
$childList = str_replace(
'" pid="' . $item['id'] . '"',
' treeview ' . ($current ? '' : 'hidden') . '" pid="' . $item['id'] . '"',
$childList
);
$nav .= '<li class="' . ($current ? 'active' : '') . '"><a href="' . $url . $addtabs . '" addtabs="' . $item['id'] . '" url="' . $url . '"><i class="' . $item['icon'] . '"></i> <span>' . $item['title'] . '</span> <span class="pull-right-container"> </span></a> </li>';
$menu .= $childList;
}
} else {
// 构造菜单数据
Tree::instance()->init($ruleList);
$menu = Tree::instance()->getTreeMenu(0, '<li class="@class"><a href="@url@addtabs" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>', $select_id, '', 'ul', 'class="treeview-menu"');
$menu = Tree::instance()->getTreeMenu(
0,
'<li class="@class"><a href="@url@addtabs" addtabs="@id" url="@url" py="@py" pinyin="@pinyin"><i class="@icon"></i> <span>@title</span> <span class="pull-right-container">@caret @badge</span></a> @childlist</li>',
$select_id,
'',
'ul',
'class="treeview-menu"'
);
if ($selected) {
$nav .= '<li role="presentation" id="tab_' . $selected['id'] . '" class="' . ($referer ? '' : 'active') . '"><a href="#con_' . $selected['id'] . '" node-id="' . $selected['id'] . '" aria-controls="' . $selected['id'] . '" role="tab" data-toggle="tab"><i class="' . $selected['icon'] . ' fa-fw"></i> <span>' . $selected['title'] . '</span> </a></li>';
}
... ...
<!-- Logo -->
<a href="javascript:;" class="logo">
<!-- 迷你模式下Logo的大小为50X50 -->
<span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'}</span>
<span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span>
<!-- 普通模式下Logo -->
<span class="logo-lg"><b>{$site.name|mb_substr=0,4,'utf-8'}</b>{$site.name|mb_substr=4,null,'utf-8'}</span>
<span class="logo-lg"><b>{$site.name|mb_substr=0,4,'utf-8'|htmlentities}</b>{$site.name|mb_substr=4,null,'utf-8'|htmlentities}</span>
</a>
<!-- 顶部通栏样式 -->
... ... @@ -72,16 +72,16 @@
<!-- 账号信息下拉框 -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="{$admin.avatar|cdnurl}" class="user-image" alt="{$admin.nickname}">
<span class="hidden-xs">{$admin.nickname}</span>
<img src="{$admin.avatar|cdnurl|htmlentities}" class="user-image" alt="{$admin.nickname|htmlentities}">
<span class="hidden-xs">{$admin.nickname|htmlentities}</span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
<img src="{$admin.avatar|cdnurl}" class="img-circle" alt="">
<img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">
<p>
{$admin.nickname}
{$admin.nickname|htmlentities}
<small>{$admin.logintime|date="Y-m-d H:i:s",###}</small>
</p>
</li>
... ...
... ... @@ -3,10 +3,10 @@
<!-- 管理员信息 -->
<div class="user-panel hidden-xs">
<div class="pull-left image">
<a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl}" class="img-circle" /></a>
<a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>
</div>
<div class="pull-left info">
<p>{$admin.nickname}</p>
<p>{$admin.nickname|htmlentities}</p>
<i class="fa fa-circle text-success"></i> {:__('Online')}
</div>
</div>
... ...
<script src="__CDN__/assets/js/require{$Think.config.app_debug?'':'.min'}.js" data-main="__CDN__/assets/js/require-backend{$Think.config.app_debug?'':'.min'}.js?v={$site.version}"></script>
\ No newline at end of file
<script src="__CDN__/assets/js/require{$Think.config.app_debug?'':'.min'}.js" data-main="__CDN__/assets/js/require-backend{$Think.config.app_debug?'':'.min'}.js?v={$site.version|htmlentities}"></script>
\ No newline at end of file
... ...
... ... @@ -46,18 +46,18 @@
<div class="panel-body">
<form id="update-form" role="form" data-toggle="validator" method="POST" action="{:url('general.profile/update')}">
<input type="hidden" id="c-avatar" name="row[avatar]" value="{$admin.avatar}"/>
<input type="hidden" id="c-avatar" name="row[avatar]" value="{$admin.avatar|htmlentities}"/>
<div class="box-body box-profile">
<div class="profile-avatar-container">
<img class="profile-user-img img-responsive img-circle plupload" src="{$admin.avatar|cdnurl}" alt="">
<img class="profile-user-img img-responsive img-circle plupload" src="{$admin.avatar|cdnurl|htmlentities}" alt="">
<div class="profile-avatar-text img-circle">{:__('Click to edit')}</div>
<button id="plupload-avatar" class="plupload" data-input-id="c-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button>
</div>
<h3 class="profile-username text-center">{$admin.username}</h3>
<h3 class="profile-username text-center">{$admin.username|htmlentities}</h3>
<p class="text-muted text-center">{$admin.email}</p>
<p class="text-muted text-center">{$admin.email|htmlentities}</p>
<div class="form-group">
<label for="username" class="control-label">{:__('Username')}:</label>
<input type="text" class="form-control" id="username" name="row[username]" value="{$admin.username|htmlentities}" disabled/>
... ...
... ... @@ -490,7 +490,7 @@ class Backend extends Controller
'pid' => isset($item['pid']) ? $item['pid'] : 0
];
}
if ($istree) {
if ($istree && !$primaryvalue) {
$tree = Tree::instance();
$tree->init(collection($list)->toArray(), 'pid');
$list = $tree->getTreeList($tree->getTreeArray(0), $field);
... ...
<script src="__CDN__/assets/js/require{$Think.config.app_debug?'':'.min'}.js" data-main="__CDN__/assets/js/require-frontend{$Think.config.app_debug?'':'.min'}.js?v={$site.version}"></script>
\ No newline at end of file
<script src="__CDN__/assets/js/require{$Think.config.app_debug?'':'.min'}.js" data-main="__CDN__/assets/js/require-frontend{$Think.config.app_debug?'':'.min'}.js?v={$site.version|htmlentities}"></script>
\ No newline at end of file
... ...
... ... @@ -61,7 +61,7 @@
<footer class="footer" style="clear:both">
<!-- FastAdmin是开源程序，建议在您的网站底部保留一个FastAdmin的链接 -->
<p class="copyright">Copyright&nbsp;©&nbsp;2017-2019 Powered by <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> All Rights Reserved {$site.name} {:__('Copyrights')} <a href="http://www.miibeian.gov.cn" target="_blank">{$site.beian}</a></p>
<p class="copyright">Copyright&nbsp;©&nbsp;2017-2019 Powered by <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> All Rights Reserved {$site.name|htmlentities} {:__('Copyrights')} <a href="http://www.miibeian.gov.cn" target="_blank">{$site.beian|htmlentities}</a></p>
</footer>
{include file="common/script" /}
... ...
... ... @@ -918,7 +918,7 @@ table.table-nowrap thead > tr > th {
}
}
/*平板样式*/
@media (max-width: 768px) {
@media (max-width: 767px) {
body .wrapper .main-header .logo {
background: none;
color: #fff;
... ... @@ -997,4 +997,4 @@ table.table-nowrap thead > tr > th {
.btn-switcher .text-gray {
color: #d2d6de !important;
}
/*# sourceMappingURL=../css/backend.css.map */
\ No newline at end of file
/*# sourceMappingURL=backend.css.map */
\ No newline at end of file
... ...
... ... @@ -533,7 +533,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
return '<a href="javascript:;" data-toggle="tooltip" title="' + __('Click to toggle status') + '" class="btn btn-toggle btn-' + (row.addon.state == 1 ? "disable" : "enable") + '" data-action="' + (row.addon.state == 1 ? "disable" : "enable") + '" data-name="' + row.name + '"><i class="fa ' + (row.addon.state == 0 ? 'fa-toggle-on fa-rotate-180 text-gray' : 'fa-toggle-on text-success') + ' fa-2x"></i></a>';
},
author: function (value, row, index) {
return '<a href="https://wpa.qq.com/msgrd?v=3&uin=' + row.qq + '&site=fastadmin.net&menu=yes" target="_blank" data-toggle="tooltip" title="' + __('Click to contact developer') + '" class="text-primary">' + value + '</a>';
var url = 'javascript:';
if (typeof row.homepage !== 'undefined') {
url = row.homepage;
} else if (typeof row.qq !== 'undefined') {
url = 'https://wpa.qq.com/msgrd?v=3&uin=' + row.qq + '&site=fastadmin.net&menu=yes';
}
return '<a href="' + url + '" target="_blank" data-toggle="tooltip" title="' + __('Click to contact developer') + '" class="text-primary">' + value + '</a>';
},
price: function (value, row, index) {
if (isNaN(value)) {
... ...
... ... @@ -67,8 +67,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
var that = this;
Layer.prompt({title: __('Please input your email'), formType: 0}, function (value, index) {
Backend.api.ajax({
url: "general/config/emailtest?receiver=" + value,
data: $(that).closest("form").serialize()
url: "general/config/emailtest",
data: $(that).closest("form").serialize() + "&receiver=" + value
});
});
... ... @@ -79,7 +79,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
var that = this;
Layer.confirm(__('Are you sure you want to delete this item?'), {icon: 3, title:'提示'}, function (index) {
Backend.api.ajax({
url: "general/config/del?receiver=" + value,
url: "general/config/del",
data: {name: $(that).data("name")}
}, function () {
$(that).closest("tr").remove();
... ...
... ... @@ -10343,7 +10343,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
image: function (value, row, index) {
value = value ? value : '/assets/img/blank.gif';
var classname = typeof this.classname !== 'undefined' ? this.classname : 'img-sm img-center';
return '<a href="javascript:void(0)" target="_blank"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>';
return '<a href="javascript:"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>';
},
images: function (value, row, index) {
value = value === null ? '' : value.toString();
... ... @@ -10352,10 +10352,14 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
var html = [];
$.each(arr, function (i, value) {
value = value ? value : '/assets/img/blank.gif';
html.push('<a href="javascript:void(0)" target="_blank"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>');
html.push('<a href="javascript:"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>');
});
return html.join(' ');
},
content: function (value, row, index) {
var width = this.width != undefined ? this.width : 250;
return "<div style='white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:" + width + "px;'>" + value + "</div>";
},
status: function (value, row, index) {
var custom = {normal: 'success', hidden: 'gray', deleted: 'danger', locked: 'info'};
if (typeof this.custom !== 'undefined') {
... ... @@ -10551,7 +10555,8 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
text = typeof j.text === 'function' ? j.text.call(table, row, j) : j.text ? j.text : '';
title = typeof j.title === 'function' ? j.title.call(table, row, j) : j.title ? j.title : text;
refresh = j.refresh ? 'data-refresh="' + j.refresh + '"' : '';
confirm = j.confirm ? 'data-confirm="' + j.confirm + '"' : '';
confirm = typeof j.confirm === 'function' ? j.confirm.call(table, row, j) : (typeof j.confirm !== 'undefined' ? j.confirm : false);
confirm = confirm ? 'data-confirm="' + confirm + '"' : '';
extend = j.extend ? j.extend : '';
disable = typeof j.disable === 'function' ? j.disable.call(table, row, j) : (typeof j.disable !== 'undefined' ? j.disable : false);
if (disable) {
... ... @@ -10644,387 +10649,387 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
return Table;
});
// jQuery List DragSort v0.5.2
// Website: http://dragsort.codeplex.com/
// License: http://dragsort.codeplex.com/license
(function($) {
$.fn.dragsort = function(options) {
if (options == "destroy") {
$(this.selector).trigger("dragsort-uninit");
return;
}
var opts = $.extend({}, $.fn.dragsort.defaults, options);
var lists = [];
var list = null, lastPos = null;
this.each(function(i, cont) {
//if list container is table, the browser automatically wraps rows in tbody if not specified so change list container to tbody so that children returns rows as user expected
if ($(cont).is("table") && $(cont).children().size() == 1 && $(cont).children().is("tbody"))
cont = $(cont).children().get(0);
var newList = {
draggedItem: null,
placeHolderItem: null,
pos: null,
offset: null,
offsetLimit: null,
scroll: null,
container: cont,
init: function() {
//set options to default values if not set
opts.tagName = opts.tagName == "" ? ($(this.container).children().size() == 0 ? "li" : $(this.container).children().get(0).tagName.toLowerCase()) : opts.tagName;
if (opts.itemSelector == "")
opts.itemSelector = opts.tagName;
if (opts.dragSelector == "")
opts.dragSelector = opts.tagName;
if (opts.placeHolderTemplate == "")
opts.placeHolderTemplate = "<" + opts.tagName + ">&nbsp;</" + opts.tagName + ">";
//listidx allows reference back to correct list variable instance
$(this.container).attr("data-listidx", i).mousedown(this.grabItem).bind("dragsort-uninit", this.uninit);
this.styleDragHandlers(true);
},
uninit: function() {
var list = lists[$(this).attr("data-listidx")];
$(list.container).unbind("mousedown", list.grabItem).unbind("dragsort-uninit");
list.styleDragHandlers(false);
},
getItems: function() {
return $(this.container).children(opts.itemSelector);
},
styleDragHandlers: function(cursor) {
this.getItems().map(function() { return $(this).is(opts.dragSelector) ? this : $(this).find(opts.dragSelector).get(); }).css("cursor", cursor ? "pointer" : "");
},
grabItem: function(e) {
var list = lists[$(this).attr("data-listidx")];
var item = $(e.target).closest("[data-listidx] > " + opts.tagName).get(0);
var insideMoveableItem = list.getItems().filter(function() { return this == item; }).size() > 0;
//if not left click or if clicked on excluded element (e.g. text box) or not a moveable list item return
if (e.which != 1 || $(e.target).is(opts.dragSelectorExclude) || $(e.target).closest(opts.dragSelectorExclude).size() > 0 || !insideMoveableItem)
return;
//prevents selection, stops issue on Fx where dragging hyperlink doesn't work and on IE where it triggers mousemove even though mouse hasn't moved,
//does also stop being able to click text boxes hence dragging on text boxes by default is disabled in dragSelectorExclude
//e.preventDefault();
//change cursor to move while dragging
var dragHandle = e.target;
while (!$(dragHandle).is(opts.dragSelector)) {
if (dragHandle == this) return;
dragHandle = dragHandle.parentNode;
}
$(dragHandle).attr("data-cursor", $(dragHandle).css("cursor"));
$(dragHandle).css("cursor", "move");
//on mousedown wait for movement of mouse before triggering dragsort script (dragStart) to allow clicking of hyperlinks to work
var listElem = this;
var trigger = function() {
list.dragStart.call(listElem, e);
$(list.container).unbind("mousemove", trigger);
};
$(list.container).mousemove(trigger).mouseup(function() { $(list.container).unbind("mousemove", trigger); $(dragHandle).css("cursor", $(dragHandle).attr("data-cursor")); });
},
dragStart: function(e) {
if (list != null && list.draggedItem != null)
list.dropItem();
list = lists[$(this).attr("data-listidx")];
list.draggedItem = $(e.target).closest("[data-listidx] > " + opts.tagName)
//record current position so on dragend we know if the dragged item changed position or not, not using getItems to allow dragsort to restore dragged item to original location in relation to fixed items
list.draggedItem.attr("data-origpos", $(this).attr("data-listidx") + "-" + $(list.container).children().index(list.draggedItem));
//calculate mouse offset relative to draggedItem
var mt = parseInt(list.draggedItem.css("marginTop"));
var ml = parseInt(list.draggedItem.css("marginLeft"));
list.offset = list.draggedItem.offset();
list.offset.top = e.pageY - list.offset.top + (isNaN(mt) ? 0 : mt) - 1;
list.offset.left = e.pageX - list.offset.left + (isNaN(ml) ? 0 : ml) - 1;
//calculate box the dragged item can't be dragged outside of
if (!opts.dragBetween) {
var containerHeight = $(list.container).outerHeight() == 0 ? Math.max(1, Math.round(0.5 + list.getItems().size() * list.draggedItem.outerWidth() / $(list.container).outerWidth())) * list.draggedItem.outerHeight() : $(list.container).outerHeight();
list.offsetLimit = $(list.container).offset();
list.offsetLimit.right = list.offsetLimit.left + $(list.container).outerWidth() - list.draggedItem.outerWidth();
list.offsetLimit.bottom = list.offsetLimit.top + containerHeight - list.draggedItem.outerHeight();
}
//create placeholder item
var h = list.draggedItem.height();
var w = list.draggedItem.width();
if (opts.tagName == "tr") {
list.draggedItem.children().each(function() { $(this).width($(this).width()); });
list.placeHolderItem = list.draggedItem.clone().attr("data-placeholder", true);
list.draggedItem.after(list.placeHolderItem);
//list.placeHolderItem.children().each(function() { $(this).css({ borderWidth:0, width: $(this).width() + 1, height: $(this).height() + 1 }).html("&nbsp;"); });
list.placeHolderItem.children().each(function() { $(this).html("&nbsp;"); });
} else {
list.draggedItem.after(opts.placeHolderTemplate);
list.placeHolderItem = list.draggedItem.next().css({ height: h, width: w }).attr("data-placeholder", true);
}
if (opts.tagName == "td") {
var listTable = list.draggedItem.closest("table").get(0);
$("<table id='" + listTable.id + "' style='border-width: 0px;' class='dragSortItem " + listTable.className + "'><tr></tr></table>").appendTo("body").children().append(list.draggedItem);
}
//style draggedItem while dragging
var orig = list.draggedItem.attr("style");
list.draggedItem.attr("data-origstyle", orig ? orig : "");
list.draggedItem.css({ position: "absolute", opacity: 0.8, "z-index": 999, height: h, width: w });
//auto-scroll setup
list.scroll = { moveX: 0, moveY: 0, maxX: $(document).width() - $(window).width(), maxY: $(document).height() - $(window).height() };
list.scroll.scrollY = window.setInterval(function() {
if (opts.scrollContainer != window) {
$(opts.scrollContainer).scrollTop($(opts.scrollContainer).scrollTop() + list.scroll.moveY);
return;
}
var t = $(opts.scrollContainer).scrollTop();
if (list.scroll.moveY > 0 && t < list.scroll.maxY || list.scroll.moveY < 0 && t > 0) {
$(opts.scrollContainer).scrollTop(t + list.scroll.moveY);
list.draggedItem.css("top", list.draggedItem.offset().top + list.scroll.moveY + 1);
}
}, 10);
list.scroll.scrollX = window.setInterval(function() {
if (opts.scrollContainer != window) {
$(opts.scrollContainer).scrollLeft($(opts.scrollContainer).scrollLeft() + list.scroll.moveX);
return;
}
var l = $(opts.scrollContainer).scrollLeft();
if (list.scroll.moveX > 0 && l < list.scroll.maxX || list.scroll.moveX < 0 && l > 0) {
$(opts.scrollContainer).scrollLeft(l + list.scroll.moveX);
list.draggedItem.css("left", list.draggedItem.offset().left + list.scroll.moveX + 1);
}
}, 10);
//misc
$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
list.setPos(e.pageX, e.pageY);
$(document).bind("mousemove", list.swapItems);
$(document).bind("mouseup", list.dropItem);
if (opts.scrollContainer != window)
$(window).bind("wheel", list.wheel);
},
//set position of draggedItem
setPos: function(x, y) {
//remove mouse offset so mouse cursor remains in same place on draggedItem instead of top left corner
var top = y - this.offset.top;
var left = x - this.offset.left;
//limit top, left to within box draggedItem can't be dragged outside of
if (!opts.dragBetween) {
top = Math.min(this.offsetLimit.bottom, Math.max(top, this.offsetLimit.top));
left = Math.min(this.offsetLimit.right, Math.max(left, this.offsetLimit.left));
}
//adjust top & left calculations to parent offset
var parent = this.draggedItem.offsetParent().not("body").offset(); //offsetParent returns body even when it's static, if not static offset is only factoring margin
if (parent != null) {
top -= parent.top;
left -= parent.left;
}
//set x or y auto-scroll amount
if (opts.scrollContainer == window) {
y -= $(window).scrollTop();
x -= $(window).scrollLeft();
y = Math.max(0, y - $(window).height() + 5) + Math.min(0, y - 5);
x = Math.max(0, x - $(window).width() + 5) + Math.min(0, x - 5);
} else {
var cont = $(opts.scrollContainer);
var offset = cont.offset();
y = Math.max(0, y - cont.height() - offset.top) + Math.min(0, y - offset.top);
x = Math.max(0, x - cont.width() - offset.left) + Math.min(0, x - offset.left);
}
list.scroll.moveX = x == 0 ? 0 : x * opts.scrollSpeed / Math.abs(x);
list.scroll.moveY = y == 0 ? 0 : y * opts.scrollSpeed / Math.abs(y);
//move draggedItem to new mouse cursor location
this.draggedItem.css({ top: top, left: left });
},
//if scroll container is a div allow mouse wheel to scroll div instead of window when mouse is hovering over
wheel: function(e) {
if (list && opts.scrollContainer != window) {
var cont = $(opts.scrollContainer);
var offset = cont.offset();
e = e.originalEvent;
if (e.clientX > offset.left && e.clientX < offset.left + cont.width() && e.clientY > offset.top && e.clientY < offset.top + cont.height()) {
var deltaY = (e.deltaMode == 0 ? 1 : 10) * e.deltaY;
cont.scrollTop(cont.scrollTop() + deltaY);
e.preventDefault();
}
}
},
//build a table recording all the positions of the moveable list items
buildPositionTable: function() {
var pos = [];
this.getItems().not([list.draggedItem[0], list.placeHolderItem[0]]).each(function(i) {
var loc = $(this).offset();
loc.right = loc.left + $(this).outerWidth();
loc.bottom = loc.top + $(this).outerHeight();
loc.elm = this;
pos[i] = loc;
});
this.pos = pos;
},
dropItem: function() {
if (list.draggedItem == null)
return;
//list.draggedItem.attr("style", "") doesn't work on IE8 and jQuery 1.5 or lower
//list.draggedItem.removeAttr("style") doesn't work on chrome and jQuery 1.6 (works jQuery 1.5 or lower)
var orig = list.draggedItem.attr("data-origstyle");
list.draggedItem.attr("style", orig);
if (orig == "")
list.draggedItem.removeAttr("style");
list.draggedItem.removeAttr("data-origstyle");
list.styleDragHandlers(true);
list.placeHolderItem.before(list.draggedItem);
list.placeHolderItem.remove();
$("[data-droptarget], .dragSortItem").remove();
window.clearInterval(list.scroll.scrollY);
window.clearInterval(list.scroll.scrollX);
//if position changed call dragEnd
if (list.draggedItem.attr("data-origpos") != $(lists).index(list) + "-" + $(list.container).children().index(list.draggedItem))
if (opts.dragEnd.apply(list.draggedItem) == false) { //if dragEnd returns false revert order
var pos = list.draggedItem.attr("data-origpos").split('-');
var nextItem = $(lists[pos[0]].container).children().not(list.draggedItem).eq(pos[1]);
if (nextItem.size() > 0)
nextItem.before(list.draggedItem);
else if (pos[1] == 0) //was the only item in list
$(lists[pos[0]].container).prepend(list.draggedItem);
else //was the last item in list
$(lists[pos[0]].container).append(list.draggedItem);
}
list.draggedItem.removeAttr("data-origpos");
list.draggedItem = null;
$(document).unbind("mousemove", list.swapItems);
$(document).unbind("mouseup", list.dropItem);
if (opts.scrollContainer != window)
$(window).unbind("wheel", list.wheel);
return false;
},
//swap the draggedItem (represented visually by placeholder) with the list item the it has been dragged on top of
swapItems: function(e) {
if (list.draggedItem == null)
return false;
//move draggedItem to mouse location
list.setPos(e.pageX, e.pageY);
//retrieve list and item position mouse cursor is over
var ei = list.findPos(e.pageX, e.pageY);
var nlist = list;
for (var i = 0; ei == -1 && opts.dragBetween && i < lists.length; i++) {
ei = lists[i].findPos(e.pageX, e.pageY);
nlist = lists[i];
}
//if not over another moveable list item return
if (ei == -1)
return false;
//save fixed items locations
var children = function() { return $(nlist.container).children().not(nlist.draggedItem); };
var fixed = children().not(opts.itemSelector).each(function(i) { this.idx = children().index(this); });
//if moving draggedItem up or left place placeHolder before list item the dragged item is hovering over otherwise place it after
if (lastPos == null || lastPos.top > list.draggedItem.offset().top || lastPos.left > list.draggedItem.offset().left)
$(nlist.pos[ei].elm).before(list.placeHolderItem);
else
$(nlist.pos[ei].elm).after(list.placeHolderItem);
//restore fixed items location
fixed.each(function() {
var elm = children().eq(this.idx).get(0);
if (this != elm && children().index(this) < this.idx)
$(this).insertAfter(elm);
else if (this != elm)
$(this).insertBefore(elm);
});
//misc
$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
lastPos = list.draggedItem.offset();
return false;
},
//returns the index of the list item the mouse is over
findPos: function(x, y) {
for (var i = 0; i < this.pos.length; i++) {
if (this.pos[i].left < x && this.pos[i].right > x && this.pos[i].top < y && this.pos[i].bottom > y)
return i;
}
return -1;
},
//create drop targets which are placeholders at the end of other lists to allow dragging straight to the last position
createDropTargets: function() {
if (!opts.dragBetween)
return;
$(lists).each(function() {
var ph = $(this.container).find("[data-placeholder]");
var dt = $(this.container).find("[data-droptarget]");
if (ph.size() > 0 && dt.size() > 0)
dt.remove();
else if (ph.size() == 0 && dt.size() == 0) {
if (opts.tagName == "td")
$(opts.placeHolderTemplate).attr("data-droptarget", true).appendTo(this.container);
else
//list.placeHolderItem.clone().removeAttr("data-placeholder") crashes in IE7 and jquery 1.5.1 (doesn't in jquery 1.4.2 or IE8)
$(this.container).append(list.placeHolderItem.removeAttr("data-placeholder").clone().attr("data-droptarget", true));
list.placeHolderItem.attr("data-placeholder", true);
}
});
}
};
newList.init();
lists.push(newList);
});
return this;
};
$.fn.dragsort.defaults = {
tagName:"",
itemSelector: "",
dragSelector: "",
dragSelectorExclude: "input, textarea",
dragEnd: function() { },
dragBetween: false,
placeHolderTemplate: "",
scrollContainer: window,
scrollSpeed: 5
};
})(jQuery);
// jQuery List DragSort v0.5.2
// Website: http://dragsort.codeplex.com/
// License: http://dragsort.codeplex.com/license
(function($) {
$.fn.dragsort = function(options) {
if (options == "destroy") {
$(this.selector).trigger("dragsort-uninit");
return;
}
var opts = $.extend({}, $.fn.dragsort.defaults, options);
var lists = [];
var list = null, lastPos = null;
this.each(function(i, cont) {
//if list container is table, the browser automatically wraps rows in tbody if not specified so change list container to tbody so that children returns rows as user expected
if ($(cont).is("table") && $(cont).children().size() == 1 && $(cont).children().is("tbody"))
cont = $(cont).children().get(0);
var newList = {
draggedItem: null,
placeHolderItem: null,
pos: null,
offset: null,
offsetLimit: null,
scroll: null,
container: cont,
init: function() {
//set options to default values if not set
opts.tagName = opts.tagName == "" ? ($(this.container).children().size() == 0 ? "li" : $(this.container).children().get(0).tagName.toLowerCase()) : opts.tagName;
if (opts.itemSelector == "")
opts.itemSelector = opts.tagName;
if (opts.dragSelector == "")
opts.dragSelector = opts.tagName;
if (opts.placeHolderTemplate == "")
opts.placeHolderTemplate = "<" + opts.tagName + ">&nbsp;</" + opts.tagName + ">";
//listidx allows reference back to correct list variable instance
$(this.container).attr("data-listidx", i).mousedown(this.grabItem).bind("dragsort-uninit", this.uninit);
this.styleDragHandlers(true);
},
uninit: function() {
var list = lists[$(this).attr("data-listidx")];
$(list.container).unbind("mousedown", list.grabItem).unbind("dragsort-uninit");
list.styleDragHandlers(false);
},
getItems: function() {
return $(this.container).children(opts.itemSelector);
},
styleDragHandlers: function(cursor) {
this.getItems().map(function() { return $(this).is(opts.dragSelector) ? this : $(this).find(opts.dragSelector).get(); }).css("cursor", cursor ? "pointer" : "");
},
grabItem: function(e) {
var list = lists[$(this).attr("data-listidx")];
var item = $(e.target).closest("[data-listidx] > " + opts.tagName).get(0);
var insideMoveableItem = list.getItems().filter(function() { return this == item; }).size() > 0;
//if not left click or if clicked on excluded element (e.g. text box) or not a moveable list item return
if (e.which != 1 || $(e.target).is(opts.dragSelectorExclude) || $(e.target).closest(opts.dragSelectorExclude).size() > 0 || !insideMoveableItem)
return;
//prevents selection, stops issue on Fx where dragging hyperlink doesn't work and on IE where it triggers mousemove even though mouse hasn't moved,
//does also stop being able to click text boxes hence dragging on text boxes by default is disabled in dragSelectorExclude
//e.preventDefault();
//change cursor to move while dragging
var dragHandle = e.target;
while (!$(dragHandle).is(opts.dragSelector)) {
if (dragHandle == this) return;
dragHandle = dragHandle.parentNode;
}
$(dragHandle).attr("data-cursor", $(dragHandle).css("cursor"));
$(dragHandle).css("cursor", "move");
//on mousedown wait for movement of mouse before triggering dragsort script (dragStart) to allow clicking of hyperlinks to work
var listElem = this;
var trigger = function() {
list.dragStart.call(listElem, e);
$(list.container).unbind("mousemove", trigger);
};
$(list.container).mousemove(trigger).mouseup(function() { $(list.container).unbind("mousemove", trigger); $(dragHandle).css("cursor", $(dragHandle).attr("data-cursor")); });
},
dragStart: function(e) {
if (list != null && list.draggedItem != null)
list.dropItem();
list = lists[$(this).attr("data-listidx")];
list.draggedItem = $(e.target).closest("[data-listidx] > " + opts.tagName)
//record current position so on dragend we know if the dragged item changed position or not, not using getItems to allow dragsort to restore dragged item to original location in relation to fixed items
list.draggedItem.attr("data-origpos", $(this).attr("data-listidx") + "-" + $(list.container).children().index(list.draggedItem));
//calculate mouse offset relative to draggedItem
var mt = parseInt(list.draggedItem.css("marginTop"));
var ml = parseInt(list.draggedItem.css("marginLeft"));
list.offset = list.draggedItem.offset();
list.offset.top = e.pageY - list.offset.top + (isNaN(mt) ? 0 : mt) - 1;
list.offset.left = e.pageX - list.offset.left + (isNaN(ml) ? 0 : ml) - 1;
//calculate box the dragged item can't be dragged outside of
if (!opts.dragBetween) {
var containerHeight = $(list.container).outerHeight() == 0 ? Math.max(1, Math.round(0.5 + list.getItems().size() * list.draggedItem.outerWidth() / $(list.container).outerWidth())) * list.draggedItem.outerHeight() : $(list.container).outerHeight();
list.offsetLimit = $(list.container).offset();
list.offsetLimit.right = list.offsetLimit.left + $(list.container).outerWidth() - list.draggedItem.outerWidth();
list.offsetLimit.bottom = list.offsetLimit.top + containerHeight - list.draggedItem.outerHeight();
}
//create placeholder item
var h = list.draggedItem.height();
var w = list.draggedItem.width();
if (opts.tagName == "tr") {
list.draggedItem.children().each(function() { $(this).width($(this).width()); });
list.placeHolderItem = list.draggedItem.clone().attr("data-placeholder", true);
list.draggedItem.after(list.placeHolderItem);
//list.placeHolderItem.children().each(function() { $(this).css({ borderWidth:0, width: $(this).width() + 1, height: $(this).height() + 1 }).html("&nbsp;"); });
list.placeHolderItem.children().each(function() { $(this).html("&nbsp;"); });
} else {
list.draggedItem.after(opts.placeHolderTemplate);
list.placeHolderItem = list.draggedItem.next().css({ height: h, width: w }).attr("data-placeholder", true);
}
if (opts.tagName == "td") {
var listTable = list.draggedItem.closest("table").get(0);
$("<table id='" + listTable.id + "' style='border-width: 0px;' class='dragSortItem " + listTable.className + "'><tr></tr></table>").appendTo("body").children().append(list.draggedItem);
}
//style draggedItem while dragging
var orig = list.draggedItem.attr("style");
list.draggedItem.attr("data-origstyle", orig ? orig : "");
list.draggedItem.css({ position: "absolute", opacity: 0.8, "z-index": 999, height: h, width: w });
//auto-scroll setup
list.scroll = { moveX: 0, moveY: 0, maxX: $(document).width() - $(window).width(), maxY: $(document).height() - $(window).height() };
list.scroll.scrollY = window.setInterval(function() {
if (opts.scrollContainer != window) {
$(opts.scrollContainer).scrollTop($(opts.scrollContainer).scrollTop() + list.scroll.moveY);
return;
}
var t = $(opts.scrollContainer).scrollTop();
if (list.scroll.moveY > 0 && t < list.scroll.maxY || list.scroll.moveY < 0 && t > 0) {
$(opts.scrollContainer).scrollTop(t + list.scroll.moveY);
list.draggedItem.css("top", list.draggedItem.offset().top + list.scroll.moveY + 1);
}
}, 10);
list.scroll.scrollX = window.setInterval(function() {
if (opts.scrollContainer != window) {
$(opts.scrollContainer).scrollLeft($(opts.scrollContainer).scrollLeft() + list.scroll.moveX);
return;
}
var l = $(opts.scrollContainer).scrollLeft();
if (list.scroll.moveX > 0 && l < list.scroll.maxX || list.scroll.moveX < 0 && l > 0) {
$(opts.scrollContainer).scrollLeft(l + list.scroll.moveX);
list.draggedItem.css("left", list.draggedItem.offset().left + list.scroll.moveX + 1);
}
}, 10);
//misc
$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
list.setPos(e.pageX, e.pageY);
$(document).bind("mousemove", list.swapItems);
$(document).bind("mouseup", list.dropItem);
if (opts.scrollContainer != window)
$(window).bind("wheel", list.wheel);
},
//set position of draggedItem
setPos: function(x, y) {
//remove mouse offset so mouse cursor remains in same place on draggedItem instead of top left corner
var top = y - this.offset.top;
var left = x - this.offset.left;
//limit top, left to within box draggedItem can't be dragged outside of
if (!opts.dragBetween) {
top = Math.min(this.offsetLimit.bottom, Math.max(top, this.offsetLimit.top));
left = Math.min(this.offsetLimit.right, Math.max(left, this.offsetLimit.left));
}
//adjust top & left calculations to parent offset
var parent = this.draggedItem.offsetParent().not("body").offset(); //offsetParent returns body even when it's static, if not static offset is only factoring margin
if (parent != null) {
top -= parent.top;
left -= parent.left;
}
//set x or y auto-scroll amount
if (opts.scrollContainer == window) {
y -= $(window).scrollTop();
x -= $(window).scrollLeft();
y = Math.max(0, y - $(window).height() + 5) + Math.min(0, y - 5);
x = Math.max(0, x - $(window).width() + 5) + Math.min(0, x - 5);
} else {
var cont = $(opts.scrollContainer);
var offset = cont.offset();
y = Math.max(0, y - cont.height() - offset.top) + Math.min(0, y - offset.top);
x = Math.max(0, x - cont.width() - offset.left) + Math.min(0, x - offset.left);
}
list.scroll.moveX = x == 0 ? 0 : x * opts.scrollSpeed / Math.abs(x);
list.scroll.moveY = y == 0 ? 0 : y * opts.scrollSpeed / Math.abs(y);
//move draggedItem to new mouse cursor location
this.draggedItem.css({ top: top, left: left });
},
//if scroll container is a div allow mouse wheel to scroll div instead of window when mouse is hovering over
wheel: function(e) {
if (list && opts.scrollContainer != window) {
var cont = $(opts.scrollContainer);
var offset = cont.offset();
e = e.originalEvent;
if (e.clientX > offset.left && e.clientX < offset.left + cont.width() && e.clientY > offset.top && e.clientY < offset.top + cont.height()) {
var deltaY = (e.deltaMode == 0 ? 1 : 10) * e.deltaY;
cont.scrollTop(cont.scrollTop() + deltaY);
e.preventDefault();
}
}
},
//build a table recording all the positions of the moveable list items
buildPositionTable: function() {
var pos = [];
this.getItems().not([list.draggedItem[0], list.placeHolderItem[0]]).each(function(i) {
var loc = $(this).offset();
loc.right = loc.left + $(this).outerWidth();
loc.bottom = loc.top + $(this).outerHeight();
loc.elm = this;
pos[i] = loc;
});
this.pos = pos;
},
dropItem: function() {
if (list.draggedItem == null)
return;
//list.draggedItem.attr("style", "") doesn't work on IE8 and jQuery 1.5 or lower
//list.draggedItem.removeAttr("style") doesn't work on chrome and jQuery 1.6 (works jQuery 1.5 or lower)
var orig = list.draggedItem.attr("data-origstyle");
list.draggedItem.attr("style", orig);
if (orig == "")
list.draggedItem.removeAttr("style");
list.draggedItem.removeAttr("data-origstyle");
list.styleDragHandlers(true);
list.placeHolderItem.before(list.draggedItem);
list.placeHolderItem.remove();
$("[data-droptarget], .dragSortItem").remove();
window.clearInterval(list.scroll.scrollY);
window.clearInterval(list.scroll.scrollX);
//if position changed call dragEnd
if (list.draggedItem.attr("data-origpos") != $(lists).index(list) + "-" + $(list.container).children().index(list.draggedItem))
if (opts.dragEnd.apply(list.draggedItem) == false) { //if dragEnd returns false revert order
var pos = list.draggedItem.attr("data-origpos").split('-');
var nextItem = $(lists[pos[0]].container).children().not(list.draggedItem).eq(pos[1]);
if (nextItem.size() > 0)
nextItem.before(list.draggedItem);
else if (pos[1] == 0) //was the only item in list
$(lists[pos[0]].container).prepend(list.draggedItem);
else //was the last item in list
$(lists[pos[0]].container).append(list.draggedItem);
}
list.draggedItem.removeAttr("data-origpos");
list.draggedItem = null;
$(document).unbind("mousemove", list.swapItems);
$(document).unbind("mouseup", list.dropItem);
if (opts.scrollContainer != window)
$(window).unbind("wheel", list.wheel);
return false;
},
//swap the draggedItem (represented visually by placeholder) with the list item the it has been dragged on top of
swapItems: function(e) {
if (list.draggedItem == null)
return false;
//move draggedItem to mouse location
list.setPos(e.pageX, e.pageY);
//retrieve list and item position mouse cursor is over
var ei = list.findPos(e.pageX, e.pageY);
var nlist = list;
for (var i = 0; ei == -1 && opts.dragBetween && i < lists.length; i++) {
ei = lists[i].findPos(e.pageX, e.pageY);
nlist = lists[i];
}
//if not over another moveable list item return
if (ei == -1)
return false;
//save fixed items locations
var children = function() { return $(nlist.container).children().not(nlist.draggedItem); };
var fixed = children().not(opts.itemSelector).each(function(i) { this.idx = children().index(this); });
//if moving draggedItem up or left place placeHolder before list item the dragged item is hovering over otherwise place it after
if (lastPos == null || lastPos.top > list.draggedItem.offset().top || lastPos.left > list.draggedItem.offset().left)
$(nlist.pos[ei].elm).before(list.placeHolderItem);
else
$(nlist.pos[ei].elm).after(list.placeHolderItem);
//restore fixed items location
fixed.each(function() {
var elm = children().eq(this.idx).get(0);
if (this != elm && children().index(this) < this.idx)
$(this).insertAfter(elm);
else if (this != elm)
$(this).insertBefore(elm);
});
//misc
$(lists).each(function(i, l) { l.createDropTargets(); l.buildPositionTable(); });
lastPos = list.draggedItem.offset();
return false;
},
//returns the index of the list item the mouse is over
findPos: function(x, y) {
for (var i = 0; i < this.pos.length; i++) {
if (this.pos[i].left < x && this.pos[i].right > x && this.pos[i].top < y && this.pos[i].bottom > y)
return i;
}
return -1;
},
//create drop targets which are placeholders at the end of other lists to allow dragging straight to the last position
createDropTargets: function() {
if (!opts.dragBetween)
return;
$(lists).each(function() {
var ph = $(this.container).find("[data-placeholder]");
var dt = $(this.container).find("[data-droptarget]");
if (ph.size() > 0 && dt.size() > 0)
dt.remove();
else if (ph.size() == 0 && dt.size() == 0) {
if (opts.tagName == "td")
$(opts.placeHolderTemplate).attr("data-droptarget", true).appendTo(this.container);
else
//list.placeHolderItem.clone().removeAttr("data-placeholder") crashes in IE7 and jquery 1.5.1 (doesn't in jquery 1.4.2 or IE8)
$(this.container).append(list.placeHolderItem.removeAttr("data-placeholder").clone().attr("data-droptarget", true));
list.placeHolderItem.attr("data-placeholder", true);
}
});
}
};
newList.init();
lists.push(newList);
});
return this;
};
$.fn.dragsort.defaults = {
tagName:"",
itemSelector: "",
dragSelector: "",
dragSelectorExclude: "input, textarea",
dragEnd: function() { },
dragBetween: false,
placeHolderTemplate: "",
scrollContainer: window,
scrollSpeed: 5
};
})(jQuery);
define("dragsort", function(){});
... ... @@ -11044,244 +11049,244 @@ define("drag", function(){});
;(function(d){d.fn.drop=function(i,e,h){var g=typeof i=="string"?i:"",f=d.isFunction(i)?i:d.isFunction(e)?e:null;if(g.indexOf("drop")!==0){g="drop"+g}h=(i==f?e:h)||{};return f?this.bind(g,h,f):this.trigger(g)};d.drop=function(e){e=e||{};b.multi=e.multi===true?Infinity:e.multi===false?1:!isNaN(e.multi)?e.multi:b.multi;b.delay=e.delay||b.delay;b.tolerance=d.isFunction(e.tolerance)?e.tolerance:e.tolerance===null?null:b.tolerance;b.mode=e.mode||b.mode||"intersect"};var c=d.event,a=c.special,b=d.event.special.drop={multi:1,delay:20,mode:"overlap",targets:[],datakey:"dropdata",noBubble:true,add:function(f){var e=d.data(this,b.datakey);e.related+=1},remove:function(){d.data(this,b.datakey).related-=1},setup:function(){if(d.data(this,b.datakey)){return}var e={related:0,active:[],anyactive:0,winner:0,location:{}};d.data(this,b.datakey,e);b.targets.push(this);return false},teardown:function(){var f=d.data(this,b.datakey)||{};if(f.related){return}d.removeData(this,b.datakey);var e=this;b.targets=d.grep(b.targets,function(g){return(g!==e)})},handler:function(g,e){var f,h;if(!e){return}switch(g.type){case"mousedown":case"touchstart":h=d(b.targets);if(typeof e.drop=="string"){h=h.filter(e.drop)}h.each(function(){var i=d.data(this,b.datakey);i.active=[];i.anyactive=0;i.winner=0});e.droppable=h;a.drag.hijack(g,"dropinit",e);break;case"mousemove":case"touchmove":b.event=g;if(!b.timer){b.tolerate(e)}break;case"mouseup":case"touchend":b.timer=clearTimeout(b.timer);if(e.propagates){a.drag.hijack(g,"drop",e);a.drag.hijack(g,"dropend",e)}break}},locate:function(k,h){var l=d.data(k,b.datakey),g=d(k),i=g.offset()||{},e=g.outerHeight(),j=g.outerWidth(),f={elem:k,width:j,height:e,top:i.top,left:i.left,right:i.left+j,bottom:i.top+e};if(l){l.location=f;l.index=h;l.elem=k}return f},contains:function(e,f){return((f[0]||f.left)>=e.left&&(f[0]||f.right)<=e.right&&(f[1]||f.top)>=e.top&&(f[1]||f.bottom)<=e.bottom)},modes:{intersect:function(f,e,g){return this.contains(g,[f.pageX,f.pageY])?1000000000:this.modes.overlap.apply(this,arguments)},overlap:function(f,e,g){return Math.max(0,Math.min(g.bottom,e.bottom)-Math.max(g.top,e.top))*Math.max(0,Math.min(g.right,e.right)-Math.max(g.left,e.left))},fit:function(f,e,g){return this.contains(g,e)?1:0},middle:function(f,e,g){return this.contains(g,[e.left+e.width*0.5,e.top+e.height*0.5])?1:0}},sort:function(f,e){return(e.winner-f.winner)||(f.index-e.index)},tolerate:function(q){var k,e,n,j,l,m,g,p=0,f,h=q.interactions.length,r=[b.event.pageX,b.event.pageY],o=b.tolerance||b.modes[b.mode];do{if(f=q.interactions[p]){if(!f){return}f.drop=[];l=[];m=f.droppable.length;if(o){n=b.locate(f.proxy)}k=0;do{if(g=f.droppable[k]){j=d.data(g,b.datakey);e=j.location;if(!e){continue}j.winner=o?o.call(b,b.event,n,e):b.contains(e,r)?1:0;l.push(j)}}while(++k<m);l.sort(b.sort);k=0;do{if(j=l[k]){if(j.winner&&f.drop.length<b.multi){if(!j.active[p]&&!j.anyactive){if(a.drag.hijack(b.event,"dropstart",q,p,j.elem)[0]!==false){j.active[p]=1;j.anyactive+=1}else{j.winner=0}}if(j.winner){f.drop.push(j.elem)}}else{if(j.active[p]&&j.anyactive==1){a.drag.hijack(b.event,"dropend",q,p,j.elem);j.active[p]=0;j.anyactive-=1}}}}while(++k<m)}}while(++p<h);if(b.last&&r[0]==b.last.pageX&&r[1]==b.last.pageY){delete b.timer}else{b.timer=setTimeout(function(){b.tolerate(q)},b.delay)}b.last=b.event}};a.dropinit=a.dropstart=a.dropend=b})(jQuery);
define("drop", function(){});
/**
* http://git.oschina.net/hbbcs/bootStrap-addTabs
* Created by joe on 2015-12-19.
* Modified by Karson
*/
(function ($) {
$.fn.addtabs = function (options) {
var obj = $(this);
options = $.extend({
content: '', //直接指定所有页面TABS内容
close: true, //是否可以关闭
monitor: 'body', //监视的区域
nav: '.nav-addtabs',
tab: '.tab-addtabs',
iframeUse: true, //使用iframe还是ajax
iframeHeight: $(window).height() - 50, //固定TAB中IFRAME高度,根据需要自己修改
iframeForceRefresh: false, //点击后强制加载对应的iframe
iframeForceRefreshTable: false, //点击后强制刷新对应的iframe中的table
callback: function () {
//关闭后回调函数
}
}, options || {});
var navobj = $(options.nav);
var tabobj = $(options.tab);
if (history.pushState) {
//浏览器前进后退事件
$(window).on("popstate", function (e) {
var state = e.originalEvent.state;
if (state) {
$("a[addtabs=" + state.id + "]", options.monitor).data("pushstate", true).trigger("click");
}
});
}
$(options.monitor).on('click', '[addtabs]', function (e) {
if ($(this).attr('url').indexOf("javascript:") !== 0) {
if ($(this).is("a")) {
e.preventDefault();
}
var id = $(this).attr('addtabs');
var title = $(this).attr('title') ? $(this).attr('title') : $.trim($(this).text());
var url = $(this).attr('url');
var content = options.content ? options.content : $(this).attr('content');
var ajax = $(this).attr('ajax') === '1' || $(this).attr('ajax') === 'true';
var state = ({
url: url, title: title, id: id, content: content, ajax: ajax
});
document.title = title;
if (history.pushState && !$(this).data("pushstate")) {
var pushurl = url.indexOf("ref=addtabs") === -1 ? (url + (url.indexOf("?") > -1 ? "&" : "?") + "ref=addtabs") : url;
try {
window.history.pushState(state, title, pushurl);
} catch (e) {
}
}
$(this).data("pushstate", null);
_add.call(this, {
id: id,
title: $(this).attr('title') ? $(this).attr('title') : $(this).html(),
content: content,
url: url,
ajax: ajax
});
}
});
navobj.on('click', '.close-tab', function () {
var id = $(this).prev("a").attr("aria-controls");
_close(id);
return false;
});
navobj.on('dblclick', 'li[role=presentation]', function () {
$(this).find(".close-tab").trigger("click");
});
navobj.on('click', 'li[role=presentation]', function () {
$("a[addtabs=" + $("a", this).attr("node-id") + "]").trigger("click");
});
$(window).resize(function () {
if (typeof options.nav === 'object') {
var siblingsWidth = 0;
navobj.siblings().each(function () {
siblingsWidth += $(this).outerWidth();
});
navobj.width(navobj.parent().width() - siblingsWidth);
} else {
$("#nav").width($("#header").find("> .navbar").width() - $(".sidebar-toggle").outerWidth() - $(".navbar-custom-menu").outerWidth() - 20);
}
_drop();
});
var _add = function (opts) {
var id, tabid, conid, url;
id = opts.id;
tabid = 'tab_' + opts.id;
conid = 'con_' + opts.id;
url = opts.url;
url += (opts.url.indexOf("?") > -1 ? "&addtabs=1" : "?addtabs=1");
var tabitem = $('#' + tabid, navobj);
var conitem = $('#' + conid, tabobj);
navobj.find("[role='presentation']").removeClass('active');
tabobj.find("[role='tabpanel']").removeClass('active');
//如果TAB不存在，创建一个新的TAB
if (tabitem.size() === 0) {
//创建新TAB的title
tabitem = $('<li role="presentation" id="' + tabid + '"><a href="#' + conid + '" node-id="' + opts.id + '" aria-controls="' + id + '" role="tab" data-toggle="tab">' + opts.title + '</a></li>');
//是否允许关闭
if (options.close && $("li", navobj).size() > 0) {
tabitem.append(' <i class="close-tab fa fa-remove"></i>');
}
if (conitem.size() === 0) {
//创建新TAB的内容
conitem = $('<div role="tabpanel" class="tab-pane" id="' + conid + '"></div>');
//是否指定TAB内容
if (opts.content) {
conitem.append(opts.content);
} else if (options.iframeUse && !opts.ajax) {//没有内容，使用IFRAME打开链接
var height = options.iframeHeight;
conitem.append('<iframe src="' + url + '" width="100%" height="' + height + '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling-x="no" scrolling-y="auto" allowtransparency="yes"></iframe></div>');
} else {
$.get(url, function (data) {
conitem.append(data);
});
}
tabobj.append(conitem);
}
//加入TABS
if ($('.tabdrop li', navobj).size() > 0) {
$('.tabdrop ul', navobj).append(tabitem);
} else {
navobj.append(tabitem);
}
} else {
//强制刷新iframe
if (options.iframeForceRefresh) {
$("#" + conid + " iframe").attr('src', function (i, val) {
return val;
});
} else if (options.iframeForceRefreshTable) {
try {
//检测iframe中是否存在刷新按钮
if ($("#" + conid + " iframe").contents().find(".btn-refresh").size() > 0) {
$("#" + conid + " iframe")[0].contentWindow.$(".btn-refresh").trigger("click");
}
} catch (e) {
}
}
}
localStorage.setItem("addtabs", $(this).prop('outerHTML'));
//激活TAB
tabitem.addClass('active');
conitem.addClass("active");
_drop();
};
var _close = function (id) {
var tabid = 'tab_' + id;
var conid = 'con_' + id;
var tabitem = $('#' + tabid, navobj);
var conitem = $('#' + conid, tabobj);
//如果关闭的是当前激活的TAB，激活他的前一个TAB
if (obj.find("li.active").not('.tabdrop').attr('id') === tabid) {
var prev = tabitem.prev().not(".tabdrop");
var next = tabitem.next().not(".tabdrop");
if (prev.size() > 0) {
prev.find('a').trigger("click");
} else if (next.size() > 0) {
next.find('a').trigger("click");
} else {
$(">li:not(.tabdrop):last > a", navobj).trigger('click');
}
}
//关闭TAB
tabitem.remove();
conitem.remove();
_drop();
options.callback();
};
var _drop = function () {
navobj.refreshAddtabs();
};
};
//刷新Addtabs
$.fn.refreshAddtabs = function () {
var navobj = $(this);
var dropdown = $(".tabdrop", navobj);
if (dropdown.size() === 0) {
dropdown = $('<li class="dropdown pull-right hide tabdrop"><a class="dropdown-toggle" data-toggle="dropdown" href="javascript:;">' +
'<i class="glyphicon glyphicon-align-justify"></i>' +
' <b class="caret"></b></a><ul class="dropdown-menu"></ul></li>');
dropdown.prependTo(navobj);
}
//检测是否有下拉样式
if (navobj.parent().is('.tabs-below')) {
dropdown.addClass('dropup');
}
var collection = 0;
var maxwidth = navobj.width() - 65;
var liwidth = 0;
//检查超过一行的标签页
var litabs = navobj.append(dropdown.find('li')).find('>li').not('.tabdrop');
var totalwidth = 0;
litabs.each(function () {
totalwidth += $(this).outerWidth(true);
});
if (navobj.width() < totalwidth) {
litabs.each(function () {
liwidth += $(this).outerWidth(true);
if (liwidth > maxwidth) {
dropdown.find('ul').append($(this));
collection++;
}
});
if (collection > 0) {
dropdown.removeClass('hide');
if (dropdown.find('.active').length === 1) {
dropdown.addClass('active');
} else {
dropdown.removeClass('active');
}
}
} else {
dropdown.addClass('hide');
}
};
})(jQuery);
/**
* http://git.oschina.net/hbbcs/bootStrap-addTabs
* Created by joe on 2015-12-19.
* Modified by Karson
*/
(function ($) {
$.fn.addtabs = function (options) {
var obj = $(this);
options = $.extend({
content: '', //直接指定所有页面TABS内容
close: true, //是否可以关闭
monitor: 'body', //监视的区域
nav: '.nav-addtabs',
tab: '.tab-addtabs',
iframeUse: true, //使用iframe还是ajax
iframeHeight: $(window).height() - 50, //固定TAB中IFRAME高度,根据需要自己修改
iframeForceRefresh: false, //点击后强制加载对应的iframe
iframeForceRefreshTable: false, //点击后强制刷新对应的iframe中的table
callback: function () {
//关闭后回调函数
}
}, options || {});
var navobj = $(options.nav);
var tabobj = $(options.tab);
if (history.pushState) {
//浏览器前进后退事件
$(window).on("popstate", function (e) {
var state = e.originalEvent.state;
if (state) {
$("a[addtabs=" + state.id + "]", options.monitor).data("pushstate", true).trigger("click");
}
});
}
$(options.monitor).on('click', '[addtabs]', function (e) {
if ($(this).attr('url').indexOf("javascript:") !== 0) {
if ($(this).is("a")) {
e.preventDefault();
}
var id = $(this).attr('addtabs');
var title = $(this).attr('title') ? $(this).attr('title') : $.trim($(this).text());
var url = $(this).attr('url');
var content = options.content ? options.content : $(this).attr('content');
var ajax = $(this).attr('ajax') === '1' || $(this).attr('ajax') === 'true';
var state = ({
url: url, title: title, id: id, content: content, ajax: ajax
});
document.title = title;
if (history.pushState && !$(this).data("pushstate")) {
var pushurl = url.indexOf("ref=addtabs") === -1 ? (url + (url.indexOf("?") > -1 ? "&" : "?") + "ref=addtabs") : url;
try {
window.history.pushState(state, title, pushurl);
} catch (e) {
}
}
$(this).data("pushstate", null);
_add.call(this, {
id: id,
title: $(this).attr('title') ? $(this).attr('title') : $(this).html(),
content: content,
url: url,
ajax: ajax
});
}
});
navobj.on('click', '.close-tab', function () {
var id = $(this).prev("a").attr("aria-controls");
_close(id);
return false;
});
navobj.on('dblclick', 'li[role=presentation]', function () {
$(this).find(".close-tab").trigger("click");
});
navobj.on('click', 'li[role=presentation]', function () {
$("a[addtabs=" + $("a", this).attr("node-id") + "]").trigger("click");
});
$(window).resize(function () {
if (typeof options.nav === 'object') {
var siblingsWidth = 0;
navobj.siblings().each(function () {
siblingsWidth += $(this).outerWidth();
});
navobj.width(navobj.parent().width() - siblingsWidth);
} else {
$("#nav").width($("#header").find("> .navbar").width() - $(".sidebar-toggle").outerWidth() - $(".navbar-custom-menu").outerWidth() - 20);
}
_drop();
});
var _add = function (opts) {
var id, tabid, conid, url;
id = opts.id;
tabid = 'tab_' + opts.id;
conid = 'con_' + opts.id;
url = opts.url;
url += (opts.url.indexOf("?") > -1 ? "&addtabs=1" : "?addtabs=1");
var tabitem = $('#' + tabid, navobj);
var conitem = $('#' + conid, tabobj);
navobj.find("[role='presentation']").removeClass('active');
tabobj.find("[role='tabpanel']").removeClass('active');
//如果TAB不存在，创建一个新的TAB
if (tabitem.size() === 0) {
//创建新TAB的title
tabitem = $('<li role="presentation" id="' + tabid + '"><a href="#' + conid + '" node-id="' + opts.id + '" aria-controls="' + id + '" role="tab" data-toggle="tab">' + opts.title + '</a></li>');
//是否允许关闭
if (options.close && $("li", navobj).size() > 0) {
tabitem.append(' <i class="close-tab fa fa-remove"></i>');
}
if (conitem.size() === 0) {
//创建新TAB的内容
conitem = $('<div role="tabpanel" class="tab-pane" id="' + conid + '"></div>');
//是否指定TAB内容
if (opts.content) {
conitem.append(opts.content);
} else if (options.iframeUse && !opts.ajax) {//没有内容，使用IFRAME打开链接
var height = options.iframeHeight;
conitem.append('<iframe src="' + url + '" width="100%" height="' + height + '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling-x="no" scrolling-y="auto" allowtransparency="yes"></iframe></div>');
} else {
$.get(url, function (data) {
conitem.append(data);
});
}
tabobj.append(conitem);
}
//加入TABS
if ($('.tabdrop li', navobj).size() > 0) {
$('.tabdrop ul', navobj).append(tabitem);
} else {
navobj.append(tabitem);
}
} else {
//强制刷新iframe
if (options.iframeForceRefresh) {
$("#" + conid + " iframe").attr('src', function (i, val) {
return val;
});
} else if (options.iframeForceRefreshTable) {
try {
//检测iframe中是否存在刷新按钮
if ($("#" + conid + " iframe").contents().find(".btn-refresh").size() > 0) {
$("#" + conid + " iframe")[0].contentWindow.$(".btn-refresh").trigger("click");
}
} catch (e) {
}
}
}
localStorage.setItem("addtabs", $(this).prop('outerHTML'));
//激活TAB
tabitem.addClass('active');
conitem.addClass("active");
_drop();
};
var _close = function (id) {
var tabid = 'tab_' + id;
var conid = 'con_' + id;
var tabitem = $('#' + tabid, navobj);
var conitem = $('#' + conid, tabobj);
//如果关闭的是当前激活的TAB，激活他的前一个TAB
if (obj.find("li.active").not('.tabdrop').attr('id') === tabid) {
var prev = tabitem.prev().not(".tabdrop");
var next = tabitem.next().not(".tabdrop");
if (prev.size() > 0) {
prev.find('a').trigger("click");
} else if (next.size() > 0) {
next.find('a').trigger("click");
} else {
$(">li:not(.tabdrop):last > a", navobj).trigger('click');
}
}
//关闭TAB
tabitem.remove();
conitem.remove();
_drop();
options.callback();
};
var _drop = function () {
navobj.refreshAddtabs();
};
};
//刷新Addtabs
$.fn.refreshAddtabs = function () {
var navobj = $(this);
var dropdown = $(".tabdrop", navobj);
if (dropdown.size() === 0) {
dropdown = $('<li class="dropdown pull-right hide tabdrop"><a class="dropdown-toggle" data-toggle="dropdown" href="javascript:;">' +
'<i class="glyphicon glyphicon-align-justify"></i>' +
' <b class="caret"></b></a><ul class="dropdown-menu"></ul></li>');
dropdown.prependTo(navobj);
}
//检测是否有下拉样式
if (navobj.parent().is('.tabs-below')) {
dropdown.addClass('dropup');
}
var collection = 0;
var maxwidth = navobj.width() - 65;
var liwidth = 0;
//检查超过一行的标签页
var litabs = navobj.append(dropdown.find('li')).find('>li').not('.tabdrop');
var totalwidth = 0;
litabs.each(function () {
totalwidth += $(this).outerWidth(true);
});
if (navobj.width() < totalwidth) {
litabs.each(function () {
liwidth += $(this).outerWidth(true);
if (liwidth > maxwidth) {
dropdown.find('ul').append($(this));
collection++;
}
});
if (collection > 0) {
dropdown.removeClass('hide');
if (dropdown.find('.active').length === 1) {
dropdown.addClass('active');
} else {
dropdown.removeClass('active');
}
}
} else {
dropdown.addClass('hide');
}
};
})(jQuery);
define("addtabs", function(){});
... ...
... ... @@ -434,7 +434,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
image: function (value, row, index) {
value = value ? value : '/assets/img/blank.gif';
var classname = typeof this.classname !== 'undefined' ? this.classname : 'img-sm img-center';
return '<a href="javascript:void(0)" target="_blank"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>';
return '<a href="javascript:"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>';
},
images: function (value, row, index) {
value = value === null ? '' : value.toString();
... ... @@ -443,10 +443,14 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
var html = [];
$.each(arr, function (i, value) {
value = value ? value : '/assets/img/blank.gif';
html.push('<a href="javascript:void(0)" target="_blank"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>');
html.push('<a href="javascript:"><img class="' + classname + '" src="' + Fast.api.cdnurl(value) + '" /></a>');
});
return html.join(' ');
},
content: function (value, row, index) {
var width = this.width != undefined ? this.width : 250;
return "<div style='white-space: nowrap; text-overflow:ellipsis; overflow: hidden; max-width:" + width + "px;'>" + value + "</div>";
},
status: function (value, row, index) {
var custom = {normal: 'success', hidden: 'gray', deleted: 'danger', locked: 'info'};
if (typeof this.custom !== 'undefined') {
... ...
... ... @@ -16,6 +16,7 @@
@import url("../libs/nice-validator/dist/jquery.validator.css");
@import url("../libs/bootstrap-select/dist/css/bootstrap-select.min.css");
@import url("../libs/fastadmin-selectpage/selectpage.css");
@import url("../libs/bootstrap-slider/slider.css");
@main-bg: #f1f4f6;
@panel-intro-bg: darken(@main-bg, 3%);
... ... @@ -954,7 +955,7 @@ table.table-nowrap {
}
//样式二关闭按钮
.layui-layer-close2, .layui-layer-close2:hover {
background: url('../libs/layer/dist/theme/default/icon.png') no-repeat -149px -31px !important;
background: url('../libs/fastadmin-layer/dist/theme/default/icon.png') no-repeat -149px -31px !important;
top: -30px;
right: -30px;
&:after {
... ... @@ -1045,7 +1046,7 @@ table.table-nowrap {
}
/*平板样式*/
@media (max-width: @screen-tablet) {
@media (max-width: @screen-xs-max) {
body .wrapper .main-header .logo {
background: none;
... ...