vito
f70a59052c
Pull request #1728 : REPORT-28950 报表工程切换为gradle工程
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'cfcd0ff50c8da4dbb941402a59b1fdcb48ea7955': (61 commits)
无JIRA任务 gradle配置修改
KERNEL-4069 添加注释
KERNEL-4069 JDK11适配 删除无用的类与mac下的适配
KERNEL-4069 fix 漏交
KERNEL-4069 配合完成JDK11构建设计器的开发
无jira feature打包失败
无jira任务,打包失败,代码重复
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
...
5 years ago
vito
cfcd0ff50c
Merge branch 'feature/10.0' into release/10.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java
5 years ago
白岳
4d85a74eca
CHART-11701 仪表盘百分比设置逻辑优化
5 years ago
yaoh.wu
d40e2c6178
Pull request #1726 : REPORT-33162 监听插件改动面板刷新线程安全
...
Merge in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '7fd2900d3e6ea8ad3fcbeba7f87d7f0f06f400dc':
REPORT-33162 监听插件改动面板刷新线程安全
5 years ago
yaohwu
7fd2900d3e
REPORT-33162 监听插件改动面板刷新线程安全
5 years ago
Harrison
0f382b1b14
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
5 years ago
Harrison
cb90f91fc7
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
[关联场景]
https://kms.fineres.com/pages/viewpage.action?pageId=116725800
[处理方案]
1、获取目标 creator
2、对 creator 的名字进行处理。
3、存在 widgetname , 说明已经初始化了, 直接通过 widgetname 处理
4、不存在, 则需要赋予一个默认的 widgetname
5 years ago
Kara
bbf278d859
Pull request #1724 : Persist/10.0
...
Merge in DESIGN/design from ~JEO/report-design:persist/10.0 to persist/10.0
* commit 'ace673fb074e75529c955d4380f5f9aed77c7241':
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
REPORT-32939 add comment
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
jeo
ace673fb07
Merge branch 'final/10.0' into persist/10.0
5 years ago
pengda
b0811cfc2f
Pull request #1722 : REPORT-32318 frm横向和纵向滚动条图标点击问题
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '4fd85e2106905e9d90f65ee0cba1b30531bd7436':
REPORT-32318 frm横向和纵向滚动条图标点击问题
5 years ago
Harrison
5a16de71e1
Pull request #1721 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 组件的默认名字不满足要求。
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '955559bb4c71dc7c099c1ded390a2838ab1f3fa3':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 回滚代码,没回滚完
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 代码回滚
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 组件的默认名字不满足要求。 一些组件外面会嵌套 TitileLayout 所以根组件依旧保持之前的逻辑。 子组件使用组件名字递增的方式。
5 years ago
pengda
4fd85e2106
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
pengda
eb185a366a
REPORT-32318 frm横向和纵向滚动条图标点击问题
5 years ago
pengda
7303828c09
Pull request #1718 : REPORT-29657 lab标签字体显示问题
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '8db9ece2d7e8e1ca024347e0efee982a48edb532':
REPORT-29657 lab标签字体显示问题
5 years ago
Harrison
955559bb4c
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
回滚代码,没回滚完
5 years ago
Harrison
97649d7f51
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
代码回滚
5 years ago
Kara
345d255d90
Pull request #1719 : REPORT-33018 设计器正常2g目前经常出现排队现象
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '0b3aac756a2d086bd96c00a7d21d7fc337cffa48':
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
REPORT-32939 add comment
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
Harrison
107a1271c4
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
5 years ago
Harrison
0d2ef6de03
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
组件的默认名字不满足要求。
一些组件外面会嵌套 TitileLayout
所以根组件依旧保持之前的逻辑。
子组件使用组件名字递增的方式。
5 years ago
hades
0b3aac756a
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
5 years ago
hades
838183e165
REPORT-32939 add comment
5 years ago
hades
9018c51a45
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
Hades
06d9a68955
Pull request #1715 : REPORT-33018 设计器正常2g目前经常出现排队现象
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '4b73db2bf361d53ad388511a26c512790afe6fc4':
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
REPORT-32939 add comment
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
Lanlan
4112152b9c
Pull request #1717 : REPORT-32275 服务器未安装插件,固化回传日志中显示成功,实际上没有回传
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '060264cbe46aada91c5f0c4e7b366e855646046e':
REPORT-32275 服务器未安装插件,固化回传日志中显示成功,实际上没有回传
5 years ago
pengda
8db9ece2d7
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
hades
4b73db2bf3
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
5 years ago
pengda
fdf8327ce0
REPORT-29657 lab标签字体显示问题
5 years ago
Lanlan
9511a93f60
Pull request #1714 : REPORT-31381 通过alphafine搜索插件,进入插件mini商城后对应的插件信息显示缺失
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '211bf38b9a686ea5b105185624c021b749def087':
alphafine搜索时,以关键词打开设计器商店
REPORT-31381 通过alphafine搜索插件,进入插件mini商城后对应的插件信息显示缺失
5 years ago
Lanlan
060264cbe4
REPORT-32275 服务器未安装插件,固化回传日志中显示成功,实际上没有回传
5 years ago
eason
9ee1568264
Pull request #1716 : CHART-13666 打包报错
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'f6663d5adf6a9d40a415dc629b0b16b50220901a':
CHART-13666 打包报错
5 years ago
白岳
f6663d5adf
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
5 years ago
白岳
bd5b08e637
CHART-13666 打包报错
5 years ago
hades
7ff33d1c6c
REPORT-32939 add comment
5 years ago
hades
3854aba922
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
Lanlan
211bf38b9a
alphafine搜索时,以关键词打开设计器商店
5 years ago
Bjorn
0f868156b2
Pull request #1713 : CHART-13666 图表类型自动匹配设计器面板
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '2f58e87ed88eff1cd557cdd3a3f1df3f8ff2beeb':
CHART-13666 代码质量
CHART-13666 代码质量
CHART-13666 增加注释
CHART-13666
CHART-13666 图表类型自动匹配设计器面板
还原
还原
CHART-14022 父类方法改变,子类增加参数
5 years ago
白岳
2f58e87ed8
CHART-13666 代码质量
5 years ago
Lanlan
fcae4b8f82
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
5 years ago
Lanlan
16346fd4f7
REPORT-31381 通过alphafine搜索插件,进入插件mini商城后对应的插件信息显示缺失
5 years ago
白岳
87c6994e38
CHART-13666 代码质量
5 years ago
白岳
2a078f775b
CHART-13666 增加注释
5 years ago
Harrison
61e8ddc2a2
Pull request #1711 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'c5b4410d9a231d384cd4bfe23b939351fe739f05':
沿用之前的命名规则。 只进行 n 对 n 的匹配。
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 [场景] 拖入组件时,组件时绝对画布块,内部有多个组件。此时,不会对内部的多个组件进行检测。 [solution] 递归的对所有组件进行处理。
5 years ago
白岳
f52bcbdb7f
CHART-13666
5 years ago
白岳
e6df73ae30
CHART-13666 图表类型自动匹配设计器面板
5 years ago
Harrison
c5b4410d9a
沿用之前的命名规则。
...
只进行 n 对 n 的匹配。
5 years ago
Hiram
26bbb1e2d8
Pull request #1712 : 无JIRA任务 gradle配置修改
...
Merge in DESIGN/design from ~HIRAM/design:feature/10.0 to feature/10.0
* commit 'f47a1d27867415a133400d32652627042510f82e':
无JIRA任务 gradle配置修改
5 years ago
Harrison
904b150e2b
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
5 years ago
Harrison
04f474543f
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
[场景]
拖入组件时,组件时绝对画布块,内部有多个组件。此时,不会对内部的多个组件进行检测。
[solution]
递归的对所有组件进行处理。
5 years ago
hiram
f47a1d2786
无JIRA任务 gradle配置修改
5 years ago
Hades
ee3cd1a2ff
Pull request #1710 : KERNEL-4069 JDK11适配 删除无用的类与mac下的适配
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'ff753001c487d64032ecb95aef35b7cffe418701':
KERNEL-4069 添加注释
KERNEL-4069 JDK11适配 删除无用的类与mac下的适配
5 years ago