superman
7d80eebe42
Merge pull request #2288 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7c5e5b87158e947f7dc439e9490c61ddc87b2f40':
CHART-15681 组合图切换到其他图形显示单元格数据源的问题
REPORT-38525 【JDK11设计器】插件商城不能用
REPORT-39343 【回归】设计器切换远程时卡死 死锁了
REPORT-39318 单元测试脚本完善
CHART-15664 雷达图饼图继承多分类的问题
修改参数
CHART-15510 toJSON
CHART-15510 完善内容样式界面交互
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago
白岳
5721fc4d75
CHART-15696 雷达图条件属性透明
4 years ago
Hades
7c5e5b8715
Pull request #2280 : REPORT-39343 【回归】设计器切换远程时卡死 死锁了
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'f3309d289768eab3d803035d91c578305ee85495':
REPORT-39343 【回归】设计器切换远程时卡死 死锁了
4 years ago
Yuan.Wang
8fffceb55e
REPORT-38954&&REPORT-38927&&REPORT-38924&&REPORT-38896 消除NPE
4 years ago
Bjorn
5e9c2e4550
Pull request #2282 : CHART-15681 组合图切换到其他图形显示单元格数据源的问题
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '2100f297af6500886c5a63f862dde4c025c0cc21':
CHART-15681 组合图切换到其他图形显示单元格数据源的问题
4 years ago
Yuan.Wang
905b646aa7
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yuan.Wang
a946a7e3d9
REPORT-38954&&REPORT-38927&&REPORT-38924&&REPORT-38896 TopXCreator中添加XCreator的变量,绘制的时候禁用其双缓冲然后直接调用其paint方法
4 years ago
Lanlan
02bd771582
Pull request #2281 : REPORT-38525 【JDK11设计器】插件商城不能用
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit 'c69ecfcfdef1827aa17890bc012752040c34da9f':
REPORT-38525 【JDK11设计器】插件商城不能用
4 years ago
白岳
2100f297af
CHART-15681 组合图切换到其他图形显示单元格数据源的问题
4 years ago
Lanlan
c69ecfcfde
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into release/10.0
4 years ago
Lanlan
768129ab62
REPORT-38525 【JDK11设计器】插件商城不能用
4 years ago
hades
f3309d2897
REPORT-39343 【回归】设计器切换远程时卡死 死锁了
4 years ago
Qinghui.Liu
889f833b53
Pull request #2219 : CHART-15510 标签和提示中插入BI的富文本编辑器
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '49d74a8b156a16894441ff7f8a6828bf916c49fc':
修改参数
CHART-15510 toJSON
CHART-15510 完善内容样式界面交互
CHART-15510 标签和提示中插入BI的富文本编辑器
4 years ago
Bjorn
dfebbc0d50
Pull request #2270 : CHART-15664 雷达图饼图继承多分类的问题
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '871c3954afe7d696efecaa89fc5f5c4237b8b777':
CHART-15664 雷达图饼图继承多分类的问题
4 years ago
vito
bdace6f0b0
Pull request #2271 : REPORT-39318 单元测试脚本完善
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'e8882aae5f4705fa9c05c91472801e9b3a766535':
REPORT-39318 单元测试脚本完善
4 years ago
superman
a8f09ece1c
Merge pull request #2278 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'd47443fbbf52d2ac927c37edc7ac6860a12649d1':
REPORT-38529 && REPORT-38527
REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用 1. bug原因:对于工具栏上的工具条combineUp,当处于编辑sheet的时候,是剪切+复制+粘贴+格式刷,其它情况都是剪切+复制+粘贴+删除,而带删除的这种,是会有两种状态,选中了某个组件时,剪切、复制、删除就都是可用的,未选中时,这几个都不可用,所以这里需要有个逻辑来切换这几个按钮的状态,而对于带格式刷的,不论有没有选中都会走到这个逻辑,然后被无脑置为不可用 2. 修改方案:添加一个判断,如果当前的状态是WORK_SHEET的时候,即编辑sheet时,直接返回,其它情况正常走逻辑
REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
4 years ago
superman
d47443fbbf
Merge pull request #2277 in DESIGN/design from feature/10.0 to bugfix/10.0
...
* commit '2b9228d1eefaed9de598fabb402cfca4b7c0bbd7':
REPORT-38529 && REPORT-38527
REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用 1. bug原因:对于工具栏上的工具条combineUp,当处于编辑sheet的时候,是剪切+复制+粘贴+格式刷,其它情况都是剪切+复制+粘贴+删除,而带删除的这种,是会有两种状态,选中了某个组件时,剪切、复制、删除就都是可用的,未选中时,这几个都不可用,所以这里需要有个逻辑来切换这几个按钮的状态,而对于带格式刷的,不论有没有选中都会走到这个逻辑,然后被无脑置为不可用 2. 修改方案:添加一个判断,如果当前的状态是WORK_SHEET的时候,即编辑sheet时,直接返回,其它情况正常走逻辑
REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
4 years ago
vito
e8882aae5f
REPORT-39318 单元测试脚本完善
4 years ago
白岳
871c3954af
CHART-15664 雷达图饼图继承多分类的问题
4 years ago
superman
2b9228d1ee
Merge pull request #2268 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'e378a08ffca5ef45b530f535dfec555317497eb7':
REPORT-38969 修改按照点击坐标获取组件的逻辑
REPORT-38969 修改按照点击坐标获取组件的逻辑
CHART-15610 自定义标签格式不保留
4 years ago
superman
e378a08ffc
Merge pull request #2267 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'cf1c59216389769a08ffd02d524b735b93e988c7':
REPORT-38969 修改按照点击坐标获取组件的逻辑
REPORT-38969 修改按照点击坐标获取组件的逻辑
CHART-15610 自定义标签格式不保留
4 years ago
Qinghui.Liu
49d74a8b15
修改参数
4 years ago
Qinghui.Liu
a1b9c0bcf4
CHART-15510 toJSON
4 years ago
Yuan.Wang
cf1c592163
Pull request #2259 : REPORT-38969 修改按照点击坐标获取组件的逻辑
...
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit 'f3708aadeb90e02d8dce8725a18333496aa512e4':
REPORT-38969 修改按照点击坐标获取组件的逻辑
REPORT-38969 修改按照点击坐标获取组件的逻辑
4 years ago
Yuan.Wang
f3708aadeb
REPORT-38969 修改按照点击坐标获取组件的逻辑
4 years ago
Bjorn
8f91aa446d
Pull request #2253 : CHART-15610 自定义标签格式不保留
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '452e0bf30093c7a7dd1d93d49afdcc121db047c2':
CHART-15610 自定义标签格式不保留
4 years ago
Yuan.Wang
928f2ab792
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yuan.Wang
2b73c4dc26
REPORT-38969 修改按照点击坐标获取组件的逻辑
4 years ago
Qinghui.Liu
bf14ab15b7
CHART-15510 完善内容样式界面交互
4 years ago
superman
c6a4b0d75d
Merge pull request #2258 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bd41dc8b2948cf288e573390b4740af135edc2e0':
REPORT-38821 修改获得扩展路径的逻辑
4 years ago
superman
bd41dc8b29
Merge pull request #2257 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '21d27ccf8174394249cc7131c7e359ad13fc051f':
REPORT-38821 修改获得扩展路径的逻辑
4 years ago
neil
b3f75b0481
Pull request #2254 : REPORT-38529 && REPORT-38527
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'd91768f8ffe489be57754ea3cb23b7ea16c853a8':
REPORT-38529 && REPORT-38527
4 years ago
hades
d91768f8ff
REPORT-38529 && REPORT-38527
4 years ago
neil
5716a08c9a
Pull request #2252 : REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用
...
Merge in DESIGN/design from ~YVAN/design:feature/10.0 to feature/10.0
* commit 'd15fad9502003b15d2ada766c8c0a4c854bc7075':
REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用 1. bug原因:对于工具栏上的工具条combineUp,当处于编辑sheet的时候,是剪切+复制+粘贴+格式刷,其它情况都是剪切+复制+粘贴+删除,而带删除的这种,是会有两种状态,选中了某个组件时,剪切、复制、删除就都是可用的,未选中时,这几个都不可用,所以这里需要有个逻辑来切换这几个按钮的状态,而对于带格式刷的,不论有没有选中都会走到这个逻辑,然后被无脑置为不可用 2. 修改方案:添加一个判断,如果当前的状态是WORK_SHEET的时候,即编辑sheet时,直接返回,其它情况正常走逻辑
4 years ago
白岳
452e0bf300
CHART-15610 自定义标签格式不保留
4 years ago
Yvan
d15fad9502
REPORT-38534 设计器界面中的剪切和复制按钮灰化不可用
...
1. bug原因:对于工具栏上的工具条combineUp,当处于编辑sheet的时候,是剪切+复制+粘贴+格式刷,其它情况都是剪切+复制+粘贴+删除,而带删除的这种,是会有两种状态,选中了某个组件时,剪切、复制、删除就都是可用的,未选中时,这几个都不可用,所以这里需要有个逻辑来切换这几个按钮的状态,而对于带格式刷的,不论有没有选中都会走到这个逻辑,然后被无脑置为不可用
2. 修改方案:添加一个判断,如果当前的状态是WORK_SHEET的时候,即编辑sheet时,直接返回,其它情况正常走逻辑
4 years ago
Yuan.Wang
21d27ccf81
Pull request #2247 : REPORT-38821 修改获得扩展路径的逻辑
...
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit '61624fb8558a26cb2c0a82c53f9516b0774dad06':
REPORT-38821 修改获得扩展路径的逻辑
4 years ago
Yuan.Wang
61624fb855
REPORT-38821 修改获得扩展路径的逻辑
4 years ago
Yuan.Wang
cac9c6d151
Merge branch 'release/10.0' of https://code.fineres.com/scm/~yuan.wang/design into release/10.0
4 years ago
superman
848fb030de
Merge pull request #2242 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '44ee31079bb2711610c15682198602aa0b9ddbb3':
4 years ago
superman
44ee31079b
Merge pull request #2241 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd28b7fde9e8c835c102cd7a5942259073ce8b3be':
4 years ago
Hades
48d927f4cd
Pull request #2229 : REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '5610f5a3054edd08957e2a29c19422ca76a89875':
REPORT-38645 【JDK11】设计器右上角,fs插件管理点击登录无反应
4 years ago
superman
d28b7fde9e
Merge pull request #2238 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '6871f2fb274c459c44185b69b17888adbfa4f19d':
REPORT-38647 && REPORT-38357
REPORT-36985 改了一点代码
REPORT-38632【无用代码删除】设计器启动页 动态画面相关代码
REPORT-36985 删除无用依赖,格式化
REPORT-36985 删除无用依赖,格式化
KERNEL-4069 jdk11 macos的jdk里面移除了windows相关的LAF
REPORT-36985 删除无用依赖
REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
REPORT-37821 frm绝对布局框选多个组件有问题 合丢了
REPORT-36619 fix
REPORT-36619 报表设计界面拖选无法选中拖选区域
REPORT-37968 设计器修改单元格属性时会顺带修改下一个点击的单元格
REPORT-32317 cpt滚动条缩放问题 在更改了界面的比例方法中,增加更新滚动条的宽度的逻辑
REPORT-36624 新的解决方案
REPORT-36624 自定义控件在参数面板的可见可用设置保存无效
KERNEL-3999 10.0.7设计器可使用JDK11构建
4 years ago
superman
6871f2fb27
Merge pull request #2237 in DESIGN/design from feature/10.0 to bugfix/10.0
...
* commit '45a88a39ddba3fe8852d78f1bd92378b1e33286d':
REPORT-38647 && REPORT-38357
REPORT-36985 改了一点代码
REPORT-38632【无用代码删除】设计器启动页 动态画面相关代码
REPORT-36985 删除无用依赖,格式化
REPORT-36985 删除无用依赖,格式化
KERNEL-4069 jdk11 macos的jdk里面移除了windows相关的LAF
REPORT-36985 删除无用依赖
REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
REPORT-36985 代码提交 组件树删除优化和选择组件时让其浮于顶层
KERNEL-3999 10.0.7设计器可使用JDK11构建
4 years ago
superman
45a88a39dd
Merge pull request #2236 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd2fe43ff6333df8bc475af577980dc85b3576c04':
4 years ago
superman
d2fe43ff63
Merge pull request #2235 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '85646a61790e64bf397970deb070f8e11021bdd0':
4 years ago
superman
85646a6179
Merge pull request #2234 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ac19d5e1f4138c4008676f1d7e195aa5f84a2575':
4 years ago
superman
ac19d5e1f4
Merge pull request #2233 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'f29a62528ba8aef10021acce6956630022c68e9e':
4 years ago
superman
da1479757e
Merge pull request #2232 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'fb17c1148ba695e8222267b2b6720b114ad126d3':
REPORT-38889 tomcat 8.5.x 请求参数带特殊字符问题
CHART-15362 属性切换保留功能开发
4 years ago
superman
fb17c1148b
Merge pull request #2231 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b8b4d50c2e87a7357089acb0865870e90966918c':
REPORT-38889 tomcat 8.5.x 请求参数带特殊字符问题
CHART-15362 属性切换保留功能开发
4 years ago