Lanlan
b2df27010f
REPORT-53714 海外版本不显示引导页面
4 years ago
669ad6eebe
REPORT-53731 关闭窗口触发doCancel事件
4 years ago
Bjorn
43c59eb56d
Pull request #4547 : KERNEL-7934 win10富文本的jxbrowser组件使用LIGHTWEIGHT渲染
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'a119a7b16e6a5e712c2f9331d42f1d6a01cd3c64':
KERNEL-7934 win10富文本的jxbrowser组件使用LIGHTWEIGHT渲染
4 years ago
Lanlan
d81ac0ca5a
Pull request #4546 : REPORT-53644 点击忘记密码，会弹出设计器bin文件夹所在目录
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit '3c86ba1aeb5ea4ac373d40574621de96ae9cdc69':
fix
REPORT-53644 点击忘记密码，会弹出设计器bin文件夹所在目录
4 years ago
Bruce.Deng
d98f8817f6
Pull request #4539 : REPORT-52526 【来源于迭代任务】【V2.1.0】设计器数据集查询界面增加复制传参后sql的功能
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit 'b5c89e6c6e3ba78e2e5d36ef3e4bb27589ddf0f3':
REPORT-52526 【来源于迭代任务】【V2.1.0】设计器数据集查询界面增加复制传参后sql的功能
4 years ago
a119a7b16e
KERNEL-7934 win10富文本的jxbrowser组件使用LIGHTWEIGHT渲染
4 years ago
c49647f9bf
Pull request #4545 : REPORT-53651 远程环境检测及同步-插件同步成功后，设计器没自动重启
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit 'f821b43e184ee38f28b371f936ccf3e7cedcc5a5':
REPORT-53651 远程环境检测及同步-插件同步成功后，设计器没自动重启
4 years ago
Lanlan
3c86ba1aeb
fix
4 years ago
f821b43e18
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
24f4a68eca
REPORT-53651 远程环境检测及同步-插件同步成功后，设计器没自动重启
4 years ago
Lanlan
7b067cc1e8
REPORT-53644 点击忘记密码，会弹出设计器bin文件夹所在目录
4 years ago
2618dc8cdc
Pull request #4544 : 无jira任务， feature/10.0 合 feature/big-screen
...
Merge in DESIGN/design from ~LANLAN/design:feature/big-screen to feature/big-screen
* commit '6c88a697ca6a55417ff55cce9882fe81a650c873':
KERNEL-7634 gradle 依赖问题
REPORT-53695 设计器在未激活情况下弹出登录引导页面
REPORT-53626 设计器启动异常
REPORT-53674 已登录工程升级到最新版本jar后仍会有登录提醒
登录面板不显示
4 years ago
Lanlan
6c88a697ca
Merge branch 'feature/10.0' into feature/big-screen
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
4 years ago
34c4367a0b
Merge pull request #4540 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'e550094e84048dc6d215bcd29cc9e3a366094cba':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
REPORT-52933 [阻止]修改log导出配置目录后，log一直为空
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-49014 update 修改下国际化key
REPORT-49014 连接同一个远程环境，同时双击打开同一个模板 一人正常打开 一人打开空白
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
代码修改
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
REPORT-51830 tab里报表块设置图片背景，复制粘贴得到的tab里的报表块预览时没有背景了，设计器里看是有图片背景的。0228也有此现象。
REPORT-51188 决策报表的tab块，在绝对布局下拖拽存在缩小问题
4 years ago
38a6d99d60
Pull request #4526 : CHART-18787 design 编辑器.图表配置界面
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen
* commit '65d5e8179b44118b44a52a4569168d38625b4e02':
api level
feat:编辑器模式 没有单元格数据源 图表切换 监控刷新等配置项
4 years ago
Lanlan
c25daaf9f1
Pull request #4537 : REPORT-53674 & REPORT-53626 & REPORT-53695 & REPORT-53690 & REPORT-53643
...
Merge in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit 'cc248cde658c5c499bab741320d5c90ece72d935':
REPORT-53695 设计器在未激活情况下弹出登录引导页面
REPORT-53626 设计器启动异常
REPORT-53674 已登录工程升级到最新版本jar后仍会有登录提醒
登录面板不显示
4 years ago
Hades
61bb09f445
Pull request #4538 : KERNEL-7634 gradle 依赖问题
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'cc810db9c443b7ef254a22fe3ece78daa34c00cd':
KERNEL-7634 gradle 依赖问题
4 years ago
Bruce.Deng
b5c89e6c6e
REPORT-52526 【来源于迭代任务】【V2.1.0】设计器数据集查询界面增加复制传参后sql的功能
4 years ago
cc810db9c4
KERNEL-7634 gradle 依赖问题
4 years ago
Lanlan
cc248cde65
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into feature/10.0
4 years ago
Lanlan
3657f1ddeb
REPORT-53695 设计器在未激活情况下弹出登录引导页面
4 years ago
Lanlan
7df9d4fc59
REPORT-53626 设计器启动异常
4 years ago
Lanlan
3741ff06fb
REPORT-53674 已登录工程升级到最新版本jar后仍会有登录提醒
4 years ago
b5e853bffb
Merge pull request #4524 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'c552274b1e840e97ff3f4bfac6d54cfa17df4a1c':
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-53157 值一样 对象地址不一样的对象同样需要被返回处理
4 years ago
21d79b1fb3
Pull request #4531 : 无jira任务， feature/10.0 合 feature/big-screen
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/big-screen to feature/big-screen
* commit 'a36395a2efd63078afe474eba56613c14323f001': (21 commits)
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53592 扩展图表创建共享组件npe问题
REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-52539 window上生成面板出现了滚动条
REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
REPORT-53135 漏交
REPORT-53135 【智能联动】组件生成时，没有新增文案
视觉调整
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
REPORT-53592 扩展图表创建共享组件npe问题
REPORT-53365 && REPORT-53310 交互修改
KERNEL-7634 依赖问题
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误
REPORT-53229 补上空格
REPORT-53240 加密组件在服务器上预览不显示
...
4 years ago
Bruce.Deng
c552274b1e
Pull request #4530 : REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit 'ced078dd55fc39af2c7ae8dc5c99e90fb5049280':
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
4 years ago
Lanlan
baff606c1a
登录面板不显示
4 years ago
061c573c3c
Pull request #4532 : REPORT-51958 远程环境检测及同步
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '8d31a5a6f2d5d0af53ae8276a0c29fdabedc7631':
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
REPORT-51958 远程环境检测及同步
4 years ago
Hades
1c9ff48f1e
Pull request #4528 : REPORT-53157 值一样 对象地址不一样的对象同样需要被返回处理
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '8f71836add656fbdd589ae998b6223a049506f6f':
REPORT-53157 值一样 对象地址不一样的对象同样需要被返回处理
4 years ago
8d31a5a6f2
REPORT-51958 远程环境检测及同步
4 years ago
616dea871c
REPORT-51958 远程环境检测及同步
4 years ago
3cd82a1ec0
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
725b0c9739
REPORT-51958 远程环境检测及同步
4 years ago
6782a52e02
REPORT-51958 远程环境检测及同步
4 years ago
a36395a2ef
Merge branch 'feature/10.0' into feature/big-screen
...
* feature/10.0: (21 commits)
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53592 扩展图表创建共享组件npe问题
REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-52539 window上生成面板出现了滚动条
REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
REPORT-53135 漏交
REPORT-53135 【智能联动】组件生成时，没有新增文案
视觉调整
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
REPORT-53592 扩展图表创建共享组件npe问题
REPORT-53365 && REPORT-53310 交互修改
KERNEL-7634 依赖问题
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
REPORT-53398 【智能联动】组件拖入时，tab2内引用到组件名的地方，替换名称有误
REPORT-53229 补上空格
REPORT-53240 加密组件在服务器上预览不显示
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
4 years ago
Bruce.Deng
ced078dd55
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0
4 years ago
Bruce.Deng
cec0f89c5f
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
4 years ago
31cd8ef498
Pull request #4529 : REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit 'c2b91aabf45f08aba95e9f324f6f90a24f0c2238':
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
4 years ago
c2b91aabf4
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
4 years ago
b351e01298
REPORT-53601 & REPORT-53614 结果文本框框设置不可编辑。进度条更新设置
4 years ago
8f71836add
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~hades/design into feature/10.0
4 years ago
a64ace980a
REPORT-53157 值一样 对象地址不一样的对象同样需要被返回处理
4 years ago
9094d90149
Pull request #4515 : REPORT-53592 扩展图表创建共享组件npe问题
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '3af622275391f496956161d41650569a460a6299':
REPORT-53592 扩展图表创建共享组件npe问题
REPORT-52539 window上生成面板出现了滚动条
REPORT-53592 扩展图表创建共享组件npe问题
4 years ago
Bruce.Deng
25a0b785f8
Pull request #4527 : REPORT-53351 & REPORT-53367 & REPORT-53362 复制传参后sql相关问题
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '82f8d822129d2d1d88fb14e27c65d50e642de7f0':
REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
REPORT-53351 复制传参后sql-参数为空时的显示结果不对
4 years ago
3af6222753
REPORT-53592 扩展图表创建共享组件npe问题
4 years ago
Bruce.Deng
82f8d82212
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/10.0
4 years ago
Bruce.Deng
310eb160bd
REPORT-53362 复制传参后sql-鼠标悬浮查看设计器面板，会多出来查看执行sql的界面
4 years ago
Hades
80dae438bd
Pull request #4523 : REPORT-53135 【智能联动】组件生成时，没有新增文案
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '77076eae38ad4eff198b29a3ffb9b265830f4b16':
REPORT-53135 漏交
REPORT-53135 【智能联动】组件生成时，没有新增文案
4 years ago
kerry
6f64f92410
Pull request #4525 : REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '59d5958c8cc39df0bd7182ea0f39ab7b6e06d89f':
REPORT-53133 组件复用-合入主版本-有俩商城下载下来的复用组件，拖入后组件树处没显示复用组件的图标，麻烦看下是这俩组件结构有啥问题嘛
4 years ago
Bruce.Deng
d8dc68e440
REPORT-53367 复制传参后sql-远程下，新增的转义字符提示失效
4 years ago
Lanlan
vito
Bjorn
Bruce.Deng
白岳
pengda
ju|剧浩宇
superman
zheng
Hades
hades
方磊
Tommy
kuangshuai
kerry