2023-11-22-dist
This commit is contained in:
@@ -155,6 +155,9 @@ li {
|
||||
.el-cascader__collapse-tag .el-cascader__collapse-tag .el-tag--light {
|
||||
display: flex !important;
|
||||
}
|
||||
.hideEvents {
|
||||
pointer-events: none !important;
|
||||
}
|
||||
.el-popper .el-cascader-panel {
|
||||
--el-cascader-menu-selected-text-color: #000;
|
||||
}
|
||||
|
||||
@@ -169,6 +169,9 @@ ul,li{
|
||||
}
|
||||
}
|
||||
}
|
||||
.hideEvents{
|
||||
pointer-events:none !important;
|
||||
}
|
||||
.el-popper{
|
||||
.el-cascader-panel{
|
||||
--el-cascader-menu-selected-text-color: #000;
|
||||
|
||||
@@ -365,18 +365,21 @@ export default defineComponent({
|
||||
let y = ( e.y - this.printStyleList[this.imgDomIndex].centers.top)+'px'
|
||||
this.printStyleList[this.imgDomIndex].style.left = x
|
||||
this.printStyleList[this.imgDomIndex].style.top = y
|
||||
// if(x.replace(/px/g,'') >= parentNode.width - imgDomWH.width){
|
||||
// this.printStyleList[this.imgDomIndex].style.left = parentNode.width - imgDomWH.width+'px'
|
||||
// }
|
||||
// if(x.replace(/px/g,'') <= 0){
|
||||
// this.printStyleList[this.imgDomIndex].style.left = 0+'px'
|
||||
// }
|
||||
// if(y.replace(/px/g,'') >= parentNode.height - imgDomWH.height){
|
||||
// this.printStyleList[this.imgDomIndex].style.top = parentNode.height - imgDomWH.height+'px'
|
||||
// }
|
||||
// if(y.replace(/px/g,'') <= 0){
|
||||
// this.printStyleList[this.imgDomIndex].style.top = 0+'px'
|
||||
// }
|
||||
if(!this.overallSingle){
|
||||
if(x.replace(/px/g,'') >= parentNode.width - imgDomWH.width){
|
||||
this.printStyleList[this.imgDomIndex].style.left = parentNode.width - imgDomWH.width+'px'
|
||||
}
|
||||
if(x.replace(/px/g,'') <= 0){
|
||||
this.printStyleList[this.imgDomIndex].style.left = 0+'px'
|
||||
}
|
||||
if(y.replace(/px/g,'') >= parentNode.height - imgDomWH.height){
|
||||
this.printStyleList[this.imgDomIndex].style.top = parentNode.height - imgDomWH.height+'px'
|
||||
}
|
||||
if(y.replace(/px/g,'') <= 0){
|
||||
this.printStyleList[this.imgDomIndex].style.top = 0+'px'
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
sizeMousemove(e) {
|
||||
|
||||
@@ -39,7 +39,8 @@
|
||||
<a-dropdown @click.stop="setOpenType('sex')">
|
||||
<a-button>
|
||||
<UserOutlined />
|
||||
{{ workspaceItem.sex.label }}
|
||||
{{ workspaceItem.sex }}
|
||||
<!-- {{ workspaceItem.sex.label }} -->
|
||||
<DownOutlined />
|
||||
</a-button>
|
||||
</a-dropdown>
|
||||
@@ -564,11 +565,11 @@ export default defineComponent({
|
||||
// this.workspaceItem.mannequinId = item.id
|
||||
// this.workspaceItem.mannequinType = str
|
||||
// this.workspaceItem.mannequinUrl = item.presignedUrl
|
||||
if(this.workspaceItem.sex.value == 'FEMALE'){
|
||||
if(this.workspaceItem.sex == 'Female'){
|
||||
this.workspaceItem.femalePresignedUrl = item.presignedUrl
|
||||
this.workspaceItem.mannequinFemaleType = str
|
||||
this.workspaceItem.mannequinFemaleId = item.id
|
||||
}else if(this.workspaceItem.sex.value == 'MALE'){
|
||||
}else if(this.workspaceItem.sex == 'Male'){
|
||||
this.workspaceItem.malePresignedUrl = item.presignedUrl
|
||||
this.workspaceItem.mannequinMaleType = str
|
||||
this.workspaceItem.mannequinMaleId = item.id
|
||||
@@ -577,12 +578,13 @@ export default defineComponent({
|
||||
this.workspaceItem.mannequinType = str
|
||||
this.workspaceItem.mannequinId = item.id
|
||||
},
|
||||
// FEMALE MALE
|
||||
setMannequinsSex(){
|
||||
if(this.workspaceItem.sex.value == 'FEMALE'){
|
||||
if(this.workspaceItem.sex == 'Female'){
|
||||
this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl
|
||||
this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType
|
||||
this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId
|
||||
}else if(this.workspaceItem.sex.value == 'MALE'){
|
||||
}else if(this.workspaceItem.sex == 'Male'){
|
||||
this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl
|
||||
this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType
|
||||
this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId
|
||||
|
||||
@@ -167,6 +167,7 @@ import domTurnImg from '@/tool/domTurnImg'
|
||||
import GO from "@/tool/GO";
|
||||
import moodb from "@/tool/moodb";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
|
||||
export default defineComponent({
|
||||
components: { Material, MoodTemplate, Generate,layout },
|
||||
setup() {
|
||||
@@ -185,9 +186,13 @@ export default defineComponent({
|
||||
let modalImg:any= computed(()=>{
|
||||
return store.state.UploadFilesModule.disposeMoodboard
|
||||
})
|
||||
let driverIndex:any = computed(()=>{
|
||||
return store.state.Guide.guide
|
||||
})
|
||||
let uploading:any = ref([])
|
||||
let edieShow:any = ref()
|
||||
let {t} = useI18n()
|
||||
|
||||
return {
|
||||
fileList,
|
||||
showFileList,
|
||||
@@ -201,6 +206,7 @@ export default defineComponent({
|
||||
layoutOpen,
|
||||
loadingShow,
|
||||
modalImg,
|
||||
driverIndex,
|
||||
uploading,
|
||||
edieShow,
|
||||
t,
|
||||
@@ -227,7 +233,6 @@ export default defineComponent({
|
||||
moodboarList:computed(()=>{
|
||||
return useStore().state.UploadFilesModule.moodboard
|
||||
}),
|
||||
|
||||
};
|
||||
},
|
||||
// watcheffect(){
|
||||
@@ -255,6 +260,14 @@ export default defineComponent({
|
||||
// this.uploading[this.uploading-1] = true
|
||||
// }
|
||||
}
|
||||
},
|
||||
driverIndex:{
|
||||
handler(newVal,oldVal){
|
||||
if(newVal.index >= 1 && newVal.index <= 2){
|
||||
this.open(newVal.index)
|
||||
}else{
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
directives:{
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { defineComponent ,createVNode } from 'vue'
|
||||
import { defineComponent ,createVNode, ref, computed } from 'vue'
|
||||
|
||||
import Generate from '@/component/HomePage/Generate.vue'
|
||||
import MoodboardUpload from '@/component/HomePage/MoodboardUpload.vue'
|
||||
@@ -76,12 +76,14 @@ export default defineComponent({
|
||||
SketchboardUpload,
|
||||
MarketingSketchUpload
|
||||
},
|
||||
state(){
|
||||
setup(){
|
||||
const store = useStore()
|
||||
let {t} = useI18n()
|
||||
return {
|
||||
t,
|
||||
}
|
||||
},
|
||||
|
||||
data(){
|
||||
return{
|
||||
showCollectionModal:false,
|
||||
|
||||
23
src/store/guide/guide.ts
Normal file
23
src/store/guide/guide.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import {Module} from 'vuex'
|
||||
import {RootState} from '../index'
|
||||
|
||||
interface DesignDetail{
|
||||
guide:any,
|
||||
|
||||
}
|
||||
|
||||
const Guide : Module<DesignDetail,RootState> = {
|
||||
state:{
|
||||
guide:0
|
||||
},
|
||||
mutations:{
|
||||
setGuide(state,data){
|
||||
state.guide = data
|
||||
},
|
||||
},
|
||||
actions:{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
export default Guide
|
||||
@@ -4,6 +4,7 @@ import DesignDetailModule from './Detail/designDetail'
|
||||
import HomeStoreModule from './homeStore/homeStore'
|
||||
import UserHabit from './userHabit/userHabit'
|
||||
import Workspace from './workspace/workspace'
|
||||
import Guide from './guide/guide'
|
||||
export interface RootState{
|
||||
|
||||
}
|
||||
@@ -22,6 +23,7 @@ export default createStore<RootState>({
|
||||
DesignDetailModule,
|
||||
HomeStoreModule,
|
||||
UserHabit,
|
||||
Workspace
|
||||
Workspace,
|
||||
Guide,
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import { driver } from "driver.js";
|
||||
import "driver.js/dist/driver.css";
|
||||
import { useStore } from "vuex";
|
||||
//版本一
|
||||
let driverIndex__ = 0
|
||||
let store
|
||||
const driverObj__ = driver({
|
||||
steps: [
|
||||
{ element: '#Guide_1_1', popover: { title: 'Title', description: 'Description' } },
|
||||
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
|
||||
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
|
||||
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
|
||||
{ element: '.Guide_1_4', popover: { title: 'Title', description: 'Description' } },
|
||||
],
|
||||
// showProgress: true,//控制总页数和当前页数是否显示
|
||||
@@ -16,26 +18,75 @@ const driverObj__ = driver({
|
||||
stageRadius:5,//切口圆弧度
|
||||
allowKeyboardControl:true,//控制是否可以键盘控制下一步
|
||||
disableActiveInteraction:false,//是否禁用显示元素的交互
|
||||
// overlay: true,
|
||||
overlayOpacity:.4,
|
||||
overlay: true,
|
||||
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
|
||||
console.log(popover,options);
|
||||
if(options.state.activeIndex >= 1 && options.state.activeIndex <= 3){
|
||||
// console.log(popover,options);
|
||||
popover.previousButton.style.display = 'none'
|
||||
if(options.state.activeIndex >= 1 && options.state.activeIndex <= 2){
|
||||
popover.footer.style.display = 'block'
|
||||
addDiv(options.state.activeElement)
|
||||
}else{
|
||||
popover.footer.style.display = 'none'
|
||||
removeDiv(options.state.activeElement)
|
||||
}
|
||||
|
||||
// console.log(options.state.activeIndex);
|
||||
driverIndex__ = driverObj__.getState().activeIndex
|
||||
let data = {
|
||||
index:driverIndex__
|
||||
}
|
||||
store?.commit("setGuide", data);
|
||||
},
|
||||
// onNextClick:(element, step, options) =>{
|
||||
// console.log(element,step,options);
|
||||
// driverObj__.moveNext()
|
||||
// // element.style.posiiton = 'relative'
|
||||
// // const mask = document.createElement('div');
|
||||
// // mask.style.position = 'absolute';
|
||||
// // mask.style.top = '0';
|
||||
// // mask.style.left = '0';
|
||||
// // mask.style.width = '100%';
|
||||
// // mask.style.height = '100%';
|
||||
// // mask.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
|
||||
// // mask.style.zIndex = '9999';
|
||||
// // element.appendChild(mask);
|
||||
// }
|
||||
});
|
||||
|
||||
|
||||
function addDiv(element){
|
||||
element.style.posiiton = 'relative'
|
||||
const mask = element.getElementsByClassName('driver-mask')?.[0]
|
||||
if(mask){
|
||||
}else{
|
||||
const mask = document.createElement('div');
|
||||
mask.style.position = 'absolute';
|
||||
mask.style.top = '0';
|
||||
mask.style.left = '0';
|
||||
mask.style.width = '100%';
|
||||
mask.style.height = '100%';
|
||||
mask.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
|
||||
mask.style.zIndex = '9999';
|
||||
mask.classList.add('driver-mask')
|
||||
element.appendChild(mask);
|
||||
}
|
||||
}
|
||||
function removeDiv(element){
|
||||
const mask = element.getElementsByClassName('driver-mask')?.[0]
|
||||
console.log(element);
|
||||
if(mask){
|
||||
// element.removeChild(mask);
|
||||
mask.remove()
|
||||
}
|
||||
}
|
||||
const openGuide = () =>{
|
||||
// driverObj__.drive();
|
||||
driverObj__.moveNext();
|
||||
driverObj__.movePrevious();
|
||||
store = useStore()
|
||||
|
||||
// driverObj__.moveNext();
|
||||
// driverObj__.movePrevious();
|
||||
}
|
||||
|
||||
export{
|
||||
openGuide,
|
||||
driverObj__,
|
||||
driverIndex__,
|
||||
}
|
||||
@@ -847,7 +847,8 @@ export default defineComponent({
|
||||
confirmDeletePic(data:any,index:any){
|
||||
let libraryIds = data ? [data.id] : this.selectImgList
|
||||
let newData = {
|
||||
libraryIds:libraryIds
|
||||
libraryIds:libraryIds,
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.batchDeleteLibrary, newData).then(
|
||||
(rv: any) => {
|
||||
|
||||
Reference in New Issue
Block a user