This commit is contained in:
X1627315083
2023-11-23 15:42:36 +08:00
parent c5820ca082
commit af1c4670b6
6 changed files with 26 additions and 14 deletions

View File

@@ -120,7 +120,7 @@
import { Chrome,Slider,Sketch,Material,Compact,Swatches,Photoshop } from '@ans1998/vue3-color'
import { Https } from "@/tool/https";
import GO from "@/tool/GO";
import { defineComponent, h,ref } from 'vue'
import { defineComponent, h,ref,inject } from 'vue'
import { LoadingOutlined } from '@ant-design/icons-vue';
import {getCookie} from '@/tool/cookie'
import {getUploadUrl,rgbToHsv} from '@/tool/util'
@@ -143,13 +143,14 @@ export default defineComponent({
}) //顔色选择器默认颜色
let selectColorList = ref({
})
let driver__ = inject('driver__')
let {t} = useI18n()
return {
fileList,
colorList,
selectColor,
selectColorList,
driver__,
t,
}
},
@@ -370,7 +371,9 @@ 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}
driverObj__.moveNext()
if(this.driver__.driver){
driverObj__.moveNext()
}
};
},100)
@@ -392,7 +395,9 @@ export default defineComponent({
},
setUplpadColor(color){
this.selectColor = color
driverObj__.moveTo(12)
if(this.driver__.driver){
driverObj__.moveTo(12)
}
},
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';

View File

@@ -482,7 +482,9 @@ export default defineComponent({
).catch(rv=>{
this.loadingShow = false
})
driverObj__.moveNext()
if(this.driver__.driver){
driverObj__.moveNext()
}
})

View File

@@ -132,7 +132,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent,h,ref,computed } from 'vue'
import { defineComponent,h,ref,computed,inject } from 'vue'
import { LoadingOutlined } from '@ant-design/icons-vue';
import {getCookie} from '@/tool/cookie'
import {getUploadUrl} from '@/tool/util'
@@ -167,6 +167,7 @@ export default defineComponent({
let loadingShow = ref(false)
let inputShow = ref(false)
let inputTime = ref()
let driver__:any = inject('driver__')
let {t} = useI18n()
let isTest = ref()
return {
@@ -180,6 +181,7 @@ export default defineComponent({
loadingShow,
inputShow,
inputTime,
driver__,
t,
isTest,
}
@@ -199,7 +201,7 @@ export default defineComponent({
watch:{
printBoards:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2){
if(newVal.length>=2 && this.driver__.driver){
driverObj__.moveTo(9)
}
}

View File

@@ -252,7 +252,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent, h, ref ,computed } from "vue";
import { defineComponent, h, ref ,computed,inject } from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
import { getCookie } from "@/tool/cookie";
import { getUploadUrl } from "@/tool/util";
@@ -286,6 +286,7 @@ export default defineComponent({
})
let {t} = useI18n()
let driver__:any = inject('driver__')
let isTest = ref()
return {
fileList,
@@ -300,6 +301,7 @@ export default defineComponent({
inputTime,
sketchboardList,
t,
driver__,
isTest,
};
},
@@ -344,7 +346,7 @@ export default defineComponent({
},
sketchboardList:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2){
if(newVal.length>=2 && this.driver__.driver){
driverObj__.moveTo(14)
}
}

View File

@@ -120,7 +120,9 @@ export default defineComponent({
return
}
}
driverObj__.moveNext()
if(this.driver__.driver){
driverObj__.moveNext()
}
this.collectionStep = this.collectionStep + 1
},
@@ -176,7 +178,9 @@ export default defineComponent({
this.showCollectionModal =false
this.collectionStep = 1
this.$emit('finishCollection')
driverObj__.moveNext()
if(this.driver__.driver){
driverObj__.moveNext()
}
}
}
})