superman
13cee64014
Merge pull request #4675 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5450dc3942f2c360421681ad81702954012eeb96':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
5450dc3942
Merge pull request #4674 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f3beaeca3620319f3341dfea2695ca24b27d3faf':
4 years ago
superman
f3beaeca36
Merge pull request #4673 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9b66502b580edb42f7169753f3b8b4d036b008aa':
4 years ago
Lanlan
a1f2b4ea39
Pull request #4670 : REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit '931e02c8513e52b4357ae4199f349d053b5f1be9':
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
4 years ago
superman
9b66502b58
Merge pull request #4672 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '4476bed0b47f3219b853f3e5a77c7b1c2b1cb52d':
4 years ago
superman
4d37a65605
Merge pull request #4671 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '156b0b9f239b8103367f1b8d3c3bed71ca26c75c':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
Hades
6be1e11709
Pull request #4662 : REPORT-53775 条件属性弹窗概率性 关闭不了
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '13542e7d680cf099a6602ade7166df987359a55e':
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
Lanlan
931e02c851
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
4 years ago
Lanlan
43d83202ed
REPORT-53625 设计器用户登录策略调整-登录触发页面显示不全
4 years ago
superman
156b0b9f23
Merge pull request #4667 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bd2cdbb7544446dc4995773a69b76bccd5e0b89c':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
superman
bd2cdbb754
Merge pull request #4666 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8f2675506b87671e5a5554eb033786db8f2c92d':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
kerry
d8f2675506
Pull request #4663 : REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '52663464441fc47d316c7fd58cddf94584b7d3e2':
代码修改
代码修改
增加username参数
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
4 years ago
kerry
5266346444
代码修改
4 years ago
kerry
cc792aae6b
代码修改
4 years ago
kerry
2bd3625d69
增加username参数
4 years ago
kerry
ddcfd7cea6
REPORT-53647【组件复用涉及到登录相关功能】设计器本身是没有登录的,换成最新的nightly后,打开设计器后无论是否登录,下载在线组件都会提示失败@lanla
4 years ago
pengda
ef254e4c3b
Pull request #4654 : REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'cfcdb21c80a56e457eb4ebf1bbb6b7ec538f5cc1':
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
hades
13542e7d68
REPORT-53775 条件属性弹窗概率性 关闭不了
4 years ago
superman
2c3625d933
Merge pull request #4661 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8863345a0778d44e7d601c37d59dc51bfe818f8a':
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
fix
REPORT-53875 新增组件库弹框
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
superman
8863345a07
Merge pull request #4658 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'be11edc537ba44e7f6fdf4ad1a7ec8bd709c16e2':
fix
REPORT-53875 新增组件库弹框
4 years ago
superman
be11edc537
Merge pull request #4657 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '59e44c1a3063fc27026374b049027deb2f82cd43':
fix
REPORT-53875 新增组件库弹框
4 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 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
pengda
cfcdb21c80
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 years ago
pengda
1d66687554
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
pengda
6072f19b3c
REPORT-53873 设计器用户登录策略调整-消息提醒-消息提醒框弹出位置
4 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 新增组件库弹框
4 years ago
Henry.Wang
d240aba665
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Henry.Wang
d2a0736412
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Henry.Wang
0c510a7dae
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Henry.Wang
8fc5323b5d
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 years ago
Lanlan
4aec5671a5
fix
4 years ago
Lanlan
4099898e83
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
4 years ago
Lanlan
672d03266e
REPORT-53875 新增组件库弹框
4 years ago
superman
f8ce993d8c
Merge pull request #4651 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1af2cc0805bc96e5a3d6fb5790b6fa2dcd79b20c':
CHART-19556 富文本轻量级加载,使用完之后销毁
4 years ago
superman
1af2cc0805
Merge pull request #4648 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '49323541f1fc264e75bfa75fb44cf8deeac22a8b':
CHART-19556 富文本轻量级加载,使用完之后销毁
4 years ago
superman
49323541f1
Merge pull request #4647 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c4d41b7382e8c2ec1e5d68ed506f4cef1a11a27e':
CHART-19556 富文本轻量级加载,使用完之后销毁
4 years ago
Henry.Wang
4a9c49662f
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
631dbe4893
KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存
4 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 富文本轻量级加载,使用完之后销毁
4 years ago
白岳
60cda6075f
CHART-19556 富文本轻量级加载,使用完之后销毁
4 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 设计器处于未登录状态,切换至远程设计变为登录状态
...
4 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 设计器处于未登录状态,切换至远程设计变为登录状态
视觉修改
...
4 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【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
增加对验证码长度的校验
修复引导页面无法关闭的问题
4 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 设计器用户登录策略调整-插件无法安装
增加对验证码长度的校验
修复引导页面无法关闭的问题
4 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【第二批问题】组件复用-合入主版本-新手引导图,和视觉图有一些不符合的地方
4 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 远程环境检测及同步
4 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 聚合报表部分内容不显示,点击之后才可显示完全
4 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【组件复用】组件生成时,数据集查询的数据集变成了内置数据集,而不是保留查询
4 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
4 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 聚合报表部分内容不显示,点击之后才可显示完全
4 years ago