latex update
This commit is contained in:
@@ -3332,8 +3332,8 @@ class Production extends Base
|
|||||||
|
|
||||||
|
|
||||||
public function myTableTest(){
|
public function myTableTest(){
|
||||||
$references = $this->production_article_refer_obj->where("p_article_id",3401)->where("state",0)->order("index asc")->select();
|
$references = $this->production_article_refer_obj->where("p_article_id",3328)->where("state",0)->order("index asc")->select();
|
||||||
$res = $this->tableCovertLatex(1102,$references);
|
$res = $this->tableCovertLatex(1120,$references);
|
||||||
|
|
||||||
echo $res;
|
echo $res;
|
||||||
}
|
}
|
||||||
@@ -3352,9 +3352,9 @@ class Production extends Base
|
|||||||
if (json_last_error() !== JSON_ERROR_NONE || !is_array($tableData) || empty($tableData)) {
|
if (json_last_error() !== JSON_ERROR_NONE || !is_array($tableData) || empty($tableData)) {
|
||||||
return "% 无效的JSON数据";
|
return "% 无效的JSON数据";
|
||||||
}
|
}
|
||||||
if(strlen($table_info['table_data'])>6000){
|
// if(strlen($table_info['table_data'])>6000){
|
||||||
return "执行附表程序";
|
// return "执行附表程序";
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 获取表格最大列数(遍历所有行,找到列数最大值,处理合并后列数变化的情况)
|
// 获取表格最大列数(遍历所有行,找到列数最大值,处理合并后列数变化的情况)
|
||||||
$maxColCount = 0;
|
$maxColCount = 0;
|
||||||
@@ -3488,6 +3488,8 @@ class Production extends Base
|
|||||||
for ($a_r=1;$a_r<$rowspan;$a_r++){
|
for ($a_r=1;$a_r<$rowspan;$a_r++){
|
||||||
$table[$rowIndex+$a_r][$currentCol] = "";
|
$table[$rowIndex+$a_r][$currentCol] = "";
|
||||||
}
|
}
|
||||||
|
}else{
|
||||||
|
$table[$rowIndex][$currentCol] = $cellContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
// $cells[] = $cellContent;
|
// $cells[] = $cellContent;
|
||||||
|
|||||||
Reference in New Issue
Block a user