kerry
d7f71616c3
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
6 years ago
zack
cb6951b77a
Merge pull request #972 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
...
* commit '8c911c3c21339fa3f95b6e6d4ea4946d4201bdae':
换个名字
REPORT-18855 加下单元测试
6 years ago
yaoh.wu
e7b953d3fa
Merge pull request #973 in DESIGN/design from ~YAOH.WU/design:REPORT-19059 to release/10.0
...
* commit '2fe09845f647ced64297eff64c4c5f8c1d2b1fcb':
REPORT-19059 环境切换同名程序数据集还是使用上一个环境的sql
6 years ago
yaoh.wu
77fa198592
Merge pull request #971 in DESIGN/design from ~YAOH.WU/design:REPORT-19058 to release/10.0
...
* commit '4020cf334a2942ee5de4c694b6bbdf6908d272aa':
REPORT-19058 环境切换暂存文件为保存提示
6 years ago
yaoh.wu
2fe09845f6
REPORT-19059 环境切换同名程序数据集还是使用上一个环境的sql
6 years ago
zack
8c911c3c21
换个名字
6 years ago
zack
47be65f2c5
REPORT-18855 加下单元测试
6 years ago
zack
c2a9427b60
Merge pull request #970 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
...
* commit 'ad5153b945ded1ab03e0afeb06a665ea8308e462':
REPORT-18855 & REPORT-18857 jpg图片持久化遗漏了一些场景
6 years ago
yaoh.wu
4020cf334a
REPORT-19058 环境切换暂存文件为保存提示
6 years ago
zack
ad5153b945
REPORT-18855 & REPORT-18857 jpg图片持久化遗漏了一些场景
6 years ago
zheng
364ed5c8a1
Merge pull request #969 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
...
* commit '2e4956c699d7e323db12e687d95a54ef45ae582c':
CHART-9576 远程设计 设计器中用实时的
6 years ago
zheng
5bfd6a07a9
Merge pull request #1 in ~ZHENG/c-design from release/10.0 to refactor/19.4.3
...
* commit 'afd2366d2850e21d072e69ff7b1bc390a8292626':
内存配置推荐:设计器安装插件随lic显示状态不对
REPORT-18955 填报属性配置,提交条件的删除按钮没有灰色化
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法 && REPORT-18522 将所有海外版设计器的信息回传功能阉割
将所有海外版设计器的信息回传功能阉割
处理乱码和入库重复问题
没有用户名时用uuid作为用户名
update
REPORT-17908 启动动画“初始化”的国际化问题
6 years ago
zheng
2e4956c699
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~zheng/C-design into release/10.0
6 years ago
Lanlan
afd2366d28
Merge pull request #968 in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
...
* commit 'faf998dfd801179b578630f131ea7261895a57bc':
内存配置推荐:设计器安装插件随lic显示状态不对
6 years ago
zheng
8eab15c473
CHART-9576 远程设计 设计器中用实时的
6 years ago
Lanlan
faf998dfd8
内存配置推荐:设计器安装插件随lic显示状态不对
6 years ago
Hades
5a6a24a7f6
Merge pull request #967 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
...
* commit 'cb3f74bc8aabbb304ef8b5d6b5b204838fc59e9c':
REPORT-18955 填报属性配置,提交条件的删除按钮没有灰色化
6 years ago
Hades
cb3f74bc8a
REPORT-18955 填报属性配置,提交条件的删除按钮没有灰色化
6 years ago
Bjorn
fc5e03cf77
Merging in latest from upstream (DESIGN/design:refs/heads/refactor/19.4.3)
...
* commit '5ca412689276abc73124c3107fa3eab33e9b45da':
CHART-9141 ChartRequestService新增+chart service move to chart module+chartdata remove from engine-cross
xchart rename to chartProvider
CHART-9141 se.cellCC && floatCC 调用图表统一接口 删除BaseChart 各resultProcessor 初步的流程走通
多层饼图
6 years ago
vito
1261ddbaba
REPORT-16346 优化一些UI上突出的一些重复创建的界面
6 years ago
zheng
5ca4126892
Merge pull request #964 in DESIGN/design from ~ZHENG/c-design:refactor/19.4.3 to refactor/19.4.3
...
* commit 'be6bbef8f526aff97b4be8b956784357124b64d2':
CHART-9141 ChartRequestService新增+chart service move to chart module+chartdata remove from engine-cross
6 years ago
zheng
be6bbef8f5
Merge branch 'refactor/19.4.3' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into refactor/19.4.3
6 years ago
zheng
eba5d13d8f
CHART-9141 ChartRequestService新增+chart service move to chart module+chartdata remove from engine-cross
6 years ago
zheng
6cfda792ff
Merge pull request #957 in DESIGN/design from ~ZHENG/c-design:refactor/19.4.3 to refactor/19.4.3
...
* commit '77d9207fc4b0a43870f76c02acfc88555a52d591':
xchart rename to chartProvider
CHART-9141 se.cellCC && floatCC 调用图表统一接口 删除BaseChart 各resultProcessor 初步的流程走通
6 years ago
yaoh.wu
0806e3ada9
Merge pull request #963 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
...
* commit '215703525ac1bad0c62f02ff690ba8872f2b58c9':
无任务,单元测试
无任务,单元测试
6 years ago
yaoh.wu
215703525a
无任务,单元测试
6 years ago
yaoh.wu
f8cad425d1
无任务,单元测试
6 years ago
vito
db96835c2a
Merge pull request #958 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
...
* commit 'edd6531a5fe0e6710debcd5e1fe3657b806ce0e2':
REPORT-16346 优化
无jira任务 import优化
误传
误传
REPORT-16346 alphafine面板创建索引缓存
6 years ago
vito
edd6531a5f
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/design/design into feature/10.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/constants/DesignerLaunchStatus.java
6 years ago
neil
0ca2ebb72e
Merge pull request #961 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
...
* commit 'e19197474d4639bff2aab648590a2b49ae67c5bb': (25 commits)
ct
ct
ct
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法 && REPORT-18522 将所有海外版设计器的信息回传功能阉割
将所有海外版设计器的信息回传功能阉割
处理乱码和入库重复问题
没有用户名时用uuid作为用户名
update
REPORT-17908 启动动画“初始化”的国际化问题
REPORT-17887 数字控件最大值最小值部分场景保存失败
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
CHART-9401 fix list
fix list
CHART-3647 删除多余代码
update
REPORT-17656 决策报表报表块复制后值被清空
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
...
6 years ago
vito
675523e91b
REPORT-16346 优化
6 years ago
zheng
77d9207fc4
xchart rename to chartProvider
6 years ago
neil
e19197474d
ct
6 years ago
neil
e51b63c890
Merge pull request #20 in ~NEIL/design from release/10.0 to feature/10.0
...
* commit 'afd396c75169c4ce622e3828aad2173f17f29865': (22 commits)
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法 && REPORT-18522 将所有海外版设计器的信息回传功能阉割
将所有海外版设计器的信息回传功能阉割
处理乱码和入库重复问题
没有用户名时用uuid作为用户名
update
REPORT-17908 启动动画“初始化”的国际化问题
REPORT-17887 数字控件最大值最小值部分场景保存失败
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
CHART-9401 fix list
fix list
CHART-3647 删除多余代码
update
REPORT-17656 决策报表报表块复制后值被清空
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
REPORT-17494 模板版本管理,选项灰化问题
REPORT-17730 控件名无法保存
REPORT-15183 有一个改远程url的接口补一下10.0
...
6 years ago
neil
210d02fc79
ct
6 years ago
neil
8ea122559a
ct
6 years ago
vito
69b9f00781
无jira任务 import优化
6 years ago
vito
ddc82345a6
误传
6 years ago
vito
4b4e946f8d
误传
6 years ago
Hades
afd396c751
Merge pull request #956 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
...
* commit '70184cdb0fae354577424e76f6d8c00a4b979649':
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法 && REPORT-18522 将所有海外版设计器的信息回传功能阉割
将所有海外版设计器的信息回传功能阉割
6 years ago
vito
86632c7309
REPORT-16346 alphafine面板创建索引缓存
6 years ago
zheng
aab562ec30
Merge branch 'refactor/19.4.3' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into refactor/19.4.3
6 years ago
zheng
bbe4791fae
CHART-9141 se.cellCC && floatCC 调用图表统一接口 删除BaseChart 各resultProcessor 初步的流程走通
6 years ago
Hades
70184cdb0f
update
6 years ago
Hades
4e218c7456
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法 && REPORT-18522 将所有海外版设计器的信息回传功能阉割
6 years ago
Hades
a98259b930
将所有海外版设计器的信息回传功能阉割
6 years ago
zheng
65012269b8
Merge pull request #953 in DESIGN/design from ~ZHENG/c-design:refactor/19.4.3 to refactor/19.4.3
...
* commit 'c2ab455b50b6451a370ea344dd2b2fc1b8366fd5':
多层饼图
6 years ago
vito
22490abef6
Merge pull request #954 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
...
* commit '9194307c9243e8b469a7366194278c94efd3196a':
REPORT-18494 线程池命名
6 years ago
vito
9194307c92
REPORT-18494 线程池命名
6 years ago
Bjorn
72c6f22b20
Merge pull request #1 in ~BJORN/design from release/10.0 to refactor/19.4.3
...
* commit 'd9bb94afbf1615aa39c988e1152470219776d807':
处理乱码和入库重复问题
没有用户名时用uuid作为用户名
update
REPORT-17908 启动动画“初始化”的国际化问题
6 years ago