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
Dailer
80c65febbe
Pull request #2999 : KERNEL-12470 feat: bi.text_value_combo逻辑优化
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'e775c5c346a66865d62abbf3bea1769688ea2d15':
KERNEL-12470 feat: bi.text_value_combo逻辑优化
2 years ago
data
f96fd2a45b
auto upgrade version to 2.0.20220818090810
2 years ago
superman
b3b5d494d9
Merge pull request #144544 in DEC/fineui from master to feature/x
...
* commit 'f96fd2a45b9062e6f13c61ec562f5d17acc79503':
auto upgrade version to 2.0.20220818090810
2 years ago
superman
7c96b8af67
Merge pull request #144104 in DEC/fineui from master to feature/x
...
* commit '3be3920fbd4dfe199f7342abf943bacf8cbc8db9':
KERNEL-9408 fix:按钮自定义图标的最终实现方式
KERNEL-9408 fix:修改其它框架实现图标的方式
KERNEL-9408 feat:按钮可以自定义图标
2 years ago
treecat
3be3920fbd
Pull request #2998 : KERNEL-9408 feat:按钮可以自定义图标
...
Merge in VISUAL/fineui from ~TREECAT/fineui:master to master
* commit 'e487760d6c8eb131aea96518869568f3c09c6914':
KERNEL-9408 fix:按钮自定义图标的最终实现方式
KERNEL-9408 fix:修改其它框架实现图标的方式
KERNEL-9408 feat:按钮可以自定义图标
2 years ago
zsmj
e775c5c346
KERNEL-12470 feat: bi.text_value_combo逻辑优化
2 years ago
treecat
e487760d6c
KERNEL-9408 fix:按钮自定义图标的最终实现方式
2 years ago
data
f5aea7544b
auto upgrade version to 2.0.20220816172514
2 years ago
superman
a92104611e
Merge pull request #142630 in DEC/fineui from master to feature/x
...
* commit 'f5aea7544bcaedafbbbccdb05e465ecbaa4ab9e0':
auto upgrade version to 2.0.20220816172514
2 years ago
superman
e83ed927d9
Merge pull request #142622 in DEC/fineui from master to feature/x
...
* commit '1ed58f2ceafc59c2a10aa3b49f143a01c03bd7db':
KERNEL-12408:base中eslint的修改
KERNEL-12408:base中eslint的修改
2 years ago
Chaos.Wang
1ed58f2cea
Pull request #2997 : KERNEL-12408:base中eslint的修改
...
Merge in VISUAL/fineui from ~CHAOS.WANG/fineui:master to master
* commit '3755aca7b4a8866ed9b7e77e6c787a5ca10cd40c':
KERNEL-12408:base中eslint的修改
KERNEL-12408:base中eslint的修改
2 years ago
chaos0156
3755aca7b4
KERNEL-12408:base中eslint的修改
2 years ago
treecat
6895777066
KERNEL-9408 fix:修改其它框架实现图标的方式
2 years ago
chaos0156
1cc5068aba
Merge branch 'master' of https://code.fineres.com/scm/~chaos.wang/fineui
2 years ago
chaos0156
b721941854
KERNEL-12408:base中eslint的修改
2 years ago
treecat
ff378ed006
KERNEL-9408 feat:按钮可以自定义图标
2 years ago
data
981103f70f
auto upgrade version to 2.0.20220816143611
2 years ago
superman
f28092a8cf
Merge pull request #142498 in DEC/fineui from master to feature/x
...
* commit '981103f70fe5ec7958e185ab83ef7a0a3871269d':
auto upgrade version to 2.0.20220816143611
2 years ago
superman
cfcca854b2
Merge pull request #142486 in DEC/fineui from master to feature/x
...
* commit '700c69b9dbd679e056da2eb478eadc8a4731f91b':
KERNEL-12408:base中eslint的修改
KERNEL-12408:base中eslint的修改
2 years ago
Chaos.Wang
700c69b9db
Pull request #2993 : KERNEL-12408:base中eslint的修改
...
Merge in VISUAL/fineui from ~CHAOS.WANG/fineui:master to master
* commit 'c7650ce8bcce7303a4a8e0a3e3c6f4b5371e8ec4':
KERNEL-12408:base中eslint的修改
KERNEL-12408:base中eslint的修改
2 years ago
chaos0156
c7650ce8bc
KERNEL-12408:base中eslint的修改
2 years ago
data
830d2333b7
auto upgrade version to 2.0.20220816135604
2 years ago
superman
b6c5e77a29
Merge pull request #142466 in DEC/fineui from master to feature/x
...
* commit '830d2333b7d407b0e90a8f296e21b91d79a469ed':
auto upgrade version to 2.0.20220816135604
2 years ago
superman
ebf8ac7e1d
Merge pull request #142462 in DEC/fineui from master to feature/x
...
* commit '1e566cc22930e6268f51d566a522af44e9cb6c98':
REPORT-77978 fix: 下拉树水印表现异常问题
KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
2 years ago
Dailer
1e566cc229
Pull request #2994 : KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'adf265507037d042d8ceb0fd9b95dfc283abc41e':
REPORT-77978 fix: 下拉树水印表现异常问题
KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
2 years ago
superman
f634bd1ec5
Merge pull request #142450 in DEC/fineui from bugfix/11.0 to feature/x
...
* commit '45605e5205e45204a02db488fa7228723c24961d':
2 years ago
superman
45605e5205
Merge pull request #142449 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit '225ae9a12db4c227ba61882713c58d5b2b621df7':
2 years ago
zsmj
adf2655070
REPORT-77978 fix: 下拉树水印表现异常问题
2 years ago
zsmj
63aba7eebb
KERNEL-11286 feat: 下拉框value,text,defaultText属性规则统一
2 years ago
zsmj
a8581a8700
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
superman
9a91427b2d
Merge pull request #142345 in DEC/fineui from release/11.0 to feature/x
...
* commit '225ae9a12db4c227ba61882713c58d5b2b621df7':
2 years ago
superman
225ae9a12d
Merge pull request #142344 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'c47f798dbfc099ac2833b076dde54a1dffcebb8d':
2 years ago
superman
c47f798dbf
Merge pull request #142334 in DEC/fineui from release/11.0 to final/11.0
...
* commit '4fd5faa8d95aba92d5ee2fc53061b19e986eb5ef':
REPORT-77246 fix: 根据review建议修改代码
REPORT-77246 fix: 修复bi.time_combo组件内容和图标重叠的问题
2 years ago
superman
9dc4748e99
Merge pull request #142337 in DEC/fineui from release/11.0 to feature/x
...
* commit '4fd5faa8d95aba92d5ee2fc53061b19e986eb5ef':
2 years ago
superman
4fd5faa8d9
Merge pull request #142329 in DEC/fineui from bugfix/11.0 to release/11.0
...
* commit '42c5a2c95cabb215305613be7ade52a704c65c7b':
2 years ago
data
dffc885cf9
auto upgrade version to 2.0.20220816105709
2 years ago
superman
19f5fc72c0
Merge pull request #142316 in DEC/fineui from master to feature/x
...
* commit 'dffc885cf90d9b4549cae84d346c688b021087c6':
auto upgrade version to 2.0.20220816105709
2 years ago