Browse Source
* commit '2052e147d955f94e7ef3d5123d116059ce2c3603': (27 commits) REPORT-57590 选中参数面板模后板上方的工具栏也要禁用剪切复制 REPORT-57898 代码回退 REPORT-57816 REPORT-57816 REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后，设计器端此模板没有显示已锁定，双击模板会弹出已锁定的弹窗，但会打开一个空白模板，且此时模板才显示“已锁定” REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后，设计器端此模板没有显示已锁定，双击模板会弹出已锁定的弹窗，但会打开一个空白模板，且此时模板才显示“已锁定” REPORT-56047 修改下判断是否为安版本的标准 REPORT-57568 解决目录树展开收起触发打开模板的逻辑 REPORT-56047 设计器11.0适配 消除自动合代码导致的问题 REPORT-57147 【回归测试】设计器模版默认预览方式不生效 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-56840 将判断下拉框是否选择了某个值的判断方法改成直接调用现成的获取值方法，减少代码冗余 REPORT-56840 修改参数命名 REPORT-57590 表单参数面板剪切复制按钮禁用 REPORT-56623 还原代码 REPORT-56840 树数据集点击选择赖所选数据集的父标记字段构建树-父节点字段发生变更 REPORT-55048 fix调整下逻辑 REPORT-57490 websocket断开时弹窗位置问题 REPORT-55048 https远程连接时，设计器上无法获取服务器推送过来的eventhread线程日志 fix npe问题 REPORT-55048 https远程连接时，设计器上无法获取服务器推送过来的eventhread线程日志 REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录 ...research/11.0
superman
3 years ago
24 changed files with 304 additions and 73 deletions
@ -0,0 +1,20 @@
|
||||
package com.fr.design.env; |
||||
|
||||
/** |
||||
* |
||||
* @author hades |
||||
* @version 10.0 |
||||
* Created by hades on 2021/8/24 |
||||
*/ |
||||
public class DesignerWorkspaceInfoContext { |
||||
|
||||
private static DesignerWorkspaceInfo workspaceInfo; |
||||
|
||||
public static DesignerWorkspaceInfo getWorkspaceInfo() { |
||||
return workspaceInfo; |
||||
} |
||||
|
||||
public static void setWorkspaceInfo(DesignerWorkspaceInfo workspaceInfo) { |
||||
DesignerWorkspaceInfoContext.workspaceInfo = workspaceInfo; |
||||
} |
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.fr.design.designer.beans.actions.behavior; |
||||
|
||||
import com.fr.design.designer.beans.actions.FormWidgetEditAction; |
||||
import com.fr.design.mainframe.FormDesigner; |
||||
|
||||
public class CopyableEnable implements UpdateBehavior<FormWidgetEditAction> { |
||||
@Override |
||||
public void doUpdate(FormWidgetEditAction action) { |
||||
FormDesigner designer = action.getEditingComponent(); |
||||
if (designer == null) { |
||||
action.setEnabled(false); |
||||
return; |
||||
} |
||||
action.setEnabled(designer.isCurrentComponentCopyable()); |
||||
} |
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.fr.design.designer.beans.actions.behavior; |
||||
|
||||
import com.fr.design.designer.beans.actions.FormWidgetEditAction; |
||||
import com.fr.design.mainframe.FormDesigner; |
||||
|
||||
public class CutableEnable implements UpdateBehavior<FormWidgetEditAction> { |
||||
@Override |
||||
public void doUpdate(FormWidgetEditAction action) { |
||||
FormDesigner designer = action.getEditingComponent(); |
||||
if (designer == null) { |
||||
action.setEnabled(false); |
||||
return; |
||||
} |
||||
action.setEnabled(designer.isCurrentComponentCutable()); |
||||
} |
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.fr.design.designer.beans.actions.behavior; |
||||
|
||||
import com.fr.design.designer.beans.actions.FormWidgetEditAction; |
||||
import com.fr.design.mainframe.FormDesigner; |
||||
|
||||
public class DeletableEnable implements UpdateBehavior<FormWidgetEditAction> { |
||||
@Override |
||||
public void doUpdate(FormWidgetEditAction action) { |
||||
FormDesigner designer = action.getEditingComponent(); |
||||
if (designer == null) { |
||||
action.setEnabled(false); |
||||
return; |
||||
} |
||||
action.setEnabled(designer.isCurrentComponentDeletable()); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue