diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php
index 8ef724f4..1bf0fe8f 100644
--- a/application/admin/controller/Ajax.php
+++ b/application/admin/controller/Ajax.php
@@ -198,22 +198,20 @@ class Ajax extends Backend
{
$type = $this->request->request("type");
switch ($type) {
+ case 'all':
case 'content':
rmdirs(CACHE_PATH, false);
Cache::clear();
- break;
+ if ($type == 'content')
+ break;
case 'template':
rmdirs(TEMP_PATH, false);
- break;
+ if ($type == 'template')
+ break;
case 'addons':
Service::refresh();
- break;
- case 'all':
- rmdirs(CACHE_PATH, false);
- Cache::clear();
- rmdirs(TEMP_PATH, false);
- Service::refresh();
- break;
+ if ($type == 'addons')
+ break;
}
\think\Hook::listen("wipecache_after");
diff --git a/application/admin/lang/zh-cn/addon.php b/application/admin/lang/zh-cn/addon.php
index 69f7b962..248e9740 100755
--- a/application/admin/lang/zh-cn/addon.php
+++ b/application/admin/lang/zh-cn/addon.php
@@ -21,8 +21,8 @@ return [
'Pay tips' => '扫码支付后如果仍然无法立即下载，请不要重复支付，请加QQ群：636393962向管理员反馈',
'Pay click tips' => '请点击这里在新窗口中进行支付！',
'Pay new window tips' => '请在新弹出的窗口中进行支付，支付完成后再重新点击安装按钮进行安装！',
- 'Uninstall tips' => '确认卸载[%s]？卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!
如有重要数据请备份后再操作！',
- 'Upgrade tips' => '确认升级[%s]？如果之前购买插件时未登录，此次升级可能出现购买后才可以下载的提示!!!
升级后可能出现部分冗余数据记录,请根据需要移除即可!!!
如有重要数据请备份后再操作！',
+ 'Uninstall tips' => '确认卸载[%s]？卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!
如有重要数据请备份后再操作！',
+ 'Upgrade tips' => '确认升级[%s]？如果之前购买插件时未登录，此次升级可能出现购买后才可以下载的提示!!!
升级后可能出现部分冗余数据记录,请根据需要移除即可!!!
如有重要数据请备份后再操作！',
'Offline installed tips' => '插件安装成功！清除浏览器缓存和框架缓存后生效！',
'Online installed tips' => '插件安装成功！清除浏览器缓存和框架缓存后生效！',
'Not login tips' => '你当前未登录FastAdmin，登录后将同步已购买的记录，下载时无需二次付费！',
diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php
index cd4e6534..89b73ac0 100755
--- a/application/admin/library/traits/Backend.php
+++ b/application/admin/library/traits/Backend.php
@@ -228,7 +228,7 @@ trait Backend
if ($this->request->has('params')) {
parse_str($this->request->post("params"), $values);
$values = array_intersect_key($values, array_flip(is_array($this->multiFields) ? $this->multiFields : explode(',', $this->multiFields)));
- if ($values) {
+ if ($values || $this->auth->isSuperAdmin()) {
$adminIds = $this->getDataLimitAdminIds();
if (is_array($adminIds)) {
$this->model->where($this->dataLimitField, 'in', $adminIds);
diff --git a/application/admin/view/dashboard/index.html b/application/admin/view/dashboard/index.html
index d9ee7ec6..04db2344 100644
--- a/application/admin/view/dashboard/index.html
+++ b/application/admin/view/dashboard/index.html
@@ -294,11 +294,11 @@
1234
-
{:__('Comment count')}
+
{:__('Comment count')}
6754
-
{:__('Like count')}
+
{:__('Like count')}
@@ -317,11 +317,11 @@
5302
-
{:__('Comment count')}
+
{:__('Comment count')}
8205
-
{:__('Like count')}
+
{:__('Like count')}
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 84a683f9..949330b2 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -860,7 +860,8 @@ define('fast',['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, u
if ($(this).hasClass("disabled") || $(this).parent().hasClass("disabled")) {
return;
}
- $(".btn:eq(" + $(this).index() + ")", layerfooter).trigger("click");
+ var index = footer.find('.btn').index(this);
+ $(".btn:eq(" + index + ")", layerfooter).trigger("click");
});
var titHeight = layero.find('.layui-layer-title').outerHeight() || 0;
@@ -9928,7 +9929,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
type = typeof type === 'undefined' ? 'buttons' : type;
var options = table ? table.bootstrapTable('getOptions') : {};
var html = [];
- var hidden, visible, url, classname, icon, text, title, refresh, confirm, extend, click;
+ var hidden, visible, disable, url, classname, icon, text, title, refresh, confirm, extend, click;
var fieldIndex = column.fieldIndex;
$.each(buttons, function (i, j) {
@@ -9959,6 +9960,10 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
refresh = j.refresh ? 'data-refresh="' + j.refresh + '"' : '';
confirm = j.confirm ? 'data-confirm="' + j.confirm + '"' : '';
extend = j.extend ? j.extend : '';
+ disable = typeof j.disable === 'function' ? j.disable.call(table, row, j) : (j.disable ? j.disable : false);
+ if (disable) {
+ classname = classname + ' disabled';
+ }
html.push('' + (text ? ' ' + text : '') + '');
}
});
diff --git a/public/assets/js/require-frontend.min.js b/public/assets/js/require-frontend.min.js
index bb508dd2..88069773 100644
--- a/public/assets/js/require-frontend.min.js
+++ b/public/assets/js/require-frontend.min.js
@@ -860,7 +860,8 @@ define('fast',['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, u
if ($(this).hasClass("disabled") || $(this).parent().hasClass("disabled")) {
return;
}
- $(".btn:eq(" + $(this).index() + ")", layerfooter).trigger("click");
+ var index = footer.find('.btn').index(this);
+ $(".btn:eq(" + index + ")", layerfooter).trigger("click");
});
var titHeight = layero.find('.layui-layer-title').outerHeight() || 0;
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 45a75bac..93cd0c4c 100644
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -541,7 +541,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
type = typeof type === 'undefined' ? 'buttons' : type;
var options = table ? table.bootstrapTable('getOptions') : {};
var html = [];
- var hidden, visible, url, classname, icon, text, title, refresh, confirm, extend, click;
+ var hidden, visible, disable, url, classname, icon, text, title, refresh, confirm, extend, click;
var fieldIndex = column.fieldIndex;
$.each(buttons, function (i, j) {
@@ -572,6 +572,10 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
refresh = j.refresh ? 'data-refresh="' + j.refresh + '"' : '';
confirm = j.confirm ? 'data-confirm="' + j.confirm + '"' : '';
extend = j.extend ? j.extend : '';
+ disable = typeof j.disable === 'function' ? j.disable.call(table, row, j) : (j.disable ? j.disable : false);
+ if (disable) {
+ classname = classname + ' disabled';
+ }
html.push('' + (text ? ' ' + text : '') + '');
}
});