diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php index 959d585d..f3f5f249 100644 --- a/application/admin/controller/Addon.php +++ b/application/admin/controller/Addon.php @@ -61,7 +61,12 @@ class Addon extends Backend if ($params) { foreach ($config as $k => &$v) { 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; } } diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html index 57f39925..439dec8c 100644 --- a/application/admin/view/index/login.html +++ b/application/admin/view/index/login.html @@ -81,7 +81,7 @@
- + {/if} diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js index 6ec1eb3f..fb550ff5 100644 --- a/public/assets/js/require-backend.min.js +++ b/public/assets/js/require-backend.min.js @@ -9565,7 +9565,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr }); $(table).on("click", "input[data-id][name='checkbox']", function (e) { 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).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) { e.preventDefault(); var ids = $(this).data("id"); - var row = Table.api.getrowbyid(ids); + var row = Table.api.getrowbyid(table, ids); row.ids = ids; var url = Table.api.replaceurl(options.extend.edit_url, row, table); Fast.api.open(url, __('Edit'), $(this).data() || {}); diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 6fec4c02..eb5013e6 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -261,7 +261,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table }); $(table).on("click", "input[data-id][name='checkbox']", function (e) { 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).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) { e.preventDefault(); var ids = $(this).data("id"); - var row = Table.api.getrowbyid(ids); + var row = Table.api.getrowbyid(table, ids); row.ids = ids; var url = Table.api.replaceurl(options.extend.edit_url, row, table); Fast.api.open(url, __('Edit'), $(this).data() || {});