superman
9b54111d7d
Merge pull request #11131 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'c6f4e3022a156d31ee2a1e08ab775ec6fe51a949':
2 years ago
superman
c6f4e3022a
Merge pull request #11130 in DESIGN/design from final/11.0 to release/11.0
...
* commit '5792205288cddd2940e63f4423408e89bf91a648':
2 years ago
superman
5792205288
Merge pull request #11120 in DESIGN/design from release/11.0 to final/11.0
...
* commit '0c22b7a9bdba0c24369f140546104cc589bc042b': (24 commits)
REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
REPORT-82895 单元格重复冻结优化 抽取判断逻辑
REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
REPORT-86482 更新日志获取时间范围问题
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87060 Swing界面操作在Swing线程避免线程卡死
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-86809 单元格重复冻结-新前端-交互问题
REPORT-86364 服务平台设计器适配
REPORT-86364 服务平台设计器适配
REPORT-86364 服务平台设计器适配
REPORT-82895 单元格重复冻结优化 决策报表相关结尾冻结实现,界面优化
REPORT-85953 【上海理光】模板保存问题 保存的时候不允许触发预览事件
REPORT-82895 【11.0.11延期】单元格重复冻结优化 增加重复判断,优化面板
REPORT-82895 【11.0.11延期】单元格重复冻结优化 后端方案重设,计算扩展后的行列数
REPORT-85754 fix:参考cpt图表的类似写法,引入焦点丢失事件
KERNEL-13706 保存数据集时,不需要对每一个数据集都去请求数据
...
2 years ago
superman
d730f0efc7
Merge pull request #11098 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '31575f8e643ae5c57d45edeb6aa342b10adc977d':
REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
2 years ago
superman
31575f8e64
Merge pull request #11097 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '0c22b7a9bdba0c24369f140546104cc589bc042b':
REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
2 years ago
Destiny.Lin-林锦龙
0c22b7a9bd
Pull request #11088 : REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit 'af89224b12edfd54eee6d06a7a8bdc0bd90f7340':
REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
2 years ago
Destiny.Lin
af89224b12
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Destiny.Lin
11cc506f1a
REPORT-87566 【单元格重复冻结】FRM-22.12.26的release分支,FRM设置冻结的窗口确认时无响应且日志有空指针报错
2 years ago
superman
603e916818
Merge pull request #11077 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'e022192ce06f7db303da8edb739afa5cc24dc756':
REPORT-82895 单元格重复冻结优化 抽取判断逻辑
2 years ago
superman
e022192ce0
Merge pull request #11076 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '40534abe583467e3ace28e7194ca18bec42e3e08':
REPORT-82895 单元格重复冻结优化 抽取判断逻辑
2 years ago
Destiny.Lin-林锦龙
40534abe58
Pull request #11067 : REPORT-82895 单元格重复冻结优化 抽取判断逻辑
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '187e9170416f32ac094f0f58a74675e0501fe3e8':
REPORT-82895 单元格重复冻结优化 抽取判断逻辑
2 years ago
Destiny.Lin
187e917041
REPORT-82895 单元格重复冻结优化 抽取判断逻辑
2 years ago
Cloud.Liu-刘学真
8b18882aae
Pull request #11061 : KERNEL-12978 fix: 适配CBB改动
...
Merge in DESIGN/design from ~CLOUD.LIU/design:feature/x to feature/x
* commit '5a717baaea4cc0f968841f55dff8675ce5ac932c':
KERNEL-12978 fix: 适配CBB改动
2 years ago
Cloud.Liu
5a717baaea
KERNEL-12978 fix: 适配CBB改动
2 years ago
superman
5f09255887
Merge pull request #11058 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '8385f90c4c9df6f6a3636272e73d2e440595d791':
REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
2 years ago
superman
8385f90c4c
Merge pull request #11057 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd654782e86cdd73f565eb3561a28c16ea7de325f':
REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
2 years ago
wei-魏阳露
d654782e86
Pull request #11038 : REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
...
Merge in DESIGN/design from ~WEI/design:release/11.0 to release/11.0
* commit '7b8b8298fb6790ec85c40561cc5d5db4dc4c5766':
REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
2 years ago
superman
3c2f113e12
Merge pull request #11048 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'abc2d3d1f9d6dd4e8b7e33d548611b78bebcd914':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
superman
abc2d3d1f9
Merge pull request #11047 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '75685d3a8eef3baf6336a22ead8522363d71d4b3':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
WeiYanglu
7b8b8298fb
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~wei/design into release/11.0
2 years ago
WeiYanglu
f992e29eee
REPORT-87323 还原改动,导致未输参数就出现数据集预览结果
2 years ago
Destiny.Lin-林锦龙
75685d3a8e
Pull request #11037 : REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '4654258604e75c48092c83299f128d8e710b2ceb':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
Destiny.Lin
4654258604
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Destiny.Lin
f016fc3628
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
superman
a70e06977d
Merge pull request #11035 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '7f45329681ece8d9f1c818a2160b487cb5527636':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
superman
7f45329681
Merge pull request #11034 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'c6a580e1f38187b53754a32f2c9c8bd55c2f2a82':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
Destiny.Lin-林锦龙
c6a580e1f3
Pull request #11024 : REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit 'cac410c30216159f01d98edb3548bfd84bf63542':
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
Yvan-欧阳帆
0f95a5f5d2
Pull request #11025 : REPORT-75091 数据脱敏一二期解除功能屏蔽
...
Merge in DESIGN/design from ~YVAN/design:feature/x to feature/x
* commit '3da2a0856d6411a0eb7504e1083d2f857bfd17a4':
REPORT-75091 数据脱敏一二期解除功能屏蔽 【问题原因】rt 【改动思路】rt 【review建议】
2 years ago
Yvan-欧阳帆
3da2a0856d
REPORT-75091 数据脱敏一二期解除功能屏蔽
...
【问题原因】rt
【改动思路】rt
【review建议】
2 years ago
Destiny.Lin
cac410c302
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Destiny.Lin
911468c341
REPORT-87102 单元格重复冻结-新前端-交互-历史模板在未勾选重复结尾行的情况下冻结结尾行是可选的
2 years ago
superman
387074c3d0
Merge pull request #11022 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '181307a4cc7472b0acbc124de8b5df5a221c25f6':
REPORT-87060 Swing界面操作在Swing线程避免线程卡死
2 years ago
superman
181307a4cc
Merge pull request #11021 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '0edf3d42821911443a7c9ba10498747195d8f246':
REPORT-87060 Swing界面操作在Swing线程避免线程卡死
2 years ago
wei-魏阳露
0edf3d4282
Pull request #10991 : REPORT-87060 Swing界面操作在Swing线程避免线程卡死
...
Merge in DESIGN/design from ~WEI/design:release/11.0 to release/11.0
* commit 'e76a6606f8af814fb3ced5a05e9cbc5cfa31164b':
REPORT-87060 Swing界面操作在Swing线程避免线程卡死
2 years ago
superman
4a6db2d6e5
Merge pull request #11002 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '594c30e797a2dcce9450bf37ac3726409be89e44':
REPORT-86482 更新日志获取时间范围问题
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
superman
594c30e797
Merge pull request #11001 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '9d99f4df9220bcab15bea6245fc3dbcfb4572da4':
REPORT-86482 更新日志获取时间范围问题
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
Destiny.Lin-林锦龙
9d99f4df92
Pull request #10992 : REPORT-87124 国际化设计器需要对服务平台做下隐藏 & REPORT-86482 更新日志获取时间范围问题
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '42f9d5ee53dea2040500dff98449e32141cb0dbf':
REPORT-86482 更新日志获取时间范围问题
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin
42f9d5ee53
REPORT-86482 更新日志获取时间范围问题
2 years ago
Destiny.Lin
de0889ccb5
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
Destiny.Lin
a89021bdeb
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin-林锦龙
8f77073921
Pull request #10990 : REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit 'd75a4f345a3be06bbe583119914e8d5021b4d0a2':
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
WeiYanglu
e76a6606f8
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~wei/design into release/11.0
2 years ago
WeiYanglu
6f7c26a886
REPORT-87060 Swing界面操作在Swing线程避免线程卡死
2 years ago
Destiny.Lin
d75a4f345a
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
Destiny.Lin
ee4d41fbe8
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
superman
f1530b635e
Merge pull request #10989 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'a8a73deea086ae450fb9bc7803205d8fe1b15709':
REPORT-86809 单元格重复冻结-新前端-交互问题
2 years ago
superman
a8a73deea0
Merge pull request #10988 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '3198fb7f82df8e5089e7b5e7c62f95749b5b1fd3':
REPORT-86809 单元格重复冻结-新前端-交互问题
2 years ago
Destiny.Lin-林锦龙
3198fb7f82
Pull request #10979 : REPORT-86809 单元格重复冻结-新前端-交互问题
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '9f3c569080e01340d12b7c7c9d2f9e1ca6979689':
REPORT-86809 单元格重复冻结-新前端-交互问题
2 years ago
Destiny.Lin
9f3c569080
REPORT-86809 单元格重复冻结-新前端-交互问题
2 years ago
superman
a41238bebc
Merge pull request #10968 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '3a04bcf679ddeaf988159d01a2f84ce428b40250':
REPORT-86364 服务平台设计器适配
REPORT-86364 服务平台设计器适配
REPORT-86364 服务平台设计器适配
REPORT-82895 单元格重复冻结优化 决策报表相关结尾冻结实现,界面优化
REPORT-85953 【上海理光】模板保存问题 保存的时候不允许触发预览事件
2 years ago