Browse Source

Merge pull request #811 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0

* commit '4bd7fd56ed198eb62959bf15362797644e201e8e':
  REPORT-14862 简道云插件适配10.0,同步简道云数据集到10。0
bugfix/10.0
zack 6 years ago
parent
commit
454a7d847d
  1. 1
      designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
  2. 27
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  3. 4
      designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

1
designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@ -147,6 +147,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
private boolean isIncludeUnderline(String name) { private boolean isIncludeUnderline(String name) {
return ComparatorUtils.equals(name.indexOf(StoreProcedureAssist.GROUP_MARKER), -1) ? false : true; return ComparatorUtils.equals(name.indexOf(StoreProcedureAssist.GROUP_MARKER), -1) ? false : true;
} }
public abstract void addDataPane(final AbstractTableDataPane<?> uPanel, String paneName);
public abstract TableDataTree getDataTree(); public abstract TableDataTree getDataTree();

27
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@ -324,4 +324,31 @@ public class TableDataTreePane extends BasicTableDataTreePane {
dataTree.refresh(); dataTree.refresh();
return Collections.unmodifiableMap(tdNameMap); return Collections.unmodifiableMap(tdNameMap);
} }
public void addDataPane(final AbstractTableDataPane<?> uPanel, String paneName) {
final NamePane nPanel = uPanel.asNamePane();
nPanel.setObjectName(paneName);
final String oldName = paneName;
allDSNames = DesignTableDataManager.getAllDSNames(tc.getBook());
DesignTableDataManager.setThreadLocal(DesignTableDataManager.NO_PARAMETER);
tc.renameTableData(oldName, nPanel.getObjectName(), false);
TableDataSource tds = tc.getBook();
TableData td = uPanel.updateBean();
if (td instanceof TableDataSourceDependent) {
((TableDataSourceDependent) td).setTableDataSource(tds);
}
String tdName = nPanel.getObjectName();
tds.putTableData(tdName, td);
Map<String, String> map = new HashMap<String, String>();
if (!ComparatorUtils.equals(oldName, tdName)) {
map.put(oldName, tdName);
}
fireDSChanged(map);
tc.fireTargetModified();
tc.parameterChanged();
int[] rows = dataTree.getSelectionRows();
dataTree.refreshChildByName(tdName);
dataTree.setSelectionRows(rows);
}
} }

4
designer-base/src/main/java/com/fr/design/dialog/BasicPane.java

@ -298,13 +298,13 @@ public abstract class BasicPane extends JPanel {
public void checkValid() throws Exception { public void checkValid() throws Exception {
} }
public static final class NamePane extends BasicPane { public static class NamePane extends BasicPane {
private UITextField nameTextField; private UITextField nameTextField;
private BasicPane centerPane; private BasicPane centerPane;
private UILabel showfield; private UILabel showfield;
private PropertyChangeAdapter changeListener; private PropertyChangeAdapter changeListener;
private NamePane(BasicPane bPane) { public NamePane(BasicPane bPane) {
this.setLayout(new BorderLayout(4, 4)); this.setLayout(new BorderLayout(4, 4));
nameTextField = new UITextField(30); nameTextField = new UITextField(30);

Loading…
Cancel
Save