* commit 'c170d6815269cdc047e06903d2a264f87414a245': REPORT-45689 兼容空类型 无须填充面板 REPORT-46679 jdk11-设计器内图标优化-目录树图标都模糊，尤其是刷新图标 【问题原因】svg图标漏传到release分支了，所以显示的是之前的png图，比较模糊 【改动思路】补充图标 REPORT-46234 普通报表\聚合报表，点击para，上方是控件设置，但是下方是组件名称bugfix/10.0
superman
4 years ago
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 1.6 KiB |
|
After Width: | Height: | Size: 610 B |
|
After Width: | Height: | Size: 602 B |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.7 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 774 B |
|
After Width: | Height: | Size: 774 B |
@ -1,21 +1,37 @@ |
|||||||
package com.fr.design.mainframe.widget.ui; |
package com.fr.design.mainframe.widget.ui; |
||||||
|
|
||||||
import com.fr.design.designer.creator.XCreator; |
import com.fr.design.designer.creator.XCreator; |
||||||
|
import com.fr.design.designer.creator.XWParameterLayout; |
||||||
|
import com.fr.design.file.HistoryTemplateListCache; |
||||||
|
import com.fr.design.mainframe.EastRegionContainerPane; |
||||||
|
import com.fr.design.mainframe.JForm; |
||||||
|
|
||||||
/** |
/** |
||||||
* Created by kerry on 2017/9/30. |
* Created by kerry on 2017/9/30. |
||||||
*/ |
*/ |
||||||
public class WidgetBasicPropertyPaneFactory { |
public class WidgetBasicPropertyPaneFactory { |
||||||
|
|
||||||
public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator){ |
public static FormBasicPropertyPane createBasicPropertyPane(XCreator xCreator) { |
||||||
if(xCreator.supportSetVisible() && xCreator.supportSetEnable()){ |
freshPropertyMode(xCreator); |
||||||
|
if (xCreator.supportSetVisible() && xCreator.supportSetEnable()) { |
||||||
return new FormBasicWidgetPropertyPane(); |
return new FormBasicWidgetPropertyPane(); |
||||||
} |
} |
||||||
if(xCreator.supportSetVisible()){ |
if (xCreator.supportSetVisible()) { |
||||||
return new BasicSetVisiblePropertyPane(); |
return new BasicSetVisiblePropertyPane(); |
||||||
}else{ |
} else { |
||||||
return new FormBasicPropertyPane(); |
return new FormBasicPropertyPane(); |
||||||
} |
} |
||||||
|
|
||||||
} |
} |
||||||
|
|
||||||
|
private static void freshPropertyMode(XCreator xCreator) { |
||||||
|
if (!(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() instanceof JForm)) { |
||||||
|
if (xCreator instanceof XWParameterLayout) { |
||||||
|
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA); |
||||||
|
} else { |
||||||
|
EastRegionContainerPane.getInstance().switchMode(EastRegionContainerPane.PropertyMode.REPORT_PARA_WIDGET); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
} |
} |
||||||
|
|||||||