Yuan.Wang
48ddaa7af5
REPORT-56134js提交事件报错中添加定位信息
3 years ago
rinoux
6fa53eda15
REPORT-51472 平台开启的模版读不到状态的问题
3 years ago
Henry.Wang
db9751cd0a
Pull request #5360 : REPORT-56595 数据集预览时可复制-表头复制问题 && REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'bee3075e5f291f3436ad1d4e74ade0648b0dfa42':
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
REPORT-56595 数据集预览时可复制-表头复制问题
3 years ago
kerry
74a947c089
REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小,挤压绝对画布块,绝对画布块内组件会保持尺寸不变且超出绝对画布块;但开发者调试下,此场景,绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry
3 years ago
superman
905368a92d
Merge pull request #5361 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'f806d05ed37ed5b2ec770f82b17e9ebdd3a2af0b':
3 years ago
Henry.Wang
bee3075e5f
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
3 years ago
Henry.Wang
e88de2094c
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
3 years ago
Henry.Wang
6d81b5e4cd
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
3 years ago
Henry.Wang
05a3713694
REPORT-56595 数据集预览时可复制-表头复制问题
3 years ago
方磊
7a85d9cd65
REPORT-56906&REPORT-56926 修正一个笔误
3 years ago
方磊
31cf103296
REPORT-56906&REPORT-56926 自定义一个输入框,只支持输入整数
3 years ago
superman
01dad2d5ad
Merge pull request #5358 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1ea984b6782f0537665a440ed076f4758274497b':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
1e37eeafe5
Merge pull request #5357 in DESIGN/design from release/11.0 to feature/x
...
* commit '268378ee9b4443763224e69817d830981a79915b':
REPORT-56080 图表双击无法进入图表编辑页
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
superman
268378ee9b
Merge pull request #5356 in DESIGN/design from release/10.0 to release/11.0
...
* commit '2c90b13ecd4ef57c7cce2fbc58448464a3e564e6':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
1ea984b678
Merge pull request #5353 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ebb501cd16df3ad26ff3f4f7b3646f4b77544143':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
f806d05ed3
Merge pull request #5354 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'd416b56c93bac26b5b2f5b1f915fd384a2788839':
3 years ago
superman
ebb501cd16
Merge pull request #5352 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2c90b13ecd4ef57c7cce2fbc58448464a3e564e6':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
Henry.Wang
f23b7a1221
Pull request #5349 : REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '9cca8d76715af0da7c6e62f7d1df39573339b279':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
3 years ago
pengda
2c90b13ecd
Pull request #5331 : REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '80f29ea909e552c53e9d0a963f9de3f33d2001c5':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
Tommy
6258f8ad19
Pull request #5348 : REPORT-56080 图表双击无法进入图表编辑页
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '9d81243a4285b7158f86b8177a0de9494e4c1b2d':
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
Henry.Wang
9cca8d7671
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
3 years ago
kuangshuai
9d81243a42
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
ju|剧浩宇
1741f249ac
Pull request #5330 : REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '2836fd2074b04c1f7190207b7d1a940d978769a3':
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
superman
1ccee2cfec
Merge pull request #5347 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'e0b5574335e9cf8b3462f387b41177e01909e65e':
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
3 years ago
pengda
80f29ea909
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
pengda
fa9c285c7d
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
Hades
e0b5574335
Pull request #5321 : REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '7268eacb44028581cf038679880e834ad3f85a4d':
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
3 years ago
Henry.Wang
2836fd2074
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
Henry.Wang
238eed0bc2
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
Henry.Wang
b6b477c936
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
superman
61601b6ef1
Merge pull request #5329 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'fc749b3b82cdd3b98639b734545f395e595b6207':
CHART-20211 面板间距调整
REPORT-54891 【10.0.19】自定义导出按钮
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
REPORT-54885 布局优化 门槛用例没通过的bug
3 years ago
superman
1a70ac929f
Merge pull request #5328 in DESIGN/design from release/11.0 to feature/x
...
* commit '8ca70b6625eb2d773d3c0c491b1a4f6321e2fd65':
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
superman
8ca70b6625
Merge pull request #5327 in DESIGN/design from release/10.0 to release/11.0
...
* commit '8ad2cf003ebb827d1a9460506edc316aa726aed8':
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
superman
fc749b3b82
Merge pull request #5325 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '0574e59ead8e606fd987d601977c592f5225a6dc':
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
superman
0574e59ead
Merge pull request #5324 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8ad2cf003ebb827d1a9460506edc316aa726aed8':
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
Bruce.Deng
fa0b5ec9c1
Pull request #5319 : REPORT-54891 【10.0.19】自定义导出按钮
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '70e34d8da4e81435e3b36815663a87fa57377e87':
REPORT-54891 【10.0.19】自定义导出按钮
3 years ago
hades
7268eacb44
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix
3 years ago
Bjorn
db3e798959
Pull request #5320 : CHART-20211 面板间距调整
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'e40b2d1c1fa5a9aefdeb301e8fcc0d546127451e':
CHART-20211 面板间距调整
3 years ago
hades
182b9164dc
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
3 years ago
Lanlan
8ad2cf003e
Pull request #5318 : REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '5aba0add282213bf04605444c61dde26f1fb53e8':
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
白岳
e40b2d1c1f
CHART-20211 面板间距调整
3 years ago
fanglei
fe4de4fe4f
Pull request #5317 : REPORT-54885 布局优化 门槛用例没通过的bug
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '02494a4e595c61d92e3336e85e4c58fe16b6f975':
REPORT-54885 布局优化 门槛用例没通过的bug
3 years ago
Bruce.Deng
70e34d8da4
REPORT-54891 【10.0.19】自定义导出按钮
3 years ago
Lanlan
5aba0add28
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
3 years ago
Lanlan
6c28ceb128
REPORT-54640 - 【10.0.19】设计器埋点重构剥离二期
3 years ago
方磊
02494a4e59
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/10.0
...
* 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0: (37 commits)
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix 单元测试
无jira 解决冲突 错误提交回退
无jira 解决冲突 错误提交回退
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到
REPORT-56080 图表双击无法进入图表编辑页
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
CHART-18786 feat:表格组件
解决冲突
无jira 解决冲突 update
feat:其他组合图不需要类型界面,自定义组合图需要
refactor:plugin use 10.0 not compatible xxx copy from 10.0 code
feat:类型和特性面板如果没有其他设置项 则拿掉
merge
merge:REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
merge:REPORT-51958 远程环境检测及同步
merge:REPORT-53626 设计器启动异常
merge:REPORT-53229 补上空格
...
3 years ago
方磊
4fbcdc4c84
REPORT-54885 布局优化 门槛用例没通过的bug
3 years ago
superman
2821612f9e
Merge pull request #5316 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'b16be7bef1ba1539f2c6eb1f28fe49864db97b9e':
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix 单元测试
无jira 解决冲突 错误提交回退
无jira 解决冲突 错误提交回退
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
3 years ago
superman
986959d25c
Merge pull request #5315 in DESIGN/design from release/11.0 to feature/x
...
* commit 'fa75ab2fd984a5cf78d7a8fc53895310f7cb4d49':
REPORT-56263 新建其它数据集失败的问题
REPORT-56601 新增存储过程时,没有刷新树结构
3 years ago
rinoux
fa75ab2fd9
Pull request #5308 : REPORT-56263 新建其它数据集失败的问题
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'bffaec522a43048a6a3c72bf4056b99b83fd0d8c':
REPORT-56263 新建其它数据集失败的问题
3 years ago