|
|
@ -7,14 +7,13 @@ import com.fr.chart.chartattr.Plot; |
|
|
|
import com.fr.chart.chartdata.MoreNameCDDefinition; |
|
|
|
import com.fr.chart.chartdata.MoreNameCDDefinition; |
|
|
|
import com.fr.chart.chartdata.OneValueCDDefinition; |
|
|
|
import com.fr.chart.chartdata.OneValueCDDefinition; |
|
|
|
import com.fr.data.TableDataSource; |
|
|
|
import com.fr.data.TableDataSource; |
|
|
|
import com.fr.data.impl.EmbeddedTableData; |
|
|
|
import com.fr.data.impl.NameTableData; |
|
|
|
import com.fr.design.DesignModelAdapter; |
|
|
|
import com.fr.design.DesignModelAdapter; |
|
|
|
import com.fr.design.DesignerEnvManager; |
|
|
|
import com.fr.design.DesignerEnvManager; |
|
|
|
import com.fr.design.data.DesignTableDataManager; |
|
|
|
import com.fr.design.data.DesignTableDataManager; |
|
|
|
import com.fr.design.ui.ModernUIPane; |
|
|
|
import com.fr.design.ui.ModernUIPane; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.IOUtils; |
|
|
|
import com.fr.general.IOUtils; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
|
|
|
|
import com.fr.plugin.chart.base.AttrTooltipRichText; |
|
|
|
import com.fr.plugin.chart.base.AttrTooltipRichText; |
|
|
|
import com.fr.plugin.chart.custom.CustomDefinition; |
|
|
|
import com.fr.plugin.chart.custom.CustomDefinition; |
|
|
|
import com.fr.plugin.chart.custom.type.CustomPlotType; |
|
|
|
import com.fr.plugin.chart.custom.type.CustomPlotType; |
|
|
@ -28,6 +27,8 @@ import com.teamdev.jxbrowser.chromium.JSValue; |
|
|
|
import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter; |
|
|
|
import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter; |
|
|
|
import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent; |
|
|
|
import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Locale; |
|
|
|
import java.util.Locale; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
@ -117,15 +118,9 @@ public class VanChartRichEditorPane { |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
String[] columnNames = DesignTableDataManager.getSelectedColumnNames(tableDataSource, ((NameTableData) tableData).getName()); |
|
|
|
EmbeddedTableData embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tableDataSource, |
|
|
|
VanChartRichEditorPane.fieldNames = new ArrayList<>(); |
|
|
|
tableData, TableData.RESULT_NOT_NEED, false); |
|
|
|
fieldNames.addAll(Arrays.asList(columnNames)); |
|
|
|
|
|
|
|
|
|
|
|
List<String> fieldNames = DesignTableDataManager.getColumnNamesByTableData(embeddedTableData); |
|
|
|
|
|
|
|
VanChartRichEditorPane.fieldNames = fieldNames; |
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public static ModernUIPane<VanChartRichEditorModel> createRichEditorPane(AttrTooltipRichText richEditor) { |
|
|
|
public static ModernUIPane<VanChartRichEditorModel> createRichEditorPane(AttrTooltipRichText richEditor) { |
|
|
|