Browse Source

Pull request #11906: REPORT-89901 feat: sql添加注释

Merge in DESIGN/design from ~SKY.LUO/design:feature/x to feature/x

* commit '7a3f3dc7166e2da29fda7b1cd1daeafe2685b418':
  REPORT-89901 feat: sql添加注释
  REPORT-89901 feat: sql添加注释
  REPORT-89901 feat: sql添加注释
  REPORT-89901 feat: sql添加注释
feature/x
Sky.Luo-罗鹏乾 2 years ago
parent
commit
214bf179fa
  1. 2
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

2
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@ -32,6 +32,7 @@ import com.fr.file.TableDataConfig;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.data.DataModel; import com.fr.general.data.DataModel;
import com.fr.general.data.TableDataException; import com.fr.general.data.TableDataException;
import com.fr.general.sql.sqlnote.SqlNoteConstants;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.module.ModuleContext; import com.fr.module.ModuleContext;
import com.fr.script.Calculator; import com.fr.script.Calculator;
@ -571,6 +572,7 @@ public abstract class DesignTableDataManager {
parameter.setValue(parameterMap.get(parameter.getName())); parameter.setValue(parameterMap.get(parameter.getName()));
} }
} }
parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount); return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount);
} catch (Exception e) { } catch (Exception e) {
throw new TableDataException(e.getMessage(), e); throw new TableDataException(e.getMessage(), e);

Loading…
Cancel
Save