Yvan
fbee3b9277
KERNEL-6188 补充泛型
4 years ago
Yvan
f549b55ca1
KERNEL-6188 去除无用的try-catch
4 years ago
Yvan
1320c80082
KERNEL-6188 修改一下doInBackground()方法与done()方法之间传递参数的类型,去除冗余代码
4 years ago
Yvan
e01a133ecd
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
40663f225c
KERNEL-6188 DatabaseConnectionPane中的SwingWorker问题
...
【问题原因】在Swingworker的doInBackground中更新UI会导致出现卡死等问题
【改动方案】将doInBackground中与UI交互的部分移到done方法中,在EDT线程处理UI,比较安全;另外修改了dialog.show()过时方法和一些导包相关问题
4 years ago
Qinghui.Liu
29d13f451d
Pull request #2939 : CHART-16853 处理富文本国际化
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'b7a987807d0aa7f05f401753a0e3c048e8c1506b':
增加空判断
CHART-16853 处理富文本国际化
4 years ago
Qinghui.Liu
b7a987807d
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
38e53e5163
增加空判断
4 years ago
Qinghui.Liu
5ae02c176c
CHART-16853 处理富文本国际化
4 years ago
superman
3a6b0962ca
Merge pull request #2935 in DESIGN/design from final/10.0 to release/10.0
...
* commit '864f9fc780595e5d525f0bc8dfd046b505a5336b':
CHART-16939 条件属性标签宽高问题
REPORT-43754 【二轮冒烟】远程新建目录重复的名字不会提醒 【问题原因】在Listener中判断重复的逻辑有点问题,它会把用户修改了某一项名字后,点击的另一项的名字置为空,然后再遍历allListNames,看是否有重复的名字,例如,aa、bb、cc的列表中,用户将aa修改为bb,然后点击bb,这时候bb被置为空,再将aa、""、cc与bb比较,发现没有重复,即不会显示命名重复弹窗 【改动方案】把重命名后,allListNames中选中项的名字置为空的逻辑,修改为,重命名后,allListNames中重命名项的名字置为空。即修改aa为bb后,将bb与""、bb、cc比较,判断有重复,然后给出命名重复提示
4 years ago
Kara
864f9fc780
Pull request #2926 : REPORT-43754 【二轮冒烟】远程新建目录重复的名字不会提醒
...
Merge in DESIGN/design from ~YVAN/design:final/10.0 to final/10.0
* commit 'af888e6255ea8246c570af9c835b5bc03828e7f9':
REPORT-43754 【二轮冒烟】远程新建目录重复的名字不会提醒 【问题原因】在Listener中判断重复的逻辑有点问题,它会把用户修改了某一项名字后,点击的另一项的名字置为空,然后再遍历allListNames,看是否有重复的名字,例如,aa、bb、cc的列表中,用户将aa修改为bb,然后点击bb,这时候bb被置为空,再将aa、""、cc与bb比较,发现没有重复,即不会显示命名重复弹窗 【改动方案】把重命名后,allListNames中选中项的名字置为空的逻辑,修改为,重命名后,allListNames中重命名项的名字置为空。即修改aa为bb后,将bb与""、bb、cc比较,判断有重复,然后给出命名重复提示
4 years ago
Kara
5cfddc0584
Pull request #2928 : CHART-16939 条件属性标签宽高问题
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '56ea11266305a9927c386b34d3e273d4096989b9':
CHART-16939 条件属性标签宽高问题
4 years ago
superman
ae6939c874
Merge pull request #2930 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'face659a98375f86c4f5f5e23188deb3243689cf':
REPORT-43905 重试错误输出改成warn
4 years ago
白岳
56ea112663
CHART-16939 条件属性标签宽高问题
4 years ago
Kara
face659a98
Pull request #2927 : REPORT-43905 重试错误输出改成warn
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '23f9133c0b0baf4400749d13095879684d5a1562':
REPORT-43905 重试错误输出改成warn
4 years ago
hades
23f9133c0b
REPORT-43905 重试错误输出改成warn
4 years ago
Yvan
af888e6255
REPORT-43754 【二轮冒烟】远程新建目录重复的名字不会提醒
...
【问题原因】在Listener中判断重复的逻辑有点问题,它会把用户修改了某一项名字后,点击的另一项的名字置为空,然后再遍历allListNames,看是否有重复的名字,例如,aa、bb、cc的列表中,用户将aa修改为bb,然后点击bb,这时候bb被置为空,再将aa、""、cc与bb比较,发现没有重复,即不会显示命名重复弹窗
【改动方案】把重命名后,allListNames中选中项的名字置为空的逻辑,修改为,重命名后,allListNames中重命名项的名字置为空。即修改aa为bb后,将bb与""、bb、cc比较,判断有重复,然后给出命名重复提示
4 years ago
Yvan
6eaa9fa3e6
Pull request #2925 : REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '8c462edfddfe614315ad84f4a450d42d8c34a0b9':
REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化 【问题原因】页面设置和重复与冻结设置的图标重复了 【改动方案】更换重复与冻结设置的图标
4 years ago
ju
f351309c9f
Pull request #2913 : MOBILE-27967 【设计器】tab样式自定义设置以后,切换回标准,在切换自定义之前设置未保留
...
Merge in DESIGN/design from ~HADES/design:MOBILE-27967 to release/10.0
* commit '9c287606d8fef68fda99e2d1cb6000d32c93ca3d':
MOBILE-27967 【设计器】tab样式自定义设置以后,切换回标准,在切换自定义之前设置未保留
4 years ago
Yvan
8c462edfdd
REPORT-43516 【视觉优化】页面设置与重复与冻结设置图标优化
...
【问题原因】页面设置和重复与冻结设置的图标重复了
【改动方案】更换重复与冻结设置的图标
4 years ago
hades
9c287606d8
MOBILE-27967 【设计器】tab样式自定义设置以后,切换回标准,在切换自定义之前设置未保留
4 years ago
Bjorn
092282f8a1
Pull request #2907 : CHART-16939 条件属性标签宽高问题
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '82e54b8700a5b5973ea5f1e9366a7c39b11ce050':
CHART-16939 条件属性标签宽高问题
4 years ago
白岳
82e54b8700
CHART-16939 条件属性标签宽高问题
4 years ago
pengda
e108f025e2
Pull request #2900 : REPORT-42734 && REPORT-42730 聚合报表block块命名校验
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '06388472a5d968a33f539854f568fca4eeae022d':
REPORT-42734 && REPORT-42730 聚合报表block块命名校验
REPORT-42734 && REPORT-42730 聚合报表block块命名校验
4 years ago
pengda
06388472a5
REPORT-42734 && REPORT-42730 聚合报表block块命名校验
4 years ago
pengda
df7440bb1a
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
pengda
bddf7c69e8
REPORT-42734 && REPORT-42730 聚合报表block块命名校验
4 years ago
superman
90bf7a2089
Merge pull request #2896 in DESIGN/design from final/10.0 to release/10.0
...
* commit '4930d5b3af93472e652b1959cfd59cb7699f5dc1':
4 years ago
superman
4930d5b3af
Merge pull request #2894 in DESIGN/design from release/10.0 to final/10.0
...
* commit '32cd05ecc1c676a5a585b2f286aafc31f9607094': (115 commits)
REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效 【问题原因】参数面板的撤销重做并不是无效的,而是因为之前在不编辑参数面板的状态,如果经过了与参数面板有关的撤销重做操作,参数面板没有刷新 【改动方案】在没有编辑参数面板的时候,也需要populate一下参数面板
CHART-14142 钻取地图同名区域处理
REPORT-43372 修改组件树路径的key的格式
CHART-16721 预定义样式代码回退
REPORT-43198 预定义样式功能优化代码回退遗漏部分
REPORT-43198 预定义样式功能优化代码回退遗漏部分
REPORT-42970 添加websocket 断开/失败时的日志
代码回退
代码屏蔽
代码屏蔽
REPORT-43198 预定义样式功能优化代码回退
CHART-16680 仪表盘切换,部分属性默认不是自动
CHART-16682 回退代码,防止设计器崩溃
REPORT-42972 加个判断
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42972 远程对接平台密码-密码超期,设计器启动时连接远程密码,报错弹窗异常
代码修改
REPORT-42887 && REPORT-42450 新建多sheet背景不生效; 单元格设置预定义样式的时候,使用工具栏设置边框设置失败
REPORT-42550 注册RPC接口
...
4 years ago
Yvan
32cd05ecc1
Pull request #2888 : REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '28746aff31a6ca57e6aeabee61c0d2113e4b0d57':
REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效 【问题原因】参数面板的撤销重做并不是无效的,而是因为之前在不编辑参数面板的状态,如果经过了与参数面板有关的撤销重做操作,参数面板没有刷新 【改动方案】在没有编辑参数面板的时候,也需要populate一下参数面板
4 years ago
Yvan
28746aff31
REPORT-43022 【10.0.11冒烟】参数面板未进入的情况下撤销重做无效
...
【问题原因】参数面板的撤销重做并不是无效的,而是因为之前在不编辑参数面板的状态,如果经过了与参数面板有关的撤销重做操作,参数面板没有刷新
【改动方案】在没有编辑参数面板的时候,也需要populate一下参数面板
4 years ago
Bjorn
e401ab6658
Pull request #2869 : CHART-14142 钻取地图同名区域处理
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'eb3538de81c6025edb4a72345888d4c2169c4e83':
CHART-14142 钻取地图同名区域处理
4 years ago
Yuan.Wang
b41b299eb0
Pull request #2863 : REPORT-43372 修改组件树路径的key的格式
...
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit 'beba27a61c07ac34a4c05b79a4a7804955975dc7':
REPORT-43372 修改组件树路径的key的格式
4 years ago
superman
55b04ed32c
Merge pull request #2868 in DESIGN/design from final/10.0 to release/10.0
...
* commit '6ab1761448506db08f979cd1dcfa1a8639796a0e':
REPORT-40853 提交单元格组多次点击卡死
4 years ago
superman
6ab1761448
Merge pull request #2867 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '70dbc1f56ced3eddc26aa356efc2b130fb0d9c75':
4 years ago
白岳
eb3538de81
CHART-14142 钻取地图同名区域处理
4 years ago
superman
70dbc1f56c
Merge pull request #2866 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '556dc363ed854ae0acad3c224125c5b17273364d':
REPORT-40853 提交单元格组多次点击卡死
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
Kara
556dc363ed
Pull request #2865 : REPORT-40853 提交单元格组多次点击卡死
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '2a9061f0f11cb840f1fc06052c4534ca25fad5be':
REPORT-40853 提交单元格组多次点击卡死
4 years ago
hades
2a9061f0f1
REPORT-40853 提交单元格组多次点击卡死
4 years ago
Yuan.Wang
beba27a61c
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yuan.Wang
7e7514a8b8
REPORT-43372 修改组件树路径的key的格式
4 years ago
ju
e1e083947e
Pull request #2853 : 无jira任务, final/10.0 合 release/10.0
...
Merge in DESIGN/design from final/10.0 to release/10.0
* commit '7cb2cb31fe3652cd622166870aa365ad19681473':
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
Kara
7cb2cb31fe
Pull request #2851 : REPORT-42470 假保存 && REPORT-43280 参数面板控件选不到
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '63d53215ffdef923d2e2d80e1f31db38daa64933':
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
hades
63d53215ff
REPORT-43280 参数面板控件选不到
4 years ago
hades
ea78749631
REPORT-42470 调整下位置 保证原顺序不变
4 years ago
hades
80fa1d102a
REPORT-42470 假保存
4 years ago
Bjorn
88d0687213
Pull request #2839 : CHART-16721 预定义样式功能回退
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '70a489ac1ce9c644d1a130ab102fbff25bd75aed':
CHART-16721 预定义样式代码回退
4 years ago
白岳
70a489ac1c
CHART-16721 预定义样式代码回退
4 years ago
ju.ju
698acb538a
Pull request #2838 : REPORT-43198 预定义样式功能优化代码回退遗漏部分
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'c8019d174d59da1236bbec1b29d2271168a6467c':
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago
kerry
c8019d174d
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago