Browse Source
* commit '5cd411fdaf76ebd57a82251de62cb2c7a5c04075': (25 commits) REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点 REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动 REPORT-149012 alphafine中搜索之前可以在设计器中搜到BI的模板，现在增加cid参数，只搜索fr相关模板 REPORT-148138 单测修复，由于资源同名导致覆盖，出现单测错误，通过修改资源解决。 REPORT-148096 整体代码已重构，删除无效单测 REPORT-148096 该方法的单测没用了，之前补充了新的没有删除旧的 && 改动，出现了未预期调用的方法 REPORT-148096 暂时过滤掉与UI相关的单测 REPORT-149091 修复动态参数切换异常 KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题 REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全 REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化 feat: JSContentPane支持自定义提示功能 #REPORT-144004 fix: pr问题处理 #REPORT-147689 fix: 颜色选择面板数组越界 #REPORT-147689 REPORT-147166 linux下，条件属性-超链设置 打开之后，设置超链的窗口无法聚焦 REPORT-147166 修改代码质量 REPORT-147166 修改代码质量 REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。 REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。 REPORT-147166 统信uos下切换条件属性后，卡片不能及时更新。 ...final/11.0
superman
2 weeks ago
50 changed files with 690 additions and 186 deletions
@ -1,8 +1,33 @@
|
||||
{ |
||||
"Fine-Design_JSAPI_Public_Module_Global_Universal": ["_g()", "getParameterContainer", "parameterCommit", "loadContentPane", "getPreviewType"], |
||||
"Fine-Design_JSAPI_Public_Module_Global_FR": [ "servletURL", "serverURL", "server", "fineServletURL", "SessionMgr.getSessionID", "showDialog", "closeDialog", |
||||
"doHyperlinkByGet", "doHyperlinkByPost", "doURLPrint", "Msg", "remoteEvaluate", "jsonEncode", "jsonDecode", |
||||
"ajax", "isEmpty", "isArray", "cellStr2ColumnRow", "columnRow2CellStr"], |
||||
"Fine-Design_JSAPI_Public_Module_Global_FS": ["signOut", "tabPane.closeActiveTab", "tabPane.addItem"], |
||||
"Fine-Design_JSAPI_Public_Module_Global_Mobile": ["location", "Mobile.getDeviceInfo"], |
||||
"Fine-Design_JSAPI_Public_Module_Widget_Get": ["this", "this.options.form", "getWidgetByName"], |
||||
"Fine-Design_JSAPI_Public_Module_Widget_Universal": ["getValue", "getText", "setValue", "visible", "invisible", "setVisible", "isVisible", "setEnable", "isEnabled", |
||||
"reset", "getType", "setWaterMark", "fireEvent", "setPopupStyle"], |
||||
"Fine-Design_JSAPI_Public_Module_Date_Widget_Peculiar":["setMaxAndMinDate"], |
||||
"Fine-Design_JSAPI_Public_Module_Button_Widget_Peculiar":["doClick"], |
||||
"Fine-Design_JSAPI_Public_Module_Combobox_Widget_Peculiar":["setName4Empty"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Marquee":["startMarquee", "stopMarquee"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Scrollbar":["setHScrollBarVisible", "setVScrollBarVisible"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Cell_Style":["addEffect"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Row_Height_Col_Width":["setRowHeight", "setColWidth"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Cell_Value":["getCellValue", "setCellValue"], |
||||
"Fine-Design_JSAPI_Public_Module_Table_Cell_Radius":["setCellRadius"], |
||||
"Fine-Design_JSAPI_Public_Module_Toolbar":["toolBarFloat", "setStyle","getToolbar"], |
||||
"Fine-Design_JSAPI_Public_Module_Toolbar_Email_Button":["changeFormat"], |
||||
"Fine-Design_JSAPI_Form_Component_Tab":["showCardByIndex", "showCardByIndex", "getShowIndex", "setTitleVisible"] |
||||
"Fine-Design_JSAPI_Public_Module_Report_Page_Jump":["gotoPreviousPage", "gotoNextPage", "gotoLastPage", "gotoFirstPage", "gotoPage"], |
||||
"Fine-Design_JSAPI_Public_Module_Report_Page_Number_Get":["getCurrentPageIndex", "getReportTotalPage", "currentPageIndex", "reportTotalPage"], |
||||
"Fine-Design_JSAPI_Public_Module_Report_Export":["exportReportToExcel", "exportReportToImage", "exportReportToPDF", "exportReportToWord"], |
||||
"Fine-Design_JSAPI_Cpt_Page_Preview_Folding_Tree":["expandNodeLayer", "collapseNodeLayer", "expandAllNodeLayer", "collapseAllNodeLayer"], |
||||
"Fine-Design_JSAPI_Cpt_Write_Preview":["getWidgetByCell", "appendReportRC", "appendReportRow", |
||||
"deleteReportRC", "deleteRows", "refreshAllSheets", "loadSheetByIndex", "loadSheetByName", "isDirtyPage", |
||||
"isAutoStash", "writeReport", "verifyAndWriteReport", "verifyReport", "importExcel", "importExcel_Clean", |
||||
"importExcel_Append", "importExcel_Cover", "stash", "clear"], |
||||
"Fine-Design_JSAPI_Cpt_View_Preview_Report_Location":["centerReport"], |
||||
"Fine-Design_JSAPI_Form_Component_Get":["getAllWidgets"], |
||||
"Fine-Design_JSAPI_Form_Component_Tab":["showCardByIndex", "getShowIndex", "setTitleVisible"] |
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
package com.fr.design.present; |
||||
|
||||
import com.fr.design.gui.controlpane.JControlUpdatePane; |
||||
import com.fr.design.gui.controlpane.ListControlPaneProvider; |
||||
|
||||
|
||||
/** |
||||
* 条件属性更新面板 |
||||
* |
||||
* @author lidongy |
||||
* @version 11.0 |
||||
* @since Created on 2025/1/23 |
||||
*/ |
||||
public class ConditionAttributesUpdatePane extends JControlUpdatePane { |
||||
|
||||
protected ConditionAttributesUpdatePane(ListControlPaneProvider listControlPane) { |
||||
super(listControlPane); |
||||
} |
||||
|
||||
/** |
||||
* 新建一个实例 |
||||
* @param listControlPane 父面板 |
||||
* @return 新面板实例 |
||||
*/ |
||||
public static JControlUpdatePane newInstance(ListControlPaneProvider listControlPane) { |
||||
return new ConditionAttributesUpdatePane(listControlPane); |
||||
} |
||||
|
||||
@Override |
||||
public void populate() { |
||||
super.populate(); |
||||
|
||||
cardPane.revalidate(); |
||||
cardPane.repaint(); |
||||
} |
||||
} |
||||
@ -1,60 +0,0 @@
|
||||
package com.fr.design.mainframe.socketio; |
||||
|
||||
import com.fr.invoke.Reflect; |
||||
import com.fr.workspace.WorkContext; |
||||
import com.fr.workspace.Workspace; |
||||
import io.socket.client.IO; |
||||
import io.socket.client.Socket; |
||||
|
||||
import org.easymock.EasyMock; |
||||
import org.junit.Assert; |
||||
import org.junit.Test; |
||||
import org.junit.runner.RunWith; |
||||
import org.powermock.api.easymock.PowerMock; |
||||
import org.powermock.core.classloader.annotations.PrepareForTest; |
||||
import org.powermock.modules.junit4.PowerMockRunner; |
||||
|
||||
|
||||
/** |
||||
* @author: Maksim |
||||
* @Date: Created in 2019/12/9 |
||||
* @Description: |
||||
*/ |
||||
@RunWith(PowerMockRunner.class) |
||||
@PrepareForTest({WorkContext.class,DesignerSocketIO.class, IO.class}) |
||||
public class DesignerSocketIOTest { |
||||
|
||||
@Test |
||||
public void close() throws Exception { |
||||
this.update(); |
||||
DesignerSocketIO.close(); |
||||
DesignerSocketIO.Status status = Reflect.on(DesignerSocketIO.class).field("status").get(); |
||||
Socket socket = Reflect.on(DesignerSocketIO.class).field("socket").get(); |
||||
|
||||
Assert.assertEquals(DesignerSocketIO.Status.Disconnecting,status); |
||||
Assert.assertNull(socket); |
||||
} |
||||
|
||||
@Test |
||||
public void update() throws Exception { |
||||
Workspace current = EasyMock.mock(Workspace.class); |
||||
EasyMock.expect(current.isLocal()).andReturn(false); |
||||
|
||||
PowerMock.mockStatic(WorkContext.class); |
||||
EasyMock.expect(WorkContext.getCurrent()).andReturn(current); |
||||
|
||||
String[] uri = {"http://127.0.0.1:8888/workspace","http://127.0.0.1:9999/workspace"}; |
||||
PowerMock.mockStaticPartial(DesignerSocketIO.class,"getSocketUri"); |
||||
PowerMock.expectPrivate(DesignerSocketIO.class,"getSocketUri").andReturn(uri); |
||||
|
||||
EasyMock.replay(current); |
||||
PowerMock.replayAll(); |
||||
|
||||
DesignerSocketIO.update(); |
||||
DesignerSocketIO.Status status = Reflect.on(DesignerSocketIO.class).field("status").get(); |
||||
Socket socket = Reflect.on(DesignerSocketIO.class).field("socket").get(); |
||||
|
||||
Assert.assertEquals(DesignerSocketIO.Status.Connected,status); |
||||
Assert.assertNotNull(socket); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue