Harrison
f780dd8286
Pull request #1740 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '53053c3612efcedbacdc4fe688e931ceec9c9ae9':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 名字需要首先加上默认值 0
5 years ago
Bjorn
6d995ebdca
Pull request #1742 : CHART-14191 分类名和指针值名称修改
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '8ee77e701f4dd0406493de6dbbcee49c18d9b5e6':
CHART-14191 分类名和指针值名称修改
5 years ago
Lucian.Chen
b2ff3f3aa1
Pull request #1743 : REPORT-33369 在A目录的修改没有点确定。在B目录确定,A的修改也会保存
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '9a9f48eadc6771100fdf8f57bc5107fb64635d11':
REPORT-33369 在A目录的修改没有点确定。在B目录确定,A的修改也会保存
5 years ago
Qinghui.Liu
f91373eda7
Pull request #1741 : CHART-14182 修改渐变风格面板和条件属性面板
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'e04882b2afd82eebc7aea1b82f6ffdad3d4e777e':
增加子类来代替参数
更换空字符、跟新行尺寸
CHART-14182 修改渐变风格面板和条件属性面板
5 years ago
白岳
8ee77e701f
CHART-14191 分类名和指针值名称修改
5 years ago
lucian
9a9f48eadc
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0
5 years ago
lucian
bf8da8edde
REPORT-33369 在A目录的修改没有点确定。在B目录确定,A的修改也会保存
5 years ago
Qinghui.Liu
e04882b2af
增加子类来代替参数
5 years ago
Qinghui.Liu
7ef880e04c
更换空字符、跟新行尺寸
5 years ago
Qinghui.Liu
c5005dda87
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
5 years ago
Qinghui.Liu
1df8696a92
CHART-14182 修改渐变风格面板和条件属性面板
5 years ago
Harrison
53053c3612
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
名字需要首先加上默认值 0
5 years ago
Starryi
576efd6749
MOBILE-27254 联排按钮Tab样式支持上下边距调整
...
Tab组件联排按钮标题栏样式配置面板添加关于上下边距的配置项
5 years ago
Bjorn
f08d4bf290
Pull request #1737 : CHART-14106 && CHART-14062 bugfix
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '1db565b58cfec6482668d9237b3463c3f4ba7b23':
CHART-14062 预定义配色都被删光之后的逻辑
CHART-14106 控件的鼠标时间修改
5 years ago
jeo
f00c81ab58
Pull request #1738 : REPORT-33370 单元测试检测的时候,依赖dev版本的core包
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'a34c04c25102839a44be3824b4ee6ac3d84a3ce6':
REPORT-33370 单元测试检测的时候,依赖dev版本的core包
5 years ago
vito
a34c04c251
REPORT-33370 单元测试检测的时候,依赖dev版本的core包
5 years ago
Harrison
5d69ae1692
Pull request #1735 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '47b66204eae7a2e20f8a8a27e129c8eca4e3fcac':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 加一层判断, 内部可能有很多中不同的 component.
5 years ago
Lucian.Chen
6ceb49c48b
Pull request #1736 : REPORT-33348 切换远程不勾选记住密码,密码没有清掉
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'c8d7663f3edad2755894bed798ead361bef3bd04':
REPORT-33348 切换远程不勾选记住密码,密码没有清掉
5 years ago
白岳
1db565b58c
CHART-14062 预定义配色都被删光之后的逻辑
5 years ago
lucian
c8d7663f3e
REPORT-33348 切换远程不勾选记住密码,密码没有清掉
5 years ago
Harrison
47b66204ea
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
加一层判断, 内部可能有很多中不同的 component.
5 years ago
白岳
9f7ae36eee
CHART-14106 控件的鼠标时间修改
5 years ago
Harrison
045f4749f1
Pull request #1725 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '628727d69e9770c4a10571f43303e23298d1f160':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 将逻辑分散到各个组件中。 减少同一个方法中的耦合
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 考虑专属容器 + cardLayout
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 [关联场景] https://kms.fineres.com/pages/viewpage.action?pageId=116725800 [处理方案] 1、获取目标 creator 2、对 creator 的名字进行处理。 3、存在 widgetname , 说明已经初始化了, 直接通过 widgetname 处理 4、不存在, 则需要赋予一个默认的 widgetname
5 years ago
Bjorn
8f9225474b
Pull request #1734 : CHART-14181 图表空数据提示
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'c937d1a162351ceb46b5a95bed713016711d1fa1':
CHART-14181 图表空数据提示
5 years ago
白岳
c937d1a162
CHART-14181 图表空数据提示
5 years ago
Lucian.Chen
dd9d8a8f9c
Pull request #1730 : REPORT-31418 【10.0.7】远程设计连接远程服务器时,允许不记录密码
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '14d7408ac6072353a5b176aeec576b2296b974cf':
REPORT-31418 【10.0.7】远程设计连接远程服务器时,允许不记录密码
5 years ago
neil
5363b1f737
Pull request #1733 : 无jira任务, bugfix -> release
...
Merge in DESIGN/design from bugfix/10.0 to release/10.0
* commit '86520a15681580cc050736b7ca1fd503a8e9e5e4':
REPORT-31879 gauss表的字段获取不到
5 years ago
Bryant
d48dd295c0
Pull request #1732 : 无jira 询问了richie,先回滚
...
Merge in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit '62247e4fde42ebc2b67fe906a51977afbe8796e9':
无jira 询问了richie,先回滚
5 years ago
Bryant
62247e4fde
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
Bryant
9133f8e4d8
无jira 询问了richie,先回滚
5 years ago
eason
047f45a98f
Pull request #1731 : CHART-14181 图表空数据提示
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'bf021e82340c3cee7a3c7002d1da72446ac8eac6':
CHART-14181 图表空数据提示
5 years ago
白岳
bf021e8234
CHART-14181 图表空数据提示
5 years ago
lucian
14d7408ac6
Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0
5 years ago
lucian
064c0975f5
REPORT-31418 【10.0.7】远程设计连接远程服务器时,允许不记录密码
5 years ago
Harrison
628727d69e
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
将逻辑分散到各个组件中。
减少同一个方法中的耦合
5 years ago
ju.ju
d6d532831f
Pull request #1729 : CHART-14181 设计器空数据提示面板
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '36f6037b2175512b038df7ffc9f4d7246026a7d0':
CHART-14181 设计器空数据提示面板
5 years ago
白岳
36f6037b21
CHART-14181 设计器空数据提示面板
5 years ago
Harrison
c8eea04ce7
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
考虑专属容器 + cardLayout
5 years ago
Bjorn
4f1e136abe
Pull request #1727 : CHART-11701 仪表盘百分比设置逻辑优化
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '4d85a74ecac09cec5ce5fd08350120a9329eadb1':
CHART-11701 仪表盘百分比设置逻辑优化
5 years ago
vito
f70a59052c
Pull request #1728 : REPORT-28950 报表工程切换为gradle工程
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'cfcd0ff50c8da4dbb941402a59b1fdcb48ea7955': (61 commits)
无JIRA任务 gradle配置修改
KERNEL-4069 添加注释
KERNEL-4069 JDK11适配 删除无用的类与mac下的适配
KERNEL-4069 fix 漏交
KERNEL-4069 配合完成JDK11构建设计器的开发
无jira feature打包失败
无jira任务,打包失败,代码重复
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
...
5 years ago
vito
cfcd0ff50c
Merge branch 'feature/10.0' into release/10.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UICheckListPopup.java
5 years ago
白岳
4d85a74eca
CHART-11701 仪表盘百分比设置逻辑优化
5 years ago
yaoh.wu
d40e2c6178
Pull request #1726 : REPORT-33162 监听插件改动面板刷新线程安全
...
Merge in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '7fd2900d3e6ea8ad3fcbeba7f87d7f0f06f400dc':
REPORT-33162 监听插件改动面板刷新线程安全
5 years ago
yaohwu
7fd2900d3e
REPORT-33162 监听插件改动面板刷新线程安全
5 years ago
Harrison
0f382b1b14
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
5 years ago
Harrison
cb90f91fc7
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪
...
[关联场景]
https://kms.fineres.com/pages/viewpage.action?pageId=116725800
[处理方案]
1、获取目标 creator
2、对 creator 的名字进行处理。
3、存在 widgetname , 说明已经初始化了, 直接通过 widgetname 处理
4、不存在, 则需要赋予一个默认的 widgetname
5 years ago
Kara
bbf278d859
Pull request #1724 : Persist/10.0
...
Merge in DESIGN/design from ~JEO/report-design:persist/10.0 to persist/10.0
* commit 'ace673fb074e75529c955d4380f5f9aed77c7241':
REPORT-33018 fix 沿用之前的方案逻辑 防止产生假保存
REPORT-32939 add comment
REPORT-32939 设计器正常2g目前经常出现排队现象
5 years ago
jeo
ace673fb07
Merge branch 'final/10.0' into persist/10.0
5 years ago
pengda
b0811cfc2f
Pull request #1722 : REPORT-32318 frm横向和纵向滚动条图标点击问题
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '4fd85e2106905e9d90f65ee0cba1b30531bd7436':
REPORT-32318 frm横向和纵向滚动条图标点击问题
5 years ago
Harrison
5a16de71e1
Pull request #1721 : REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 组件的默认名字不满足要求。
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '955559bb4c71dc7c099c1ded390a2838ab1f3fa3':
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 回滚代码,没回滚完
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 代码回滚
REPORT-32149【组件加密】@harrison两个组件进行拖入,模板预览很奇怪 组件的默认名字不满足要求。 一些组件外面会嵌套 TitileLayout 所以根组件依旧保持之前的逻辑。 子组件使用组件名字递增的方式。
5 years ago