Zhenfei.Li-李振飞
0890d11ff0
Fixed merge conflict
2 years ago
Joker.Wang-王顺
6747882413
Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)
...
* commit 'f072c668620f96c292114004792960f08f3dd023':
KERNEL-13947 refactor: Drawer的bug
2 years ago
Joker.Wang-王顺
3c98a6b4b8
KERNEL-13841 refactor:base文件es6化与import引入适配
2 years ago
Zhenfei.Li-李振飞
f072c66862
Pull request #3290 : KERNEL-13947 refactor: Drawer的bug
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '0af2b5afdbcb60b320f03c398a2b6105a2108818':
KERNEL-13947 refactor: Drawer的bug
2 years ago
Zhenfei.Li
0af2b5afdb
KERNEL-13947 refactor: Drawer的bug
2 years ago
Joker.Wang-王顺
8a3b7d6dbd
Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)
...
* commit '517df399d56c006bf4ccba858634bde6b1f6c304':
KERNEL-13947 refactor: 处理继承OB对象的执行顺序问题
KERNEL-13928 refactor: 去掉多余的引入
KERNEL-13928 refactor: 修改解构赋值错误的地方
KERNEL-13928 refactor: es6化1.text.js
KERNEL-13928 refactor: es6化0.single.js
KERNEL-13928 refactor: 重构一些用到的方法
2 years ago
Zhenfei.Li-李振飞
517df399d5
Pull request #3289 : KERNEL-13947 refactor: 处理继承OB对象的执行顺序问题
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '67cfec57aec6464bf1f5a6552c8ba2d612b311a4':
KERNEL-13947 refactor: 处理继承OB对象的执行顺序问题
2 years ago
Zhenfei.Li
67cfec57ae
KERNEL-13947 refactor: 处理继承OB对象的执行顺序问题
2 years ago
superman
81d8fde98d
Merge pull request #214492 in DEC/fineui from master to feature/x
...
* commit 'c370dc736fa28f2ff7470f9daeb398ac96c06b3d':
auto upgrade version to 2.0.20221228163952
2 years ago
data
c370dc736f
auto upgrade version to 2.0.20221228163952
2 years ago
superman
76ef644c47
Merge pull request #214488 in DEC/fineui from master to feature/x
...
* commit '1967a92a539399304cfaee1437e4679e1c6f6d01':
REPORT-85533 fix: BI.parseDateTime方法对%l:%M:%S %P这种格式的日期如果带有秒数解析出错
2 years ago
Impact-吴家豪
052894228f
Pull request #3287 : KERNEL-13928 refactor: es6化0.single.js
...
Merge in VISUAL/fineui from ~IMPACT/fine_ui:es6 to es6
* commit 'a941b90118c0e27f6f54e4c1d927056836133a78':
KERNEL-13928 refactor: 去掉多余的引入
KERNEL-13928 refactor: 修改解构赋值错误的地方
KERNEL-13928 refactor: es6化1.text.js
KERNEL-13928 refactor: es6化0.single.js
KERNEL-13928 refactor: 重构一些用到的方法
2 years ago
Dailer-刘荣歆
1967a92a53
Pull request #3288 : REPORT-85533 fix: BI.parseDateTime方法对%l:%M:%S %P这种格式的日期如果带有秒数解析出错
...
Merge in VISUAL/fineui from ~DAILER/fineui:master to master
* commit '170b61c9758615c192b8cad23cc9021604a891de':
REPORT-85533 fix: BI.parseDateTime方法对%l:%M:%S %P这种格式的日期如果带有秒数解析出错
2 years ago
zsmj
170b61c975
REPORT-85533 fix: BI.parseDateTime方法对%l:%M:%S %P这种格式的日期如果带有秒数解析出错
2 years ago
impact
a941b90118
KERNEL-13928 refactor: 去掉多余的引入
2 years ago
impact
7f5eeb430c
KERNEL-13928 refactor: 修改解构赋值错误的地方
2 years ago
impact
2314d4b58b
KERNEL-13928 refactor: es6化1.text.js
2 years ago
impact
a10539682f
KERNEL-13928 refactor: es6化0.single.js
2 years ago
impact
ff266d9864
KERNEL-13928 refactor: 重构一些用到的方法
2 years ago
Joker.Wang-王顺
d91cc3713f
Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)
...
* commit 'fc1f2599856cede93b8df32e35b5a7ed0ef4904d':
KERNEL-13947 refactor: base的es6化demo
2 years ago
Zhenfei.Li-李振飞
fc1f259985
Pull request #3286 : KERNEL-13947 refactor: base的es6化demo
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit '8c8fd18c6cefe604fc6d780eaa46cec1e91f0dc0':
KERNEL-13947 refactor: base的es6化demo
2 years ago
Zhenfei.Li
8c8fd18c6c
KERNEL-13947 refactor: base的es6化demo
2 years ago
Joker.Wang-王顺
eb02dc2d82
Merging in latest from upstream (VISUAL/fineui:refs/heads/es6)
...
* commit 'c8157c5853d8c26651c4ba0109e3c095b9f05ee3':
KERNEL-13947 refactor: OB和Widget从index export
KERNEL-13947 refactor: 统一挂载
KERNEL-13947 refactor: ob和widget的es6化
2 years ago
Zhenfei.Li-李振飞
c8157c5853
Pull request #3285 : KERNEL-13947 refactor: 提交下ob和widget的es6化,避免阻塞
...
Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6
* commit 'e9a87a8528757c42dbef22337850566e3d4e9422':
KERNEL-13947 refactor: OB和Widget从index export
KERNEL-13947 refactor: 统一挂载
KERNEL-13947 refactor: ob和widget的es6化
2 years ago
Zhenfei.Li
e9a87a8528
KERNEL-13947 refactor: OB和Widget从index export
2 years ago
Zhenfei.Li
2b80c67839
KERNEL-13947 refactor: 统一挂载
2 years ago
Zhenfei.Li
da4a0ffac0
KERNEL-13947 refactor: ob和widget的es6化
2 years ago
superman
fe1595ccaf
Merge pull request #214044 in DEC/fineui from bugfix/11.0 to feature/x
...
* commit 'a4ae1138dfa2827b488941f6afd87963e97d0e6f':
2 years ago
superman
a4ae1138df
Merge pull request #214043 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit 'ea776c0be708f36dc71b8eb27a43abe6d3ff19e4':
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】【目录管理-管理首页】添加首页时模板类型的下拉框为空
2 years ago
superman
531a3144dd
Merge pull request #214040 in DEC/fineui from master to feature/x
...
* commit '6a928b6b7d3b580b8aeaab64a063a835a4c329a1':
auto upgrade version to 2.0.20221226102617
2 years ago
superman
22ebfb5823
Merge pull request #214039 in DEC/fineui from release/11.0 to feature/x
...
* commit 'ea776c0be708f36dc71b8eb27a43abe6d3ff19e4':
BI-119112 fix:editor弹出errorbubble位置修改
Revert "BI-119112 fix:editor可以自定义error bubble位置"
BI-119112 fix:editor可以自定义error bubble位置
2 years ago
data
6a928b6b7d
auto upgrade version to 2.0.20221226102617
2 years ago
Aeolus.Zhang-张敬峥
70f876f121
Merge pull request #3283 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit 'ea776c0be708f36dc71b8eb27a43abe6d3ff19e4':
BI-119112 fix:editor弹出errorbubble位置修改
Revert "BI-119112 fix:editor可以自定义error bubble位置"
BI-119112 fix:editor可以自定义error bubble位置
2 years ago
Claire.Tang-唐锦霞
ea776c0be7
Pull request #213315 : BI-119112 fix:editor可以自定义error bubble位置
...
Merge in DEC/fineui from ~CLAIRE.TANG/d-fineui:release/11.0 to release/11.0
* commit 'db70951e38bcac0824de17efe8e3427eaa3a7c4f':
BI-119112 fix:editor弹出errorbubble位置修改
Revert "BI-119112 fix:editor可以自定义error bubble位置"
BI-119112 fix:editor可以自定义error bubble位置
2 years ago
superman
a38cf32eea
Merge pull request #213472 in DEC/fineui from master to feature/x
...
* commit '2919cdbebace177f3556124239b76bb1c7acbecf':
auto upgrade version to 2.0.20221223112542
2 years ago
superman
da6d057687
Merge pull request #213471 in DEC/fineui from release/11.0 to feature/x
...
* commit '7c8064d11aead7e34e173fd9007cb2dabee8e54a':
BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
2 years ago
data
2919cdbeba
auto upgrade version to 2.0.20221223112542
2 years ago
Aeolus.Zhang-张敬峥
f2b957b2fe
Merge pull request #3282 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit '7c8064d11aead7e34e173fd9007cb2dabee8e54a':
BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
2 years ago
Dailer-刘荣歆
7c8064d11a
Pull request #213464 : BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
...
Merge in DEC/fineui from ~DAILER/fineui-decision:release/11.0 to release/11.0
* commit 'e6f07ab36b4b22892bfa801bc1832e4d9ad61eb8':
BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
2 years ago
zsmj
e6f07ab36b
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
2 years ago
zsmj
25117de9d3
BI-119128 fix: 【自适应迭代发散】小屏编辑,高度适应+自定义(1366*449),直接预览,文本控件下拉选项偏离
...
上下空间都不够的时候场景。
另外高度自适应fixed元素导致滚动问题还需探索一下
2 years ago
superman
2e0f653d7d
Merge pull request #213455 in DEC/fineui from master to feature/x
...
* commit 'eae0b4dc62e3c15c0c1c9d1705fdc5bc27590a37':
auto upgrade version to 2.0.20221223092552
2 years ago
superman
4b401f7eb5
Merge pull request #213454 in DEC/fineui from release/11.0 to feature/x
...
* commit 'd83773f58ecb4e14679152386935ad4037ec5c9f':
BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览,下拉树查看已选展示异常
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
2 years ago
data
eae0b4dc62
auto upgrade version to 2.0.20221223092552
2 years ago
Aeolus.Zhang-张敬峥
583d822d47
Merge pull request #3281 in VISUAL/fineui from DEC/fineui:release/11.0 to master
...
* commit 'd83773f58ecb4e14679152386935ad4037ec5c9f':
BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览,下拉树查看已选展示异常
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
2 years ago
Dailer-刘荣歆
d83773f58e
Pull request #213306 : BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览,下拉树查看已选展示异常
...
Merge in DEC/fineui from ~DAILER/fineui-decision:release/11.0 to release/11.0
* commit '326bd3b9578f4039902843e54606aa98934acb43':
BI-119217 fix: 【6.0.6冒烟】等比自适应-高清屏-宽度自适应预览,下拉树查看已选展示异常
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
2 years ago
Claire
db70951e38
BI-119112 fix:editor弹出errorbubble位置修改
2 years ago
Claire
5b1f652ba3
Revert "BI-119112 fix:editor可以自定义error bubble位置"
...
This reverts commit 287c609f6c
.
2 years ago
Claire
287c609f6c
BI-119112 fix:editor可以自定义error bubble位置
2 years ago
Dailer-刘荣歆
326bd3b957
Merging in latest from upstream (DEC/fineui:refs/heads/release/11.0)
...
* commit '328f5d943453bc879129302fc7115a142c6e9088':
REPORT-87371 fix: 【BI6.0】【目录管理-管理首页】添加首页时模板类型的下拉框为空
2 years ago