renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/v1.3_营销资产中台

Browse Source 
# Conflicts:
#	src/main.ts
#	src/styles/components/index.scss
#	src/styles/components/table.scss
#	src/styles/index.ts
#	src/views/components/dataEngine/keyWord.vue
This commit is contained in:
rd
2025-07-02 09:22:21 +08:00
parent 30b2eb8211 6ef12fafe4
commit 3f5aa63d89
37 changed files with 1498 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/styles/components/table.scss
View File

@ -1,7 +1,7 @@
.arco-table {
@mixin table-cell-text {
color: var(--Text-1, #211f24);
font-family: 'Alibaba PuHuiTi';
color: var(--Text-1, #3C4043);
font-family: 'PuHuiTi-Regular';
font-size: 14px;
font-style: normal;
font-weight: 400;
@ -19,6 +19,7 @@
padding: 13px 16px;
.arco-table-th-title {
@include table-cell-text;
font-family: 'PingFangSC-Medium';
}
}
}
@ -29,7 +30,8 @@
.arco-table-td {
.arco-table-cell {
padding: 13px 16px;
.arco-table-cell-content {
.arco-table-cell-content,
.arco-table-td-content {
@include table-cell-text;
}
}