shine
f78f1c8c82
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
3 years ago
shine
b8317ff113
ignore
3 years ago
zheng
ace6ca5fb9
Merging in latest from upstream (DESIGN/design:refs/heads/feature/big-screen)
...
* commit '823d91d51a9ff4a6a15d6b27d2674c65273f6440':
REPORT-58533 附件模板中报表块无法进入编辑
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
无jira 忽略异常
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
shine
6a4d71e136
根据最新视觉调整单元格边框颜色
3 years ago
shine
68a3d41504
POM-2302 cpt组件默认样式
3 years ago
fanglei
712638e5dc
Pull request #5704 : REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
...
Merge in DESIGN/design from ~FANGLEI/design10.0:bugfix/10.0 to bugfix/10.0
* commit 'fb1d0f8d578143bb3f60ecab452b5031d71f46ca':
REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
3 years ago
superman
823d91d51a
Merge pull request #5725 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '0cc49b968106b3260c895958197d409be2ab1427':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
0cc49b9681
Merge pull request #5720 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '39a83a802c13d8ffe2bcf49a0b37bbabfff2c7e0':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
39a83a802c
Merge pull request #5719 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8ed8d12424f99e3077ef5fd83fe12f4ea471705f':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
Hades
8ed8d12424
Pull request #5705 : REPORT-58553 附件模板中报表块无法进入编辑
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '5e4bd357d72e70b431071f2dffe13c7004852a91':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
aca9ba74ca
Merge pull request #5713 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8bb9331614be76bbb5f98c4dc235b1d3dff129c6':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
superman
8bb9331614
Merge pull request #5709 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '46b685fe678c9d3d4f284bf8f3a3053e979fca82':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
superman
46b685fe67
Merge pull request #5708 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '638e29e74265e3296ca9ef0f95429587bb06e0bf':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
hades
5e4bd357d7
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
3 years ago
hades
720d610df5
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
方磊
fb1d0f8d57
REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
3 years ago
Hades
638e29e742
Pull request #5699 : REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '98768ff1088b7541169523f4086883456259cb73':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
hades
98768ff108
REPORT-58713 加些注释
3 years ago
hades
37abccaea2
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
superman
ab5298ecb8
Merge pull request #5695 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'd0ff7afe775c94eaaa39c0dd1e8321bebd4772a2':
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
无jira 忽略异常
3 years ago
superman
d0ff7afe77
Merge pull request #5691 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '7d81ef2e0b453d2371000f8db7b6d031a208c876':
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
无jira 忽略异常
3 years ago
superman
7d81ef2e0b
Merge pull request #5690 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c2bbfc2127209b285b9cb0fb821ab25da9eefdff':
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
无jira 忽略异常
3 years ago
superman
c2bbfc2127
Merge pull request #5689 in DESIGN/design from final/10.0 to release/10.0
...
* commit '62909e97e1d63406d38a9233fb6ee21b871679e5':
3 years ago
superman
62909e97e1
Merge pull request #5688 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '26a3be9d7544f22c0a99c33dee95cbe3f64ba6a8':
3 years ago
superman
26a3be9d75
Merge pull request #5685 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '3f231303f731d896611723739334fefdab7ec25a':
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
CHART-20517 图表类型编辑之后再重置标题
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
Hades
f4360ae77f
Pull request #5670 : REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符 && REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11 && 无jira 忽略异常
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '4c17b62cfc2c069389ca4bd80dc4d29bf2aa738e':
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
无jira 忽略异常
3 years ago
Hades
6f609934a7
Pull request #5667 : REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '438d2cb8e772a9ae7040e6bdc8cce6e4df3df516':
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
3 years ago
superman
4510d45d9d
Merge pull request #5678 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '10a0acc78917f849a397cf2793298b1c0e411512':
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
superman
10a0acc789
Merge pull request #5674 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'acb8d99693c4ef3343701495bfa25e1204e3b06b':
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
superman
acb8d99693
Merge pull request #5673 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '93cae3cd98412402466d5b1f60ffd45927eb4dd6':
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
superman
93cae3cd98
Merge pull request #5672 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3f231303f731d896611723739334fefdab7ec25a':
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
hades
4c17b62cfc
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
3 years ago
ju|剧浩宇
0396536e29
Pull request #5668 : 无JIRA任务 feature/big-screen to feature/10.0
...
Merge in DESIGN/design from feature/big-screen to feature/10.0
* commit '68b63b40e57bf2b4fbb73c381a7c869ee47d6c2b':
CHART-20299 fix:大屏模板重命名
3 years ago
hades
438d2cb8e7
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
3 years ago
Yuan.Wang
3f231303f7
Pull request #5665 : REPORT-56134 js提交事件报错中添加定位信息
...
Merge in DESIGN/design from ~YUAN.WANG/design:final/10.0 to final/10.0
* commit 'c19f6811e7f98abeed97626fad9c4636e44d83f4':
REPORT-56134 js提交事件报错中添加定位信息
3 years ago
Yuan.Wang
c19f6811e7
REPORT-56134 js提交事件报错中添加定位信息
3 years ago
Hades
9afebaa410
Pull request #5663 : REPORT-55048 websocket使用代理的情况再处理下
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'bc0aee15e1948b6fc6ce395cd54c70fcb2c1547e':
REPORT-55048 websocket使用代理的情况处理下
3 years ago
hades
bc0aee15e1
REPORT-55048 websocket使用代理的情况处理下
3 years ago
Hades
30d90d5af1
Pull request #5660 : REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'b9810de77f1aa36da88dd1de48f9998eef0972be':
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
hades
b9810de77f
REPORT-55748 处理下import 问题
3 years ago
hades
dae339c7fd
Merge branch 'final/10.0' of https://code.fineres.com/scm/~hades/design into final/10.0
3 years ago
hades
70847a3057
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
3 years ago
hades
cdbac0ac9f
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
3 years ago
superman
68b63b40e5
Merge pull request #5651 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '63e6129006b0748a923ebfe53e283724f05a83d1':
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
superman
63e6129006
Merge pull request #5647 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '3df63d28d40c001ba3f47ac00ca61f8e95abc830':
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
superman
3df63d28d4
Merge pull request #5646 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '16f0d2cfb431b24fc82de0289d6bb01d45c85064':
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
superman
16f0d2cfb4
Merge pull request #5645 in DESIGN/design from final/10.0 to release/10.0
...
* commit '0d81f87a69bdee1a9bba7a5867ff8e6ce1711e14':
CHART-20517 图表类型编辑之后再重置标题
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
superman
0d81f87a69
Merge pull request #5644 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'f70b8224a09e669bd86ffe065c681562221ae980':
3 years ago
Bjorn
422fe7896a
Pull request #5643 : CHART-20517 图表类型编辑之后再重置标题
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit 'b8d800e2a618a2521d23044871feaeb778b1ce08':
CHART-20517 图表类型编辑之后再重置标题
3 years ago
白岳
b8d800e2a6
CHART-20517 图表类型编辑之后再重置标题
3 years ago