|
@@ -2518,6 +2518,9 @@ class PublicRpcService implements PublicRpcServiceInterface
|
|
|
if(in_array($val['type'],[23,24])){
|
|
if(in_array($val['type'],[23,24])){
|
|
|
$cat_num = $cat_num + 2;
|
|
$cat_num = $cat_num + 2;
|
|
|
}
|
|
}
|
|
|
|
|
+ if(in_array($val['type'],[7,14])){
|
|
|
|
|
+ $cat_num = $cat_num + 1;
|
|
|
|
|
+ }
|
|
|
if(!isset($map[$val['column_num'] - 1]['col_data']['row_num'])){
|
|
if(!isset($map[$val['column_num'] - 1]['col_data']['row_num'])){
|
|
|
$row_num = 1;
|
|
$row_num = 1;
|
|
|
$map[$val['column_num'] - 1]['col_data']['row_num'] = $row_num;
|
|
$map[$val['column_num'] - 1]['col_data']['row_num'] = $row_num;
|