superman
151da25be2
Merge pull request #12867 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'b2de40da21a90f0069ae25a205ea1e35981e46c9':
12 months ago
superman
b2de40da21
Merge pull request #12866 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'c8ce0eefbc7f59d28b26a8fb1239dc47d7f0e889':
12 months ago
superman
c8ce0eefbc
Merge pull request #12861 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'f17efcaaf1f44c97b1e705eb09238b91bc0578d6':
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
REPORT-104056 保持整体对齐
REPORT-105614 设计器去除webroot/druid服务
REPORT-104056 补充一下注释
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
REPORT-104056 统一布局
REPORT-104056 改下命名
REPORT-104056 【FR国际化】文字显示不全
REPORT-103529 完善
REPORT-103529 单测巡检前置修复-2
12 months ago
superman
f7d4355b46
Merge pull request #12833 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '6c3df65c831c7b4d467b0f65bf21c75352faf6ac':
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
12 months ago
superman
6c3df65c83
Merge pull request #12832 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'fd87ee34485bb4dff8178e3f0eb7889107ffa077':
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
12 months ago
superman
fd87ee3448
Merge pull request #12831 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'f17efcaaf1f44c97b1e705eb09238b91bc0578d6':
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
12 months ago
Coral.Chen-张晨
f17efcaaf1
Pull request #12825 : REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
...
Merge in DESIGN/design from ~CORAL.CHEN/design:final/11.0 to final/11.0
* commit 'ce1a9402df7a6ff6aadc44f7a2a837364a3f86a6':
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
12 months ago
Coral.Chen
ce1a9402df
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
12 months ago
superman
006cfc995e
Merge pull request #12822 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '8f72cda989ec65a7ffbd14d116cef6e852c157a0':
12 months ago
superman
8f72cda989
Merge pull request #12821 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '889124b6af1c79f165b848a48a98daa56e8b9e35':
12 months ago
superman
889124b6af
Merge pull request #12820 in DESIGN/design from final/11.0 to release/11.0
...
* commit '8e72698f28ce317f5ee4708aac5f12b8c350f7e7':
12 months ago
superman
8e72698f28
Merge pull request #12813 in DESIGN/design from release/11.0 to final/11.0
...
* commit '5706da81addd9a78d6cd8bf02cfbcf8bdae17f5d':
REPORT-104056 保持整体对齐
REPORT-105614 设计器去除webroot/druid服务
REPORT-104056 补充一下注释
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
REPORT-104056 统一布局
REPORT-104056 改下命名
REPORT-104056 【FR国际化】文字显示不全
REPORT-103529 完善
REPORT-103529 单测巡检前置修复-2
12 months ago
superman
391bfbdd58
Merge pull request #12803 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '665cf72a4ffd5cec39c1522788183dec48467573':
REPORT-105614 设计器去除webroot/druid服务
12 months ago
superman
665cf72a4f
Merge pull request #12802 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '5706da81addd9a78d6cd8bf02cfbcf8bdae17f5d':
REPORT-105614 设计器去除webroot/druid服务
12 months ago
vito-刘恒霖
5706da81ad
Pull request #12786 : REPORT-105614 设计器去除webroot/druid服务
...
Merge in DESIGN/design from ~VITO/c-design:new-ui to release/11.0
* commit '01765fae603fb678dd89c906e1f24a447c500c2d':
REPORT-105614 设计器去除webroot/druid服务
12 months ago
superman
d2fd4b0a7f
Merge pull request #12795 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'a42fcdd3a916800134ed37d2dd5813f411a355d9':
REPORT-104056 保持整体对齐
REPORT-104056 补充一下注释
REPORT-104056 统一布局
REPORT-104056 改下命名
REPORT-104056 【FR国际化】文字显示不全
12 months ago
superman
a42fcdd3a9
Merge pull request #12794 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'ff2a006b08d263252e6a27fd8d44cb034e0eaaac':
REPORT-104056 保持整体对齐
REPORT-104056 补充一下注释
REPORT-104056 统一布局
REPORT-104056 改下命名
REPORT-104056 【FR国际化】文字显示不全
12 months ago
Obo-王学仁
ff2a006b08
Pull request #12736 : REPORT-104056 【FR国际化】文字显示不全
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'e96700795ec43ffb8b362ef9e722aa25abefd2a0':
REPORT-104056 保持整体对齐
REPORT-104056 补充一下注释
REPORT-104056 统一布局
REPORT-104056 改下命名
REPORT-104056 【FR国际化】文字显示不全
12 months ago
obo
e96700795e
REPORT-104056 保持整体对齐
12 months ago
vito
01765fae60
REPORT-105614 设计器去除webroot/druid服务
12 months ago
obo
7173c158ba
REPORT-104056 补充一下注释
12 months ago
superman
f3b9386f39
Merge pull request #12769 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '169cf7cb8e9467474a0a00fffd3def64a8da3792':
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
12 months ago
superman
169cf7cb8e
Merge pull request #12768 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '3b17b8637f74d7378a3172eb80d030c016e24119':
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
12 months ago
zheng-郑潇
3b17b8637f
Pull request #12753 : fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '6c70712c4313b30cf70f4d5ac9e25c0320e0ecc0':
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
12 months ago
shine
6c70712c43
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
12 months ago
shine
d5c10c6f64
fix:报表块编辑返回大屏画布编辑 右侧属性面板弹框需要都隐藏 #REPORT-105397
12 months ago
obo
c89113e8f1
REPORT-104056 统一布局
1 year ago
obo
fd72018286
REPORT-104056 改下命名
1 year ago
obo
6b0c4e1dec
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
1 year ago
obo
40b6475add
REPORT-104056 【FR国际化】文字显示不全
1 year ago
superman
6e88379ec2
Merge pull request #12735 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '69be0e9ff3c0f9b0dcff8da0cfb9e294064765b8':
1 year ago
superman
69be0e9ff3
Merge pull request #12734 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '8b0f17ea3119c80db868d4acac43887220a4ae72':
1 year ago
superman
8b0f17ea31
Merge pull request #12711 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit '0da71c51a78945b21a65ca0932519f588f2c1d11':
1 year ago
superman
0da71c51a7
Merge pull request #12710 in DESIGN/design from feature/x to bugfix/11.0
...
* commit 'd1f620e2107b6e6f4d822c6c715a97932fc73594':
1 year ago
superman
d1f620e210
Merge pull request #12693 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '9fe9b55f55910550a5598f988c29e8e8dce1f1a3':
REPORT-103529 完善
REPORT-103529 单测巡检前置修复-2
1 year ago
superman
9fe9b55f55
Merge pull request #12692 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '22d12d0af5b8c3df2704ab0498046e950ffa174b':
REPORT-103529 完善
REPORT-103529 单测巡检前置修复-2
1 year ago
superman
22d12d0af5
Merge pull request #12691 in DESIGN/design from final/11.0 to release/11.0
...
* commit '6bfbd450c011562fc0f9e9b56d786fa50bfb9995':
1 year ago
superman
6bfbd450c0
Merge pull request #12690 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '0b5a0e51d6531e72e787a39d4e0085035f88e9ef':
1 year ago
Obo-王学仁
89320031fa
Pull request #12628 : REPORT-103529 单测巡检前置修复-2
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '7a8ce0346d63271e9f1316eb483ad70ac6ba4334':
REPORT-103529 完善
REPORT-103529 单测巡检前置修复-2
1 year ago
superman
0b5a0e51d6
Merge pull request #12683 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '9d3cccd6efa6855e3166ea16b04b13af317966f6': (28 commits)
REPORT-103382 切换移动端自定义样式,类转换异常
REPORT-97143 延期,屏蔽入口
REPORT-104017 不专门适配fvs了,编辑窗口根据模版主题适配图层的功能可以兼容fvs场景,fvs创建图层时处理一下为black即可
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
REPORT-104017 删除没用的代码
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-98466 FileNodeConstants中使用List存储文件类型可能导致重复
REPORT-100238 fix: 桌面上用设计器打不开fvs文件
REPORT-103732 海外版本地图组件的GIS图层优化-fvs下标准自动配置切换问题
加个注释 #none
REPORT-101812 fix: 国际化文本截断
fix: 保留“=” #none
fix: 替换图表用到的TinyFormulaPane #REPORT-102440
REPORT-103247 设计器更新后,未删除原来的【特殊字符导出优化】
REPORT-102440 fix:清除公式内容后不显示"$$$"
REPORT-102520 fix:代码质量
REPORT-102520 fix:面板样式优化
...
1 year ago
superman
2249707322
Merge pull request #12685 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '8ab5a7ceb3cc18c68589c2a576490808a7d387b3':
REPORT-103382 切换移动端自定义样式,类转换异常
REPORT-97143 延期,屏蔽入口
REPORT-104017 不专门适配fvs了,编辑窗口根据模版主题适配图层的功能可以兼容fvs场景,fvs创建图层时处理一下为black即可
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
REPORT-104017 删除没用的代码
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
1 year ago
superman
8ab5a7ceb3
Merge pull request #12684 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '7acaaf93b62ed3209ab0b08ed45cff656734ccb3':
REPORT-103382 切换移动端自定义样式,类转换异常
REPORT-97143 延期,屏蔽入口
REPORT-104017 不专门适配fvs了,编辑窗口根据模版主题适配图层的功能可以兼容fvs场景,fvs创建图层时处理一下为black即可
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
REPORT-104017 删除没用的代码
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
1 year ago
superman
7acaaf93b6
Merge pull request #12682 in DESIGN/design from final/11.0 to release/11.0
...
* commit '9d3cccd6efa6855e3166ea16b04b13af317966f6':
REPORT-103382 切换移动端自定义样式,类转换异常
REPORT-97143 延期,屏蔽入口
REPORT-104017 不专门适配fvs了,编辑窗口根据模版主题适配图层的功能可以兼容fvs场景,fvs创建图层时处理一下为black即可
REPORT-104133 【文本类控件】文本类控件新功能入口在设计器上打开
REPORT-104017 删除没用的代码
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
REPORT-104017 海外版本地图组件的GIS图层优化-fvs下切换gis图层配置时自动会由mapbox变为黑色
1 year ago
obo
7a8ce0346d
REPORT-103529 完善
1 year ago
Coral.Chen-张晨
9d3cccd6ef
Pull request #12668 : REPORT-103382 切换移动端自定义样式,类转换异常
...
Merge in DESIGN/design from ~CORAL.CHEN/design:final/11.0 to final/11.0
* commit 'efaa5e21a76a679a34f50fb86577b13100bd0910':
REPORT-103382 切换移动端自定义样式,类转换异常
1 year ago
Coral.Chen
efaa5e21a7
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
1 year ago
Coral.Chen
dc517ad4c3
REPORT-103382 切换移动端自定义样式,类转换异常
1 year ago
Coral.Chen-张晨
25e5863a2c
Pull request #12667 : REPORT-97143 延期,屏蔽入口
...
Merge in DESIGN/design from ~CORAL.CHEN/design:final/11.0 to final/11.0
* commit 'a5bd21e7c75ad12bfade8008c8670c0f78917272':
REPORT-97143 延期,屏蔽入口
1 year ago
Coral.Chen
a5bd21e7c7
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
1 year ago
Coral.Chen
ba6a74caaf
REPORT-97143 延期,屏蔽入口
1 year ago