diff --git a/src/assets/style/style.css b/src/assets/style/style.css index e75078ed..3ee0cb18 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -334,6 +334,12 @@ li { width: 0.57142857rem; height: 0.91428571rem; } +.ant-select-multiple .ant-select-selection-search { + height: 100%; +} +.ant-select-multiple .ant-select-selection-search-input { + height: 100%; +} .ant-checkbox-checked .ant-checkbox-inner { background-color: #767676; border-color: #d9d9d9 !important; @@ -343,6 +349,23 @@ li { .ant-checkbox-input:focus + .ant-checkbox-inner { border-color: #d9d9d9 !important; } +.libraryPageCascader { + border-radius: 1rem; +} +.libraryPageCascader .cascader_btn_max { + height: 4rem; + position: absolute; + width: 100%; + border-bottom: 1px solid #e1e1e1; + display: flex; + align-items: center; +} +.libraryPageCascader .cascader_btn_max .cascader_btn1 { + margin: 0 1rem; +} +.libraryPageCascader .ant-cascader-menu { + margin-top: 4rem; +} .collection_modal .ant-modal-body, .design_detail_modal_component .ant-modal-body, .designOpenrtion_modal .ant-modal-body, diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 93dc2d19..35760a8d 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -383,6 +383,12 @@ ul,li{ } } } +.ant-select-multiple .ant-select-selection-search{ + height: 100%; +} +.ant-select-multiple .ant-select-selection-search-input{ + height: 100%; +} .ant-checkbox-checked .ant-checkbox-inner{ background-color: #767676; border-color: #d9d9d9 !important; @@ -390,6 +396,24 @@ ul,li{ .ant-checkbox-wrapper:hover .ant-checkbox-inner, .ant-checkbox:hover .ant-checkbox-inner, .ant-checkbox-input:focus + .ant-checkbox-inner{ border-color: #d9d9d9 !important; } +.libraryPageCascader{ + border-radius: 1rem; + .cascader_btn_max{ + height: 4rem; + position: absolute; + width: 100%; + border-bottom: 1px solid rgb(225 225 225); + display: flex; + align-items: center; + .cascader_btn1{ + margin: 0 1rem; + } + } + .ant-cascader-menu{ + margin-top: 4rem; + } +} + //collection 弹窗 .collection_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page{ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 072b77e6..c6050e16 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -245,18 +245,6 @@ export default defineComponent({ window.removeEventListener('beforeunload',beforeunload) } window.addEventListener('beforeunload',beforeunload) - let onresizeTime:any - let this_ = this - window.onresize = () => { - return (() => { - clearTimeout(onresizeTime) - onresizeTime = setTimeout(async ()=>{ - await this_.setImgSize() - },500) - - })() - } - let userInfo:any = getCookie("userInfo") this.userInfo = JSON.parse(userInfo); // let url = Https.httpUrls.getDesignDetail + `?designItemId=34242&designPythonOutfitId=34004` @@ -408,6 +396,17 @@ export default defineComponent({ height:body.layersObject[0].imageSize?.[1]*ratio+'px', } } + let onresizeTime:any + let this_ = this + window.onresize = () => { + return (() => { + clearTimeout(onresizeTime) + onresizeTime = setTimeout(async ()=>{ + await this_.setImgSize() + },500) + + })() + } this.frontBack = { front:front, back:back, diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index b81fd529..9ac91bfe 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -259,14 +259,12 @@ export default defineComponent({ hex = '#FFFFFF' } this.selectIndex = index - this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {} - // this.fileList = [] this.tcxColor = '' this.pantongName = '' this.pantongNameList = [] - // this.selectColorList= [] this.reviewColor= {} this.getColorBg = false + // this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {} }, //通过tcx获取颜色 diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 8278d22b..4b6ff64b 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -69,10 +69,11 @@ :before-upload="beforeUpload" v-model:file-list="fileList" multiple - :maxCount="8 - moodboarList.length+fileList.length" + :maxCount="8 - moodboarList.length+fileList.length" accept=".jpg,.png,.jpeg,.bmp" @change="(file) => fileUploadChange(file)" > +
+
+ + {{ $t('MoodboardUpload.Maximum') }} +
@@ -280,7 +286,7 @@ v-model:visible="renameVisivle" :footer="null" title="Rename Pic" - width="56rem" + width="65%" :maskClosable="false" :centered="true" @onCancel="closeRenameModal" @@ -322,7 +328,7 @@ import { useStore } from "vuex"; import { Https } from "@/tool/https"; import { getCookie } from "@/tool/cookie"; import { useI18n } from "vue-i18n"; - +import type { ShowSearchType } from 'ant-design-vue/es/cascader'; export default defineComponent({ components: { HeaderComponent, @@ -409,7 +415,7 @@ export default defineComponent({ value: 'little', children: [ { - label: 'Toy Fish', + label: `'Toy Fish'`, value: 'fish', }, { @@ -425,6 +431,10 @@ export default defineComponent({ ], }, ]; + const filter: ShowSearchType['filter'] = (inputValue, path) => { + return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1); + }; + let labelOpen = ref(false) return { menuList, selectImgList, @@ -457,7 +467,9 @@ export default defineComponent({ printModel, value: ref([]), options, + filter, t, + labelOpen, } }, data(this_) { @@ -483,6 +495,7 @@ export default defineComponent({ this.getLibraryList() this.getSex() this.token = getCookie("token") || ""; + }, methods:{ @@ -723,8 +736,6 @@ export default defineComponent({ customRequest(event:any){ - console.log(222); - if(this.selectCode == "Models"){ return } @@ -951,27 +962,67 @@ export default defineComponent({ return } } - // this.isShowMark = true - // Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then( - // (rv) => { - // if(rv){ - // let arr - // rv.generatedCollectionItems.forEach((v:any,index:number)=>{ - // arr = { - // id:v.generateItemId, - // imgUrl:v.generateItemUrl, - // } - // this.generateList.push(arr) - // console.log(this.generateList); - - // }) - // this.isShowMark = false - // } - // } - // ).catch(res=>{ - // this.isShowMark = false - // }); + this.isShowMark = true + Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then( + (rv) => { + if(rv){ + let arr + rv.generatedCollectionItems.forEach((v:any,index:number)=>{ + arr = { + id:v.generateItemId, + imgUrl:v.generateItemUrl, + } + this.generateList.push(arr) + }) + this.isShowMark = false + } + } + ).catch(res=>{ + this.isShowMark = false + }); }, + + dropdownVisibleChange(){ + this.labelOpen = true + document.addEventListener('click',this.setClick) + nextTick().then(()=>{ + let cascader = document.getElementsByClassName('libraryPageCascader')[0] + let cascaderChild = cascader.children[0].children[0] + console.log(cascader.children,cascaderChild); + cascader.addEventListener('click',(event)=>{ + event.stopPropagation() + }) + if(cascader.children[0].children[0].children.length > 1){ + }else{ + + let button1:any = document.createElement("span") + button1.classList.add('started_btn','cascader_btn1') + let button2:any = document.createElement("span") + button2.classList.add('started_btn','cascader_btn2') + let divMax:any = document.createElement("div") + divMax.classList.add('cascader_btn_max') + button1.textContent = '新增' + button2.textContent = '删除' + button1.addEventListener('click',this.addLabel,false) + button2.addEventListener('click',this.removeLabel,false) + divMax.appendChild(button1) + divMax.appendChild(button2) + cascaderChild?.insertAdjacentElement("afterbegin", divMax); + } + }) + }, + setClick(){ + this.labelOpen = false + document.removeEventListener('click',this.setClick) + }, + removeClick(){ + }, + addLabel(){ + this.labelOpen = false + }, + removeLabel(){ + this.labelOpen = false + } } }) @@ -981,7 +1032,7 @@ export default defineComponent({ overflow: hidden; height: 100%; padding: 0 9rem; - min-width: 1024px; + min-width: 1440px; position: relative; .page_content { position: relative; @@ -1109,7 +1160,7 @@ export default defineComponent({ .content_search_block{ display: flex; align-items: center; - width: 75rem; + width: 75rem; .search_input{ // width: 20.8rem; // padding-left: 1.5rem; @@ -1148,6 +1199,7 @@ export default defineComponent({ color: #FFFFFF; } } + } .library_right_header{