Zhenfei.Li
70accbff8f
Merge branch 'master' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
...
# Conflicts:
# src/base/single/editor/editor.js
# src/core/utils/chinesePY.js
2 years ago
Zhenfei.Li-李振飞
1a05f1ffab
Merging in latest from upstream (VISUAL/fineui:refs/heads/master)
...
* commit '718f83e1f9181c3d2136a915bca1540124cb1e02':
auto upgrade version to 2.0.20230107203454
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
Zhenfei.Li-李振飞
77124056b5
Pull request #3330 : 无JIRA任务 refactor: 批量替换一下错误写法
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit 'ce500ccec12d020f149558967162287fd91b2106':
无JIRA任务 refactor: 批量替换一下错误写法
2 years ago
Zhenfei.Li
ce500ccec1
Merge branch 'es6' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
2 years ago
Zhenfei.Li
ad988917c1
无JIRA任务 refactor: 批量替换一下错误写法
2 years ago
Impact-吴家豪
9c6066e51e
Pull request #3327 : KERNEL-14020 refactor: base/single中的iframe,image,instruction,link,trigger ES6化
...
Merge in VISUAL/fineui from ~IMPACT/fine_ui:es6 to es6
* commit '1530f78a1e405b926e652da2eead493792b99e22':
KERNEL-14020 refactor: base/single中的iframe,image,instruction,link,trigger ES6化
2 years ago
Zhenfei.Li-李振飞
61799cbba4
Pull request #3325 : KERNEL-14035 refactor: core/utils
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '3d958f3c9e642af2e94fdb860286c40f2bfdeb55':
KERNEL-14035 refactor: core/utils
2 years ago
data
718f83e1f9
auto upgrade version to 2.0.20230107203454
2 years ago
Dailer-刘荣歆
54bf0aef91
Pull request #3329 : JSY-25808 fix: fineui-复选下拉框bug
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit 'cf931e8ee1767e76c3acd7270f75572de79a4d2f':
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
zsmj
cf931e8ee1
JSY-25808 fix: fineui-复选下拉框bug
2 years ago
Zhenfei.Li-李振飞
3d958f3c9e
Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)
...
* commit 'b25759f4c8c57ce562c3f4ce1204ef70941a9ee1':
KERNEL-14022 refact: textitem
KERNEL-13972 refactor: import不换行
KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx
KERNEL-14022 refact: 按钮干掉 apply
2 years ago
Zhenfei.Li-李振飞
42c039c398
Merging in latest from upstream (VISUAL/fineui:refs/heads/master)
...
* commit 'e33549fec3f77f79f202cd2c40c16d9691d82306': (25 commits)
auto upgrade version to 2.0.20230106121528
auto upgrade version to 2.0.20230106114746
REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
KERNEL-14024 feat: bi.number_editor 功能优化, 支持键盘上下键微调数值
REPORT-87959 fix: BI.NumberEditor超出范围需要自动禁用微调按钮
auto upgrade version to 2.0.20230105142517
auto upgrade version to 2.0.20230104191718
BI-119441 公式输入字符页面崩溃
BI-119658 feat: MultiSelectCombo支持搜索自定义itemFormatter
JSY-25808 fix: fineui-复选下拉框bug
auto upgrade version to 2.0.20230104113455
auto upgrade version to 2.0.20230104103318
BI-118657 style: 图标更新
无JIRA fix: extend 类型修复
auto upgrade version to 2.0.20230103144542
无jira fix(base/extend): 修改泛型
auto upgrade version to 2.0.20230103111549
auto upgrade version to 2.0.20230103094653
无JIRA refactor(base/extend): 完善泛型
auto upgrade version to 2.0.20221230161545
...
2 years ago
treecat-罗群
b25759f4c8
Pull request #3328 : KERNEL-14022 refact: textitem
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit 'a7adde18115d89f59c93eb3d485ba67dd6d52587':
KERNEL-14022 refact: textitem
2 years ago
Treecat
a7adde1811
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
Treecat
1d97dd10cc
KERNEL-14022 refact: textitem
2 years ago
Joker.Wang-王顺
1609ae3079
Pull request #3326 : KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx
...
Merge in VISUAL/fineui from ~JOKER.WANG/fineui:es6 to es6
* commit '7deb6554b04ef6d626f99dd255c7b7ad1368383c':
KERNEL-13972 refactor: import不换行
KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx
2 years ago
impact
1530f78a1e
KERNEL-14020 refactor: base/single中的iframe,image,instruction,link,trigger ES6化
2 years ago
Joker.Wang-王顺
7deb6554b0
KERNEL-13972 refactor: import不换行
2 years ago
treecat-罗群
2d78b6fe62
Pull request #3324 : KERNEL-14022 refact: 按钮干掉 apply
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '882dda0f30f37541842c55f31bdc65747cc9ab61':
KERNEL-14022 refact: 按钮干掉 apply
2 years ago
Joker.Wang-王顺
f931531212
KERNEL-13972 refactor: 解决冲突
2 years ago
Joker.Wang-王顺
50db461708
KERNEL-13972 refactor: base/collection、base/tree es6化和修改bi.xxx
2 years ago
Zhenfei.Li
7446b7e786
KERNEL-14035 refactor: core/utils
2 years ago
Treecat
882dda0f30
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
Treecat
c5ea536fd7
KERNEL-14022 refact: 按钮干掉 apply
2 years ago
treecat-罗群
c4e47e6235
Pull request #3321 : KERNEL-14022 case/button文件夹 es6
...
Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6
* commit '06c05a34fb7da3a5b205e6c18e92f23c943cab67':
case/button文件夹 es6
2 years ago
Zhenfei.Li-李振飞
2e9e4426f1
Pull request #3322 : KERNEL-14035 refactor: constant、element、logic文件夹及整体eslint一下
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '8fcb09c1e3c2805906ed44cd4cda7426d3a2a65b':
KERNEL-14035 refactor: 挂载Element
KERNEL-14035 refactor: constant、element、logic文件夹及整体eslint一下
2 years ago
data
e33549fec3
auto upgrade version to 2.0.20230106121528
2 years ago
Aeolus.Zhang-张敬峥
66d39c7012
Merge pull request #3323 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit 'b53dcfc993a5e3d728dcd4fc0dfc70fa380291bf':
REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
2 years ago
superman
b53dcfc993
Merge pull request #216131 in DEC/fineui from final/11.0 to release/11.0
...
* commit '25b806c344e5397547d5b528630b1af073db58ab':
REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
2 years ago
data
8c4d2bde5e
auto upgrade version to 2.0.20230106114746
2 years ago
Dailer-刘荣歆
25b806c344
Pull request #215980 : REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
...
Merge in DEC/fineui from ~DAILER/fineui-decision:final/11.0 to final/11.0
* commit 'd610d82b01553ea107e57b9a9af5a5a02c037a88':
REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
2 years ago
Dailer-刘荣歆
34921cab7f
Pull request #3318 : REPORT-87959 && KERNEL-14024 feat: bi.number_editor 功能优化, 支持键盘上下键微调数值
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '92c60228ff4b4ed12f53deb254499fec6017ddbb':
KERNEL-14024 feat: bi.number_editor 功能优化, 支持键盘上下键微调数值
REPORT-87959 fix: BI.NumberEditor超出范围需要自动禁用微调按钮
2 years ago
Zhenfei.Li
8fcb09c1e3
KERNEL-14035 refactor: 挂载Element
2 years ago
Zhenfei.Li
153b612482
Merge branch 'es6' of ssh://code.fineres.com:7999/~zhenfei.li/fineui into es6
2 years ago
Zhenfei.Li
4addb6aefd
KERNEL-14035 refactor: constant、element、logic文件夹及整体eslint一下
2 years ago
Zhenfei.Li-李振飞
62fe9b5f31
Pull request #3320 : KERNEL-14001 refactor: plguin、system等
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '7ae79f12e34d873a2f4c058cf2fe3d880c8eb2a0':
KERNEL-14001 refactor: plguin、system等
2 years ago
Treecat
06c05a34fb
Merge branch 'es6' of ssh://code.fineres.com:7999/~treecat/fineui into es6
2 years ago
Treecat
a18cd23e1c
case/button文件夹 es6
2 years ago
Dailer-刘荣歆
d610d82b01
REPORT-88040 fix: 【BI6.0】【用户管理-机构部门】机构部门选择部门后编辑用户,点击全选显示异常
2 years ago
Zhenfei.Li
7ae79f12e3
KERNEL-14001 refactor: plguin、system等
2 years ago
Zhenfei.Li-李振飞
d911498fb7
Pull request #3319 : 无JIRA任务 chore: eslint调整
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '6da3c1967041fc25d61d92d7a5faa33fcaf91714':
无JIRA任务 chore: eslint调整
2 years ago
Zhenfei.Li
6da3c19670
无JIRA任务 chore: eslint调整
2 years ago
zsmj
92c60228ff
Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui
2 years ago
zsmj
2ba96a52d6
KERNEL-14024 feat: bi.number_editor 功能优化, 支持键盘上下键微调数值
2 years ago
zsmj
7a2c999e2b
REPORT-87959 fix: BI.NumberEditor超出范围需要自动禁用微调按钮
2 years ago
data
2293c19c5b
auto upgrade version to 2.0.20230105142517
2 years ago
Aeolus.Zhang-张敬峥
1b8b388f03
Merge pull request #3317 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '4b6370326ce09197339980235051dfe3c79b881e':
BI-119441 公式输入字符页面崩溃
2 years ago
windy-许昊
4b6370326c
Pull request #215866 : BI-119441 公式输入字符页面崩溃
...
Merge in DEC/fineui from ~WINDY/fineui:release/11.0 to release/11.0
* commit '96e4fb0cef52b53f70d75be06c693d5177fa10f6':
BI-119441 公式输入字符页面崩溃
2 years ago
Zhenfei.Li-李振飞
4913c2b167
Pull request #3316 : 无JIRA任务 chore: 补充eslint规则
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '5fcb9f0eb0d31f09ae4407654fd4b01d40e8b076':
无JIRA任务 chore: 补充eslint规则
2 years ago
Zhenfei.Li-李振飞
5fcb9f0eb0
Fixed merge conflict
2 years ago