superman
e2a295dcb0
Merge pull request #149213 in DEC/fineui from master to feature/x
...
* commit 'cfb85f583375db0046acaabb126898c749ac18d2':
2 years ago
Kitetop
cfb85f5833
Pull request #3007 : 无JIAR任务 解决合并冲突
...
Merge in VISUAL/fineui from ~KITETOP/fineui_view:master to master
* commit '1a04b48a0d093b9a5507d2ae2453b2d904336cfa':
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
Kitetop
1a04b48a0d
Pull request #1 : 无JIAR任务 解决合并冲突
...
Merge in ~KITETOP/fineui_view from ~KITETOP/fineui:feature/x to master
* commit '58c8dfc8ce50f9ac8d3c5ef2c73d50bfa92c9116':
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
data
dffe33b79b
auto upgrade version to 2.0.20220820144639
2 years ago
superman
58c8dfc8ce
Merge pull request #147081 in DEC/fineui from master to feature/x
...
* commit 'dffe33b79b9f4a092c0573fa8c9676885708ef74':
auto upgrade version to 2.0.20220820144639
2 years ago
superman
546c81ae7c
Merge pull request #147069 in DEC/fineui from master to feature/x
...
* commit '9072baaa2496af926ec30652cc2f3c755ed598c2':
无JIRA fix: bug fix
2 years ago
Dailer
9072baaa24
Pull request #3006 : 无JIRA fix: bug fix
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '3b57760726dd3cb2a75d1e2c76a46d1fb6627053':
无JIRA fix: bug fix
2 years ago
zsmj
3b57760726
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
00801cc9d8
无JIRA fix: bug fix
2 years ago
superman
c2c3784a3d
Merge pull request #146076 in DEC/fineui from release/11.0 to feature/x
...
* commit 'f930b9a6f9d98bc6e587da0983f4526a42103375':
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
2 years ago
superman
f930b9a6f9
Merge pull request #146075 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'f1ef0ad48ea96ebf9f3e746d95513a682cd4f83a':
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
2 years ago
Kitetop
f1ef0ad48e
Pull request #145920 : REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
...
Merge in DEC/fineui from ~KITETOP/fineui:final/11.0 to final/11.0
* commit 'f001f4d9a133a3a35f28801b90ea160ced941f79':
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
2 years ago
superman
61d85a2fb1
Merge pull request #146048 in DEC/fineui from release/11.0 to feature/x
...
* commit '1d403ca77afdd7eb05d260de4b0e388da7bd3525':
2 years ago
superman
1d403ca77a
Merge pull request #146047 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'f953ead3ebeadb16a430ff000b134abd4a916736':
2 years ago
superman
f953ead3eb
Merge pull request #146046 in DEC/fineui from persist/11.0 to final/11.0
...
* commit '1797eca193500bd9899c050adec33cf7ca73c836':
2 years ago
superman
1797eca193
Merge pull request #146045 in DEC/fineui from final/11.0 to persist/11.0
...
* commit '3ca8bf00d6a759190a60193a8934fe19d699ffdd':
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
chore: 打包加上hash
REPORT-77246 fix: 根据review建议修改代码
REPORT-77246 fix: 修复bi.time_combo组件内容和图标重叠的问题
2 years ago
iapyang
8e55df2191
Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui
2 years ago
iapyang
9229f85380
chore: 更新loader
2 years ago
Kitetop
f001f4d9a1
REPORT-78579 fix: 调整bi.time_combo组件结构,保持结构统一
2 years ago
data
be7f7bfff9
auto upgrade version to 2.0.20220819140607
2 years ago
superman
8fd7809220
Merge pull request #145895 in DEC/fineui from master to feature/x
...
* commit 'be7f7bfff96cc55f840bd0b328911263df1bf68c':
auto upgrade version to 2.0.20220819140607
2 years ago
superman
610c29b777
Merge pull request #145887 in DEC/fineui from master to feature/x
...
* commit '9704163398b54ddea79afa0df93790a16b5fee18':
KERNEL-9408 fix:解决button的icon属性有时失效
2 years ago
treecat
9704163398
Pull request #3002 : KERNEL-9408 fix:解决button的icon属性有时失效
...
Merge in VISUAL/fineui from ~TREECAT/fineui:master to master
* commit 'cf819306fd173e55d4713b71d6ab8ef384160910':
KERNEL-9408 fix:解决button的icon属性有时失效
2 years ago
data
3bd0101890
auto upgrade version to 2.0.20220819114527
2 years ago
superman
9d87a883e9
Merge pull request #145779 in DEC/fineui from master to feature/x
...
* commit '3bd01018903bc8504296bd943fd8ea31d128f89b':
auto upgrade version to 2.0.20220819114527
2 years ago
superman
64629b5beb
Merge pull request #145775 in DEC/fineui from master to feature/x
...
* commit '9a1ee961c5e62ecedcd80bd137f37b2ae07a0dd4':
JSY-21914 fix: 处理报错
KERNEL-12033 feat: 复选列表添加itemFormatter属性,支持自定义节点类型
2 years ago
superman
66ddda9eae
Merge pull request #145771 in DEC/fineui from master to feature/x
...
* commit 'b616c6796f0ab9cfe30c4182cfb744729caa734e':
auto upgrade version to 2.0.20220819113527
2 years ago
data
b616c6796f
auto upgrade version to 2.0.20220819113527
2 years ago
Dailer
9a1ee961c5
Pull request #3004 : KERNEL-12033 feat: 复选列表添加itemFormatter属性,支持自定义节点类型
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '250414dc23f483025f26fa6c8954fac76497dc50':
JSY-21914 fix: 处理报错
KERNEL-12033 feat: 复选列表添加itemFormatter属性,支持自定义节点类型
2 years ago
zsmj
250414dc23
JSY-21914 fix: 处理报错
2 years ago
superman
808c080a11
Merge pull request #145767 in DEC/fineui from master to feature/x
...
* commit 'ede698798d9c46b960bcfe01771796a7f8d92ff0':
JSY-21914 fix: 处理报错
2 years ago
Kira
ede698798d
Pull request #3003 : JSY-21914 fix: 处理报错
...
Merge in VISUAL/fineui from ~KIRA/fineui:master to master
* commit '67bc8f8aefd40b4a24760dabdfb8ef7c2c71e5de':
JSY-21914 fix: 处理报错
2 years ago
zsmj
872e97b96b
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
b37406b60d
KERNEL-12033 feat: 复选列表添加itemFormatter属性,支持自定义节点类型
2 years ago
Kira
67bc8f8aef
JSY-21914 fix: 处理报错
2 years ago
treecat
cf819306fd
KERNEL-9408 fix:解决button的icon属性有时失效
2 years ago
Kitetop
4a7a3354ba
Pull request #144882 : 无JIAR任务 解决冲突
...
Merge in DEC/fineui from ~KITETOP/fineui:feature/x to feature/x
* commit '3a2606696c2459357a990d4475eed99b7b65fbdd':
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
Kitetop
3a2606696c
无JIAR任务 解决冲突
2 years ago
superman
3f123d9feb
Merge pull request #144879 in DEC/fineui from final/11.0 to release/11.0
...
* commit '3ca8bf00d6a759190a60193a8934fe19d699ffdd':
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
Kitetop
3ca8bf00d6
Pull request #144801 : REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
...
Merge in DEC/fineui from ~KITETOP/fineui:final/11.0 to final/11.0
* commit '1e0db6efd606375d0b1fcc74d68cb491a7aff334':
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
data
157a59b070
auto upgrade version to 2.0.20220818153502
2 years ago
superman
80c8940263
Merge pull request #144853 in DEC/fineui from master to feature/x
...
* commit '157a59b07066a3ed020af488a7d1072d2d42c535':
auto upgrade version to 2.0.20220818153502
2 years ago
superman
0b599d2c1e
Merge pull request #144845 in DEC/fineui from master to feature/x
...
* commit 'a99bd2bdebd2cec745636331c43fca95f3716578':
无JIRA fix: 事件参数写错了
2 years ago
Dailer
a99bd2bdeb
Pull request #3000 : 无JIRA fix: 事件参数写错了
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '9b84395cfb27486f3174ca3d3b6ee956b6d8a07f':
无JIRA fix: 事件参数写错了
2 years ago
zsmj
9b84395cfb
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
701ab5576f
无JIRA fix: 事件参数写错了
2 years ago
Kitetop
1e0db6efd6
REPORT-78514 revert: REPORT-7696组件是否异步获取数据,和组件是否支持搜索分离开
2 years ago
data
6432871fc1
auto upgrade version to 2.0.20220818103515
2 years ago
superman
7c781aca2d
Merge pull request #144612 in DEC/fineui from master to feature/x
...
* commit '6432871fc1ff0373ea04c6addd867c756747542c':
auto upgrade version to 2.0.20220818103515
2 years ago
superman
6801c10062
Merge pull request #144604 in DEC/fineui from master to feature/x
...
* commit '80c65febbe1551c84e830ce9b8c6e0fe8a9f9ef3':
KERNEL-12470 feat: bi.text_value_combo逻辑优化
2 years ago