superman
49f0e3bb1a
Merge pull request #4173 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '2e286c2d77ad12b9fc896d1be2d0a296693d60c8':
REPORT-51843 远程设计-服务器重启后,设计器配置工作目录,点击确定无效
4 years ago
superman
2e286c2d77
Merge pull request #4172 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '23f87c6700f9adc57768c327f3afa26ed00588e1':
REPORT-51843 远程设计-服务器重启后,设计器配置工作目录,点击确定无效
4 years ago
shine
fd4a5e9fdf
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
4 years ago
shine
823755386c
CHART-18790 design new template name
4 years ago
Kara
23f87c6700
Pull request #4170 : REPORT-51843 远程设计-服务器重启后,设计器配置工作目录,点击确定无效
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '01588824814413c5847a89093bc28e207a5ea64a':
REPORT-51843 远程设计-服务器重启后,设计器配置工作目录,点击确定无效
4 years ago
hades
0158882481
REPORT-51843 远程设计-服务器重启后,设计器配置工作目录,点击确定无效
4 years ago
Bjorn
bb44c733e2
Pull request #4152 : CHART-19104 鼠标的click事件不能稳定触发,改为change事件
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'bf16dad6e4ed1b725815339e0148e5e17f4d7985':
CHART-19104 鼠标的click事件不能稳定触发,改为change事件
4 years ago
Bruce.Deng
1c529c7160
Pull request #4151 : REPORT-51309 & REPORT-51281 & REPORT-51378 & REPORT-51490 导出-字体检测-检测按钮相关问题
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '3dd4d3d564dfc220bf4307209f45e0ee65835a3e':
REPORT-51281 & REPORT-51378 & REPORT-51490 导出-字体检测-模板保存相关问题
REPORT-51309 导出-字体检测-检测按钮提示的文字显示不全
4 years ago
白岳
bf16dad6e4
CHART-19104 鼠标的click事件不能稳定触发,改为change事件
4 years ago
Bruce.Deng
3dd4d3d564
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0
4 years ago
Bruce.Deng
4e4e1132d0
REPORT-51281 & REPORT-51378 & REPORT-51490 导出-字体检测-模板保存相关问题
4 years ago
Bruce.Deng
180998daeb
REPORT-51309 导出-字体检测-检测按钮提示的文字显示不全
4 years ago
superman
2c48018d36
Merge pull request #4148 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '7d125ad66d91462fb83a98911feed482168a4423':
4 years ago
superman
7d125ad66d
Merge pull request #4147 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '69e75fa7cf7e0b68a9dec1dff76d926b0b5d22ac':
4 years ago
superman
69e75fa7cf
Merge pull request #4146 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '04be858b6d68d62cd1f96a889e64668711d2e7ff':
4 years ago
superman
04be858b6d
Merge pull request #4144 in DESIGN/design from bugfix/10.0 to final/10.0
...
* commit 'e0860282ae1cc853423cf97f24739fb8ab378a08':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
superman
90f80c19dc
Merge pull request #4129 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '1bcf1e037225972b3843be78b85c9c3561550ace':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
superman
1bcf1e0372
Merge pull request #4128 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'e0860282ae1cc853423cf97f24739fb8ab378a08':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Lucian.Chen
e0860282ae
Pull request #4125 : REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit '67f2694862ed2a2216df19e3874c45c5c7189572':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
67f2694862
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
d88687d988
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Henry.Wang
47a2153461
Pull request #4112 : CHART-18951 悬浮窗图表无法关闭
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'adc8808b16cb289867aaae05732cff5444498f0d':
CHART-18951 悬浮窗图表无法关闭
4 years ago
Henry.Wang
adc8808b16
CHART-18951 悬浮窗图表无法关闭
4 years ago
zheng
b6be8804da
Pull request #4098 : CHART-18790 模板切换更新设计器界面
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen
* commit '8487a0ce987cef0b772138d31124f40a8568f0a6':
update
feature: JTemplate新增 停用模板+指定模板所需设计器界面方法
refactor: north region 4 designer Frame
refactor: center region 4 designer Frame
4 years ago
Henry.Wang
5ffdbc7480
Pull request #4105 : CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '394b4702629b28fd4ec76f217b9ebcdc638b2945':
CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
4 years ago
Henry.Wang
394b470262
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
e799d65b7e
CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
4 years ago
Hades
c3fee9ef44
Pull request #4091 : REPORT-51317 保存失败后,保存中加载动画还在
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'fb0d6575de14889736788e0819b4e0d528989cae':
REPORT-51317 保存失败后,保存中加载动画还在
4 years ago
shine
8487a0ce98
update
4 years ago
shine
ba88eedb27
feature: JTemplate新增 停用模板+指定模板所需设计器界面方法
4 years ago
superman
48ef2eacb9
Merge pull request #4095 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'fe9df15ebdeb3eb19b617b1199bd94c4e1382be6':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
superman
fe9df15ebd
Merge pull request #4094 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'ac5a017db914f9eb6befe9f94799d088aaaa1024':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
Hades
ac5a017db9
Pull request #4090 : REPORT-51446 注册表启动设计器会报错并闪退
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '1a028c69f12910ccccd58db15560fc0b9393ad0c':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
shine
f57d523e14
refactor: north region 4 designer Frame
4 years ago
hades
fb0d6575de
REPORT-51317 保存失败后,保存中加载动画还在
4 years ago
shine
f6078b1742
refactor: center region 4 designer Frame
4 years ago
hades
1a028c69f1
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
zheng
1371fa5b25
Pull request #4083 : CHART-18997 design 表单 扩展图表图表块读取失败 不吞抛错rethrow
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '160c0bd9ef3a988a78b5144d9528738589f6c42e':
CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
4 years ago
superman
2103940ee9
Merge pull request #4087 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '795b1b0451612c68e9eb33380cae8614d74bd42b':
4 years ago
superman
795b1b0451
Merge pull request #4086 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'bc6bae75d9a1affde6a936c1560b2fed3644b253':
4 years ago
superman
bc6bae75d9
Merge pull request #4085 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'c4d444dfa32fbcd95fcd12ce9fa25f8458a93ebd':
4 years ago
superman
c4d444dfa3
Merge pull request #4084 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '471382f8f0195cc18bb69e3eb24e2b134784505a':
4 years ago
shine
160c0bd9ef
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
4 years ago
shine
e8a70ea8bf
CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
4 years ago
superman
471382f8f0
Merge pull request #4082 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '0dc2ac14184fe11fac8992b00d763802720ee8e7':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
pengda
2590d1b6c6
Pull request #4060 : REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '803a58287888453a0ca1d2c62c16876b5162efdb':
REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
4 years ago
superman
ff296045e9
Merge pull request #4066 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '9954537d47dbd9bf730655e598f851eb12ade728':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
9954537d47
Merge pull request #4065 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'a5328e9e28628d4cf3076dd9ca190bc145e4f3b6':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
a5328e9e28
Merge pull request #4064 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '0dc2ac14184fe11fac8992b00d763802720ee8e7':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
0dc2ac1418
Merge pull request #4063 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'ff37e3146b25b11aeb61b8d1c1b1ad3e849ad9d0':
4 years ago