diff --git a/package.json b/package.json index 526877a75..6f1b83328 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@ctrl/tinycolor": "^3.4.0", "@logicflow/core": "0.7.1", "@logicflow/extension": "0.7.1", - "@pureadmin/components": "^0.0.9", + "@pureadmin/components": "^1.0.0", "@vueuse/core": "^7.7.0", "@vueuse/motion": "^2.0.0-beta.9", "@vueuse/shared": "^7.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79b06547c..e45622f37 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ specifiers: "@iconify/vue": ^3.1.3 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 - "@pureadmin/components": ^0.0.9 + "@pureadmin/components": ^1.0.0 "@types/element-resize-detector": 1.1.3 "@types/js-cookie": ^3.0.1 "@types/lodash-es": ^4.17.6 @@ -105,7 +105,7 @@ dependencies: "@ctrl/tinycolor": 3.4.0 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 - "@pureadmin/components": 0.0.9_vue@3.2.31 + "@pureadmin/components": 1.0.0_vue@3.2.31 "@vueuse/core": 7.7.0_vue@3.2.31 "@vueuse/motion": 2.0.0-beta.9_vue@3.2.31 "@vueuse/shared": 7.7.0_vue@3.2.31 @@ -1143,10 +1143,10 @@ packages: } dev: false - /@pureadmin/components/0.0.9_vue@3.2.31: + /@pureadmin/components/1.0.0_vue@3.2.31: resolution: { - integrity: sha512-WCxmnKRDwB+51aEFHr5snIytDCjJuovucfQhVJroQleFYsFga+aYKwmvIRFutOkqVa5hndUXLcUm9k8oTKngcQ== + integrity: sha512-XQAKuGo5ybJsiAiP4JQNJCzS04u6P0B2iQ+3n+h5yEfMQIestmGPomF0pFa0ho/Wp1JpqBxvct9ZcVK7xmNW7w== } peerDependencies: vue: ^3.2.0 diff --git a/src/main.ts b/src/main.ts index 2122a41a6..f5f1341b1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,6 +14,7 @@ import "virtual:windi.css"; // 导入公共样式 import "./style/index.scss"; import "@pureadmin/components/dist/index.min.css"; +import "@pureadmin/components/dist/theme.min.css"; // 导入字体图标 import "./assets/iconfont/iconfont.js"; import "./assets/iconfont/iconfont.css"; diff --git a/src/style/index.scss b/src/style/index.scss index 823328fef..991bac4ba 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -93,17 +93,3 @@ ul { .mobile-spacing { margin: 0; } - -// @pureadmin/components 样式覆盖 -.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn { - color: var(--el-color-primary) !important; -} -.ant-tabs-ink-bar { - background: var(--el-color-primary) !important; -} -.ant-tabs-tab, -.ant-tabs-tab-btn { - &:hover { - color: var(--el-color-primary) !important; - } -}