Browse Source

Merge pull request #189 in DESIGN/design from ~JU/design:release/10.0 to release/10.0

* commit '48f3afc99d13528bce9f87a806ed92975941633d':
  BI-26025 【产品验收】树数据集用作为用户同步数据集结果为空
master
ju 7 years ago
parent
commit
46bf758d05
  1. 8
      designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java

8
designer-base/src/com/fr/design/data/datapane/preview/PreviewTableModel.java

@ -190,10 +190,12 @@ public class PreviewTableModel extends AbstractTableModel {
s = Inter.getLocText("FR-Designer_Parameter_String"); s = Inter.getLocText("FR-Designer_Parameter_String");
if (!WorkContext.getCurrent().isLocal() && dataModel instanceof EmbeddedTDDataModel) { if (!WorkContext.getCurrent().isLocal() && dataModel instanceof EmbeddedTDDataModel) {
Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column); Class clzz = ((EmbeddedTDDataModel) dataModel).getColumnClass(column);
if (Number.class.isAssignableFrom(clzz)) { if (clzz != null) {
if (Number.class.isAssignableFrom(clzz)) {
s = Inter.getLocText("FR-Designer_Number");//bigdecimal s = Inter.getLocText("FR-Designer_Number");//bigdecimal
} else if (java.sql.Date.class.isAssignableFrom(clzz)) { } else if (java.sql.Date.class.isAssignableFrom(clzz)) {
s = Inter.getLocText("FR-Designer_Date"); s = Inter.getLocText("FR-Designer_Date");
}
} }
} }
} else if (o instanceof Integer) { } else if (o instanceof Integer) {

Loading…
Cancel
Save