Skip to content
This repository was archived by the owner on Aug 10, 2023. It is now read-only.

Commit 1930cba

Browse files
committed
release: 更新 TyhTagging 组件样式问题
1 parent 7bbc64a commit 1930cba

File tree

10 files changed

+1204
-59
lines changed

10 files changed

+1204
-59
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# 更新日志
22

3+
## 3.2.10 (2022-02-22)
4+
5+
- 更新 TyhTagging 组件样式问题
6+
37
## 3.2.10 (2022-02-21)
48

59
- 加入 TyhTagging 组件

src/App.vue

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
<template>
2+
<p>
3+
<tyh-tagging type="primary" size="20">tyh-ui</tyh-tagging>
4+
整体<tyh-tagging type="danger" color="skyblue">非常简洁明了</tyh-tagging>,
5+
虽没有很多高级的组件,但它是使用最简单的方式达到
6+
<tyh-tagging type="danger">实用</tyh-tagging>的效果。
7+
</p>
8+
<p>
9+
<tyh-tagging type="danger">
10+
使用方便,配置简单,目录清晰,结构简单,组件轻量级,上手简单,像复制粘贴一样容易。
11+
</tyh-tagging>
12+
</p>
13+
214
<tyh-tagging>标注1</tyh-tagging>
315
<tyh-tagging type="primary">标注2</tyh-tagging>
416
<tyh-tagging type="success">标注3</tyh-tagging>
@@ -7,10 +19,10 @@
719
</template>
820

921
<script setup>
10-
import { ref } from 'vue'
11-
const fits = ['fill', 'contain', 'cover', 'none', 'scale-down']
12-
const fun = (x) => x + 1
13-
fun(2)
22+
// import { ref } from 'vue'
23+
// const fits = ['fill', 'contain', 'cover', 'none', 'scale-down']
24+
// const fun = (x) => x + 1
25+
// fun(2)
1426
// provide('newValue', '123')
1527
// 图片懒加载简单逻辑
1628
// nextTick(() => {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.tyh-tagging {
2+
display: inline-block;
3+
border-radius: 6px;
4+
padding: 2px 8px;
5+
margin: 0;
6+
}
7+
.tyh-tagging-,
8+
.tyh-tagging-default {
9+
background-color: #e7e7e7;
10+
}
11+
.tyh-tagging-primary {
12+
background-color: #3a6ff4;
13+
}
14+
.tyh-tagging-success {
15+
background-color: #54c600;
16+
}
17+
.tyh-tagging-danger {
18+
background-color: #d10f1b;
19+
}
20+
.tyh-tagging-warning {
21+
background-color: #fbcc30;
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@primary: #3a6ff4;
2+
@success: #54c600;
3+
@danger: #d10f1b;
4+
@warning: #fbcc30;
5+
6+
.tyh-tagging {
7+
display: inline-block;
8+
border-radius: 6px;
9+
padding: 2px 8px;
10+
margin: 0;
11+
}
12+
13+
.tyh-tagging-,
14+
.tyh-tagging-default {
15+
background-color: #e7e7e7;
16+
}
17+
18+
.tyh-tagging-primary {
19+
background-color: @primary;
20+
}
21+
22+
.tyh-tagging-success {
23+
background-color: @success;
24+
}
25+
26+
.tyh-tagging-danger {
27+
background-color: @danger;
28+
}
29+
30+
.tyh-tagging-warning {
31+
background-color: @warning;
32+
}

src/components/tyhUi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tyh-ui2",
3-
"version": "3.2.10",
3+
"version": "3.2.11",
44
"description": "The next generation ui component library of tyh-ui is based on vue3 Version, fully embrace vue3.",
55
"main": "src/index.js",
66
"scripts": {

src/components/tyhUi/packages/tagging/TyhTagging.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ const props = defineProps({
2020
},
2121
color: {
2222
type: String,
23-
default: '#333'
23+
default: '#fff'
2424
}
2525
})
2626
const isClass = computed(() => ['tyh-tagging', `tyh-tagging-${props.type}`])
2727
const isStyle = computed(() => {
28-
return { fontSize: `${props.size}px`, color: props.color }
28+
return {
29+
fontSize: `${props.size}px`,
30+
color: props.type === 'default' ? '#333' : props.color
31+
}
2932
})
3033
</script>
31-
32-
<style src="./style/index.css" scoped>
33-
</style>

src/components/tyhUi/packages/tagging/style/index.css

-21
This file was deleted.

src/components/tyhUi/packages/tagging/style/index.less

-26
This file was deleted.

src/components/tyhUi/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const install = app => {
8585
}
8686

8787
const tyhUi = {
88-
version: "3.2.10",
88+
version: "3.2.11",
8989
install
9090
}
9191

src/components/tyhUi/style/index.css

+1,123-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)