superman
e633cf6477
Merge pull request #12395 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '9d6b475b15be7aa5a69af8df68f25a70d165d77d':
1 year ago
superman
9d6b475b15
Merge pull request #12394 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '2654840cb8f5df921150bff8b167ce43c363a196':
1 year ago
superman
2654840cb8
Merge pull request #12393 in DESIGN/design from final/11.0 to release/11.0
...
* commit '406c463ba637107d6c41fd5cdfd107c1473a5c15':
1 year ago
superman
406c463ba6
Merge pull request #12392 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'f678686892424ed13e816682b049763bc97943bb':
1 year ago
superman
f678686892
Merge pull request #12387 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '158d215cedc7778a6be30ea4eac19c66cc734e56': (60 commits)
REPORT-99813 fix: 插件商店svg图片加载
无jira任务 chore: 代码工程适配apple silicon架构
REPORT-89867 插件管理整体优化 fix:兼容问题
REPORT-98903 fix: jxbrowser v7自动启动V6
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-99320 插件管理整体优化-设计器内单个插件更新的提示没有显示哪个插件更新,和平台提示文本不一致
REPORT-99332 设计器文本输入框文本被自动移除的问题 rt, 把 trim 取消掉
REPORT-97972 回退一下自己代码库的改动
REPORT-97972 回退一下自己代码库的改动
REPORT-97972 【FR国际化】文字显示不全
REPORT-99073 插件管理整体优化-设计器内,批量禁用、启用插件没有效果
REPORT-98879 修复jxbrowser7在windows下路径问题
Revert "REPORT-80651 模板版本管理重构一期补交"
Revert "REPORT-91839 模板版本管理二期"
Revert "REPORT-91839 模板版本管理二期 修复规范问题"
Revert "REPORT-91839 模板版本管理二期 完善一下判断逻辑,增加自动保存标签设置"
Revert "REPORT-91839 模板版本管理二期 优化判断新老模式的逻辑,事件响应改为Config准备后进行"
Revert "REPORT-91839 模板版本管理二期 补充按钮交互,消除冗余代码"
...
1 year ago
obo
1cca82e930
Merge remote-tracking branch 'origin/bugfix/11.0' into bugfix/11.0
1 year ago
obo
d41730efa0
REPORT-99850 公式面板 在参数后按任意字母都会变成$符号
1 year ago
superman
6da64cba54
Merge pull request #12376 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'b136d4856511210407be3252e94461b3d2dd0152':
REPORT-99813 fix: 插件商店svg图片加载
Revert "无jira任务 代码工程适配apple silicon架构"
无jira任务 chore: 代码工程适配apple silicon架构
1 year ago
superman
b136d48565
Merge pull request #12375 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '1684dea0f5914fdabbc57dea7a66edfdff2b0e36':
REPORT-99813 fix: 插件商店svg图片加载
Revert "无jira任务 代码工程适配apple silicon架构"
无jira任务 chore: 代码工程适配apple silicon架构
1 year ago
superman
1684dea0f5
Merge pull request #12374 in DESIGN/design from final/11.0 to release/11.0
...
* commit '158d215cedc7778a6be30ea4eac19c66cc734e56':
REPORT-99813 fix: 插件商店svg图片加载
无jira任务 chore: 代码工程适配apple silicon架构
1 year ago
vito-刘恒霖
158d215ced
Pull request #12368 : REPORT-99813 fix: 插件商店svg图片加载
...
Merge in DESIGN/design from ~VITO/c-design:final/11.0 to final/11.0
* commit 'c0c3af61d4bee7852f623fb55f3bdc47e07a2c64':
REPORT-99813 fix: 插件商店svg图片加载
1 year ago
vito
c0c3af61d4
REPORT-99813 fix: 插件商店svg图片加载
1 year ago
vito-刘恒霖
d433b24d4f
Pull request #12367 : 无jira任务 Revert "代码工程适配apple silicon架构"
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit 'fb19a3d308815467548a524eaca0e3f2dd88d260':
Revert "无jira任务 代码工程适配apple silicon架构"
1 year ago
vito
fb19a3d308
Revert "无jira任务 代码工程适配apple silicon架构"
...
This reverts commit d988986347
.
1 year ago
vito-刘恒霖
7373989c06
Pull request #12366 : 无jira任务 chore: 代码工程适配apple silicon架构
...
Merge in DESIGN/design from ~VITO/c-design:final/11.0 to final/11.0
* commit '40dd1d8e9cc60fb1dd6a3351db502cd4160d829b':
无jira任务 chore: 代码工程适配apple silicon架构
1 year ago
vito
40dd1d8e9c
无jira任务 chore: 代码工程适配apple silicon架构
1 year ago
superman
050fb4b8d5
Merge pull request #12365 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '27cd0f3a5dac67d40cf0ce5c4d819c42d139091f':
REPORT-94637 单元测试修复 com.fr.form全修复
REPORT-94637 单元测试修复@obo-com.fr.nx
REPORT-89867 插件管理整体优化 fix:兼容问题
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
REPORT-98903 fix: jxbrowser v7自动启动V6
无jira任务 代码工程适配apple silicon架构
1 year ago
Destiny.Lin-林锦龙
249eeacbe4
Pull request #12357 : REPORT-98345 版本管理三期 前两期的回退恢复一下
...
Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x
* commit '8e48d2a865cd85b34c50c0c94664f7ec03b21fcc':
Revert "Revert "REPORT-91839 模板版本管理二期 修复bug""
Revert "Revert "REPORT-91839 模板版本管理二期 多删了一部分""
Revert "Revert "REPORT-91839 模板版本管理二期 补充按钮交互,消除冗余代码""
Revert "Revert "REPORT-91839 模板版本管理二期 优化判断新老模式的逻辑,事件响应改为Config准备后进行""
Revert "Revert "REPORT-91839 模板版本管理二期 完善一下判断逻辑,增加自动保存标签设置""
Revert "Revert "REPORT-91839 模板版本管理二期 修复规范问题""
Revert "Revert "REPORT-91839 模板版本管理二期""
Revert "Revert "REPORT-80651 模板版本管理重构一期补交""
1 year ago
superman
27cd0f3a5d
Merge pull request #12364 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '644e290981e653d0166f95de409afd363c1f4361':
REPORT-94637 单元测试修复 com.fr.form全修复
REPORT-94637 单元测试修复@obo-com.fr.nx
REPORT-89867 插件管理整体优化 fix:兼容问题
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
REPORT-98903 fix: jxbrowser v7自动启动V6
无jira任务 代码工程适配apple silicon架构
1 year ago
superman
644e290981
Merge pull request #12363 in DESIGN/design from final/11.0 to release/11.0
...
* commit '0bd8a0cc451eed63ad0bae4016f873b136daa1f3':
REPORT-89867 插件管理整体优化 fix:兼容问题
REPORT-98903 fix: jxbrowser v7自动启动V6
1 year ago
Obo-王学仁
190fe38dec
Pull request #12355 : REPORT-94637 单元测试修复@obo-com.fr.nx
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'b12796d82b0abf1cc4eb49fcdac7a3d856a8cfc7':
REPORT-94637 单元测试修复@obo-com.fr.nx
1 year ago
Destiny.Lin
8e48d2a865
Merge remote-tracking branch 'origin/feature/x' into feature/x
1 year ago
Destiny.Lin-林锦龙
9179e632eb
Pull request #12356 : REPORT-94637 单元测试修复 com.fr.form & com.fr.base全修复
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit 'd4ead29d0f0ebbfc360fe4fdacf9d654edcad7d7':
REPORT-94637 单元测试修复 com.fr.form全修复
1 year ago
Destiny.Lin
ac3d8fca3a
Revert "Revert "REPORT-91839 模板版本管理二期 修复bug""
...
This reverts commit 90ff0ce4c5
.
1 year ago
Destiny.Lin
0b73df4db7
Revert "Revert "REPORT-91839 模板版本管理二期 多删了一部分""
...
This reverts commit 718080f622
.
1 year ago
Destiny.Lin
3e0f7cf210
Revert "Revert "REPORT-91839 模板版本管理二期 补充按钮交互,消除冗余代码""
...
This reverts commit 58b1b29cbf
.
1 year ago
Destiny.Lin
4868bef9ad
Revert "Revert "REPORT-91839 模板版本管理二期 优化判断新老模式的逻辑,事件响应改为Config准备后进行""
...
This reverts commit 3258151e7d
.
1 year ago
Destiny.Lin
cda76945a6
Revert "Revert "REPORT-91839 模板版本管理二期 完善一下判断逻辑,增加自动保存标签设置""
...
This reverts commit e54b89675d
.
1 year ago
Destiny.Lin
280bba4f12
Revert "Revert "REPORT-91839 模板版本管理二期 修复规范问题""
...
This reverts commit b103a0de08
.
1 year ago
Destiny.Lin
630c61e711
Revert "Revert "REPORT-91839 模板版本管理二期""
...
This reverts commit 392240edd9
.
1 year ago
Destiny.Lin
cdc8c70297
Revert "Revert "REPORT-80651 模板版本管理重构一期补交""
...
This reverts commit 2614d67ebb
.
1 year ago
Bruce.Deng-邓铖臻
452b2b57da
Pull request #12351 : REPORT-98536 fvs替换frm-设计器变更
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/x to feature/x
* commit 'abfb3464b195ed53bbaa3280b33a12c3929115b9':
REPORT-98536 fvs替换frm-设计器变更 - 去掉新建决策报表快捷键
REPORT-98536 fvs替换frm-设计器变更
1 year ago
Bruce.Deng
abfb3464b1
REPORT-98536 fvs替换frm-设计器变更 - 去掉新建决策报表快捷键
1 year ago
Destiny.Lin
d4ead29d0f
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
1 year ago
Destiny.Lin
828acf2b8c
REPORT-94637 单元测试修复 com.fr.form全修复
1 year ago
Destiny.Lin-林锦龙
0bd8a0cc45
Pull request #12354 : REPORT-89867 插件管理整体优化 fix:兼容问题
...
Merge in DESIGN/design from ~DESTINY.LIN/design:final/11.0 to final/11.0
* commit 'd7922fb3296bbcf9493916a33c47ecb636e13862':
REPORT-89867 插件管理整体优化 fix:兼容问题
1 year ago
obo
b12796d82b
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
1 year ago
obo
5f97183c78
REPORT-94637 单元测试修复@obo-com.fr.nx
1 year ago
Destiny.Lin
d7922fb329
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
1 year ago
Destiny.Lin
76f4b22b2c
REPORT-89867 插件管理整体优化 fix:兼容问题
1 year ago
Obo-王学仁
abfd76032c
Pull request #12353 : REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
...
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '38bd784adeddacd5db5821a82456e91b2c6bc3f3':
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
1 year ago
vito-刘恒霖
9d96202d89
Pull request #12352 : REPORT-98903 fix: jxbrowser v7自动启动V6
...
Merge in DESIGN/design from ~VITO/c-design:final/11.0 to final/11.0
* commit '6c7e0f066148ac94eb56a6b21ec9d3bd0e1a72ca':
REPORT-98903 fix: jxbrowser v7自动启动V6
1 year ago
obo
38bd784ade
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
1 year ago
obo
a0491cbe1f
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
1 year ago
obo
ee26d574f3
REPORT-98932 设计器拖动至屏幕外时触发弹出框后无法进行操作
1 year ago
vito
6c7e0f0661
REPORT-98903 fix: jxbrowser v7自动启动V6
1 year ago
vito-刘恒霖
fcaf75f2af
Pull request #12350 : 无jira任务 代码工程适配apple silicon架构
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit 'd9889863478fb5c6bc5e7d9594009278773ede18':
无jira任务 代码工程适配apple silicon架构
1 year ago
Bruce.Deng
acb72723cc
REPORT-98536 fvs替换frm-设计器变更
1 year ago
vito
d988986347
无jira任务 代码工程适配apple silicon架构
1 year ago
superman
5daead15aa
Merge pull request #12323 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '2fd18070f3d0afabae2fecc2ee1b285bc5e7ddc0':
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-97591 排序按钮设置颜色后,新增排序规则保存并关闭模板,再次打开排序按钮颜色丢失
REPORT-99320 插件管理整体优化-设计器内单个插件更新的提示没有显示哪个插件更新,和平台提示文本不一致
REPORT-99332 设计器文本输入框文本被自动移除的问题 rt, 把 trim 取消掉
REPORT-97972 回退一下自己代码库的改动
REPORT-97972 回退一下自己代码库的改动
REPORT-97972 【FR国际化】文字显示不全
1 year ago