shine
4f34fc2697
omport
4 years ago
shine
de6236770f
处理冲突错了 更改
4 years ago
shine
b3d8e804a6
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
4 years ago
shine
eb9730b110
conflict
4 years ago
zheng
0d25e3f77a
Pull request #4366 : CHART-18787 design refactor:图表类型信息
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen
* commit '86784f34cc7dba81a673adf019dc05a50afb6c99':
CHART-18787 design refactor:图表类型信息
CHART-18788 模板保存开重写方法
4 years ago
kerry
9f2fd06c0c
Pull request #4365 : REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '8efb51bcdde6f07feb238c97f6a596bb74ab056b':
REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
4 years ago
shine
86784f34cc
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
4 years ago
shine
db03f46adf
CHART-18787 design refactor:图表类型信息
4 years ago
kerry
8efb51bcdd
REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
4 years ago
superman
e789462075
Merge pull request #4360 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '9241e383928560716b5d8b8fc48f2a3757348b62':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
superman
9241e38392
Merge pull request #4359 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd016733842ee8a36ec84ca248ae035fcffc3d06a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
superman
d016733842
Merge pull request #4358 in DESIGN/design from final/10.0 to release/10.0
...
* commit '1158743e95afea781b9ce2aed2c8772f87bc217a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
Kara
1158743e95
Pull request #4356 : REPORT-52824 10.0.16 模板另存不会生成新的模板id
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'd5d6925c5c4ffa1cf79fb49729a3f942b17f09c7':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
hades
d5d6925c5c
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
shine
0dee08f919
CHART-18788 模板保存开重写方法
4 years ago
fanglei
62b33713cc
Pull request #4324 : REPORT-52264 模版权限编辑警告弹窗不在页面中间
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'cb474f5d121a3873c4eedbb09614e18d37e3bf43':
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
Tommy
9c7d5e5422
Pull request #4348 : EPORT-52539 REPORT-52512 bug fixed
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'b53cbb1fed9b463987e05ea83a18bb53c97e070f':
REPORT-52629 组件展示排序逻辑的保存
REPORT-52512 共享组件删除后删除对应的数据集
REPORT-52539 组件生成面板出现横向滚动条
4 years ago
方磊
cb474f5d12
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
4 years ago
superman
57149373c9
Merge pull request #4353 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '22494fd94318e97e6af85457988977192b4502fd':
4 years ago
superman
22494fd943
Merge pull request #4352 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8a854a4c926a4de61600df395d3f1dc2b16fe3d':
4 years ago
superman
d8a854a4c9
Merge pull request #4351 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f98a3b98c65e0a5c8d694fc0a462551f26a64017':
4 years ago
superman
f98a3b98c6
Merge pull request #4350 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'a8bd826258edb8f615964d8b2d544f254d2e687a':
4 years ago
kuangshuai
b53cbb1fed
REPORT-52629 组件展示排序逻辑的保存
4 years ago
kuangshuai
01f120587a
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
kuangshuai
b087607a94
REPORT-52512 共享组件删除后删除对应的数据集
4 years ago
superman
a8bd826258
Merge pull request #4346 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '31a8bae6f914c8741cfae5cfc271d5d255cf612b':
CHART-19344 取色器改为点击之后确定颜色
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
4 years ago
superman
a68a09210f
Merge pull request #4343 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1d2605f4ca4aa479059fda57330c46d21f9a310a':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
superman
1d2605f4ca
Merge pull request #4342 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '231fdee81be05af9e58cbff3e9007479933df134':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
superman
231fdee81b
Merge pull request #4341 in DESIGN/design from final/10.0 to release/10.0
...
* commit '31a8bae6f914c8741cfae5cfc271d5d255cf612b':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
Bjorn
d22df0ae3e
Pull request #4338 : CHART-19306 无穷值显示增加等于号 & 默认渐变色修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'cd40cde35e57e3f277dc213e211153f22d98ea98':
颜色修改
CHART-19306 默认渐变色修改
CHART-19306 公式增加等于号
4 years ago
kuangshuai
257fc30d21
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
kerry
b393edb639
Pull request #4339 : REPORT-52699 组件复用-合入主版本-feature主jar,一些第三方插件控件,右侧点击事件/移动端,显示的还是属性设置页面内容
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '678bff7a07c604a463ce484d2fb68b4d382587e2':
REPORT-52699 组件复用-合入主版本-feature主jar,一些第三方插件控件,右侧点击事件/移动端,显示的还是属性设置页面内容
4 years ago
白岳
cd40cde35e
颜色修改
4 years ago
白岳
1e7065f969
CHART-19306 默认渐变色修改
4 years ago
kerry
678bff7a07
REPORT-52699 组件复用-合入主版本-feature主jar,一些第三方插件控件,右侧点击事件/移动端,显示的还是属性设置页面内容
4 years ago
白岳
21f61d5e92
CHART-19306 公式增加等于号
4 years ago
kuangshuai
6409303f0f
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
kuangshuai
316caa1369
REPORT-52539 组件生成面板出现横向滚动条
4 years ago
Henry.Wang
efcca5d237
Pull request #4317 : REPORT-51992 设计器性能提升-缩略图占内存优化
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'ccdec5a203a4ae29f0d5038004fd5f8076a34eed':
REPORT-51992 设计器性能提升-缩略图占内存优化
REPORT-51992 设计器性能提升-缩略图占内存优化
REPORT-51992 设计器性能提升-缩略图占内存优化
4 years ago
Kara
31a8bae6f9
Pull request #4337 : CHART-19344 系列取色器改为点击之后确定颜色
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '298fab27bf729127d6669aea6d722342f1dd17b9':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
白岳
298fab27bf
CHART-19344 取色器改为点击之后确定颜色
4 years ago
方磊
41f218bea0
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
Bjorn
ebd8b8c6eb
Pull request #4316 : CHART-19306 仪表盘配色面板修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '46d77e489323f9f03c4e78e80f6df664603c35dc':
CHART-19306 仪表盘配色面板修改
4 years ago
Henry.Wang
ccdec5a203
REPORT-51992 设计器性能提升-缩略图占内存优化
4 years ago
Henry.Wang
a7cd43294e
REPORT-51992 设计器性能提升-缩略图占内存优化
4 years ago
kerry
28b02fd270
Pull request #4315 : REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '96b2f00fdaf01fb5d30313a2f976c73d5f39ca8b':
REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
4 years ago
白岳
46d77e4893
CHART-19306 仪表盘配色面板修改
4 years ago
kerry
96b2f00fda
REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
4 years ago
Henry.Wang
c69fefe8e7
REPORT-51992 设计器性能提升-缩略图占内存优化
4 years ago
superman
142c7ea2fa
Merge pull request #4311 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a25522c2a1b93e0b424e97611f3c836ec68c225d':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago