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

Merge remote-tracking branch 'origin/StableVersion' into develop

Browse Source
This commit is contained in:
X1627315083
2024-09-25 11:07:49 +08:00
parent f840b03c0d
commit 309cdf16a9
33 changed files with 3462 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@@ -6,7 +6,7 @@ NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' # VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
# 佩佩 # 佩佩
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波 # 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

BIN
dist.7z Normal file
View File

Binary file not shown.

1
public/index.html
View File

@@ -3,6 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> -->
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>AiDA</title> <title>AiDA</title>

147
src/assets/style/style.css
View File

@@ -10,6 +10,10 @@ body,
--aida-fsize1-8: calc(1.8rem*1.2); --aida-fsize1-8: calc(1.8rem*1.2);
--aida-fsize1-6: calc(1.6rem*1.2); --aida-fsize1-6: calc(1.6rem*1.2);
--aida-fsize1-4: calc(1.4rem*1.2); --aida-fsize1-4: calc(1.4rem*1.2);
--antd-wave-shadow-color: #39215b;
}
::selection {
background-color: #1890ff;
} }
input { input {
outline: none; outline: none;
@@ -337,6 +341,9 @@ li {
cursor: pointer; cursor: pointer;
pointer-events: auto !important; pointer-events: auto !important;
} }
.ant-popover-placement-top {
z-index: 9999;
}
.ant-drawer { .ant-drawer {
z-index: 9999; z-index: 9999;
} }
@@ -1524,7 +1531,8 @@ textarea:focus {
.design_detail_modal_component .input_border, .design_detail_modal_component .input_border,
.library_page .input_border, .library_page .input_border,
.productImg_modal .input_border, .productImg_modal .input_border,
.accountEdit_page .input_border { .accountEdit_page .input_border,
.generalMenu_printModel_upload .input_border {
z-index: 2; z-index: 2;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1539,7 +1547,8 @@ textarea:focus {
.design_detail_modal_component .input_border .input_box, .design_detail_modal_component .input_border .input_box,
.library_page .input_border .input_box, .library_page .input_border .input_box,
.productImg_modal .input_border .input_box, .productImg_modal .input_border .input_box,
.accountEdit_page .input_border .input_box { .accountEdit_page .input_border .input_box,
.generalMenu_printModel_upload .input_border .input_box {
position: relative; position: relative;
z-index: 2; z-index: 2;
flex: 1; flex: 1;
@@ -1551,7 +1560,8 @@ textarea:focus {
.design_detail_modal_component .input_border .input_box .inputShowText, .design_detail_modal_component .input_border .input_box .inputShowText,
.library_page .input_border .input_box .inputShowText, .library_page .input_border .input_box .inputShowText,
.productImg_modal .input_border .input_box .inputShowText, .productImg_modal .input_border .input_box .inputShowText,
.accountEdit_page .input_border .input_box .inputShowText { .accountEdit_page .input_border .input_box .inputShowText,
.generalMenu_printModel_upload .input_border .input_box .inputShowText {
width: 100%; width: 100%;
display: none; display: none;
} }
@@ -1560,11 +1570,13 @@ textarea:focus {
.library_page .input_border .input_box.active .input_box_btnBox, .library_page .input_border .input_box.active .input_box_btnBox,
.productImg_modal .input_border .input_box.active .input_box_btnBox, .productImg_modal .input_border .input_box.active .input_box_btnBox,
.accountEdit_page .input_border .input_box.active .input_box_btnBox, .accountEdit_page .input_border .input_box.active .input_box_btnBox,
.generalMenu_printModel_upload .input_border .input_box.active .input_box_btnBox,
.collection_modal_body .input_border .input_box.active textarea, .collection_modal_body .input_border .input_box.active textarea,
.design_detail_modal_component .input_border .input_box.active textarea, .design_detail_modal_component .input_border .input_box.active textarea,
.library_page .input_border .input_box.active textarea, .library_page .input_border .input_box.active textarea,
.productImg_modal .input_border .input_box.active textarea, .productImg_modal .input_border .input_box.active textarea,
.accountEdit_page .input_border .input_box.active textarea { .accountEdit_page .input_border .input_box.active textarea,
.generalMenu_printModel_upload .input_border .input_box.active textarea {
border: 1px solid #ff0001; border: 1px solid #ff0001;
box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2);
} }
@@ -1572,7 +1584,8 @@ textarea:focus {
.design_detail_modal_component .input_border .input_box.active span, .design_detail_modal_component .input_border .input_box.active span,
.library_page .input_border .input_box.active span, .library_page .input_border .input_box.active span,
.productImg_modal .input_border .input_box.active span, .productImg_modal .input_border .input_box.active span,
.accountEdit_page .input_border .input_box.active span { .accountEdit_page .input_border .input_box.active span,
.generalMenu_printModel_upload .input_border .input_box.active span {
opacity: 1; opacity: 1;
display: block; display: block;
color: rgba(255, 0, 0.7); color: rgba(255, 0, 0.7);
@@ -1581,7 +1594,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_keyword, .design_detail_modal_component .input_border .search_keyword,
.library_page .input_border .search_keyword, .library_page .input_border .search_keyword,
.productImg_modal .input_border .search_keyword, .productImg_modal .input_border .search_keyword,
.accountEdit_page .input_border .search_keyword { .accountEdit_page .input_border .search_keyword,
.generalMenu_printModel_upload .input_border .search_keyword {
height: 0; height: 0;
flex-basis: 100%; flex-basis: 100%;
} }
@@ -1589,7 +1603,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_keyword .search_keyword_center, .design_detail_modal_component .input_border .search_keyword .search_keyword_center,
.library_page .input_border .search_keyword .search_keyword_center, .library_page .input_border .search_keyword .search_keyword_center,
.productImg_modal .input_border .search_keyword .search_keyword_center, .productImg_modal .input_border .search_keyword .search_keyword_center,
.accountEdit_page .input_border .search_keyword .search_keyword_center { .accountEdit_page .input_border .search_keyword .search_keyword_center,
.generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center {
justify-content: space-between; justify-content: space-between;
display: flex; display: flex;
width: var(--width); width: var(--width);
@@ -1607,7 +1622,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_left,
.library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left,
.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_left, .productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_left,
.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left { .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_left,
.generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_left {
display: flex; display: flex;
overflow: hidden; overflow: hidden;
flex: 1; flex: 1;
@@ -1617,7 +1633,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item,
.library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item,
.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item, .productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item,
.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item { .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item,
.generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_item {
border-radius: 0.4rem; border-radius: 0.4rem;
border: solid 1px #39215b; border: solid 1px #39215b;
background-color: #8156bd; background-color: #8156bd;
@@ -1633,31 +1650,36 @@ textarea:focus {
.design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .design_detail_modal_component .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child,
.library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .library_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child,
.productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child, .productImg_modal .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child,
.accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child { .accountEdit_page .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child,
.generalMenu_printModel_upload .input_border .search_keyword .search_keyword_center .search_keyword_center_item:last-child {
margin-right: 0; margin-right: 0;
} }
.collection_modal_body .input_border .input_box_btnBox, .collection_modal_body .input_border .input_box_btnBox,
.design_detail_modal_component .input_border .input_box_btnBox, .design_detail_modal_component .input_border .input_box_btnBox,
.library_page .input_border .input_box_btnBox, .library_page .input_border .input_box_btnBox,
.productImg_modal .input_border .input_box_btnBox, .productImg_modal .input_border .input_box_btnBox,
.accountEdit_page .input_border .input_box_btnBox { .accountEdit_page .input_border .input_box_btnBox,
.generalMenu_printModel_upload .input_border .input_box_btnBox {
border: calc(0.1rem*1.2) solid #F1F1F1; border: calc(0.1rem*1.2) solid #F1F1F1;
width: var(--width); width: var(--width);
display: flex; display: flex;
float: left; float: left;
align-items: center;
} }
.collection_modal_body .input_border .input_box_btnBox .ant-spin-text, .collection_modal_body .input_border .input_box_btnBox .ant-spin-text,
.design_detail_modal_component .input_border .input_box_btnBox .ant-spin-text, .design_detail_modal_component .input_border .input_box_btnBox .ant-spin-text,
.library_page .input_border .input_box_btnBox .ant-spin-text, .library_page .input_border .input_box_btnBox .ant-spin-text,
.productImg_modal .input_border .input_box_btnBox .ant-spin-text, .productImg_modal .input_border .input_box_btnBox .ant-spin-text,
.accountEdit_page .input_border .input_box_btnBox .ant-spin-text { .accountEdit_page .input_border .input_box_btnBox .ant-spin-text,
.generalMenu_printModel_upload .input_border .input_box_btnBox .ant-spin-text {
font-size: 1.2rem; font-size: 1.2rem;
} }
.collection_modal_body .input_border .input_box_btnBox .search_seed, .collection_modal_body .input_border .input_box_btnBox .search_seed,
.design_detail_modal_component .input_border .input_box_btnBox .search_seed, .design_detail_modal_component .input_border .input_box_btnBox .search_seed,
.library_page .input_border .input_box_btnBox .search_seed, .library_page .input_border .input_box_btnBox .search_seed,
.productImg_modal .input_border .input_box_btnBox .search_seed, .productImg_modal .input_border .input_box_btnBox .search_seed,
.accountEdit_page .input_border .input_box_btnBox .search_seed { .accountEdit_page .input_border .input_box_btnBox .search_seed,
.generalMenu_printModel_upload .input_border .input_box_btnBox .search_seed {
padding: 0; padding: 0;
width: 4rem; width: 4rem;
text-align: center; text-align: center;
@@ -1668,7 +1690,8 @@ textarea:focus {
.design_detail_modal_component .input_border .upload_item .upload_file_item, .design_detail_modal_component .input_border .upload_item .upload_file_item,
.library_page .input_border .upload_item .upload_file_item, .library_page .input_border .upload_item .upload_file_item,
.productImg_modal .input_border .upload_item .upload_file_item, .productImg_modal .input_border .upload_item .upload_file_item,
.accountEdit_page .input_border .upload_item .upload_file_item { .accountEdit_page .input_border .upload_item .upload_file_item,
.generalMenu_printModel_upload .input_border .upload_item .upload_file_item {
width: 8rem; width: 8rem;
height: 8rem; height: 8rem;
} }
@@ -1676,7 +1699,8 @@ textarea:focus {
.design_detail_modal_component .input_border input, .design_detail_modal_component .input_border input,
.library_page .input_border input, .library_page .input_border input,
.productImg_modal .input_border input, .productImg_modal .input_border input,
.accountEdit_page .input_border input { .accountEdit_page .input_border input,
.generalMenu_printModel_upload .input_border input {
width: 100%; width: 100%;
border-radius: calc(0.5rem*1.2); border-radius: calc(0.5rem*1.2);
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
@@ -1689,42 +1713,48 @@ textarea:focus {
.design_detail_modal_component .input_border inputinput:-moz-placeholder, .design_detail_modal_component .input_border inputinput:-moz-placeholder,
.library_page .input_border inputinput:-moz-placeholder, .library_page .input_border inputinput:-moz-placeholder,
.productImg_modal .input_border inputinput:-moz-placeholder, .productImg_modal .input_border inputinput:-moz-placeholder,
.accountEdit_page .input_border inputinput:-moz-placeholder { .accountEdit_page .input_border inputinput:-moz-placeholder,
.generalMenu_printModel_upload .input_border inputinput:-moz-placeholder {
color: rgba(0, 0, 0, 0.15); color: rgba(0, 0, 0, 0.15);
} }
.collection_modal_body .input_border inputinput:-ms-input-placeholder, .collection_modal_body .input_border inputinput:-ms-input-placeholder,
.design_detail_modal_component .input_border inputinput:-ms-input-placeholder, .design_detail_modal_component .input_border inputinput:-ms-input-placeholder,
.library_page .input_border inputinput:-ms-input-placeholder, .library_page .input_border inputinput:-ms-input-placeholder,
.productImg_modal .input_border inputinput:-ms-input-placeholder, .productImg_modal .input_border inputinput:-ms-input-placeholder,
.accountEdit_page .input_border inputinput:-ms-input-placeholder { .accountEdit_page .input_border inputinput:-ms-input-placeholder,
.generalMenu_printModel_upload .input_border inputinput:-ms-input-placeholder {
color: rgba(0, 0, 0, 0.15); color: rgba(0, 0, 0, 0.15);
} }
.collection_modal_body .input_border inputinput::-webkit-input-placeholder, .collection_modal_body .input_border inputinput::-webkit-input-placeholder,
.design_detail_modal_component .input_border inputinput::-webkit-input-placeholder, .design_detail_modal_component .input_border inputinput::-webkit-input-placeholder,
.library_page .input_border inputinput::-webkit-input-placeholder, .library_page .input_border inputinput::-webkit-input-placeholder,
.productImg_modal .input_border inputinput::-webkit-input-placeholder, .productImg_modal .input_border inputinput::-webkit-input-placeholder,
.accountEdit_page .input_border inputinput::-webkit-input-placeholder { .accountEdit_page .input_border inputinput::-webkit-input-placeholder,
.generalMenu_printModel_upload .input_border inputinput::-webkit-input-placeholder {
color: rgba(0, 0, 0, 0.15); color: rgba(0, 0, 0, 0.15);
} }
.collection_modal_body .input_border input.forbidden, .collection_modal_body .input_border input.forbidden,
.design_detail_modal_component .input_border input.forbidden, .design_detail_modal_component .input_border input.forbidden,
.library_page .input_border input.forbidden, .library_page .input_border input.forbidden,
.productImg_modal .input_border input.forbidden, .productImg_modal .input_border input.forbidden,
.accountEdit_page .input_border input.forbidden { .accountEdit_page .input_border input.forbidden,
.generalMenu_printModel_upload .input_border input.forbidden {
cursor: no-drop; cursor: no-drop;
} }
.collection_modal_body .input_border .input_box_btnBox_upImg, .collection_modal_body .input_border .input_box_btnBox_upImg,
.design_detail_modal_component .input_border .input_box_btnBox_upImg, .design_detail_modal_component .input_border .input_box_btnBox_upImg,
.library_page .input_border .input_box_btnBox_upImg, .library_page .input_border .input_box_btnBox_upImg,
.productImg_modal .input_border .input_box_btnBox_upImg, .productImg_modal .input_border .input_box_btnBox_upImg,
.accountEdit_page .input_border .input_box_btnBox_upImg { .accountEdit_page .input_border .input_box_btnBox_upImg,
.generalMenu_printModel_upload .input_border .input_box_btnBox_upImg {
height: 100%; height: 100%;
} }
.collection_modal_body .input_border .fi, .collection_modal_body .input_border .fi,
.design_detail_modal_component .input_border .fi, .design_detail_modal_component .input_border .fi,
.library_page .input_border .fi, .library_page .input_border .fi,
.productImg_modal .input_border .fi, .productImg_modal .input_border .fi,
.accountEdit_page .input_border .fi { .accountEdit_page .input_border .fi,
.generalMenu_printModel_upload .input_border .fi {
margin-right: 1rem; margin-right: 1rem;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
@@ -1740,7 +1770,8 @@ textarea:focus {
.design_detail_modal_component .input_border .fi.fi-br-loading, .design_detail_modal_component .input_border .fi.fi-br-loading,
.library_page .input_border .fi.fi-br-loading, .library_page .input_border .fi.fi-br-loading,
.productImg_modal .input_border .fi.fi-br-loading, .productImg_modal .input_border .fi.fi-br-loading,
.accountEdit_page .input_border .fi.fi-br-loading { .accountEdit_page .input_border .fi.fi-br-loading,
.generalMenu_printModel_upload .input_border .fi.fi-br-loading {
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
} }
@@ -1748,21 +1779,24 @@ textarea:focus {
.design_detail_modal_component .input_border .fi.active, .design_detail_modal_component .input_border .fi.active,
.library_page .input_border .fi.active, .library_page .input_border .fi.active,
.productImg_modal .input_border .fi.active, .productImg_modal .input_border .fi.active,
.accountEdit_page .input_border .fi.active { .accountEdit_page .input_border .fi.active,
.generalMenu_printModel_upload .input_border .fi.active {
transform: rotate(180deg); transform: rotate(180deg);
} }
.collection_modal_body .input_border .fi.forbidden, .collection_modal_body .input_border .fi.forbidden,
.design_detail_modal_component .input_border .fi.forbidden, .design_detail_modal_component .input_border .fi.forbidden,
.library_page .input_border .fi.forbidden, .library_page .input_border .fi.forbidden,
.productImg_modal .input_border .fi.forbidden, .productImg_modal .input_border .fi.forbidden,
.accountEdit_page .input_border .fi.forbidden { .accountEdit_page .input_border .fi.forbidden,
.generalMenu_printModel_upload .input_border .fi.forbidden {
cursor: no-drop; cursor: no-drop;
} }
.collection_modal_body .input_border .search_upImg, .collection_modal_body .input_border .search_upImg,
.design_detail_modal_component .input_border .search_upImg, .design_detail_modal_component .input_border .search_upImg,
.library_page .input_border .search_upImg, .library_page .input_border .search_upImg,
.productImg_modal .input_border .search_upImg, .productImg_modal .input_border .search_upImg,
.accountEdit_page .input_border .search_upImg { .accountEdit_page .input_border .search_upImg,
.generalMenu_printModel_upload .input_border .search_upImg {
width: 4rem; width: 4rem;
height: 100%; height: 100%;
position: absolute; position: absolute;
@@ -1773,7 +1807,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_upImg span, .design_detail_modal_component .input_border .search_upImg span,
.library_page .input_border .search_upImg span, .library_page .input_border .search_upImg span,
.productImg_modal .input_border .search_upImg span, .productImg_modal .input_border .search_upImg span,
.accountEdit_page .input_border .search_upImg span { .accountEdit_page .input_border .search_upImg span,
.generalMenu_printModel_upload .input_border .search_upImg span {
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
@@ -1781,7 +1816,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_upImg .ant-upload-select-picture-card, .design_detail_modal_component .input_border .search_upImg .ant-upload-select-picture-card,
.library_page .input_border .search_upImg .ant-upload-select-picture-card, .library_page .input_border .search_upImg .ant-upload-select-picture-card,
.productImg_modal .input_border .search_upImg .ant-upload-select-picture-card, .productImg_modal .input_border .search_upImg .ant-upload-select-picture-card,
.accountEdit_page .input_border .search_upImg .ant-upload-select-picture-card { .accountEdit_page .input_border .search_upImg .ant-upload-select-picture-card,
.generalMenu_printModel_upload .input_border .search_upImg .ant-upload-select-picture-card {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block !important; display: block !important;
@@ -1790,7 +1826,8 @@ textarea:focus {
.design_detail_modal_component .input_border .search_textarea, .design_detail_modal_component .input_border .search_textarea,
.library_page .input_border .search_textarea, .library_page .input_border .search_textarea,
.productImg_modal .input_border .search_textarea, .productImg_modal .input_border .search_textarea,
.accountEdit_page .input_border .search_textarea { .accountEdit_page .input_border .search_textarea,
.generalMenu_printModel_upload .input_border .search_textarea {
z-index: 3; z-index: 3;
height: auto; height: auto;
position: absolute; position: absolute;
@@ -1806,14 +1843,16 @@ textarea:focus {
.design_detail_modal_component .input_border .generage_btn, .design_detail_modal_component .input_border .generage_btn,
.library_page .input_border .generage_btn, .library_page .input_border .generage_btn,
.productImg_modal .input_border .generage_btn, .productImg_modal .input_border .generage_btn,
.accountEdit_page .input_border .generage_btn { .accountEdit_page .input_border .generage_btn,
.generalMenu_printModel_upload .input_border .generage_btn {
margin-left: 2rem; margin-left: 2rem;
} }
.collection_modal_body .upload_item, .collection_modal_body .upload_item,
.design_detail_modal_component .upload_item, .design_detail_modal_component .upload_item,
.library_page .upload_item, .library_page .upload_item,
.productImg_modal .upload_item, .productImg_modal .upload_item,
.accountEdit_page .upload_item { .accountEdit_page .upload_item,
.generalMenu_printModel_upload .upload_item {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
@@ -1821,7 +1860,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item, .design_detail_modal_component .upload_item .upload_file_item,
.library_page .upload_item .upload_file_item, .library_page .upload_item .upload_file_item,
.productImg_modal .upload_item .upload_file_item, .productImg_modal .upload_item .upload_file_item,
.accountEdit_page .upload_item .upload_file_item { .accountEdit_page .upload_item .upload_file_item,
.generalMenu_printModel_upload .upload_item .upload_file_item {
margin: 0 calc(2rem*1.2) calc(2rem*1.2) 0; margin: 0 calc(2rem*1.2) calc(2rem*1.2) 0;
display: inline-block; display: inline-block;
width: calc(10rem*1.2); width: calc(10rem*1.2);
@@ -1835,7 +1875,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item.active, .design_detail_modal_component .upload_item .upload_file_item.active,
.library_page .upload_item .upload_file_item.active, .library_page .upload_item .upload_file_item.active,
.productImg_modal .upload_item .upload_file_item.active, .productImg_modal .upload_item .upload_file_item.active,
.accountEdit_page .upload_item .upload_file_item.active { .accountEdit_page .upload_item .upload_file_item.active,
.generalMenu_printModel_upload .upload_item .upload_file_item.active {
opacity: 0.5; opacity: 0.5;
border-radius: calc(1rem*1.2); border-radius: calc(1rem*1.2);
transform: scale(0.9); transform: scale(0.9);
@@ -1844,21 +1885,24 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item.active .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item.active .delete_file_block,
.library_page .upload_item .upload_file_item.active .delete_file_block, .library_page .upload_item .upload_file_item.active .delete_file_block,
.productImg_modal .upload_item .upload_file_item.active .delete_file_block, .productImg_modal .upload_item .upload_file_item.active .delete_file_block,
.accountEdit_page .upload_item .upload_file_item.active .delete_file_block { .accountEdit_page .upload_item .upload_file_item.active .delete_file_block,
.generalMenu_printModel_upload .upload_item .upload_file_item.active .delete_file_block {
pointer-events: none; pointer-events: none;
} }
.collection_modal_body .upload_item .upload_file_item.active .operate_file_block, .collection_modal_body .upload_item .upload_file_item.active .operate_file_block,
.design_detail_modal_component .upload_item .upload_file_item.active .operate_file_block, .design_detail_modal_component .upload_item .upload_file_item.active .operate_file_block,
.library_page .upload_item .upload_file_item.active .operate_file_block, .library_page .upload_item .upload_file_item.active .operate_file_block,
.productImg_modal .upload_item .upload_file_item.active .operate_file_block, .productImg_modal .upload_item .upload_file_item.active .operate_file_block,
.accountEdit_page .upload_item .upload_file_item.active .operate_file_block { .accountEdit_page .upload_item .upload_file_item.active .operate_file_block,
.generalMenu_printModel_upload .upload_item .upload_file_item.active .operate_file_block {
pointer-events: none; pointer-events: none;
} }
.collection_modal_body .upload_item .upload_file_item.upload_component, .collection_modal_body .upload_item .upload_file_item.upload_component,
.design_detail_modal_component .upload_item .upload_file_item.upload_component, .design_detail_modal_component .upload_item .upload_file_item.upload_component,
.library_page .upload_item .upload_file_item.upload_component, .library_page .upload_item .upload_file_item.upload_component,
.productImg_modal .upload_item .upload_file_item.upload_component, .productImg_modal .upload_item .upload_file_item.upload_component,
.accountEdit_page .upload_item .upload_file_item.upload_component { .accountEdit_page .upload_item .upload_file_item.upload_component,
.generalMenu_printModel_upload .upload_item .upload_file_item.upload_component {
border: none; border: none;
display: flex; display: flex;
align-items: center; align-items: center;
@@ -1868,7 +1912,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), .design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper),
.library_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), .library_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper),
.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper), .productImg_modal .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper),
.accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper) { .accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper),
.generalMenu_printModel_upload .upload_item .upload_file_item :deep(.ant-upload-picture-card-wrapper) {
position: absolute; position: absolute;
width: auto; width: auto;
top: 50%; top: 50%;
@@ -1879,7 +1924,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), .design_detail_modal_component .upload_item .upload_file_item :deep(.ant-upload-select-picture-card),
.library_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), .library_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card),
.productImg_modal .upload_item .upload_file_item :deep(.ant-upload-select-picture-card), .productImg_modal .upload_item .upload_file_item :deep(.ant-upload-select-picture-card),
.accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card) { .accountEdit_page .upload_item .upload_file_item :deep(.ant-upload-select-picture-card),
.generalMenu_printModel_upload .upload_item .upload_file_item :deep(.ant-upload-select-picture-card) {
width: calc(6rem*1.2); width: calc(6rem*1.2);
height: calc(6rem*1.2); height: calc(6rem*1.2);
border: calc(0.3rem*1.2) solid #ededed; border: calc(0.3rem*1.2) solid #ededed;
@@ -1890,7 +1936,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content,
.library_page .upload_item .upload_file_item .upload_file_item_content, .library_page .upload_item .upload_file_item .upload_file_item_content,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content, .productImg_modal .upload_item .upload_file_item .upload_file_item_content,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -1902,21 +1949,24 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover div, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover div,
.library_page .upload_item .upload_file_item .upload_file_item_content:hover div, .library_page .upload_item .upload_file_item .upload_file_item_content:hover div,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover div, .productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover div,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover div { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover div,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content:hover div {
opacity: 1; opacity: 1;
} }
.collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .collection_modal_body .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block,
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block,
.library_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .library_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block, .productImg_modal .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content:hover .delete_file_block {
display: block; display: block;
} }
.collection_modal_body .upload_item .upload_file_item .upload_file_item_content .upload_img, .collection_modal_body .upload_item .upload_file_item .upload_file_item_content .upload_img,
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .upload_img, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .upload_img,
.library_page .upload_item .upload_file_item .upload_file_item_content .upload_img, .library_page .upload_item .upload_file_item .upload_file_item_content .upload_img,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content .upload_img, .productImg_modal .upload_item .upload_file_item .upload_file_item_content .upload_img,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .upload_img { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content .upload_img,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content .upload_img {
display: block; display: block;
height: 100%; height: 100%;
width: auto; width: auto;
@@ -1927,7 +1977,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block,
.library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block, .productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content .delete_file_block {
display: none; display: none;
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
@@ -1945,7 +1996,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop,
.library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop, .productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop {
width: calc(3.2rem*1.2); width: calc(3.2rem*1.2);
height: calc(3.2rem*1.2); height: calc(3.2rem*1.2);
background: rgba(0, 0, 0, 0.6); background: rgba(0, 0, 0, 0.6);
@@ -1961,7 +2013,8 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, .design_detail_modal_component .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu,
.library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, .library_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu,
.productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu, .productImg_modal .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu,
.accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu { .accountEdit_page .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_file_item_content .delete_file_block.rightTop .icon-shanchu {
font-size: calc(1.6rem*1.2); font-size: calc(1.6rem*1.2);
color: #fff; color: #fff;
} }
@@ -1969,14 +2022,16 @@ textarea:focus {
.design_detail_modal_component .upload_item .upload_file_item .upload_img_icon, .design_detail_modal_component .upload_item .upload_file_item .upload_img_icon,
.library_page .upload_item .upload_file_item .upload_img_icon, .library_page .upload_item .upload_file_item .upload_img_icon,
.productImg_modal .upload_item .upload_file_item .upload_img_icon, .productImg_modal .upload_item .upload_file_item .upload_img_icon,
.accountEdit_page .upload_item .upload_file_item .upload_img_icon { .accountEdit_page .upload_item .upload_file_item .upload_img_icon,
.generalMenu_printModel_upload .upload_item .upload_file_item .upload_img_icon {
width: calc(4.6rem*1.2); width: calc(4.6rem*1.2);
} }
.collection_modal_body .upload_item .upload_file_item:last-child, .collection_modal_body .upload_item .upload_file_item:last-child,
.design_detail_modal_component .upload_item .upload_file_item:last-child, .design_detail_modal_component .upload_item .upload_file_item:last-child,
.library_page .upload_item .upload_file_item:last-child, .library_page .upload_item .upload_file_item:last-child,
.productImg_modal .upload_item .upload_file_item:last-child, .productImg_modal .upload_item .upload_file_item:last-child,
.accountEdit_page .upload_item .upload_file_item:last-child { .accountEdit_page .upload_item .upload_file_item:last-child,
.generalMenu_printModel_upload .upload_item .upload_file_item:last-child {
margin: 0; margin: 0;
} }
.generalModel_modal .ant-modal-content { .generalModel_modal .ant-modal-content {

10
src/assets/style/style.less
View File

@@ -10,6 +10,10 @@ html,body,#app{
--aida-fsize1-8: calc(1.8rem*1.2); --aida-fsize1-8: calc(1.8rem*1.2);
--aida-fsize1-6: calc(1.6rem*1.2); --aida-fsize1-6: calc(1.6rem*1.2);
--aida-fsize1-4: calc(1.4rem*1.2); --aida-fsize1-4: calc(1.4rem*1.2);
--antd-wave-shadow-color:#39215b;
}
::selection{
background-color: #1890ff;
} }
input{ input{
outline:none; outline:none;
@@ -359,6 +363,9 @@ input:focus{
cursor: pointer; cursor: pointer;
pointer-events: auto !important; pointer-events: auto !important;
} }
.ant-popover-placement-top{
z-index: 9999;
}
.ant-drawer{ .ant-drawer{
z-index: 9999; z-index: 9999;
} }
@@ -1600,7 +1607,7 @@ textarea:focus{
outline: none; /* 清除默认焦点样式 */ outline: none; /* 清除默认焦点样式 */
} }
//设计input和上传按钮样式 //设计input和上传按钮样式
.collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal,.accountEdit_page{ .collection_modal_body,.design_detail_modal_component,.library_page,.productImg_modal,.accountEdit_page,.generalMenu_printModel_upload{
.input_border{ .input_border{
z-index: 2; z-index: 2;
display: flex; display: flex;
@@ -1680,6 +1687,7 @@ textarea:focus{
width: var(--width); width: var(--width);
display: flex; display: flex;
float: left; float: left;
align-items: center;
.ant-spin-text{ .ant-spin-text{
font-size: 1.2rem; font-size: 1.2rem;
} }

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

@@ -152,7 +152,7 @@
<div class="design_detail_perview_content" > <div class="design_detail_perview_content" >
<!-- <div class="generate_button" v-show="designItemDetail.singleOverall == 'overall'" @click="generateHighDesign()">Generate Product lmage</div> --> <!-- <div class="generate_button" v-show="designItemDetail.singleOverall == 'overall'" @click="generateHighDesign()">Generate Product lmage</div> -->
<setDesignItem ref="setDesignItem" @setParentLoadingShow=setParentLoadingShow @setDesignCoverage="setDesignCoverage" @setSubmit="setSubmit"></setDesignItem> <setDesignItem ref="setDesignItem" :isBody="body" @setParentLoadingShow=setParentLoadingShow @setDesignCoverage="setDesignCoverage" @setSubmit="setSubmit"></setDesignItem>
<!-- <setDesignItemMobile v-else ref="setDesignItemMobile" @setParentLoadingShow=setParentLoadingShow @setDesignCoverage="setDesignCoverage" @setSubmit="setSubmit"></setDesignItemMobile> --> <!-- <setDesignItemMobile v-else ref="setDesignItemMobile" @setParentLoadingShow=setParentLoadingShow @setDesignCoverage="setDesignCoverage" @setSubmit="setSubmit"></setDesignItemMobile> -->
</div> </div>
@@ -507,15 +507,12 @@ export default defineComponent({
item.layersObject[0] = item.layersObject[1] item.layersObject[0] = item.layersObject[1]
item.layersObject[1] = a item.layersObject[1] = a
} }
if(item.printObject.prints == null){ if(item.printObject.prints == null)item.printObject.prints = []
item.printObject.prints = [] item.printObject.prints.forEach((element:any) => {
}else{ if(!element.designType){
item.printObject.prints.forEach((element:any) => { element.designType = 'Library'
if(!element.designType){ }
element.designType = 'Library' });
}
});
}
}) })
this.currentIndex = 0 this.currentIndex = 0
this.store.commit('setDesignItemDetail',rv) this.store.commit('setDesignItemDetail',rv)

12
src/component/Detail/DesignDetailEnd.vue
View File

@@ -94,10 +94,8 @@
<div v-if="type_ == 2 && (current?.printObject?.prints?.length != 0 || printsList.length != 0 || exhibitionList.print.length != 0)" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div> <div v-if="type_ == 2 && (current?.printObject?.prints?.length != 0 || printsList.length != 0 || exhibitionList.print.length != 0)" @click.stop="setPrint" class="subitOkPreviewBtn Guide_1_23">{{ $t('DesignDetailEnd.Layout') }}</div>
<!-- <div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div> --> <!-- <div v-else-if="type_ == 2 && designItemDetail?.clothes?.[currentIndex]?.printObject?.prints?.[0]?.path != null && current?.printObject?.prints?.[0]?.path == null" @click.stop="setPreview" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.preview') }}</div> -->
<div v-if="type_ == 4 && (elementsList.length != 0 || exhibitionList.elements.length != 0)" @click.stop="setElemets" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.Layout') }}</div> <div v-if="type_ == 4 && (elementsList.length != 0 || exhibitionList.elements.length != 0)" @click.stop="setElemets" class="subitOkPreviewBtn">{{ $t('DesignDetailEnd.Layout') }}</div>
<DesignPrintOperation v-if="!moible" ref="DesignPrintOperation"></DesignPrintOperation> <DesignPrintOperation ref="DesignPrintOperation"></DesignPrintOperation>
<DesignPrintOperationMobile v-else ref="DesignPrintOperationMobile"></DesignPrintOperationMobile> <DesignElementsOperation ref="DesignElementsOperation"></DesignElementsOperation>
<DesignElementsOperation v-if="!moible" ref="DesignElementsOperation"></DesignElementsOperation>
<DesignPrintMobile v-else ref="DesignPrintMobile"></DesignPrintMobile>
</div> </div>
<div class="mark_loading" v-show="loadingShow"> <div class="mark_loading" v-show="loadingShow">
<a-spin size="large" /> <a-spin size="large" />
@@ -112,7 +110,6 @@ import { Sketch} from '@ans1998/vue3-color'
import DesignPrintOperation from './DesignPrintOperation.vue'; import DesignPrintOperation from './DesignPrintOperation.vue';
import DesignPrintOperationMobile from './DesignPrintOperationMobile.vue'; import DesignPrintOperationMobile from './DesignPrintOperationMobile.vue';
import DesignElementsOperation from './DesignElements.vue'; import DesignElementsOperation from './DesignElements.vue';
import DesignPrintMobile from './DesignElementsMobile.vue';
import { message,Upload} from 'ant-design-vue'; import { message,Upload} from 'ant-design-vue';
import { openGuide,driverObj__ } from "@/tool/guide"; import { openGuide,driverObj__ } from "@/tool/guide";
import {isMoible,setGradual} from '@/tool/util' import {isMoible,setGradual} from '@/tool/util'
@@ -123,7 +120,7 @@ export default defineComponent({
props: ["msg"], props: ["msg"],
components:{ components:{
Draggable,Sketch,DesignPrintOperation,DesignPrintOperationMobile, Draggable,Sketch,DesignPrintOperation,DesignPrintOperationMobile,
DesignElementsOperation,DesignPrintMobile,sketchCategory DesignElementsOperation,sketchCategory
}, },
setup(prop) { setup(prop) {
const store = useStore(); const store = useStore();
@@ -262,7 +259,8 @@ export default defineComponent({
setPrint(){ setPrint(){
// if(this.current?.printObject?.prints?.[0]?.path){ // if(this.current?.printObject?.prints?.[0]?.path){
let DesignPrintOperation = isMoible() ? this.$refs.DesignPrintOperationMobile : this.$refs.DesignPrintOperation let DesignPrintOperation = this.$refs.DesignPrintOperation
// let DesignPrintOperation = isMoible() ? this.$refs.DesignPrintOperationMobile : this.$refs.DesignPrintOperation
DesignPrintOperation.init() DesignPrintOperation.init()
if(this.driver__.driver){ if(this.driver__.driver){
nextTick().then(()=>{ nextTick().then(()=>{

5
src/component/Detail/DesignPrintOperation.vue
View File

@@ -99,7 +99,7 @@
</div> </div>
<img :src="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtion_sketch"> <img :src="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtion_sketch">
<div class="designOpenrtion_btn"> <div class="designOpenrtion_btn">
<ul v-if="overallSingle" v-for="item,index in printStyleList[stateOverallSingle]" :key="item" :class="{active:item?.designOpenrtionBtn?item?.designOpenrtionBtn:false}" class="designOpenrtion_Mousingle" :style="item.style" @mousedown.stop="itemMoveMousedown(index,$event)"> <ul v-if="overallSingle" v-for="item,index in printStyleList[stateOverallSingle]" :key="item" :class="{active:item?.designOpenrtionBtn?item?.designOpenrtionBtn:false}" class="designOpenrtion_Mousingle" :style="item.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))">
<li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li> <li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li>
<li class="designOpenrtion_btn_bottom" @mousedown.stop="itemSizeMousedown('bottom',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('bottom',getMousePosition($event,true))"></li> <li class="designOpenrtion_btn_bottom" @mousedown.stop="itemSizeMousedown('bottom',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('bottom',getMousePosition($event,true))"></li>
<li class="designOpenrtion_btn_left" @mousedown.stop="itemSizeMousedown('left',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('left',getMousePosition($event,true))"></li> <li class="designOpenrtion_btn_left" @mousedown.stop="itemSizeMousedown('left',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('left',getMousePosition($event,true))"></li>
@@ -110,7 +110,7 @@
</li> </li>
</ul> </ul>
<div v-show="!overallSingle"></div> <div v-show="!overallSingle"></div>
<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" class="designOpenrtion_Mouoverall active" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @mousedown.stop="itemMoveMousedown(0,$event)"> <ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" class="designOpenrtion_Mouoverall active" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @mousedown.stop="itemMoveMousedown(0,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(0,getMousePosition($event,true))">
<i class="fi fi-rr-arrows animtion1"></i> <i class="fi fi-rr-arrows animtion1"></i>
<i class="fi fi-rr-arrows animtion2"></i> <i class="fi fi-rr-arrows animtion2"></i>
<li class="designOpenrtion_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li> <li class="designOpenrtion_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li>
@@ -294,7 +294,6 @@ export default defineComponent({
el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)" el.style.transform = "translate(-50%, -50%)rotateZ("+ angle + "deg)"
} }
} }
document.addEventListener('mousemove', mousemove);
// 添加鼠标松开事件监听器 // 添加鼠标松开事件监听器
let mouseup = () => { let mouseup = () => {
value.instance.printStyleList[value.instance.stateOverallSingle][value.instance.imgDomIndex].transform.rotateZ = angle value.instance.printStyleList[value.instance.stateOverallSingle][value.instance.imgDomIndex].transform.rotateZ = angle

86
src/component/Detail/addDetails.vue
View File

@@ -34,7 +34,12 @@
<input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]"> <input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
<!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> --> <!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> -->
</div> </div>
<div class="exportCanvasBox_center"> <div class="exportCanvasBox_center_box">
<div class="exportCanvasBox_center">
<!-- <div class="editFrontBack_bgImg" v-show="loadingShow">
<img :src="imgData?.undividedLayer" alt="">
</div> -->
</div>
<div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div> <div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div>
</div> </div>
</div> </div>
@@ -63,6 +68,7 @@ import allOrder from "@/component/Pay/allOrder.vue";
import creditsDetail from "@/component/Pay/creditsDetail.vue"; import creditsDetail from "@/component/Pay/creditsDetail.vue";
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing"; import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { getMousePosition } from "@/tool/mdEvent";
export default defineComponent({ export default defineComponent({
components: { components: {
creditsDetail, creditsDetail,
@@ -110,15 +116,8 @@ export default defineComponent({
exportWH = 512 exportWH = 512
nextTick(()=>{ nextTick(()=>{
let canvasBox = document.querySelector(".addDetails_modal .exportCanvasBox_center"); let canvasBox = document.querySelector(".addDetails_modal .exportCanvasBox_center");
let oldCanvasDom = canvasBox.querySelector('.canvas-container') document.removeEventListener('mousemove', mouseMove);
let oldCanvasDom1 = canvasBox.querySelector('canvas') document.removeEventListener('touchmove', touchmove);
var canvasDom = document.createElement("canvas");
document.addEventListener("keydown", canvasKeyDown);
document.addEventListener("keyup", canvasKeyUp);
if(oldCanvasDom)oldCanvasDom.remove()
if(oldCanvasDom)loadingShow.value = false
if(oldCanvasDom1)oldCanvasDom1.remove()
canvasBox.appendChild(canvasDom);
let img = new Image(); let img = new Image();
img.onload = function(){ img.onload = function(){
@@ -136,13 +135,11 @@ export default defineComponent({
exportWH = img.height exportWH = img.height
} }
ratio = [wScale,hScale] ratio = [wScale,hScale]
canvas = new fabric.Canvas(canvasDom, { canvas = canvasGeneral.canvasInit(canvasBox,{
width: canvasWH.value * wScale, width:canvasWH.value * wScale,
height: canvasWH.value * hScale, height:canvasWH.value * hScale,
isDrawingMode: false, // 开启绘图模式 })
});
scale = img.height/canvas.height scale = img.height/canvas.height
JSchangeType(canvas,'init')
pencilbtnStyle.value.background = rgba pencilbtnStyle.value.background = rgba
fabric.Object.prototype.cornerSize = 10 fabric.Object.prototype.cornerSize = 10
@@ -174,7 +171,8 @@ export default defineComponent({
}); });
//画布上移动 //画布上移动
canvas.on("mouse:move", event =>setCanvasMove(event)); document.addEventListener('mousemove', mouseMove);
document.addEventListener('touchmove', touchmove);
setOperation('pencil') setOperation('pencil')
img.remove() img.remove()
} }
@@ -206,20 +204,24 @@ export default defineComponent({
document.removeEventListener("keyup", canvasKeyUp); document.removeEventListener("keyup", canvasKeyUp);
} }
let rgba = 'rgba(0, 0, 0, 1)' let rgba = 'rgba(0, 0, 0, 1)'
let mouseMove = (event)=>{
let e = getMousePosition(event,false)
setCanvasMove(e)
}
let touchmove = (event)=>{
let e = getMousePosition(event,true)
setCanvasMove(e)
}
let setCanvasMove = (event)=>{ let setCanvasMove = (event)=>{
var pointer = canvas.getPointer(event.e);
if(canvas.isDrawingMode){ if(canvas.isDrawingMode){
canvas.setCursor('none'); canvas.setCursor('none');
} }
let canvasBox = document.querySelector(".addDetails_canvasCenter .canvas-container"); let canvasCenterBox = document.querySelector(".addDetails_modal .exportCanvasBox_center_box");
const rect = canvasBox.getBoundingClientRect(); if(!canvasCenterBox)return
const parentRect = canvasBox.parentElement.getBoundingClientRect(); let parentX = event.clientX - canvasCenterBox.getBoundingClientRect().left
let parentX = rect.left - parentRect.left let parentY = event.clientY - canvasCenterBox.getBoundingClientRect().top
let parentY = rect.top - parentRect.top pencilbtnStyle.value.left = parentX + "px"
pencilbtnStyle.value.left = parentX + pointer.x+'px' pencilbtnStyle.value.top = parentY+'px'
pencilbtnStyle.value.top = parentY + pointer.y+'px'
canvas.requestRenderAll()
} }
let setOperation = (str)=>{ let setOperation = (str)=>{
canvasBtn.canvasState = str canvasBtn.canvasState = str
@@ -339,26 +341,17 @@ export default defineComponent({
} }
) )
exportCanvas.add(obj) exportCanvas.add(obj)
// if(allObjects.length-1 == index){
// let data = exportCanvas.toDataURL('jpg')
// cancelDsign()
// clearCanvas()
// emit('setSloganData',data)
// }
}) })
let data = exportCanvas.toDataURL('jpg') let data = exportCanvas.toDataURL('jpg')
cancelDsign() cancelDsign()
clearCanvas() clearCanvas()
emit('setSloganData',data) emit('setSloganData',data)
}) })
} }
let cancelDsign = ()=>{ let cancelDsign = ()=>{
canvas.dispose();
showPayOrder.value = false
document.removeEventListener('keydown',canvasKeyDown); document.removeEventListener('keydown',canvasKeyDown);
document.removeEventListener('keyup', canvasKeyUp); document.removeEventListener('keyup', canvasKeyUp);
showPayOrder.value = false
} }
return { return {
presentState, presentState,
@@ -473,6 +466,25 @@ export default defineComponent({
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
} }
.exportCanvasBox_center_box{
padding: 3rem;
height: 100%;
flex: 1;
position: relative;
width: 100%;
background: #e6e6e6;
&:hover{
cursor: none;
}
.editFrontBack_pencilbtn{
position: absolute;
z-index: 1;
border-radius: 50%;
border: 1px solid #000;
pointer-events: none;
transform: translate(-50%,-50%);
}
}
.exportCanvasBox_center{ .exportCanvasBox_center{
height: 100%; height: 100%;
flex: 1; flex: 1;

97
src/component/Detail/editFrontBack.vue
View File

@@ -6,7 +6,7 @@
</div> --> </div> -->
<i class="icon iconfont icon-chehui" @click="historyState('')"></i> <i class="icon iconfont icon-chehui" @click="historyState('')"></i>
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i> <i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:canvasState == 'move'}"></i> <!-- <i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:canvasState == 'move'}"></i> -->
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:canvasState == 'pencil'}"></i> <i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:canvasState == 'pencil'}"></i>
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i> <i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i>
<div class="editFrontBack_center_btn_colorRed" @click="setOperationColor('rgb(255,0,0)')" :class="{active:rgba == 'rgb(255,0,0)'}" title="front"></div> <div class="editFrontBack_center_btn_colorRed" @click="setOperationColor('rgb(255,0,0)')" :class="{active:rgba == 'rgb(255,0,0)'}" title="front"></div>
@@ -14,9 +14,11 @@
<input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]"> <input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
<!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> --> <!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> -->
</div> </div>
<div class="exportCanvasBox_center"> <div class="exportCanvasBox_center_box">
<div class="editFrontBack_bgImg" v-show="loadingShow"> <div class="exportCanvasBox_center">
<img :src="imgData?.undividedLayer" alt=""> <div class="editFrontBack_bgImg" v-show="loadingShow">
<img :src="imgData?.undividedLayer" alt="">
</div>
</div> </div>
<div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div> <div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div>
</div> </div>
@@ -32,6 +34,7 @@ import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import allOrder from "@/component/Pay/allOrder.vue"; import allOrder from "@/component/Pay/allOrder.vue";
import creditsDetail from "@/component/Pay/creditsDetail.vue"; import creditsDetail from "@/component/Pay/creditsDetail.vue";
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing"; import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
import { getMousePosition } from "@/tool/mdEvent";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
export default defineComponent({ export default defineComponent({
components: { components: {
@@ -92,18 +95,14 @@ export default defineComponent({
var canvasDom = document.createElement("canvas"); var canvasDom = document.createElement("canvas");
document.addEventListener("keydown", canvasKeyDown); document.addEventListener("keydown", canvasKeyDown);
document.addEventListener("keyup", canvasKeyUp); document.addEventListener("keyup", canvasKeyUp);
let oldCanvasDom = canvasBox.querySelector('.canvas-container') document.removeEventListener('mousemove', mouseMove);
let oldCanvasDom1 = canvasBox.querySelector('canvas') document.removeEventListener('touchmove', touchmove);
if(oldCanvasDom)oldCanvasDom.remove()
if(oldCanvasDom)loadingShow.value = false
if(oldCanvasDom1)oldCanvasDom1.remove()
canvasBox.appendChild(canvasDom); canvasBox.appendChild(canvasDom);
let img = new Image(); let img = new Image();
img.onload = function(){ img.onload = function(){
loadingShow.value = true loadingShow.value = true
let height = canvasBox.offsetHeight; let height = canvasBox.offsetHeight;
canvasWH.value = height canvasWH.value = height
console.log(canvasBox.offsetHeight);
canvasBox.style.width = height+'px' canvasBox.style.width = height+'px'
let wScale = 1 let wScale = 1
let hScale = 1 let hScale = 1
@@ -117,13 +116,10 @@ export default defineComponent({
exportWH = img.height exportWH = img.height
} }
ratio = [wScale,hScale] ratio = [wScale,hScale]
canvas = new fabric.Canvas(canvasDom, { canvas = canvasGeneral.canvasInit(canvasBox,{
width: canvasWH.value * wScale, width:canvasWH.value * wScale,
height: canvasWH.value * hScale, height:canvasWH.value * hScale,
isDrawingMode: false, // 开启绘图模式 })
});
JSchangeType(canvas,'init')
console.log(rgba.value);
pencilbtnStyle.value.background = rgba.value pencilbtnStyle.value.background = rgba.value
fabric.Object.prototype.cornerSize = 10 fabric.Object.prototype.cornerSize = 10
fabric.Object.prototype.transparentCorners = false fabric.Object.prototype.transparentCorners = false
@@ -159,7 +155,9 @@ export default defineComponent({
}); });
//画布上移动 //画布上移动
canvas.on("mouse:move", event =>setCanvasMove(event)); // canvas.on("mouse:move", event =>setCanvasMove(event));
document.addEventListener('mousemove', mouseMove);
document.addEventListener('touchmove', touchmove);
setOperation('pencil') setOperation('pencil')
createSetTimeSubmit() createSetTimeSubmit()
img.remove() img.remove()
@@ -186,8 +184,7 @@ export default defineComponent({
} }
let setClone = ()=>{ let setClone = ()=>{
// canvasBtn.canvasState = 'move'
// canvasBtn.spreadState = false
let canvasBox = document.querySelector(".editFrontBack_center .exportCanvasBox_center"); let canvasBox = document.querySelector(".editFrontBack_center .exportCanvasBox_center");
let oldCanvasDom = canvasBox.querySelector('.canvas-container') let oldCanvasDom = canvasBox.querySelector('.canvas-container')
let oldCanvasDom1 = canvasBox.querySelector('canvas') let oldCanvasDom1 = canvasBox.querySelector('canvas')
@@ -200,22 +197,24 @@ export default defineComponent({
document.removeEventListener("keyup", canvasKeyUp); document.removeEventListener("keyup", canvasKeyUp);
} }
let rgba = ref('rgb(255,0,0)') let rgba = ref('rgb(255,0,0)')
let mouseMove = (event)=>{
let e = getMousePosition(event,false)
setCanvasMove(e)
}
let touchmove = (event)=>{
let e = getMousePosition(event,true)
setCanvasMove(e)
}
let setCanvasMove = (event)=>{ let setCanvasMove = (event)=>{
var pointer = canvas.getPointer(event.e);
if(canvas.isDrawingMode){ if(canvas.isDrawingMode){
canvas.setCursor('none'); canvas.setCursor('none');
// brushIndicator.set({ left: pointer.x, top: pointer.y, visible: true,radius:(canvasBtn.canvasPencilWidth[canvasBtn.canvasState])/2 });
} }
let canvasBox = document.querySelector(".editFrontBack_center .canvas-container"); let canvasCenterBox = document.querySelector(".editFrontBack_center .exportCanvasBox_center_box");
const rect = canvasBox.getBoundingClientRect(); if(!canvasCenterBox)return
const parentRect = canvasBox.parentElement.getBoundingClientRect(); let parentX = event.clientX - canvasCenterBox.getBoundingClientRect().left
let parentX = rect.left - parentRect.left let parentY = event.clientY - canvasCenterBox.getBoundingClientRect().top
let parentY = rect.top - parentRect.top pencilbtnStyle.value.left = parentX + "px"
// brushIndicator.set({ left: x, top: y, visible: true,radius:(canvasBtn.canvasPencilWidth[canvasBtn.canvasState])/2 }); pencilbtnStyle.value.top = parentY+'px'
pencilbtnStyle.value.left = parentX + pointer.x+'px'
pencilbtnStyle.value.top = parentY + pointer.y+'px'
canvas.requestRenderAll()
} }
let setOperation = (str)=>{ let setOperation = (str)=>{
canvasBtn.canvasState = str canvasBtn.canvasState = str
@@ -227,7 +226,7 @@ export default defineComponent({
pencilbtnStyle.value.display = `block` pencilbtnStyle.value.display = `block`
}else if(str == 'eraser'){ }else if(str == 'eraser'){
setEraser() setEraser()
rgba.value = 'rgb(255,255,255)' // rgba.value = 'rgb(255,255,255)'
pencilbtnStyle.value.display = `block` pencilbtnStyle.value.display = `block`
} }
} }
@@ -373,6 +372,7 @@ export default defineComponent({
}) })
} }
let cancelDsign = ()=>{ let cancelDsign = ()=>{
document.removeEventListener('keydown',canvasKeyDown); document.removeEventListener('keydown',canvasKeyDown);
document.removeEventListener('keyup', canvasKeyUp); document.removeEventListener('keyup', canvasKeyUp);
} }
@@ -410,6 +410,7 @@ export default defineComponent({
// width: calc(512px / 2); // width: calc(512px / 2);
// width: 256px; // width: 256px;
height: 100%; height: 100%;
width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// height: calc(512px / 2); // height: calc(512px / 2);
@@ -499,13 +500,30 @@ export default defineComponent({
transform: translate(-50%,0); transform: translate(-50%,0);
} }
} }
.exportCanvasBox_center{ .exportCanvasBox_center_box{
padding: 3rem;
height: 100%; height: 100%;
flex: 1; flex: 1;
position: relative; position: relative;
width: 100%;
background: #e6e6e6;
&:hover{
cursor: none;
}
.editFrontBack_pencilbtn{
position: absolute;
z-index: 1;
border-radius: 50%;
border: 1px solid #000;
pointer-events: none;
transform: translate(-50%,-50%);
}
}
.exportCanvasBox_center{
margin: 0 auto; margin: 0 auto;
overflow: hidden; overflow: hidden;
background: #e6e6e6; height: 100%;
position: relative;
// overflow: scroll; // overflow: scroll;
:deep(.canvas-container){ :deep(.canvas-container){
@@ -531,14 +549,7 @@ export default defineComponent({
object-fit: contain; object-fit: contain;
} }
} }
.editFrontBack_pencilbtn{
position: absolute;
z-index: 1;
border-radius: 50%;
border: 1px solid #000;
pointer-events: none;
transform: translate(-50%,-50%);
}
} }
.exportCanvasBox_center:hover{ .exportCanvasBox_center:hover{
.editFrontBack_center_btn{ .editFrontBack_center_btn{

141
src/component/Detail/oldHistoryDetail.vue
View File

@@ -1,141 +0,0 @@
<template>
<a-modal class="oldHsitory_detail_modal_component"
v-model:visible="hsitoryDetailShow"
:footer="null"
:title="collectionName"
width="80%"
:maskClosable="false"
:keyboard="false"
:centered="true"
>
<template #closeIcon>
<div class="close_icon" @click.stop="changeDetailShow()"><span class="icon iconfont icon-guanbi"></span></div>
</template>
<!-- <div class="history_detail_content scroll_style">
<div class="history_img_block" v-for="img in groupDetails" :key="img">
<div class="history_img_item" >
<img class="element_img" :src="img.url">
</div>
</div>
</div> -->
<OldExportNewCoolection ref="OldExportNewCoolection"></OldExportNewCoolection>
</a-modal>
</template>
<script lang="ts">
import OldExportNewCoolection from "@/component/HomePage/OldExportNewCoolection.vue";
import { defineComponent, ref, nextTick } from 'vue'
export default defineComponent({
components: {
OldExportNewCoolection
},
props:{
groupDetails:{
default:{},
},
collectionName:{
default:''
}
},
setup() {
let hsitoryDetailShow = ref(false)
return{
hsitoryDetailShow
}
},
data(){
return{
}
},
methods:{
init(data:any){
this.hsitoryDetailShow = true
nextTick().then(()=>{
let OldExportNewCoolection:any = this.$refs.OldExportNewCoolection
OldExportNewCoolection.init(data)
})
},
changeDetailShow(){
this.hsitoryDetailShow = !this.hsitoryDetailShow
}
}
})
</script>
<style lang="less">
.oldHsitory_detail_modal_component{
.ant-modal-body{
overflow-y: initial !important;
overflow-x: auto;
}
.export_new_collection_review{
position: relative;
left: 50%;
transform: translateX(-50%) scale(2);
transform-origin: top center;
top: 0;
}
.ant-modal-close{
width: 3.6rem;
height: 3.6rem;
position: absolute;
top: -1.8rem;
right: -1.8rem;
}
.ant-modal-header{
background: #F7F7F7;
}
.ant-modal-body{
background: #F2F3FB;
height: 80vh;
min-height: 72rem;
overflow-y: hidden;
padding: 0;
}
.close_icon{
width: 3.6rem;
height: 3.6rem;
background: #000000;
border-radius: 50%;
line-height: 3.6rem;
text-align: center;
.icon-guanbi{
font-size: 2rem;
color: #ffffff;
}
}
.history_detail_content{
padding: 2.6rem 2.0rem 2.6rem 3.7rem;
height: 100%;
width: 100%;
overflow-y:auto;
background: #FFFFFF;
.history_img_block{
width: 16.5rem;
height: 16.5rem;
border: 0.1rem solid #343579;
margin: 0 1.7rem 1.7rem 0;
display: inline-block;
.history_img_item{
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}
.element_img{
max-width: 100%;
max-height: 100%;
}
}
}
}
</style>

21
src/component/Detail/setDesignItem.vue
View File

@@ -8,7 +8,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="designOpenrtion_imgMask" :style="frontBack?.body?.style"> <div class="designOpenrtion_imgMask" :style="frontBack?.body?.style">
<!-- <div <!-- <div
v-for="item,index in frontBack.back" v-for="item,index in frontBack.back"
@@ -26,7 +25,7 @@
<div class="detail_modal_item_front" v-for="item,index in frontBack.front" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)" :style="item.style"> <div class="detail_modal_item_front" v-for="item,index in frontBack.front" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)" :style="item.style">
<img :src="item.imageUrl" alt=""> <img :src="item.imageUrl" alt="">
</div> </div>
<div class="designOpenrtion_btn"> <div class="designOpenrtion_btn" v-if="!isBody">
<ul v-for="item,index in frontBack.front" :key="item" :class="{active:item.designOpenrtionBtn}" class="designOpenrtion_btn" :style="item.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))"> <ul v-for="item,index in frontBack.front" :key="item" :class="{active:item.designOpenrtionBtn}" class="designOpenrtion_btn" :style="item.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))">
<li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li> <li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li>
<li class="designOpenrtion_btn_bottom" @mousedown.stop="itemSizeMousedown('bottom',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('bottom',getMousePosition($event,true))"></li> <li class="designOpenrtion_btn_bottom" @mousedown.stop="itemSizeMousedown('bottom',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('bottom',getMousePosition($event,true))"></li>
@@ -56,7 +55,7 @@ import { Https } from "@/tool/https";
import editFrontBack from '@/component/Detail/editFrontBack.vue' import editFrontBack from '@/component/Detail/editFrontBack.vue'
import { getMousePosition } from "@/tool/mdEvent"; import { getMousePosition } from "@/tool/mdEvent";
export default defineComponent({ export default defineComponent({
// props: ["frontBack"], props: ["isBody"],
emits:['setParentLoadingShow','setDesignCoverage','setSubmit'], emits:['setParentLoadingShow','setDesignCoverage','setSubmit'],
components:{editFrontBack}, components:{editFrontBack},
setup(prop) { setup(prop) {
@@ -160,11 +159,18 @@ export default defineComponent({
let front = [] let front = []
let back = [] let back = []
let body = {} let body = {}
designItemDetail.others.forEach((item) => { if(designItemDetail.others.length > 0){
if(item.type == 'Body'){ designItemDetail.others.forEach((item) => {
if(item.type == 'Body'){
body = item
}
});
}else{
designItemDetail.clothes.forEach((item) => {
body = item body = item
} });
}); }
let ratio = await this.setPostition(body.layersObject[0]?.imageUrl) let ratio = await this.setPostition(body.layersObject[0]?.imageUrl)
let frontIndex = 6 let frontIndex = 6
let backIndex = 3 let backIndex = 3
@@ -243,7 +249,6 @@ export default defineComponent({
}, },
clear(){ clear(){
this.imgDomIndex = -1 this.imgDomIndex = -1
console.log(this.editFrontBack);
this.clothesOpenActive(-1) this.clothesOpenActive(-1)
this.editFrontBack.setClone() this.editFrontBack.setClone()
window.removeEventListener('resize', this.setImgSizeTime); window.removeEventListener('resize', this.setImgSizeTime);

53
src/component/HomePage/ExportModel.vue
View File

@@ -168,7 +168,6 @@
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}"></i> <i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}"></i>
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}"></i> <i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}"></i>
<!-- <i class="icon iconfont icon-xiala" :class="closeNav.tool?'icon-rotate':''" @click.stop="setCloseNav('tool')"></i> --> <!-- <i class="icon iconfont icon-xiala" :class="closeNav.tool?'icon-rotate':''" @click.stop="setCloseNav('tool')"></i> -->
<i class="icon iconfont icon-xian" @click="setOperation('fold')" :class="{active:operation == 'fold'}"></i> <i class="icon iconfont icon-xian" @click="setOperation('fold')" :class="{active:operation == 'fold'}"></i>
<i class="icon iconfont icon-checkbox-full" @click="setOperation('rect')" :class="{active:operation == 'rect'}"></i> <i class="icon iconfont icon-checkbox-full" @click="setOperation('rect')" :class="{active:operation == 'rect'}"></i>
<!-- <i class="icon iconfont icon-zhixian" @click="setOperation('line')" :class="{active:operation == 'line'}"></i> --> <!-- <i class="icon iconfont icon-zhixian" @click="setOperation('line')" :class="{active:operation == 'line'}"></i> -->
@@ -180,6 +179,7 @@
<input type="file" @change="uploadImage"> <input type="file" @change="uploadImage">
</label> </label>
<i class="icon iconfont" @click="setOperation('text')" :class="{active:operation == 'text'}">T</i> <i class="icon iconfont" @click="setOperation('text')" :class="{active:operation == 'text'}">T</i>
<i @click="setLiquefaction()">液化</i>
</div> </div>
<!-- <div class="exportCanvasBox_left_tool exportCanvasBox_left_item" :class="{'closeNav' :closeNav.tool}"> <!-- <div class="exportCanvasBox_left_tool exportCanvasBox_left_item" :class="{'closeNav' :closeNav.tool}">
<div class="exportCanvasBox_left_tool_item"> <div class="exportCanvasBox_left_tool_item">
@@ -287,6 +287,7 @@
</div> </div>
</a-modal> </a-modal>
<publish ref="publish" @setPublish="setSubmit"></publish> <publish ref="publish" @setPublish="setSubmit"></publish>
<liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction"></liquefaction>
</a-modal> </a-modal>
</template> </template>
<script> <script>
@@ -307,12 +308,14 @@ import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMov
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import {isMoible,calculateGradientCoordinate,base64ToFile} from '@/tool/util' import {isMoible,calculateGradientCoordinate,base64ToFile} from '@/tool/util'
import publish from "@/component/WorksPage/publish.vue"; import publish from "@/component/WorksPage/publish.vue";
import liquefaction from "@/component/modules/liquefaction.vue";
export default defineComponent({ export default defineComponent({
components: { components: {
scaleImage, scaleImage,
ExportNewCoolection, ExportNewCoolection,
publish, publish,
liquefaction,
}, },
props: ["msg", "sketchCatecoryList"], props: ["msg", "sketchCatecoryList"],
setup(props,{emit}) { setup(props,{emit}) {
@@ -465,8 +468,9 @@ export default defineComponent({
let oldExportCanvas let oldExportCanvas
let localCanvas = localStorage.getItem('canvasContent') let localCanvas = localStorage.getItem('canvasContent')
let localUserlikeGroupId = localStorage.getItem('userlikeGroupId') let localUserlikeGroupId = localStorage.getItem('userlikeGroupId')
let currentTime = localStorage.getItem('currentTime')
oldExportCanvas = await new Promise((resolve, reject) => { oldExportCanvas = await new Promise((resolve, reject) => {
if(localUserlikeGroupId == userlikeGroupId){ if(localUserlikeGroupId == userlikeGroupId && (new Date().getTime() - currentTime < 21600000)){
Modal.confirm({ Modal.confirm({
title: useI18.t('exportModel.jsContent8'), title: useI18.t('exportModel.jsContent8'),
okText: 'Yes', okText: 'Yes',
@@ -622,6 +626,7 @@ export default defineComponent({
data.canvasHeight = canvasWH.value.height data.canvasHeight = canvasWH.value.height
localStorage.setItem('canvasContent',JSON.stringify(data)) localStorage.setItem('canvasContent',JSON.stringify(data))
localStorage.setItem('userlikeGroupId',userlikeGroupId) localStorage.setItem('userlikeGroupId',userlikeGroupId)
localStorage.setItem('currentTime',new Date().getTime())
},3000) },3000)
if(driver__.value.driver){ if(driver__.value.driver){
driverObj__.moveNext() driverObj__.moveNext()
@@ -1931,6 +1936,46 @@ export default defineComponent({
canvas.renderAll(); canvas.renderAll();
} }
} }
//液化
let liquefaction = ref(null)
let submitLiquefaction = (rv)=>{
}
let setLiquefaction = ()=>{
const selectedObject = canvas.getActiveObjects();
if (selectedObject.length > 0) {
// 创建一个新的画布用于生成图片
const tempCanvas = new fabric.Canvas();
tempCanvas.setDimensions({
width: selectedObject.width,
height: selectedObject.height,
});
let cloneCount = 0;
selectedObject.forEach((obj) => {
obj.clone((clonedObject) => {
tempCanvas.add(clonedObject);
clonedObject.set({ left: obj.left, top: obj.top }); // 设置位置
cloneCount++;
// 当所有对象都克隆完成后生成图片
if (cloneCount === selectedObject.length) {
const dataURL = tempCanvas.toDataURL();
console.log(dataURL);
console.log('Image URL:', dataURL);
// 可以根据需要使用 dataURL，例如显示在 img 标签中
}
});
});
// 生成图片的地址
} else {
console.log('No object selected.');
return null;
}
// liquefaction.value.init()
}
onMounted(() => { onMounted(() => {
let arr = [ let arr = [
{ value: 'Arial', name: 'select font' }, { value: 'Arial', name: 'select font' },
@@ -2009,6 +2054,10 @@ export default defineComponent({
fontFamily, fontFamily,
textDataShow, textDataShow,
setFontFamily, setFontFamily,
//液化
liquefaction,
submitLiquefaction,
setLiquefaction,
}; };
}, },
data(prop) { data(prop) {

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

@@ -1,6 +1,6 @@
<template> <template>
<div class="generate"> <div class="generate">
<div v-if="type_.type2 == 'Printboard' && scene.value == 'Pattern'" class="generate_checkbox" > <div v-if="(type_.type2 == 'Printboard' && scene.value == 'Pattern')" class="generate_checkbox" >
<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_2_4'}"></generalMenu> <generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_2_4'}"></generalMenu>
<!-- <generalMenu :dataList="sceneList" @setprintModel="setSceneList" :item="scene"></generalMenu> --> <!-- <generalMenu :dataList="sceneList" @setprintModel="setSceneList" :item="scene"></generalMenu> -->
<!-- <div v-if="type_.type2 == 'Printboard'" class="printModel"> <!-- <div v-if="type_.type2 == 'Printboard'" class="printModel">
@@ -14,7 +14,7 @@
</div> </div>
<div class="input_border" > <div class="input_border" >
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',type_.type2 =='Sketchboard'?'Guide_1_9_2':'']"> <div class="input_box Guide_1_5" :class="[inputShow?'active':'',type_.type2 =='Sketchboard'?'Guide_1_9_2':'']">
<div class="input_box_btnBox"> <div class="input_box_btnBox" v-if="scene?.value != 'extract'">
<div class="upload_item"> <div class="upload_item">
<div <div
class="upload_file_item Guide_1_2_7" class="upload_file_item Guide_1_2_7"
@@ -39,13 +39,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <a-popover>
<template #content>
<p>Seed</p>
</template>
<input class="search_seed" max="9999" v-show="scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
</a-popover> -->
<input <input
class="search_input" class="search_input"
@input="ifMaximumLength" @input="ifMaximumLength"
@@ -77,6 +70,53 @@
<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i> <i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i> <i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i>
</div> </div>
<div class="input_box_btnBox" v-else>
<div class="upload_item">
<div
class="upload_file_item"
v-for="(file, index) in sketchboardList"
:key="file"
:class="[driver__.driver?'showEvents':'']"
>
<div
class="upload_file_item_content"
v-show="file?.status === 'uploading'"
>
<a-spin size="small" :indicator="indicator" tip="Uploading..." />
</div>
<div
class="upload_file_item_content"
v-show="file?.status === 'done' || file?.base64"
>
<img :src="file?.imgUrl" class="upload_img" />
<div class="delete_like_file_block" :class="[driver__.driver?'hideEvents':'']">
<span class="icon iconfont icon-shanchu operate_icon" @click.stop="deleteFile(index)"></span>
</div>
</div>
</div>
</div>
<i class="fi fi-br-upload" style="margin-left: 2rem;" v-show="sketchboardList.length == 0" :title="$t('Generate.uploadproduct')">
<a-upload
class="search_upImg"
:capture="null"
:action="uploadUrl + '/api/element/upload'"
list-type="picture-card"
:data="{
...upload,
}"
:maxCount='1'
:headers="{ Authorization: token }"
v-model:file-list="sketchboardList"
:before-upload="beforeUpload"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
</a-upload>
</i>
<div :title="$t('Generate.style')">
<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel"></generalMenu>
</div>
</div>
<textarea <textarea
v-show="isTextarea" v-show="isTextarea"
class="search_textarea " class="search_textarea "
@@ -86,10 +126,8 @@
@click.stop="" @click.stop=""
v-model="searchPictureName" v-model="searchPictureName"
></textarea> ></textarea>
<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div> -->
<div v-show="!isGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate"> <div v-show="!isGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate">
{{ $t('Generate.Generate') }} {{ $t('Generate.Generate') }}
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
</div> </div>
<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click="getgenerate"> <div v-show="isGenerate && !remGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click="getgenerate">
<i class="fi fi-br-loading"></i> <i class="fi fi-br-loading"></i>
@@ -108,37 +146,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" class="generage_img Guide_1_6">
<div class="upload_item">
<div
class="upload_file_item Guide_1_2_7"
v-for="(file, index) in sketchboardList"
:key="file"
@click.stop="setSketchboardItem(file)"
:class="[file?.checked?'active':'',checkboxImage? 'forbidden':'',driver__.driver?'showEvents':'']"
>
<div
class="upload_file_item_content"
v-show="file?.status === 'uploading'"
>
<a-spin :indicator="indicator" tip="Uploading..." />
</div>
<div
class="upload_file_item_content"
v-show="file?.status === 'done'"
>
<img :src="file?.imgUrl" class="upload_img" />
<div
class="delete_file_block"
:class="[driver__.driver?'hideEvents':'']"
@click.stop="deleteFile(index)"
>
<span class="icon iconfont icon-shanchu"></span>
</div>
</div>
</div>
</div>
</div> -->
<div class="generage_img Guide_1_6" :class="{Guide_1_13_2:type_.type2 == 'Sketchboard',Guide_1_2_9:type_.type2 == 'Printboard'}" :style="[isGenerate?'overflow:hidden':'']"> <div class="generage_img Guide_1_6" :class="{Guide_1_13_2:type_.type2 == 'Sketchboard',Guide_1_2_9:type_.type2 == 'Printboard'}" :style="[isGenerate?'overflow:hidden':'']">
<div <div
class="generage_img_item" class="generage_img_item"
@@ -163,8 +170,11 @@
<span class="icon iconfont icon-shanchu operate_icon"></span> <span class="icon iconfont icon-shanchu operate_icon"></span>
</div> </div>
</div> </div>
<div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div>
</div> </div>
<scaleImage ref="scaleImage"></scaleImage> <scaleImage ref="scaleImage" :isCanvas="true" :workspace="workspace"></scaleImage>
<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan> <createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
</div> </div>
</template> </template>
@@ -196,25 +206,9 @@ export default defineComponent({
setup(props) { setup(props) {
// console.log(prop.msg); // console.log(prop.msg);
let printModelList = ref([ let printModelList:any = ref([])
{ let sketchStyleList:any = ref([])
num:'', let printModel:any = ref({
optype:false,
value:'Painting Style',
label:useI18n().t('Generate.Model1')
},{
num:'',
optype:false,
value:'Illustration Style',
label:useI18n().t('Generate.Model2')
},{
num:'',
optype:false,
value:'Real Style',
label:useI18n().t('Generate.Model3')
},
])
let printModel = ref({
num:'', num:'',
optype:false, optype:false,
value:'Painting Style', value:'Painting Style',
@@ -240,12 +234,13 @@ export default defineComponent({
let isTest = ref() let isTest = ref()
let userInfo:any = {} let userInfo:any = {}
let generateTime:any = ref() let generateTime:any = ref()
let generateProceedList = ref([]) let generateProceedList:any = ref([])
let remGenerate:any = ref(false) let remGenerate:any = ref(false)
let remGenerateTime:any = ref() let remGenerateTime:any = ref()
let styleRecommend:any = inject('styleRecommend') let styleRecommend:any = inject('styleRecommend')
let generateLevel2Type = '' let generateLevel2Type = ''
let isSloganHint:any = ref(' ') let isSloganHint:any = ref(' ')
let loadingShow =ref(false)
return { return {
searchPictureName, searchPictureName,
searchPictureSeed, searchPictureSeed,
@@ -255,6 +250,7 @@ export default defineComponent({
level2Type, level2Type,
printModel, printModel,
printModelList, printModelList,
sketchStyleList,
isGenerate, isGenerate,
// printBoards, // printBoards,
@@ -274,6 +270,7 @@ export default defineComponent({
styleRecommend, styleRecommend,
generateLevel2Type, generateLevel2Type,
isSloganHint, isSloganHint,
loadingShow,
}; };
}, },
data(prop) { data(prop) {
@@ -319,6 +316,42 @@ export default defineComponent({
this.workspaceCom = computed(()=>{ this.workspaceCom = computed(()=>{
return this.store?.state?.Workspace?.workspace return this.store?.state?.Workspace?.workspace
}) })
// if()
if(this.type_.type2 == 'Printboard'){
this.printModelList = [
{
num:'',
optype:false,
value:'Painting Style',
label:useI18n().t('Generate.Model1')
},{
num:'',
optype:false,
value:'Illustration Style',
label:useI18n().t('Generate.Model2')
},{
num:'',
optype:false,
value:'Real Style',
label:useI18n().t('Generate.Model3')
},
]
}else if(this.type_.type2 == 'Sketchboard'){
this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
this.printModelList.forEach((item:any)=>{
item.img = 'https://www.aida.com.hk/img/aida_logo.5ab4163e.png'
})
this.printModelList.push({
num:'',
optype:false,
img:-1,
value:'',
label:useI18n().t('Generate.Model1')
})
}
this.printModel = this.printModelList[0]
}, },
watch:{ watch:{
driver__:{ driver__:{
@@ -377,6 +410,7 @@ export default defineComponent({
methods: { methods: {
generageAdd(data: any) { generageAdd(data: any) {
data.type_ = this.type_; data.type_ = this.type_;
data.type_.type1 = data.designType?data.designType:this.type_.type1
data.resData = JSON.parse(JSON.stringify(data)) data.resData = JSON.parse(JSON.stringify(data))
let maxImg = 8 let maxImg = 8
if(this.type_.type2 == 'Sketchboard'){ if(this.type_.type2 == 'Sketchboard'){
@@ -410,7 +444,41 @@ export default defineComponent({
setprintModel(value:any){ setprintModel(value:any){
this.printModel = value this.printModel = value
}, },
imageToSketch(){
if((!this.printModel?.id && !this.printModel?.value) || !this.sketchboardList?.[0]?.id)return message.info(this.t('Generate.jsContent4'));
this.loadingShow = true
let data = {
"elementId": this.sketchboardList[0].id,
gender:this.workspace.sexEnum.value,
"style": this.printModel.value,
"styleImageId": this.printModel.id?this.printModel.id:''
}
Https.axiosPost(Https.httpUrls.imageToSketch, data).then((rv)=>{
if(rv){
this.sketchCatecoryList.forEach((itemCategory:any) => {
if(itemCategory.value == rv.category){
rv.categoryValue = itemCategory?.value
rv.category = itemCategory?.name
}
});
this.fileList.push({
imgUrl:rv.url,
categoryValue:rv.categoryValue,
category:rv.category,
id:rv.id,
status:'Success',
})
this.loadingShow = false
}
}).catch(()=>{
this.loadingShow = false
})
},
getgenerate(){ getgenerate(){
if(this.scene?.value == 'extract'){
this.imageToSketch()
return
}
this.isTextarea = false this.isTextarea = false
this.isInputFocus = false this.isInputFocus = false
if(this.isGenerate)return if(this.isGenerate)return
@@ -844,7 +912,6 @@ export default defineComponent({
border-radius: calc(1rem*1.2); border-radius: calc(1rem*1.2);
img { img {
transform: scale(0.9); transform: scale(0.9);
object-fit: contain;
} }
.delete_like_file_block{ .delete_like_file_block{
pointer-events:none; pointer-events:none;
@@ -856,6 +923,7 @@ export default defineComponent({
img { img {
width: calc(10rem*1.2); width: calc(10rem*1.2);
height: calc(10rem*1.2); height: calc(10rem*1.2);
object-fit: contain;
} }
&:hover .delete_like_file_block{ &:hover .delete_like_file_block{
// display: block; // display: block;

190
src/component/HomePage/OldExportNewCoolection.vue
View File

@@ -1,190 +0,0 @@
<template>
<!-- 生成collention缩略图用的 -->
<div class="export_new_collection_review">
<div class="img_block_item" v-if="allBoardData?.moodTemplateId">
<MoodTemplate :fileList="allBoardData?.moodboardFiles" :moodTemplateId="allBoardData?.moodTemplateId"></MoodTemplate>
</div>
<div class="img_block_item" v-else>
<div class="lager_img_item" v-for="(mood) in allBoardData.moodboardFiles" :key="mood">
<div class="all_img_item_block">
<img class="all_img_content cover_img" :src="mood.imgUrl" >
</div>
</div>
</div>
<div class="img_block_item">
<div class="small_img_item" v-for="(print) in allBoardData.printboardFiles" :key="print">
<div class="all_img_item_block">
<img class="all_img_content cover_img" :src="print.imgUrl">
</div>
</div>
<div class="small_img_item" v-for="(generate) in allBoardData.generatePrintFiles" :key="generate">
<div class="all_img_item_block">
<img class="all_img_content cover_img" :src="generate.imgUrl">
</div>
</div>
</div>
<div class="img_block_item">
<div class="color_item" v-for="(color) in allBoardData.colorBoards" :key="color">
<div class="color_content" :style="{background:`rgb(${color?.rgbValue?.r},${color?.rgbValue?.g},${color?.rgbValue?.b})`}"></div>
<div class="color_content_body">
<div class="color_des">{{color.tcx}}</div>
<div class="color_des">{{color.name}}</div>
</div>
</div>
</div>
<div class="img_block_item">
<div class="lager_img_item" v-for="(skecth) in allBoardData.skecthboardFiles" :key="skecth">
<div class="all_img_item_block">
<img class="all_img_content" :src="skecth.imgUrl">
</div>
</div>
</div>
<div class="img_block_item">
<div class="lager_img_item" v-for="(marketing) in allBoardData.marketingSketchFiles" :key="marketing">
<div class="all_img_item_block">
<img class="all_img_content" :src="marketing.imgUrl">
</div>
</div>
</div>
<div class="img_block_item">
<div class="lager_img_item" v-for="(design) in allBoardData.likeDesignCollectionList" :key="design.designItemUrl">
<div class="all_img_item_block">
<img class="all_img_content" :src="design.designItemUrl">
</div>
</div>
</div>
</div>
</template>
<script lang="ts">
import { computed, defineComponent, ref } from 'vue'
import MoodTemplate from '@/component/HomePage/MoodTemplate.vue'
import { useStore } from "vuex";
export default defineComponent({
// props: {
// allBoardData: {
// // default: false,
// },
// },
components:{MoodTemplate},
setup() {
const allBoardData = ref({});
// let allBoardData:any = computed(()=>{return store.state.UploadFilesModule.allBoardData})
// let likeDesignCollectionList : any = computed(()=>{return store.state.HomeStoreModule.likeDesignCollectionList})
return {
allBoardData,
// likeDesignCollectionList,
}
},
mounted () {
},
methods:{
init(data:any){
this.allBoardData = data
}
}
})
</script>
<style lang="less" scoped>
.export_new_collection_review{
width: 40.8rem;
background: #fff;
position: fixed;
left: -100rem;
top: 0;
.img_block_item{
margin-bottom: 2rem;
// &.color_block_item{
// padding: 0 0.5rem 0 0.3rem;
// }
.lager_img_item{
display: inline-block;
width: 20.4rem;
height: 20.4rem;
vertical-align: top;
}
.sketch_img_item{
display: inline-block;
width: 20.4rem;
height: 42.2rem;
vertical-align: top;
}
.small_img_item{
width: 6.8rem;
height: 6.8rem;
display: inline-block;
vertical-align: top;
}
.color_item{
display: inline-block;
vertical-align: top;
// padding: 0 0.5rem;
margin-right: 1.6rem;
margin-bottom: 0.5rem;
&:nth-child(4n){
margin-right: 0;
}
}
.color_content{
width: 9rem;
height:6.2rem
}
.color_content_body{
width: 9rem;
padding: 0.7rem 0.2rem;
background: #FEFEFE;
border: 1px solid #E6E6E6;
.color_des{
font-size: 1rem;
font-family: Roboto;
font-weight: 500;
color: #000000;
margin-bottom: 0.5rem;
line-height: 1.3rem;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
&:last-child{
margin-bottom: 0;
}
}
}
.all_img_item_block{
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
.all_img_content{
max-height: 100%;
max-width: 100%;
&.cover_img{
width: 100%;
height: 100%;
}
}
}
}
}
</style>

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

@@ -203,18 +203,6 @@ export default defineComponent({
designType:'' designType:''
}) })
let workspace:any = ref({}) let workspace:any = ref({})
let sceneList = ref([
{
name:'Pattern',
value:'Pattern'
},{
name:'Slogan',
value:'Slogan'
},{
name:'Logo',
value:'Logo'
},
])
let scene = ref({ let scene = ref({
name:'Pattern', name:'Pattern',
value:'Pattern' value:'Pattern'
@@ -234,7 +222,6 @@ export default defineComponent({
userInfo, userInfo,
useGenerate, useGenerate,
workspace, workspace,
sceneList,
scene, scene,
openMenu, openMenu,
printCatecoryList, printCatecoryList,
@@ -700,6 +687,8 @@ export default defineComponent({
.printMenu{ .printMenu{
margin-right: 0; margin-right: 0;
margin-top: auto; margin-top: auto;
position: relative;
margin-left: 2rem;
>div{ >div{
width: 14rem; width: 14rem;
font-size: var(--aida-fsize1-6); font-size: var(--aida-fsize1-6);
@@ -707,6 +696,8 @@ export default defineComponent({
i{ i{
transition: all .3s; transition: all .3s;
display: inline-block; display: inline-block;
position: absolute;
right: 0;
} }
.forbidden{ .forbidden{
transform: rotate(180deg); transform: rotate(180deg);

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

@@ -23,6 +23,19 @@
> >
<span>{{ $t('SketchboardUpload.Generate') }}</span> <span>{{ $t('SketchboardUpload.Generate') }}</span>
</div> </div>
<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
<div @click.stop="openPrintModel">{{ scene.name }} <i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
<ul v-show="openMenu">
<li
v-for="item,index in sketchStyleList"
class="printModel_item"
@click.stop="setSceneList(item)"
:title="item.value == 'Pattern'?$t('PrintboardUpload.PatternTitle'):
item.value == 'Logo'?$t('PrintboardUpload.LogoTitle'):
item.value == 'Slogan'?$t('PrintboardUpload.SloganTitle'):''"
>{{ item.name }}</li>
</ul>
</div>
</div> </div>
<div v-show="openClick == 1" class="sketchboard_body"> <div v-show="openClick == 1" class="sketchboard_body">
<div class="upload_img_body scroll_style"> <div class="upload_img_body scroll_style">
@@ -113,6 +126,7 @@
v-show="openClick == 3" v-show="openClick == 3"
ref="Generate" ref="Generate"
msg="Sketchboard" msg="Sketchboard"
:scene="scene"
:sketchCatecoryList="sketchCatecoryList" :sketchCatecoryList="sketchCatecoryList"
></Generate> ></Generate>
</div> </div>
@@ -214,6 +228,14 @@ export default defineComponent({
level2Type:'', level2Type:'',
designType:'', designType:'',
}) })
let scene = ref({
name:'Generate Sketch',
value:'generate'
})
let openMenu = ref(false)
let sketchStyleList:any = computed(()=>{
return store.state.UserHabit.SketchGenerateType
})
return { return {
fileList, fileList,
openClick, openClick,
@@ -227,6 +249,9 @@ export default defineComponent({
isTest, isTest,
userInfo, userInfo,
useGenerate, useGenerate,
scene,
openMenu,
sketchStyleList,
}; };
}, },
data() { data() {
@@ -549,6 +574,23 @@ export default defineComponent({
} }
this.store.commit("setSketchboardFile", this.fileList); this.store.commit("setSketchboardFile", this.fileList);
}, },
setSceneList(data:any){
if(this.scene.value === data.value) return
this.scene = data
let generate:any = this.$refs.Generate
generate.sketchboardList = []
generate.searchPictureName = ''
this.openMenu = false
},
openPrintModel(){
if(this.openMenu)return
document.addEventListener('click',this.removePrintModel)
this.openMenu = true
},
removePrintModel(){
this.openMenu = false
document.removeEventListener('click',this.removePrintModel)
}
}, },
}); });
</script> </script>
@@ -610,6 +652,32 @@ export default defineComponent({
margin-right: calc(0.8rem*1.2); margin-right: calc(0.8rem*1.2);
} }
} }
.printMenu{
margin-right: 0;
margin-left: 2rem;
margin-top: auto;
position: relative;
>div{
width: 14rem;
font-size: var(--aida-fsize1-6);
border: 0;
i{
transition: all .3s;
display: inline-block;
position: absolute;
right: 0;
}
.forbidden{
transform: rotate(180deg);
}
}
ul{
width: 14rem;
}
}
.switch_type_item:nth-child(3){
margin: 0;
}
} }
.sketchboard_body { .sketchboard_body {
// height: calc(100% - 5rem*1.2)); // height: calc(100% - 5rem*1.2));

112
src/component/HomePage/generalMenu.vue
View File

@@ -1,16 +1,56 @@
<template> <template>
<div class="generalMenu_printModel"> <div class="generalMenu_printModel">
<div @click.stop="openPrintModel" :class="driverClass.class1">{{ item.label }}</div> <div @click.stop="openPrintModel" :class="driverClass.class1">
<a-popover>
<template #content>
<img style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
</template>
<span v-if="item.label">{{ item.label }}</span>
<span v-else>{{ item.name }}</span>
</a-popover>
</div>
<ul :class="driverClass.class2" v-show="openClick"> <ul :class="driverClass.class2" v-show="openClick">
<li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">{{ item.label }}</li> <li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">
<a-popover placement="right">
<template #content>
<img v-if="item.img != -1" style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
<div v-else-if="item.img == -1" class="generalMenu_printModel_upload ">
<i class="fi fi-br-upload input_border" style="width: 8rem; height: 8rem;padding: 0;" :title="$t('Generate.uploadTitle')">
<a-upload
style="height: 100%;"
class="search_upImg"
:capture="null"
:action="uploadUrl + '/api/element/upload'"
list-type="picture-card"
:data="{
...upload,
}"
:maxCount='1'
:headers="{ Authorization: token }"
accept=".jpg,.png,.jpeg,.bmp"
@change="(file) => fileUploadChange(file)"
>
</a-upload>
</i>
</div>
</template>
<span v-if="item.label">{{ item.label }}</span>
<span v-else>{{ item.name }}</span>
</a-popover>
</li>
</ul> </ul>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent,ref ,nextTick} from "vue"; import { defineComponent,ref ,nextTick} from "vue";
import { Https } from "@/tool/https"; import { useStore } from "vuex";
import { Https } from "@/tool/https";
import { openGuide,driverObj__ } from "@/tool/guide"; import { openGuide,driverObj__ } from "@/tool/guide";
import { getUploadUrl } from "@/tool/util";
import { getCookie } from "@/tool/cookie";
import { message, Upload, Modal } from "ant-design-vue";
export default defineComponent({ export default defineComponent({
name:'filterComponent', name:'filterComponent',
props:{ props:{
@@ -37,7 +77,7 @@
setup(props:any,{emit}){ setup(props:any,{emit}){
let selectIndex = ref(0) let selectIndex = ref(0)
let openClick = ref(false) let openClick = ref(false)
let store = useStore();
let openPrintModel = ()=>{ let openPrintModel = ()=>{
document.addEventListener('click',removePrintModel) document.addEventListener('click',removePrintModel)
openClick.value = true openClick.value = true
@@ -48,7 +88,10 @@
}) })
} }
let setprintModel = (item:any,index:any)=>{ let setprintModel = (item:any,index:any)=>{
console.log(item.img);
if(props.deleteItem == index) return if(props.deleteItem == index) return
if(item.img == -1) return
openClick.value = false openClick.value = false
selectIndex = index selectIndex = index
nextTick().then(()=>{ nextTick().then(()=>{
@@ -62,15 +105,69 @@
openClick.value = false openClick.value = false
document.removeEventListener('click',removePrintModel) document.removeEventListener('click',removePrintModel)
} }
let fileUploadChange = (data: any)=>{
let file = data.file;
let bor = true
if (file.status === "done") {
let res = JSON.parse(file.xhr.response);
if(res.errCode == 0){
file.type_ = "upload";
props.dataList.forEach((item:any)=>{
if(item.img == -1){
item.img = res.data.url
item.id = res.data.id
}
})
}else{
bor = false
}
} else if (file.status === "error") {
bor = false
}
if(!bor){
let res:any = JSON.parse(file.xhr.response);
// props.dataList.forEach((item:any)=>{
// if(item.img == -1){
// }
// })
message.warning(res.errMsg);
}
}
return { return {
selectIndex, selectIndex,
openClick, openClick,
store,
setprintModel, setprintModel,
openPrintModel, openPrintModel,
fileUploadChange,
} }
}, },
data(prop) {
return {
upload: {
isPin: 0,
gender:'',
level1Type: 'Sketchboard',
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
},
token: "",
uploadUrl: "",
type_: {
type1: "generate",
type2: 'Sketchboard',
},
workspaceCom:{},
isTextarea:false,
isInputFocus:false,
};
},
mounted() {
this.uploadUrl = getUploadUrl();
this.token = getCookie("token") || "";
this.upload.gender = this.store?.state?.Workspace?.workspace?.sexEnum?.value
}
}); });
</script> </script>
<style lang="less"> <style lang="less">
@@ -122,4 +219,9 @@
} }
} }
} }
.generalMenu_printModel_upload{
>i{
justify-content: center;
}
}
</style> </style>

32
src/component/HomePage/layout.vue
View File

@@ -30,7 +30,7 @@
</div> </div>
<div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent"> <div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent">
<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="index" @mousedown="setpitch(item,index)" @touchstart="setpitch(item,index)" ref="content" > <div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="index" @mousedown="setpitch(item,index)" @touchstart="setpitch(item,index)" ref="content" >
<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':item.angle?`translate(-50%, -50%) scale(${item.zoom}) rotateZ(${item.angle}deg)`:`translate(-50%, -50%) scale(${item.zoom})`}" draggable="false" :class="moodbClassName[index]" v-modelImg> <img crossOrigin="anonymous" :src="item.imgUrl" :style="{'transform':item.angle?`translate(-50%, -50%) scale(${item.zoom}) rotateZ(${item.angle}deg)`:`translate(-50%, -50%) scale(${item.zoom}) rotateZ(${item.angle}deg)`}" draggable="false" :class="moodbClassName[index]" v-modelImg>
<div> <div>
</div> </div>
@@ -39,7 +39,7 @@
<li class="layout_btn_bottom" v-compile.stop="'bottom'"></li> <li class="layout_btn_bottom" v-compile.stop="'bottom'"></li>
<li class="layout_btn_left" v-compile.stop="'left'"></li> <li class="layout_btn_left" v-compile.stop="'left'"></li>
<li class="layout_btn_right" v-compile.stop="'right'"></li> <li class="layout_btn_right" v-compile.stop="'right'"></li>
<li class="layout_rotote" v-rotote.stop='item'></li> <li class="layout_rotote" v-rotote.stop='item' :style="{'transform':`translate(-50%, -50%) rotateZ(${item.angle}deg)`}"></li>
<li class="layout_translate" v-translate.stop></li> <li class="layout_translate" v-translate.stop></li>
<!-- <li class="layout_translate" v-translate.stop></li> --> <!-- <li class="layout_translate" v-translate.stop></li> -->
<li class="layout_angle_tr" v-angle.stop = "'top'"></li> <li class="layout_angle_tr" v-angle.stop = "'top'"></li>
@@ -372,7 +372,7 @@ export default defineComponent({
mounted(el,item){ mounted(el,item){
let mouse = true; let mouse = true;
let angle :any = 0 let angle :any = 0
let num:any let num:any = 1
let x = 0 let x = 0
let y = 0 let y = 0
let elParent = el.parentNode.parentNode let elParent = el.parentNode.parentNode
@@ -391,6 +391,8 @@ export default defineComponent({
var info = el.getBoundingClientRect(); var info = el.getBoundingClientRect();
let eX = info.x + info.width / 2; let eX = info.x + info.width / 2;
let eY = info.y + info.height / 2; let eY = info.y + info.height / 2;
num = item.value.zoom?item.value.zoom :1
angle = item.value.angle?item.value.angle:0
let mouseMove = function(event:MouseEvent){ let mouseMove = function(event:MouseEvent){
let e:any = getMousePosition(event,false) let e:any = getMousePosition(event,false)
mouseMoveOperation(e) mouseMoveOperation(e)
@@ -406,8 +408,7 @@ export default defineComponent({
let x:any = e.clientX - X let x:any = e.clientX - X
let y:any = Y - e.clientY let y:any = Y - e.clientY
angle = Math.atan2(x,y)*(180 / Math.PI) angle = Math.atan2(x,y)*(180 / Math.PI)
elParent.firstElementChild.style.transform = "translate(-50%,-50%) scale("+ num + ") rotateZ("+ angle + "deg)" item.value.angle = angle
el.style.transform = "translate(-50%,-50%) rotateZ("+ angle + "deg)"
} }
}; };
@@ -432,25 +433,9 @@ export default defineComponent({
let timeSwitch = true let timeSwitch = true
el.parentNode.addEventListener('mousemove', (e:MouseEvent) => { el.parentNode.addEventListener('mousemove', (e:MouseEvent) => {
el.parentNode.addEventListener('mousewheel',(e:MouseEvent) => { el.parentNode.addEventListener('mousewheel',(e:MouseEvent) => {
if(document.defaultView){ num = item.value.zoom?item.value.zoom :1
let transform = document.defaultView.getComputedStyle(elParent.firstElementChild, null).transform.split('(')[1].split(',') angle = item.value.angle?item.value.angle:0
num = Number(transform[3])
}
if(timeSwitch){ if(timeSwitch){
if(angle == 0){
function getRotationAngle(transformDom:any) {
if (!transformDom || transformDom === 'none') return null;
let transform = window.getComputedStyle(transformDom).transform;
const values = transform?.match(/matrix\(([^)]+)\)/);
if (values) {
const matrix = values[1].split(',').map(Number);
const angle = Math.atan2(matrix[1], matrix[0]) * (180 / Math.PI);
return angle >= 0 ? angle : angle + 360; // 确保角度为正值
}
return null;
}
angle = getRotationAngle(elParent.firstElementChild);
}
timeSwitch = false timeSwitch = false
if((e as WheelEvent).deltaY > 0){ if((e as WheelEvent).deltaY > 0){
if(num <= 1){ if(num <= 1){
@@ -477,7 +462,6 @@ export default defineComponent({
let instance:any = item.instance let instance:any = item.instance
instance.moodItemScale = num * 100 instance.moodItemScale = num * 100
item.value.zoom = num item.value.zoom = num
elParent.firstElementChild.style.transform = "translate(-50%,-50%) scale("+ num + ") rotateZ("+ angle + "deg)"
} }
}); });
}); });

58
src/component/HomePage/scaleImage.vue
View File

@@ -102,15 +102,14 @@
</div> </div>
<div class="scaleImage_content_imgBox" :class="{active:isComparison}"> <div class="scaleImage_content_imgBox" :class="{active:isComparison}">
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl"> <img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
<img :src="scaleImageList[scaleImageIndex]?.imgUrl"> <generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl">
<div class="img_operate_block" v-if="isLike"> <div class="img_operate_block" v-if="isLike">
<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i> <i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i> <i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
</div> </div>
</div> </div>
</div> </div>
<div class="scaleImage_nav" @keydown="handleKeyDown"> <div class="scaleImage_nav" @keydown="handleKeyDown">
<div class="nav_left"> <div class="nav_left">
<i class="fi fi-rr-arrow-small-left" @click="lastStep()"></i> <i class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
@@ -124,18 +123,9 @@
<i class="fi fi-rr-arrow-small-right" @click.stop="nextStep()"></i> <i class="fi fi-rr-arrow-small-right" @click.stop="nextStep()"></i>
</div> </div>
</div> </div>
<!-- <div> <div class="mark_loading" v-show="loadingShow">
<a-button type="primary" @click="() => setVisible(true)">show image preview</a-button> <a-spin size="large" />
<a-image </div>
:width="200"
:style="{ display: 'none' }"
:preview="{
visible,
onVisibleChange: setVisible,
}"
src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
/>
</div> -->
</a-modal> </a-modal>
</template> </template>
@@ -147,7 +137,9 @@ import { useStore } from "vuex";
import { downloadIamge } from "@/tool/util"; import { downloadIamge } from "@/tool/util";
import { getCookie,setCookie } from "@/tool/cookie"; import { getCookie,setCookie } from "@/tool/cookie";
import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue";
export default defineComponent({ export default defineComponent({
components:{generalMiniCanvas},
props:{ props:{
productData:{ productData:{
type:Object, type:Object,
@@ -156,7 +148,16 @@ export default defineComponent({
brightenValue:1, brightenValue:1,
upload:'', upload:'',
}, },
} },
isCanvas:{
type:Boolean,
default:false,
},
workspace:{
type:Object,
default:{
}
},
}, },
setup(props:any,{emit}) { setup(props:any,{emit}) {
const store = useStore(); const store = useStore();
@@ -298,6 +299,27 @@ export default defineComponent({
}); });
} }
} }
let submitBase64Data = (rv:any)=>{
loadingShow.value = true
let data = {
"base64": rv,
"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue,
"gender": props.workspace.sexEnum.value,
}
Https.axiosPost(Https.httpUrls.modifySketch, data).then(
(rv) => {
rv.imgUrl = rv.url
rv.status = 'Success'
rv.category = scaleImageList.value[scaleImageIndex.value]?.category
rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue
delete rv.url
scaleImageList.value.unshift(rv)
loadingShow.value = false
}
).catch(res=>{
loadingShow.value = false
});
}
return { return {
...toRefs(productimg), ...toRefs(productimg),
scaleImage, scaleImage,
@@ -313,6 +335,7 @@ export default defineComponent({
robotAssits, robotAssits,
getPrductimg, getPrductimg,
removeProductimg, removeProductimg,
submitBase64Data,
}; };
}, },
data() { data() {
@@ -447,6 +470,7 @@ export default defineComponent({
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
z-index: 2;
.operate_icon{ .operate_icon{
font-size: 1.8rem; font-size: 1.8rem;
color: #fff; color: #fff;
@@ -464,7 +488,7 @@ export default defineComponent({
} }
.scaleImage_content:hover{ .scaleImage_content_imgBox:hover{
.img_operate_block{ .img_operate_block{
opacity: 1; opacity: 1;
} }

1525
src/component/modules/generalCanvas.vue Normal file
View File

File diff suppressed because it is too large Load Diff

511
src/component/modules/generalMiniCanvas.vue Normal file
View File

@@ -0,0 +1,511 @@
<template>
<div class="generalMiniCanvas">
<div class="addDetails_canvasCenter">
<div class="generalMiniCanvas_btn generalMiniCanvas_item" :class="{spread:spreadState}">
<!-- <div @click="setOperation('')" class="generalMiniCanvas_btn_item">
<div>新增</div>
</div> -->
<i class="icon iconfont icon-chehui" @click="historyState('')"></i>
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')"></i>
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:canvasState == 'move'}"></i>
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:canvasState == 'pencil'}"></i>
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:canvasState == 'eraser'}"></i>
<input type="range" v-show="canvasState != 'move'" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
<!-- <div class="icon iconfont icon-xiala" :class="{btnRotate:spreadState}" @click="()=>spreadState = !spreadState"></div> -->
</div>
<div class="exportCanvasBox_center_box">
<div class="exportCanvasBox_center">
<!-- <div class="editFrontBack_bgImg" v-show="loadingShow">
<img :src="imgData?.undividedLayer" alt="">
</div> -->
</div>
<div class="editFrontBack_pencilbtn" v-show="loadingShow" :style="pencilbtnStyle"></div>
</div>
</div>
<div class="exportCanvasBox_submit" @click="setSubmit">
<div class="started_btn">
{{ $t('addDetails.submit') }}
</div>
</div>
</div>
</template>
<script>
import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs } from "vue";
import { Https } from "@/tool/https";
import { formatTime } from "@/tool/util";
import { setCookie, getCookie } from "@/tool/cookie";
import { Modal, message } from "ant-design-vue";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import allOrder from "@/component/Pay/allOrder.vue";
import creditsDetail from "@/component/Pay/creditsDetail.vue";
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
import { useI18n } from "vue-i18n";
import canvasGeneral from "@/tool/canvasGeneral";
import { getMousePosition } from "@/tool/mdEvent";
export default defineComponent({
components: {
creditsDetail,
allOrder,
},
emits: ['submitBase64Data'],
props: {
imgUrl: {
type: String,
default: ''
},
},
// watch: {
// // imgUrl: function(newVal, oldVal) {
// // console.log(newVal);
// // // 当propertyName数据发生变化时，执行相应的操作
// // }
// imgUrl(newVal, oldVal) {
// console.log(`imgUrl changed from ${oldVal} to ${newVal}`);
// },
// },
setup(props,{emit}) {
let presentState = ref('paypal');
let showPayOrder = ref(false);
let loadingShow = ref(false);
let { t } = useI18n();
let canvas = reactive({});
let scale = 2;
let ratio = [1,1]
let exportWH = 512
let pencilbtnStyle = ref({
background:'',
width:0+'px',
height:0+'px',
display:'none',
left:0+'px',
top:0+'px',
})
let canvasBtn = reactive({
canvasState:'move',
canvasPencilWidth:{
pencil:4,
eraser:4,
},
spreadState:false,
})
let canvasWH = ref(0);
watch(
() => props.imgUrl,
(newValue, oldValue) => {
init()
})
onMounted(()=>{
init()
})
let reverseCanvasState = ref([])//存放canvas操作
let normalCanvasState = ref([])//存放canvas操作
let canvasState = ref()//存放canvas操作
let keyDown = []//监听键盘的 keydown 和 keyup 事件
let init = ()=>{
normalCanvasState.value = []
reverseCanvasState.value = []
showPayOrder.value = true;
ratio = [1,1]
nextTick(()=>{
let canvasBox = document.querySelector(".generalMiniCanvas .exportCanvasBox_center");
document.removeEventListener('mousemove', mouseMove);
document.removeEventListener('touchmove', touchmove);
let img = new Image();
img.onload = function(){
loadingShow.value = true
let height = canvasBox.offsetHeight;
canvasWH.value = height
// canvasBox.style.width = height+'px'
let wScale = 1
let hScale = 1
if(img.width>img.height){
hScale = img.height/img.width
exportWH = img.width
}else{
wScale = img.width/img.height
exportWH = img.height
}
ratio = [wScale,hScale]
canvas = canvasGeneral.canvasInit(canvasBox,{
width:canvasWH.value * wScale,
height:canvasWH.value * hScale,
})
scale = img.height/canvas.height
pencilbtnStyle.value.background = rgba
fabric.Object.prototype.cornerSize = 10
fabric.Object.prototype.transparentCorners = false
fabric.Image.fromURL(props.imgUrl, function(img) {
// 设置背景图对象的宽度和高度与 canvas 相同
img.scaleToWidth(canvas.width);
img.scaleToHeight(canvas.height);
img.set({
scaleX: canvas.width / img.width,
scaleY: canvas.height / img.height
});
// 将背景图添加到 canvas 的底层
canvas.setBackgroundImage(img, canvas.renderAll.bind(canvas));
if(!fabric.Object.prototype.controls.deleteControl){
JSSetRemoveImage(deleteObj)
}else{
fabric.Object.prototype.controls.deleteControl.mouseUpHandler = deleteObj
}
setPencilWidth()
updateCanvasState()
},{ crossOrigin: "Anonymous" });
// 鼠标抬起事件
canvas.on('mouse:up', function(event) {
if(canvasBtn.canvasState != 'move'){
updateCanvasState('mouseUp')
}
});
//画布上移动
document.addEventListener('mousemove', mouseMove);
document.addEventListener('touchmove', touchmove);
setOperation('pencil')
img.remove()
}
img.src = props.imgUrl
})
}
let canvasKeyDown = (event) => {
if(keyDown.indexOf(event.key)>-1){
}else{
keyDown.push(event.code)
if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){
historyState('reverse')
}else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1){
historyState('')
}
}
}
let canvasKeyUp = (event) =>{
keyDown = keyDown.filter(function(item) {
return event.code !== item;
})
}
let clearCanvas = ()=>{
canvasBtn.canvasState = 'move'
canvasBtn.spreadState = false
document.removeEventListener("keydown", canvasKeyDown);
document.removeEventListener("keyup", canvasKeyUp);
}
let rgba = 'rgba(0, 0, 0, 1)'
let mouseMove = (event)=>{
let e = getMousePosition(event,false)
setCanvasMove(e)
}
let touchmove = (event)=>{
let e = getMousePosition(event,true)
setCanvasMove(e)
}
let setCanvasMove = (event)=>{
if(canvas.isDrawingMode){
canvas.setCursor('none');
}
let canvasCenterBox = document.querySelector(".generalMiniCanvas .exportCanvasBox_center_box");
if(!canvasCenterBox)return
let parentX = event.clientX - canvasCenterBox.getBoundingClientRect().left
let parentY = event.clientY - canvasCenterBox.getBoundingClientRect().top
pencilbtnStyle.value.left = parentX + "px"
pencilbtnStyle.value.top = parentY+'px'
}
let setOperation = (str)=>{
canvasBtn.canvasState = str
if(str == 'move'){
setMove()
pencilbtnStyle.value.display = `none`
}else if(str == 'pencil'){
setPencil()
pencilbtnStyle.value.display = `block`
}else if(str == 'eraser'){
setEraser()
pencilbtnStyle.value.display = `block`
}
}
let setMove = ()=>{
canvas.isDrawingMode = false
canvas.forEachObject((obj) =>obj.selectable = true);
}
let setPencil = ()=>{
canvas.isDrawingMode = true//开启绘画模式
canvas.freeDrawingBrush = new fabric.PencilBrush(canvas,{});
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
canvas.freeDrawingBrush.color = rgba
pencilbtnStyle.value.background = rgba
canvas.freeDrawingBrush.isEraser = false
setPencilWidth()
}
let setEraser = ()=>{
canvas.isDrawingMode = true
let eraser = new fabric.EraserBrush(canvas)
canvas.freeDrawingBrush = eraser
canvas.requestRenderAll();
canvas.freeDrawingBrush.isEraser = true
pencilbtnStyle.value.background = `rgb(255,255,255)`
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
setPencilWidth()
}
let deleteObj = ()=> {
// if(!canvas.getActiveObjects()){
// return
// }
let target = canvas.getActiveObjects()
target.forEach((item)=>{
canvas.fxRemove(item, {
onComplete(){
canvas.discardActiveObject(); // 丢弃当前选中的对象
canvas.renderAll(); // 重新渲染 Canvas
}
})
canvas.FX_DURATION = 300
})
}
let setTimeOutWidth
let setPencilWidth = ()=>{//切换颜色给铅笔设置颜色
clearTimeout(setTimeOutWidth)
setTimeOutWidth = setTimeout(()=>{
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState])
pencilbtnStyle.value.height = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
},300)
}
let updateCanvasState = (str) =>{
if(str != 'mouseUp'){
}
const canvasAsJson = JSON.stringify(canvas.toJSON());
normalCanvasState.value.push(canvasAsJson);
}
//撤回
let historyState = (str)=> {
if(str == 'reverse' && reverseCanvasState.value.length > 0){//反撤回
let obj = reverseCanvasState.value.pop()
// canvasState.value = reverseCanvasState.value[reverseCanvasState.value.length-1]
canvasState.value = obj
normalCanvasState.value.push(obj);
}else if(str == '' && normalCanvasState.value.length > 1){
let obj = normalCanvasState.value.pop()
canvasState.value = normalCanvasState.value[normalCanvasState.value.length-1]
reverseCanvasState.value.push(obj);
}else{
return
}
canvas.loadFromJSON(canvasState.value, () => {});
}
let setSubmit = ()=>{
var allObjects = canvas.getObjects('path');
// if(allObjects.length == 0){
// return message.info(t('addDetails.jsContent1'))
// }
var canvasDom = document.createElement("canvas");
let exportCanvas = new fabric.Canvas(canvasDom, {
backgroundColor: "rgba(255, 255, 255,1)",
width: exportWH * ratio[0],
height: exportWH * ratio[1],
isDrawingMode: false, // 开启绘图模式
});
canvas.backgroundImage.clone((back)=>{
back.set({
scaleX:1,
scaleY:1,
left:back.left*scale,
top:back.top*scale ,
})
exportCanvas.backgroundImage = back
allObjects.forEach((item,index)=>{
// let obj = fabric.util.object.clone(item);
if(item.type == 'circle')return
let obj
item.clone((cloned)=>{
obj = cloned
})
obj.set(
{
scaleX:(item.scaleX?item.scaleX:1)*scale,
scaleY:(item.scaleY?item.scaleY:1)*scale,
left:item.left*scale,
top:item.top*scale,
}
)
exportCanvas.add(obj)
})
let data = exportCanvas.toDataURL('jpg')
cancelDsign()
clearCanvas()
emit('submitBase64Data',data)
})
}
let cancelDsign = ()=>{
document.removeEventListener('keydown',canvasKeyDown);
document.removeEventListener('keyup', canvasKeyUp);
showPayOrder.value = false
}
return {
presentState,
showPayOrder,
loadingShow,
t,
pencilbtnStyle,
...toRefs(canvasBtn),
init,
setOperation,
setPencilWidth,
historyState,
setSubmit,
cancelDsign,
};
},
data() {
return {
};
},
mounted() {},
methods: {
},
});
</script>
<style lang="less">
.generalMiniCanvas{
position: relative;
// width: calc(512px / 2);
// width: 256px;
height: 100%;
display: flex;
flex-direction: column;
// height: calc(512px / 2);
margin: 0 auto;
.generalMiniCanvas_item{
// position: relative;
background: #fff;
position: absolute;
display: flex;
border: 0.2rem solid #c4c4c4;
width: 25rem;
border-radius: 4px; /* 设置圆角半径 */
flex-wrap: wrap;
.generalMiniCanvas_btn_item{
display: flex;
align-items: center;
padding: 1rem 0;
}
}
.generalMiniCanvas_btn{
z-index: 2;
// left: 50%;
min-width: 45rem;
// transform: translate(-50%,-135%);
// transition: all .3s;
padding: 1rem 1.5rem;
// transform: translate(-50%,0);
position: relative;
width: 100%;
flex-direction: row;
input{
// width: 100%;
// margin-top: 1rem;
flex: 1;
}
.icon-xiala{
position: absolute;
width: 2rem;
bottom: 0;
transform: translate(-50%, 90%);
left: 50%;
width: 6rem;
background: #fff;
text-align: center;
cursor: pointer;
&.icon-xiala::before{
transition: all .3s;
}
&.btnRotate::before{
transform: rotate(180deg);
display: block;
}
}
i{
font-size: 2.5rem;
cursor: pointer;
width: 4rem;
height: 4rem;
display: flex;
align-items: center;
justify-content: center;
&.active{
border: 1px solid;
border-radius: .4rem;
}
}
&.spread{
transform: translate(-50%,0);
}
}
.addDetails_canvasCenter{
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
position: relative;
margin: 0 auto;
}
.exportCanvasBox_center_box{
padding: 3rem;
height: 100%;
flex: 1;
position: relative;
width: 100%;
background: #e6e6e6;
&:hover{
cursor: none;
}
.editFrontBack_pencilbtn{
position: absolute;
z-index: 1;
border-radius: 50%;
border: 1px solid #000;
pointer-events: none;
transform: translate(-50%,-50%);
}
}
.exportCanvasBox_center{
height: 100%;
flex: 1;
position: relative;
overflow: hidden;
background: #e6e6e6;
// overflow: scroll;
.canvas-container{
left: 50%;
top: 50%;
transform: translate(-50%,-50%);
}
.editFrontBack_pencilbtn{
position: absolute;
z-index: 1;
border-radius: 50%;
border: 1px solid #000;
pointer-events: none;
transform: translate(-50%,-50%);
}
}
.exportCanvasBox_center:hover{
.generalMiniCanvas_btn{
// transform: translate(-50%,-101%);
// &.spread{
// transform: translate(-50%,0);
// }
}
}
}
.exportCanvasBox_submit{
margin-top: 1rem;
text-align: center;
}
</style>

284
src/component/modules/liquefaction.vue Normal file
View File

@@ -0,0 +1,284 @@
<template>
<a-modal
class="liquefaction generalModel"
v-model:visible="liqufeaction"
:footer="null"
width="50%"
:maskClosable="false"
:centered="true"
:closable="false"
wrapClassName="#app"
:keyboard="false"
>
<div class="generalModel_btn">
<div class="generalModel_closeIcon" @click.stop="cancelDsign()">
<i class="fi fi-rr-cross-small"></i>
</div>
</div>
<div class="liquefaction_center">
</div>
</a-modal>
<!-- <div class="mark_loading" v-show="loadingShow">
<a-spin size="large" />
</div> -->
</template>
<script>
import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs } from "vue";
import { Https } from "@/tool/https";
import { formatTime } from "@/tool/util";
import { setCookie, getCookie } from "@/tool/cookie";
import { Modal, message } from "ant-design-vue";
import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
import allOrder from "@/component/Pay/allOrder.vue";
import creditsDetail from "@/component/Pay/creditsDetail.vue";
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JSSetRemoveImage,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
import { useI18n } from "vue-i18n";
import { getMousePosition } from "@/tool/mdEvent";
export default defineComponent({
components: {
creditsDetail,
allOrder,
},
emits: ['setSloganData'],
setup(props,{emit}) {
let presentState = ref('paypal');
let liqufeaction = ref(false);
let loadingShow = ref(false);
let { t } = useI18n();
let canvas = reactive({});
let scale = 2;
let ratio = [1,1]
let exportWH = 512
let pencilbtnStyle = ref({
background:'',
width:0+'px',
height:0+'px',
display:'none',
left:0+'px',
top:0+'px',
})
let canvasBtn = reactive({
canvasState:'move',
canvasPencilWidth:{
pencil:4,
eraser:4,
},
spreadState:false,
})
let canvasWH = ref(0);
onMounted(()=>{
})
let exportUrl = ''
let reverseCanvasState = ref([])//存放canvas操作
let normalCanvasState = ref([])//存放canvas操作
let canvasState = ref()//存放canvas操作
let keyDown = []//监听键盘的 keydown 和 keyup 事件
let init = (data)=>{
console.log(data);
console.log(123);
}
let canvasKeyDown = (event) => {
if(keyDown.indexOf(event.key)>-1){
}else{
keyDown.push(event.code)
if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){
historyState('reverse')
}else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1){
historyState('')
}
}
}
let canvasKeyUp = (event) =>{
keyDown = keyDown.filter(function(item) {
return event.code !== item;
})
}
let clearCanvas = ()=>{
canvasBtn.canvasState = 'move'
canvasBtn.spreadState = false
document.removeEventListener("keydown", canvasKeyDown);
document.removeEventListener("keyup", canvasKeyUp);
}
let rgba = 'rgba(0, 0, 0, 1)'
let mouseMove = (event)=>{
let e = getMousePosition(event,false)
setCanvasMove(e)
}
let touchmove = (event)=>{
let e = getMousePosition(event,true)
setCanvasMove(e)
}
let setCanvasMove = (event)=>{
if(canvas.isDrawingMode){
canvas.setCursor('none');
}
let canvasCenterBox = document.querySelector(".liquefaction .exportCanvasBox_center_box");
if(!canvasCenterBox)return
let parentX = event.clientX - canvasCenterBox.getBoundingClientRect().left
let parentY = event.clientY - canvasCenterBox.getBoundingClientRect().top
pencilbtnStyle.value.left = parentX + "px"
pencilbtnStyle.value.top = parentY+'px'
}
let setOperation = (str)=>{
canvasBtn.canvasState = str
if(str == 'move'){
setMove()
pencilbtnStyle.value.display = `none`
}else if(str == 'pencil'){
setPencil()
pencilbtnStyle.value.display = `block`
}else if(str == 'eraser'){
setEraser()
pencilbtnStyle.value.display = `block`
}
}
let setMove = ()=>{
canvas.isDrawingMode = false
canvas.forEachObject((obj) =>obj.selectable = true);
}
let setPencil = ()=>{
canvas.isDrawingMode = true//开启绘画模式
canvas.freeDrawingBrush = new fabric.PencilBrush(canvas,{});
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
canvas.freeDrawingBrush.color = rgba
pencilbtnStyle.value.background = rgba
canvas.freeDrawingBrush.isEraser = false
setPencilWidth()
}
let setEraser = ()=>{
canvas.isDrawingMode = true
let eraser = new fabric.EraserBrush(canvas)
canvas.freeDrawingBrush = eraser
canvas.requestRenderAll();
canvas.freeDrawingBrush.isEraser = true
pencilbtnStyle.value.background = `rgb(255,255,255)`
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]);
setPencilWidth()
}
let deleteObj = ()=> {
// if(!canvas.getActiveObjects()){
// return
// }
let target = canvas.getActiveObjects()
target.forEach((item)=>{
canvas.fxRemove(item, {
onComplete(){
canvas.discardActiveObject(); // 丢弃当前选中的对象
canvas.renderAll(); // 重新渲染 Canvas
}
})
canvas.FX_DURATION = 300
})
}
let setTimeOutWidth
let setPencilWidth = ()=>{//切换颜色给铅笔设置颜色
clearTimeout(setTimeOutWidth)
setTimeOutWidth = setTimeout(()=>{
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState])
pencilbtnStyle.value.height = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
},300)
}
let updateCanvasState = (str) =>{
if(str != 'mouseUp'){
}
const canvasAsJson = JSON.stringify(canvas.toJSON());
normalCanvasState.value.push(canvasAsJson);
}
//撤回
let historyState = (str)=> {
if(str == 'reverse' && reverseCanvasState.value.length > 0){//反撤回
let obj = reverseCanvasState.value.pop()
// canvasState.value = reverseCanvasState.value[reverseCanvasState.value.length-1]
canvasState.value = obj
normalCanvasState.value.push(obj);
}else if(str == '' && normalCanvasState.value.length > 1){
let obj = normalCanvasState.value.pop()
canvasState.value = normalCanvasState.value[normalCanvasState.value.length-1]
reverseCanvasState.value.push(obj);
}else{
return
}
canvas.loadFromJSON(canvasState.value, () => {});
}
let setSubmit = ()=>{
var allObjects = canvas.getObjects('path');
// if(allObjects.length == 0){
// return message.info(t('addDetails.jsContent1'))
// }
var canvasDom = document.createElement("canvas");
let exportCanvas = new fabric.Canvas(canvasDom, {
backgroundColor: "rgba(255, 255, 255,1)",
width: exportWH * ratio[0],
height: exportWH * ratio[1],
isDrawingMode: false, // 开启绘图模式
});
canvas.backgroundImage.clone((back)=>{
back.set({
scaleX:1,
scaleY:1,
left:back.left*scale,
top:back.top*scale ,
})
exportCanvas.backgroundImage = back
allObjects.forEach((item,index)=>{
// let obj = fabric.util.object.clone(item);
if(item.type == 'circle')return
let obj
item.clone((cloned)=>{
obj = cloned
})
obj.set(
{
scaleX:(item.scaleX?item.scaleX:1)*scale,
scaleY:(item.scaleY?item.scaleY:1)*scale,
left:item.left*scale,
top:item.top*scale,
}
)
exportCanvas.add(obj)
})
let data = exportCanvas.toDataURL('jpg')
cancelDsign()
clearCanvas()
emit('setSloganData',data)
})
}
let cancelDsign = ()=>{
document.removeEventListener('keydown',canvasKeyDown);
document.removeEventListener('keyup', canvasKeyUp);
liqufeaction.value = false
}
return {
presentState,
liqufeaction,
loadingShow,
t,
pencilbtnStyle,
...toRefs(canvasBtn),
init,
setOperation,
setPencilWidth,
historyState,
setSubmit,
cancelDsign,
};
},
data() {
return {
};
},
mounted() {},
methods: {
},
});
</script>
<style lang="less" scoped>
.liquefaction {
}
</style>

2
src/lang/cn.ts
View File

@@ -415,6 +415,8 @@ export default {
effectPoor:'当前生成的图像质量低于标准。请考虑调整您的提示词并再次尝试。', effectPoor:'当前生成的图像质量低于标准。请考虑调整您的提示词并再次尝试。',
Model:'模型', Model:'模型',
uploadTitle:'上传参考图', uploadTitle:'上传参考图',
uploadproduct:'上传产品图',
style:'风格',
sloganTitle:'输入文字内容', sloganTitle:'输入文字内容',
jsContent1:"您只能上传图片文件！", jsContent1:"您只能上传图片文件！",
jsContent2:'图片必须小于5MB', jsContent2:'图片必须小于5MB',

2
src/lang/en.ts
View File

@@ -415,6 +415,8 @@ export default {
effectPoor:'The quality of the generated images currently falls below standard. Please consider adjusting your prompt and trying again.', effectPoor:'The quality of the generated images currently falls below standard. Please consider adjusting your prompt and trying again.',
Model:'Model', Model:'Model',
uploadTitle:'Upload reference image', uploadTitle:'Upload reference image',
uploadproduct:'Upload product picture',
style:'Style',
sloganTitle:'Input text content', sloganTitle:'Input text content',
jsContent1:"You can only upload Image file!", jsContent1:"You can only upload Image file!",
jsContent2:'Image must smaller than 5MB!', jsContent2:'Image must smaller than 5MB!',

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

@@ -71,6 +71,8 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles] state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]
}, },
addGenerateMaterialFils(state,data:any){ addGenerateMaterialFils(state,data:any){
console.log(data);
let file let file
let arr let arr
let maxImg = 8 let maxImg = 8

26
src/store/userHabit/userHabit.ts
View File

@@ -13,9 +13,12 @@ interface UserHabit{
FemalePosition:any, FemalePosition:any,
MalePosition:any, MalePosition:any,
Position:any, Position:any,
SketchGenerateType:any,
SketchStyle:any,
systemUser:any, systemUser:any,
userInfo:any, userInfo:any,
messageSystem:any, messageSystem:any,
sex:any,
} }
const userHabit : Module<UserHabit,RootState> = { const userHabit : Module<UserHabit,RootState> = {
@@ -37,7 +40,9 @@ const userHabit : Module<UserHabit,RootState> = {
designElementsType:[], designElementsType:[],
FemalePosition:[], FemalePosition:[],
MalePosition:[], MalePosition:[],
SketchGenerateType:[],
Position:[], Position:[],
SketchStyle:[],
systemUser:{ systemUser:{
value : -1 value : -1
}, },
@@ -48,6 +53,8 @@ const userHabit : Module<UserHabit,RootState> = {
messageNum:0, messageNum:0,
messageType:{}, messageType:{},
}, },
sex:{
},
}, },
mutations:{ mutations:{
res_clothingType(state,data){ res_clothingType(state,data){
@@ -65,6 +72,12 @@ const userHabit : Module<UserHabit,RootState> = {
setFemalePosition(state,data){ setFemalePosition(state,data){
state.FemalePosition = data state.FemalePosition = data
}, },
setSketchGenerateType(state,data){
state.SketchGenerateType = data
},
setSketchStyle(state,data){
state.SketchStyle = data
},
setMalePosition(state,data){ setMalePosition(state,data){
state.MalePosition = data state.MalePosition = data
}, },
@@ -115,7 +128,9 @@ const userHabit : Module<UserHabit,RootState> = {
}else{ }else{
} }
},
setSex(state,data){
state.sex.value = data
}, },
}, },
@@ -150,7 +165,7 @@ const userHabit : Module<UserHabit,RootState> = {
}, },
getLangType(context){ getLangType(context){
let allPromise = []; let allPromise = [];
let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition'] let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition','SketchStyle','SketchGenerateType','Sex']
let axiosGet = (item:any)=>{ let axiosGet = (item:any)=>{
return new Promise((resolve) => { return new Promise((resolve) => {
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => { Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => {
@@ -159,6 +174,7 @@ const userHabit : Module<UserHabit,RootState> = {
let name = item.name let name = item.name
item.name = item.value item.name = item.value
item.value = name item.value = name
item.optype = false
}); });
if(item == 'DesignElementsEnum'){ if(item == 'DesignElementsEnum'){
context.commit('setDesignElementsType',rv) context.commit('setDesignElementsType',rv)
@@ -169,6 +185,12 @@ const userHabit : Module<UserHabit,RootState> = {
}else if(item == 'MalePosition'){ }else if(item == 'MalePosition'){
context.commit('setMalePosition',rv) context.commit('setMalePosition',rv)
context.commit('setPosition','MalePosition') context.commit('setPosition','MalePosition')
}else if(item == 'SketchStyle'){
context.commit('setSketchStyle',rv)
}else if(item == 'SketchGenerateType'){
context.commit('setSketchGenerateType',rv)
}else if(item == 'Sex'){
context.commit('setSex',rv)
} }
resolve('') resolve('')
} }

100
src/tool/canvasDrawing.js
View File

@@ -295,6 +295,102 @@ function JSSetRemoveImage(fun){
cornerSize: 24 cornerSize: 24
}) })
} }
function JSSetGroup(data){
let rect
if(data.gradient){
let colorStops = []
data.gradient.gradientList.forEach(item=>{
let obj = {
offset:item.left.split('%')[0]/100,
color:`rgba(${item.rgba.r},${item.rgba.g},${item.rgba.b},${item.rgba.a})`
}
colorStops.push(obj)
})
let { x0, y0, x1, y1 } = calculateGradientCoordinate(100,120,data.gradient.angle)
let linear = new fabric.Gradient({
type: 'linear', // 线性渐变
// coords: { x1: 0, y1: 0, x2: 200, y2: 0 }, // 渐变方向
coords: { x1:x0, y1:y0, x2:x1, y2:y1 }, // 渐变方向
colorStops: colorStops,
})
var color = new fabric.Rect({
top:0,
left:0,
width: 110,
height: 130,
textAlign: "left",
fill: linear // 设置渐变填充
// fill: `rgb(${data.rgbValue.r},${data.rgbValue.g},${data.rgbValue.b})`,
});
var text = new fabric.Text('',{
left: 0,
top: 0,
fontSize: 0,
fontFamily: "Arial",
textAlign: "left",
fill: "black",
});
let text1 = new fabric.Text('',{
left: 0,
top: 0,
width: 20,
fontSize: 0,
fontFamily: "Arial",
textAlign: "left",
});
rect = {text,text1,color,width:110}
}else{
var text = new fabric.Text(data.tcx,{
left: 0,
top: 60,
fontSize: 14,
fontFamily: "Arial",
textAlign: "left",
fill: "black",
});
let text1 = new fabric.Text(data.name,{
left: 0,
top: 80,
width: 20,
fontSize: 14,
fontFamily: "Arial",
textAlign: "left",
});
let width = 110 > text1.width ? 110 : text1.width;
var color = new fabric.Rect({
width: width,
height: 60,
textAlign: "left",
fill: `rgb(${data.rgbValue.r},${data.rgbValue.g},${data.rgbValue.b})`,
});
rect = {text,text1,color,width}
}
return rect
}
function JSSetPencil(str,canvas){
let pencil
if(str == 'PencilBrush'){
pencil = new fabric.PencilBrush(canvas,{}); //普通笔
}else if(str == 'Marking'){
pencil = new fabric.PencilBrush(canvas,); //记号笔
}else if(str == 'InkBrush'){
pencil = new fabric.InkBrush(canvas,{}); //油画笔
}else if(str=='CrayonBrush'){
pencil = new fabric.CrayonBrush(canvas,{}); //蜡笔
}else if(str == 'RibbonBrush'){
pencil = new fabric.RibbonBrush(canvas,{width: 1,}); //色带
}else if(str == 'MarkerBrush'){
pencil = new fabric.MarkerBrush(canvas,{}); //书写笔
// pencil = new fabric.PenBrush(canvas,{}); //书写笔
}else if(str == 'WritingBrush'){
pencil = new fabric.WritingBrush(canvas,{}); //毛笔
}else if(str == 'LongfurBrush'){
pencil = new fabric.LongfurBrush(canvas,{width: 1,}); //色带
}else if(str == 'SpraypaintBrush'){
pencil = new fabric.SpraypaintBrush(canvas,{}); //长毛刷
}
return pencil
}
export { export {
multiselectJS, multiselectJS,
JSRectUpdata, JSRectUpdata,
@@ -304,5 +400,7 @@ export {
JScreateCheck, JScreateCheck,
exportSele, exportSele,
JSSetTexture, JSSetTexture,
JSSetRemoveImage JSSetRemoveImage,
JSSetGroup,
JSSetPencil,
} }

239
src/tool/canvasGeneral.js Normal file
View File

@@ -0,0 +1,239 @@
import {
exportSele,
JSRectUpdata,
JSchangeType,
JScanvasMouseDown,
JScanvasMouseMove,
JScreateCheck,
JSSetTexture,
JSSetRemoveImage,
} from "@/tool/canvasDrawing";
class myCanvas {
constructor() {
this.canvasDomParent = null;
this.canvas = null;
this.canvasDom = null;
this.pencilBtn = null;
this.pencilType = null;
this.keyDown = [];//键盘按下
this._clipboard = null; //剪切板
this.isLoadCanvas = false//撤回或者反撤回false为撤回
this.reverseCanvasState=[];//撤回
this.normalCanvasState=[];//反撤回
this.canvasState = {}//当前内容
this.pencilList = {
textFontFamilyList:[
{ value: 'Arial', name: 'select font' },
{ value: 'EN_slogan_art1', name: 'select font' },
{ value: 'EN_slogan_art2', name: 'select font' },
{ value: 'EN_slogan_art3', name: 'select font' },
{ value: 'EN_slogan_art4', name: 'select font' },
{ value: 'EN_slogan_art5', name: 'select font' },
{ value: 'EN_slogan_art6', name: 'select font' },
{ value: 'EN_slogan_art7', name: 'select font' },
{ value: '微软雅黑', name: '请选择字体' },
{ value: 'CN_slogan_art1', name: '请选择字体' },
{ value: 'CN_slogan_art2', name: '请选择字体' },
{ value: 'CN_slogan_art3', name: '请选择字体' },
{ value: 'CN_slogan_art4', name: '请选择字体' },
{ value: '华文行楷', name: '请选择字体' },
{ value: '隶书', name: '请选择字体' },
],
brushList:[
{
value:'PencilBrush',
url:'/image/brush/PencilBrush.jpg'
},{
value:'Marking',
url:'/image/brush/PencilBrush-2.jpg'
},{
value:'InkBrush',
url:'/image/brush/InkBrush.jpg'
},{
value:'CrayonBrush',
url:'/image/brush/CrayonBrush.jpg'
},{
value:'RibbonBrush',
url:'/image/brush/RibbonBrush.jpg'
},{
value:'MarkerBrush',
url:'/image/brush/MarkerBrush.jpg'
},{
value:'WritingBrush',
url:'/image/brush/WritingBrush.jpg'
},{
value:'LongfurBrush',
url:'/image/brush/LongfurBrush.jpg'
},{
value:'SpraypaintBrush',
url:'/image/brush/SpraypaintBrush.jpg'
},
]
}
}
canvasInit(dom, val) {
this.canvasDomParent = dom;
this.canvasClear()
var canvasDom = document.createElement("canvas");
this.canvasDomParent.appendChild(canvasDom);
this.canvas = new fabric.Canvas(canvasDom, {
backgroundColor: "rgba(255, 255, 255)",
width: val.width?val.width:this.canvasDomParent.getBoundingClientRect().width,
height: val.height?val.height:this.canvasDomParent.getBoundingClientRect().height,
isDrawingMode: val.isDrawingMode, // 开启绘图模式
});
if(!fabric.Object.prototype.controls.deleteControl){//设置元素删除
JSSetRemoveImage(this.deleteObject)
}else{
fabric.Object.prototype.controls.deleteControl.mouseUpHandler = this.deleteObject
}
this.canvas.on("object:modified", ()=>{
this.updateCanvasState('')
});
this.canvasKeyDown = this.canvasKeyDown.bind(this);
this.canvasKeyUp = this.canvasKeyUp.bind(this);
document.addEventListener("keydown", this.canvasKeyDown);
document.addEventListener("keyup", this.canvasKeyUp);
initAligningGuidelines(this.canvas,true)
JSchangeType(this.canvas,'init')
this.updateCanvasState('')
this.canvas.on("object:added", (event)=>{
if(!this.isLoadCanvas)this.updateCanvasState('')
});
return this.canvas
}
canvasKeyUp(event){
this.keyDown = this.keyDown.filter(function(item) {
return event.code !== item;
})
}
canvasKeyDown(event){
if(this.keyDown.indexOf(event.key)>-1){
}else{
this.keyDown.push(event.code)
if(event.key === 'Enter' && operation.value == 'fold'){
foldEnd('Enter')
}else if(event.key === 'Delete'){
deleteObject()
}else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyZ') > -1 && this.keyDown.indexOf('ShiftLeft') > -1){
this.historyState('reverse')
}else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyZ') > -1){
this.historyState('')
}else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyC') > -1){
this.copy()
}else if(this.keyDown.indexOf('ControlLeft') > -1 && this.keyDown.indexOf('KeyV') > -1){
this.paste()
}
}
}
canvasClear(){
let oldCanvasDom = this.canvasDomParent.querySelector('.canvas-container')
let oldCanvasDom1 = this.canvasDomParent.querySelector('canvas')
if(oldCanvasDom)oldCanvasDom.remove()
if(oldCanvasDom1)oldCanvasDom1.remove()
document.removeEventListener("keydown", this.canvasKeyDown);
document.removeEventListener("keyup", this.canvasKeyUp);
}
//删除选中元素
deleteObject = ()=> {
if(!this.canvas.getActiveObjects()){
return
}
let target = this.canvas.getActiveObjects()
target.forEach((item)=>{
this.canvas.fxRemove(item, {
onComplete:()=>{
this.canvas.discardActiveObject(); // 丢弃当前选中的对象
this.canvas.renderAll(); // 重新渲染 Canvas
}
})
this.canvas.FX_DURATION = 300
})
this.updateCanvasState('remove')
}
//复制粘贴
copy(canvas){
var activeObject = this.canvas.getActiveObject();
if(!activeObject){
return
}
activeObject.clone((cloned)=>{
this._clipboard = cloned;
})
}
paste = () => {//粘贴
if(!this._clipboard){
return
}
this._clipboard.clone(clonedObj => {
this.canvas.discardActiveObject() // 取消选择
// 设置新内容的坐标位置
clonedObj.set({
left: clonedObj.left + 10,
top: clonedObj.top + 10,
evented: true
})
if (clonedObj.type === 'activeSelection') {
// 活动选择需要一个对画布的引用
clonedObj.canvas = canvas;
clonedObj.forEachObject((obj)=>{
this.canvas.add(obj)
})
clonedObj.setCoords()
} else {
this.canvas.add(clonedObj)
}
this._clipboard.top += 10
this._clipboard.left += 10
this.canvas.setActiveObject(clonedObj)
this.canvas.requestRenderAll()
})
this.updateCanvasState()
}
//撤回反撤回
//设置画布监听修改添加事件，用来做撤回功能
updateCanvasState(str){
const canvasAsJson = JSON.stringify(this.canvas.toJSON());
if(str == 'loadingCompleted'){
// this.reverseCanvasState.push(canvasAsJson);
}
this.normalCanvasState.push(canvasAsJson);
if (this.isLoadCanvas) {
this.reverseCanvasState = []
this.isLoadCanvas = false;
this.canvasState = canvasAsJson
}
}
//撤回
historyState(str){
if(str == 'reverse' && this.reverseCanvasState.length > 0){//反撤回
let obj = this.reverseCanvasState.pop()
// this.canvasState = this.reverseCanvasState[this.reverseCanvasState.length-1]
this.canvasState = obj
this.normalCanvasState.push(obj);
}else if(str == '' && this.normalCanvasState.length > 1){
let obj = this.normalCanvasState.pop()
this.canvasState = this.normalCanvasState[this.normalCanvasState.length-1]
this.reverseCanvasState.push(obj);
this.isLoadCanvas = true;
}else{
return
}
this.canvas.loadFromJSON(this.canvasState, () => {});
}
}
export default new myCanvas()

4
src/tool/https.js
View File

@@ -183,6 +183,7 @@ export const Https = {
updateUserGroupName:`/api/history/updateUserGroupName`, //History修改用户分组名 updateUserGroupName:`/api/history/updateUserGroupName`, //History修改用户分组名
historyChoose:`/api/history/choose`, //History choose historyChoose:`/api/history/choose`, //History choose
getDesignDetail:`/api/design/detail/getDetail`,//查询design详情 getDesignDetail:`/api/design/detail/getDetail`,//查询design详情
designSingleWithGradient:`/api/design/detail/designSingleWithGradient`,//查询需要更新mask列表
getNextSysElement:'/api/design/detail/getNextSysElement',//切换系统的element getNextSysElement:'/api/design/detail/getNextSysElement',//切换系统的element
detailPrintDot:'/api/design/detail/printDot',//print打点预览 detailPrintDot:'/api/design/detail/printDot',//print打点预览
designSingle:`/api/design/detail/designSingle`,//单个design designSingle:`/api/design/detail/designSingle`,//单个design
@@ -225,6 +226,9 @@ export const Https = {
generateResult:'/api/generate/result',//获取生成结果 generateResult:'/api/generate/result',//获取生成结果
generateLike:'/api/generate/like',//喜欢ganerate图片 generateLike:'/api/generate/like',//喜欢ganerate图片
generateDislike:'/api/generate/dislike',//喜欢ganerate图片 generateDislike:'/api/generate/dislike',//喜欢ganerate图片
imageToSketch:'/api/generate/imageToSketch',//成品图转为线稿
modifySketch:'/api/generate/modifySketch',//修改画布内容并且储存
elementUpload:`/api/element/upload`,//上传图片 elementUpload:`/api/element/upload`,//上传图片
// oldHis:`/oldHis/history/queryUserGroup`,//上传图片 // oldHis:`/oldHis/history/queryUserGroup`,//上传图片
sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片 sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片

2
src/views/HomeRecommend.vue
View File

@@ -26,7 +26,7 @@
<div class="content_body_recommend_top"> <div class="content_body_recommend_top">
<h1>DESIGN <br> AIDA</h1> <h1>DESIGN <br> AIDA</h1>
<div class="zindex"> <div class="zindex">
Slooming <br> Blooming <br>
Your Creativity Your Creativity
</div> </div>
</div> </div>

7
src/views/HomeView/HomeView.vue
View File

@@ -1,6 +1,8 @@
<template> <template>
<div class="home_page"> <div class="home_page">
<!-- <HeaderComponent></HeaderComponent> --> <!-- <HeaderComponent></HeaderComponent> -->
<!-- <generalCanvas></generalCanvas> -->
<div class="page_content"> <div class="page_content">
<!-- <img class="page_content_bg" src="@/assets/images/homePage/bg.png" /> --> <!-- <img class="page_content_bg" src="@/assets/images/homePage/bg.png" /> -->
<div class="page_content_body"> <div class="page_content_body">
@@ -216,7 +218,6 @@
<!-- design collection的进度蒙层 end--> <!-- design collection的进度蒙层 end-->
<affiche ref="affiche"></affiche> <affiche ref="affiche"></affiche>
<!-- <RobotAssist></RobotAssist> --> <!-- <RobotAssist></RobotAssist> -->
</div> </div>
</template> </template>
@@ -229,6 +230,7 @@ import CollectionModal from "@/component/HomePage/collectionModal.vue";
import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue"; import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue"; import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
import productImg from "@/component/HomePage/productImg.vue"; import productImg from "@/component/HomePage/productImg.vue";
import generalCanvas from "@/component/modules/generalCanvas.vue";
import affiche from "@/component/HomePage/affiche.vue"; import affiche from "@/component/HomePage/affiche.vue";
import DesignDetail from "@/component/Detail/DesignDetail.vue"; import DesignDetail from "@/component/Detail/DesignDetail.vue";
// import RobotAssist from "@/component/HomePage/RobotAssist.vue"; // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
@@ -256,7 +258,8 @@ export default defineComponent({
affiche, affiche,
// RobotAssist, // RobotAssist,
draggable, draggable,
productImg productImg,
generalCanvas
}, },
props:{ props:{
getLangIsShowMark:{ getLangIsShowMark:{

241
src/views/HomeView/library.vue
View File

@@ -128,7 +128,7 @@
:clearable="true" :clearable="true"
:placeholder="$t('LibraryPage.Select')" :placeholder="$t('LibraryPage.Select')"
:max-collapse-tags=3 :max-collapse-tags=3
:props="props" :props="prop"
:collapse-tags-tooltip="true" :collapse-tags-tooltip="true"
ref="cascader" ref="cascader"
popper-class="libraryPageCascader" popper-class="libraryPageCascader"
@@ -342,12 +342,9 @@
<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan> <createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
<!-- 蒙层 start--> <!-- 蒙层 start-->
<div class="mark_loading" v-show="isShowMark"> <div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
<a-spin size="large" /> <a-spin size="large" />
</div>
<!-- <div v-show="remGenerate" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div> -->
</div>
<!-- 蒙层 end--> <!-- 蒙层 end-->
<!-- <RobotAssist></RobotAssist> --> <!-- <RobotAssist></RobotAssist> -->
@@ -355,7 +352,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { LoadingOutlined } from "@ant-design/icons-vue"; import { LoadingOutlined } from "@ant-design/icons-vue";
import { defineComponent,h ,ref,createVNode,nextTick,reactive,provide,computed} from 'vue' import { defineComponent,h ,ref,createVNode,nextTick,watch,provide,computed} from 'vue'
// import HeaderComponent from "@/component/HomePage/Header.vue"; // import HeaderComponent from "@/component/HomePage/Header.vue";
import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue'; import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue';
// import ModelPlacement from '@/component/LibraryPage/ModelPlacementUpdata.vue'; // import ModelPlacement from '@/component/LibraryPage/ModelPlacementUpdata.vue';
@@ -388,7 +385,13 @@ export default defineComponent({
sketchCategory, sketchCategory,
createSlogan, createSlogan,
}, },
setup() { props:{
getLangIsShowMark:{
type:Boolean,
}
},
setup(props) {
const store = useStore(); const store = useStore();
let menuList = computed(()=>{ let menuList = computed(()=>{
return [ return [
@@ -503,7 +506,7 @@ export default defineComponent({
let getLibraryListInputTime:any = ref() let getLibraryListInputTime:any = ref()
const options:any = ref([ const options:any = ref([
]); ]);
let props = { let prop = {
multiple: true, multiple: true,
checkStrictly: true, checkStrictly: true,
emitPath:true, emitPath:true,
@@ -512,9 +515,97 @@ export default defineComponent({
label:'classificationName', label:'classificationName',
} }
let isTextarea = ref(false) let isTextarea = ref(false)
let workspace:any = ref({}) let workspace:any = computed(()=>{
return store?.state?.Workspace?.workspace
})
let generateLevel2:any = {} let generateLevel2:any = {}
let isSloganHint:any = ref('') let isSloganHint:any = ref('')
watch(
() => props.getLangIsShowMark, // 这里使用了一个 getter 函数
(newValue, oldValue) => {
if(!newValue){
getLibraryList('')
getClass()
getSex()
}
})
let getSex = () =>{
sex.value = store.state.UserHabit.sex.value[0].value
sexList.value = store.state.UserHabit.sex.value
getPosition()
}
let getPosition = ()=>{
store.commit('setPosition',sex.value)
designType.value = designTypeList.value.Sketchboard?.[0].value
}
let getLibraryList = (str:any)=>{
let labelArr:any = []
value.value.labelValue.forEach((item:any)=>{
labelArr.push(item[item.length-1])
})
let design = ''
if(selectCode.value == 'Sketchboard' || selectCode.value == 'DesignElements' || selectCode.value == 'Printboard'){
design = designType.value
}
let data = {
classificationIdList:labelArr,
level1Type:selectCode.value,
level2Type:design,
page:1,
modelSex:sex.value?sex.value:'',
pictureName:searchPictureName.value,
size:pageSize.value,
intersection:intersection.value,
}
if(str == 'page'){
data.page = currentPage.value
}else{
currentPage.value = 1
}
isShowMark.value = true
Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then(
(rv: any) => {
if(rv.content?.length == 0 && currentPage.value != 1){
currentPage.value = 1
getLibraryList('')
}else{
imgList.value = rv.content
total.value = rv.total
isShowMark.value = false
}
}
).catch((res)=>{
isShowMark.value = false
});
}
let getClass = ()=>{
let data = {
"classificationIdList": [],
"classificationName": "",
"createTime": "",
"deleteConfirm": '',
"id": '',
"libraryId": '',
"parentId": '',
"type": selectCode.value,
"updateTime": "",
"userId": ''
}
Https.axiosPost(Https.httpUrls.queryClassification, data).then(
(rv: any) => {
options.value = rv
rv.forEach((rvItem:any,rvIndex:number) => {
options.value[rvIndex].value = rvItem.id
options.value[rvIndex].label = rvItem.classificationName
rvItem.childList.forEach((childItem:any,index:number) => {
options.value[rvIndex].childList[index].value = childItem.id
options.value[rvIndex].childList[index].label = childItem.classificationName
});
});
}
).catch((res)=>{
});
}
return { return {
menuList, menuList,
selectImgList, selectImgList,
@@ -554,12 +645,15 @@ export default defineComponent({
scene, scene,
dragIdx, dragIdx,
getLibraryListInputTime, getLibraryListInputTime,
props, prop,
options, options,
isTextarea, isTextarea,
workspace, workspace,
generateLevel2, generateLevel2,
isSloganHint, isSloganHint,
getPosition,
getLibraryList,
getClass,
} }
}, },
data(this_) { data(this_) {
@@ -611,59 +705,13 @@ export default defineComponent({
this.isTest =JSON.parse(isTest) this.isTest =JSON.parse(isTest)
this.userInfo = JSON.parse(userInfo); this.userInfo = JSON.parse(userInfo);
this.uploadUrl = getUploadUrl() this.uploadUrl = getUploadUrl()
this.getLibraryList('') this.token = getCookie("token") || "";
this.getClass()
this.getSex()
this.token = getCookie("token") || "";
this.workspace = computed(()=>{
return this.store?.state?.Workspace?.workspace
})
}, },
methods:{ methods:{
getSex(){
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'Sex'}}).then((rv: any) => {
if (rv) {
let arr:any = []
rv.forEach((item:any) => {
arr.push({
value:item.name,
label:item.value,
})
});
this.sex = arr[0].value
this.sexList = arr
this.getPosition()
}
})
},
async getPosition(){
// let params
// if(this.sex.value == 'Female'){
// params = 'FemalePosition'
// }else{
// params = 'MalePosition'
// }
this.store.commit('setPosition',this.sex)
this.designType = this.designTypeList.Sketchboard?.[0].value
// await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
// if (rv) {
// let arr:any = []
// rv.forEach((item:any) => {
// arr.push({
// value:item.name,
// label:item.value,
// name:item.value
// })
// });
// this.designType = arr[0]
// this.designTypeList['Sketchboard'] = arr
// // this.workspaceItem.position = this.totalTypeList[0].label
// }
// })
},
likeFile(item:any,str:string){ likeFile(item:any,str:string){
let designType = '' let designType = ''
if(this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){ if(this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
@@ -1045,46 +1093,7 @@ export default defineComponent({
} }
}); });
}, },
getLibraryList(str:any){
let labelArr:any = []
this.value.labelValue.forEach((item:any)=>{
labelArr.push(item[item.length-1])
})
let designType = ''
if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
designType = this.designType
}
let data = {
classificationIdList:labelArr,
level1Type:this.selectCode,
level2Type:designType,
page:1,
modelSex:this.sex?this.sex:'',
pictureName:this.searchPictureName,
size:this.pageSize,
intersection:this.intersection,
}
if(str == 'page'){
data.page = this.currentPage
}else{
this.currentPage = 1
}
this.isShowMark = true
Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then(
(rv: any) => {
if(rv.content?.length == 0 && this.currentPage != 1){
this.currentPage = 1
this.getLibraryList('')
}else{
this.imgList = rv.content
this.total = rv.total
this.isShowMark = false
}
}
).catch((res)=>{
this.isShowMark = false
});
},
//编辑模特打点 //编辑模特打点
editPlacementClick(data:any){ editPlacementClick(data:any){
@@ -1447,34 +1456,6 @@ export default defineComponent({
}) })
},
getClass(){
let data = {
"classificationIdList": [],
"classificationName": "",
"createTime": "",
"deleteConfirm": '',
"id": '',
"libraryId": '',
"parentId": '',
"type": this.selectCode,
"updateTime": "",
"userId": ''
}
Https.axiosPost(Https.httpUrls.queryClassification, data).then(
(rv: any) => {
this.options = rv
rv.forEach((rvItem:any,rvIndex:number) => {
this.options[rvIndex].value = rvItem.id
this.options[rvIndex].label = rvItem.classificationName
rvItem.childList.forEach((childItem:any,index:number) => {
this.options[rvIndex].childList[index].value = childItem.id
this.options[rvIndex].childList[index].label = childItem.classificationName
});
});
}
).catch((res)=>{
});
}, },
scaleImage(index:any){ scaleImage(index:any){
let scaleImage:any = this.$refs.scaleImage let scaleImage:any = this.$refs.scaleImage