treecat-罗群
fa3bbbe666
Pull request #163857 : 无jira 解决冲突
...
Merge in DEC/fineui from ~TREECAT/dec-fineui:feature/x to feature/x
* commit '6896c11b8ce61d2d1d03bcced82240e540630c48':
BI-111334 style:视觉iconfont更新
2 years ago
Treecat
6896c11b8c
Merge remote-tracking branch 'origin/release/11.0' into feature/x
...
# Conflicts:
# dist/font/iconfont.eot
# dist/font/iconfont.ttf
# dist/font/iconfont.woff
# dist/font/iconfont.woff2
2 years ago
superman
b7dc0c12ac
Merge pull request #163855 in DEC/fineui from final/11.0 to release/11.0
...
* commit '213c7d1998e5ab088b564f08205a2c755174e45a':
BI-111334 style:视觉iconfont更新
2 years ago
Claire.Tang-唐锦霞
213c7d1998
Pull request #163792 : BI-111334 style:视觉iconfont更新
...
Merge in DEC/fineui from ~CLAIRE.TANG/d-fineui:final/11.0 to final/11.0
* commit 'fb069f655e5e6967a9e3b8a1990fa122da903047':
BI-111334 style:视觉iconfont更新
2 years ago
superman
bbd0aab296
Merge pull request #163813 in DEC/fineui from master to feature/x
...
* commit '1f2e9f0848b96dffec3e356905c17fee25fb1e93':
auto upgrade version to 2.0.20220906151811
2 years ago
data
1f2e9f0848
auto upgrade version to 2.0.20220906151811
2 years ago
superman
71cb208b6b
Merge pull request #163805 in DEC/fineui from master to feature/x
...
* commit '69fb9ed436479803f89d6e8f90cf596c0b516128':
KERNEL-11911 feat: label组件默认使用text作为tooltip,仅对label生效,不影响html_label
KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿
Revert "KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿"
KERNEL-12683 feat: 文件上传支持自定义校验 , bi.file reset方法清空前一次上传的files
无JIRA 去掉sameroute报错
2 years ago
Dailer-刘荣歆
69fb9ed436
Pull request #3049 : KERNEL-12683 feat: 文件上传支持自定义校验 , bi.file reset方法清空前一次上传的files
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '1bd7c58af00cd72a770ab5e36fe8c2aa12e9c086':
KERNEL-11911 feat: label组件默认使用text作为tooltip,仅对label生效,不影响html_label
KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿
Revert "KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿"
KERNEL-12683 feat: 文件上传支持自定义校验 , bi.file reset方法清空前一次上传的files
无JIRA 去掉sameroute报错
2 years ago
Claire
fb069f655e
BI-111334 style:视觉iconfont更新
2 years ago
superman
d446b086ff
Merge pull request #163782 in DEC/fineui from release/11.0 to feature/x
...
* commit 'c8e9338dc71157c749c4a323f472aca2d8e29698':
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
2 years ago
superman
c8e9338dc7
Merge pull request #163781 in DEC/fineui from final/11.0 to release/11.0
...
* commit '181e96b6d59b53f0991145ee93b3f3bc0be23355':
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
2 years ago
Oliver.Ke-柯键基
181e96b6d5
Pull request #163779 : 同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
...
Merge in DEC/fineui from ~OLIVER.KE/fineui-decision:final/11.0 to final/11.0
* commit 'fa75b87fbcd545245fe67272ef7f736361c01144':
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
2 years ago
Oliver.Ke
fa75b87fbc
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
2 years ago
zsmj
1bd7c58af0
KERNEL-11911 feat: label组件默认使用text作为tooltip,仅对label生效,不影响html_label
2 years ago
zsmj
19cf7ccc1e
KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿
2 years ago
zsmj
2877f5f7c0
Revert "KERNEL-12609 fix: From FDL 显示日志信息场景,label默认带有tooltip逻辑导致卡顿"
...
This reverts commit d09bd2e3d9
.
2 years ago
zsmj
221e254ea1
KERNEL-12683 feat: 文件上传支持自定义校验 , bi.file reset方法清空前一次上传的files
2 years ago
zsmj
1f9e16ac0b
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
superman
a5c6a024f2
Merge pull request #163695 in DEC/fineui from release/11.0 to feature/x
...
* commit 'cc9a3912b89259b23e122ecd9f4b9f9a2d4febb3':
BI-113579 可配置
2 years ago
superman
cc9a3912b8
Merge pull request #163694 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'aba2ff058803da56ce6483e3e97b7dd18d16654c':
BI-113579 可配置
2 years ago
windy-许昊
aba2ff0588
Pull request #163676 : BI-113579 可配置
...
Merge in DEC/fineui from ~WINDY/fineui:final/11.0 to final/11.0
* commit '9d94d01f095289a37eaad5162c3a76104f10403b':
BI-113579 可配置
2 years ago
windy
9d94d01f09
BI-113579 可配置
2 years ago
zsmj
ba884c00b9
无JIRA 去掉sameroute报错
2 years ago
data
d88d871088
auto upgrade version to 2.0.20220905204735
2 years ago
superman
c0c105158a
Merge pull request #162919 in DEC/fineui from master to feature/x
...
* commit 'd88d8710882f80d3f8bba5543fdacbb1d98a73d0':
auto upgrade version to 2.0.20220905204735
2 years ago
superman
0e42d2ed69
Merge pull request #162911 in DEC/fineui from master to feature/x
...
* commit 'a7f1c88475e8c917571beed6cdc35d4393e70818':
BI-111334 style:视觉iconfont更新
BI-111334 style:视觉iconfont更新:
2 years ago
Claire.Tang-唐锦霞
a7f1c88475
Pull request #3048 : BI-111334 style:视觉iconfont更新:
...
Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master
* commit 'e3e743de0432281ae1b0e3ef2c7c0ab53645296d':
BI-111334 style:视觉iconfont更新
BI-111334 style:视觉iconfont更新:
2 years ago
Claire
e3e743de04
BI-111334 style:视觉iconfont更新
2 years ago
Claire
978f57e705
Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui
2 years ago
Claire
8a1409f5fd
BI-111334 style:视觉iconfont更新:
2 years ago
superman
9da61430ca
Merge pull request #162723 in DEC/fineui from master to feature/x
...
* commit '806d4b151e0b3b85b83abe713d00a710389d1d61':
auto upgrade version to 2.0.20220905163443
2 years ago
treecat-罗群
4588ee4aa5
Pull request #162722 : 无jira 解决合并冲突
...
Merge in DEC/fineui from ~TREECAT/dec-fineui:feature/x to feature/x
* commit '2909dee2dbf635dbdc110a5a77d7ae290636db3d':
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
Treecat
2909dee2db
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~treecat/dec-fineui into feature/x
...
# Conflicts:
# src/base/single/input/radio/radio.js
2 years ago
data
806d4b151e
auto upgrade version to 2.0.20220905163443
2 years ago
superman
804db91b9e
Merge pull request #162719 in DEC/fineui from final/11.0 to release/11.0
...
* commit '54ecbc38a1cbd0c5948a67e2ef1a2a017f472012':
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
treecat-罗群
54ecbc38a1
Pull request #162600 : BI-112711 改动提交一份到final
...
Merge in DEC/fineui from ~TREECAT/dec-fineui:final/11.0 to final/11.0
* commit '269ec1d780cd0553ac8de59472eefbc6a8950036':
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
superman
863f40298b
Merge pull request #162717 in DEC/fineui from master to feature/x
...
* commit 'c31a1725182aba738def10afaf579e0e14c68d23':
2 years ago
Aeolus.Zhang-张敬峥
c31a172518
Merge pull request #3045 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '1a07c7e0995e2432202e3a3808723f9207d00ac5':
BI-113522 文本下拉展开发两次请求
2 years ago
superman
75e22699f2
Merge pull request #162712 in DEC/fineui from release/11.0 to feature/x
...
* commit '1a07c7e0995e2432202e3a3808723f9207d00ac5':
BI-113522 文本下拉展开发两次请求
2 years ago
superman
1a07c7e099
Merge pull request #162711 in DEC/fineui from final/11.0 to release/11.0
...
* commit '40c9cee14072e344fd89abb3faf52ad99cd8a17b':
BI-113522 文本下拉展开发两次请求
2 years ago
windy-许昊
40c9cee140
Pull request #162677 : BI-113522 && BI-113419文本下拉展开发两次请求
...
Merge in DEC/fineui from ~WINDY/fineui:final/11.0 to final/11.0
* commit '42825f2ec3f08812870638829fbac64014e64bee':
BI-113522 文本下拉展开发两次请求
2 years ago
windy
42825f2ec3
BI-113522 文本下拉展开发两次请求
2 years ago
data
9f2508f6d3
auto upgrade version to 2.0.20220905140631
2 years ago
superman
f301b9ebb0
Merge pull request #162612 in DEC/fineui from master to feature/x
...
* commit '9f2508f6d3a7567313e001e7761718c432a5532d':
auto upgrade version to 2.0.20220905140631
2 years ago
Treecat
269ec1d780
Merge branch 'final/11.0' of ssh://code.fineres.com:7999/~treecat/dec-fineui into final/11.0
...
# Conflicts:
# src/base/single/input/radio/radio.js
2 years ago
Treecat
6cabd38b05
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
superman
ceda8a1edb
Merge pull request #162599 in DEC/fineui from master to feature/x
...
* commit '318d76583dbfe08634ffdcbe764012ce5efd8926':
feature: 内存溢出换一种实现方案
2 years ago
guy-王川
318d76583d
Pull request #3044 : 无JIRA任务 feature: 内存溢出换一种实现方案
...
Merge in VISUAL/fineui from ~GUY/fineui:master to master
* commit 'dc906b2a5255354302411aba88eff95685833983':
feature: 内存溢出换一种实现方案
2 years ago
guy
dc906b2a52
feature: 内存溢出换一种实现方案
2 years ago
data
eb36b2656f
auto upgrade version to 2.0.20220905101842
2 years ago