Zhenfei.Li-李振飞
5fcb9f0eb0
Fixed merge conflict
2 years ago
Dailer-刘荣歆
929649567a
Pull request #3312 : KERNEL-14012 feat: core/structure文件夹
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit 'c4184571d3c5b808fb3231add275aa356ffdf513':
KERNEL-14012 feat: core/structure文件夹
KERNEL-14012 feat: core/structure文件夹
KERNEL-14012 feat: core/structure文件夹
2 years ago
Zhenfei.Li
4e2a41bfb7
无JIRA任务 chore: 补充eslint规则
2 years ago
superman
bb3cb37d39
Merge pull request #215914 in DEC/fineui from release/11.0 to feature/x
...
* commit 'e3a865f6c185a0899f13626f85fed5ed7383a514':
2 years ago
superman
e3a865f6c1
Merge pull request #215913 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'b709620d8a59f8ab10318c3bfd0416aea407a5a3':
2 years ago
superman
b709620d8a
Merge pull request #215912 in DEC/fineui from persist/11.0 to final/11.0
...
* commit '6083ab3b1bc7d749b52f79897ac7224bb64431fa':
2 years ago
superman
6083ab3b1b
Merge pull request #215911 in DEC/fineui from final/11.0 to persist/11.0
...
* commit '9093689c7fbf448238a71326dfb21a0846f946d3': (90 commits)
BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
BI-119112 fix:editor弹出errorbubble位置修改
Revert "BI-119112 fix:editor可以自定义error bubble位置"
BI-119112 fix:editor可以自定义error bubble位置
BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览,下拉树查看已选展示异常
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
auto upgrade version to 2.0.20221218194544
auto upgrade version to 2.0.20221216170431
BI-118262 fix: 树过滤组件搜索过滤不生效
BI-117667 fix: 【6.0.5冒烟】数值下拉选择多个选项,查看已选点击加载更多展示重复数据
auto upgrade version to 2.0.20221216114354
KERNEL-13893 feat: 颜色选择器默认色板候选调整
auto upgrade version to 2.0.20221216100516
auto upgrade version to 2.0.20221215221629
auto upgrade version to 2.0.20221215220552
BI-119055 fix: needadaptive的下拉计算NaN
无JRIA fix: 再检查一遍输入框圆角问题
auto upgrade version to 2.0.20221215171537
BI-118849 fix: combo在屏幕边缘,左右位置不够之后的位置调整逻辑
...
2 years ago
superman
9b8535f0d6
Merge pull request #215890 in DEC/fineui from master to feature/x
...
* commit 'de96301385cdfbb6eab17fd2eaa6dc731b8445ba':
auto upgrade version to 2.0.20230104191718
BI-119658 feat: MultiSelectCombo支持搜索自定义itemFormatter
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
data
de96301385
auto upgrade version to 2.0.20230104191718
2 years ago
Dailer-刘荣歆
2bc697c38e
Pull request #3314 : JSY-25808 && BI-119658
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'a105c140ec6a0440c532ad7d3b08f64809760146':
BI-119658 feat: MultiSelectCombo支持搜索自定义itemFormatter
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
Impact-吴家豪
9fc6250b2d
Pull request #3315 : KERNEL-13901 refactor: input文件夹ES6化补充
...
Merge in VISUAL/fineui from ~IMPACT/fine_ui:es6 to es6
* commit '4efd86dc35c980e3c754611464af6469f7e00f40':
KERNEL-13901 refactor: input文件夹ES6化补充
2 years ago
windy
96e4fb0cef
BI-119441 公式输入字符页面崩溃
2 years ago
zsmj
c4184571d3
KERNEL-14012 feat: core/structure文件夹
2 years ago
impact
4efd86dc35
KERNEL-13901 refactor: input文件夹ES6化补充
2 years ago
zsmj
a105c140ec
BI-119658 feat: MultiSelectCombo支持搜索自定义itemFormatter
2 years ago
Impact-吴家豪
02229a41fe
Pull request #3313 : KERNEL-13901 refactor: label、editor、input文件夹ES6化
...
Merge in VISUAL/fineui from ~IMPACT/fine_ui:es6 to es6
* commit '63ab82f65ff5ffcc80e44281afdc246078fbcb6d':
KERNEL-13901 refactor: label、editor、input文件夹ES6化
2 years ago
Impact-吴家豪
63ab82f65f
Fixed merge conflict
2 years ago
treecat-罗群
6118935451
Pull request #3311 : KERNEL-13962 refact: es6按钮组
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'f29b6135173c313d6ab61139296b33f9e7195c95':
KERNEL-13962 refact: es6按钮组
2 years ago
zsmj
bd331aad6c
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
impact
b092b80dd4
KERNEL-13901 refactor: label、editor、input文件夹ES6化
2 years ago
Treecat
f29b613517
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
...
# Conflicts:
# src/base/index.js
2 years ago
zsmj
6b58c1b907
KERNEL-14012 feat: core/structure文件夹
2 years ago
zsmj
47a9ac4d31
Merge branch 'es6' of ssh://code.fineres.com:7999/~dailer/fineui into es6
2 years ago
zsmj
bceffd1a0a
KERNEL-14012 feat: core/structure文件夹
2 years ago
Treecat
e8f2b82e48
KERNEL-13962 refact: es6按钮组
2 years ago
Zhenfei.Li-李振飞
1da1920a2a
Pull request #3310 : 无JIRA任务 chore: 重新整理一下import和export和挂载到BI的规范
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '455a1618766713b1aef3687a559d6b447540cd89':
无JIRA任务 refactor: func中的挂载BI挪走
无JIRA任务 chore: 重新整理一下import和export和挂载到BI的规范
2 years ago
Zhenfei.Li
455a161876
无JIRA任务 refactor: func中的挂载BI挪走
2 years ago
Zhenfei.Li
c645f52ac8
无JIRA任务 chore: 重新整理一下import和export和挂载到BI的规范
2 years ago
iapyang
0c17f1b9a5
Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui
2 years ago
iapyang
f8c96f249a
REPORT-85056 🦄 refactor: 升级jquery
2 years ago
superman
ec71158628
Merge pull request #215841 in DEC/fineui from bugfix/11.0 to feature/x
...
* commit '3676b241691b142f2a0e3e3fb4f43b4bef91592a':
2 years ago
superman
3676b24169
Merge pull request #215840 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit '220de618728da7bd841a30526c5a6f02c1aa970b':
BI-118657 style: 图标更新
2 years ago
superman
6b6b62acfd
Merge pull request #215825 in DEC/fineui from master to feature/x
...
* commit '73637b654568fca76d930f21b40a2f3e4f364671':
auto upgrade version to 2.0.20230104113455
2 years ago
data
73637b6545
auto upgrade version to 2.0.20230104113455
2 years ago
superman
3783ef1303
Merge pull request #215821 in DEC/fineui from master to feature/x
...
* commit '12e1429b864b07f8f976af9cb2e3471e4975f377':
auto upgrade version to 2.0.20230104103318
2 years ago
superman
2b95793db6
Merge pull request #215820 in DEC/fineui from release/11.0 to feature/x
...
* commit '220de618728da7bd841a30526c5a6f02c1aa970b':
BI-118657 style: 图标更新
2 years ago
Dailer-刘荣歆
b4d01e95aa
Pull request #3301 : KERNEL-13991 feat: core/func文件夹
...
Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6
* commit '3955ff070b17a9c8eb1b7020bd8adf0bdffac767':
KERNEL-13991 feat: core/func文件夹
KERNEL-13991 feat: core/func文件夹
KERNEL-13991 feat: core/func文件夹
2 years ago
zsmj
3955ff070b
Merge branch 'es6' of https://code.fineres.com/scm/visual/fineui into es6
...
# Conflicts:
# src/core/index.js
2 years ago
zsmj
df41ae3b78
KERNEL-13991 feat: core/func文件夹
2 years ago
Aeolus.Zhang-张敬峥
12e1429b86
Merge pull request #3303 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '220de618728da7bd841a30526c5a6f02c1aa970b':
BI-118657 style: 图标更新
2 years ago
Sylar-黄山
262c3a18e9
Pull request #3302 : 无JIRA fix: extend 类型修复
...
Merge in VISUAL/fineui from ~SYLAR/fineui:master to master
* commit '51c1b860d6d907aad4dbb4d6f0555d662db84b64':
无JIRA fix: extend 类型修复
2 years ago
Zoey.Chen-陈泽语
220de61872
Pull request #215809 : BI-118657 style: 图标更新
...
Merge in DEC/fineui from ~ZOEY.CHEN/fineui_:release/11.0 to release/11.0
* commit '98038f2b07b5c78a2f62c925257aa8e56260666f':
BI-118657 style: 图标更新
2 years ago
zsmj
8ed5aaf502
KERNEL-13991 feat: core/func文件夹
2 years ago
data
001ebd1fbb
auto upgrade version to 2.0.20230104103318
2 years ago
chenzeyu
98038f2b07
BI-118657 style: 图标更新
2 years ago
Impact-吴家豪
95a461c194
Pull request #3300 : KERNEL-13948 refactor: base/combination文件夹ES6化
...
Merge in VISUAL/fineui from ~IMPACT/fine_ui:es6 to es6
* commit '4edb0d9b23139d38d3913765396c6c49d69d61b3':
KERNEL-13948 refactor: base/combination文件夹ES6化
KERNEL-13948 docs: 修复combo_group demo接口错误
2 years ago
zsmj
4753180394
Merge branch 'es6' of ssh://code.fineres.com:7999/~dailer/fineui into es6
...
# Conflicts:
# src/core/index.js
2 years ago
zsmj
15b9445fae
KERNEL-13991 feat: core/func文件夹
2 years ago
superman
53396f6e1f
Merge pull request #215684 in DEC/fineui from master to feature/x
...
* commit '51c1b860d6d907aad4dbb4d6f0555d662db84b64':
无JIRA fix: extend 类型修复
2 years ago
Sylar-黄山
51c1b860d6
Pull request #215672 : 无JIRA fix: extend 类型修复
...
Merge in DEC/fineui from ~SYLAR/fineui:master to master
* commit '41edb79a1a627b1dc83c1b481387469b155f828a':
无JIRA fix: extend 类型修复
2 years ago