superman
5f3b060cde
Merge pull request #164946 in DEC/fineui from master to feature/x
...
* commit '50b027f288a9fab7bb7d3ad7d9d1f224f60113cd':
2 years ago
Aeolus.Zhang-张敬峥
50b027f288
Merge pull request #3056 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit 'cfdb2cc1e63247a35ea853cdb49430021c6cf030':
同步代码 去掉默认覆盖font图标的颜色的规则
2 years ago
superman
05eeef579f
Merge pull request #164941 in DEC/fineui from release/11.0 to feature/x
...
* commit 'cfdb2cc1e63247a35ea853cdb49430021c6cf030':
同步代码 去掉默认覆盖font图标的颜色的规则
2 years ago
superman
cfdb2cc1e6
Merge pull request #164940 in DEC/fineui from final/11.0 to release/11.0
...
* commit '29d7a5f50efc95693bb20faeca1272bea3f8f057':
同步代码 去掉默认覆盖font图标的颜色的规则
2 years ago
Oliver.Ke-柯键基
29d7a5f50e
Pull request #164938 : 同步代码 去掉默认覆盖font图标的颜色的规则
...
Merge in DEC/fineui from ~OLIVER.KE/fineui-decision:final/11.0 to final/11.0
* commit '66bd03e83ac8f17fb0b7298a346d042ded5ea587':
同步代码 去掉默认覆盖font图标的颜色的规则
2 years ago
Oliver.Ke
66bd03e83a
同步代码 去掉默认覆盖font图标的颜色的规则
2 years ago
zsmj
ea61930f4f
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
e774b33222
BI-113533 fix: bi.color_chooser destroyWhenHide 场景下二次创建popup状态的保持问题
2 years ago
data
57da263f6b
auto upgrade version to 2.0.20220907145719
2 years ago
superman
ca68a03e04
Merge pull request #164917 in DEC/fineui from master to feature/x
...
* commit '57da263f6b8976e6c41159017f3147870e83f867':
auto upgrade version to 2.0.20220907145719
2 years ago
superman
f9a0c636c8
Merge pull request #164905 in DEC/fineui from master to feature/x
...
* commit '68067641cb8e1524bbef2043ffe5ca60e737bb32':
2 years ago
Aeolus.Zhang-张敬峥
68067641cb
Merge pull request #3054 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '4d9036329955cc785c4eb999fbe2c4c7497228de':
同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
superman
256cc4898b
Merge pull request #164888 in DEC/fineui from release/11.0 to feature/x
...
* commit '4d9036329955cc785c4eb999fbe2c4c7497228de':
同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
superman
4d90363299
Merge pull request #164887 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'e17b527cc79be1a5fed15c0dc7fc718527c05569':
同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
Oliver.Ke-柯键基
e17b527cc7
Pull request #164871 : 同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
...
Merge in DEC/fineui from ~OLIVER.KE/fineui-decision:final/11.0 to final/11.0
* commit '35ec8edd49dcfabd6c218a5a84ffb50ed66681e3':
同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
superman
620928791c
Merge pull request #164884 in DEC/fineui from release/11.0 to feature/x
...
* commit 'e05439818fc5bede292912c50eb88a2af6044f77':
2 years ago
superman
e05439818f
Merge pull request #164883 in DEC/fineui from final/11.0 to release/11.0
...
* commit '263c3c487f5b2a791a5404e4a70660b86b2b0f44':
2 years ago
superman
263c3c487f
Merge pull request #164882 in DEC/fineui from persist/11.0 to final/11.0
...
* commit 'a337831784b48c5fd2e2090f4143810e9e3133dd':
2 years ago
Claire.Tang-唐锦霞
501512f252
Pull request #164876 : 无jira任务 bugfix/11.0 合 feature/x 解决冲突
...
Merge in DEC/fineui from ~CLAIRE.TANG/d-fineui:bugfix/11.0 to feature/x
* commit 'fa760e2cb98223e4b55b05ee87cae551ba75bae3':
2 years ago
superman
a337831784
Merge pull request #164881 in DEC/fineui from final/11.0 to persist/11.0
...
* commit '213c7d1998e5ab088b564f08205a2c755174e45a': (173 commits)
BI-111334 style:视觉iconfont更新
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
BI-113579 可配置
BI-113522 文本下拉展开发两次请求
BI-112711 fix:单选按钮的选中视觉不对
无JIRA任务 图标更新
Pull request #3033 : REPORT-79369 fix:修正按钮文字计算公式 & 无jira feat:补充按钮ts类型
JSY-22302 fix: text无法点击
无JIRA fix: nor_bar 复选下拉框切换箭头
Update src/less/base/tree/ztree.less
REPORT-79286 同步到release/11.0
同步
auto upgrade version to 2.0.20220826175704
bugfix: bug
auto upgrade version to 2.0.20220826171804
REPORT-77978 fix: 下拉树水印表现异常问题
auto upgrade version to 2.0.20220826110757
无JIRA fix:按钮 textAlign 失效
auto upgrade version to 2.0.20220826090446
auto upgrade version to 2.0.20220825194716
...
2 years ago
data
1d96b777c8
auto upgrade version to 2.0.20220907135746
2 years ago
Oliver.Ke
35ec8edd49
同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
superman
fea8c52f37
Merge pull request #164870 in DEC/fineui from master to feature/x
...
* commit '1d96b777c8bc2b80455d57e748974ff92db9b2f0':
auto upgrade version to 2.0.20220907135746
2 years ago
Claire
fa760e2cb9
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~claire.tang/d-fineui into bugfix/11.0
2 years ago
superman
38fad52d2f
Merge pull request #164861 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit 'b7dc0c12ac1dc7a118f597029e5cf84c0a4a403e':
BI-111334 style:视觉iconfont更新
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
BI-113579 可配置
BI-113522 文本下拉展开发两次请求
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
superman
4c7f445cfa
Merge pull request #164854 in DEC/fineui from master to feature/x
...
* commit 'ce63db7e24d446aa6fad9db3ca7c21ac32cd2769':
无JIRA fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
Dailer-刘荣歆
ce63db7e24
Pull request #3053 : 无JIRA fix: 修复text_value_combo 下拉框未创建时setValue场景
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '4ef2af58d4481534e1c75efc70c3ab43daeb4b6a':
无JIRA fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
zsmj
4ef2af58d4
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
2d4d5f19a2
无JIRA fix: 修复text_value_combo 下拉框未创建时setValue场景
2 years ago
data
72d8d1c5f2
auto upgrade version to 2.0.20220906172430
2 years ago
superman
a052348f51
Merge pull request #163874 in DEC/fineui from master to feature/x
...
* commit '72d8d1c5f2476fe5e6970b8ce4daf5bdc8deb38d':
auto upgrade version to 2.0.20220906172430
2 years ago
superman
72506ebcd2
Merge pull request #163870 in DEC/fineui from master to feature/x
...
* commit '46285207b08182a058da3b7f5804f9bda276b5de':
2 years ago
treecat-罗群
46285207b0
Pull request #3052 : 无jira任务 解决字体文件冲突
...
Merge in VISUAL/fineui from ~TREECAT/fineui:master to master
* commit '63f280a3c085adf4cc92605a131586b2aa8e51ea':
BI-111334 style:视觉iconfont更新
2 years ago
data
d11e371f97
auto upgrade version to 2.0.20220906171520
2 years ago
superman
4423c7358b
Merge pull request #163866 in DEC/fineui from master to feature/x
...
* commit 'd11e371f9744c535dd8d0133e003159eaa122f47':
auto upgrade version to 2.0.20220906171520
2 years ago
Treecat
63f280a3c0
Merge remote-tracking branch 'dec/release/11.0'
...
# Conflicts:
# dist/font/iconfont.eot
# dist/font/iconfont.ttf
# dist/font/iconfont.woff
# dist/font/iconfont.woff2
2 years ago
superman
5f67af2a1b
Merge pull request #163862 in DEC/fineui from master to feature/x
...
* commit 'd885da9ed4f659fd24efcf266dc14fad08a12e1d':
chore: 打包问题
2 years ago
Teller-杨派
d885da9ed4
Pull request #3051 : 无JIRA任务 打包问题
...
Merge in VISUAL/fineui from ~TELLER/fineui:master to master
* commit 'cff23d9b5fd8af2b0f4d217df45b0da72f3697c9':
chore: 打包问题
2 years ago
iapyang
cff23d9b5f
chore: 打包问题
2 years ago
superman
9400c6577b
Merge pull request #163858 in DEC/fineui from master to feature/x
...
* commit 'e91e55f70f415c2f62fb0e6137dc5be0adffa56b':
auto upgrade version to 2.0.20220906163624
chore: without jquery增加一些runtime语法编译
chore: 修改下脚本
2 years ago
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
data
e91e55f70f
auto upgrade version to 2.0.20220906163624
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
treecat-罗群
c57c30a7b2
Pull request #3050 : 无jira 解决合并冲突
...
Merge in VISUAL/fineui from ~TREECAT/fineui:master to master
* commit '4222a4460a6f6edc7c2dae89f999c39218e0aa5c':
同步代码 feat: 给下拉框一个完全自由控制的tooltip方式
BI-113579 可配置
BI-112711 fix:单选按钮的选中视觉不对
2 years ago
Teller-杨派
128c5b8150
Pull request #3047 : 无JIRA任务 without jquery增加一些runtime语法polyfill
...
Merge in VISUAL/fineui from ~TELLER/fineui:master to master
* commit 'e533a2dfce2a26b621020ee9626181bbd45d5f82':
chore: without jquery增加一些runtime语法编译
chore: 修改下脚本
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
data
1f2e9f0848
auto upgrade version to 2.0.20220906151811
2 years ago
Treecat
4222a4460a
Merge remote-tracking branch 'dec/release/11.0'
...
# Conflicts:
# src/base/single/input/radio/radio.js
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