|
|
|
@ -1,6 +1,7 @@
|
|
|
|
|
package com.fr.design.data; |
|
|
|
|
|
|
|
|
|
import com.fr.data.TableDataSource; |
|
|
|
|
import com.fr.design.constants.TableDataConstants; |
|
|
|
|
import com.fr.design.dialog.FineJOptionPane; |
|
|
|
|
import com.fr.design.i18n.Toolkit; |
|
|
|
|
import com.fr.stable.StringUtils; |
|
|
|
@ -11,8 +12,6 @@ import com.fr.stable.StringUtils;
|
|
|
|
|
* Created by hades on 2020/4/27 |
|
|
|
|
*/ |
|
|
|
|
public abstract class BasicTableDataUtils { |
|
|
|
|
private static final String SEPARATOR = "_"; |
|
|
|
|
|
|
|
|
|
private static final int LEN = 2; |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -38,10 +37,10 @@ public abstract class BasicTableDataUtils {
|
|
|
|
|
|
|
|
|
|
public static String getTableDataName(boolean isCover, TableDataSource tds, String tdName, String srcName, boolean isDsNameRepeaded) { |
|
|
|
|
if (isCover) { |
|
|
|
|
return srcName + SEPARATOR + tdName; |
|
|
|
|
return srcName + TableDataConstants.SEPARATOR + tdName; |
|
|
|
|
} |
|
|
|
|
if (tds.getTableData(tdName) != null || isDsNameRepeaded) {//如果有同名的就拼上来源名称
|
|
|
|
|
tdName = srcName + SEPARATOR + tdName; |
|
|
|
|
tdName = srcName + TableDataConstants.SEPARATOR + tdName; |
|
|
|
|
} |
|
|
|
|
int i = 0; |
|
|
|
|
while (tds.getTableData(tdName) != null) { |
|
|
|
|