@@ -122,6 +135,24 @@ export default defineComponent({
scale:0,
},
loadingShow:false,
+ printElementList:null as any,
+ })
+ const collItemSize = reactive({
+ collValue:18,
+ num:1,
+ prentWidth:0 as any,
+ padding:10,
+ likeStyle:{
+
+ },
+ itemStyle:{
+ width:0,
+ height:0,
+ },
+ collTime:null as any,
+ isMove:false,
+ elList:[] as any,
+ selectIndex:0,
})
const setOveralSingle = ()=>{
@@ -177,6 +208,7 @@ export default defineComponent({
scale,
}
getItemPosition(item)
+ setItemPosition()
store.commit('DesignDetailCopy/setCurrentPrintElement',null)
}
const previewDetailPrintData = ()=>{
@@ -256,16 +288,13 @@ export default defineComponent({
let pattern = {
centers:{left:0,top:0},
style:{
- // left:(boor?left:Math.trunc(Math.random()*x)+1)+"px",
- // top:(boor?top:Math.trunc(Math.random()*y)+1)+"px",
left:left+'px',
top:top+'px',
right:"auto",
bottom:"auto",
width:editPrintElementData.sketchWH.width*item.scale[0]+'px',
height:editPrintElementData.sketchWH.height*item.scale[1]+'px',
- zIndex:item.priority,
- // zIndex:this.printZIndex++
+ // zIndex:item.priority,
},
transform:{
rotateZ:item.angle?item.angle:0
@@ -280,6 +309,7 @@ export default defineComponent({
editPrintElementData.printStyleList[props.type].overall = []
editPrintElementData.printStyleList[props.type].overall.push(item)
}
+
}
const setPosition = ()=>{
nextTick(()=>{
@@ -309,6 +339,7 @@ export default defineComponent({
}
getItemPosition(item)
})
+ setItemPosition()
}
if(props.type == 'print'){
editPrintElementData.overallSingle = state
@@ -345,7 +376,7 @@ export default defineComponent({
let scale = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0])
let rotateZ = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0])
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.designOpenrtionBtn = true
- editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.style.zIndex = editPrintElementData.printZIndex++
+ // editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.style.zIndex = editPrintElementData.printZIndex++
editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.transform = {
scale:scale,
rotateZ:rotateZ?rotateZ:0,
@@ -479,10 +510,8 @@ export default defineComponent({
top:editPrintElementDom.imgDom.offsetTop+'px',
height:editPrintElementDom.imgDom.offsetHeight+'px',
width:editPrintElementDom.imgDom.offsetWidth+'px',
- zIndex:editPrintElementData.printZIndex
+ // zIndex:editPrintElementData.printZIndex
}
- // document.removeEventListener("mouseup", sizeMouseup);
- // document.removeEventListener("mousemove", sizeMousemove);
document.removeEventListener('mousemove',sizeMouseMove)
document.removeEventListener('touchmove',sizeTouchmove)
document.removeEventListener('mouseup',sizeMouseup)
@@ -490,8 +519,6 @@ export default defineComponent({
}
const mouseup = (e:any)=>{
- // document.removeEventListener("mouseup", mouseup);
- // document.removeEventListener("mousemove", moveMousemove);
document.removeEventListener('mousemove',mouseMove)
document.removeEventListener('touchmove',touchmove)
document.removeEventListener('mouseup',mouseup)
@@ -500,6 +527,191 @@ export default defineComponent({
const clearOverall = ()=>{
editPrintElementData.printStyleList[props.type].overall = []
}
+
+
+ const designMousedown = (e:any,uniqueId:number,str:string)=>{
+ let item:any = collItemSize.elList.filter((item:any)=>item.uniqueId == uniqueId)[0]
+ if(!item)return
+ const pEl = editPrintElementData.printElementList;
+ item.el.style.zIndex = 2;
+ item.el.style.transition = 'all 0s';
+ let startX = e.clientX,
+ startY = e.clientY,
+ startSL = + pEl.scrollLeft,
+ left = item.el.offsetLeft,
+ top = item.el.offsetTop;
+ collItemSize.isMove = false;
+ const elWidth = item.el.offsetWidth;
+
+
+ var toMovePx = 1;
+ var toMoveType = "";//left right
+ let moveFun = (e:any) => {
+ collItemSize.isMove = true
+ let X = e.clientX - startX + (pEl.scrollLeft - startSL) + left;
+ let Y = 0;
+ if(X < 0) X = 0;
+ const maxLeft = parseInt(collItemSize.prentWidth) - elWidth - collItemSize.padding ;
+ if(X > maxLeft) X = maxLeft;
+ item.el.style.left = `${X}px`;
+ item.el.style.top = `${Y}px`;
+
+ const pElBCR = pEl.getBoundingClientRect();
+ var num = 2;
+ if(X < pEl.scrollLeft){
+ toMoveType = "left";
+ num = pElBCR.x-e.clientX;
+ }else if(X > pEl.scrollLeft + pEl.clientWidth - elWidth){
+ toMoveType = "right";
+ num = e.clientX - pElBCR.x - pElBCR.width;
+ }else{
+ toMoveType = "";
+ }
+ toMovePx = num / 20;
+ if(toMovePx < 2) toMovePx = 2;
+
+
+ reRange(item, X, Y,str);
+ };
+
+ const updataFun = ()=>{
+ if(toMoveType == "left"){
+ let left = pEl.scrollLeft - toMovePx;
+ if(left < 0)left = 0;
+ item.el.style.left = `${left}px`;
+ pEl.scrollLeft = left;
+ reRange(item, left, 0);
+ }else if(toMoveType == "right"){
+ let left = pEl.scrollLeft + toMovePx;
+ if(left > pEl.scrollWidth - pEl.clientWidth)left = pEl.scrollWidth - pEl.clientWidth;
+ const elLeft = left + pEl.clientWidth - elWidth - collItemSize.padding;
+ item.el.style.left = `${elLeft}px`;
+ pEl.scrollLeft = left;
+ reRange(item, elLeft, 0);
+ }else if(toMoveType == "stop"){
+ return;
+ }
+ requestAnimationFrame(updataFun);
+ }
+ updataFun();
+
+ let mouseUpFun = ()=>{
+ toMoveType = "stop"
+ document.removeEventListener('mousemove',mouseMove)
+ document.removeEventListener('touchmove',touchmove)
+
+ document.removeEventListener('mouseup',mouseUpFun)
+ document.removeEventListener('touchend',mouseUpFun)
+ item.el.style.zIndex = 1;
+ item.el.style.transition = 'top .5s';
+ moveItem();
+ sortDesignCollection()
+ }
+ let mouseMove = function(event:any){
+ let e = getMousePosition(event,false)
+ moveFun(e)
+ }
+ let touchmove = function(event:any){
+ let e = getMousePosition(event,true)
+ moveFun(e)
+ }
+
+ document.addEventListener('mousemove',mouseMove)
+ document.addEventListener('touchmove',touchmove)
+
+ document.addEventListener('mouseup',mouseUpFun)
+ document.addEventListener('touchend',mouseUpFun)
+ }
+ //排序 从大到小
+ const sortDesignCollection = ()=> {
+
+ }
+ const reRange = (item:any, x:number, y:number,str?:string)=>{
+ let elList:any = collItemSize.elList
+ let index = collItemSize.selectIndex
+ let width,height,num
+ num = collItemSize.num
+ width = collItemSize.itemStyle.width
+ height = collItemSize.itemStyle.height
+
+ let moveIndex = Math.round(x / (width + 10)) + Math.round(y / (height + 10)) * num;
+ moveIndex = elList.length - 1 - moveIndex
+ moveIndex = moveIndex < 0 ? 0 : moveIndex;
+ moveIndex = moveIndex > elList.length - 1 ? elList.length - 1 : moveIndex;
+ if(moveIndex != index){
+ collItemSize.selectIndex = moveIndex;
+ let currentSort = item.sort;
+ for(let i = 0;i < elList.length;i++){
+ if(currentSort < moveIndex){
+ if(elList[i].sort > currentSort && elList[i].sort <= moveIndex){
+ elList[i].sort -= 1;
+ };
+ }else if(currentSort > moveIndex){
+ if(elList[i].sort < currentSort && elList[i].sort >= moveIndex){
+ elList[i].sort += 1;
+ };
+ }
+ };
+ elList[item.index].sort = moveIndex;
+ moveItem();
+ }
+ }
+ const moveItem = ()=>{
+ let value = collItemSize.num
+ for(let i = 0;i < collItemSize.elList.length;i++){
+ let height = parseInt(String((collItemSize.elList.length - 1 - collItemSize.elList[i].sort) / value)) * (collItemSize.itemStyle.width +collItemSize.padding) + 'px';
+ collItemSize.elList[i].el.style.left = height
+ }
+ setZIndex()
+ }
+ const navDelete = (item:any)=>{
+ let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle]
+ let index = arr.findIndex((arrItem:any)=>arrItem.uniqueId == item.uniqueId)
+ arr.splice(index,1)
+ setItemPosition()
+ }
+ const setZIndex = ()=>{
+ let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle]
+ collItemSize.elList.forEach((elItem:any)=>{
+ let clothesIndex = arr.findIndex((item:any)=>item.uniqueId == elItem.uniqueId)
+ arr[clothesIndex].pattern.style.zIndex = elItem.sort
+ // let clothesId = editPrintElementData.designDetail.clothes[clothesIndex].id
+ // editPrintElementData.designDetail.clothes[clothesIndex].priority = elItem.sort
+ // let frontIndex = editPrintElementData.frontBack_.front.findIndex((item:any)=>item.id == clothesId)
+ // editPrintElementData.frontBack_.front[frontIndex].style.zIndex = elItem.sort + 10
+ })
+ }
+ const setItemPosition = async ()=>{
+ // editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle].splice(editPrintElementData.imgDomIndex,1)
+ await nextTick()
+ let parent = editPrintElementData.printElementList.offsetWidth
+ let elArr = editPrintElementData.printElementList.querySelectorAll('.imgItem')
+ let value = collItemSize.num
+ const htmlFontSize = parseFloat(getComputedStyle(document.documentElement).fontSize);
+ const remValue = 8 * htmlFontSize;
+ //子元素宽度 = (父容器总宽度 - (列数-1)*间隙) / 列数
+ collItemSize.itemStyle.width = remValue
+ collItemSize.elList = []
+ let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle]
+
+ arr.forEach((item,index) => {item.uniqueId = `${Date.now()}_${index}`});
+
+ const sortedArray = [...arr].sort((a, b) => a.priority - b.priority);
+ const sortMap = {} as any;
+ sortedArray.forEach((item, index) => {
+ sortMap[item.priority] = index ; // 1, 2, 3, 4...
+ });
+ for(let i = 0;i < elArr.length;i++){
+ collItemSize.elList.push({
+ el: elArr[i],
+ // sort: elArr.length - i -1,
+ sort: sortMap[arr[i].priority],
+ index: i,
+ uniqueId:arr[i]?.uniqueId || 99999,
+ });
+ }
+ collItemSize.prentWidth = (collItemSize.padding + remValue) * elArr.length + 'px'
+ }
onMounted(()=>{
if(props.type == 'element'){
editPrintElementData.stateOverallSingle = 'single'
@@ -513,6 +725,7 @@ export default defineComponent({
getMousePosition,
...toRefs(editPrintElementDom),
...toRefs(editPrintElementData),
+ ...toRefs(collItemSize),
setOveralSingle,
formatter,
itemMoveMousedown,
@@ -520,6 +733,8 @@ export default defineComponent({
deletePrint,
previewDetailPrintData,
clearOverall,
+ designMousedown,
+ navDelete,
}
},
directives:{
@@ -656,6 +871,35 @@ export default defineComponent({
}
}
}
+ > .printElementList{
+ width: 100%;
+ height: 10rem;
+ position: relative;
+ overflow-x: auto;
+ .itemList{
+ height: 100%;
+ }
+ .imgItem{
+ width: 8rem;
+ height: 8rem;
+ position: absolute;
+ cursor: pointer;
+ border-radius: 1rem;
+ overflow: hidden;
+ > img{
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ }
+ > i{
+ position: absolute;
+ right: 1rem;
+ top: 1rem;
+ color: #fff;
+ text-shadow: 0px 0px 2px black, 0px 0px 2px black, 0px 0px 2px black;
+ }
+ }
+ }
> .editPrintElementBox{
flex: 1;
overflow: hidden;
diff --git a/src/component/DetailCopy/detailRight/elementType.vue b/src/component/DetailCopy/detailRight/elementType.vue
deleted file mode 100644
index 17d8506c..00000000
--- a/src/component/DetailCopy/detailRight/elementType.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/DetailCopy/detailRight/index.vue b/src/component/DetailCopy/detailRight/index.vue
index 3e78e609..6c81c19b 100644
--- a/src/component/DetailCopy/detailRight/index.vue
+++ b/src/component/DetailCopy/detailRight/index.vue
@@ -6,7 +6,6 @@
@@ -20,15 +19,15 @@ import { useStore } from "vuex";
import sketchType from './sketchType.vue'
import printType from './printType.vue'
import editPrintElement from './editPrintElement.vue'
-import elementType from './elementType.vue'
import modelsType from './modelsType.vue'
export default defineComponent({
components:{
- sketchType,printType,elementType,editPrintElement,modelsType
+ sketchType,printType,editPrintElement,modelsType
},
setup(props,{emit}) {
const store = useStore();
const detailData = reactive({
+ designDetail:computed(()=>store.state.DesignDetailCopy.designDetail),
editPrintElement:null as any,
selectDetail:computed(()=>store.state.DesignDetailCopy.selectDetail),
currentDetailType:computed(()=>store.state.DesignDetailCopy.currentDetailType),
@@ -55,6 +54,7 @@ export default defineComponent({
display: flex;
flex: 1;
overflow: hidden;
+ flex-direction: column;
> .detailText{
margin-bottom: 1rem;
}
diff --git a/src/component/DetailCopy/detailRight/modelsType.vue b/src/component/DetailCopy/detailRight/modelsType.vue
index 8aebb707..795356cd 100644
--- a/src/component/DetailCopy/detailRight/modelsType.vue
+++ b/src/component/DetailCopy/detailRight/modelsType.vue
@@ -1,6 +1,6 @@
-
{{$t('DesignPrintOperation.NewPrint')}}
+
{{$t('DesignPrintOperation.NewModel')}}
diff --git a/src/component/DetailCopy/model/modelNav.vue b/src/component/DetailCopy/model/modelNav.vue
index cbbb6487..3b6b1c83 100644
--- a/src/component/DetailCopy/model/modelNav.vue
+++ b/src/component/DetailCopy/model/modelNav.vue
@@ -1,13 +1,20 @@
-
-
+
\ No newline at end of file
diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue
index 74296b1d..01868fde 100644
--- a/src/component/DetailCopy/model/modelPosition.vue
+++ b/src/component/DetailCopy/model/modelPosition.vue
@@ -18,7 +18,7 @@
-
![]()
+
![]()
@@ -144,9 +144,10 @@ export default defineComponent({
top:selectItem.imgDom.offsetTop+'px',
height:selectItem.imgDom.offsetHeight+'px',
width:selectItem.imgDom.offsetWidth+'px',
- zIndex:selectItem.printZIndex
+ zIndex:selectItem.imgDom.style.zIndex,
+ // zIndex:selectItem.printZIndex
}
- detailData.frontBack.back[selectItem.imgDomIndex].style.zIndex = selectItem.printZIndex
+ // detailData.frontBack.back[selectItem.imgDomIndex].style.zIndex = selectItem.printZIndex
document.removeEventListener('mousemove',sizeMouseMove)
document.removeEventListener('touchmove',sizeTouchmove)
document.removeEventListener('mouseup',sizeMouseup)
@@ -271,8 +272,8 @@ export default defineComponent({
let event = e||window.event
selectItem.imgDom = document.getElementsByClassName('molepositon')[0].getElementsByClassName("detail_modal_item_front")[selectItem.imgDomIndex]
detailData.frontBack.front[index].designOpenrtionBtn = true
- detailData.frontBack.front[index].style.zIndex = selectItem.printZIndex++
- detailData.frontBack.back[index].style.zIndex = selectItem.printZIndex
+ // detailData.frontBack.front[index].style.zIndex = selectItem.printZIndex++
+ // detailData.frontBack.back[index].style.zIndex = selectItem.printZIndex
let imgDomWH = selectItem.imgDom.getBoundingClientRect()
let left = Number(detailData.frontBack.front[index].style.left.replace(/px/g,''))
let top = Number(detailData.frontBack.front[index].style.top.replace(/px/g,''))
@@ -346,8 +347,8 @@ export default defineComponent({
v.designOpenrtionBtn = false
})
detailData.frontBack.front[index].designOpenrtionBtn = true
- detailData.frontBack.front[index].style.zIndex = selectItem.printZIndex++
- detailData.frontBack.back[index].style.zIndex = selectItem.printZIndex
+ // detailData.frontBack.front[index].style.zIndex = selectItem.printZIndex++
+ // detailData.frontBack.back[index].style.zIndex = selectItem.printZIndex
clothesOpenActive(index)
}
const updataPosition = ()=>{
@@ -473,11 +474,6 @@ export default defineComponent({
position: absolute;
top: 0;
}
- .designOpenrtion_print{
- img{
- object-fit: cover;
- }
- }
.detail_modal_item_front,.designOpenrtion_print{
z-index: 2;
height: 100%;
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index 4860cb96..69818b3a 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -915,6 +915,7 @@ export default defineComponent({
position: relative;
padding-right: calc(3rem*1.2);
margin-right: 2.4rem;
+ width: 24rem;
.upload_centetn{
// overflow-x: hidden;
height: calc(100% - 4.4rem*1.2);
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 9a2048a5..87b7c08f 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -334,6 +334,7 @@ export default defineComponent({
})
const setSpeed = (item:any)=>{
speed.speedState = false
+ document.removeEventListener('click',openSpeed)
speed.speedData = item
}
return {
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 14779e9d..060174bc 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -211,6 +211,9 @@ export default defineComponent({
let printCatecoryList:any = computed(()=>{
return store.state.UserHabit.printType
})
+ let printboardList = computed(()=>{
+ return store.state.UploadFilesModule.printboard
+ })
return {
fileList,
printImgList,
@@ -225,6 +228,7 @@ export default defineComponent({
scene,
openMenu,
printCatecoryList,
+ printboardList,
}
},
computed:{
@@ -253,9 +257,7 @@ export default defineComponent({
cropperFileData:{name:'',uid:''}, //裁剪的原始文件数据
currentFileNum:0, //当前上传的文件数
isUpload:false,
- printboardList:computed(()=>{
- return useStore().state.UploadFilesModule.printboard
- }),
+
isTextarea:false,
isInputFocus:false,
}
diff --git a/src/component/HomePage/renew.vue b/src/component/HomePage/renew.vue
index ba6edb72..1ae00333 100644
--- a/src/component/HomePage/renew.vue
+++ b/src/component/HomePage/renew.vue
@@ -5,7 +5,7 @@
:get-container="() => $refs.renew"
v-model:visible="renewModel"
:footer="null"
- width="130rem"
+ width="110rem"
height="auto"
:maskClosable="false"
:centered="true"
@@ -49,90 +49,64 @@
-
Unlock the Pro Advantage
+
+
{{ $t("Renew.Strengths") }}
-
-
Benefits
-
-
Free
-
PRO
+
+
+
+
+
+
+
{{ $t("Renew.StrengthsTitle1") }}
{{ $t("Renew.StrengthsTitle1_1") }}
+
+ {{ $t("Renew.StrengthsInfo1") }}
{{ $t("Renew.StrengthsInfo1_1") }}
+
+
-
+
-
GPT-4o - DeepSeek-R1 - Gemini Pro and more
+
{{ $t("Renew.StrengthsTitle2") }}
{{ $t("Renew.StrengthsTitle2_1") }}
- More accurate answers with multiple latest AI models
+ {{ $t("Renew.StrengthsInfo2") }}
{{ $t("Renew.StrengthsInfo2_1") }}
-
-
+
-
GPT-4o - DeepSeek-R1 - Gemini Pro and more
+
+
{{ $t("Renew.StrengthsTitle3") }}
{{ $t("Renew.StrengthsTitle3_1") }}
- More accurate answers with multiple latest AI models
+ {{ $t("Renew.StrengthsInfo3") }}
{{ $t("Renew.StrengthsInfo3_1") }}
{{ $t("Renew.StrengthsInfo3_2") }}
-
-
+
-
GPT-4o - DeepSeek-R1 - Gemini Pro and more
+
{{ $t("Renew.StrengthsTitle4") }}
{{ $t("Renew.StrengthsTitle4_1") }}
- More accurate answers with multiple latest AI models
+ {{ $t("Renew.StrengthsInfo4") }}
{{ $t("Renew.StrengthsInfo4_1") }}
-
-
-
-
-
-
-
-
-
GPT-4o - DeepSeek-R1 - Gemini Pro and more
-
- More accurate answers with multiple latest AI models
-
-
-
-
@@ -140,7 +114,7 @@
{{ $t("Renew.title") }}
-
Get started today for unlimited access!
+
- Continue
+ {{ $t("Renew.Continue") }}
-
-
-
@@ -39,14 +36,14 @@
{{ $t('HomeView.Design') }}
-
+
{{ $t('Header.Tools') }}
-
{{ item.label }}
+
{{ item.label }}
@@ -76,33 +73,80 @@
-
-
{{ $t('Header.Type') }} :
-
-
+
+
+
+ Classify
+
+
-
+
+
+
+ {{ $t('Header.Unfold') }}
+
+
+
+
+
+
+
+ {{ $t('Header.Size') }}
+
+
@@ -168,8 +212,15 @@
+
+
+
+
+
+
@@ -294,6 +343,7 @@ import { getMousePosition } from "@/tool/mdEvent";
import { removeClass } from "element-plus/es/utils";
import collectionModal from './collection.vue'
import designTools from './tools.vue'
+import selectMenu from '@/component/modules/selectMenu.vue'
export default defineComponent({
name: "homePage",
@@ -306,6 +356,7 @@ export default defineComponent({
DesignDetailcopy,
editDesignType,
designTools,
+ selectMenu,
},
emits:['setTask'],
activated() {
@@ -436,6 +487,7 @@ export default defineComponent({
}
const setSpeed = (item:any)=>{
speed.speedState = false
+ document.removeEventListener('click',openSpeed)
speed.speedData = item
}
const openEditTools = ()=>{
@@ -2002,35 +2054,7 @@ export default defineComponent({
position: relative;
- .designPage_left_bottom{
- position: absolute;
- width: 3rem;
- height: 7rem;
- background: #fff;
- border: 2px solid;
- border-right: none;
- border-radius: 2rem 0 0 2rem;
- top: 50%;
- transform: translate(-100%,-50%);
- left: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 2;
- cursor: pointer;
- transition: width .3s;
- &:hover{
- width: 4rem;
- }
- >span{
- transition: all .3s;
- transform: rotate(90deg);
- &.active{
- transform: rotate(270deg);
- }
- }
-
- }
+
.page_content_body {
position: absolute;
width: 100%;
@@ -2162,23 +2186,53 @@ export default defineComponent({
justify-content: space-between;
position: relative;
.designPage_left_bottom{
- border-radius: 0 2rem 2rem 0rem;
- left: 2rem;
- top: 50%;
- left: auto;
- right: 0;
- transform: translate(100%, -50%);
- // top: calc(50% - 10.4rem / 2);
+ position: absolute;
+ width: 3rem;
+ height: 7rem;
+ background: #fff;
border: 2px solid;
- border-left: none;
- flex-direction: column;
- &.active{
- left: 44rem;
- transform: translate(0, -50%);
+ border-right: none;
+ border-radius: 2rem 0 0 2rem;
+ top: 50%;
+ transform: translate(-100%,-50%);
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 2;
+ cursor: pointer;
+ transition: width .3s;
+ &:hover{
+ width: 4rem;
+ }
+ >span{
+ transition: all .3s;
+ transform: rotate(90deg);
+ &.active{
+ transform: rotate(270deg);
+ }
+ }
+ &.right{
+ border-radius: 0 2rem 2rem 0rem;
+ left: 2rem;
+ top: 50%;
+ left: auto;
+ right: 0;
+ transform: translate(100%, -50%);
+ // top: calc(50% - 10.4rem / 2);
+ border: 2px solid;
+ border-left: none;
+ flex-direction: column;
+
+ &.active{
+ // left: 44rem;
+ }
}
}
+
.right_top {
padding: 1rem 3.2rem 2rem 1.2rem;
+ padding-right: 0;
display: flex;
justify-content: space-between;
box-shadow: 0rem 0.2rem 8rem 0rem rgba(238, 238, 244, 0.25);
@@ -2214,11 +2268,11 @@ export default defineComponent({
.right_content_block_box{
flex: 1;
display: flex;
- overflow: hidden;
}
.right_content_block {
flex: 1;
display: flex;
+ position: relative;
width: 0;
flex-direction: column;
&.recycleBin{
diff --git a/src/component/home/index.vue b/src/component/home/index.vue
index 64d6382f..efc397a0 100644
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -164,6 +164,7 @@ export default defineComponent({
label:rv.workspaceVO?.positionEnum?.value,
value:rv.workspaceVO?.positionEnum?.name
},
+ workspaceId:rv.workspaceVO?.id,
positionList:[],
publishData:{
id:rv.portfolioDTO?.id?rv.portfolioDTO?.id:'',
diff --git a/src/component/home/newProject/setting.vue b/src/component/home/newProject/setting.vue
index 2aaa10ac..dd62262e 100644
--- a/src/component/home/newProject/setting.vue
+++ b/src/component/home/newProject/setting.vue
@@ -107,6 +107,7 @@ export default defineComponent({
value:rv.workspaceVO.positionEnum.name
},
positionList:[],
+ workspaceId:rv.workspaceVO?.id,
publishData:{
id:rv.portfolioDTO.id?rv.portfolioDTO.id:'',
portfolioDes:rv.portfolioDTO.portfolioDes?rv.portfolioDTO.portfolioDes:'',
diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue
index 44511084..386f7edd 100644
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -196,6 +196,7 @@ export default defineComponent({
styleId:data.show.style?data.selectObject.styleId:null,
id:data.selectObject.id,
workspace:{
+ id:data.selectObject.workspaceId,
sex:data.selectObject.sex,
// sex:data.show.gender?data.selectObject.sex:null,
systemDesignerPercentage:data.show.systemDesigner?data.selectObject.systemDesignerPercentage:null,
@@ -230,6 +231,7 @@ export default defineComponent({
label:rv.workspaceVO?.positionEnum?.value,
value:rv.workspaceVO?.positionEnum?.name
},
+ workspaceId:rv.workspaceVO?.id,
positionList:[],
publishData:{
id:rv.portfolioDTO?.id?rv.portfolioDTO?.id:'',
diff --git a/src/component/home/tools/patternMaking3D/index.vue b/src/component/home/tools/patternMaking3D/index.vue
index 3969b6b2..d4ee5a44 100644
--- a/src/component/home/tools/patternMaking3D/index.vue
+++ b/src/component/home/tools/patternMaking3D/index.vue
@@ -83,6 +83,7 @@
+
+ 
+ 
+ 
+