aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复ipad图层编辑

Browse Source
This commit is contained in:
X1627315083
2023-12-01 15:02:37 +08:00
parent dcfd96516b
commit 0c9e153157
24 changed files with 130 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/130.c21278fc.css vendored
View File

File diff suppressed because one or more lines are too long

1
dist/css/138.44be22b0.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/css/237.2e789cd6.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/785.d8297711.css → dist/css/627.8f066d73.css vendored
View File

File diff suppressed because one or more lines are too long

1
dist/css/638.0862f83b.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
dist/index.html vendored
View File

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.04d53701.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.515c9595.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>AiDA</title><link rel="stylesheet" href="./css/googleapis.css"><link rel="stylesheet" href="./css/roboto.css"><script defer="defer" src="/js/chunk-vendors.9c1ca004.js"></script><script defer="defer" src="/js/app.07fe668f.js"></script><link href="/css/chunk-vendors.5e9dbdc9.css" rel="stylesheet"><link href="/css/app.515c9595.css" rel="stylesheet"></head><body><script src="./js/color-thief.js"></script><noscript><strong>We're sorry but aida doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

1
dist/js/130.3c9b525c.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/138.5cec1f8e.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
dist/js/537.449e5d2c.js → dist/js/537.f53d098a.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/js/785.6561882c.js → dist/js/627.734643ca.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/js/237.89d84820.js → dist/js/638.5dd307b3.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/949.19361b7a.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/949.d129d852.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.04d53701.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.07fe668f.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
src/component/Detail/DesignDetail.vue
View File

@@ -314,7 +314,7 @@ export default defineComponent({
this.frontBack = {}
}else{
this.designShowPrview = 1;
this.designItemDetailUrl = {}
// this.designItemDetailUrl = {}
}
},

1
src/component/Detail/habit.vue
View File

@@ -831,6 +831,7 @@ export default defineComponent({
transform: translateY(100%);
}
.habit_btn{
min-height: 26rem;
display: flex;
justify-content: space-between;
.model_current{

42
src/component/HomePage/ColorboardUpload.vue
View File

@@ -4,8 +4,8 @@
<div class="modal_text">
<div>{{ $t('ColorboardUpload.Thumbnail') }}</div>
</div>
<div class="modal_img Guide_1_11_1" :class="[driver__.driver?'showEvents':'']">
<div class="modal_img_item" v-for="color,index in colorList" :key="color" >
<div class="modal_img">
<div class="modal_img_item" v-for="color,index in colorList" :class="[ index == 1?'Guide_1_11_1':'',driver__.driver?'showEvents':'']" :key="color" >
<div @click="selectColorItem(index,color)" :class="['upload_color',selectIndex === index ? 'select_upload_color' : '',]" :style="{background:`rgba(${color?.r},${color?.g},${color?.b},${color?.a})`}">
</div>
</div>
@@ -85,7 +85,7 @@
</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">
<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_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> -->
@@ -120,7 +120,7 @@
import { Chrome,Slider,Sketch,Material,Compact,Swatches,} from '@ans1998/vue3-color'
import { Https } from "@/tool/https";
import GO from "@/tool/GO";
import { defineComponent, h,ref,inject } from 'vue'
import { defineComponent, h,ref,inject, nextTick } from 'vue'
import { LoadingOutlined } from '@ant-design/icons-vue';
import {getCookie} from '@/tool/cookie'
import {getUploadUrl,rgbToHsv} from '@/tool/util'
@@ -155,12 +155,22 @@ export default defineComponent({
}
},
watch:{
selectColor(newVal,oldVal){
this.colorList[this.selectIndex] = newVal.rgba
let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
this.setColorboardList(colorList)
// this.clearSelectColor()
}
// selectColor(newVal,oldVal){
// console.log(this.selectIndex);
// this.colorList[this.selectIndex] = newVal.rgba
// let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
// this.setColorboardList(colorList)
// // this.clearSelectColor()
// },
selectColor:{
handler(newVal,oldVal){
this.colorList[this.selectIndex] = newVal.rgba
let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
this.setColorboardList(colorList)
// this.clearSelectColor()
},
immediate: true
},
},
computed:{
getSelectRGB(selectColor){
@@ -400,10 +410,14 @@ export default defineComponent({
return hex;
},
setUplpadColor(color){
this.selectColor = color
if(this.driver__.driver){
driverObj__.moveNext()
}
this.selectColor = ''
nextTick().then(()=>{
this.selectColor = color
if(this.driver__.driver){
driverObj__.moveNext()
}
})
},
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';

17
src/component/HomePage/Generate.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="generate Guide_1_6">
<div class="generate">
<div v-if="type_.type2 == 'Sketchboard'|| type_.type2 == 'Printboard'" class="generate_checkbox">
<div>
<label>
@@ -53,7 +53,7 @@
<span>{{ $t('Generate.maximumLength') }}</span>
</div>
<div v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" class="generage_img">
<div v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" class="generage_img Guide_1_6">
<div class="upload_item">
<div
class="upload_file_item"
@@ -151,7 +151,7 @@
</div>
</div>
</div>
<div v-else class="generage_img">
<div v-else class="generage_img Guide_1_6">
<div
class="generage_img_item"
v-for="(item, index) in fileList"
@@ -316,7 +316,6 @@ export default defineComponent({
this.isTest =JSON.parse(isTest)|| ''
this.uploadUrl = getUploadUrl();
this.workspace = this.store.state.Workspace.workspace
},
computed: {
getSketchLabel(value: any) {
@@ -339,7 +338,7 @@ export default defineComponent({
this.store.commit("addGenerateMaterialFils", data);
// console.log(this.fileList);
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length >= 2 && this.driver__.driver){
if(moodboard.length >= 3 && this.driver__.driver){
driverObj__.moveNext()
}
},
@@ -454,9 +453,11 @@ export default defineComponent({
this.fileList.push(arr)
this.loadingShow = false
})
if(this.driver__.driver){
driverObj__.moveTo(3)
}
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(3)
}
})
// if(){
// // driverObj__.moveNext()
// }

2
src/component/HomePage/MoodboardUpload.vue
View File

@@ -312,7 +312,7 @@ export default defineComponent({
}
let Generate:any = this.$refs.Generate
if(this.driver__.driver){
Generate.searchPictureName = 'Purple'
Generate.searchPictureName = 'Exit sign, door, sunset, ocean, surreal'
}else{
Generate.searchPictureName = ''
}

36
src/component/HomePage/SketchboardUpload.vue
View File

@@ -46,7 +46,7 @@
v-show="file?.status === 'done'"
>
<img :src="file?.imgUrl" class="upload_img" />
<div class="operate_file_block">
<div class="operate_file_block Guide_1_13" :class="[driver__.driver?'showEvents':'']">
<div class="select_img_type">
<div
class="select_category"
@@ -65,7 +65,7 @@
></div>
</div>
<div
class="category_list"
class="category_list Guide_1_14"
v-show="file.categoryShow"
>
<div
@@ -252,7 +252,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent, h, ref ,computed,inject } from "vue";
import { defineComponent, h, ref ,computed,inject, nextTick } from "vue";
import { LoadingOutlined } from "@ant-design/icons-vue";
import { getCookie } from "@/tool/cookie";
import { getUploadUrl } from "@/tool/util";
@@ -347,7 +347,19 @@ export default defineComponent({
sketchboardList:{
handler(newVal:any,oldVal:any){
if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){
driverObj__.moveTo(14)
if(this.driver__.driver){
// driverObj__.moveTo(17)
}
}
}
},
driver__:{
handler(newVal,oldVal){
if(newVal.index >= 14 && newVal.index <= 15){
if(this.driver__.driver){
// driverObj__.moveTo(15)
}
}else{
}
}
}
@@ -374,7 +386,7 @@ export default defineComponent({
},
getPosition(){
let params
if(this.workspace.sexEnum.name == 'Female'){
if(this.workspace?.sexEnum?.name == 'Female'){
params = 'FemalePosition'
}else{
params = 'MalePosition'
@@ -409,6 +421,12 @@ export default defineComponent({
(v: any) => v.status === "done"
);
this.store.commit("setSketchboardFile", fileList);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveTo(14)
}
})
} else if (file.status === "error") {
let index = -1;
this.fileList.forEach((ele: any, index1: any) => {
@@ -442,6 +460,14 @@ export default defineComponent({
showFileCategory(file: any) {
file.categoryShow = true;
console.log(12312312);
nextTick().then(()=>{
if(this.driver__.driver){
driverObj__.moveNext()
}
})
document.addEventListener("click", this.hiddenFileCategory);
},

3
src/component/HomePage/layoutMobile.vue
View File

@@ -224,7 +224,6 @@ export default defineComponent({
compile:{
mounted (el,compile) {
el.addEventListener('touchstart',(e:any)=>{
console.log(e);
e.stopPropagation()
let elParent = el.parentNode.parentNode
el.parentElement.parentNode.parentNode.children.forEach((v:any) => {
@@ -257,8 +256,6 @@ export default defineComponent({
}
let mouse = true
let touchmove = function(e:any){
console.log(123);
if(mouse){
if(compile.value == 'left'){
elParent.style.width = parent + gpsXY - e.targetTouches[0].clientX + 'px'

2
src/store/uploadFile/uploadFile.ts
View File

@@ -218,7 +218,7 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
state.marketingSketchFiles = []
state.moodTemplateId = ''
state.disposeMoodboard = []
state.showSketchboard = []
// state.showSketchboard = []
},
clearAllId(state){
state.moodboard.forEach((v:any) => {

83
src/tool/guide.js
View File

@@ -12,42 +12,48 @@ let data = {
}
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_4', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_5', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_6', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_7', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_10', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_11', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_1', popover: { title: '', description: 'Begin your creative journey here.' } },
// { element: '.Guide_1_2', popover: { title: '', description: 'Description' } },
// { element: '.Guide_1_2', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_4', popover: { title: '', description: 'Click here to try the latest image generation technology to create your mood board.' } },
{ element: '.Guide_1_5', popover: { title: '', description: "Enter keywords that capture the mood you wish to express and then click the 'Generate' button." } },
{ element: '.Guide_1_6', popover: { title: '', description: 'Select three images for your moodboard.' } },
{ element: '.Guide_1_7', popover: { title: '', description: 'Click here to layout your moodboard.' } },
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
//以上moodboard
{ element: '.Guide_1_2', popover: { title: '', description: 'Upload two print images here' } },
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
{ element: '.Guide_1_10', popover: { title: '', description: 'Click here to extract primary colors from image.' } },
{ element: '.Guide_1_11', popover: { title: '', description: 'Select the color you want from these color blocks as the first color.' } },
{ element: '.Guide_1_11_1', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_11', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_11_1', popover: { title: '', description: 'Click on this block to select the second color.' } },
{ element: '.Guide_1_11_2', popover: { title: '', description: 'Choose the color you want from these color blocks.' } },
{ element: '.Guide_1_8', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_14', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_15', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_17', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_18', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_19', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_20', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_21', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_22', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_23', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_24', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_25', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_26', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_27', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_28', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_29', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_30', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_8', popover: { title: '', description: 'Click here for next step.' } },
{ element: '.Guide_1_2', popover: { title: '', description: 'Upload two sketches for your collection on this page' } },
{ element: '.Guide_1_14', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_13', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_14', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_15', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_17', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_18', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_19', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_20', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_21', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_22', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_23', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_24', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_25', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_26', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_27', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_28', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_29', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_30', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Description' } },
],
// showProgress: true,//控制总页数和当前页数是否显示
allowClose:false,
@@ -62,7 +68,7 @@ const driverObj__ = driver({
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
// console.log(popover,options);
console.log(popover,options);
if(element){
element.classList.remove('Guide_')
}
@@ -156,6 +162,7 @@ function removeDiv(element){
const openGuide = () =>{
let isBeginner = JSON.parse(getCookie('isBeginner'))
console.log(isBeginner);
let data
// console.log(isBeginner);
if(isBeginner){
@@ -171,12 +178,12 @@ const openGuide = () =>{
driver:false,
}
}
// driverObj__.destroy();
driverObj__.drive();
driverObj__.destroy();
// driverObj__.drive();
data = {
index:driverIndex__,
driver:true,
driver:false,
}
store = useStore()
// driverObj__.moveTo(18);