superman
d04bd32e4f
Merge pull request #260361 in DEC/fineui from feature/x to bugfix/11.0
...
* commit '47afc547fb759e8e0804fad02bfbe42b1a982c33': (37 commits)
REPORT-113703 FineOne 新前端样式统一 弹窗-FR.Msg.Alert()
REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
BI-142512 fix: 年份控件切换成动态时间少了横线
REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
BI-142512 fix: 年份控件切换成动态时间少了横线
update font
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
无jira任务 fix:补充MultiLayerDownListCombo的抛出事件
BI-137665 fix: popover和message高度改28
无jira任务 优化布局
BI-141781 feat: 下拉框接收tipText
BI-129824 fix: 多提交
BI-129824 fix: 控件优化
BI-129824 fix: 控件优化
BI-137665 feat: 修改弹窗样式
无JIRA任务 form不传label时展示内容
update font
...
11 months ago
chenzeyu
8fb9f2a37c
无jira任务 fix: 更新图标
11 months ago
drew-倪梦威
47afc547fb
Pull request #259591 : REPORT-113703 FineOne 新前端样式统一 弹窗-FR.Msg.Alert()
...
Merge in DEC/fineui from ~DREW/fineui:feature/x to feature/x
* commit '64843af1b945c09e594b5ccef469ac230b3a285f':
REPORT-113703 FineOne 新前端样式统一 弹窗-FR.Msg.Alert()
11 months ago
nmwei
64843af1b9
REPORT-113703 FineOne 新前端样式统一 弹窗-FR.Msg.Alert()
11 months ago
superman
2fb142bd38
Merge pull request #259437 in DEC/fineui from release/11.0 to feature/x
...
* commit 'c5c701d1aa902c878250308576221833257b9296':
11 months ago
superman
c5c701d1aa
Merge pull request #259436 in DEC/fineui from final/11.0 to release/11.0
...
* commit '518d6a69b27e2c4dd7c92989a53b181be1a8e450':
11 months ago
superman
518d6a69b2
Merge pull request #259435 in DEC/fineui from persist/11.0 to final/11.0
...
* commit '476d874c94bda602013091e3cad390dd0e583407':
11 months ago
superman
98133c8faa
Merge pull request #259434 in DEC/fineui from master to feature/x
...
* commit 'b7adcb94b0bf6c0bd873c77c25fa8963fde60faf':
BI-142512 fix: 年份控件切换成动态时间少了横线
11 months ago
Oliver.Chen-陈润桐
a9ff10b3b6
Pull request #259433 : 无jira fix:解决冲突
...
Merge in DEC/fineui from ~OLIVER.CHEN/dec-fineui:feature/x to feature/x
* commit '02f1cc1c2401fd00c1f116ed8f6166af923e9442':
REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
update font
11 months ago
Hans-杨瀚
130861e5e2
Pull request #259432 : REPORT-112276 & REPORT-112276
...
Merge in DEC/fineui from ~HANS/fineui:feature/x to feature/x
* commit '7a884527b7d17c9c8539c39a57cad7cba6d5edd3':
REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
11 months ago
Oliver.Chen
02f1cc1c24
Merge remote-tracking branch 'origin/release/11.0' into feature/x
...
# Conflicts:
# packages/fineui/dist/font/iconfont.eot
# packages/fineui/dist/font/iconfont.svg
# packages/fineui/dist/font/iconfont.ttf
# packages/fineui/dist/font/iconfont.woff
# packages/fineui/dist/font/iconfont.woff2
11 months ago
hans
7a884527b7
REPORT-112276 公共数据取数简道云数据连接部分适配
...
补充下ts类型
11 months ago
hans
0680435c5d
REPORT-112276 公共数据取数简道云数据连接部分适配
...
引用lodash.uniqWith
11 months ago
Hans-杨瀚
c9b6449a91
Pull request #259429 : REPORT-112276 公共数据取数简道云数据连接部分适配
...
Merge in DEC/fineui from ~HANS/fineui:release/11.0 to release/11.0
* commit '53c3562c0a45b40f979e105746e33e1316aad123':
REPORT-112276 公共数据取数简道云数据连接部分适配 补充下ts类型
11 months ago
superman
476d874c94
Merge pull request #259430 in DEC/fineui from final/11.0 to persist/11.0
...
* commit '40d5174afb364726df15246ad7e9789224e87494':
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
update font
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
11 months ago
hans
53c3562c0a
REPORT-112276 公共数据取数简道云数据连接部分适配
...
补充下ts类型
11 months ago
Zoey.Chen-陈泽语
1e1611ff15
Pull request #259426 : BI-142512 fix: 年份控件切换成动态时间少了横线
...
Merge in DEC/fineui from ~ZOEY.CHEN/fineui_:feature/x to feature/x
* commit 'beeeec7ba568431b17cb9e0f2b2373c50a795a8f':
BI-142512 fix: 年份控件切换成动态时间少了横线
11 months ago
chenzeyu
beeeec7ba5
BI-142512 fix: 年份控件切换成动态时间少了横线
11 months ago
superman
e2930cfcad
Merge pull request #259424 in DEC/fineui from final/11.0 to release/11.0
...
* commit '40d5174afb364726df15246ad7e9789224e87494':
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
update font
11 months ago
Hans-杨瀚
f6a2d746a2
Pull request #259422 : REPORT-112276 公共数据取数简道云数据连接部分适配
...
Merge in DEC/fineui from ~HANS/fineui:release/11.0 to release/11.0
* commit '0c02ca36abda5ef0cdc3da02edf52160e987b5de':
REPORT-112276 公共数据取数简道云数据连接部分适配 引用lodash.uniqWith
11 months ago
hans
0c02ca36ab
REPORT-112276 公共数据取数简道云数据连接部分适配
...
引用lodash.uniqWith
11 months ago
Zoey.Chen-陈泽语
40d5174afb
Pull request #259421 : BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
...
Merge in DEC/fineui from ~ZOEY.CHEN/fineui_:final/11.0 to final/11.0
* commit '9384119477626309ce958cbacb065fe5f665574c':
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
11 months ago
chenzeyu
9384119477
BI-142531 fix: 缓存清空且hasNext为false时仍然显示加载更多数据
11 months ago
Zoey.Chen-陈泽语
b7adcb94b0
Pull request #3728 : BI-142512 fix: 年份控件切换成动态时间少了横线
...
Merge in VISUAL/fineui from ~ZOEY.CHEN/fineui:master to master
* commit '3276f9eab33ee0e80bf24c18dac54e0944ff7791':
BI-142512 fix: 年份控件切换成动态时间少了横线
11 months ago
chenzeyu
3276f9eab3
BI-142512 fix: 年份控件切换成动态时间少了横线
11 months ago
superman
ed84db36a1
Pull request #259419 : 无jira任务, release/11.0 合 feature/x
...
Merge in DEC/fineui from release/11.0 to feature/x
* commit 'b4fb18b6fe04e3ae64ff71f1116d65894896f5ff':
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
11 months ago
Oliver.Chen-陈润桐
ba0efd11c3
Pull request #259420 : update font
...
Merge in DEC/fineui from ~OLIVER.CHEN/dec-fineui:final/11.0 to final/11.0
* commit 'aafd5db7537475791f6bdb5966d9b42d02fde364':
update font
11 months ago
Oliver.Chen
aafd5db753
update font
11 months ago
superman
b4fb18b6fe
Merge pull request #259418 in DEC/fineui from final/11.0 to release/11.0
...
* commit '253c1b2eb80dadb40d7b886e5ca8dcdf3e1eb1a9':
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
11 months ago
superman
1c8be56dc3
Merge pull request #259416 in DEC/fineui from master to feature/x
...
* commit '9429da8e768097db25c4236fec9b7776c44f6473':
无jira任务 fix:补充MultiLayerDownListCombo的抛出事件
11 months ago
Jimmy.Chai-柴嘉明
253c1b2eb8
Pull request #259415 : BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
...
Merge in DEC/fineui from ~JIMMY.CHAI/dec-fineui:final/11.0 to final/11.0
* commit 'c74646d3f6de680bcc739e9404f0ea2a19e6f2dc':
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
11 months ago
jimmychai
c74646d3f6
BI-142225 fix: 再次添加过滤条件,参数值三个字会标红
11 months ago
Claire.Tang-唐锦霞
9429da8e76
Pull request #3727 : 无jira任务 fix:补充MultiLayerDownListCombo的抛出事件
...
Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master
* commit '3f4f732e333ec92e707dd6c730576429251bb622':
无jira任务 fix:补充MultiLayerDownListCombo的抛出事件
11 months ago
Claire
3f4f732e33
Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui
11 months ago
Claire
9ae59913ae
无jira任务 fix:补充MultiLayerDownListCombo的抛出事件
11 months ago
superman
f050d0bcf6
Merge pull request #259357 in DEC/fineui from master to feature/x
...
* commit '3f635a4d694630ab7f515d9eab808792895df3c2':
BI-137665 fix: popover和message高度改28
11 months ago
imp-张健
3f635a4d69
Pull request #3726 : BI-137665 fix: popover和message高度改28
...
Merge in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit 'd4b3fc811ed2ed4b37c7e96c34adc6c02256dbf6':
BI-137665 fix: popover和message高度改28
11 months ago
jian
d4b3fc811e
Merge remote-tracking branch 'origin/master'
11 months ago
jian
e498de0e6f
BI-137665 fix: popover和message高度改28
11 months ago
superman
b772a7e33c
Merge pull request #259217 in DEC/fineui from master to feature/x
...
* commit '6671db25fafd4e01cf9c27cecd8e593b615ed036':
无jira任务 优化布局
11 months ago
imp-张健
6671db25fa
Pull request #3725 : 无jira任务 优化布局
...
Merge in VISUAL/fineui from ~IMP/fineui_fui:master to master
* commit '9ccd890ed5423557f5531e12a9fae8752cc9e4bb':
无jira任务 优化布局
11 months ago
imp
9ccd890ed5
无jira任务 优化布局
11 months ago
Austin.Duan-段嗣跃
8b7bb7fd9a
Pull request #259181 : 无JIRA任务,解决冲突
...
Merge in DEC/fineui from ~AUSTIN.DUAN/decision-fineui:feature/x to feature/x
* commit '586f1f7191786f6ea4a86cce15221b165bb3c83f': (24 commits)
BI-141781 feat: 下拉框接收tipText
BI-129824 fix: 多提交
BI-129824 fix: 控件优化
BI-129824 fix: 控件优化
BI-137665 feat: 修改弹窗样式
无JIRA任务 form不传label时展示内容
update font
BI-137665 fix: 代码优化
BI-137665 fix: 代码优化
BI-137665 fix: 代码优化
JSY-36355 feat: MultiSelectItem支持传入el
BI-141206 fix: 去掉默认值
无JIRA 类型
JSY-35428 feat:选色板支持高度props传入
JSY-35428 feat:增加选色控件传递可选颜色色值
无jira任务 多提交的
BI-139188 feat: 【ParusBI】 search_editor的布局改成自适应的
BI-139188 feat: 【ParusBI】 深色模式下树控件样式补齐
KERNEL-16950 fix: 加一些log
KERNEL-16950 fix: 日志
...
11 months ago
superman
e63089a5f5
Pull request #259180 : 无jira任务, bugfix/11.0 合 feature/x
...
Merge in DEC/fineui from bugfix/11.0 to feature/x
* commit 'fe9aa303659d8b4fd44ae0a7afc4fdc3488ecd0e':
11 months ago
Austin.Duan
586f1f7191
无JIRA任务,解决冲突
...
# Conflicts:
# packages/fineui/dist/font/iconfont.eot
# packages/fineui/dist/font/iconfont.svg
# packages/fineui/dist/font/iconfont.ttf
# packages/fineui/dist/font/iconfont.woff
# packages/fineui/dist/font/iconfont.woff2
11 months ago
superman
fe9aa30365
Merge pull request #259179 in DEC/fineui from release/11.0 to bugfix/11.0
...
* commit 'ae81e3a61dec0cbae507ae26e3f95309a882ef1e':
11 months ago
Kobi-蒋科斌
599cb1bc13
Pull request #3724 : BI-141781 feat: 下拉框接收tipText
...
Merge in VISUAL/fineui from ~KOBI/fineui:master to master
* commit '412761872125966f43831bac49881f137a841ab3':
BI-141781 feat: 下拉框接收tipText
11 months ago
superman
dc574384d9
Merge pull request #259175 in DEC/fineui from release/11.0 to feature/x
...
* commit 'ae81e3a61dec0cbae507ae26e3f95309a882ef1e':
11 months ago
superman
ae81e3a61d
Merge pull request #259174 in DEC/fineui from final/11.0 to release/11.0
...
* commit 'aa9c2bd1246e6081d27c6f5add0cd3f379f7ae2b':
11 months ago
superman
aa9c2bd124
Merge pull request #259173 in DEC/fineui from persist/11.0 to final/11.0
...
* commit 'd4a5061109368af95128ea8a7494e1afcc48e51b':
11 months ago