Browse Source

Pull request #14191: REPORT-126694 预定义控件保存失败

Merge in DESIGN/design from ~DESTINY.LIN/design:mss/2.0 to mss/2.0

* commit 'faf2af7a215d100ed6374ceb2828be13cf221515':
  REPORT-126694 预定义控件保存失败
mss/2.0
Destiny.Lin-林锦龙 6 months ago
parent
commit
c7acf55d34
  1. 3
      designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
  2. 4
      designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
  3. 2
      designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java
  4. 3
      designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
  5. 3
      designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java
  6. 3
      designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java

3
designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java

@ -59,8 +59,7 @@ public class FunctionManagerAction extends UpdateAction {
} }
}); });
FunctionConfig mirror = functionManager.mirror(); functionManagerPane.populate(functionManager);
functionManagerPane.populate(mirror);
functionManagerDialog.setVisible(true); functionManagerDialog.setVisible(true);
} }

4
designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java

@ -36,9 +36,7 @@ public class ProcedureListAction extends UpdateAction {
final ProcedureConfig procedureConfig = ProcedureConfig.getInstance(); final ProcedureConfig procedureConfig = ProcedureConfig.getInstance();
final ProcedureManagerPane databaseManagerPane = new ProcedureManagerPane() { final ProcedureManagerPane databaseManagerPane = new ProcedureManagerPane() {
public void complete() { public void complete() {
populate(procedureConfig);
ProcedureConfig mirror = procedureConfig.mirror();
populate(mirror);
} }
}; };
BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null); BasicDialog databaseListDialog = databaseManagerPane.showLargeWindow(designerFrame, null);

2
designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java

@ -111,7 +111,7 @@ public class ChartPreStyleListPane extends JListControlPane {
} }
public void populateBean() { public void populateBean() {
ChartPreStyleConfig config = ChartPreStyleConfig.getInstance().mirror(); ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
Iterator keys = config.names(); Iterator keys = config.names();

3
designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

@ -49,8 +49,7 @@ public class ServerConfigManagerAction extends UpdateAction {
@Override @Override
public void complete() { public void complete() {
ServerPreferenceConfig mirror = config.mirror(); populate(config);
populate(mirror);
} }
}; };

3
designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java

@ -61,8 +61,7 @@ public class StyleListAction extends UpdateAction {
} }
}); });
ServerPreferenceConfig mirror = ServerPreferenceConfig.getInstance().mirror(); styleListPane.populate(ServerPreferenceConfig.getInstance());
styleListPane.populate(mirror);
styleListDialog.setVisible(true); styleListDialog.setVisible(true);
} }

3
designer-realize/src/main/java/com/fr/design/actions/server/WidgetManagerAction.java

@ -39,8 +39,7 @@ public class WidgetManagerAction extends UpdateAction {
final WidgetManagerPane widgetManagerPane = new WidgetManagerPane() { final WidgetManagerPane widgetManagerPane = new WidgetManagerPane() {
@Override @Override
public void complete() { public void complete() {
WidgetInfoConfig mirror = widgetManager.mirror(); populate(widgetManager);
populate(mirror);
} }
}; };

Loading…
Cancel
Save