github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-20 09:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复组合数据 索引为空bug

Browse Source
This commit is contained in:
sugar1569 2019-04-02 18:06:28 +08:00
parent 364ed0d3dc
commit 83b8eb5a07
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
application/admin/controller/setting/SystemGroupData.php
View File

@ -47,20 +47,19 @@ class SystemGroupData extends AuthController
$f = array(); $f = array();
foreach ($Fields["fields"] as $key => $value) { foreach ($Fields["fields"] as $key => $value) {
$info = []; $info = [];
if(!empty($value["param"])){ if(isset($value["param"])){
$value["param"] = str_replace("\r\n","\n",$value["param"]);//防止不兼容 $value["param"] = str_replace("\r\n","\n",$value["param"]);//防止不兼容
$params = explode("\n",$value["param"]); $params = explode("\n",$value["param"]);
if(is_array($params) && !empty($params)){ if(is_array($params) && !empty($params)){
foreach ($params as $index => $v) { foreach ($params as $index => $v) {
$vl = explode('=>',$v); $vl = explode('=>',$v);
if(!empty($vl[0]) && !empty($vl[1])){ if(isset($vl[0]) && isset($vl[1]) && count($vl)){
$info[$index]["value"] = $vl[0]; $info[$index]["value"] = $vl[0];
$info[$index]["label"] = $vl[1]; $info[$index]["label"] = $vl[1];
} }
} }
} }
} }
switch ($value["type"]){ switch ($value["type"]){
case 'input': case 'input':
$f[] = Form::input($value["title"],$value["name"]); $f[] = Form::input($value["title"],$value["name"]);
@ -109,9 +108,16 @@ class SystemGroupData extends AuthController
foreach ($params as $key => $param) { foreach ($params as $key => $param) {
foreach ($Fields['fields'] as $index => $field) { foreach ($Fields['fields'] as $index => $field) {
if($key == $field["title"]){ if($key == $field["title"]){
// if($param == "" || count($param) == 0) if($field['type'] == 'radio'){
if($param == "") $radioParam = explode("\n",$field["param"]);
return Json::fail($field["name"]."不能为空！"); if(is_array($radioParam) && !empty($radioParam)){
foreach ($radioParam as $radioIndex => &$radioItem) {
$radioItemCut = explode('=>',$radioItem);
if(isset($radioItemCut[0]) && isset($radioItemCut[1]) && $radioItemCut[0] == $param) $param = $radioItemCut[1];
}
}
}
if($param == "") return Json::fail($field["name"]."不能为空！");
else{ else{
$value[$key]["type"] = $field["type"]; $value[$key]["type"] = $field["type"];
$value[$key]["value"] = $param; $value[$key]["value"] = $param;
@ -119,7 +125,6 @@ class SystemGroupData extends AuthController
} }
} }
} }
$data = array("gid"=>$gid,"add_time"=>time(),"value"=>json_encode($value),"sort"=>$params["sort"],"status"=>$params["status"]); $data = array("gid"=>$gid,"add_time"=>time(),"value"=>json_encode($value),"sort"=>$params["sort"],"status"=>$params["status"]);
GroupDataModel::set($data); GroupDataModel::set($data);
return Json::successful('添加数据成功!'); return Json::successful('添加数据成功!');
@ -150,20 +155,32 @@ class SystemGroupData extends AuthController
$f = array(); $f = array();
foreach ($Fields['fields'] as $key => $value) { foreach ($Fields['fields'] as $key => $value) {
$info = []; $info = [];
if(!empty($value["param"])){ if(isset($value["param"])){
$value["param"] = str_replace("\r\n","\n",$value["param"]);//防止不兼容 $value["param"] = str_replace("\r\n","\n",$value["param"]);//防止不兼容
$params = explode("\n",$value["param"]); $params = explode("\n",$value["param"]);
if(is_array($params) && !empty($params)){ if(is_array($params) && !empty($params)){
foreach ($params as $index => $v) { foreach ($params as $index => $v) {
$vl = explode('=>',$v); $vl = explode('=>',$v);
if(!empty($vl[0]) && !empty($vl[1])){ if(isset($vl[0]) && isset($vl[1])){
$info[$index]["value"] = $vl[0]; $info[$index]["value"] = $vl[0];
$info[$index]["label"] = $vl[1]; $info[$index]["label"] = $vl[1];
} }
} }
} }
} }
$fvalue = isset($GroupDataValue[$value['title']]['value'])?$GroupDataValue[$value['title']]['value']:''; if(isset($value['type']) && $value['type'] == 'radio'){
if(count($info)){
foreach ($info as $radioKey=>&$radioItem){
if(is_array($radioItem) &&
count($radioItem) == 2 &&
isset($GroupDataValue[$value['title']]['value']) &&
strlen(trim($GroupDataValue[$value['title']]['value'])) &&
$radioItem['label'] === $GroupDataValue[$value['title']]['value']){
$fvalue = $radioItem['value'];
}
}
}
}else $fvalue = isset($GroupDataValue[$value['title']]['value'])?$GroupDataValue[$value['title']]['value']:'';
switch ($value['type']){ switch ($value['type']){
case 'input': case 'input':
$f[] = Form::input($value['title'],$value['name'],$fvalue); $f[] = Form::input($value['title'],$value['name'],$fvalue);
@ -221,6 +238,15 @@ class SystemGroupData extends AuthController
foreach ($params as $key => $param) { foreach ($params as $key => $param) {
foreach ($Fields['fields'] as $index => $field) { foreach ($Fields['fields'] as $index => $field) {
if($key == $field["title"]){ if($key == $field["title"]){
if($field['type'] == 'radio'){
$radioParam = explode("\n",$field["param"]);
if(is_array($radioParam) && !empty($radioParam)){
foreach ($radioParam as $radioIndex => &$radioItem) {
$radioItemCut = explode('=>',$radioItem);
if(isset($radioItemCut[0]) && isset($radioItemCut[1]) && $radioItemCut[0] == $param) $param = $radioItemCut[1];
}
}
}
if(!$param) if(!$param)
return Json::fail($field["name"]."不能为空！"); return Json::fail($field["name"]."不能为空！");
else{ else{