From a42c69f168208caeab5486afa5edf52a2a742d17 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 9 Oct 2023 11:05:17 +0800 Subject: [PATCH 1/9] =?UTF-8?q?REPORT-102875=20=E5=86=B3=E7=AD=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=8B=96=E5=85=A5=E7=9A=84=E5=9B=BE=E8=A1=A8=E9=83=BD?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/designer/creator/XCreatorUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 1ebd19ec3d..4cb42a04ce 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -33,6 +33,7 @@ import com.fr.form.ui.AbstractBorderStyleWidget; import com.fr.form.ui.Button; import com.fr.form.ui.CardAddButton; import com.fr.form.ui.CardSwitchButton; +import com.fr.form.ui.ChartEditor; import com.fr.form.ui.CheckBox; import com.fr.form.ui.CheckBoxGroup; import com.fr.form.ui.ComboBox; @@ -201,6 +202,8 @@ public class XCreatorUtils { private static void putExtraEditor() { if (DesignModuleFactory.getChartEditorClass() != null) { objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class); + } else { + objectMap.put(ChartEditor.class, XChartEditor.class); } } From 5ebbf68dd1ae3a28d842f49d2dbb79c306038051 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 14:20:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E4=BF=9D=E5=AD=98=E5=9F=8B=E7=82=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 3 +++ .../java/com/fr/design/worker/save/CallbackSaveWorker.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 76abb74455..06a37c872f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -3,6 +3,7 @@ package com.fr.design.mainframe; import com.fr.base.Parameter; import com.fr.base.TRL; import com.fr.base.extension.FileExtension; +import com.fr.base.info.TemplateSaveInfoContext; import com.fr.base.io.BaseBook; import com.fr.base.iofile.attr.DesignBanCopyAttrMark; import com.fr.base.iofile.attr.TemplateIdAttrMark; @@ -1884,6 +1885,8 @@ public abstract class JTemplate> CallbackSaveWorker worker = new CallbackSaveWorker(new Callable() { @Override public Boolean call() throws Exception { + TemplateSaveInfoContext.getInstance().startRecord(); + TemplateSaveInfoContext.getInstance().collectInfo(template.suffix()); return saveRealFileByWorker(); } }, this); diff --git a/designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java b/designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java index ed2597f1d7..b7a50a3af1 100644 --- a/designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java +++ b/designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java @@ -1,5 +1,6 @@ package com.fr.design.worker.save; +import com.fr.base.info.TemplateSaveInfoContext; import com.fr.common.util.Collections; import com.fr.design.mainframe.JTemplate; import java.util.LinkedList; @@ -34,6 +35,8 @@ public class CallbackSaveWorker extends SaveWorker { } successRunnableList = null; failRunnableList = null; + TemplateSaveInfoContext.getInstance().stopRecord(); + TemplateSaveInfoContext.getInstance().setSaveCompleted(success); } private void fireRunnable(List list) { From ba7a3e241f794e42037a9e5aab7b409995d31a57 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 15:04:33 +0800 Subject: [PATCH 3/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=90=AF=E5=8A=A8=E5=9F=8B=E7=82=B9=E6=96=B0=E5=A2=9EJDK?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/startup/metric/DesignerStartupModel.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java b/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java index 5ed94d82eb..4114420e10 100644 --- a/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java +++ b/designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java @@ -39,6 +39,11 @@ public class DesignerStartupModel { * mode：模式，0-有设计器起动页；1-无设计器起始页 */ private int mode; + + /** + * jdkVersion:JDK版本 + */ + private String jdkVersion; public DesignerStartupModel() { } @@ -73,7 +78,15 @@ public class DesignerStartupModel { public void setInfo(MachineInfo info) { this.info = info; } - + + public String getJdkVersion() { + return jdkVersion; + } + + public void setJdkVersion(String jdkVersion) { + this.jdkVersion = jdkVersion; + } + public int getMode() { return mode; } @@ -83,7 +96,7 @@ public class DesignerStartupModel { } private void fillInfo() { - + this.setJdkVersion(System.getProperty("java.runtime.version")); MachineInfo info = new MachineInfo(); AbstractOperatingSystem operatingSystem = OperatingSystem.getOperatingSystem(); info.setSystem(operatingSystem.getDisplayString()); From 10a47e02526b9b5bd3dd5cf11b3a68aab9eb532e Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:12:52 +0800 Subject: [PATCH 4/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E6=94=B6=E9=9B=86=E5=BC=82=E5=B8=B8=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/errorinfo/ErrorInfo.java | 22 +++++ .../StartErrorMessageCollector.java | 4 + .../mainframe/InformationCollector.java | 20 +++- .../errorinfo/ErrorInfoUploader.java | 92 +++++++++++++------ 4 files changed, 108 insertions(+), 30 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java b/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java index 99950edae7..8cef0d5afa 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java @@ -33,6 +33,10 @@ public class ErrorInfo { private String log; private String stackTrace; + private boolean starting; + + private boolean remote; + public ErrorInfo(String username, String uuid, String activekey) { this.username = username; this.uuid = uuid; @@ -51,6 +55,22 @@ public class ErrorInfo { this.username = username; } + public boolean isStarting() { + return starting; + } + + public void setStarting(boolean starting) { + this.starting = starting; + } + + public boolean isRemote() { + return remote; + } + + public void setRemote(boolean remote) { + this.remote = remote; + } + public String getUuid() { return uuid; } @@ -126,6 +146,8 @@ public class ErrorInfo { jo.put("logid", logid); jo.put("log", log); jo.put("stacktrace", stackTrace); + jo.put("starting", starting); + jo.put("remote", remote); saveFileToCache(jo); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java index ca3fd13ccc..69342d13e6 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java @@ -4,6 +4,8 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.errorinfo.ErrorInfo; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; +import com.fr.start.common.DesignerStartupContext; +import com.fr.workspace.WorkContext; /** * @@ -35,6 +37,8 @@ public class StartErrorMessageCollector { errorInfo.setLogid(id); errorInfo.setLog(msg); errorInfo.setStackTrace(detail); + errorInfo.setStarting(DesignerStartupContext.getInstance().isOnStartup()); + errorInfo.setRemote(!WorkContext.getCurrent().isLocal()); errorInfo.saveAsJSON(); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java index 615ee2a96b..bee247d8dd 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java @@ -57,6 +57,10 @@ public class InformationCollector implements XMLReadable, XMLWriter { */ private static final long DELTA = 24 * 3600 * 1000L; private static final long SEND_DELAY = 300 * 1000L; + /** + * 10分钟后再收集信息 + */ + private static final long SEND_DELAY_4_ERROR_INFO = 300 * 1000L * 2; private static final String FILE_NAME = "fr.info"; private static final String XML_START_STOP_LIST = "StartStopList"; private static final String XML_START_STOP = "StartStop"; @@ -64,6 +68,8 @@ public class InformationCollector implements XMLReadable, XMLWriter { private static final String ATTR_START = "start"; private static final String ATTR_STOP = "stop"; + private static final String THREAD_NAME = "ErrorInfoCollector"; + private static InformationCollector collector; /** @@ -143,9 +149,22 @@ public class InformationCollector implements XMLReadable, XMLWriter { */ public void collectStartTime() { this.current.setStartDate(dateToString()); + dealWithErrorInfo(); sendInfo(); } + private void dealWithErrorInfo() { + ScheduledExecutorService service = Executors + .newSingleThreadScheduledExecutor(new NamedThreadFactory(THREAD_NAME)); + service.schedule(() -> { + ErrorInfoUploader.getInstance().dealErrorInfo(false); + }, SEND_DELAY_4_ERROR_INFO, TimeUnit.MILLISECONDS); + service.shutdown(); + } + + /** + * 目前来看这些数据好像没啥用了，但是还是先留着吧，单独把错误信息拿出来用云端运维统一提交 + */ private void sendInfo() { if (!DesignerEnvManager.getEnvManager().isJoinProductImprove() || !FRContext.isChineseEnv()) { return; @@ -157,7 +176,6 @@ public class InformationCollector implements XMLReadable, XMLWriter { SolidCollector.getInstance().sendToCloudCenterAndDeleteFile(); FocusPointMessageUploader.getInstance().sendToCloudCenter(); ChartInfoCollector.getInstance().sendPointInfo(); - ErrorInfoUploader.getInstance().sendErrorInfo(); sendInfoSuccessCallback(); }, SEND_DELAY, TimeUnit.MILLISECONDS); service.shutdown(); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java index 73ecf610d1..97b6a0e162 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java @@ -20,9 +20,10 @@ import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -148,6 +149,15 @@ public class ErrorInfoUploader { // 判断更新解决方案缓存. checkUpdateSolution(); + dealErrorInfo(true); + } + + /** + * 处理错误信息 + * + * @param needSend2Cloud 是否需要上传到云中心 + */ + public void dealErrorInfo(boolean needSend2Cloud) { //读取文件夹里的json, 加入上传队列中. File folder = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FOLDER_NAME)); if (!folder.exists()) { @@ -164,41 +174,65 @@ public class ErrorInfoUploader { } try { - if (ArrayUtils.isNotEmpty(files)) { - JSONArray jsonArray = new JSONArray(); - List tempFiles = new ArrayList<>(); - int count = 0; - for (File file : files) { - count++; - String filePath = file.getPath(); - String suffix = filePath.substring(filePath.lastIndexOf(".")); - - if (suffix.endsWith(SUFFIX)) { - String content = IOUtils.inputStream2String(new FileInputStream(file)); - if (content.length() > MAX_ERROR_SIZE) { - CommonIOUtils.deleteFile(file); - continue; - } - jsonArray.put(new JSONObject(content)); - tempFiles.add(file); - if (jsonArray.length() == MAX_ITEMS || count == files.length) { - String url = CloudCenter.getInstance().acquireUrlByKind("design.error"); - if (StringUtils.isBlank(url)) { - return; - } - if (sendErrorInfo(url, jsonArray)) { - deleteFiles(tempFiles); - } - jsonArray = new JSONArray(); - } + dealFiles(files, needSend2Cloud); + } catch (Exception ignore) { + + } + } + + private void dealFiles(File[] files, boolean needSend2Cloud) throws IOException { + if (ArrayUtils.isNotEmpty(files)) { + JSONArray jsonArray = new JSONArray(); + List tempFiles = new ArrayList<>(); + int count = 0; + for (File file : files) { + count++; + String filePath = file.getPath(); + String suffix = filePath.substring(filePath.lastIndexOf(".")); + + if (suffix.endsWith(SUFFIX)) { + String content = IOUtils.inputStream2String(Files.newInputStream(file.toPath())); + if (content.length() > MAX_ERROR_SIZE) { + CommonIOUtils.deleteFile(file); + continue; + } + jsonArray.put(new JSONObject(content)); + tempFiles.add(file); + if (jsonArray.length() == MAX_ITEMS || count == files.length) { + processInfos(jsonArray, needSend2Cloud, tempFiles); } } } - } catch (Exception ignore) { + } + } + private void processInfos(JSONArray jsonArray, boolean needSend2Cloud, List tempFiles) { + if (needSend2Cloud) { + String url = CloudCenter.getInstance().acquireUrlByKind("design.error"); + if (StringUtils.isBlank(url)) { + return; + } + if (sendErrorInfo(url, jsonArray)) { + deleteFiles(tempFiles); + } + jsonArray = new JSONArray(); + } else { + sendInfos4AnalysisAndClearFiles(jsonArray, tempFiles); } } + + /** + * 提供给云端运维监听的方法(beforeExecute) + * + * @param jsonArray 要提交的信息 + * @param tempFiles 要删除的文件 + */ + private void sendInfos4AnalysisAndClearFiles(JSONArray jsonArray, List tempFiles) { + deleteFiles(tempFiles); + } + + private void deleteFiles(List files) { for (File file : files) { CommonIOUtils.deleteFile(file); From 2fdcf43a206fbd7d730ec861a893b1e7c43d333b Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:13:38 +0800 Subject: [PATCH 5/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=B8=B8=E9=87=8F=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java index 97b6a0e162..0a817b89ba 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java @@ -38,6 +38,8 @@ public class ErrorInfoUploader { public static final String SUFFIX = ".json"; public static final String FOLDER_NAME = "errorInfo"; + private static final String CLOUD_KEY = "design.error"; + private static ErrorInfoUploader collector; // 在一台不能上网的电脑里发现了10w个errorinfo... private static final int MAX_ERROR_SIZE = 2000; @@ -208,7 +210,7 @@ public class ErrorInfoUploader { private void processInfos(JSONArray jsonArray, boolean needSend2Cloud, List tempFiles) { if (needSend2Cloud) { - String url = CloudCenter.getInstance().acquireUrlByKind("design.error"); + String url = CloudCenter.getInstance().acquireUrlByKind(CLOUD_KEY); if (StringUtils.isBlank(url)) { return; } From 06e0f04f1932f14e2ce16ea06dc03a33bf2090e8 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:35:02 +0800 Subject: [PATCH 6/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/designer/creator/XCreatorUtils.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 4cb42a04ce..1bf5843b89 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -202,8 +202,6 @@ public class XCreatorUtils { private static void putExtraEditor() { if (DesignModuleFactory.getChartEditorClass() != null) { objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class); - } else { - objectMap.put(ChartEditor.class, XChartEditor.class); } } From 61db7d3841f731d2887f62120104d443ec015093 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:36:54 +0800 Subject: [PATCH 7/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/designer/creator/XCreatorUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 1bf5843b89..4cb42a04ce 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -202,6 +202,8 @@ public class XCreatorUtils { private static void putExtraEditor() { if (DesignModuleFactory.getChartEditorClass() != null) { objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class); + } else { + objectMap.put(ChartEditor.class, XChartEditor.class); } } From b4170ce73d1b21b0cca741f12ceb9cc7c67c70f2 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:37:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/designer/creator/XCreatorUtils.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 4cb42a04ce..1bf5843b89 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -202,8 +202,6 @@ public class XCreatorUtils { private static void putExtraEditor() { if (DesignModuleFactory.getChartEditorClass() != null) { objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class); - } else { - objectMap.put(ChartEditor.class, XChartEditor.class); } } From 9543ce2f75bb1b110044e7e4f85dc5eb5367bfb1 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 16 Nov 2023 17:38:02 +0800 Subject: [PATCH 9/9] =?UTF-8?q?REPORT-106669=20=E6=8A=A5=E8=A1=A8=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E8=A1=A5=E5=85=85=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?= =?UTF-8?q?=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/designer/creator/XCreatorUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 1bf5843b89..1ebd19ec3d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -33,7 +33,6 @@ import com.fr.form.ui.AbstractBorderStyleWidget; import com.fr.form.ui.Button; import com.fr.form.ui.CardAddButton; import com.fr.form.ui.CardSwitchButton; -import com.fr.form.ui.ChartEditor; import com.fr.form.ui.CheckBox; import com.fr.form.ui.CheckBoxGroup; import com.fr.form.ui.ComboBox;