Browse Source
* commit '9244cdb26687212a12dfcfa1e766f9a1e96e3b2c': REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态 REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况 REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况 CHART-20619 预定义面板渐变色取色器控件修改 REPORT-51919 【主题切换】复用组件适配主题切换 REPORT-59063 CRM 内存里报表块缩略图占用内存太大了 REPORT-59097 【主题切换】悬浮元素默认样式,应该是跟随主题的默认research/11.0
superman
3 years ago
20 changed files with 190 additions and 69 deletions
@ -1,9 +1,25 @@ |
|||||||
package com.fr.design.base.mode; |
package com.fr.design.base.mode; |
||||||
|
|
||||||
|
|
||||||
|
import com.fr.design.mainframe.DesignerContext; |
||||||
|
|
||||||
public enum DesignerMode { |
public enum DesignerMode { |
||||||
NORMAL, |
NORMAL, |
||||||
BAN_COPY_AND_CUT, |
BAN_COPY_AND_CUT, |
||||||
VCS, |
VCS, |
||||||
AUTHORITY, |
AUTHORITY { |
||||||
DUCHAMP |
@Override |
||||||
|
public void closeMode() { |
||||||
|
DesignerContext.getDesignerFrame().closeAuthorityMode(); |
||||||
|
} |
||||||
|
}, |
||||||
|
DUCHAMP; |
||||||
|
|
||||||
|
public void openMode() { |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
public void closeMode() { |
||||||
|
} |
||||||
|
|
||||||
} |
} |
||||||
|
@ -0,0 +1,41 @@ |
|||||||
|
package com.fr.design.mainframe.theme.utils; |
||||||
|
|
||||||
|
import com.fr.base.NameStyle; |
||||||
|
import com.fr.base.theme.TemplateTheme; |
||||||
|
import com.fr.base.theme.settings.ThemedCellStyle; |
||||||
|
import com.fr.design.file.HistoryTemplateListCache; |
||||||
|
import com.fr.design.mainframe.JTemplate; |
||||||
|
import com.fr.report.cell.FloatElement; |
||||||
|
import com.fr.stable.unit.UNIT; |
||||||
|
|
||||||
|
/** |
||||||
|
* @author Starryi |
||||||
|
* @version 1.0 |
||||||
|
* Created by Starryi on 2021/9/9 |
||||||
|
*/ |
||||||
|
public class DefaultThemedFloatElement { |
||||||
|
public static FloatElement createInstance() { |
||||||
|
return themingFloatElement(new FloatElement()); |
||||||
|
} |
||||||
|
|
||||||
|
public static FloatElement createInstance(Object value) { |
||||||
|
return themingFloatElement(new FloatElement(value)); |
||||||
|
} |
||||||
|
|
||||||
|
public static FloatElement createInstance(UNIT leftDistance, UNIT topDistance, UNIT width, UNIT height, Object value) { |
||||||
|
return themingFloatElement(new FloatElement(leftDistance, topDistance, width, height, value)); |
||||||
|
} |
||||||
|
|
||||||
|
private static FloatElement themingFloatElement(FloatElement floatElement) { |
||||||
|
JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); |
||||||
|
if (template != null) { |
||||||
|
TemplateTheme theme = template.getTemplateTheme(); |
||||||
|
ThemedCellStyle themedCellStyle = theme.getCellStyleList().getUse4Default(); |
||||||
|
if (themedCellStyle != null) { |
||||||
|
NameStyle nameStyle = NameStyle.getPassiveInstance(themedCellStyle.getName(), themedCellStyle.getStyle()); |
||||||
|
floatElement.setStyle(nameStyle); |
||||||
|
} |
||||||
|
} |
||||||
|
return floatElement; |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue