John.Ying
518e43bb38
Pull request #9509 : 无jira 解决冲突
...
Merge in DESIGN/design from ~JOHN.YING/design:feature/x to feature/x
* commit '6e9f7d67c3ad7e81a0eff3219845d5ab1c78ecd8':
REPORT-75072 fix:SocketIO启动失败,端口被占用
KERNEL-11853 设置的分钟数可以支持小数,但不能小于1分钟
2 years ago
John.Ying
6e9f7d67c3
无jira 解决冲突
2 years ago
superman
922600130a
Merge pull request #9508 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'ff262162793157652afb496ff91dd0beffb8ab4a':
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
抽数缓存最小更新间隔限制1分钟,不允许小数
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
REPORT-74603 嵌入式数据库的限制访问
REPORT-74664 重新打开新模式模板按钮显示老模式
REPORT-73491 聚合报表条件属性配置面板,在设计器重启后该面板不能正确显示
REPORT-71824 frm打开报表块编辑页面,切换工作目录无法打开当前frm
2 years ago
Yvan
87123b36be
Merge remote-tracking branch 'origin/feature/x' into feature/x
2 years ago
Yvan
84cbc7e64d
REPORT-72635 - 数据连接面板为空的问题(含控制权限)
...
【问题原因】迭代任务,问题与改动思路详见https://kms.fineres.com/pages/viewpage.action?pageId=443822299
【改动思路】同上
【review建议】无
2 years ago
Hades
327a22ab28
Pull request #9505 : REPORT-75786 11.0feature版本设计器无法启动
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '82a8701eb50dcfb8b674da8263bca3ba8d924d4a':
REPORT-75786 11.0feature版本设计器无法启动
2 years ago
hades
82a8701eb5
REPORT-75786 11.0feature版本设计器无法启动
2 years ago
Fly.Li
2beadd4b06
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
2 years ago
Harrison
97b89b31a3
Pull request #9504 : REPORT-75786 11.0feature版本设计器无法启动
...
Merge in DESIGN/design from ~HARRISON/design:feature/x to feature/x
* commit '6926245b3f92b8359f179487e1c362ef5d57179d':
REPORT-75786 11.0feature版本设计器无法启动 DesignUtils.initLookAndFeel 需要先解密。 会用到 GeneralUtils 的逻辑
2 years ago
Harrison
6926245b3f
REPORT-75786 11.0feature版本设计器无法启动
...
DesignUtils.initLookAndFeel 需要先解密。
会用到 GeneralUtils 的逻辑
2 years ago
superman
d9ed27ff79
Merge pull request #9503 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '3738152fc5bf37046a80e21f0e7f841d9eb3f763':
REPORT-75072 fix:SocketIO启动失败,端口被占用
2 years ago
Harrison
331bbaa88c
Pull request #9493 : REPORT-72828 设计器启动优化之起始页设计
...
Merge in DESIGN/design from ~HARRISON/design:feature/x to feature/x
* commit 'bf9738a86ae646ee34a65673280ef619c8fbfdaa':
REPORT-72828 设计器启动优化之起始页设计 1、修复远程目录的展示问题 2、UI效果,距离右边 6 px 3、参数设置放到 UI 线程中
补充注释
REPORT-72828 设计器启动优化之起始页设计 1-添加 loading 页面 2-手动调用部分功能 3-预热功能和在预热中对部分功能的忽视 4-启动页相关的UI 5-预加载服务
2 years ago
Harrison
bf9738a86a
REPORT-72828 设计器启动优化之起始页设计
...
1、修复远程目录的展示问题
2、UI效果,距离右边 6 px
3、参数设置放到 UI 线程中
2 years ago
Link.Zhao
667f5dc6cb
Pull request #9494 : REPORT-70746 更新日志的显示逻辑优化
...
Merge in DESIGN/design from ~LINK.ZHAO/design:feature/x to feature/x
* commit 'eedccf740aafa0efb271520dd66e6567ac4af353':
REPORT-70746 更新日志的显示逻辑优化
REPORT-70746 更新日志的显示逻辑优化
REPORT-70746 更新日志的显示逻辑优化
2 years ago
Link.Zhao
eedccf740a
REPORT-70746 更新日志的显示逻辑优化
...
url不能用硬编码
2 years ago
Link.Zhao
ff8239ba70
REPORT-70746 更新日志的显示逻辑优化
...
耗时操作放到action里,避免ui阻塞
2 years ago
Link.Zhao
daa73d3cd6
REPORT-70746 更新日志的显示逻辑优化
...
添加更新日志链接按钮
修改url
2 years ago
Fly.Li
865ba04e4a
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
2 years ago
Fly.Li
7b581c1312
REPORT-70537:数据连接优化埋点
2 years ago
John.Ying
3738152fc5
Pull request #9490 : REPORT-75072 fix:SocketIO启动失败,端口被占用
...
Merge in DESIGN/design from ~JOHN.YING/design:release/11.0 to release/11.0
* commit '6f8d015598e6015f6bddcc8ff8c2413a9b0d8c1d':
REPORT-75072 fix:SocketIO启动失败,端口被占用
2 years ago
Harrison
540afceb1d
补充注释
2 years ago
Harrison
d5e0743712
REPORT-72828 设计器启动优化之起始页设计
...
1-添加 loading 页面
2-手动调用部分功能
3-预热功能和在预热中对部分功能的忽视
4-启动页相关的UI
5-预加载服务
2 years ago
superman
085abf4835
Merge pull request #9491 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '6945cc247e57a007af0841b032148d908a6aa01f':
KERNEL-11853 设置的分钟数可以支持小数,但不能小于1分钟
2 years ago
John.Ying
6f8d015598
REPORT-75072 fix:SocketIO启动失败,端口被占用
2 years ago
pengda
0e31c4a948
Pull request #9487 : REPORT-72354 导出图片优化二期
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit '74267e4a89b5718bf374a9ab3c9d293d3bf02cc3':
REPORT-72354 导出图片优化二期
2 years ago
pengda
74267e4a89
Merge remote-tracking branch 'origin/feature/x' into feature/x
2 years ago
pengda
fa538f3d78
REPORT-72354 导出图片优化二期
2 years ago
Maximus
6945cc247e
Pull request #9454 : KERNEL-11853 抽数缓存最小更新间隔限制1分钟
...
Merge in DESIGN/design from ~MAXIMUS/design:release/11.0 to release/11.0
* commit '90fc5542b3b830ce2fe7d7faa22322ed284f5e75':
KERNEL-11853 设置的分钟数可以支持小数,但不能小于1分钟
2 years ago
superman
73a8356c96
Merge pull request #9468 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '1f31d6039737741b29cadb60e9919f19c6d31cd1':
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
2 years ago
superman
1f31d60397
Merge pull request #9467 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'b2187f220b7788c8e8d56c641b3904dcd66a18ff':
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
2 years ago
superman
b2187f220b
Merge pull request #9466 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'ff262162793157652afb496ff91dd0beffb8ab4a':
2 years ago
superman
ff26216279
Merge pull request #9458 in DESIGN/design from release/11.0 to final/11.0
...
* commit '92f6b1e4d3de1f790bdf797b3ee904953cebbc17':
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
抽数缓存最小更新间隔限制1分钟,不允许小数
REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
REPORT-74603 嵌入式数据库的限制访问
REPORT-74664 重新打开新模式模板按钮显示老模式
REPORT-73491 聚合报表条件属性配置面板,在设计器重启后该面板不能正确显示
REPORT-71824 frm打开报表块编辑页面,切换工作目录无法打开当前frm
2 years ago
superman
92f6b1e4d3
Merge pull request #9457 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit '63c3d6e912f921245ef6daf3cdb4dc41defbd48e':
REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
2 years ago
Maximus
90fc5542b3
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Bruce.Deng
a9cf7497d8
Pull request #9442 : REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/11.0 to release/11.0
* commit '8d441237c0a33e291fba097752e0a7e3cab9285e':
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
2 years ago
Maximus
3d5f28fd95
KERNEL-11853 设置的分钟数可以支持小数,但不能小于1分钟
2 years ago
superman
44a48331ef
Merge pull request #9452 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '63c3d6e912f921245ef6daf3cdb4dc41defbd48e':
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
抽数缓存最小更新间隔限制1分钟,不允许小数
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
2 years ago
superman
63c3d6e912
Merge pull request #9451 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '3297ad03468d5396582037550fa2834b5bad25c8':
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
抽数缓存最小更新间隔限制1分钟,不允许小数
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
2 years ago
superman
3297ad0346
Merge pull request #9450 in DESIGN/design from final/11.0 to release/11.0
...
* commit '14710733f731c5a781b5f81c073665e9c9227bed':
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
2 years ago
Maximus
0f586c8786
Pull request #9441 : KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
...
Merge in DESIGN/design from ~MAXIMUS/design:release/11.0 to release/11.0
* commit '4aec6e5b8d2187dd7b24026c77fa050feb69df3a':
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Bruce.Deng
8d441237c0
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
2 years ago
Maximus
4aec6e5b8d
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Yann
14710733f7
Pull request #9440 : REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
...
Merge in DESIGN/design from ~YANN/design:final/11.0 to final/11.0
* commit 'cb91ff9c60a0a16febe8d27950d0f050d435e183':
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
2 years ago
Maximus
b012cbac57
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Maximus
833b53133d
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Num73
26f30107aa
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Num73
247e752bc8
KERNEL-11853 抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Num73
2d4110e77f
抽数缓存最小更新间隔限制1分钟,不允许小数
2 years ago
Yann
cb91ff9c60
REPORT-74775 【设计器】内置数据集预览数据,多列情况,显示有问题
2 years ago
kerry
d61f5a96c5
Pull request #9429 : REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/11.0 to bugfix/11.0
* commit 'cdaa29cd4339bb0b33615a803425c5c84197f6fe':
REPORT-75174 FR11新自适应-PC端自适应属性报表块选择自定义,报表块右侧Pc浏览器自适应设置项选择双向自适应,切换为新模式后,报表块变为不自动调整
2 years ago