Henry.Wang
1b1ac56344
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~henry.wang/design into bugfix/10.0
4 years ago
Henry.Wang
80ea9bb843
REPORT-32427 设计器操作决策报表TAB块,出现问题
4 years ago
Hades
9436db3995
Pull request #1780 : REPORT-32997 模板列宽修改但是值不变出现了缩进 转专人服务-Cafu
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '7946d9ddfbe510883e2d75fdd750dfdc8cf7d360':
REPORT-32997 模板列宽修改但是值不变出现了缩进 转专人服务-Cafu
4 years ago
hades
7946d9ddfb
REPORT-32997 模板列宽修改但是值不变出现了缩进 转专人服务-Cafu
4 years ago
ju.ju
400fd0ceff
Pull request #1774 : REPORT-32520 页面设置上希望超过2000可以正常显示宽和高--来源【客户需求 471986】
...
Merge in DESIGN/design from ~YUAN.WANG/design:bugfix/10.0 to bugfix/10.0
* commit '1f3781c3442bbc773acaa88f8fd7630ac98853e5':
REPORT-32520 修改代码规范
REPORT-32520 修改代码规范
REPORT-32520 修改页面设置超过2000后预览不能正常显示宽和高的bug
4 years ago
Henry.Wang
f6cd3169c9
Pull request #1773 : REPORT-33944 页边距为0,设计器虚线和实际有1的误差
...
Merge in DESIGN/design from ~HENRY.WANG/design:bugfix/10.0 to bugfix/10.0
* commit 'c1d29e61697a5997eaadeb53751620158efe06be':
REPORT-33944 改为常量
REPORT-33944 大于允许的精度之外才是大于
REPORT-33944 页边距为0,设计器虚线和实际有1的误差
4 years ago
Yuan.Wang
1f3781c344
REPORT-32520 修改代码规范
4 years ago
Yuan.Wang
900d1f6883
REPORT-32520 修改代码规范
4 years ago
assassion
322f01e340
REPORT-32520 修改页面设置超过2000后预览不能正常显示宽和高的bug
4 years ago
Henry.Wang
c1d29e6169
REPORT-33944 改为常量
4 years ago
Henry.Wang
a6648211e9
REPORT-33944 大于允许的精度之外才是大于
4 years ago
Henry.Wang
ed82eca8c9
REPORT-33944 页边距为0,设计器虚线和实际有1的误差
4 years ago
neil
adee41c26b
Pull request #1771 : 无jira任务, final -> bugfix
...
Merge in DESIGN/design from final/10.0 to bugfix/10.0
* commit '5d1dc866ca8087a4c62ea078c72d622d1ac79550': (334 commits)
CHART-14399 坐标轴切换类型时,保留网格线类型和颜色 同步到final
REPORT-34222 报表设计器给容器插件开个复制粘贴的接口 同步到final
MOBILE-27698 移动端控件类插件设置边框不生效
REPORT-33599 设计器菜单栏导出txt,当修改导出的参数时模版会被刷新为待保存状态 && REPORT-33525 删除引用的Js或者css 有歧义
REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
CHART-14104 坐标轴切换前后,传递网格线属性
import设置不对
REPORT-33858 日志死循环的问题
CHART-13666 国际化修改
CHART-13666
CHART-13666 图表自动类型推荐
删除无用方法
代码简化
REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
REPORT-33575 改下方法名称
REPORT-33575 远程连接启用https的环境,服务器关掉之后没有跳出切换工作目录的弹窗 && REPORT-33454 切换远程目录成功,弹窗提示切换失败
REPORT-33731 带参存储过程预览没有弹出参数输入框
MOBILE-27532 单选/复选按钮组自适应高度
REPORT-33459 启动后 设计器显示异常
CHART-14264 修改配色面板样式
...
4 years ago
Henry.Wang
d27cf46c96
Pull request #1766 : REPORT-34127 筛选条件,改了后面单元格条件之后,前面单元格自动跟着修改了
...
Merge in DESIGN/design from ~HENRY.WANG/design:bugfix/10.0 to bugfix/10.0
* commit 'e811e5846f888d2081ec5d1bc38b337fa0d31c39':
REPORT-34127 筛选条件,改了后面单元格条件之后,前面单元格自动跟着修改了
4 years ago
Kara
5d1dc866ca
Pull request #1769 : CHART-14399 坐标轴切换类型时,保留网格线类型和颜色 同步到final
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:final/10.0 to final/10.0
* commit '56c61a0c16bb17d1c6fd117014a5475614116b67':
CHART-14399 坐标轴切换类型时,保留网格线类型和颜色 同步到final
4 years ago
Qinghui.Liu
56c61a0c16
CHART-14399 坐标轴切换类型时,保留网格线类型和颜色 同步到final
4 years ago
Kara
adb9b99f77
Pull request #1767 : REPORT-34222 报表设计器给容器插件开个复制粘贴的接口 同步到final
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '151a8bb5ca78c66a0894f76223ba64458b5a38ce':
REPORT-34222 报表设计器给容器插件开个复制粘贴的接口 同步到final
4 years ago
hades
151a8bb5ca
REPORT-34222 报表设计器给容器插件开个复制粘贴的接口 同步到final
4 years ago
Henry.Wang
e811e5846f
REPORT-34127 筛选条件,改了后面单元格条件之后,前面单元格自动跟着修改了
4 years ago
Kara
c810c19746
Pull request #1762 : Final/10.0
...
Merge in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit '9187737d85d364c08984f55a01b22e999c060654': (133 commits)
MOBILE-27698 移动端控件类插件设置边框不生效
REPORT-33599 设计器菜单栏导出txt,当修改导出的参数时模版会被刷新为待保存状态 && REPORT-33525 删除引用的Js或者css 有歧义
REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
CHART-14104 坐标轴切换前后,传递网格线属性
import设置不对
REPORT-33858 日志死循环的问题
CHART-13666 国际化修改
CHART-13666
CHART-13666 图表自动类型推荐
删除无用方法
代码简化
REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
REPORT-33575 改下方法名称
REPORT-33575 远程连接启用https的环境,服务器关掉之后没有跳出切换工作目录的弹窗 && REPORT-33454 切换远程目录成功,弹窗提示切换失败
REPORT-33731 带参存储过程预览没有弹出参数输入框
MOBILE-27532 单选/复选按钮组自适应高度
REPORT-33459 启动后 设计器显示异常
CHART-14264 修改配色面板样式
CHART-14227 空数据规则修改
REPORT-33690 抽出方法
...
4 years ago
jeo
9187737d85
Merge branch 'release/10.0' into final/10.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java
4 years ago
wei
94f883cdb3
Pull request #1761 : MOBILE-27698 移动端控件类插件设置边框不生效
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit '921df92042373ff03f8ab2fe4edf68887de36c8b':
MOBILE-27698 移动端控件类插件设置边框不生效
4 years ago
kuangshuai
921df92042
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~tommy/design into release/10.0
4 years ago
kuangshuai
ce05afdf4c
MOBILE-27698 移动端控件类插件设置边框不生效
4 years ago
Hades
06ae14dcc2
Pull request #1760 : REPORT-33599 设计器菜单栏导出txt,当修改导出的参数时模版会被刷新为待保存状态 && REPORT-33525 删除引用的Js或者css 有歧义
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '90394c357d4933e24a8bf9145eba7d611796327a':
REPORT-33599 设计器菜单栏导出txt,当修改导出的参数时模版会被刷新为待保存状态 && REPORT-33525 删除引用的Js或者css 有歧义
4 years ago
hades
90394c357d
REPORT-33599 设计器菜单栏导出txt,当修改导出的参数时模版会被刷新为待保存状态 && REPORT-33525 删除引用的Js或者css 有歧义
4 years ago
ju.ju
d6c00845c9
Pull request #1759 : REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
...
Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '03f3c716755be677e640e369b7191461a990cf8a':
REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
4 years ago
zack
03f3c71675
REPORT-33616 填报属性设置-智能添加单元格,确认和取消效果一样
4 years ago
Qinghui.Liu
bcda5f66a8
Pull request #1758 : CHART-14104 坐标轴切换前后,传递网格线属性
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '7413a41304532d1825b1ad751f05b73c6c2789fc':
CHART-14104 坐标轴切换前后,传递网格线属性
4 years ago
Qinghui.Liu
7413a41304
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
a1350867e7
CHART-14104 坐标轴切换前后,传递网格线属性
4 years ago
Bjorn
876ba732ac
Pull request #1756 : CHART-13666 图表自动类型推荐
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '0e2370b266d4d913fcbabb80de44b26e0fce2478':
CHART-13666 国际化修改
CHART-13666
CHART-13666 图表自动类型推荐
4 years ago
zack
b9d6dfb9d5
Pull request #1754 : REPORT-33731 带参存储过程预览没有弹出参数输入框
...
Merge in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '04b01ff4664ca43ae8db712cd02ba1bf4b7185f3':
import设置不对
REPORT-33731 带参存储过程预览没有弹出参数输入框
4 years ago
drew
d19d36276d
Pull request #1752 : MOBILE-27532 单选/复选按钮组自适应高度
...
Merge in DESIGN/design from ~DREW/design:release/10.0 to release/10.0
* commit '4c101df6e9b362b60b6f7634778e4caf85af1b6a':
代码简化
MOBILE-27532 单选/复选按钮组自适应高度
4 years ago
rinoux
9c4e3eb0a8
Pull request #1757 : REPORT-33858 日志死循环的问题
...
Merge in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
* commit 'a458266ea108d4d34b33c4108acf947f2407c982':
REPORT-33858 日志死循环的问题
4 years ago
kerry
75c250e1ea
Pull request #1755 : REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '488616bc6427cf67e67297eae7b9035326135424':
删除无用方法
REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
4 years ago
zack
04b01ff466
import设置不对
4 years ago
Hades
1611d83cd6
Pull request #1753 : REPORT-33575 远程连接启用https的环境,服务器关掉之后没有跳出切换工作目录的弹窗 && REPORT-33454 切换远程目录成功,弹窗提示切换失败
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '01ba3bf406c16027f3da12d8c642937b73fff53e':
REPORT-33575 改下方法名称
REPORT-33575 远程连接启用https的环境,服务器关掉之后没有跳出切换工作目录的弹窗 && REPORT-33454 切换远程目录成功,弹窗提示切换失败
4 years ago
rinoux
a458266ea1
REPORT-33858 日志死循环的问题
4 years ago
白岳
0e2370b266
CHART-13666 国际化修改
4 years ago
白岳
a40991ca18
CHART-13666
4 years ago
白岳
308bfc7e7f
CHART-13666 图表自动类型推荐
4 years ago
kerry
488616bc64
删除无用方法
4 years ago
nmwei
4c101df6e9
代码简化
4 years ago
kerry
cd8551d565
REPORT-31758【frm自适应重构05.25周】frm设计界面支持缩放
4 years ago
hades
01ba3bf406
REPORT-33575 改下方法名称
4 years ago
hades
df64e6e5c9
REPORT-33575 远程连接启用https的环境,服务器关掉之后没有跳出切换工作目录的弹窗 && REPORT-33454 切换远程目录成功,弹窗提示切换失败
4 years ago
zack
6429b828d5
REPORT-33731 带参存储过程预览没有弹出参数输入框
4 years ago
Hades
853de08120
Pull request #1750 : REPORT-33459 启动后 设计器显示异常
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'd24ec99f43f2a617e17f22837e07d5c36a127ea6':
REPORT-33459 启动后 设计器显示异常
4 years ago
Qinghui.Liu
06a33f4b97
Pull request #1751 : CHART-14264 修改配色面板样式
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6a348cafe42913cada511d9f639222bd4625214b':
CHART-14264 修改配色面板样式
修改兼容方式
CHART-14228 向下兼容网格线
4 years ago