From c7b33fe92cf6d4449ca5919353c15611ae9ad410 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:40:32 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/components/graffiti/components/brushSize.vue | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/components/graffiti/components/brushSize.vue b/src/components/graffiti/components/brushSize.vue
index 9c47a7c..52d103b 100644
--- a/src/components/graffiti/components/brushSize.vue
+++ b/src/components/graffiti/components/brushSize.vue
@@ -9,6 +9,7 @@
title="璋冩暣绗斿埛绮楃粏"
@change="(event) => $emit('change-size', +event.target.value)"
/>
+ <el-color-picker v-model="checkColor" @change="onChangeColor"></el-color-picker>
</div>
</template>
@@ -24,12 +25,29 @@
brushSize() {
return this.size
}
+ },
+ data() {
+ return {
+ checkColor:"#000000"
+ }
+ },
+ methods:{
+ onChangeColor(color) {
+ this.$emit("change-color", color);
+ },
}
};
// const brushSize = computed(() => props.size);
</script>
-<style scoped>
+<style lang="less" scoped>
+.wrap-range {
+ display: flex;
+ align-items: center;
+ .el-color-picker {
+ margin-left: 20px;
+ }
+}
.wrap-range input {
width: 150px;
height: 20px;
--
Gitblit v1.9.1