diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
index 1fd555e82..4742f337c 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
@@ -8,16 +8,14 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.editlock.ConnectionLockChangeChecker;
 import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.NameInspector;
-import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.design.gui.imenu.UILockMenuItem;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.stable.StringUtils;
 import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.design.os.impl.DatabaseDialogAction;
 import com.fr.file.ConnectionConfig;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index d41af3205..ab85a14dc 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
@@ -22,11 +22,10 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.file.TableDataConfig;
 
-import com.fr.stable.StringUtils;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
 import java.awt.Dimension;
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index a5ab12ff9..afd65f3e5 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@@ -21,7 +21,7 @@ import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
index ac80cd53c..8eb6a4aa9 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/ConnectionLockChangeChecker.java
@@ -1,7 +1,7 @@
 package com.fr.design.editlock;
 
 
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 /**
  * @author Yvan
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
index 951bea334..8f276dfe8 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockChangeChecker.java
@@ -5,7 +5,7 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.editlock.EditLockOperator;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
index baa3543f8..2ab10fb92 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/EditLockUtils.java
@@ -8,7 +8,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.IOUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.editlock.EditLockOperator;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
diff --git a/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
index a3f2bbbf4..e38a4e940 100644
--- a/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
+++ b/designer-base/src/main/java/com/fr/design/editlock/ServerTableDataLockChangeChecker.java
@@ -1,6 +1,6 @@
 package com.fr.design.editlock;
 
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 /**
  * @author Yvan
diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
index b5534f609..77b5516f5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
+++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java
@@ -3,7 +3,7 @@ package com.fr.design.gui.ibutton;
 import com.fr.design.editlock.EditLockChangeEvent;
 import com.fr.design.editlock.EditLockChangeListener;
 import com.fr.design.editlock.EditLockUtils;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.Icon;
 
diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
index 092b76516..c609e5d5c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
+++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UILockMenuItem.java
@@ -2,7 +2,7 @@ package com.fr.design.gui.imenu;
 
 import com.fr.design.editlock.EditLockChangeEvent;
 import com.fr.design.editlock.EditLockChangeListener;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 
 import javax.swing.Action;
 
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
index ae0f8d1cb..057b561fa 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
+++ b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
@@ -11,7 +11,7 @@ import com.fr.stable.os.support.OSBasedAction;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
-import com.fr.workspace.server.lock.editlock.LockItem;
+import com.fr.report.LockItem;
 import static com.fr.design.actions.server.ConnectionListAction.doWithDatasourceManager;
 
 /**