ju|剧浩宇
daa50294bf
Pull request #4609 : 无jira任务,合代码冲突
...
Merge in DESIGN/design from ~PENGDA/design:feature/big-screen to feature/big-screen
* commit '8426be5860d117972f2d128198d8b94bde88bb34':
REPORT-51958 远程环境检测及同步
fix
CHART-19525 富文本编辑框设置为可调整
修改延迟时间
REPORT-51360 设计器消息提醒
REPORT-53706 关闭按钮样式调整
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
3 years ago
pengda
8426be5860
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~pengda/design into feature/big-screen
...
Conflicts:
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
3 years ago
superman
a403f09e6b
Merge pull request #4605 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '121acadfe851c7c4dc0935887ab8624313792660':
REPORT-53821 driver加上trim函数
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
3 years ago
superman
121acadfe8
Merge pull request #4604 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'a9d4d4632e6cf25ff4eb0cfeb18096f969ef4789':
REPORT-53821 driver加上trim函数
3 years ago
Lanlan
fedbde7969
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into feature/10.0
3 years ago
Lanlan
733b388cfc
REPORT-53711 设计器用户登录策略调整-插件无法安装
3 years ago
kerry
38a1d8229a
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
3 years ago
pengda
2dfe3b125b
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
pengda
a9e769c863
REPORT-51958 远程环境检测及同步
3 years ago
Lanlan
c64f389214
增加对验证码长度的校验
3 years ago
Lanlan
c1e38fc23c
修复引导页面无法关闭的问题
3 years ago
Bjorn
8f1bfbedf1
Pull request #4597 : CHART-19525 富文本编辑框设置为可调整
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'cbe011be6b71f3353c73caeddcbd41e8387989ef':
CHART-19525 富文本编辑框设置为可调整
3 years ago
Lanlan
8bf55b1952
Pull request #4598 : REPORT-51360 设计器消息提醒 & REPORT-53706 关闭按钮样式调整
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit '1af829055b777332899b50bb164f37a4972b81f9':
fix
修改延迟时间
REPORT-51360 设计器消息提醒
REPORT-53706 关闭按钮样式调整
3 years ago
Lanlan
1af829055b
fix
3 years ago
白岳
cbe011be6b
CHART-19525 富文本编辑框设置为可调整
3 years ago
Hades
7f556d13bd
Pull request #4565 : REPORT-52871 聚合报表部分内容不显示
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '09f268e4b58cc36a5530c125492ccdf9fa2f0c8c':
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
3 years ago
pengda
2769d09518
Pull request #4568 : REPORT-51958 远程环境检测及同步
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '6be9984128b0a373c6c4331c4a098d5d9ddf3e9d':
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
3 years ago
kerry
fbbd2ca3d5
Pull request #4567 : REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'aa59c0a9bc6883c8b48b858dad55f211eaa982a1':
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
3 years ago
Xiqiu
a9d4d4632e
Pull request #4566 : REPORT-53821 driver加上trim函数
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit '8968df6b347121d8ec67ad9d32fd5bdb102de919':
REPORT-53821 driver加上trim函数
3 years ago
Lanlan
48e762113c
修改延迟时间
3 years ago
Lanlan
f15e9df331
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into feature/10.0
3 years ago
Lanlan
e875233546
REPORT-51360 设计器消息提醒
3 years ago
Lanlan
a320657685
REPORT-53706 关闭按钮样式调整
3 years ago
pengda
6be9984128
REPORT-51958 远程环境检测及同步
3 years ago
superman
5bd3b04cca
Merge pull request #4575 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '0b04ec774d4cb3688d03aaf4afa7c24480664608':
REPORT-53591 远程环境检测及同步-插件名称提示有误
REPORT-53785 切换工作目录后更新本地组件库
REPORT-53772 【智能联动】组件名/数据集名替换时,拖入失败时重新再拖入成功 有几率造成多次替换
登录面板颜色切换
REPORT-53710 设计器处于未登录状态,切换至远程设计变为登录状态
REPORT-53651 & REPORT-53591 & REPORT-53610 插件检测结果展示和重启
REPORT-53651 & REPORT-53591 & REPORT-53610 插件检测结果展示和重启
REPORT-53714 海外版本访问社区时不提示登录
fix
REPORT-53689 点击私人消息/社区,跳转的不是当前设计器登录账号
REPORT-51360 提供国际化翻译内容
如果存在更新升级的弹窗,则不显示引导页面
REPORT-53714 海外版本不显示引导页面
3 years ago
superman
0b04ec774d
Merge pull request #4572 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '3a117df6d26e27e5e6471569d81c128697943a02':
3 years ago
superman
3a117df6d2
Merge pull request #4571 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e82794e5eb42e085470dabfde3a14d72bf4acbb3':
3 years ago
superman
e82794e5eb
Merge pull request #4570 in DESIGN/design from final/10.0 to release/10.0
...
* commit '4476bed0b47f3219b853f3e5a77c7b1c2b1cb52d':
3 years ago
superman
4476bed0b4
Merge pull request #4569 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '6be1605c28ed5f3ce55c77f79bcf122dfde082b6':
3 years ago
pengda
c5aae7b9e0
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
pengda
993b9c20c8
REPORT-51958 远程环境检测及同步
3 years ago
pengda
7d5d567597
REPORT-51958 远程环境检测及同步
3 years ago
kerry
aa59c0a9bc
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
3 years ago
xiqiu
8968df6b34
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
xiqiu
fd16e0c71f
REPORT-53821 driver加上trim函数
3 years ago
hades
09f268e4b5
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
3 years ago
superman
6be1605c28
Merge pull request #4564 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'a4ad653393c7ad1821aa3aa0940d609c275f2a03':
3 years ago
pengda
62d90b2948
Pull request #4563 : REPORT-53591 远程环境检测及同步-插件名称提示有误
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '6839bfc7416980bf950511db227969ab621691f9':
REPORT-53591 远程环境检测及同步-插件名称提示有误
3 years ago
Tommy
e46e8b4cdd
Pull request #4562 : REPORT-53785 切换工作目录后更新本地组件库
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '98ec52e68b161f1039549484cb1bd45612b5f700':
REPORT-53785 切换工作目录后更新本地组件库
3 years ago
Lanlan
743aae4a23
Pull request #4561 : REPORT-53714 & REPORT-51360 & REPORT-53689 & REPORT-53714 & REPORT-53710
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit '53cef1d491176d1028c628ecd139ed2ffa1f8870':
登录面板颜色切换
REPORT-53710 设计器处于未登录状态,切换至远程设计变为登录状态
REPORT-53714 海外版本访问社区时不提示登录
fix
REPORT-53689 点击私人消息/社区,跳转的不是当前设计器登录账号
REPORT-51360 提供国际化翻译内容
如果存在更新升级的弹窗,则不显示引导页面
REPORT-53714 海外版本不显示引导页面
3 years ago
pengda
6839bfc741
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
pengda
a867ed903a
REPORT-53591 远程环境检测及同步-插件名称提示有误
3 years ago
kuangshuai
98ec52e68b
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
kuangshuai
fc96c6bb71
REPORT-53785 切换工作目录后更新本地组件库
3 years ago
Hades
4d2a09294b
Pull request #4552 : REPORT-53772 【智能联动】组件名/数据集名替换时,拖入失败时重新再拖入成功 有几率造成多次替换
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '814b4636f532418f308bd4a3cd35f89e2499f18d':
REPORT-53772 【智能联动】组件名/数据集名替换时,拖入失败时重新再拖入成功 有几率造成多次替换
3 years ago
pengda
c58bab2933
Pull request #4550 : REPORT-53651 & REPORT-53591 & REPORT-53610 插件检测结果展示和重启
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit 'bc4e274d32f733b6e1b9ea6a6c75fdb834ce8258':
REPORT-53651 & REPORT-53591 & REPORT-53610 插件检测结果展示和重启
REPORT-53651 & REPORT-53591 & REPORT-53610 插件检测结果展示和重启
3 years ago
superman
0ad0684931
Merge pull request #4560 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'ddee70ccda9ccd7eda98d8ee0bef5ae1efcba8d6':
视觉修改
REPORT-52936 saveWorker去掉对模板id的依赖
REPORT-53734 【智能联动】组件名/数据集名替换时,发现替换多次
REPORT-53739 提供单按钮ui
REPORT-53731 关闭窗口触发doCancel事件
KERNEL-7934 win10富文本的jxbrowser组件使用LIGHTWEIGHT渲染
fix
REPORT-53651 远程环境检测及同步-插件同步成功后,设计器没自动重启
REPORT-53644 点击忘记密码,会弹出设计器bin文件夹所在目录
REPORT-52526 【来源于迭代任务】【V2.1.0】设计器数据集查询界面增加复制传参后sql的功能
3 years ago
superman
ddee70ccda
Merge pull request #4557 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1bed23587bc19110c2102e8ede9b70be22942ff6':
3 years ago
superman
1bed23587b
Merge pull request #4556 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c87390a37a284c965bd115f8613aa765fb81abf9':
3 years ago
superman
c87390a37a
Merge pull request #4555 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'a4ad653393c7ad1821aa3aa0940d609c275f2a03':
3 years ago