Kobi-蒋科斌
5490ecead6
Pull request #15001 : 无JIRA任务 改了前端bug，更新一波js
...
Merge in DESIGN/design from ~KOBI/design:fbp/release to fbp/release
* commit 'afc912a6c689003642b7a233a7245a3ae9a3d889':
无JIRA任务 改了前端bug，更新一波js
3 months ago
Kobi
afc912a6c6
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
Kobi
871008078b
无JIRA任务 改了前端bug，更新一波js
3 months ago
0954155c4d
Pull request #15000 : REPORT-136580 【fr-fbp回归】JS编辑器的UI效果不好
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release
* commit '218dac3c1b80659b155b62846761b645af0fcb5c':
js高级编辑缩放
3 months ago
218dac3c1b
Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~renekton/design into fbp/release
3 months ago
d1fd96ae33
js高级编辑缩放
3 months ago
8ff4ed9592
Merge pull request #14998 in DESIGN/design from fbp/master to fbp/release
...
* commit '1873425299d985c2bec575e673502bc651fb6649':
3 months ago
Destiny.Lin-林锦龙
9fe8ad5403
Pull request #14988 : 无jira任务,适配驱动改动
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit 'eb911e021a6128d42d137d053631693412d43653':
无jira任务,适配驱动改动
3 months ago
Destiny.Lin
eb911e021a
无jira任务,适配驱动改动
3 months ago
1873425299
Merge pull request #14987 in DESIGN/design from fbp/release to fbp/master
...
* commit 'b09cf5abd277f3a9a14838a088e122e0cfb886e7': (287 commits)
REPORT-136473 & EPORT-136480 fix: 懒加载导致控件输入框事件异常
REPORT-135233 调整VcsOperator
REPORT-135233 调整AuthorityOperator
REPORT-135233 调整DecisionOperator
REPORT-135233 调整TplOperator
REPORT-135233 调整DataBaseTypeOperator
REPORT-135233 调整TemplateExportOperator
REPORT-135233 调整OrganizationOperator
REPORT-135233 调整TemplateChecker
REPORT-135233 调整VcsAutoCleanOperator
REPORT-135233 调整DataFetcher,CommitHelper
REPORT-135233 调整LockInfoOperator
REPORT-135233 调整ShareEmbeddedConverter
REPORT-135233 调整TableDataOperator和ConnectionOperator
REPORT-135233 调整FileNodes
REPORT-135996 fix: 视觉二次验收问题修复
REPORT-136212 fix: 图表创建面板优化
REPORT-136120 fix: 本地设计器启动日志级别需要全部配置保持一致
REPORT-135874 fix: 修复无法获取远程环境脱敏规则的问题
修改拖拽条颜色
...
3 months ago
Destiny.Lin-林锦龙
b09cf5abd2
Pull request #14976 : REPORT-135233 调整远程设计结构
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit 'b899c9c15b87d5674699707a93b5043f4fcfd522':
REPORT-135233 调整VcsOperator
REPORT-135233 调整AuthorityOperator
REPORT-135233 调整DecisionOperator
REPORT-135233 调整TplOperator
REPORT-135233 调整DataBaseTypeOperator
REPORT-135233 调整TemplateExportOperator
REPORT-135233 调整OrganizationOperator
REPORT-135233 调整TemplateChecker
REPORT-135233 调整VcsAutoCleanOperator
REPORT-135233 调整DataFetcher,CommitHelper
REPORT-135233 调整LockInfoOperator
REPORT-135233 调整ShareEmbeddedConverter
REPORT-135233 调整TableDataOperator和ConnectionOperator
REPORT-135233 调整FileNodes
3 months ago
c468de9839
Pull request #14979 : REPORT-136473 & EPORT-136480 fix: 懒加载导致控件输入框事件异常
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release
* commit 'f2865d95ff13ee0dfdd84984a533a93ee52447ff':
REPORT-136473 & EPORT-136480 fix: 懒加载导致控件输入框事件异常
3 months ago
f2865d95ff
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
9430e29cb0
REPORT-136473 & EPORT-136480 fix: 懒加载导致控件输入框事件异常
3 months ago
Destiny.Lin
b899c9c15b
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
...
# Conflicts:
# designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
# designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java
3 months ago
Destiny.Lin
4ab941d666
REPORT-135233 调整VcsOperator
3 months ago
Destiny.Lin
ceb90ba297
REPORT-135233 调整AuthorityOperator
3 months ago
Destiny.Lin
3a8e944ad6
REPORT-135233 调整DecisionOperator
3 months ago
Destiny.Lin
cfc6528297
REPORT-135233 调整TplOperator
3 months ago
Destiny.Lin
b12d108a7c
REPORT-135233 调整DataBaseTypeOperator
3 months ago
Destiny.Lin
b44b2fbc38
REPORT-135233 调整TemplateExportOperator
3 months ago
Destiny.Lin
26a22893b3
REPORT-135233 调整OrganizationOperator
3 months ago
Destiny.Lin
4107751f05
REPORT-135233 调整TemplateChecker
3 months ago
Destiny.Lin
be719446bf
REPORT-135233 调整VcsAutoCleanOperator
3 months ago
Destiny.Lin
9cbdb70f45
REPORT-135233 调整DataFetcher,CommitHelper
3 months ago
Destiny.Lin
e7cc3647f4
REPORT-135233 调整LockInfoOperator
3 months ago
Destiny.Lin
b2b7dc484b
REPORT-135233 调整ShareEmbeddedConverter
3 months ago
Destiny.Lin
c1e1ae1697
REPORT-135233 调整TableDataOperator和ConnectionOperator
3 months ago
Destiny.Lin
bfdd0b52bd
REPORT-135233 调整FileNodes
3 months ago
a3c89b079c
Pull request #14938 : REPORT-136212 & REPORT-135996 fbp-newui细节问题修复
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release
* commit 'e4d73d09ef8fa004759b5b2fbf7e9eb30fe80111':
REPORT-135996 fix: 视觉二次验收问题修复
REPORT-136212 fix: 图表创建面板优化
3 months ago
e4d73d09ef
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
7f61b231e5
REPORT-135996 fix: 视觉二次验收问题修复
3 months ago
8b440ef2dd
REPORT-136212 fix: 图表创建面板优化
3 months ago
74cc3d4196
Pull request #14937 : REPORT-136120 fix: 本地设计器启动日志级别需要全部配置保持一致
...
Merge in DESIGN/design from ~ANNER/design:fbp/release to fbp/release
* commit '87ba02b6812cb961730253b874be61cfa1dc1793':
REPORT-136120 fix: 本地设计器启动日志级别需要全部配置保持一致
3 months ago
87ba02b681
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
509142cbef
REPORT-136120 fix: 本地设计器启动日志级别需要全部配置保持一致
3 months ago
eae21136b7
Pull request #14927 : REPORT-136114 fix:老图表部分面板翻新
...
Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release
* commit '36e34a37d74308bed655aa9129c07ad8808780cf':
REPORT-136114 fix:老图表部分面板翻新
3 months ago
b02df5885b
Pull request #14932 : REPORT-136088 - 【fr-fbp回归】模板主题控件样式tab，布局问题
...
Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release
* commit 'fbaa15f962a62bf5733df2ba7597d5defbb53468':
修改拖拽条颜色
去除html标签
3 months ago
f5d6c56433
Pull request #14936 : REPORT-135874 fix: 修复无法获取远程环境脱敏规则的问题
...
Merge in DESIGN/design from ~ANNER/design:fbp/release to fbp/release
* commit 'b243d185f71b113c29214a4d9d1843efb796b8f4':
REPORT-135874 fix: 修复无法获取远程环境脱敏规则的问题
3 months ago
b243d185f7
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
f22127c6da
REPORT-135874 fix: 修复无法获取远程环境脱敏规则的问题
3 months ago
vito-刘恒霖
0d4f08bd45
Pull request #14933 : REPORT-135657 提供前端获取当前所有数据集的方式
...
Merge in DESIGN/design from ~VITO/c-design:fbp/release to fbp/release
* commit '7a808fe9873f36925743a550e672072f3429f9a8':
REPORT-135657 提供前端获取当前所有数据集的方式
3 months ago
fbaa15f962
修改拖拽条颜色
3 months ago
vito
7a808fe987
REPORT-135657 提供前端获取当前所有数据集的方式
3 months ago
c79e808d6b
Merge branch 'fbp/release' of ssh://code.fineres.com:7999/~renekton/design into fbp/release
3 months ago
df47e1220c
去除html标签
3 months ago
Destiny.Lin-林锦龙
e9cbbc948b
Pull request #14931 : REPORT-135879 【fr-fbp回归】次管保存数据中心模板，报错没权限
...
Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release
* commit '6c750089c7b6c5756d766f68bbb7c97839c2ea41':
REPORT-135879 【fr-fbp回归】次管保存数据中心模板，报错没权限
3 months ago
182e90673f
Pull request #14929 : REPORT-135680 fix:fbp回归问题修复
...
Merge in DESIGN/design from ~RICHARD.FANG/design:fbp/release to fbp/release
* commit 'dedc0dde723deb72eb4f11cae7cffb389485f0d4':
REPORT-135680 fix:fbp回归问题修复
3 months ago
Destiny.Lin
6c750089c7
Merge remote-tracking branch 'origin/fbp/release' into fbp/release
3 months ago
Destiny.Lin
80c26a2bdc
REPORT-135879 【fr-fbp回归】次管保存数据中心模板，报错没权限
3 months ago
Kobi-蒋科斌
Renekton-张世豪
superman
Destiny.Lin-林锦龙
Levy.Xie-解安森
Anner-王敬松
Anner
vito-刘恒霖
Richard.Fang-方超