hades
f62f46b7b4
REPORT-51683 【10.0.17】智能联动被修改位置
4 years ago
Henry.Wang
f7edb51b99
Pull request #4419 : 冲突解决
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit 'fdaa57c50b6aaeb10e656018ead45c95109bb533':
REPORT-52942 处理插件提到公共模块稍后展示
REPORT-51678 事件配置项支持重命名
REPORT-52928 部分埋点没有记录
REPORT-52895 部分埋点没有记录
REPORT-52818 图表块点击快捷配置触发了编辑效果
REPORT-52816 编辑框对齐
REPORT-52819 加密组件加载相关逻辑补充
4 years ago
Henry.Wang
fdaa57c50b
紧急冲突
4 years ago
kuangshuai
450e42db74
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
kuangshuai
cd09065f92
REPORT-51678 移植加密组件剪切复制粘贴的逻辑
4 years ago
Tommy
ef88c54c25
Pull request #4403 : REPORT-52819 REPORT-52816 REPORT-52818 REPORT-5289 REPORT-51678 bug fixed
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '61c6ac4fb10d7a26375c5a75cc9bdb31fb4cb107':
REPORT-51678 事件配置项支持重命名
REPORT-52928 部分埋点没有记录
REPORT-52895 部分埋点没有记录
REPORT-52818 图表块点击快捷配置触发了编辑效果
REPORT-52816 编辑框对齐
REPORT-52819 加密组件加载相关逻辑补充
4 years ago
vito
af6f2cd118
Pull request #4404 : REPORT-52942 处理插件提到公共模块稍后展示
...
Merge in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit '6f0afeacd5668f4e49d82ef405428bc80b877b9d':
REPORT-52942 处理插件提到公共模块稍后展示
4 years ago
superman
426029f102
Merge pull request #4410 in DESIGN/design from feature/10.0 to feature/x
...
* commit '5ee22d8a80affe469d200a8e41313b464f88d9ca':
REPORT-51361 实际执行另存时才产生新的模板id
4 years ago
vito
6f0afeacd5
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~vito/c-design into feature/10.0
4 years ago
vito
fd68321053
REPORT-52942 处理插件提到公共模块稍后展示
4 years ago
kuangshuai
61c6ac4fb1
REPORT-51678 事件配置项支持重命名
4 years ago
kuangshuai
b5f3394fa7
REPORT-52928 部分埋点没有记录
4 years ago
kuangshuai
8169f88c6c
REPORT-52895 部分埋点没有记录
4 years ago
kuangshuai
d6275bf94d
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
yaoh.wu
5ee22d8a80
Pull request #4394 : REPORT-51361 实际执行另存时才产生新的模板id
...
Merge in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '84fc8a1cd314eb6fbedc2f98ce5ad681ffb1d770':
REPORT-51361 实际执行另存时才产生新的模板id
4 years ago
superman
073f6e6428
Merge pull request #4400 in DESIGN/design from feature/10.0 to feature/x
...
* commit '87dd56cc0bef8a610d395cecbfe098035fd5d3fb':
REPORT-51361 设计器模板维度表移至云端运维插件
4 years ago
yaohwu
84fc8a1cd3
REPORT-51361 实际执行另存时才产生新的模板id
4 years ago
yaoh.wu
87dd56cc0b
Pull request #4393 : REPORT-51361 设计器模板维度表移至云端运维插件
...
Merge in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '7c14f0e2eede5aa75f525cb0bce0e6fc4934c0f7':
REPORT-51361 设计器模板维度表移至云端运维插件
4 years ago
kuangshuai
e6bcb5a99a
REPORT-52818 图表块点击快捷配置触发了编辑效果
4 years ago
kuangshuai
bb828b6e08
REPORT-52816 编辑框对齐
4 years ago
kuangshuai
5c7946b0f6
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
4 years ago
kuangshuai
25293200a5
REPORT-52819 加密组件加载相关逻辑补充
4 years ago
yaohwu
7c14f0e2ee
REPORT-51361 设计器模板维度表移至云端运维插件
4 years ago
superman
d975306490
Merge pull request #4391 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'ac67f3a096d451b56ff44061329aec31fe76651e':
REPORT-51962【10.0.17】错误信息优化之模板缺失插件异常提示优化
4 years ago
vito
ac67f3a096
Pull request #4377 : REPORT-51962【10.0.17】错误信息优化之模板缺失插件异常提示优化
...
Merge in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'da041999be00618c333c724b4685281d6c3c58e8':
REPORT-51962【10.0.17】错误信息优化之模板缺失插件异常提示优化
4 years ago
superman
fe9d99af76
Merge pull request #4383 in DESIGN/design from feature/10.0 to feature/x
...
* commit '198da96ae11d36c6f7b30c2d5c1a3e4fc5d3703b':
REPORT-51678 交互调整
4 years ago
kerry
198da96ae1
Pull request #4370 : REPORT-51678 交互调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'a8583b97c78b1ac4763f8c49477ed8fecf7e9015':
REPORT-51678 交互调整
4 years ago
vito
da041999be
REPORT-51962【10.0.17】错误信息优化之模板缺失插件异常提示优化
4 years ago
superman
c9d2127e6f
Merge pull request #4376 in DESIGN/design from feature/10.0 to feature/x
...
* commit '6093fa0f2df616827e1dc75b37129a8de77a10f9':
CHART-18965 自定义html框优化
REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
4 years ago
superman
6093fa0f2d
Merge pull request #4374 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bc33528072b78304f34624d9a1cb220a2f5b8731':
4 years ago
superman
bc33528072
Merge pull request #4373 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5fda617ccc5a8b5f664bb4666074676245933ae0':
4 years ago
superman
5fda617ccc
Merge pull request #4372 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3bc49807b18e15d2778e10e9ccf400e73ce2e554':
4 years ago
superman
3bc49807b1
Merge pull request #4371 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'c7dd50049a7ef769819a15f3d23336ee7ab1146a':
4 years ago
kerry
a8583b97c7
REPORT-51678 交互调整
4 years ago
Bjorn
9893b4430f
Pull request #4369 : CHART-18965 自定义html框优化
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'ab113ab438b6b8044e81416d7d292e5d7c608225':
CHART-18965 自定义html框优化
4 years ago
白岳
ab113ab438
CHART-18965 自定义html框优化
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
kerry
8efb51bcdd
REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时,点击提示的组件复用蓝字,弹出新手引导,关闭引导后,弹出了已合入主版本的提示; 组件复用-合入主版本-鼠标悬浮工具栏套用组件时,tooltip显示“套用组件”,交互文档以及和交互确认了下,应该是“复用组件”
4 years ago
superman
c7dd50049a
Merge pull request #4364 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '1158743e95afea781b9ce2aed2c8772f87bc217a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
superman
ab77e0de52
Merge pull request #4362 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'e789462075380e6987e0375b11ea49efd7da7c13':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52629 组件展示排序逻辑的保存
REPORT-52512 共享组件删除后删除对应的数据集
REPORT-52539 组件生成面板出现横向滚动条
REPORT-52264 模版权限编辑警告弹窗不在页面中间
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
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
32018213ff
Merge pull request #4355 in DESIGN/design from feature/10.0 to feature/x
...
* commit '57149373c97532b94f77742ebfb3cedf2a44f679':
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