From b5124abbfa4a84c73f6fff081202b9eb18d73923 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 Jan 2025 17:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon/details_color.png | Bin 0 -> 639 bytes src/assets/images/icon/details_elements.png | Bin 0 -> 1248 bytes src/assets/images/icon/details_print.png | Bin 0 -> 748 bytes src/assets/images/icon/details_sketch.png | Bin 0 -> 498 bytes src/assets/style/style.css | 23 +- src/assets/style/style.less | 29 ++- .../Account/frontPage/cancelRenewal.vue | 3 +- .../Account/frontPage/mylnformation.vue | 15 +- src/component/DetailCopy/designDetail.vue | 206 +++++++++++++++++ .../DetailCopy/editSketchPosition.vue | 0 src/component/DetailCopy/libraryList.vue | 218 ++++++++++++++++++ src/component/DetailCopy/sketchLeft.vue | 164 +++++++++++++ src/component/DetailCopy/uploadList.vue | 209 +++++++++++++++++ src/component/HomePage/ExportModel.vue | 5 +- src/store/homeStore/homeStore.ts | 2 +- src/tool/canvasGeneralCopy.js | 8 +- src/views/HomeMain.vue | 2 +- src/views/HomeView/HomeView.vue | 52 +++-- src/views/LoginPage.vue | 6 +- 19 files changed, 896 insertions(+), 46 deletions(-) create mode 100644 src/assets/images/icon/details_color.png create mode 100644 src/assets/images/icon/details_elements.png create mode 100644 src/assets/images/icon/details_print.png create mode 100644 src/assets/images/icon/details_sketch.png create mode 100644 src/component/DetailCopy/designDetail.vue create mode 100644 src/component/DetailCopy/editSketchPosition.vue create mode 100644 src/component/DetailCopy/libraryList.vue create mode 100644 src/component/DetailCopy/sketchLeft.vue create mode 100644 src/component/DetailCopy/uploadList.vue diff --git a/src/assets/images/icon/details_color.png b/src/assets/images/icon/details_color.png new file mode 100644 index 0000000000000000000000000000000000000000..6233167d9945ef4e779ea4a933b2907766dbc275 GIT binary patch literal 639 zcmV-_0)YLAP)x00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP86LeUDF(jtSE#e_IR^`_L+*X=8-d7`%ww>_ zp9iJiA@@2wFb`YLNA5O0(=P|YJZR-`Q|@ClGv*DmPeI?089FJZSd+GXKHfkoT#}CYUg-y?=>E{4KnBWpe9{o!u$yR$KumBnxXBSFS!mn zgL9g7rg&|c_y7Ody`%rkoSHT9+mCH`kzt^CPQ->db3KE)ebAxbb6m_;RzFFPhVj`u zr=`Z76WtE;k%5|B(Ek-{(o=F`@eqUmDAMDMbSy};%3ASxb0nm}kTCE4_1vB`6UmTx z5wqihU0eX+!h9UUAJJ}9bH?N5d_f`#2yWyx@eT0^7nnTvnnh?zhXmTSuIciwt9P|` z?Xvys-nw;Y9j-`BPBVh<3AATov`jrR-eARunSCzYr!X8}qzX-F-H>Yd|8jieHu$KE Z;U7zdH0x0GBP9R;002ovPDHLkV1hr@B)|Xw literal 0 HcmV?d00001 diff --git a/src/assets/images/icon/details_elements.png b/src/assets/images/icon/details_elements.png new file mode 100644 index 0000000000000000000000000000000000000000..c08eabb488c78138b6e7a76e1dfbd81dd48f971d GIT binary patch literal 1248 zcmV<61Rwi}P)0X{%3A(u8-*;91aV2cX$2E%ge3I0165ULanW>zw;82 zV{dP7wxOXRLQTUL#$z7ltKIPR_4WJ6$Vk}XaG2tCI-QZ@<6|*~cV}nEhYmADJmKNt zp`WQ_aCmt5OPuk%w#UauPe(_`?8?eYl-zE&v+nM0si>&vfoXs;WS^OtaopbCM%$E8 zwzjtREhi^uTOM&&)tE=%edSaJM-qO;-=;^&Sn@!RSGBYzXR8djU-_z5hjKj+&f2J49adUIS ztib*Ky*-V8iv>XlApj$j^YZef!oosjN$Bkc$s&#Y0Z0XD6;eT3g+C)m6bo`A6bcED zGb0l*E)WPfR*dV2atc6PQ;9%F@egO_TA zl4xUVYik_3&A#xon1}iCH-Nq;lTB4#d_j?$B0@c>7N86)i_y{1pxFe(^V;G`Pfkwy z&(F_YFE1~;THMywww<4!@8ioeH6WuOA0O_;#YGP@fV#T6kP+S#z5*NjAAzk2wWd}- zm3tCO!1(WDg2Z-2&hES4?{_mDWMySZm6ereRaI3#6RjNtmY$ye_rk)0ht|6wZ(C}h zeV5hL)P&mG+y7N{q1V^fV^o=&dJAbkjfkQ+rW2rmP2a4^!+7Ei#)t~N?qkWgMc7)k zAW1fZX6-EF)aKKFv8dwo_4SGK^Yc++xJB&rNWB)IIB=H_55L@lnp=bmB_A{^dmSj) z;NYM{ya6pg-*r(eI1QI^YA!TYnOlWakX9iTq*YLJi-r!KpsO_ADYxU@qE#-G zj;Ey}&ep z(~E5RnPJPm!Eh|a#|HUm5O7*ap+z3_Ug7Sm$7AQ~ z0_9LC{gm|_!;_CvB+1Dq(JlPOD~1vzjg#-#PVqO4fMa(yIawf`+g2!ty7PNVB&~e- zQS=ZGPTpe#44Li)JQ+Q$yaqp@%!b)RiX4S;iZ_9+ z?rfKMK9CT(lJeicZet%l2T6i|N1FrfqK84r=R+R|{y}AqXgi4+#w5ubOTXtC9IapQ zZ~HKE)0m?%N%EVARGI%Ucmp3X>MZoKmqxh)mNH?(XVO^pe^hr`<7?w~cQG@>5P7d@X z#Nc$y)%P?0>yLL7vn6TJ!l#Lxo3K3~0p`Ldl9957dM0yPh~0M1CCrDyQIL%K e++;0+o7jKDrD-}4ArsXA0000%nibb}NW8YF;HpC-NIyZi5w=#x(b zGy>ynWZqhE)A_r2b3q7vv6c!JSO0zaL~it?iGF z++OBG=3Cc3pzlFj;5|^Uj{T%-C*$^Di_5cR=!d~+LR4?@KeRDR(1u53_c9e>Tff*v zqvOS))Y4@_U9xE72r{h0WYKF08hoMyt}SR_x_x^c?Wl1Zf(C}6=&SnC+zD<$(7pmq2pr%`V%N4#}qibbQ5R?&ls>U1Db;tj_}oMTqlOWV8w98anMWp*5cqKW{&6< zmrDZ2GLrVXIJ(L(N7Vkjv}89y#sov6Yf1(M3#U+^e`FH+d(xv50m5lNiW(nkiKwtn zPgdxA&wIZv0tZk%c)+>{1g>0xe?XR`B1=+{C8@}gRAfmivLqGv3H#PEFQ8-cJEjy# oj^&v3aIMZZ^ml?Pu{XsXKX-!L)mB(0AOHXW07*qoM6N<$f(aJT=l}o! literal 0 HcmV?d00001 diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 4036e047..a2af9c91 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -714,7 +714,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .generalModel_state .generalModel_state_item > input { height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; background-color: #fff; @@ -738,7 +738,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .generalModel_state .generalModel_state_item .range_picker { height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; background-color: #fff; @@ -872,6 +872,15 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte box-shadow: none; height: calc(65rem*1.2); } +.generalModel.fullScreen { + max-width: 100%; +} +.generalModel.fullScreen .ant-modal-content { + border-radius: 0rem; +} +.generalModel.fullScreen .ant-modal-body { + padding: 2.5rem 3rem; +} .generalModel .ant-modal-content { border-radius: 3rem; height: 100%; @@ -1098,10 +1107,6 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .sketchboard_upload_modal .switch_type_list.showEvents * { pointer-events: auto; } -.ant-modal-wrap { - height: 100vh; - overflow: auto; -} .ant-btn:hover, .ant-btn:focus, .ant-btn:active, @@ -1610,10 +1615,14 @@ textarea:focus { .upload_item .upload_file_item .ant-upload-picture-card-wrapper .ant-upload-select-picture-card { width: calc(6rem*1.2); height: calc(6rem*1.2); - border: calc(0.3rem*1.2) solid #ededed; + border: calc(0.3rem*1.2) solid #000; border-radius: calc(1rem*1.2); margin: 0; } +.upload_item .upload_file_item .ant-upload-picture-card-wrapper .ant-upload-select-picture-card .fi-br-upload { + font-size: 2rem; + color: #000; +} .upload_item .upload_file_item.upload_file_item:last-child { margin: 0; } diff --git a/src/assets/style/style.less b/src/assets/style/style.less index cd3e3932..c7589b62 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -781,7 +781,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte >input{ height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; background-color: #fff; @@ -805,7 +805,7 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-picker-range,.ant-select-selector,.range_picker{ height: 2.5rem !important; border-radius: 4rem; - padding: 2rem !important; + padding: calc(2rem - 1px * 2) !important; box-sizing: content-box; background-color: #f3f3f3; background-color: #fff; @@ -946,6 +946,15 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte position: relative; box-shadow: none; height: calc(65rem*1.2); + &.fullScreen{ + max-width: 100%; + .ant-modal-content{ + border-radius: 0rem; + } + .ant-modal-body{ + padding: 2.5rem 3rem; + } + } .ant-modal-content{ border-radius: 3rem; height: 100%; @@ -1192,12 +1201,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte } } -.ant-modal-wrap{ - height: 100vh; - // overflow: hidden; - overflow: auto; - // position: fixed; -} +// .ant-modal-wrap{ +// height: 100vh; +// overflow: auto; +// } // .driver-overlay-animated{ // z-index: 10002 !important; // } @@ -1742,9 +1749,13 @@ textarea:focus{ .ant-upload-select-picture-card { width: calc(6rem*1.2); height: calc(6rem*1.2); - border: calc(0.3rem*1.2) solid #ededed; + border: calc(0.3rem*1.2) solid #000; border-radius: calc(1rem*1.2); margin: 0; + .fi-br-upload{ + font-size: 2rem; + color: #000; + } } diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue index f48cd1a0..11288b34 100644 --- a/src/component/Account/frontPage/cancelRenewal.vue +++ b/src/component/Account/frontPage/cancelRenewal.vue @@ -98,7 +98,8 @@ export default defineComponent({ \ No newline at end of file diff --git a/src/component/DetailCopy/editSketchPosition.vue b/src/component/DetailCopy/editSketchPosition.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/component/DetailCopy/libraryList.vue b/src/component/DetailCopy/libraryList.vue new file mode 100644 index 00000000..9b33a1fc --- /dev/null +++ b/src/component/DetailCopy/libraryList.vue @@ -0,0 +1,218 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/sketchLeft.vue b/src/component/DetailCopy/sketchLeft.vue new file mode 100644 index 00000000..8f544a71 --- /dev/null +++ b/src/component/DetailCopy/sketchLeft.vue @@ -0,0 +1,164 @@ + + + \ No newline at end of file diff --git a/src/component/DetailCopy/uploadList.vue b/src/component/DetailCopy/uploadList.vue new file mode 100644 index 00000000..5cf36973 --- /dev/null +++ b/src/component/DetailCopy/uploadList.vue @@ -0,0 +1,209 @@ + + + + \ No newline at end of file diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 9b9e21c1..ce8738b3 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1267,13 +1267,13 @@ export default defineComponent({ let oldOperation = '' let canvasKeyDown = (event) => { let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote'] - if(keys.indexOf(event.key) > -1){ + if(keys.indexOf(event.code) > -1){ event.preventDefault(); } if(keyDown.indexOf(event.code)>-1){ }else{ keyDown.push(event.code) - if(event.key === 'Enter' && operation.value == 'fold'){ + if(event.code === 'Enter' && operation.value == 'fold'){ foldEnd('Enter') }else if(event.key === 'Delete'){ deleteObject() @@ -1288,7 +1288,6 @@ export default defineComponent({ }else if(keyDown.indexOf('BracketLeft') > -1){ let width = canvasPencilWidth.value[operation.value] canvasPencilWidth.value[operation.value] = (width - 5) < 3?3:(width - 5) - console.log(canvasPencilWidth.value[operation.value]); setPencilWidth() }else if(keyDown.indexOf('BracketRight') > -1){ let width = canvasPencilWidth.value[operation.value] diff --git a/src/store/homeStore/homeStore.ts b/src/store/homeStore/homeStore.ts index bd85806e..154ca1d9 100644 --- a/src/store/homeStore/homeStore.ts +++ b/src/store/homeStore/homeStore.ts @@ -37,7 +37,7 @@ const HomeStoreModule : Module = { }, setDeleteDesignCollectionList(state,data){ let obj = state.designCollectionList.splice(data,1) - state.deleteDesignCollectionList.unshift(...obj) + // state.deleteDesignCollectionList.unshift(...obj) }, cancelDeleteDesignCollectionList(state,data){ let obj = state.deleteDesignCollectionList.splice(data,1) diff --git a/src/tool/canvasGeneralCopy.js b/src/tool/canvasGeneralCopy.js index b5a48c74..73a586a0 100644 --- a/src/tool/canvasGeneralCopy.js +++ b/src/tool/canvasGeneralCopy.js @@ -683,6 +683,11 @@ class MyCanvas { } await obj.clone((cloned)=>{ let {width,height,left,top} = position + cloned.set({ + custom:{ + dashed:true + } + }) // cloned.set({left:cloned.strokeWidth/2,top:cloned.strokeWidth/2}) let group = new fabric.Group([cloned],{ left:left + cloned.strokeWidth/2, @@ -1471,7 +1476,8 @@ class MyCanvas { if(!options?.target?.custom?.dashed && this.layer.selectLayer.group.custom.groupType == 'Grid'){ await new Promise((resolve, reject) => { - let clipPathElement = this.clipPath.clipGroup._objects.filter(obj => obj.custom)[0] + console.log(this.clipPath.clipGroup); + let clipPathElement = this.clipPath.clipGroup._objects.filter(obj => obj.custom?.dashed)[0] let clipPathLect = this.clipPath.clipGroup.left let clipPathTop = this.clipPath.clipGroup.top diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 4b072e2c..168a0a33 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -128,7 +128,7 @@ --> - + diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index b8799aa4..b2399397 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -188,9 +188,9 @@ ) "> - + + @@ -232,9 +232,9 @@ --> - - + +