Merge pull request #13370 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'be45981f67ea826dfa8b1831479055b2eb850a1c':
  REPORT-109525 【设计器性能】启动性能优化 代码规范
  REPORT-111169 数据集含有注释的参数，但参数依然生效
  REPORT-109525 【设计器性能】启动性能优化 插件禁用启用逻辑完善

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -417,8 +417,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
 
     private void checkParameter() {
         String[] paramTexts = new String[2];
-        paramTexts[0] = this.sqlTextPane.getText();
-        paramTexts[1] = this.pageQuery;
+        paramTexts[0] = SqlUtils.clearSqlComments(this.sqlTextPane.getText());
+        paramTexts[1] = SqlUtils.clearSqlComments(this.pageQuery);
         Parameter[] parameters = ParameterHelper.analyze4Parameters(paramTexts, false);
 
         if (parameters.length < 1 && this.editorPane.update().size() < 1) {

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -153,9 +153,9 @@ public class PluginOperateUtils {
             public void run() {
                 PluginMarker pluginMarker = PluginUtils.createPluginMarker(pluginInfo);
                 PluginContext plugin = PluginManager.getContext(pluginMarker);
-                boolean isRunning = plugin.isRunning();
-                PluginTaskCallback modifyStatusCallback = new ModifyStatusCallback(isRunning, jsCallback);
-                changePluginActive(isRunning, pluginMarker, modifyStatusCallback, plugin);
+                boolean running = plugin.isRunning() || plugin.isPrepare();
+                PluginTaskCallback modifyStatusCallback = new ModifyStatusCallback(running, jsCallback);
+                changePluginActive(running, pluginMarker, modifyStatusCallback, plugin);
             }
         });
     }

designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@@ -270,8 +270,8 @@ public class PluginUtils {
                 jo.put("vendor", pluginContext.getVendor());
                 jo.put("price", pluginContext.getPrice());
                 jo.put("requiredJarTime", pluginContext.getRequiredJarTime());
-                // 前端需求的active实际上是插件的运行状态，通过isRunning()获取
-                jo.put("active", pluginContext.isRunning());
+                // 前端需求的active实际上是插件的运行状态，通过isRunning()或isPrepare()获取
+                jo.put("active", pluginContext.isRunning() || pluginContext.isPrepare());
                 jo.put("hidden", pluginContext.isHidden());
                 jo.put("free", pluginContext.isFree());
                 jo.put("licDamaged", pluginContext.isLicDamaged());