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

新增系统配置扩展参数替换功能 

优化系统配置添加逻辑
修复系统配置无法添加的BUG
pull/144/MERGE
Karson 2019-10-06 15:16:00 +08:00
parent 8066902212
commit 193f33f11a
7 changed files with 337 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/admin/controller/general/Config.php
View File

@ -21,7 +21,7 @@ class Config extends Backend
* @var \app\common\model\Config * @var \app\common\model\Config
*/ */
protected $model = null; protected $model = null;
protected $noNeedRight = ['check']; protected $noNeedRight = ['check', 'rulelist'];
public function _initialize() public function _initialize()
{ {
@ -62,6 +62,7 @@ class Config extends Backend
} }
$this->view->assign('siteList', $siteList); $this->view->assign('siteList', $siteList);
$this->view->assign('typeList', ConfigModel::getTypeList()); $this->view->assign('typeList', ConfigModel::getTypeList());
$this->view->assign('ruleList', ConfigModel::getRegexList());
$this->view->assign('groupList', ConfigModel::getGroupList()); $this->view->assign('groupList', ConfigModel::getGroupList());
return $this->view->fetch(); return $this->view->fetch();
} }
@ -201,6 +202,32 @@ class Config extends Backend
} }
} }
/**
* 规则列表
* @internal
*/
public function rulelist()
{
//主键
$primarykey = $this->request->request("keyField");
//主键值
$keyValue = $this->request->request("keyValue", "");
$keyValueArr = array_filter(explode(',', $keyValue));
$regexList = \app\common\model\Config::getRegexList();
$list = [];
foreach ($regexList as $k => $v) {
if ($keyValueArr) {
if (in_array($k, $keyValueArr)) {
$list[] = ['id' => $k, 'name' => $v];
}
} else {
$list[] = ['id' => $k, 'name' => $v];
}
}
return json(['list' => $list]);
}
/** /**
* 发送测试邮件 * 发送测试邮件
* @internal * @internal

3
application/admin/lang/zh-cn/general/config.php
View File

@ -33,6 +33,7 @@ return [
'Array' => '数组', 'Array' => '数组',
'Array key' => '键名', 'Array key' => '键名',
'Array value' => '键值', 'Array value' => '键值',
'Custom' => '自定义',
'Content' => '数据列表', 'Content' => '数据列表',
'Rule' => '校验规则', 'Rule' => '校验规则',
'Site name' => '站点名称', 'Site name' => '站点名称',
@ -45,6 +46,8 @@ return [
'Fixed page' => '后台固定页', 'Fixed page' => '后台固定页',
'Category type' => '分类类型', 'Category type' => '分类类型',
'Config group' => '配置分组', 'Config group' => '配置分组',
'Rule tips' => '校验规则使用请参考Nice-validator文档',
'Extend tips' => '扩展属性支持{id}、{name}、{group}、{title}、{value}、{content}、{rule}替换',
'Mail type' => '邮件发送方式', 'Mail type' => '邮件发送方式',
'Mail smtp host' => 'SMTP服务器', 'Mail smtp host' => 'SMTP服务器',
'Mail smtp port' => 'SMTP端口', 'Mail smtp port' => 'SMTP端口',

76
application/admin/view/general/config/index.html
View File

@ -1,17 +1,23 @@
<style type="text/css"> <style type="text/css">
@media (max-width: 375px) { @media (max-width: 375px) {
.edit-form tr td input{width:100%;} .edit-form tr td input {
.edit-form tr th:first-child,.edit-form tr td:first-child{ width: 100%;
width:20%;
} }
.edit-form tr th:nth-last-of-type(-n+2),.edit-form tr td:nth-last-of-type(-n+2){
.edit-form tr th:first-child, .edit-form tr td:first-child {
width: 20%;
}
.edit-form tr th:nth-last-of-type(-n+2), .edit-form tr td:nth-last-of-type(-n+2) {
display: none; display: none;
} }
} }
.edit-form table > tbody > tr td a.btn-delcfg{
.edit-form table > tbody > tr td a.btn-delcfg {
visibility: hidden; visibility: hidden;
} }
.edit-form table > tbody > tr:hover td a.btn-delcfg{
.edit-form table > tbody > tr:hover td a.btn-delcfg {
visibility: visible; visibility: visible;
} }
</style> </style>
@ -22,8 +28,8 @@
{foreach $siteList as $index=>$vo} {foreach $siteList as $index=>$vo}
<li class="{$vo.active?'active':''}"><a href="#{$vo.name}" data-toggle="tab">{:__($vo.title)}</a></li> <li class="{$vo.active?'active':''}"><a href="#{$vo.name}" data-toggle="tab">{:__($vo.title)}</a></li>
{/foreach} {/foreach}
<li> <li data-toggle="tooltip" title="{:__('Add new config')}">
<a href="#addcfg" data-toggle="tab" title="{:__('Add new config')}"><i class="fa fa-plus"></i></a> <a href="#addcfg" data-toggle="tab"><i class="fa fa-plus"></i></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -53,7 +59,7 @@
<div class="col-sm-8 col-xs-12"> <div class="col-sm-8 col-xs-12">
{switch $item.type} {switch $item.type}
{case string} {case string}
<input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control" data-rule="{$item.rule}" data-tip="{$item.tip}" /> <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value|htmlentities}" class="form-control" data-rule="{$item.rule}" data-tip="{$item.tip}"/>
{/case} {/case}
{case text} {case text}
<textarea {$item.extend} name="row[{$item.name}]" class="form-control" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}">{$item.value|htmlentities}</textarea> <textarea {$item.extend} name="row[{$item.name}]" class="form-control" data-rule="{$item.rule}" rows="5" data-tip="{$item.tip}">{$item.value|htmlentities}</textarea>
@ -72,26 +78,27 @@
</dl> </dl>
{/case} {/case}
{case datetime} {case datetime}
<input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-tip="{$item.tip}" data-rule="{$item.rule}" /> <input {$item.extend} type="text" name="row[{$item.name}]" value="{$item.value}" class="form-control datetimepicker" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
{/case} {/case}
{case number} {case number}
<input {$item.extend} type="number" name="row[{$item.name}]" value="{$item.value}" class="form-control" data-tip="{$item.tip}" data-rule="{$item.rule}" /> <input {$item.extend} type="number" name="row[{$item.name}]" value="{$item.value}" class="form-control" data-tip="{$item.tip}" data-rule="{$item.rule}"/>
{/case} {/case}
{case checkbox} {case checkbox}
{foreach name="item.content" item="vo"} {foreach name="item.content" item="vo"}
<label for="row[{$item.name}][]-{$key}"><input id="row[{$item.name}][]-{$key}" name="row[{$item.name}][]" type="checkbox" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value"}checked{/in} /> {$vo}</label> <label for="row[{$item.name}][]-{$key}"><input id="row[{$item.name}][]-{$key}" name="row[{$item.name}][]" type="checkbox" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
{/foreach} {/foreach}
{/case} {/case}
{case radio} {case radio}
{foreach name="item.content" item="vo"} {foreach name="item.content" item="vo"}
<label for="row[{$item.name}]-{$key}"><input id="row[{$item.name}]-{$key}" name="row[{$item.name}]" type="radio" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value"}checked{/in} /> {$vo}</label> <label for="row[{$item.name}]-{$key}"><input id="row[{$item.name}]-{$key}" name="row[{$item.name}]" type="radio" value="{$key}" data-tip="{$item.tip}" {in name="key" value="$item.value" }checked{/in} /> {$vo}</label>
{/foreach} {/foreach}
{/case} {/case}
{case value="select" break="0"}{/case} {case value="select" break="0"}{/case}
{case value="selects"} {case value="selects"}
<select {$item.extend} name="row[{$item.name}]{$item.type=='selects'?'[]':''}" class="form-control selectpicker" data-tip="{$item.tip}" {$item.type=='selects'?'multiple':''}> <select {$item.extend} name="row[{$item.name}]{$item.type=='selects'?'[]':''}" class="form-control selectpicker" data-tip="{$item.tip}" {$item.type=='selects'?'multiple':''}>
{foreach name="item.content" item="vo"} {foreach name="item.content" item="vo"}
<option value="{$key}" {in name="key" value="$item.value"}selected{/in}>{$vo}</option> <option value="{$key}" {in name="key" value="$item.value" }selected{
/in}>{$vo}</option>
{/foreach} {/foreach}
</select> </select>
{/case} {/case}
@ -116,7 +123,7 @@
{/case} {/case}
{case switch} {case switch}
<input id="c-{$item.name}" name="row[{$item.name}]" type="hidden" value="{:$item.value?1:0}"> <input id="c-{$item.name}" name="row[{$item.name}]" type="hidden" value="{:$item.value?1:0}">
<a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-{$item.name}" data-yes="1" data-no="0" > <a href="javascript:;" data-toggle="switcher" class="btn-switcher" data-input-id="c-{$item.name}" data-yes="1" data-no="0">
<i class="fa fa-toggle-on text-success {if !$item.value}fa-flip-horizontal text-gray{/if} fa-2x"></i> <i class="fa fa-toggle-on text-success {if !$item.value}fa-flip-horizontal text-gray{/if} fa-2x"></i>
</a> </a>
{/case} {/case}
@ -124,6 +131,9 @@
<label for="row[{$item.name}]-yes"><input id="row[{$item.name}]-yes" name="row[{$item.name}]" type="radio" value="1" {$item.value?'checked':''} data-tip="{$item.tip}" /> {:__('Yes')}</label> <label for="row[{$item.name}]-yes"><input id="row[{$item.name}]-yes" name="row[{$item.name}]" type="radio" value="1" {$item.value?'checked':''} data-tip="{$item.tip}" /> {:__('Yes')}</label>
<label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label> <label for="row[{$item.name}]-no"><input id="row[{$item.name}]-no" name="row[{$item.name}]" type="radio" value="0" {$item.value?'':'checked'} data-tip="{$item.tip}" /> {:__('No')}</label>
{/case} {/case}
{case custom}
{$item.extend}
{/case}
{/switch} {/switch}
</div> </div>
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
@ -153,22 +163,25 @@
{/foreach} {/foreach}
<div class="tab-pane fade" id="addcfg"> <div class="tab-pane fade" id="addcfg">
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="{:url('general.config/add')}"> <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="{:url('general.config/add')}">
{:token()}
<div class="form-group"> <div class="form-group">
<label for="type" class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<select name="row[type]" class="form-control selectpicker"> <select name="row[type]" class="form-control selectpicker">
{foreach name="typeList" item="vo"} {foreach name="typeList" item="vo"}
<option value="{$key}" {in name="key" value="string"}selected{/in}>{$vo}</option> <option value="{$key}" {in name="key" value="string" }selected{
/in}>{$vo}</option>
{/foreach} {/foreach}
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="group" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<select name="row[group]" class="form-control selectpicker"> <select name="row[group]" class="form-control selectpicker">
{foreach name="groupList" item="vo"} {foreach name="groupList" item="vo"}
<option value="{$key}" {in name="key" value="basic"}selected{/in}>{$vo}</option> <option value="{$key}" {in name="key" value="basic" }selected{
/in}>{$vo}</option>
{/foreach} {/foreach}
</select> </select>
</div> </div>
@ -176,44 +189,55 @@
<div class="form-group"> <div class="form-group">
<label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label> <label for="name" class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<input type="text" class="form-control" id="name" name="row[name]" value="" data-rule="required; length(3~30); remote(general/config/check)" /> <input type="text" class="form-control" id="name" name="row[name]" value="" data-rule="required; length(3~30); remote(general/config/check)"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label> <label for="title" class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<input type="text" class="form-control" id="title" name="row[title]" value="" data-rule="required" /> <input type="text" class="form-control" id="title" name="row[title]" value="" data-rule="required"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="value" class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label> <label for="value" class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<input type="text" class="form-control" id="value" name="row[value]" value="" data-rule="" /> <input type="text" class="form-control" id="value" name="row[value]" value="" data-rule=""/>
</div> </div>
</div> </div>
<div class="form-group hide" id="add-content-container"> <div class="form-group hide" id="add-content-container">
<label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label> <label for="content" class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<textarea name="row[content]" id="content" cols="30" rows="5" class="form-control" data-rule="required">value1|title1 <textarea name="row[content]" id="content" cols="30" rows="5" class="form-control" data-rule="required(content)">value1|title1
value2|title2</textarea> value2|title2</textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="tip" class="control-label col-xs-12 col-sm-2">{:__('Tip')}:</label> <label for="tip" class="control-label col-xs-12 col-sm-2">{:__('Tip')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<input type="text" class="form-control" id="tip" name="row[tip]" value="" data-rule="" /> <input type="text" class="form-control" id="tip" name="row[tip]" value="" data-rule=""/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="rule" class="control-label col-xs-12 col-sm-2">{:__('Rule')}:</label> <label for="rule" class="control-label col-xs-12 col-sm-2">{:__('Rule')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<input type="text" class="form-control" id="rule" name="row[rule]" value="" /> <div class="input-group pull-left">
<input type="text" class="form-control" id="rule" name="row[rule]" value="" data-tip="{:__('Rule tips')}"/>
<span class="input-group-btn">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" type="button">{:__('Choose')}</button>
<ul class="dropdown-menu pull-right rulelist">
{volist name="ruleList" id="item"}
<li><a href="javascript:;" data-value="{$key}">{$item}<span class="text-muted">({$key})</span></a></li>
{/volist}
</ul>
</span>
</div>
<span class="msg-box n-right" for="rule"></span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="extend" class="control-label col-xs-12 col-sm-2">{:__('Extend')}:</label> <label for="extend" class="control-label col-xs-12 col-sm-2">{:__('Extend')}:</label>
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<textarea name="row[extend]" id="extend" cols="30" rows="5" class="form-control" data-rule=""></textarea> <textarea name="row[extend]" id="extend" cols="30" rows="5" class="form-control" data-tip="{:__('Extend tips')}" data-rule="required(extend)" data-msg-extend="当类型为自定义时，扩展属性不能为空"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

10
application/common/model/Config.php
View File

@ -72,6 +72,16 @@ class Config extends Model
return $regexList; return $regexList;
} }
public function getExtendAttr($value, $data)
{
$result = preg_replace_callback("/\{([a-zA-Z]+)\}/", function ($matches) use ($data) {
if (isset($data[$matches[1]])) {
return $data[$matches[1]];
}
}, $data['extend']);
return $result;
}
/** /**
* 读取分类分组列表 * 读取分类分组列表
* @return array * @return array

35
public/assets/js/backend/general/config.js
View File

@ -51,9 +51,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
Form.api.bindevent($("form.edit-form")); Form.api.bindevent($("form.edit-form"));
//不可见的元素不验证 //不可见的元素不验证
$("form#add-form").data("validator-options", {ignore: ':hidden'}); $("form#add-form").data("validator-options", {
Form.api.bindevent($("form#add-form"), null, function (ret) { ignore: ':hidden',
rules: {
content: function () {
return ['radio', 'checkbox', 'select', 'selects'].indexOf($("#add-form select[name='row[type]']").val()) > -1;
},
extend: function () {
return $("#add-form select[name='row[type]']").val() == 'custom';
}
}
});
Form.api.bindevent($("form#add-form"), function (ret) {
setTimeout(function () {
location.reload(); location.reload();
}, 1500);
}); });
//切换显示隐藏变量字典列表 //切换显示隐藏变量字典列表
@ -61,6 +73,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
$("#add-content-container").toggleClass("hide", ['select', 'selects', 'checkbox', 'radio'].indexOf($(this).val()) > -1 ? false : true); $("#add-content-container").toggleClass("hide", ['select', 'selects', 'checkbox', 'radio'].indexOf($(this).val()) > -1 ? false : true);
}); });
//选择规则
$(document).on("click", ".rulelist > li > a", function () {
var ruleArr = $("#rule").val() == '' ? [] : $("#rule").val().split(";");
var rule = $(this).data("value");
var index = ruleArr.indexOf(rule);
if (index > -1) {
ruleArr.splice(index, 1);
} else {
ruleArr.push(rule);
}
$("#rule").val(ruleArr.join(";"));
$(this).parent().toggleClass("active");
});
//添加向发件人发送测试邮件按钮和方法 //添加向发件人发送测试邮件按钮和方法
$('input[name="row[mail_from]"]').parent().next().append('<a class="btn btn-info testmail">' + __('Send a test message') + '</a>'); $('input[name="row[mail_from]"]').parent().next().append('<a class="btn btn-info testmail">' + __('Send a test message') + '</a>');
$(document).on("click", ".testmail", function () { $(document).on("click", ".testmail", function () {
@ -77,7 +103,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
//删除配置 //删除配置
$(document).on("click", ".btn-delcfg", function () { $(document).on("click", ".btn-delcfg", function () {
var that = this; var that = this;
Layer.confirm(__('Are you sure you want to delete this item?'), {icon: 3, title:'提示'}, function (index) { Layer.confirm(__('Are you sure you want to delete this item?'), {
icon: 3,
title: '提示'
}, function (index) {
Backend.api.ajax({ Backend.api.ajax({
url: "general/config/del", url: "general/config/del",
data: {name: $(that).data("name")} data: {name: $(that).data("name")}

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

@ -7295,6 +7295,9 @@ define('upload',['jquery', 'bootstrap', 'plupload', 'template'], function ($, un
elem = el.name && _checkable(el) ? me.$el.find('input[name="'+ el.name +'"]').get(0) : el; elem = el.name && _checkable(el) ? me.$el.find('input[name="'+ el.name +'"]').get(0) : el;
// Get field // Get field
if (!(field = me.getField(elem)) || !field.rule) { if (!(field = me.getField(elem)) || !field.rule) {
if(!field.rule){
me.hideMsg(el);
}
return; return;
} }
// Cache event type // Cache event type
@ -9355,7 +9358,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
complete: function (xhr) { complete: function (xhr) {
var token = xhr.getResponseHeader('__token__'); var token = xhr.getResponseHeader('__token__');
if (token) { if (token) {
$("input[name='__token__']", form).val(token); $("input[name='__token__']").val(token);
} }
} }
}, function (data, ret) { }, function (data, ret) {
@ -9363,7 +9366,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
if (data && typeof data === 'object') { if (data && typeof data === 'object') {
//刷新客户端token //刷新客户端token
if (typeof data.token !== 'undefined') { if (typeof data.token !== 'undefined') {
$("input[name='__token__']", form).val(data.token); $("input[name='__token__']").val(data.token);
} }
//调用客户端事件 //调用客户端事件
if (typeof data.callback !== 'undefined' && typeof data.callback === 'function') { if (typeof data.callback !== 'undefined' && typeof data.callback === 'function') {
@ -9377,7 +9380,7 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
} }
}, function (data, ret) { }, function (data, ret) {
if (data && typeof data === 'object' && typeof data.token !== 'undefined') { if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
$("input[name='__token__']", form).val(data.token); $("input[name='__token__']").val(data.token);
} }
if (typeof error === 'function') { if (typeof error === 'function') {
if (false === error.call(form, data, ret)) { if (false === error.call(form, data, ret)) {
@ -11784,7 +11787,7 @@ define("addtabs", function(){});
restore = function () { restore = function () {
// restore origin style values // restore origin style values
$hidden.each(function (i) { $hidden.each(function (i) {
var $this = $(this), _tmp = tmp[ i ]; var $this = $(this), _tmp = tmp[i];
if (_tmp === undefined) if (_tmp === undefined)
$this.removeAttr('style'); $this.removeAttr('style');
@ -11798,8 +11801,8 @@ define("addtabs", function(){});
// it can be 'width', 'height', 'outerWidth', 'innerWidth'... etc // it can be 'width', 'height', 'outerWidth', 'innerWidth'... etc
// configs.includeMargin only works for 'outerWidth' and 'outerHeight' // configs.includeMargin only works for 'outerWidth' and 'outerHeight'
var actual = /(outer)/.test(method) ? var actual = /(outer)/.test(method) ?
$target[ method ](configs.includeMargin) : $target[method](configs.includeMargin) :
$target[ method ](); $target[method]();
restore(); restore();
// IMPORTANT, this plugin only return the value of the first element // IMPORTANT, this plugin only return the value of the first element
@ -11813,13 +11816,17 @@ define("addtabs", function(){});
SelectPage.prototype.setElem = function (combo_input) { SelectPage.prototype.setElem = function (combo_input) {
// 1. build Dom object // 1. build Dom object
var elem = {}, p = this.option, css = this.css_class, msg = this.message, input = $(combo_input); var elem = {}, p = this.option, css = this.css_class, msg = this.message, input = $(combo_input);
var cssWidth = input.css("width");
var orgWidth = input.outerWidth(); var orgWidth = input.outerWidth();
if (cssWidth.indexOf("%") > -1 || input.parent().size() > 0 && input.parent().width() == orgWidth) {
orgWidth = "100%";
} else {
// fix input width in hidden situation // fix input width in hidden situation
if (orgWidth <= 0) if (orgWidth <= 0)
orgWidth = this.elementRealSize(input, 'outerWidth'); orgWidth = this.elementRealSize(input, 'outerWidth');
if (orgWidth < 150) if (orgWidth < 150)
orgWidth = 150; orgWidth = 150;
}
elem.combo_input = input.attr({'autocomplete': 'off'}).addClass(css.input).wrap('<div>'); elem.combo_input = input.attr({'autocomplete': 'off'}).addClass(css.input).wrap('<div>');
if (p.selectOnly) if (p.selectOnly)
elem.combo_input.prop('readonly', true); elem.combo_input.prop('readonly', true);
@ -11865,7 +11872,7 @@ define("addtabs", function(){});
id: hidden_id id: hidden_id
}).val(''); }).val('');
elem.combo_input.attr({ elem.combo_input.attr({
name: input_name + namePrefix, name: typeof input.data('name') !== 'undefined' ? input.data('name') : input_name + namePrefix,
id: input_id + namePrefix id: input_id + namePrefix
}); });
@ -11961,11 +11968,8 @@ define("addtabs", function(){});
data = [data[0]]; data = [data[0]];
self.afterInit(self, data); self.afterInit(self, data);
} else {//ajax data source mode to init selected item } else {//ajax data source mode to init selected item
$.ajax({ var _paramsFunc = p.params, _params = {}, searchKey = p.searchField;
dataType: 'json', var _orgParams = {
type: 'POST',
url: p.data,
data: {
searchTable: p.dbTable, searchTable: p.dbTable,
searchKey: p.keyField, searchKey: p.keyField,
searchValue: key, searchValue: key,
@ -11974,7 +11978,22 @@ define("addtabs", function(){});
keyField: p.keyField, keyField: p.keyField,
keyValue: key, keyValue: key,
searchField: p.searchField searchField: p.searchField
}, };
if (_paramsFunc) {
var result = $.isFunction(_paramsFunc) ? _paramsFunc(self) : _paramsFunc;
if (result && $.isPlainObject(result)) {
_params = $.extend({}, _orgParams, result);
} else {
_params = _orgParams;
}
} else {
_params = _orgParams;
}
$.ajax({
dataType: 'json',
type: 'POST',
url: p.data,
data: _params,
success: function (json) { success: function (json) {
var d = null; var d = null;
if (p.eAjaxSuccess && $.isFunction(p.eAjaxSuccess)) if (p.eAjaxSuccess && $.isFunction(p.eAjaxSuccess))
@ -12543,14 +12562,15 @@ define("addtabs", function(){});
}; };
_orgParams[searchKey] = q_word[0]; _orgParams[searchKey] = q_word[0];
if (_paramsFunc) { if (_paramsFunc) {
var result = $.isFunction(_paramsFunc) ? _paramsFunc() : _paramsFunc; var result = $.isFunction(_paramsFunc) ? _paramsFunc(self) : _paramsFunc;
if (result && $.isPlainObject(result)) { if (result && $.isPlainObject(result)) {
_params = $.extend({}, _orgParams, result); _params = $.extend({}, _orgParams, result);
} else { } else {
_params = _orgParams; _params = _orgParams;
} }
} else } else {
_params = _orgParams; _params = _orgParams;
}
self.prop.xhr = $.ajax({ self.prop.xhr = $.ajax({
dataType: 'json', dataType: 'json',
url: p.data, url: p.data,
@ -12571,7 +12591,7 @@ define("addtabs", function(){});
self.showMessage(self, self.message.ajax_error); self.showMessage(self, self.message.ajax_error);
return; return;
} }
if(self.elem.navi) { if (self.elem.navi) {
$(self.elem.navi).toggleClass("hide", json.cnt_whole <= json.originalResult.length); $(self.elem.navi).toggleClass("hide", json.cnt_whole <= json.originalResult.length);
} }
@ -13553,6 +13573,5 @@ define("addtabs", function(){});
return this; return this;
}; };
})(window.jQuery); })(window.jQuery);
define("selectpage", function(){}); define("selectpage", function(){});

6
public/assets/js/require-form.js
View File

@ -431,7 +431,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
complete: function (xhr) { complete: function (xhr) {
var token = xhr.getResponseHeader('__token__'); var token = xhr.getResponseHeader('__token__');
if (token) { if (token) {
$("input[name='__token__']", form).val(token); $("input[name='__token__']").val(token);
} }
} }
}, function (data, ret) { }, function (data, ret) {
@ -439,7 +439,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
if (data && typeof data === 'object') { if (data && typeof data === 'object') {
//刷新客户端token //刷新客户端token
if (typeof data.token !== 'undefined') { if (typeof data.token !== 'undefined') {
$("input[name='__token__']", form).val(data.token); $("input[name='__token__']").val(data.token);
} }
//调用客户端事件 //调用客户端事件
if (typeof data.callback !== 'undefined' && typeof data.callback === 'function') { if (typeof data.callback !== 'undefined' && typeof data.callback === 'function') {
@ -453,7 +453,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
} }
}, function (data, ret) { }, function (data, ret) {
if (data && typeof data === 'object' && typeof data.token !== 'undefined') { if (data && typeof data === 'object' && typeof data.token !== 'undefined') {
$("input[name='__token__']", form).val(data.token); $("input[name='__token__']").val(data.token);
} }
if (typeof error === 'function') { if (typeof error === 'function') {
if (false === error.call(form, data, ret)) { if (false === error.call(form, data, ret)) {