2023-11-16-dist
This commit is contained in:
@@ -499,7 +499,7 @@ export default defineComponent({
|
||||
let { colorBoards } =
|
||||
this.store.state.UploadFilesModule.allBoardData;
|
||||
if (!colorBoards || colorBoards?.length < 1) {
|
||||
message.warning(
|
||||
message.info(
|
||||
this.t('HomeView.jsContent1')
|
||||
);
|
||||
return;
|
||||
@@ -536,7 +536,7 @@ export default defineComponent({
|
||||
let { colorBoards } =
|
||||
this.store.state.UploadFilesModule.allBoardData;
|
||||
if (!colorBoards || colorBoards?.length < 1) {
|
||||
message.warning(
|
||||
message.info(
|
||||
this.t('HomeView.jsContent2')
|
||||
);
|
||||
return;
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
<div class="content_search_block">
|
||||
<input class="search_input" :placeholder="$t('LibraryPage.inputContent1')" v-model="searchPictureName" @keydown.enter="getLibraryList()">
|
||||
<div class="search_cascader">
|
||||
<a-cascader
|
||||
<!-- <a-cascader
|
||||
@click.stop="dropdownVisibleChange"
|
||||
ref="cascader"
|
||||
v-model:value="value.labelValue"
|
||||
@@ -106,18 +106,23 @@
|
||||
:open="false"
|
||||
dropdownClassName="libraryPageCascader"
|
||||
>
|
||||
</a-cascader>
|
||||
<div v-show="labelOpen.labelOpen" @click.stop="" class="search_cascader_checkbox">
|
||||
<a-checkbox-group
|
||||
v-model:value="value.labelValue"
|
||||
:options="options"
|
||||
/>
|
||||
<br>
|
||||
<a-checkbox-group
|
||||
v-model:value="value.labelValue"
|
||||
:options="options.childList"
|
||||
/>
|
||||
</div>
|
||||
</a-cascader> -->
|
||||
<el-cascader
|
||||
:options="options"
|
||||
:filterable="true"
|
||||
v-model="value.labelValue"
|
||||
:collapse-tags="true"
|
||||
:show-all-levels="false"
|
||||
:clearable="true"
|
||||
:max-collapse-tags=3
|
||||
:props="props"
|
||||
:collapse-tags-tooltip="true"
|
||||
clearable
|
||||
ref="cascader"
|
||||
popper-class="libraryPageCascader"
|
||||
@visible-change="dropdownVisibleChange"
|
||||
>
|
||||
</el-cascader>
|
||||
</div>
|
||||
|
||||
<!-- <div class="search_icon_block" @click="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div> -->
|
||||
@@ -308,22 +313,19 @@
|
||||
<div class="rename_form_content">
|
||||
<input class="rename_form_input" :placeholder="$t('LibraryPage.inputContent3')" v-model="newPicName" @keydown.enter="confrimRename()">
|
||||
</div>
|
||||
<a-cascader
|
||||
@click.stop="labelSearch"
|
||||
ref="cascader"
|
||||
v-model:value="value.editLabelValue"
|
||||
style="width: 100%"
|
||||
:field-names="{ label: 'classificationName', value: 'id', children: 'childList'}"
|
||||
multiple
|
||||
@change="setLabel1"
|
||||
max-tag-count="responsive"
|
||||
:options="options"
|
||||
placeholder="Please select"
|
||||
:show-search="{ filter }"
|
||||
:open="labelOpen.editLabelOpen"
|
||||
dropdownClassName="editLabel"
|
||||
<el-cascader
|
||||
:options="options"
|
||||
:filterable="true"
|
||||
v-model="value.editLabelValue"
|
||||
:collapse-tags="true"
|
||||
:show-all-levels="false"
|
||||
:clearable="true"
|
||||
:max-collapse-tags=6
|
||||
:props="props"
|
||||
:collapse-tags-tooltip="true"
|
||||
clearable
|
||||
>
|
||||
</a-cascader>
|
||||
</el-cascader>
|
||||
<div class="rename_button_list">
|
||||
<div class="rename_button_item rename_cancel_button" @click="closeRenameModal()">{{ $t('LibraryPage.Cancel') }}</div>
|
||||
<div class="rename_button_item rename_submit_button" @click="confrimRename()">{{ $t('LibraryPage.Sure') }}</div>
|
||||
@@ -359,6 +361,7 @@ import { Https } from "@/tool/https";
|
||||
import { getCookie } from "@/tool/cookie";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import type { ShowSearchType } from 'ant-design-vue/es/cascader';
|
||||
import { ElCascader } from 'element-plus'
|
||||
export default defineComponent({
|
||||
components: {
|
||||
HeaderComponent,
|
||||
@@ -366,6 +369,7 @@ export default defineComponent({
|
||||
setLabel,
|
||||
ModelPlacementMobile,
|
||||
RobotAssist,
|
||||
ElCascader,
|
||||
},
|
||||
setup() {
|
||||
|
||||
@@ -442,14 +446,19 @@ export default defineComponent({
|
||||
labelValue:[],
|
||||
editLabelValue:[],
|
||||
})
|
||||
const filter: ShowSearchType['filter'] = (inputValue, path) => {
|
||||
return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
|
||||
};
|
||||
let labelOpen = ref({
|
||||
labelOpen:false,
|
||||
editLabelOpen:false,
|
||||
})
|
||||
|
||||
|
||||
let props = {
|
||||
multiple: true,
|
||||
checkStrictly: true,
|
||||
emitPath:true,
|
||||
children:'childList',
|
||||
value:'id',
|
||||
label:'classificationName',
|
||||
}
|
||||
|
||||
let isTest = ref()
|
||||
|
||||
|
||||
return {
|
||||
menuList,
|
||||
@@ -483,9 +492,8 @@ export default defineComponent({
|
||||
printModel,
|
||||
value,
|
||||
options,
|
||||
filter,
|
||||
t,
|
||||
labelOpen,
|
||||
props,
|
||||
isTest,
|
||||
}
|
||||
},
|
||||
@@ -686,19 +694,7 @@ export default defineComponent({
|
||||
libraryName:this.newPicName,
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
}
|
||||
// Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
|
||||
// (rv: any) => {
|
||||
// if(this.renameType ==='batch'){
|
||||
// this.selectImgList = []
|
||||
// }
|
||||
// this.getLibraryList()
|
||||
// this.closeRenameModal()
|
||||
// }
|
||||
// ).catch((res)=>{
|
||||
// this.closeRenameModal()
|
||||
// });
|
||||
console.log(this.value);
|
||||
|
||||
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
|
||||
let labelArr:any = []
|
||||
this.value.editLabelValue.forEach((item:any)=>{
|
||||
// if(item.length > 1){
|
||||
@@ -709,7 +705,6 @@ export default defineComponent({
|
||||
labelArr.push(item[item.length-1])
|
||||
|
||||
})
|
||||
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
|
||||
let data2 = {
|
||||
"classificationIdList": labelArr,
|
||||
"classificationName": "",
|
||||
@@ -720,16 +715,28 @@ export default defineComponent({
|
||||
"updateTime": "",
|
||||
"userId": 0
|
||||
}
|
||||
// Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
|
||||
// (rv: any) => {
|
||||
// console.log(rv);
|
||||
// this.getLibraryList()
|
||||
// this.closeRenameModal()
|
||||
Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
|
||||
(rv: any) => {
|
||||
if(this.renameType ==='batch'){
|
||||
this.selectImgList = []
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
|
||||
(rv: any) => {
|
||||
console.log(rv);
|
||||
this.getLibraryList()
|
||||
this.closeRenameModal()
|
||||
|
||||
// }
|
||||
// ).catch((res)=>{
|
||||
// this.closeRenameModal()
|
||||
// });
|
||||
}
|
||||
).catch((res)=>{
|
||||
this.closeRenameModal()
|
||||
});
|
||||
}
|
||||
).catch((res)=>{
|
||||
this.closeRenameModal()
|
||||
});
|
||||
|
||||
|
||||
|
||||
},
|
||||
|
||||
//打开修改名称弹窗
|
||||
@@ -759,31 +766,26 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.getRelClassificationIdList, classData).then(
|
||||
(rv: any) => {
|
||||
let arr:any = []
|
||||
this.options.forEach((item:any)=>{
|
||||
rv.forEach((rvItem:any) => {
|
||||
if(item.id == rvItem){
|
||||
arr.push(item.id)
|
||||
}else{
|
||||
item.childList.forEach((optionsItem:any) => {
|
||||
if(optionsItem.id == rvItem){
|
||||
arr.push([optionsItem.parentId,optionsItem.id])
|
||||
}
|
||||
// this.options.forEach((item:any)=>{
|
||||
// rv.forEach((rvItem:any) => {
|
||||
// if(item.id == rvItem){
|
||||
// arr.push(item.id)
|
||||
// }else{
|
||||
// item.childList.forEach((optionsItem:any) => {
|
||||
// if(optionsItem.id == rvItem){
|
||||
// arr.push([optionsItem.parentId,optionsItem.id])
|
||||
// }
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
})
|
||||
this.value.editLabelValue = arr
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
// })
|
||||
this.value.editLabelValue = rv
|
||||
}
|
||||
).catch((res)=>{
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
this.renameType = type
|
||||
this.labelOpen.labelOpen = false
|
||||
this.renameVisivle = true
|
||||
},
|
||||
upLoad(){
|
||||
@@ -799,7 +801,6 @@ export default defineComponent({
|
||||
},
|
||||
//删除单个图片
|
||||
deleteSinglePic(data:any,index:any){
|
||||
this.labelOpen.labelOpen = false
|
||||
let _this = this
|
||||
Modal.confirm({
|
||||
title: this.t('LibraryPage.jsContent1'),
|
||||
@@ -848,17 +849,36 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
).catch((res)=>{
|
||||
if(data.level1Type == "Models" && res.errCode === 1){
|
||||
let _this = this
|
||||
Modal.confirm({
|
||||
title: res.errMsg,
|
||||
icon: createVNode(ExclamationCircleOutlined),
|
||||
okText: 'Yes',
|
||||
cancelText: 'No',
|
||||
mask:false,
|
||||
zIndex:99999,
|
||||
// centered:true,
|
||||
onOk() {
|
||||
data.deleteModelConfirm = 1
|
||||
_this.confirmDeletePic(data,index)
|
||||
},
|
||||
onCancel(){
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
beforeUpload(file:any,fileList:any){
|
||||
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
|
||||
if (!isJpgOrPng) {
|
||||
message.warning(this.t('LibraryPage.jsContent3'));
|
||||
message.info(this.t('LibraryPage.jsContent3'));
|
||||
}
|
||||
const isLt2M = file.size / 1024 / 1024 < 2;
|
||||
if (!isLt2M) {
|
||||
message.warning(this.t('LibraryPage.jsContent4'));
|
||||
message.info(this.t('LibraryPage.jsContent4'));
|
||||
}
|
||||
if(isJpgOrPng && isLt2M){
|
||||
this.currentUploadFileNum = fileList.length
|
||||
@@ -941,8 +961,7 @@ export default defineComponent({
|
||||
this.value.labelValue.forEach((item:any)=>{
|
||||
labelArr.push(item[item.length-1])
|
||||
})
|
||||
console.log(labelArr);
|
||||
|
||||
console.log(this.value.labelValue);
|
||||
let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
|
||||
let data = {
|
||||
classificationIdList:labelArr,
|
||||
@@ -971,7 +990,6 @@ export default defineComponent({
|
||||
...data.libraryModelPoint,
|
||||
url:data.url,
|
||||
}
|
||||
this.labelOpen.labelOpen = false
|
||||
this.placementClick(newData)
|
||||
},
|
||||
|
||||
@@ -1022,7 +1040,7 @@ export default defineComponent({
|
||||
if (index > -1) {
|
||||
this.selectGenerateList.splice(index, 1);
|
||||
}
|
||||
message.error(file.name + this.t('LibraryPage.jsContent8'));
|
||||
message.warning(file.name + this.t('LibraryPage.jsContent8'));
|
||||
}
|
||||
},
|
||||
deleteFile(index: any) {
|
||||
@@ -1063,7 +1081,7 @@ export default defineComponent({
|
||||
},
|
||||
getgenerate(){
|
||||
if(this.isTest){//试用用户禁止使用
|
||||
message.warning(
|
||||
message.info(
|
||||
this.t('isTest.available')
|
||||
);
|
||||
return
|
||||
@@ -1104,7 +1122,7 @@ export default defineComponent({
|
||||
|
||||
}
|
||||
}else{
|
||||
message.warning(
|
||||
message.info(
|
||||
this.t('LibraryPage.jsContent7')
|
||||
);
|
||||
return
|
||||
@@ -1133,71 +1151,45 @@ export default defineComponent({
|
||||
},
|
||||
|
||||
dropdownVisibleChange(){
|
||||
this.labelOpen.labelOpen = true
|
||||
document.addEventListener('click',this.setClick)
|
||||
// nextTick().then(()=>{
|
||||
// let cascader = document.getElementsByClassName('libraryPageCascader')[0]
|
||||
// let cascaderChild = cascader.children[0].children[0]
|
||||
// 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 = 'redact'
|
||||
// // button2.textContent = '删除'
|
||||
// button1.addEventListener('click',this.addLabel,false)
|
||||
// // button2.addEventListener('click',this.removeLabel,false)
|
||||
// divMax.appendChild(button1)
|
||||
// // divMax.appendChild(button2)
|
||||
// cascaderChild?.insertAdjacentElement("afterbegin", divMax);
|
||||
|
||||
// // cascader.addEventListener('click',this.cascaderClick)
|
||||
// }
|
||||
// })
|
||||
nextTick().then(()=>{
|
||||
let cascader = document.getElementsByClassName('libraryPageCascader')[0]
|
||||
let cascaderChild = cascader
|
||||
if(cascader.children.length > 3 ){
|
||||
}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 = 'edit'
|
||||
// button2.textContent = '删除'
|
||||
button1.addEventListener('click',this.removeLabel,false)
|
||||
divMax.appendChild(button1)
|
||||
// divMax.appendChild(button2)
|
||||
cascaderChild?.insertAdjacentElement("afterbegin", divMax);
|
||||
// cascader.addEventListener('click',this.cascaderClick)
|
||||
}
|
||||
})
|
||||
},
|
||||
// cascaderClick(e:Event){
|
||||
// console.log(e.target)
|
||||
// },
|
||||
setLabel1(value:any){
|
||||
console.log(value);
|
||||
console.log(this.value.labelValue);
|
||||
// this.value.labelValue = [[31,32],[31,33],[31,35],[31,40],[31,41],[31,42]]
|
||||
let myCascader:any = this.$refs.cascader
|
||||
},
|
||||
setClick(){
|
||||
this.labelOpen.labelOpen = false
|
||||
this.labelOpen.editLabelOpen = false
|
||||
document.removeEventListener('click',this.setClick)
|
||||
},
|
||||
removeClick(){
|
||||
},
|
||||
addLabel(){
|
||||
|
||||
removeLabel(){
|
||||
let setLabel:any = this.$refs.setLabel
|
||||
this.labelOpen.labelOpen = false
|
||||
let cascader:any = this.$refs.cascader
|
||||
cascader.togglePopperVisible()
|
||||
let event = new Event('click', {"bubbles":true, "cancelable":true});
|
||||
document.dispatchEvent(event);
|
||||
setLabel.init('add',this.options)
|
||||
},
|
||||
// removeLabel(){
|
||||
// let setLabel:any = this.$refs.setLabel
|
||||
// setLabel.init('remove')
|
||||
// this.labelOpen = false
|
||||
// }
|
||||
labelSearch(){
|
||||
this.labelOpen.editLabelOpen = true
|
||||
document.addEventListener('click',this.setClick)
|
||||
nextTick().then(()=>{
|
||||
let cascader = document.getElementsByClassName('editLabel')[0]
|
||||
cascader.addEventListener('click',(event)=>{
|
||||
event.stopPropagation()
|
||||
})
|
||||
console.log(this.value.editLabelValue);
|
||||
|
||||
})
|
||||
|
||||
|
||||
@@ -1399,17 +1391,7 @@ export default defineComponent({
|
||||
width: 60%;
|
||||
display: flex;
|
||||
position: relative;
|
||||
.search_cascader_checkbox{
|
||||
position: absolute;
|
||||
top: 3rem;
|
||||
background: #fff;
|
||||
z-index: 2;
|
||||
border: 1px solid;
|
||||
.ant-checkbox-group{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
.search_icon_block{
|
||||
@@ -1785,19 +1767,11 @@ export default defineComponent({
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
.ant-select-allow-clear{
|
||||
.el-cascader{
|
||||
height: 4.6rem;
|
||||
margin-top: 2rem;
|
||||
.ant-select-selector{
|
||||
.ant-select-selection-overflow{
|
||||
.ant-select-selection-overflow-item{
|
||||
.ant-select-selection-item{
|
||||
.ant-select-selection-item-content{
|
||||
line-height: 2.7;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-tag__content{
|
||||
line-height: 2.5;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -298,7 +298,7 @@ export default defineComponent({
|
||||
//邮箱登录的下一步
|
||||
emailNextStepFun() {
|
||||
if (!isEmail(this.email)) {
|
||||
message.warning("The email format is incorrect");
|
||||
message.info("The email format is incorrect");
|
||||
return;
|
||||
}
|
||||
let data = {
|
||||
@@ -331,7 +331,7 @@ export default defineComponent({
|
||||
//忘记密码的下一步
|
||||
forgetPasswordNextStepFun() {
|
||||
if (!isEmail(this.forgetPasswordEmail)) {
|
||||
message.warning("The email format is incorrect");
|
||||
message.info("The email format is incorrect");
|
||||
return;
|
||||
}
|
||||
let data = {
|
||||
@@ -381,22 +381,22 @@ export default defineComponent({
|
||||
return;
|
||||
}else{
|
||||
if (!this.username || !this.password) {
|
||||
message.warning("Please enter your account number or password");
|
||||
message.info("Please enter your account number or password");
|
||||
return;
|
||||
}
|
||||
//输入邮箱
|
||||
if (!this.email) {
|
||||
message.warning("Please enter your email address");
|
||||
message.info("Please enter your email address");
|
||||
return;
|
||||
}
|
||||
//判断邮箱格式是否正确
|
||||
if (!isEmail(this.email)) {
|
||||
message.warning("The email format is incorrect");
|
||||
message.info("The email format is incorrect");
|
||||
return;
|
||||
}
|
||||
//判断是否同意隐私政策
|
||||
if (!this.checked) {
|
||||
message.warning("Agree to all terms, privacy fees and policies");
|
||||
message.info("Agree to all terms, privacy fees and policies");
|
||||
return;
|
||||
}
|
||||
let data = {
|
||||
@@ -453,7 +453,7 @@ export default defineComponent({
|
||||
if (rv) {
|
||||
this.createTimer();
|
||||
let token = rv.token;
|
||||
let isTest = true
|
||||
let isTest = false
|
||||
setCookie("token", token);
|
||||
setCookie("isTest", isTest);
|
||||
setCookie("userInfo", JSON.stringify(rv));
|
||||
|
||||
Reference in New Issue
Block a user