Merge remote-tracking branch 'origin/master'

main
liu.shiyi 2 years ago
commit 59f17ac8a7

@ -47,9 +47,8 @@ registerConfig(
'--bs-el-background-3': '#303640', // 组件背景色表格头部、下拉框hover... '--bs-el-background-3': '#303640', // 组件背景色表格头部、下拉框hover...
'--bs-el-title': '#ffffff', // 标题字体颜色 '--bs-el-title': '#ffffff', // 标题字体颜色
'--bs-el-text': '#ffffff', // 一般字体颜色 '--bs-el-text': '#ffffff', // 一般字体颜色
'--bs-el-color-primary': '#409EFF', // elment-ui主题色激活 '--bs-el-color-primary': '#409EFF', // 样式主题色
// 主题色激活 '--bs-el-color-primary-active': '64, 158, 255', // 主要激活 => rgba(64, 158, 255, 1) = #409EFF
'--bs-el-color-primary-active': '64, 158, 255', // => rgba(64, 158, 255, 1) = #409EFF
'--bs-el-border': 'transparent' // 边框颜色 '--bs-el-border': 'transparent' // 边框颜色
}, },
customPlots: [], customPlots: [],

@ -1,6 +1,6 @@
{ {
"name": "@gcpaas/data-room-ui", "name": "@gcpaas/data-room-ui",
"version": "0.0.1-2023071001-Alpha", "version": "0.0.1-2023071102-Alpha",
"description": "自定义大屏", "description": "自定义大屏",
"author": "gc-starter", "author": "gc-starter",
"license": "MIT", "license": "MIT",

@ -301,7 +301,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~packages/assets/style/bsTheme.scss'; @import '../../assets/style/bsTheme.scss';
.bs-pagination { .bs-pagination {
::v-deep .el-input__inner { ::v-deep .el-input__inner {

@ -467,5 +467,5 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~packages/assets/style/bsTheme.scss'; @import '../../assets//style/bsTheme.scss';
</style> </style>

@ -18,7 +18,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "packages/assets/style/bsTheme"; @import "../assets/style/bsTheme.scss";
.not-permission-wrap { .not-permission-wrap {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;

Loading…
Cancel
Save