This commit is contained in:
X1627315083
2023-12-01 17:13:22 +08:00
parent 0c9e153157
commit 86697dc3dd
10 changed files with 139 additions and 89 deletions

View File

@@ -84,8 +84,8 @@
</div>
</a-upload>
</div>
<div class="upload_color Guide_1_11">
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item" :class="[ index == 1?'Guide_1_11_2':'']">
<div class="upload_color">
<div v-for="color,index in selectColorList" :key="color" @click="setUplpadColor(color)" class="upload_color_item" :class="[ index == 0?'Guide_1_11':'',index == 1?'Guide_1_11_2':'']">
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
</div>
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
@@ -387,9 +387,11 @@ export default defineComponent({
this.selectColorList = selectColorList
this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
if(this.driver__.driver){
driverObj__.moveNext()
}
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
};
},100)

View File

@@ -65,7 +65,7 @@
></div>
</div>
<div
class="category_list Guide_1_14"
class="category_list Guide_1_13_1"
v-show="file.categoryShow"
>
<div
@@ -348,7 +348,7 @@ export default defineComponent({
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){
if(this.driver__.driver){
// driverObj__.moveTo(17)
driverObj__.moveTo(16)
}
}
}
@@ -460,11 +460,9 @@ export default defineComponent({
showFileCategory(file: any) {
file.categoryShow = true;
console.log(12312312);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
driverObj__.moveTo(15)
}
})
@@ -486,6 +484,12 @@ export default defineComponent({
file.categoryValue = cate.value;
file.category = cate.name;
this.store.commit("setSketchboardFile", this.fileList);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
// driverObj__.moveTo(13)
}
})
}
},
hiddenFileCategory() {