From 46aa96a3c2b04529eff487bf42ea0ca62da68f30 Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Tue, 21 Nov 2023 23:23:50 +0800 Subject: [PATCH] fix icon --- package.json | 2 +- packages/icon/src/icon.js | 2 +- styles/icon.scss | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2f3b23549..104025980 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "3.7.7-beta.1", + "version": "3.7.7-beta.2", "description": "一个基于 vue 的 PC 端表单/表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...", "scripts": { "update": "npm install --legacy-peer-deps", diff --git a/packages/icon/src/icon.js b/packages/icon/src/icon.js index 40420f3ec..7db450c90 100644 --- a/packages/icon/src/icon.js +++ b/packages/icon/src/icon.js @@ -8,7 +8,7 @@ export default { render (h) { const { name, roll, status } = this return h('i', { - class: [`vxe-icon-${name}`, roll || '', status || ''], + class: [`vxe-icon-${name}`, roll || '', status ? [`theme--${status}`] : ''], on: { click: this.clickEvent } diff --git a/styles/icon.scss b/styles/icon.scss index e2deb66ba..df3487311 100644 --- a/styles/icon.scss +++ b/styles/icon.scss @@ -15,6 +15,29 @@ } } +$btnThemeList: ( + ( + name: "primary", + textColor: var(--vxe-primary-color), + ), + ( + name: "success", + textColor: var(--vxe-success-color), + ), + ( + name: "info", + textColor: var(--vxe-info-color), + ), + ( + name: "warning", + textColor: var(--vxe-warning-color), + ), + ( + name: "danger", + textColor: var(--vxe-danger-color), + ) +); + [class*="vxe-icon-"] { font-family: "vxeiconfont" !important; font-style: normal; @@ -42,6 +65,12 @@ &.roll { animation: rollCircle 1s infinite linear; } + @for $index from 0 to length($btnThemeList) { + $item: nth($btnThemeList, $index + 1); + &.theme--#{map-get($item, name)} { + color: map-get($item, textColor); + } + } } .vxe-icon-time:before {