hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'karson/master'

pull/71/head
PPPSCN 2018-04-08 00:36:44 +08:00
parent a282d5d779 58c72de604
commit 6b490f55f7
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/admin/controller/Addon.php
View File

@ -61,7 +61,12 @@ class Addon extends Backend
if ($params) { if ($params) {
foreach ($config as $k => &$v) { foreach ($config as $k => &$v) {
if (isset($params[$v['name']])) { if (isset($params[$v['name']])) {
$value = is_array($params[$v['name']]) ? implode(',', $params[$v['name']]) : $params[$v['name']]; if ($v['type'] == 'array') {
$params[$v['name']] = is_array($params[$v['name']]) ? $params[$v['name']] : (array)json_decode($params[$v['name']], true);
$value = $params[$v['name']];
} else {
$value = is_array($params[$v['name']]) ? implode(',', $params[$v['name']]) : $params[$v['name']];
}
$v['value'] = $value; $v['value'] = $value;
} }
} }

2
application/admin/view/index/login.html
View File

@ -81,7 +81,7 @@
<div class="input-group-addon"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></div> <div class="input-group-addon"><span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></div>
<input type="text" name="captcha" class="form-control" placeholder="{:__('Captcha')}" data-rule="{:__('Captcha')}:required;length(4)" /> <input type="text" name="captcha" class="form-control" placeholder="{:__('Captcha')}" data-rule="{:__('Captcha')}:required;length(4)" />
<span class="input-group-addon" style="padding:0;border:none;cursor:pointer;"> <span class="input-group-addon" style="padding:0;border:none;cursor:pointer;">
<img src="{:captcha_src()}" width="100" height="30" onclick="this.src = '{:captcha_src()}?r=' + Math.random();"/> <img src="{:rtrim('__PUBLIC__', '/')}/captcha" width="100" height="30" onclick="this.src = '{:rtrim('__PUBLIC__', '/')}/captcha?r=' + Math.random();"/>
</span> </span>
</div> </div>
{/if} {/if}

4
public/assets/js/require-backend.min.js vendored
View File

@ -9565,7 +9565,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
}); });
$(table).on("click", "input[data-id][name='checkbox']", function (e) { $(table).on("click", "input[data-id][name='checkbox']", function (e) {
var ids = $(this).data("id"); var ids = $(this).data("id");
var row = Table.api.getrowbyid(ids); var row = Table.api.getrowbyid(table, ids);
table.trigger('check.bs.table', [row, this]); table.trigger('check.bs.table', [row, this]);
}); });
$(table).on("click", "[data-id].btn-change", function (e) { $(table).on("click", "[data-id].btn-change", function (e) {
@ -9575,7 +9575,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
$(table).on("click", "[data-id].btn-edit", function (e) { $(table).on("click", "[data-id].btn-edit", function (e) {
e.preventDefault(); e.preventDefault();
var ids = $(this).data("id"); var ids = $(this).data("id");
var row = Table.api.getrowbyid(ids); var row = Table.api.getrowbyid(table, ids);
row.ids = ids; row.ids = ids;
var url = Table.api.replaceurl(options.extend.edit_url, row, table); var url = Table.api.replaceurl(options.extend.edit_url, row, table);
Fast.api.open(url, __('Edit'), $(this).data() || {}); Fast.api.open(url, __('Edit'), $(this).data() || {});

4
public/assets/js/require-table.js
View File

@ -261,7 +261,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
}); });
$(table).on("click", "input[data-id][name='checkbox']", function (e) { $(table).on("click", "input[data-id][name='checkbox']", function (e) {
var ids = $(this).data("id"); var ids = $(this).data("id");
var row = Table.api.getrowbyid(ids); var row = Table.api.getrowbyid(table, ids);
table.trigger('check.bs.table', [row, this]); table.trigger('check.bs.table', [row, this]);
}); });
$(table).on("click", "[data-id].btn-change", function (e) { $(table).on("click", "[data-id].btn-change", function (e) {
@ -271,7 +271,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
$(table).on("click", "[data-id].btn-edit", function (e) { $(table).on("click", "[data-id].btn-edit", function (e) {
e.preventDefault(); e.preventDefault();
var ids = $(this).data("id"); var ids = $(this).data("id");
var row = Table.api.getrowbyid(ids); var row = Table.api.getrowbyid(table, ids);
row.ids = ids; row.ids = ids;
var url = Table.api.replaceurl(options.extend.edit_url, row, table); var url = Table.api.replaceurl(options.extend.edit_url, row, table);
Fast.api.open(url, __('Edit'), $(this).data() || {}); Fast.api.open(url, __('Edit'), $(this).data() || {});