|
@@ -2454,7 +2454,7 @@ public class ExcelTabController extends BladeController {
|
|
String textainfo = element.text();
|
|
String textainfo = element.text();
|
|
if (textainfo == null || textainfo == "" || Func.isEmpty(textainfo)) {
|
|
if (textainfo == null || textainfo == "" || Func.isEmpty(textainfo)) {
|
|
int x1, y1;
|
|
int x1, y1;
|
|
- if (element.html().indexOf("x1") >= 0 && element.html().indexOf("y1") >= 0) {
|
|
|
|
|
|
+ if ((element.html().indexOf("x1") >= 0 && element.html().indexOf("y1") >= 0) || (element.hasAttr("x1") && element.hasAttr("y1"))) {
|
|
if (element.html().indexOf("el-tooltip") >= 0) {
|
|
if (element.html().indexOf("el-tooltip") >= 0) {
|
|
x1 = Integer.parseInt(element.children().get(0).children().get(0).attr("x1"));
|
|
x1 = Integer.parseInt(element.children().get(0).children().get(0).attr("x1"));
|
|
y1 = Integer.parseInt(element.children().get(0).children().get(0).attr("y1"));
|
|
y1 = Integer.parseInt(element.children().get(0).children().get(0).attr("y1"));
|