fix
This commit is contained in:
@@ -120,7 +120,7 @@
|
|||||||
import { Chrome,Slider,Sketch,Material,Compact,Swatches,Photoshop } from '@ans1998/vue3-color'
|
import { Chrome,Slider,Sketch,Material,Compact,Swatches,Photoshop } from '@ans1998/vue3-color'
|
||||||
import { Https } from "@/tool/https";
|
import { Https } from "@/tool/https";
|
||||||
import GO from "@/tool/GO";
|
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 { LoadingOutlined } from '@ant-design/icons-vue';
|
||||||
import {getCookie} from '@/tool/cookie'
|
import {getCookie} from '@/tool/cookie'
|
||||||
import {getUploadUrl,rgbToHsv} from '@/tool/util'
|
import {getUploadUrl,rgbToHsv} from '@/tool/util'
|
||||||
@@ -143,13 +143,14 @@ export default defineComponent({
|
|||||||
}) //顔色选择器默认颜色
|
}) //顔色选择器默认颜色
|
||||||
let selectColorList = ref({
|
let selectColorList = ref({
|
||||||
})
|
})
|
||||||
|
let driver__ = inject('driver__')
|
||||||
let {t} = useI18n()
|
let {t} = useI18n()
|
||||||
return {
|
return {
|
||||||
fileList,
|
fileList,
|
||||||
colorList,
|
colorList,
|
||||||
selectColor,
|
selectColor,
|
||||||
selectColorList,
|
selectColorList,
|
||||||
|
driver__,
|
||||||
t,
|
t,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -370,7 +371,9 @@ export default defineComponent({
|
|||||||
this.selectColorList = selectColorList
|
this.selectColorList = selectColorList
|
||||||
this.getHsvColor(selectColorList)
|
this.getHsvColor(selectColorList)
|
||||||
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
|
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
|
||||||
|
if(this.driver__.driver){
|
||||||
driverObj__.moveNext()
|
driverObj__.moveNext()
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
},100)
|
},100)
|
||||||
@@ -392,7 +395,9 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
setUplpadColor(color){
|
setUplpadColor(color){
|
||||||
this.selectColor = color
|
this.selectColor = color
|
||||||
|
if(this.driver__.driver){
|
||||||
driverObj__.moveTo(12)
|
driverObj__.moveTo(12)
|
||||||
|
}
|
||||||
},
|
},
|
||||||
beforeUpload(file){
|
beforeUpload(file){
|
||||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
||||||
|
|||||||
@@ -482,7 +482,9 @@ export default defineComponent({
|
|||||||
).catch(rv=>{
|
).catch(rv=>{
|
||||||
this.loadingShow = false
|
this.loadingShow = false
|
||||||
})
|
})
|
||||||
|
if(this.driver__.driver){
|
||||||
driverObj__.moveNext()
|
driverObj__.moveNext()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<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 { LoadingOutlined } from '@ant-design/icons-vue';
|
||||||
import {getCookie} from '@/tool/cookie'
|
import {getCookie} from '@/tool/cookie'
|
||||||
import {getUploadUrl} from '@/tool/util'
|
import {getUploadUrl} from '@/tool/util'
|
||||||
@@ -167,6 +167,7 @@ export default defineComponent({
|
|||||||
let loadingShow = ref(false)
|
let loadingShow = ref(false)
|
||||||
let inputShow = ref(false)
|
let inputShow = ref(false)
|
||||||
let inputTime = ref()
|
let inputTime = ref()
|
||||||
|
let driver__:any = inject('driver__')
|
||||||
let {t} = useI18n()
|
let {t} = useI18n()
|
||||||
let isTest = ref()
|
let isTest = ref()
|
||||||
return {
|
return {
|
||||||
@@ -180,6 +181,7 @@ export default defineComponent({
|
|||||||
loadingShow,
|
loadingShow,
|
||||||
inputShow,
|
inputShow,
|
||||||
inputTime,
|
inputTime,
|
||||||
|
driver__,
|
||||||
t,
|
t,
|
||||||
isTest,
|
isTest,
|
||||||
}
|
}
|
||||||
@@ -199,7 +201,7 @@ export default defineComponent({
|
|||||||
watch:{
|
watch:{
|
||||||
printBoards:{
|
printBoards:{
|
||||||
handler(newVal:any,oldVal:any){
|
handler(newVal:any,oldVal:any){
|
||||||
if(newVal.length>=2){
|
if(newVal.length>=2 && this.driver__.driver){
|
||||||
driverObj__.moveTo(9)
|
driverObj__.moveTo(9)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -252,7 +252,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<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 { LoadingOutlined } from "@ant-design/icons-vue";
|
||||||
import { getCookie } from "@/tool/cookie";
|
import { getCookie } from "@/tool/cookie";
|
||||||
import { getUploadUrl } from "@/tool/util";
|
import { getUploadUrl } from "@/tool/util";
|
||||||
@@ -286,6 +286,7 @@ export default defineComponent({
|
|||||||
|
|
||||||
})
|
})
|
||||||
let {t} = useI18n()
|
let {t} = useI18n()
|
||||||
|
let driver__:any = inject('driver__')
|
||||||
let isTest = ref()
|
let isTest = ref()
|
||||||
return {
|
return {
|
||||||
fileList,
|
fileList,
|
||||||
@@ -300,6 +301,7 @@ export default defineComponent({
|
|||||||
inputTime,
|
inputTime,
|
||||||
sketchboardList,
|
sketchboardList,
|
||||||
t,
|
t,
|
||||||
|
driver__,
|
||||||
isTest,
|
isTest,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -344,7 +346,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
sketchboardList:{
|
sketchboardList:{
|
||||||
handler(newVal:any,oldVal:any){
|
handler(newVal:any,oldVal:any){
|
||||||
if(newVal.length>=2){
|
if(newVal.length>=2 && this.driver__.driver){
|
||||||
driverObj__.moveTo(14)
|
driverObj__.moveTo(14)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,7 +120,9 @@ export default defineComponent({
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(this.driver__.driver){
|
||||||
driverObj__.moveNext()
|
driverObj__.moveNext()
|
||||||
|
}
|
||||||
this.collectionStep = this.collectionStep + 1
|
this.collectionStep = this.collectionStep + 1
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -176,9 +178,11 @@ export default defineComponent({
|
|||||||
this.showCollectionModal =false
|
this.showCollectionModal =false
|
||||||
this.collectionStep = 1
|
this.collectionStep = 1
|
||||||
this.$emit('finishCollection')
|
this.$emit('finishCollection')
|
||||||
|
if(this.driver__.driver){
|
||||||
driverObj__.moveNext()
|
driverObj__.moveNext()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
|||||||
@@ -437,9 +437,6 @@ export default defineComponent({
|
|||||||
let collectionModal: any = this.$refs.collectionModal;
|
let collectionModal: any = this.$refs.collectionModal;
|
||||||
this.store.commit("clearAllData");
|
this.store.commit("clearAllData");
|
||||||
collectionModal.changeCollectionModal(true);
|
collectionModal.changeCollectionModal(true);
|
||||||
nextTick().then(()=>{
|
|
||||||
driverObj__.moveNext();
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
|
|
||||||
//recollection
|
//recollection
|
||||||
|
|||||||
Reference in New Issue
Block a user