Browse Source

Pull request #14820: REPORT-130200 & REPORT-134561 & REPORT-134262

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '4919c34b3f084f2a9e66b231e652752d25c33ad3':
  REPORT-134262 【fr-fbp回归】js编辑-引用js-82环境-引用路径问题
  REPORT-134561 【fr-fbp回归】【数据集】fbp设计器 存储数据集预览报错、预览UI效果需要优化
  REPORT-130200 【FR-FBP】整体大回归测试 优化下写法,防止循环获取全部数据集
fbp/merge
Destiny.Lin-林锦龙 6 months ago
parent
commit
4265d3399a
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  2. 4
      designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java
  3. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  4. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

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

@ -459,7 +459,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
if (!ComparatorUtils.equals(oldName, tdName)) { if (!ComparatorUtils.equals(oldName, tdName)) {
map.put(oldName, tdName); map.put(oldName, tdName);
} }
fireDSChanged(map); DesignCacheManager.processByCacheTableData(() -> fireDSChanged(map));
tc.fireTargetModified(); tc.fireTargetModified();
tc.parameterChanged(); tc.parameterChanged();
int[] rows = tableDataTree.getSelectionRows(); int[] rows = tableDataTree.getSelectionRows();

4
designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java

@ -11,6 +11,7 @@ import com.fanruan.workplace.conetxt.CompatiblePool;
import com.fanruan.workplace.http.HttpConstants; import com.fanruan.workplace.http.HttpConstants;
import com.fanruan.workplace.http.RepositoryManager; import com.fanruan.workplace.http.RepositoryManager;
import com.fanruan.workplace.http.WorkspaceHeartBeatShell; import com.fanruan.workplace.http.WorkspaceHeartBeatShell;
import com.fanruan.workplace.http.exception.DefaultRemoteExceptionHandler;
import com.fr.report.UnLockedHandler; import com.fr.report.UnLockedHandler;
import com.fr.workspace.engine.exception.RemoteDesignLoginLockHandler; import com.fr.workspace.engine.exception.RemoteDesignLoginLockHandler;
import com.fr.workspace.engine.exception.RemoteDesignNoAuthHandler; import com.fr.workspace.engine.exception.RemoteDesignNoAuthHandler;
@ -50,6 +51,7 @@ import com.fr.workspace.engine.base.FineObjectPool;
import com.fr.workspace.engine.client.heartbeart.FineWorkspaceHeartbeat; import com.fr.workspace.engine.client.heartbeart.FineWorkspaceHeartbeat;
import com.fr.workspace.engine.client.heartbeart.WorkspaceHeartbeat; import com.fr.workspace.engine.client.heartbeart.WorkspaceHeartbeat;
import com.fr.workspace.engine.exception.RemoteDriverUnExistHandler; import com.fr.workspace.engine.exception.RemoteDriverUnExistHandler;
import com.fr.workspace.engine.exception.RemoteProcedureErrorHandler;
import com.fr.workspace.engine.resource.FineWorkResource; import com.fr.workspace.engine.resource.FineWorkResource;
import com.fr.workspace.engine.resource.FineWorkResourceAdaptor; import com.fr.workspace.engine.resource.FineWorkResourceAdaptor;
import com.fr.workspace.pool.WorkRPCRegister; import com.fr.workspace.pool.WorkRPCRegister;
@ -81,6 +83,7 @@ import com.fr.workspace.server.repository.widget.ShareRepository;
public class DesignWorkContextComponent { public class DesignWorkContextComponent {
private static final String VERSION_NUM = "01"; private static final String VERSION_NUM = "01";
private static final String ERROR_CODE = "11300024";
/** /**
@ -155,6 +158,7 @@ public class DesignWorkContextComponent {
RemoteExceptionConvert.registerException(HttpConstants.LOGIN_LOCK, new RemoteDesignLoginLockHandler()); RemoteExceptionConvert.registerException(HttpConstants.LOGIN_LOCK, new RemoteDesignLoginLockHandler());
RemoteExceptionConvert.registerException(HttpConstants.TPL_HAS_BEAN_UNLOCK, new UnLockedHandler()); RemoteExceptionConvert.registerException(HttpConstants.TPL_HAS_BEAN_UNLOCK, new UnLockedHandler());
RemoteExceptionConvert.registerException(HttpConstants.DRIVER_NOT_EXIST, new RemoteDriverUnExistHandler()); RemoteExceptionConvert.registerException(HttpConstants.DRIVER_NOT_EXIST, new RemoteDriverUnExistHandler());
DefaultRemoteExceptionHandler.getInstance().registerMatchMsg(ERROR_CODE, new RemoteProcedureErrorHandler());
} }
private void supplementalCommon() { private void supplementalCommon() {

4
designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java

@ -80,8 +80,8 @@ public class WebCssPane extends BasicPane {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME,
new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME);
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

4
designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java

@ -158,8 +158,8 @@ public class WebJsPane extends BasicPane {
private ActionListener chooseFileListener = new ActionListener() { private ActionListener chooseFileListener = new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, FILEChooserPane fileChooser = FILEChooserPane.getInstanceWithDesignatePath(ProjectConstants.RESOURCES_NAME ,
new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")), ProjectConstants.RESOURCES_NAME);
if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
final FILE file = fileChooser.getSelectedFILE(); final FILE file = fileChooser.getSelectedFILE();

Loading…
Cancel
Save