Browse Source

Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~lidongy/design into release/11.0

release/11.0
lidongy 8 months ago
parent
commit
a7a7b66d88
  1. 2
      designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
  2. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

2
designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java

@ -32,7 +32,7 @@ public abstract class EditLockChangeChecker {
*/
public void start() {
this.scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("EditLockChangeChecker"));
this.scheduler.scheduleAtFixedRate(new Runnable() {
this.scheduler.scheduleWithFixedDelay(new Runnable() {
@Override
public void run() {
// 判断是否为远程设计环境

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@ -14,7 +14,7 @@ com.fr.design.report.fit.firstColumn=130*20
com.fr.design.report.fit.column=100*20
com.fr.design.lock.LockInfoDialog=500*180
com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24
com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24
com.fr.start.common.DesignerOpenEmptyPanel.createButton=90*24
com.fr.design.cell.expand.sort.pane=267*165
com.fr.design.sort.rule.item=125*20
com.fr.design.ds.column.sort.pane=250*180

Loading…
Cancel
Save