Yvan
80554b04ff
Merge branch 'release/10.0' of https://code.fineres.com/scm/~yvan/design into release/10.0
...
# 请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开始的行将被忽略,而空的提交说明将终止提交。
4 years ago
Yvan
0a80bfb61f
Merge branch 'release/10.0' of https://code.fineres.com/scm/~yvan/design into release/10.0
...
# 请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开始的行将被忽略,而空的提交说明将终止提交。
4 years ago
superman
02ef44c6e0
Merge pull request #1900 in DESIGN/design from final/10.0 to release/10.0
...
* commit '628d4d4469fa45b8971e3e719deae0c9706144bc':
CHART-14801 面板样式修改
4 years ago
Kara
628d4d4469
Pull request #1897 : CHART-14801 面板样式修改
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '604f611bda68d8b8df593079a89fc42bdcf907d1':
CHART-14801 面板样式修改
4 years ago
白岳
604f611bda
CHART-14801 面板样式修改
4 years ago
Qinghui.Liu
dbcdf85182
系列标记点界面
4 years ago
Yvan
411e1b2e75
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
063c2cd52b
REPORT-35906 数据集编辑的界面,在添加行数或修改行数后,代码中会做一部分重复添加,根据添加的顺序特点,删去多余的Component,解决bug
4 years ago
Qinghui.Liu
28e2c0ee86
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
7db61352ff
结果数据不支持数据筛选
4 years ago
Qinghui.Liu
5b4868a601
系列和数据点提示界面
4 years ago
superman
cc8d792494
Merge pull request #1892 in DESIGN/design from final/10.0 to release/10.0
...
* commit '39b5ef76e506d7b594a9bebab55c6bb544babade':
4 years ago
superman
39b5ef76e5
Merge pull request #1891 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '3ee16f66a4f9a91beb0e6bc87a5e3f22bf12fdf3':
4 years ago
superman
3ee16f66a4
Merge pull request #1890 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '42131ec5c5cc270642cac99df486c902c1f421be': (56 commits)
REPORT-34954 在富文本设置中,未选中数据时直接点击上下标仍然可以同时设置(提错了,之前提到了release)
无
REPORT-35455 赶这一波发布
REPORT-35699 国际化修改对报表下拉框产生影响 添加import
REPORT-35699 国际化修改对报表下拉框产生影响
REPORT-35387 参数面板已有控件的时候,点击右侧全部添加,控件重叠 代码格式调整
REPORT-35387 参数面板已有控件的时候,点击右侧全部添加,控件重叠 删除打印语句
REPORT-35387 参数面板已有控件的时候,点击右侧全部添加,控件重叠
REPORT-35205 fix
REPORT-35379 && REPORT-35205
修改属性访问修饰符
REPORT-35253 切换远程到本地设计器的问题
REPORT-34780 && CHART-14441
CHART-14624 调整面积图系列面板不透明的enable属性的check
REPORT-35381 && REPORT-35379
CHART-14598 雷达图增加线宽设置
CHART-14541 轴标题增加缩进
REPORT-34020 【国际化】非简中设计器-界面右侧面板选择超链接或悬浮元素后下拉框溢出
CHART-14120 英文设计器地图数据面板截断
REPORT-33236
...
4 years ago
Qinghui.Liu
86cef6a4a2
Pull request #1871 : CHART-14744 箱型图界面
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6532deb6d84013fe257f057c7d071f6062050ad7':
数据集数据流程
完善面板结构
整理数据集数据
填充数据集数据界面
整理箱型图数据点提示
CHART-11549 初始化箱型图界面
4 years ago
Henry.Wang
6f210916d7
REPORT-35568 参数面板,添加多个控件,撤销,会出现一个蓝色的框线
4 years ago
Qinghui.Liu
6532deb6d8
数据集数据流程
4 years ago
superman
bdce344067
Merge pull request #1877 in DESIGN/design from final/10.0 to release/10.0
...
* commit '42131ec5c5cc270642cac99df486c902c1f421be':
REPORT-34954 在富文本设置中,未选中数据时直接点击上下标仍然可以同时设置(提错了,之前提到了release)
4 years ago
Henry.Wang
5d7ad8d0a5
Pull request #1875 : REPORT-35690 国际化-填报快捷键设置页面展示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'cec4c13074e0c1356047da33c82bf99e1cbf2900':
REPORT-35690 国际化-填报快捷键设置页面展示不全
4 years ago
Henry.Wang
cec4c13074
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
4 years ago
Henry.Wang
ffe989fd94
REPORT-35690 国际化-填报快捷键设置页面展示不全
4 years ago
Henry.Wang
3155e4ac81
Pull request #1874 : REPORT-35688 国际化-预定义样式,显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'bf03497df4aaae57cbfda57352091cf7957e6604':
REPORT-35688 国际化-预定义样式,显示不全
4 years ago
Bjorn
224efd7b4d
Pull request #1873 : CHART-14689 切换按钮换行不限制高度
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '03a36cd7f36d83a62f81867d7c4736a61c5c0294':
CHART-14689 切换按钮换行不限制高度
4 years ago
Qinghui.Liu
3755374686
完善面板结构
4 years ago
白岳
03a36cd7f3
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
4 years ago
白岳
e6c10db5cf
CHART-14689 切换按钮换行不限制高度
4 years ago
Henry.Wang
bf03497df4
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
4 years ago
Henry.Wang
76042b8633
REPORT-35688 国际化-预定义样式,显示不全
4 years ago
Kara
42131ec5c5
Pull request #1872 : REPORT-34954 在富文本设置中,未选中数据时直接点击上下标仍然可以同时设置(提错了,之前提到了release)
...
Merge in DESIGN/design from ~HUGH.C/design:final/10.0 to final/10.0
* commit 'fde23b8576a7e053a34ad40f82e9be01dd3c422d':
REPORT-34954 在富文本设置中,未选中数据时直接点击上下标仍然可以同时设置(提错了,之前提到了release)
4 years ago
Hugh.C
fde23b8576
REPORT-34954 在富文本设置中,未选中数据时直接点击上下标仍然可以同时设置(提错了,之前提到了release)
4 years ago
Qinghui.Liu
56c45528e5
解决冲突
4 years ago
Qinghui.Liu
2525b1f62d
整理数据集数据
4 years ago
Hades
d9f99da85c
Pull request #1870 : REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '75d9b30d8c71e0b548731cfcff4b6109a49a81e6':
REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题
4 years ago
Bjorn
8a7a41cd18
Pull request #1867 : CHART-14689 预定义配色按钮样式修改
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '326eb6bb1eefb6716c8ff6eb4145c06c8f02f1fe':
CHART-14689 预定义配色按钮样式修改
4 years ago
hades
75d9b30d8c
REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题
4 years ago
superman
a8a8cf951b
Merge pull request #1866 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'b57e3e7db44eda725716ac649edadf12d267c1e0':
无
REPORT-35455 赶这一波发布
REPORT-35699 国际化修改对报表下拉框产生影响 添加import
REPORT-35699 国际化修改对报表下拉框产生影响
4 years ago
白岳
326eb6bb1e
CHART-14689 预定义配色按钮样式修改
4 years ago
Henry.Wang
66eabbbf84
Pull request #1864 : REPORT-35692 国际化-页面设置-单位改为INCH,显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '8eda3e745d6421b3101164517b30ba2309ebd914':
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 方法替换
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 撤销一些代码
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 调整格式
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全
REPORT-35699 国际化修改对报表下拉框产生影响 添加import
REPORT-35699 国际化修改对报表下拉框产生影响
4 years ago
Hades
9811fbe39e
Pull request #1863 : REPORT-34996 && REPORT-34636 && REPORT-34878 && REPORT-34936
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '23a94b9371a68a360c33d87d0a683c8f6dbfb4c5':
REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题
REPORT-34996 && REPORT-34636
4 years ago
Henry.Wang
8eda3e745d
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 方法替换
4 years ago
hades
23a94b9371
REPORT-34878 && REPORT-34936 linux下条件属性和超链保存问题
4 years ago
Henry.Wang
304a522cfb
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 撤销一些代码
4 years ago
Henry.Wang
b30e6623d6
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全 调整格式
4 years ago
Henry.Wang
39fd9ae7e7
REPORT-35692 国际化-页面设置-单位改为INCH,显示不全
4 years ago
hades
deee0ab65f
REPORT-34996 && REPORT-34636
4 years ago
pengda
5a525fd05f
Pull request #1862 : REPORT-34907 linux设计器-纸张背景-渐变色,右边的游标不能拖动
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '0bf03a25b340587175652e0dd3d2add7dd5e7a56':
REPORT-34907 linux设计器-纸张背景-渐变色,右边的游标不能拖动
4 years ago
Kara
b57e3e7db4
Pull request #1856 : REPORT-35699 国际化修改对报表下拉框产生影响
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit '57c22fe43b56ae478d357c29417b79b51303b0f8':
REPORT-35699 国际化修改对报表下拉框产生影响 添加import
REPORT-35699 国际化修改对报表下拉框产生影响
4 years ago
Kara
d5bc64aa16
Pull request #1861 : REPORT-35455 final传一份,赶这一波发布
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit '0debb703223cacd46f5894e3583d8c39de77b087':
无
REPORT-35455 赶这一波发布
4 years ago
pengda
0bf03a25b3
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
pengda
fbd5c66682
REPORT-34907 linux设计器-纸张背景-渐变色,右边的游标不能拖动
4 years ago