方磊
897230cfaa
REPORT-54885 添加注释,便于理解
3 years ago
superman
94a0f734aa
Merge pull request #5272 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '35ed2c50d10775494462b928d2153c747bc8c1ad':
3 years ago
superman
94ff52feb4
Merge pull request #5271 in DESIGN/design from release/11.0 to feature/x
...
* commit '9e96755af5259f69d8a89936add1a4d5770f9ba8':
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
方磊
122fa10b8c
REPORT-54885 优化获取延长线方法的实现
3 years ago
方磊
3e65344d93
REPORT-54885 优化方法命名
3 years ago
方磊
0c59cab942
REPORT-54885 优化api命名
3 years ago
方磊
3c5a53d2a2
REPORT-54885 优化重复代码
3 years ago
zheng
35ed2c50d1
Pull request #5256 : CHART-20142 design feature/big-screen to feature/10.0
...
Merge in DESIGN/design from feature/big-screen to feature/10.0
* commit 'e1b2cbb455f19beaeed841685525c52587fadab0': (29 commits)
CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到
CHART-18786 feat:表格组件
解决冲突
无jira 解决冲突 update
feat:其他组合图不需要类型界面,自定义组合图需要
refactor:plugin use 10.0 not compatible xxx copy from 10.0 code
feat:类型和特性面板如果没有其他设置项 则拿掉
merge
merge:REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
merge:REPORT-51958 远程环境检测及同步
merge:REPORT-53626 设计器启动异常
merge:REPORT-53229 补上空格
merge:REPORT-53229 设计器顶部版本号信息改为小版本信息
merge:REPORT-51442 菜单栏和数据集面板灰化问题
merge:先把我自己的改回去
feat:对接扩展图表
api level
feat:编辑器模式 没有单元格数据源 图表切换 监控刷新等配置项
REPORT-52490 图表配置界面 添加属性改变事件接口
omport
...
3 years ago
kerry
9e96755af5
Pull request #5253 : REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '21e4bc1f77853efd1a023d13dd8df36fcba0f9d2':
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
superman
e1b2cbb455
Merge pull request #5264 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '6f6d1959ac6bb3eb517e8e6c3d389c2cb9a6499a':
REPORT-56080 图表双击无法进入图表编辑页
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
3 years ago
superman
9e756163b3
Merge pull request #5263 in DESIGN/design from release/11.0 to feature/x
...
* commit 'b428f495ff857ccf8790677188d36d5b7d6a637d':
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
rinoux
b428f495ff
Pull request #5254 : REPORT-51472 设计器启动缓存配置读写模块
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'b41a6ed7b37da6fb64953a73c7e342e9c364002b':
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
方磊
6ecdf5a8d9
REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分
3 years ago
zheng
e215a59f7b
Pull request #5255 : CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen
* commit '330dff7c009e06060d8f3c47d3f5141f1678d4e3':
CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到
3 years ago
shine
330dff7c00
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
3 years ago
rinoux
b41a6ed7b3
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
shine
2fe05ed614
CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到
3 years ago
Tommy
6f6d1959ac
Pull request #5252 : REPORT-56080 图表双击无法进入图表编辑页
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '4dfa89b1371429d79f7a7d26e06bc185fcb0c811':
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
kerry
21e4bc1f77
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
Henry.Wang
2693a17f21
Pull request #5251 : REPORT-55060 数据集预览支持复制
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'ebf44c29a8bf51664783a0aeab79bb890931d68e':
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
REPORT-55060 数据集预览支持复制
3 years ago
kuangshuai
4dfa89b137
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
kuangshuai
705d28949b
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
Henry.Wang
ebf44c29a8
REPORT-55060 数据集预览支持复制
3 years ago
Henry.Wang
bd6817a976
REPORT-55060 数据集预览支持复制
3 years ago
Henry.Wang
d5b2289874
REPORT-55060 数据集预览支持复制
3 years ago
方磊
ab3a2b7f77
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/10.0
...
* 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0:
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55091 只有一个非超管用户的目录文件无法另存或新建
3 years ago
方磊
2331aa149e
REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分
3 years ago
ju|剧浩宇
56c8931a70
Pull request #5240 : REPORT-55072 设计器内文件选择器替换为原生的
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '468b6600e872e10b1604618a9edbf2469d9afcf4':
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
REPORT-55072 设计器内文件选择器替换为原生的
3 years ago
superman
279d472fb6
Merge pull request #5248 in DESIGN/design from release/11.0 to feature/x
...
* commit '0d15e520fd19e9060685acb32aee440b83b41b56':
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
loy
0d15e520fd
Pull request #5241 : KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
...
Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0
* commit '808783b8b502fb6b965efad61046e7e025ff4616':
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
loy
808783b8b5
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
Henry.Wang
468b6600e8
REPORT-55072 设计器内文件选择器替换为原生的
3 years ago
Henry.Wang
623edcaf91
REPORT-55072 设计器内文件选择器替换为原生的
3 years ago
Henry.Wang
1e8a3098cb
REPORT-55072 设计器内文件选择器替换为原生的
3 years ago
superman
a2fbd07e62
Merge pull request #5207 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '486c70356eb961c5fef32b7775db0ecee3cfadfe':
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
3 years ago
superman
a1d1b53e1c
Merge pull request #5206 in DESIGN/design from release/11.0 to feature/x
...
* commit '284b6e92fbf1f2c538cae50f466f91b58231e7f2':
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
3 years ago
superman
284b6e92fb
Merge pull request #5205 in DESIGN/design from feature/10.0 to release/11.0
...
* commit '486c70356eb961c5fef32b7775db0ecee3cfadfe':
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
3 years ago
Bjorn
486c70356e
Pull request #5199 : CHART-20134 图表接口判断增加对新接口的判断
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '3383679b7c13d09a99b5018bed60299bba55849d':
CHART-20134 图表接口判断增加对新接口的判断
3 years ago
白岳
3383679b7c
CHART-20134 图表接口判断增加对新接口的判断
3 years ago
Xiqiu
b78513d6cb
Pull request #5165 : KERNEL-8304 连接池逻辑重构
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '95eb275a6cefaf9c96a2fe9ab7d97259eb9d039a':
KERNEL-8304 连接池逻辑重构
3 years ago
superman
878a72c805
Merge pull request #5184 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'eec249b5748a90583a1f7083be6453432e88ed1a':
3 years ago
superman
051542d94f
Merge pull request #5183 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f37dceb3e74bc40e9cf83ff7338660c1cbb48fa7':
3 years ago
superman
f37dceb3e7
Merge pull request #5182 in DESIGN/design from feature/10.0 to release/11.0
...
* commit 'eec249b5748a90583a1f7083be6453432e88ed1a':
3 years ago
superman
eec249b574
Merge pull request #5180 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '237143b3831f4ce54d822717d0ff4d26cc935fc2':
3 years ago
superman
237143b383
Merge pull request #5179 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '3f1b971a576734b43623c7f31d02add42b50257f':
3 years ago
superman
3f1b971a57
Merge pull request #5178 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'd416b56c93bac26b5b2f5b1f915fd384a2788839':
3 years ago
superman
d416b56c93
Merge pull request #5177 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '58784a38ae1a906d85aeb196a0315ce113b9883a':
3 years ago
superman
58784a38ae
Merge pull request #5176 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '2fc0b44aace0fe514861c652eaa7d09321876591':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
3 years ago
superman
864f92abbf
Merge pull request #5175 in DESIGN/design from feature/x to release/11.0
...
* commit 'da16b83633e55ea5d093b6350cf4ce39953ed5b7':
CHART-19555 注释掉暂时不用的属性
KERNEL-7640 填报预览新前端适配第一波代码合并
KERNEL-7640 填报预览新前端适配第一波代码合并
3 years ago
Bjorn
da16b83633
Pull request #5166 : CHART-19555 注释掉暂时不用的属性
...
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '43736246f8c24f07f5421136b8e04e82718c0dfc':
CHART-19555 注释掉暂时不用的属性
3 years ago