superman
be11edc537
Merge pull request #4657 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '59e44c1a3063fc27026374b049027deb2f82cd43':
fix
REPORT-53875 新增组件库弹框
3 years ago
Henry.Wang
c9569afa24
Pull request #4653 : KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'd240aba665366092c3872e986ef409b81c755da0':
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
pengda
cfcdb21c80
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
3 years ago
pengda
1d66687554
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
pengda
6072f19b3c
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
3 years ago
Lanlan
59e44c1a30
Pull request #4652 : REPORT-53875 新增组件库弹框
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '4aec5671a5b0edda1327a52f18f1cc7a9372d891':
fix
REPORT-53875 新增组件库弹框
3 years ago
Henry.Wang
d240aba665
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
Henry.Wang
d2a0736412
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
Henry.Wang
0c510a7dae
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
Henry.Wang
8fc5323b5d
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
Lanlan
4aec5671a5
fix
3 years ago
Lanlan
4099898e83
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
3 years ago
Lanlan
672d03266e
REPORT-53875 新增组件库弹框
3 years ago
superman
f8ce993d8c
Merge pull request #4651 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1af2cc0805bc96e5a3d6fb5790b6fa2dcd79b20c':
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
superman
74530909ca
Merge pull request #4650 in DESIGN/design from feature/10.0 to feature/x
...
* commit '1af2cc0805bc96e5a3d6fb5790b6fa2dcd79b20c':
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
superman
1af2cc0805
Merge pull request #4648 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '49323541f1fc264e75bfa75fb44cf8deeac22a8b':
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
superman
49323541f1
Merge pull request #4647 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c4d41b7382e8c2ec1e5d68ed506f4cef1a11a27e':
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
Henry.Wang
4a9c49662f
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
3 years ago
Henry.Wang
631dbe4893
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
3 years ago
Bjorn
c4d41b7382
Pull request #4644 : CHART-19556 富文本轻量级加载,使用完之后销毁
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '60cda6075f3d96ace5d5c6e04679d7db81a6cb56':
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
白岳
60cda6075f
CHART-19556 富文本轻量级加载,使用完之后销毁
3 years ago
superman
8bd12968f0
Merge pull request #4643 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '005054b97bd513ba6f3214f66bd0679fe85778f2': (148 commits)
REPORT-53711 设计器用户登录策略调整-插件无法安装
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
REPORT-51958 远程环境检测及同步
增加对验证码长度的校验
修复引导页面无法关闭的问题
fix
CHART-19525 富文本编辑框设置为可调整
修改延迟时间
REPORT-51360 设计器消息提醒
REPORT-53706 关闭按钮样式调整
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
REPORT-53591 远程环境检测及同步-插件名称提示有误
REPORT-53785 切换工作目录后更新本地组件库
REPORT-53772 【智能联动】组件名/数据集名替换时,拖入失败时重新再拖入成功 有几率造成多次替换
登录面板颜色切换
REPORT-53710 设计器处于未登录状态,切换至远程设计变为登录状态
...
3 years ago
superman
005054b97b
Merge pull request #4642 in DESIGN/design from feature/10.0 to bugfix/10.0
...
* commit 'c1cbd7844fa3b6a04fa2cf0c7bffea0e7423fb30': (147 commits)
REPORT-53711 设计器用户登录策略调整-插件无法安装
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
REPORT-51958 远程环境检测及同步
增加对验证码长度的校验
修复引导页面无法关闭的问题
fix
CHART-19525 富文本编辑框设置为可调整
修改延迟时间
REPORT-51360 设计器消息提醒
REPORT-53706 关闭按钮样式调整
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
REPORT-53591 远程环境检测及同步-插件名称提示有误
REPORT-53785 切换工作目录后更新本地组件库
REPORT-53772 【智能联动】组件名/数据集名替换时,拖入失败时重新再拖入成功 有几率造成多次替换
登录面板颜色切换
REPORT-53710 设计器处于未登录状态,切换至远程设计变为登录状态
视觉修改
...
3 years ago
superman
f57491068a
Merge pull request #4627 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'c1cbd7844fa3b6a04fa2cf0c7bffea0e7423fb30':
REPORT-53711 设计器用户登录策略调整-插件无法安装
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
增加对验证码长度的校验
修复引导页面无法关闭的问题
3 years ago
superman
e52769edc4
Merge pull request #4626 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'c1cbd7844fa3b6a04fa2cf0c7bffea0e7423fb30':
REPORT-53711 设计器用户登录策略调整-插件无法安装
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
REPORT-51958 远程环境检测及同步
增加对验证码长度的校验
修复引导页面无法关闭的问题
3 years ago
Lanlan
c1cbd7844f
Pull request #4601 : REPORT-53691 & REPORT-53706 & REPORT-53711
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit 'fedbde7969cb301d2444b6ca7d0414ce6021bd1e':
REPORT-53711 设计器用户登录策略调整-插件无法安装
增加对验证码长度的校验
修复引导页面无法关闭的问题
3 years ago
kerry
2b010bf898
Pull request #4600 : REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '38a1d8229a8e8ca70fbcdfe73cc44289d3870d91':
REPORT-53787 && REPORT-53786【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
3 years ago
pengda
e6b9a51c26
Pull request #4599 : REPORT-51958 远程环境检测及同步
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '2dfe3b125bb07fe48bdab083a5012b17547e6730':
REPORT-51958 远程环境检测及同步
3 years ago
superman
1939a6cdc9
Merge pull request #4608 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'a403f09e6b5794786ed55947f1d3134025c39f41':
REPORT-53821 driver加上trim函数
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
3 years ago
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
22c35b2b1f
Merge pull request #4607 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'a403f09e6b5794786ed55947f1d3134025c39f41':
fix
CHART-19525 富文本编辑框设置为可调整
修改延迟时间
REPORT-51360 设计器消息提醒
REPORT-53706 关闭按钮样式调整
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-53806【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
REPORT-53821 driver加上trim函数
REPORT-52871 聚合报表部分内容不显示,点击之后才可显示完全
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