Browse Source
* commit '973230757a1898070f1f579e0d699b37d71d5bf3': (39 commits) 图标 update 今天要合到master代码,新功能来不及测试了,先回退 bug rt update rt rt rt 插件读取 实例化manager对象 表单增加图表类型增加行 图标 update 聚合报表工具栏 聚合报表工具栏 聚合报表图标 npe 预览展示 表单交互统一,漏传了一个文件 ...master
superman
8 years ago
13 changed files with 131 additions and 67 deletions
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
||||
package com.fr.design.module;
import com.fr.chart.base.ChartInternationalNameContentBean;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.chart.ChartDialog;
import com.fr.design.chart.gui.ChartComponent;
import com.fr.design.chart.gui.ChartWidgetOption;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.mainframe.App;
import com.fr.design.mainframe.ChartAndWidgetPropertyPane;
import com.fr.design.mainframe.ChartPropertyPane;
import com.fr.form.ui.ChartEditor;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.PluginReadListener;
import javax.swing.*;
/**
GeneralContext;
GeneralContext;
GeneralContext;
GeneralContext;
import com.fr.general.IOUtils;
GeneralContext;
import com.fr.general.Inter;
GeneralContext;
import com.fr.stable.bridge.StableFactory;
GeneralContext;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
GeneralContext;
import com.fr.stable.plugin.PluginReadListener;
GeneralContext;
GeneralContext;
import javax.swing.*;
GeneralContext;
/**
import com.fr.general.IOUtils;
import com.fr.general.IOUtils;
GeneralContext;
import com.fr.general.IOUtils;
import com.fr.general.IOUtils;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.general.IOUtils;
import com.fr.stable.bridge.StableFactory;
}
import com.fr.general.IOUtils;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.IOUtils;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.general.IOUtils;
import com.fr.general.IOUtils;
import javax.swing.*;
import com.fr.general.IOUtils;
/**
import com.fr.general.Inter;
import com.fr.general.Inter;
GeneralContext;
import com.fr.general.Inter;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.general.Inter;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.general.Inter;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.general.Inter;
import com.fr.general.Inter;
import javax.swing.*;
}
import com.fr.general.Inter;
/**
import com.fr.stable.bridge.StableFactory;
}
/**
import com.fr.stable.bridge.StableFactory;
import com.fr.general.IOUtils;
import com.fr.stable.bridge.StableFactory;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.bridge.StableFactory;
}
import com.fr.stable.bridge.StableFactory;
import javax.swing.*;
>
protected WidgetOption[] options4Show() {
ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
for (int i = 0; i < typeName.length; i++) {
String plotID = typeName[i].getPlotID();
Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
if(rowChart == null) {
continue;
}
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
}
return child;
}
public String getInterNationalName() {
return Inter.getLocText("FR-Chart-Design_ChartModule");
}
} |
||||
package com.fr.design.module;
import com.fr.chart.base.ChartInternationalNameContentBean;
import com.fr.chart.chartattr.Chart;
import com.fr.chart.chartattr.ChartCollection;
import com.fr.chart.charttypes.ChartTypeManager;
import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.chart.ChartDialog;
import com.fr.design.chart.gui.ChartComponent;
import com.fr.design.chart.gui.ChartWidgetOption;
import com.fr.design.gui.core.WidgetOption;
import com.fr.design.mainframe.App;
import com.fr.design.mainframe.ChartAndWidgetPropertyPane;
import com.fr.design.mainframe.ChartPropertyPane;
import com.fr.form.ui.ChartEditor;
import com.fr.general.import com.fr.stable.bridge.StableFactory;
/**
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
GeneralContext;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.IOUtils;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
/**
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import javax.swing.*;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
/**
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.PluginReadListener;
GeneralContext;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.general.IOUtils;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.general.Inter;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.PluginReadListener;
import javax.swing.*;
import com.fr.stable.plugin.PluginReadListener;
/**
GeneralContext;
}
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import com.fr.general.IOUtils;
import com.fr.general.Inter;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import com.fr.stable.bridge.StableFactory;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import com.fr.stable.plugin.PluginReadListener;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import javax.swing.*;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
ActionFactory.registerChartPreStyleAction(new ChartPreStyleAction());
}
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import com.fr.general.Inter;
import javax.swing.*;
ActionFactory.registerChartCollection(ChartCollection.class);
}
import javax.swing.*;
import com.fr.general.IOUtils;
import javax.swing.*;
import com.fr.general.Inter;
import javax.swing.*;
import com.fr.stable.bridge.StableFactory;
import javax.swing.*;
import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
import javax.swing.*;
import com.fr.stable.plugin.PluginReadListener;
import javax.swing.*;
return new App[0];
import javax.swing.*;
/**
>
protected WidgetOption[] options4Show() {
ChartInternationalNameContentBean[] typeName = ChartTypeManager.getInstance().getAllChartBaseNames();
ChartWidgetOption[] child = new ChartWidgetOption[typeName.length];
for (int i = 0; i < typeName.length; i++) {
String plotID = typeName[i].getPlotID();
Chart[] rowChart = ChartTypeManager.getInstance().getChartTypes(plotID);
if(rowChart == null) {
continue;
}
String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID);
Icon icon = IOUtils.readIcon(iconPath);
child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]);
}
return child;
}
public String getInterNationalName() {
return Inter.getLocText("FR-Chart-Design_ChartModule");
}
} |
Loading…
Reference in new issue