b51999f0c4
Merge pull request #15197 in DESIGN/design from fbp/master to fbp/release
...
* commit 'f0928175786ec37c2626b709f80f66e59d3445f4':
无JIRA任务 改了前端bug，更新一波js
REPORT-138445 fix: 优化文本域UI问题
REPORT-138445 fix: 优化文本域UI问题
1 month ago
Kobi-蒋科斌
f092817578
Pull request #15188 : 无JIRA任务 改了前端bug，更新一波js
...
Merge in DESIGN/design from ~KOBI/design:fbp/master to fbp/master
* commit '70b58c530fbf5dee9bbcbc8d954e757557f98ab0':
无JIRA任务 改了前端bug，更新一波js
1 month ago
1d5ff9d350
Pull request #15186 : REPORT-138445 fix: 优化文本域UI问题
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/master to fbp/master
* commit 'e1481dd7eb9008fc61785b51225e75b6839b0730':
REPORT-138445 fix: 优化文本域UI问题
REPORT-138445 fix: 优化文本域UI问题
1 month ago
Kobi
70b58c530f
Merge remote-tracking branch 'origin/fbp/master' into fbp/master
...
# Conflicts:
# designer-base/src/main/resources/com/fr/design/data/tabledata/datacenter/web/data-choose.main.js
1 month ago
Kobi
982af61a03
无JIRA任务 改了前端bug，更新一波js
1 month ago
e1481dd7eb
REPORT-138445 fix: 优化文本域UI问题
1 month ago
de64bbf7a1
REPORT-138445 fix: 优化文本域UI问题
1 month ago
289398a4ef
Merge pull request #15184 in DESIGN/design from fbp/master to fbp/release
...
* commit '51a9b4032060cc10c69412742cd0db8a02952100':
REPORT-138544 【fr-fbp冒烟】服务器数据集没有数据连接的权限，异常报错不符合预期
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
REPORT-138440 fix: 字体大小调整
REPORT-138572 【fr-fbp冒烟】【数据源】模板左下角点击加号新建数据集，名称不会和已有的服务器数据集校验
1 month ago
51a9b40320
Pull request #15182 : REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/master to fbp/master
* commit '15d8625836eaef2aa8b64903a26ecd71d54a0638':
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
1 month ago
Destiny.Lin-林锦龙
f99e7823ce
Pull request #15183 : REPORT-138572 【fr-fbp冒烟】【数据源】模板左下角点击加号新建数据集，名称不会和已有的服务器数据集校验 & REPORT-138544 【fr-fbp冒烟】服务器数据集没有数据连接的权限，异常报错不符合预期
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/master to fbp/master
* commit 'cd2a7064716c37043df4773919686472f7d5df99':
REPORT-138544 【fr-fbp冒烟】服务器数据集没有数据连接的权限，异常报错不符合预期
REPORT-138572 【fr-fbp冒烟】【数据源】模板左下角点击加号新建数据集，名称不会和已有的服务器数据集校验
1 month ago
Destiny.Lin
cd2a706471
Merge remote-tracking branch 'origin/fbp/master' into fbp/master
1 month ago
Destiny.Lin
5668d56e55
REPORT-138544 【fr-fbp冒烟】服务器数据集没有数据连接的权限，异常报错不符合预期
1 month ago
b4ccd32130
Pull request #15180 : REPORT-138440 fix: 字体大小调整
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/master to fbp/master
* commit 'eb76f2348777bfbace045a9aef72f1b43c3cdadd':
REPORT-138440 fix: 字体大小调整
1 month ago
15d8625836
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
1 month ago
08068d56e7
REPORT-138579 fix: ComboBox宽度重复缩放导致布局异常
1 month ago
eb76f23487
REPORT-138440 fix: 字体大小调整
1 month ago
1db4d03e1a
Pull request #15179 : 无JIRA： 修复冲突 & master -> release
...
Merge in DESIGN/design from ~ANNER/design:fbp/release to fbp/release
* commit '3d8cf6c65ef2b4287683f9a2bcc2112f3f17ec92': (37 commits)
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
REPORT-138445 wms图层连接问题 修复一个逻辑问题
REPORT-138420 & REPORT-138440 fix: 翻新面板，engine-x 国际文案修复
REPORT-138297 & REPORT-138273 fix: 懒加载面板保存事件问题统一修复
REPORT-138379 fix：模板web属性无法添加插件按钮
REPORT-138445 wms图层连接问题 获取图层逻辑被注释掉了，重新加回来
REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全
REPORT-138407 fix: 内置服务器增加抽数缓存模块
REPORT-137667 【fr-fbp冒烟】【数据源】服务器数据集设置分页查询sql不生效
REPORT-138360 fix: 本地获取规则需要单独补充
增加注释
模板填报属性不能选中修复
改为常量
REPORT-135996 fix：属性面板视觉验收问题
标题选中图标大小&文本与第一行对齐
REPORT-138178 fix: 权限编辑阴影大小问题
REPORT-138177 fix:国际化显示不全增加tooltip
REPORT-137840 fix:事件-js参数区域无滚动条修复
REPORT-137614 fix:存储过程报错提示调整为折叠弹窗
...
1 month ago
3d8cf6c65e
Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~anner/design into fbp/release
1 month ago
Destiny.Lin
47bb397682
REPORT-138572 【fr-fbp冒烟】【数据源】模板左下角点击加号新建数据集，名称不会和已有的服务器数据集校验
1 month ago
09c113aa30
Pull request #15177 : REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/master to fbp/master
* commit 'd4fc94a7a1f9f886be16c9e86ae3c17fdd3a6d34':
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
1 month ago
6945b93dfb
Pull request #15165 : REPORT-138445 wms图层连接问题
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:fbp/master to fbp/master
* commit '513fceea1d0de8e1c3cc6d71af14fc3adfa866f2':
REPORT-138445 wms图层连接问题 修复一个逻辑问题
REPORT-138445 wms图层连接问题 获取图层逻辑被注释掉了，重新加回来
1 month ago
d4fc94a7a1
Merge remote-tracking branch 'origin/fbp/master' into fbp/master
...
# Conflicts:
# designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
1 month ago
6423b82643
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
1 month ago
583b884693
REPORT-138421 fix:连续配置表头导致上一个表头配置丢失问题修复
1 month ago
497fba7f41
Pull request #15175 : REPORT-138297 & REPORT-138273 fix: 懒加载面板保存事件问题统一修复
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/master to fbp/master
* commit 'ed51311d80249fea1fe6e928a2f3d71d9950911e':
REPORT-138297 & REPORT-138273 fix: 懒加载面板保存事件问题统一修复
1 month ago
34b62624ea
Pull request #15176 : REPORT-138420 & REPORT-138440 fix: 翻新面板，engine-x 国际文案修复
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/master to fbp/master
* commit 'be1d034082ad0e7f18c0f64b4cb73159f92a16a3':
REPORT-138420 & REPORT-138440 fix: 翻新面板，engine-x 国际文案修复
1 month ago
Coral.Chen-张晨
e15fb607fb
Pull request #15166 : REPORT-138379 fix：模板web属性无法添加插件按钮
...
Merge in DESIGN/design from ~CORAL.CHEN/design:fbp/master to fbp/master
* commit 'fce46955fc4733ad34bf8e477ec4552c7711f5ec':
REPORT-138379 fix：模板web属性无法添加插件按钮
1 month ago
513fceea1d
REPORT-138445 wms图层连接问题
...
修复一个逻辑问题
1 month ago
be1d034082
REPORT-138420 & REPORT-138440 fix: 翻新面板，engine-x 国际文案修复
1 month ago
ed51311d80
REPORT-138297 & REPORT-138273 fix: 懒加载面板保存事件问题统一修复
1 month ago
Coral.Chen
fce46955fc
REPORT-138379 fix：模板web属性无法添加插件按钮
1 month ago
f278df2ced
Pull request #15163 : REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/master to fbp/master
* commit 'd7cc5538ba06f46943f3729d122165b247fb3dc7':
REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全
1 month ago
d7e010a6fe
REPORT-138445 wms图层连接问题
...
获取图层逻辑被注释掉了，重新加回来
1 month ago
d7cc5538ba
Merge branch 'fbp/master' of ssh://code.fineres.com:7999/~renekton/design into fbp/master
1 month ago
c2f8de3464
REPORT-138355【fr-fbp冒烟】标签富文本更多颜色显示不全
1 month ago
f990318eca
Pull request #15162 : REPORT-138407 fix: 内置服务器增加抽数缓存模块
...
Merge in DESIGN/design from ~ANNER/design:fbp/master to fbp/master
* commit '9e35bd61826cada5e9c610fa1de8304da561c409':
REPORT-138407 fix: 内置服务器增加抽数缓存模块
1 month ago
9e35bd6182
Merge remote-tracking branch 'origin/fbp/master' into fbp/master
1 month ago
ef889b08bf
REPORT-138407 fix: 内置服务器增加抽数缓存模块
1 month ago
Destiny.Lin-林锦龙
52b671861c
Pull request #15161 : REPORT-137667 【fr-fbp冒烟】【数据源】服务器数据集设置分页查询sql不生效
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/master to fbp/master
* commit '46ab19f9f167f5f0cc0aeb2f218b58f155943312':
REPORT-137667 【fr-fbp冒烟】【数据源】服务器数据集设置分页查询sql不生效
1 month ago
Destiny.Lin
46ab19f9f1
REPORT-137667 【fr-fbp冒烟】【数据源】服务器数据集设置分页查询sql不生效
1 month ago
7696631148
Pull request #15160 : REPORT-138360 fix: 本地获取规则需要单独补充
...
Merge in DESIGN/design from ~ANNER/design:fbp/master to fbp/master
* commit '337132bed08c05d77720a0712b61fe8701b2d258':
REPORT-138360 fix: 本地获取规则需要单独补充
1 month ago
337132bed0
Merge remote-tracking branch 'origin/fbp/master' into fbp/master
1 month ago
b4976cf30d
REPORT-138360 fix: 本地获取规则需要单独补充
1 month ago
ac8c0c3354
Pull request #15150 : REPORT-138224 【fr-fbp回归】填报属性设置中，选中字段时的效果不正常
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/master to fbp/master
* commit '28c9e9d3864f628048877bf9b5999082e9db6689':
增加注释
模板填报属性不能选中修复
1 month ago
28c9e9d386
增加注释
1 month ago
09506db62a
Merge branch 'fbp/master' of ssh://code.fineres.com:7999/~renekton/design into fbp/master
1 month ago
1111fa1700
模板填报属性不能选中修复
1 month ago
ab057fa80f
Pull request #15146 : REPORT-137614 & REPORT-137840 & REPORT-138177 fbp冒烟测试问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/master to fbp/master
* commit '85392ddf1da8be9420e660e6bcf3aad1a6e0a162':
REPORT-138177 fix:国际化显示不全增加tooltip
REPORT-137840 fix:事件-js参数区域无滚动条修复
REPORT-137614 fix:存储过程报错提示调整为折叠弹窗
1 month ago
f2fbbba7c5
Pull request #15148 : REPORT-135968 【视觉验收】设计器cpt主页部分
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/master to fbp/master
* commit 'd3954073305658e70b42414bd7d3bb7a60453ca7':
改为常量
标题选中图标大小&文本与第一行对齐
1 month ago
5c1e8be413
Pull request #15149 : REPORT-135996 fix：属性面板视觉验收问题
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/master to fbp/master
* commit '59145032022da02e057b8c5519d8eafb74661489':
REPORT-135996 fix：属性面板视觉验收问题
1 month ago
superman
Kobi-蒋科斌
Levy.Xie-解安森
Destiny.Lin-林锦龙
Zongyu.Wang-王宗雨
Anner-王敬松
Anner
Richard.Fang-方超
Shengzu.Xue-薛胜祖
Coral.Chen-张晨
Renekton-张世豪