This commit is contained in:
2024-11-25 20:23:41 +03:00
parent f66790f67a
commit 784e4dbbca
4 changed files with 8 additions and 12 deletions

View File

@@ -451,7 +451,7 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
if (needsCurrent() && (getCurrent() != null)) {
savedCurrentKey = getCurrent().getPK();
}
savedSelectedKeys = getSelectedKeys();
savedSelectedKeys = getAllSelectedKeys();
}
public void RestoreLastCurrent() {
for (Object key : savedSelectedKeys) {
@@ -472,6 +472,10 @@ public abstract class DataSetControlForm<D extends DBObject> extends ControlForm
return dataSource.Data.values().stream().filter(d -> isObjectVisible(d) && d.isSelected()).collect(Collectors.toCollection(Vector::new));
}
public Vector<Object> getSelectedKeys() {
return dataSource.Data.values().stream().filter(d -> isObjectVisible(d) && d.isSelected()).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
}
//в том числе и невидимые. нужно для сохранения галок при перезакачке бд.
public Vector<Object> getAllSelectedKeys() {
return dataSource.Data.values().stream().filter(DBObject::isSelected).map(d -> d.getPK()).collect(Collectors.toCollection(Vector::new));
}
public boolean CheckCurrent(TextLog log) {

View File

@@ -8,7 +8,6 @@ import Common.Visual.Menus.VisualiserMenu;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererMaskedNanInteger;
import Common.Visual.Tables.RendererStatusEnum;
import Common.Visual.UI;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Repository.Component.Component;

View File

@@ -61,7 +61,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override
public void GetVersionInfo() {
version = 1120;
version = 1121;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());