白岳
0bef26216a
还原范围
3 years ago
Henry.Wang
9c66d3d9fb
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
1f031e4b72
REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
3 years ago
白岳
4e10ea8419
CHART-20642 图表预定义配色避免重名和空字符串名
3 years ago
hades
cdf36ae6c3
REPORT-58991 设计器内-模板画布可滚动-点击组件编辑-不在视线内的组件,编辑锁定位置有问题
3 years ago
fanglei
71b06205fc
Pull request #5776 : REPORT-59099 给帮助文档的网址补上默认值
...
Merge in DESIGN/design from ~FANGLEI/design10.0:bugfix/10.0 to bugfix/10.0
* commit '5e001197e8ef32559e5b499a5c55a7f08636b4d5':
REPORT-59099 给帮助文档的网址补上默认值
3 years ago
Henry.Wang
1b50eb4177
Pull request #5772 : REPORT-59063 CRM 内存里报表块缩略图占用内存太大了 && REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'aebb0df1ce7aee3860f8f3eb2ce21628e73f30f6':
REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况
REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况
REPORT-59063 CRM 内存里报表块缩略图占用内存太大了
3 years ago
eason
c083183945
Pull request #5773 : CHART-20402 增加几个接口
...
Merge in DESIGN/design from ~EASON/design:feature/10.0 to feature/10.0
* commit '1248729a97b44d788b8f2b1408301793f7d43410':
新接口
新接口
CHART-20402 增加几个接口
CHART-20402 增加几个接口
CHART-20402 增加几个接口
3 years ago
eason
1248729a97
新接口
3 years ago
eason
ad415c8129
新接口
3 years ago
Henry.Wang
aebb0df1ce
REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况
3 years ago
Henry.Wang
f1f0904388
REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况
3 years ago
superman
e5564ac75a
Merge pull request #5780 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '172c8aa2939b041e1db85048aa130003883574fb':
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58227 远程设计 设计器切换已经打开的模板卡顿
REPORT-58136 远程设计无法新建决策报表
3 years ago
superman
172c8aa293
Merge pull request #5779 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5d4b5199d12f43549fa188cea02b484c6ba9dcae':
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58136 远程设计无法新建决策报表
3 years ago
方磊
5e001197e8
REPORT-59099 给帮助文档的网址补上默认值
3 years ago
eason
20690cbd72
CHART-20402 增加几个接口
3 years ago
eason
006ecfe883
CHART-20402 增加几个接口
3 years ago
eason
6312212e86
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~eason/design into feature/10.0
3 years ago
eason
febd687b9e
CHART-20402 增加几个接口
3 years ago
Henry.Wang
1de563c7ba
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
990885a22e
REPORT-59063 CRM 内存里报表块缩略图占用内存太大了
3 years ago
Henry.Wang
5d4b5199d1
Pull request #5770 : REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '70af89a29459e02b6168c47485004f79b1eff369':
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
REPORT-58136 远程设计无法新建决策报表
3 years ago
Hades
468d264b3c
Pull request #5769 : REPORT-58227 远程设计 设计器切换已经打开的模板卡顿
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '1b7f5cf7761e9ad8c0c37926fe3a23e5fa3b4aa8':
REPORT-58227 远程设计 设计器切换已经打开的模板卡顿
3 years ago
Henry.Wang
70af89a294
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit '54d2a0c729e6e38a4355a1f8183dbd83d25f0fb9': (28 commits)
REPORT-58533 附件模板中报表块无法进入编辑
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
无jira 忽略异常
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
REPORT-57171 AF打不开
无jira 加个切换时处理 防止工具栏残留
REPORT-58296 调整参数面板高度消失问题
REPORT-58159 组件编辑按钮-表单组件选中-设计器日志框无法置于设计器上方
无jira 调整下日志等级
REPORT-58260 组件包安装适配zip
REPORT-58260 组件包安装适配zip
...
3 years ago
Henry.Wang
2bfab3ce67
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
3 years ago
Henry.Wang
48d4c2ab9f
REPORT-58592 日语版设计器 引用css和JavaScript的选择文件按钮显示不出来了
3 years ago
hades
1b7f5cf776
REPORT-58227 远程设计 设计器切换已经打开的模板卡顿
3 years ago
superman
bb4879dcca
Merge pull request #5755 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ed6a77a470d37d25be574baaac4cf688d5c51d91':
3 years ago
superman
ed6a77a470
Merge pull request #5754 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '54d2a0c729e6e38a4355a1f8183dbd83d25f0fb9':
3 years ago
superman
54d2a0c729
Merge pull request #5753 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f17c56b0d001d5fcd052f9a0ce04954a484ea630':
3 years ago
superman
f17c56b0d0
Merge pull request #5752 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '052aa9cd50b1a14ac348ceb07469f95adbff8c58':
3 years ago
superman
052aa9cd50
Merge pull request #5750 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '62909e97e1d63406d38a9233fb6ee21b871679e5':
3 years ago
zheng
eae7ebe0d2
Pull request #5729 : POM-2302 cpt组件默认样式
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/10.0
* commit 'f78f1c8c82998554bc8c489877ae8c58ceaef43f':
ignore
根据最新视觉调整单元格边框颜色
POM-2302 cpt组件默认样式
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
superman
4025e0c702
Merge pull request #5733 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '712638e5dc1f506fcfb0c55f14688da44343a214':
REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
3 years ago
shine
f78f1c8c82
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
3 years ago
shine
b8317ff113
ignore
3 years ago
zheng
ace6ca5fb9
Merging in latest from upstream (DESIGN/design:refs/heads/feature/big-screen)
...
* commit '823d91d51a9ff4a6a15d6b27d2674c65273f6440':
REPORT-58533 附件模板中报表块无法进入编辑
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
REPORT-58573 打开11.0制作的模板不向上兼容提示- 提示内容中应建议升级至11
REPORT-58200 初次安装的10.0设计器,用户目录下会生成.finereport80缓存文件
REPORT-56134 js提交事件报错中添加定位信息
REPORT-55048 websocket使用代理的情况处理下
REPORT-55748 处理下import 问题
REPORT-58535 【稳定共创】附件模板概率出现2个编辑按钮
REPORT-50784 单元格文本包含生僻字情况下,双击单元格进入编辑状态后字符无法用默认字体绘制
CHART-20517 图表类型编辑之后再重置标题
CHART-20517 图表类型编辑之后再重置标题
无jira 忽略异常
REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的
3 years ago
shine
6a4d71e136
根据最新视觉调整单元格边框颜色
3 years ago
shine
68a3d41504
POM-2302 cpt组件默认样式
3 years ago
fanglei
712638e5dc
Pull request #5704 : REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
...
Merge in DESIGN/design from ~FANGLEI/design10.0:bugfix/10.0 to bugfix/10.0
* commit 'fb1d0f8d578143bb3f60ecab452b5031d71f46ca':
REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
3 years ago
superman
823d91d51a
Merge pull request #5725 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '0cc49b968106b3260c895958197d409be2ab1427':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
0cc49b9681
Merge pull request #5720 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '39a83a802c13d8ffe2bcf49a0b37bbabfff2c7e0':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
39a83a802c
Merge pull request #5719 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8ed8d12424f99e3077ef5fd83fe12f4ea471705f':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
Hades
8ed8d12424
Pull request #5705 : REPORT-58553 附件模板中报表块无法进入编辑
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '5e4bd357d72e70b431071f2dffe13c7004852a91':
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
superman
aca9ba74ca
Merge pull request #5713 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '8bb9331614be76bbb5f98c4dc235b1d3dff129c6':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
superman
8bb9331614
Merge pull request #5709 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '46b685fe678c9d3d4f284bf8f3a3053e979fca82':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
superman
46b685fe67
Merge pull request #5708 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '638e29e74265e3296ca9ef0f95429587bb06e0bf':
REPORT-58713 加些注释
REPORT-58713 决策报表中公式模拟计算的参数编辑窗口会出现“闪屏”现象
3 years ago
hades
5e4bd357d7
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
3 years ago
hades
720d610df5
REPORT-58533 附件模板中报表块无法进入编辑
3 years ago
方磊
fb1d0f8d57
REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确
3 years ago