lemon
2d971b36ef
Merge remote-tracking branch 'origin/newui' into newui
3 months ago
Zongyu.Wang-王宗雨
e32906d181
Merging in latest from upstream (DESIGN/design:refs/heads/newui)
...
* commit '414433fc2365e890e248927655453beced9a53f3':
REPORT-130919 & REPORT-130916 & REPORT-130911 &REPORT-130847 & REPORT-130831 & REPORT-130830 & REPORT-130756 & REPORT-130707 & REPORT-130263 fix:【NewUI】问题修复
边框问题
边框问题
修改width
单元格元素-数据列-过滤普通未换行
模板主题配置;单元格元素缩放,新增图标
3 months ago
lemon
b6a6c82fed
REPORT-127437 fix:数据筛选缩放问题
3 months ago
Richard.Fang-方超
414433fc23
Pull request #14604 : REPORT-130919 & REPORT-130916 & REPORT-130911 &REPORT-130847 & REPORT-130831 & REPORT-130830 & REPORT-130756 & REPORT-130707 & REPORT-130263 fix:【NewUI】问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:newui to newui
* commit 'fa14e20e37b0cea1d8fedd3bbbf87ab17754f444':
REPORT-130919 & REPORT-130916 & REPORT-130911 &REPORT-130847 & REPORT-130831 & REPORT-130830 & REPORT-130756 & REPORT-130707 & REPORT-130263 fix:【NewUI】问题修复
3 months ago
Richard.Fang
fa14e20e37
REPORT-130919 & REPORT-130916 & REPORT-130911 &REPORT-130847 & REPORT-130831 & REPORT-130830 & REPORT-130756 & REPORT-130707 & REPORT-130263 fix:【NewUI】问题修复
3 months ago
Renekton-张世豪
1175e393dc
Pull request #14603 : REPORT-130408 - 模板主题设置窗缩放问题 & REPORT-130959 - 多个待保存项 & REPORT-130849 - 设计器操作-控件设置-提交入库页面问题 有滚轮 & REPORT-130914 - 单元格元素-图表缩放问题合集
...
Merge in DESIGN/design from ~RENEKTON/design:newui to newui
* commit 'b40ffe183acaf81343321c8289b7661770a886b2':
边框问题
边框问题
修改width
单元格元素-数据列-过滤普通未换行
模板主题配置;单元格元素缩放,新增图标
3 months ago
renekton
b40ffe183a
边框问题
3 months ago
renekton
da67399d43
边框问题
3 months ago
lemon
0942cb783b
REPORT-127437 fix:数据字典增加类型问题修复
3 months ago
Coral.Chen-张晨
5466690b3e
Pull request #14602 : REPORT-130399 fix:服务器配置屏蔽FRM入口
...
Merge in DESIGN/design from ~CORAL.CHEN/design:fbp-1.0 to fbp-1.0
* commit '7fc365fc3b55570b89750c437b58cf4c3d5352d6':
REPORT-130399 fix:服务器配置屏蔽FRM入口
3 months ago
Coral.Chen
7fc365fc3b
Merge remote-tracking branch 'origin/fbp-1.0' into fbp-1.0
3 months ago
Coral.Chen
f20b3bb904
REPORT-130399 fix:服务器配置屏蔽FRM入口
3 months ago
Destiny.Lin-林锦龙
86dff4fdd9
Pull request #14601 : 无jira任务,修复打包参数
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0
* commit '10af312b7d41355fb02bd05335644ce9883c067b':
无jira任务,修复打包参数
3 months ago
Destiny.Lin
10af312b7d
Merge remote-tracking branch 'origin/fbp-1.0' into fbp-1.0
3 months ago
Destiny.Lin
bd3f73d294
无jira任务,修复打包参数
3 months ago
vito-刘恒霖
1b0273ed84
Pull request #14590 : REPORT-113978 设计器对接数据中心设计器部分
...
Merge in DESIGN/design from ~VITO/c-design:fbp-1.0 to fbp-1.0
* commit 'c4d451bcd1ad90e8b84ad65275f05165436157ee':
REPORT-113978 设计器对接数据中心设计器部分
3 months ago
vito
c4d451bcd1
REPORT-113978 设计器对接数据中心设计器部分
3 months ago
Anner-王敬松
68691841ef
Pull request #14589 : 无JIRA fix: 修复打包
...
Merge in DESIGN/design from ~ANNER/design:fbp-1.0 to fbp-1.0
* commit '01b0d85e62cd823ea76d6e2245f6b0d7317d3acc':
无JIRA fix: 修复打包
无JIRA fix: 修复打包
3 months ago
Anner
01b0d85e62
无JIRA fix: 修复打包
3 months ago
renekton
da0fc69398
修改width
3 months ago
Anner
917cba3f70
无JIRA fix: 修复打包
3 months ago
lemon
b852fa8192
REPORT-127437 fix: 新建 poly sheet 按钮缩放问题
3 months ago
renekton
0e08cf1fbe
单元格元素-数据列-过滤普通未换行
3 months ago
renekton
9b6a5200e0
模板主题配置;单元格元素缩放,新增图标
3 months ago
Destiny.Lin-林锦龙
30d3a81139
Pull request #14585 : REPORT-130368 版本管理自动清理不会触发 & REPORT-130872 FBP设计器和平台 新建sql数据集,设置公式参数保存后再次打开没有保存上
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0
* commit '46d3bcc5941b19d850e4c1dce0276bfbcf9d53ac':
REPORT-130872 FBP设计器和平台 新建sql数据集,设置公式参数保存后再次打开没有保存上
REPORT-130368 版本管理自动清理不会触发
3 months ago
Destiny.Lin
46d3bcc594
Merge remote-tracking branch 'origin/fbp-1.0' into fbp-1.0
3 months ago
Destiny.Lin
e8c6d5c2f5
REPORT-130872 FBP设计器和平台 新建sql数据集,设置公式参数保存后再次打开没有保存上
3 months ago
lemon
be4d84a174
REPORT-127437 fix: 图表条件属性翻新,视觉问题调整
3 months ago
Destiny.Lin
b97771d771
REPORT-130368 版本管理自动清理不会触发
3 months ago
Destiny.Lin-林锦龙
f61c8c9615
Pull request #14582 : REPORT-130377 fbp通过demo启动还是会进入起始页 & REPORT-130404 fbp设计器远程82,已有用户、部门、角色都拿不到数据
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0
* commit '49371411dc8e78469543729a5d22c04bbb368dfe':
REPORT-130377 fbp通过demo启动还是会进入起始页
REPORT-130404 fbp设计器远程82,已有用户、部门、角色都拿不到数据
3 months ago
Destiny.Lin
49371411dc
REPORT-130377 fbp通过demo启动还是会进入起始页
3 months ago
Destiny.Lin
9d90c29ce0
REPORT-130404 fbp设计器远程82,已有用户、部门、角色都拿不到数据
3 months ago
lemon
176bc51aac
Merge remote-tracking branch 'origin/newui' into newui
3 months ago
Levy.Xie-解安森
3f57114b39
Pull request #14571 : REPORT-130803 & REPORT-130794 & REPORT-130779 & REPORT-130717 & REPORT-130669 & REPORT-130852 【NewUI】视觉&测试验收问题修复
...
Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui
* commit '4268769dbbc93e529b97d9d348785b1365d20d59':
REPORT-113994 【NewUI】视觉&测试验收问题修复
REPORT-113994 【NewUI】视觉&测试验收问题修复
3 months ago
Levy.Xie-解安森
4268769dbb
REPORT-113994 【NewUI】视觉&测试验收问题修复
3 months ago
Levy.Xie-解安森
77bb5397c3
REPORT-113994 【NewUI】视觉&测试验收问题修复
3 months ago
Renekton-张世豪
1e4385789c
Pull request #14570 : REPORT-130723 - 单元格元素-图表-样式-图例-布局图标和弹窗UI
...
Merge in DESIGN/design from ~RENEKTON/design:newui to newui
* commit '43a6f35aabad58fdff0222fd6b3fd282f703d8f1':
vcs问题待产品确认再修改
边框问题
高dpi缩放,控件不可见修复
vcs版本管理关闭其他所有模板时保存模板时版本不更新问题修改
图例自定义位置弹窗缩放,关闭其他模板保存版本未更新问题,左右面板分割位置缩放
3 months ago
Richard.Fang-方超
7c5d8d3b33
Pull request #14568 : REPORT-127436【NewUI】fix:视觉验收问题修复&REPORT-130699插入数据列可选列为空修复&REPORT-130323设计器tab页列表UI问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:newui to newui
* commit 'c4e805a132959a55fe47663f1c90ec36ec79d3aa':
REPORT-127436【NewUI】fix:视觉验收问题修复&REPORT-130699插入数据列可选列为空修复&REPORT-130323设计器tab页列表UI问题修复
REPORT-127436【NewUI】fix:视觉验收问题修复&REPORT-130699插入数据列可选列为空修复&REPORT-130323设计器tab页列表UI问题修复
3 months ago
renekton
43a6f35aab
vcs问题待产品确认再修改
3 months ago
lemon
0f217212bd
REPORT-127437 fix: 视觉问题修复
3 months ago
renekton
0650f683e2
边框问题
3 months ago
renekton
1c5e509a36
高dpi缩放,控件不可见修复
3 months ago
renekton
c095678433
vcs版本管理关闭其他所有模板时保存模板时版本不更新问题修改
3 months ago
Destiny.Lin-林锦龙
532a83fc2f
Pull request #14569 : REPORT-114392 FR-FBP版本本地设计适配 修复部分数据集问题&修复打包
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0
* commit 'd0dde705cd1a74deeaa359e03e5a2520d0f63615':
REPORT-114392 FR-FBP版本本地设计适配 修复打包问题
Revert "REPORT-113978 设计器对接数据中心"
Revert "无jira任务 代码质量"
REPORT-114392 FR-FBP版本本地设计适配 修复部分数据集问题
3 months ago
Destiny.Lin
d0dde705cd
REPORT-114392 FR-FBP版本本地设计适配 修复打包问题
3 months ago
Destiny.Lin
51a4197ecf
Revert "REPORT-113978 设计器对接数据中心"
...
This reverts commit e1db078347
.
3 months ago
Destiny.Lin
6bd18381a7
Revert "无jira任务 代码质量"
...
This reverts commit fa0a3073db
.
3 months ago
Richard.Fang
c4e805a132
Merge remote-tracking branch 'origin/newui' into newui
...
# Conflicts:
# designer-base/src/main/java/com/fine/theme/light/ui/laf/FineLaf.java
# designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
3 months ago
Richard.Fang
4cd866d10f
REPORT-127436【NewUI】fix:视觉验收问题修复&REPORT-130699插入数据列可选列为空修复&REPORT-130323设计器tab页列表UI问题修复
3 months ago
Destiny.Lin
e5d5075c61
Merge remote-tracking branch 'origin/fbp-1.0' into fbp-1.0
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java
3 months ago