mirror of https://gitee.com/karson/fastadmin.git
parent
481256dff3
commit
e31a546b48
|
|
@ -328,7 +328,7 @@ class Addon extends Backend
|
||||||
$search = $this->request->get("search");
|
$search = $this->request->get("search");
|
||||||
$search = htmlspecialchars(strip_tags($search));
|
$search = htmlspecialchars(strip_tags($search));
|
||||||
$onlineaddons = Cache::get("onlineaddons");
|
$onlineaddons = Cache::get("onlineaddons");
|
||||||
if (!is_array($onlineaddons)) {
|
if (!is_array($onlineaddons) && config('fastadmin.api_url')) {
|
||||||
$onlineaddons = [];
|
$onlineaddons = [];
|
||||||
$result = Http::sendRequest(config('fastadmin.api_url') . '/addon/index', [], 'GET', [
|
$result = Http::sendRequest(config('fastadmin.api_url') . '/addon/index', [], 'GET', [
|
||||||
CURLOPT_HTTPHEADER => ['Accept-Encoding:gzip'],
|
CURLOPT_HTTPHEADER => ['Accept-Encoding:gzip'],
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'Id' => 'ID',
|
'Id' => 'ID',
|
||||||
'Title' => '插件名称',
|
'Title' => '名称',
|
||||||
'Value' => '配置值',
|
'Value' => '配置值',
|
||||||
'Array key' => '键',
|
'Array key' => '键',
|
||||||
'Array value' => '值',
|
'Array value' => '值',
|
||||||
|
|
@ -21,7 +21,6 @@ return [
|
||||||
'Pay tips' => '扫码支付后如果仍然无法立即下载,请不要重复支付,请稍后再重试安装!',
|
'Pay tips' => '扫码支付后如果仍然无法立即下载,请不要重复支付,请稍后再重试安装!',
|
||||||
'Pay click tips' => '请点击这里在新窗口中进行支付!',
|
'Pay click tips' => '请点击这里在新窗口中进行支付!',
|
||||||
'Pay new window tips' => '请在新弹出的窗口中进行支付,支付完成后再重新点击安装按钮进行安装!',
|
'Pay new window tips' => '请在新弹出的窗口中进行支付,支付完成后再重新点击安装按钮进行安装!',
|
||||||
'Uninstall tips' => '确认卸载<b>[%s]</b>?<p class="text-danger">卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!</p>如有重要数据请备份后再操作!',
|
|
||||||
'Upgrade tips' => '确认升级<b>[%s]</b>?<p class="text-danger">升级后可能出现部分冗余数据记录,请根据需要移除即可!!!</p>如有重要数据请备份后再操作!',
|
'Upgrade tips' => '确认升级<b>[%s]</b>?<p class="text-danger">升级后可能出现部分冗余数据记录,请根据需要移除即可!!!</p>如有重要数据请备份后再操作!',
|
||||||
'Offline installed tips' => '插件安装成功!清除浏览器缓存和框架缓存后生效!',
|
'Offline installed tips' => '插件安装成功!清除浏览器缓存和框架缓存后生效!',
|
||||||
'Online installed tips' => '插件安装成功!清除浏览器缓存和框架缓存后生效!',
|
'Online installed tips' => '插件安装成功!清除浏览器缓存和框架缓存后生效!',
|
||||||
|
|
@ -41,7 +40,6 @@ return [
|
||||||
'Click to toggle status' => '点击切换插件状态',
|
'Click to toggle status' => '点击切换插件状态',
|
||||||
'Click to contact developer' => '点击与插件开发者取得联系',
|
'Click to contact developer' => '点击与插件开发者取得联系',
|
||||||
'My addons' => '我购买的插件',
|
'My addons' => '我购买的插件',
|
||||||
'My posts' => '我发布的插件',
|
|
||||||
'Index' => '前台',
|
'Index' => '前台',
|
||||||
'All' => '全部',
|
'All' => '全部',
|
||||||
'Uncategoried' => '未归类',
|
'Uncategoried' => '未归类',
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,6 @@
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<div class="breadcrumb"><a href="https://www.fastadmin.net/user/myaddon.html" target="_blank"><i class="fa fa-money"></i> {:__('My addons')}</a></div>
|
<div class="breadcrumb"><a href="https://www.fastadmin.net/user/myaddon.html" target="_blank"><i class="fa fa-money"></i> {:__('My addons')}</a></div>
|
||||||
<div class="breadcrumb"><a href="https://www.fastadmin.net/user/addon.html" target="_blank"><i class="fa fa-upload"></i> {:__('My posts')}</a></div>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
@ -264,7 +263,7 @@
|
||||||
<% } %>
|
<% } %>
|
||||||
</ul>
|
</ul>
|
||||||
</span>
|
</span>
|
||||||
<% }else{%>
|
<% }else if(typeof item.releaselist !="undefined" && item.releaselist.length>0){%>
|
||||||
<a href="javascript:;" class="btn btn-xs btn-primary btn-success btn-install"
|
<a href="javascript:;" class="btn btn-xs btn-primary btn-success btn-install"
|
||||||
data-type="<%=item.price<=0?'free':'price';%>" data-donateimage="<%=item.donateimage%>"
|
data-type="<%=item.price<=0?'free':'price';%>" data-donateimage="<%=item.donateimage%>"
|
||||||
data-version="<%=item.version%>"><i class="fa fa-cloud-download"></i> {:__('Install')}</a>
|
data-version="<%=item.version%>"><i class="fa fa-cloud-download"></i> {:__('Install')}</a>
|
||||||
|
|
@ -275,6 +274,12 @@
|
||||||
<i class="fa fa-flash"></i> {:__('Demo')}
|
<i class="fa fa-flash"></i> {:__('Demo')}
|
||||||
</a>
|
</a>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|
||||||
|
<% if(item.button){ %>
|
||||||
|
<a href="<%=item.url%>" class="btn btn-xs btn-primary btn-info" target="_blank">
|
||||||
|
<%=item.button%>
|
||||||
|
</a>
|
||||||
|
<% } %>
|
||||||
<% } else {%>
|
<% } else {%>
|
||||||
<% if(addon.version!=item.version){%>
|
<% if(addon.version!=item.version){%>
|
||||||
<% if(typeof item.releaselist !="undefined" && item.releaselist.length>1){%>
|
<% if(typeof item.releaselist !="undefined" && item.releaselist.length>1){%>
|
||||||
|
|
|
||||||
|
|
@ -225,7 +225,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
||||||
Layer.open({
|
Layer.open({
|
||||||
content: Template("logintpl", {}),
|
content: Template("logintpl", {}),
|
||||||
zIndex: 99,
|
zIndex: 99,
|
||||||
area: area,
|
area: [$(window).width() > 800 ? '500px' : '95%', $(window).height() > 600 ? '400px' : '95%'],
|
||||||
title: __('Login FastAdmin'),
|
title: __('Login FastAdmin'),
|
||||||
resize: false,
|
resize: false,
|
||||||
btn: [__('Login'), __('Register')],
|
btn: [__('Login'), __('Register')],
|
||||||
|
|
@ -566,10 +566,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
||||||
var url = 'javascript:';
|
var url = 'javascript:';
|
||||||
if (typeof row.homepage !== 'undefined') {
|
if (typeof row.homepage !== 'undefined') {
|
||||||
url = row.homepage;
|
url = row.homepage;
|
||||||
} else if (typeof row.qq !== 'undefined') {
|
} else if (typeof row.qq !== 'undefined' && row.qq) {
|
||||||
url = 'https://wpa.qq.com/msgrd?v=3&uin=' + row.qq + '&site=fastadmin.net&menu=yes';
|
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>';
|
return '<a href="' + url + '" target="_blank" data-toggle="tooltip" class="text-primary">' + value + '</a>';
|
||||||
},
|
},
|
||||||
price: function (value, row, index) {
|
price: function (value, row, index) {
|
||||||
if (isNaN(value)) {
|
if (isNaN(value)) {
|
||||||
|
|
|
||||||
|
|
@ -11080,8 +11080,8 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
|
||||||
fileName: 'export_' + Moment().format("YYYY-MM-DD"),
|
fileName: 'export_' + Moment().format("YYYY-MM-DD"),
|
||||||
ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
|
ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
|
||||||
},
|
},
|
||||||
pageSize: 10,
|
pageSize: localStorage.getItem("pagesize") || 10,
|
||||||
pageList: [10, 25, 50, 'All'],
|
pageList: [10, 15, 20, 25, 50, 'All'],
|
||||||
pagination: true,
|
pagination: true,
|
||||||
clickToSelect: true, //是否启用点击选中
|
clickToSelect: true, //是否启用点击选中
|
||||||
dblClickToEdit: true, //是否启用双击编辑
|
dblClickToEdit: true, //是否启用双击编辑
|
||||||
|
|
@ -11241,6 +11241,12 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
|
||||||
table.on('refresh.bs.table', function (e, settings, data) {
|
table.on('refresh.bs.table', function (e, settings, data) {
|
||||||
$(Table.config.refreshbtn, toolbar).find(".fa").addClass("fa-spin");
|
$(Table.config.refreshbtn, toolbar).find(".fa").addClass("fa-spin");
|
||||||
});
|
});
|
||||||
|
//当表格分页变更时
|
||||||
|
table.on('page-change.bs.table', function (e, page, pagesize) {
|
||||||
|
if (!isNaN(pagesize)) {
|
||||||
|
localStorage.setItem("pagesize", pagesize);
|
||||||
|
}
|
||||||
|
});
|
||||||
//当执行搜索时
|
//当执行搜索时
|
||||||
table.on('search.bs.table common-search.bs.table', function (e, settings, data) {
|
table.on('search.bs.table common-search.bs.table', function (e, settings, data) {
|
||||||
table.trigger("uncheckbox");
|
table.trigger("uncheckbox");
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
|
||||||
fileName: 'export_' + Moment().format("YYYY-MM-DD"),
|
fileName: 'export_' + Moment().format("YYYY-MM-DD"),
|
||||||
ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
|
ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
|
||||||
},
|
},
|
||||||
pageSize: 10,
|
pageSize: localStorage.getItem("pagesize") || 10,
|
||||||
pageList: [10, 25, 50, 'All'],
|
pageList: [10, 15, 20, 25, 50, 'All'],
|
||||||
pagination: true,
|
pagination: true,
|
||||||
clickToSelect: true, //是否启用点击选中
|
clickToSelect: true, //是否启用点击选中
|
||||||
dblClickToEdit: true, //是否启用双击编辑
|
dblClickToEdit: true, //是否启用双击编辑
|
||||||
|
|
@ -181,6 +181,12 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
|
||||||
table.on('refresh.bs.table', function (e, settings, data) {
|
table.on('refresh.bs.table', function (e, settings, data) {
|
||||||
$(Table.config.refreshbtn, toolbar).find(".fa").addClass("fa-spin");
|
$(Table.config.refreshbtn, toolbar).find(".fa").addClass("fa-spin");
|
||||||
});
|
});
|
||||||
|
//当表格分页变更时
|
||||||
|
table.on('page-change.bs.table', function (e, page, pagesize) {
|
||||||
|
if (!isNaN(pagesize)) {
|
||||||
|
localStorage.setItem("pagesize", pagesize);
|
||||||
|
}
|
||||||
|
});
|
||||||
//当执行搜索时
|
//当执行搜索时
|
||||||
table.on('search.bs.table common-search.bs.table', function (e, settings, data) {
|
table.on('search.bs.table common-search.bs.table', function (e, settings, data) {
|
||||||
table.trigger("uncheckbox");
|
table.trigger("uncheckbox");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue