Skip to content

E
exhibition_backstage
提交 7328c1b0 authored 作者: 龙菲's avatar 龙菲
浏览文件
操作

优化展览新增和编辑

上级 c296348f
隐藏空白字符变更
内嵌 并排
正在显示 包含 427 行增加 和 330 行删除
src/components/Uploader/ManualUploaderBind.vue
浏览文件 @ 7328c1b0
......@@ -74,6 +74,7 @@ export default {
data() {
return {
fileList: [],
removedIds: [], //被删除的文件Id集合
};
},
watch: {
......@@ -175,6 +176,11 @@ export default {
// 文件列表移除文件时的钩子
handleRemove(file, fileList) {
let that = this;
const { status } = file;
if (status == "success") {
this.removedIds.push(file.fileId);
this.$emit("getRemovedIds", this.removedIds);
}
that.fileList.map(async (item, index) => {
if (item.uid === file.uid) {
that.fileList.splice(index, 1);
......
src/utils/transformData.js → src/utils/bizTransform.js
浏览文件 @ 7328c1b0
// 本文件提供一些前端和后端数据交互和转换的一些方法，可批量使用的
const transformData = {
const bizTransform = {
/**
* 转换服务器的封面数据到前端可用的封面数据
* @param {String} faceImage 封面文件ID
......@@ -19,7 +19,7 @@ const transformData = {
fileId: faceImage || "",
},
];
console.log('result', result);
console.log("result", result);
return result;
},
......@@ -49,13 +49,10 @@ const transformData = {
* @returns {String} 提交给服务器需要的以逗号隔开的字符串
*/
literatureIdArrToStr(arr) {
let str = "";
if (arr.length == 0) {
return "";
}
const result = arr.join(",");
str = result.substring(0, result.length - 1);
return str;
return arr.join(",");
},
/**
......@@ -125,14 +122,15 @@ const transformData = {
* @returns {String} 部门ID字符串
*/
getDeptIdStr(deptArr) {
let str = "";
if (deptArr.length == 0) {
return "";
if (deptArr instanceof Array) {
if (deptArr.length == 0) {
return "";
}
return deptArr.join(",");
} else {
return deptArr;
}
const result = deptArr.join(",");
str = result.substring(0, result.length - 1);
return str;
},
};
export default transformData;
export default bizTransform;
src/views/culturalRelic/components/InfoEditDialog.vue
浏览文件 @ 7328c1b0
......@@ -306,8 +306,8 @@ import { addOrUpdateCulturalRelic } from "@/api/culturalRelic";
import { mapGetters, mapActions } from "vuex";
import { uploadV1 } from "@/utils/file";
import { rules } from "../configs/validateRules";
import fileUploadFunctions from "@/utils/fileUploadFuctions";
import transformData from "@/utils/transformData";
import fileUploadFunctions from "@/utils/bizUploadFunctions";
import transformData from "@/utils/bizTransform";
const {
faceImageToClient,
literatureIdArrToStr,
......@@ -667,3 +667,4 @@ export default {
margin: 20px 0;
}
</style>
@/utils/bizTransform@/utils/bizUploadFunctions
\ No newline at end of file
src/views/display/components/ExhibitionUnit.vue
浏览文件 @ 7328c1b0
......@@ -7,27 +7,45 @@
<div class="exhibition-units-tree-node" slot-scope="{ node, data }">
<div style="display: flex; align-items: center">
<div class="title" @click="handleClickNode(node, data)">
<el-input placeholder="请输入标题" v-model="data.title" v-if="data.isEditing" :ref="data.euId + 'Title'"
@blur="() => handleInputBlur(node, data)">
<el-input
placeholder="请输入标题"
v-model="data.title"
v-if="data.isEditing"
:ref="data.euId + 'Title'"
@blur="() => handleInputBlur(node, data)"
>
</el-input>
<span v-else>{{ data.title }}</span>
</div>
<span v-if="!isDisableEvent">
<el-tooltip content="编辑标题" placement="top">
<i v-if="!data.isEditing" class="el-icon-edit plus-peer" @click="() => editNode(node, data)"></i>
<i
v-if="!data.isEditing"
class="el-icon-edit plus-peer"
@click="() => editNode(node, data)"
></i>
</el-tooltip>
<el-tooltip content="添加子节点" placement="top">
<svg-icon @click="() => appendChild(data)" icon-class="node-child2" class="plus-child"
style="font-size: 32px; color: #409eff"></svg-icon>
<svg-icon
@click="() => appendChild(data)"
icon-class="node-child2"
class="plus-child"
style="font-size: 32px; color: #409eff"
></svg-icon>
</el-tooltip>
<el-tooltip content="添加同级节点" placement="top">
<i class="el-icon-plus plus-peer" @click="() => appendPeerNode(node, data)"></i>
<i
class="el-icon-plus plus-peer"
@click="() => appendPeerNode(node, data)"
></i>
</el-tooltip>
<el-tooltip content="删除当前节点" placement="top">
<i class="el-icon-close delete" @click="() => remove(node, data)"></i>
<i
class="el-icon-close delete"
@click="() => remove(node, data)"
></i>
</el-tooltip>
</span>
</div>
</div>
</el-tree>
......@@ -39,23 +57,48 @@
</el-input>
</el-col>
<el-col :span="24" class="mg-bt20">
<VueQuillEditor v-model="currentData.intro" placeholder="请输入单元介绍" />
<VueQuillEditor
v-model="currentData.intro"
placeholder="请输入单元介绍"
/>
</el-col>
<el-col :span="24" class="mg-bt20">
<div>单元文物：</div>
<el-select :disabled="isDisableEvent" v-model="currentData.crIds" multiple filterable remote reserve-keyword
:placeholder="isDisableEvent ? '无' : '请输入关键词搜索文物'" :remote-method="searchCR" :loading="loading"
style="width: 100%" ref="remoteSelect">
<el-option v-for="item in crList" :key="item.crId" :label="item.name" :value="item.crId">
<el-select
:disabled="isDisableEvent"
v-model="currentData.crIds"
multiple
filterable
remote
reserve-keyword
:placeholder="isDisableEvent ? '无' : '请输入关键词搜索文物'"
:remote-method="searchCR"
:loading="loading"
style="width: 100%"
ref="remoteSelect"
>
<el-option
v-for="item in crList"
:key="item.crId"
:label="item.name"
:value="item.crId"
>
</el-option>
</el-select>
</el-col>
<el-col :span="24">
<div>单元图片：</div>
<span></span>
<ManualUploaderBind v-model="currentData.imagesVo" :fileLimit="7" :fileSize="50"
:fileType="['jpeg', 'jpg', 'png']" listType="picture-card" :ref="'unit-images-' + currentData.euId"
:onlyRead="isDisableEvent" />
<ManualUploaderBind
v-model="currentData.imagesVo"
:fileLimit="7"
:fileSize="50"
:fileType="['jpeg', 'jpg', 'png']"
listType="picture-card"
:ref="'unit-images-' + currentData.euId"
:onlyRead="isDisableEvent"
@getRemovedIds="getRemovedIds"
/>
</el-col>
</el-row>
<!-- <el-collapse-transition>
......@@ -64,14 +107,32 @@
</el-row>
</el-collapse-transition> -->
<div class="next-prev">
<el-button size="mini" type="primary" icon="el-icon-back" @click="handleToUnit('prev')">上一节点</el-button>
<el-button size="mini" type="primary" icon="el-icon-right" @click="handleToUnit('next')">下一节点</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-back"
@click="handleToUnit('prev')"
>上一节点</el-button
>
<el-button
size="mini"
type="primary"
icon="el-icon-right"
@click="handleToUnit('next')"
>下一节点</el-button
>
</div>
</el-col>
</el-row>
<el-button v-if="(!treeData.length > 0 && !isDisableEvent)" type="primary" icon="el-icon-circle-plus-outline"
@click="handleAddUnit('manual')" size="mini">手动添加展览单元</el-button>
<span v-if="(treeData.length == 0 && isDisableEvent)">暂无</span>
<el-button
v-if="!treeData.length > 0 && !isDisableEvent"
type="primary"
icon="el-icon-circle-plus-outline"
@click="handleAddUnit('manual')"
size="mini"
>手动添加展览单元</el-button
>
<span v-if="treeData.length == 0 && isDisableEvent">暂无</span>
<!-- <el-button
v-if="!treeData.length > 0"
type="success"
......@@ -111,8 +172,8 @@ export default {
},
isDisableEvent: {
type: Boolean,
default: false
}
default: false,
},
},
watch: {
exhibitionUnits: {
......@@ -194,7 +255,9 @@ export default {
handleClickNode(node, data) {
this.currentData = data;
this.crList = [...new Set([...this.crList, ...this.currentData.culturalRelics])];
this.crList = [
...new Set([...this.crList, ...this.currentData.culturalRelics]),
];
},
editNode(node, data) {
this.$set(data, "isEditing", true);
......@@ -280,12 +343,10 @@ export default {
}
},
handleToUnit(type) {
// debugger
const { euId } = this.currentData;
let next = {};
let prev = {};
let that = this;
// debugger
traverseTree(this.treeData);
function traverseTree(arr) {
if (arr && arr.length > 0) {
......@@ -320,6 +381,10 @@ export default {
}
}
},
getRemovedIds(removedIds) {
this.removedIds = [...new Set([...this.removedIds, ...removedIds])];
console.log("this.removedIds", this.removedIds);
},
},
};
</script>
......@@ -421,7 +486,7 @@ export default {
}
::v-deep .images-list {
&>div {
& > div {
white-space: pre-wrap;
}
}
......@@ -431,6 +496,3 @@ export default {
justify-content: flex-end;
}
</style>
src/views/display/components/InfoEditDialog copy.vue
浏览文件 @ 7328c1b0
......@@ -372,8 +372,8 @@ import { deleteFiles } from "@/api/file";
import { getVirtualListPer } from "@/api/vitual";
import { rules } from "../configs/validateRules";
import { pageSelectUrl, upLoadAddress } from "../configs/urls";
import transformData from "@/utils/transformData";
import fileUploadFunctions from "@/utils/fileUploadFuctions";
import transformData from "@/utils/bizTransform";
import fileUploadFunctions from "@/utils/bizUploadFunctions";
import unitsFunctions from "./units";
const {
faceImageToClient,
......@@ -959,3 +959,4 @@ export default {
right: -8%;
}
</style>
@/utils/bizTransform@/utils/bizUploadFunctions
\ No newline at end of file
src/views/display/components/InfoEditDialog.vue
浏览文件 @ 7328c1b0
......@@ -244,6 +244,7 @@
:fileType="['png', 'jpeg', 'jpg']"
:files="faceImage"
ref="faceImage"
@getRemovedIds="getRemovedIds"
/>
</el-form-item>
......@@ -256,6 +257,7 @@
:fileType="['png', 'jpeg', 'jpg']"
ref="images"
:advice="imagesAdvice"
@getRemovedIds="getRemovedIds"
/>
</el-form-item>
<el-form-item label="展览音频" :label-width="formLabelWidth">
......@@ -266,6 +268,7 @@
:fileType="['mp3']"
listType="card"
ref="audios"
@getRemovedIds="getRemovedIds"
/>
</el-form-item>
<el-form-item label="展览视频" :label-width="formLabelWidth">
......@@ -276,6 +279,7 @@
:fileType="['mp4']"
listType="card"
ref="videos"
@getRemovedIds="getRemovedIds"
/>
</el-form-item>
</el-col>
......@@ -372,8 +376,8 @@ import { deleteFiles } from "@/api/file";
import { getVirtualListPer } from "@/api/vitual";
import { rules } from "../configs/validateRules";
import { pageSelectUrl, upLoadAddress } from "../configs/urls";
import transformData from "@/utils/transformData";
import fileUploadFunctions from "@/utils/fileUploadFuctions";
import transformData from "@/utils/bizTransform";
import fileUploadFunctions from "@/utils/bizUploadFunctions";
import unitsFunctions from "./units";
import submit from "./submit";
const {
......@@ -495,6 +499,7 @@ export default {
upLoadAddress,
rules,
mediaKeys: ["faceImage", "images", "videos", "audios"],
removedIds:[]
};
},
async created() {
......@@ -528,6 +533,8 @@ export default {
literatureVo,
deptId,
exhibitionUnits,
culturalRelicVo,
virtualVo
} = this.dialogForm;
this.faceImage = faceImageToClient(
faceImage,
......@@ -537,10 +544,10 @@ export default {
this.images = imagesVo || [];
this.videos = videosVo || [];
this.audios = audiosVo || [];
this.crList = this.getClientCrList();
this.crIds = this.getClientCrIds();
this.vrList = this.getClientVrList();
this.vrIds = this.getClientVrIds();
this.crList = this.getClientCrList(culturalRelicVo);
this.crIds = this.getClientCrIds(culturalRelicVo);
this.vrList = this.getClientVrList(virtualVo);
this.vrIds = this.getClientVrIds(virtualVo);
this.dialogForm.status = statusStrToBool(status);
this.literatureIdArr = literatureListToIds(literatureVo);
this.dialogForm.deptId = getDeptIdArr(deptId, this.userInfo);
......@@ -738,255 +745,17 @@ export default {
break;
}
},
handleSubmit(submitFlag) {
submit(submitFlag, this);
},
// handleSubmit(submitFlag) {
// // this.loading = true;
// this.$refs.form.validate(async (valid) => {
// if (valid) {
// this.submitLoading = true;
// let that = this;
// let formData = new FormData();
// // 已存在的文件的对象
// let successFilesObj = [];
// // 需要被删除的文件Id
// let deleteFileArr = [];
// // 添加布展本身的媒体文件至formData
// const mediaKeys = ["faceImage", "images", "videos", "audios"];
// let newFiles = {}; //key：字段名或者单元id名, value:不同媒体或单元已经存在的文件id数组
// mediaKeys.map((media) => {
// let files = getMediaFile(this, media);
// let fileIds = []; //不同媒体或单元已经存在的文件id数组
// files.map((f) => {
// if (isFileRaw(f)) {
// // 添加文件到表单中
// formData.append(media, f.raw);
// } else {
// // 如果成功
// if (successFilesObj[media]) {
// successFilesObj[media].push(f);
// } else {
// successFilesObj[media] = [f];
// }
// fileIds.push(f.fileId);
// }
// });
// newFiles[media] = fileIds;
// });
// mediaKeys.map((media) => {
// if (this.dialogForm[media]) {
// let oldFileIdArr = this.dialogForm[media].split(",");
// oldFileIdArr.map((oldId) => {
// if (newFiles[media].indexOf(oldId) == -1) {
// deleteFileArr.push(oldId);
// }
// });
// }
// });
// let unitIds = [];
// let unitData = [...this.$refs["exhibitionUnits"].getUnitData()];
// // 批量添加image进入formdata
// let newfileIdsArr = []; //不同媒体或单元已经存在的文件id数组
// let oldFileIdsArr = []; //旧的ids集合
// addUnitImgToFormData(unitData);
// function addUnitImgToFormData(arr) {
// if (arr.length > 0) {
// arr.map((item) => {
// if (item.imagesVo && item.imagesVo.length > 0) {
// let imageFiles = item.imagesVo;
// let unitOldIds = item.images.split(",");
// oldFileIdsArr = oldFileIdsArr.concat(unitOldIds);
// imageFiles.map((imgFile) => {
// if (imgFile.status && imgFile.status == "ready") {
// formData.append(`unit-images-${item.euId}`, imgFile.raw);
// } else {
// if (successFilesObj[`unit-images-${item.euId}`]) {
// successFilesObj[`unit-images-${item.euId}`].push(
// imgFile
// );
// } else {
// successFilesObj[`unit-images-${item.euId}`] = [imgFile];
// }
// newfileIdsArr.push(imgFile.fileId);
// }
// });
// }
// if (item.children) {
// addUnitImgToFormData(item.children);
// }
// });
// }
// }
// oldFileIdsArr.map((oldfileId) => {
// // 如果旧的id在新的id集合中找不到，则代表该文件被删除
// if (newfileIdsArr.indexOf(oldfileId) == -1) {
// deleteFileArr.push(oldfileId);
// }
// });
// // 上传所有媒体文件
// let filesObj = {};
// // formData有长度时再进行上传
// if (isFormDataHasData(formData)) {
// this.loadingText = "正在上传文件...请耐心等待";
// let upLoadRes = await uploadV1(formData);
// if (upLoadRes.code == 0) {
// upLoadRes.data.map((resFile) => {
// if (filesObj[resFile.fileKey]) {
// filesObj[resFile.fileKey].push(resFile.fileId);
// } else {
// filesObj[resFile.fileKey] = [resFile.fileId];
// }
// });
// }
// }
// // 1、回填之前先获取已存在的文件
// for (const key in successFilesObj) {
// // 如果文件id中含有已上传成功的某个key，如images，则将已上传成功的images推入文件id集合
// if (filesObj[key]) {
// successFilesObj[key].map((sf) => {
// filesObj[key].push(sf.fileId);
// });
// } else {
// let ids = [];
// successFilesObj[key].map((sf) => {
// ids.push(sf.fileId);
// });
// filesObj[key] = ids;
// }
// }
// // 2、回填布展自带的媒体文件
// const dialogFormSuccess = this.getSuccessedDialogForm(
// mediaKeys,
// this.dialogForm,
// filesObj
// );
// // 3、回填布展单元媒体文件,修改关联文物为Str，和显示隐藏控制器
// const unitDataSuccess = this.getSuccessedUnit(unitData, filesObj);
// const params = {
// ...dialogFormSuccess,
// exhibitionUnits: unitDataSuccess,
// };
// params.literature = getLtStrByArr(this.literatureIdArr); //文献
// params.status = getStatusNumByBool(this.dialogForm.status);
// params.crIds = that.crIds.join(",");
// params.bvIds = that.vrIds.join(",");
// params.displayCharacter = 1; //传布展
// params.submitFlag = submitFlag;
// return;
// addOrUpdateDisplayTemp(params)
// .then((res) => {
// if (res.code == 0) {
// setTimeout(() => {
// that.$emit("refresh");
// that.reload();
// that.submitLoading = false;
// that.$message.success("提交成功！");
// that.visible = false;
// }, 1000);
// }
// })
// .catch((err) => {
// that.submitLoading = false;
// });
// }
// });
// },
getLtStrByArr(arr) {
if (arr.length == 0) {
return "";
}
return arr.join(",");
getRemovedIds(removedIds) {
this.removedIds = [...new Set([...this.removedIds, ...removedIds])];
console.log("this.removedIds", this.removedIds);
},
getStatusNumByBool(bool) {
if (!bool instanceof Boolean) {
return;
}
return bool ? 1 : 0;
},
/**
* @param {Array} mediaKeys 媒体keys
* @param {Object} dialogForm 表单对象
* @param {Object} filesObj 文件对象们
* @returns {Array} 回填上传的文件之后的布展单元
*/
getSuccessedDialogForm(mediaKeys, form, filesObj) {
const newForm = JSON.parse(JSON.stringify(form));
mediaKeys.forEach((media) => {
if (filesObj[media]) {
newForm[media] = filesObj[media].join(",");
} else {
newForm[media] = "";
}
});
return newForm;
handleSubmit(submitFlag) {
submit(submitFlag, this);
},
/**
* @param {Array} unitData 回填上传的文件之前的布展单元
* @param {Object} filesObj 文件对象们
* @returns {Array} 回填上传的文件之后的布展单元
*/
getSuccessedUnit(unitData, filesObj) {
const newData = JSON.parse(JSON.stringify(unitData)); //不改变输入的数据
backFillUnit(newData);
return newData;
function backFillUnit(arr) {
if (arr.length > 0) {
arr.forEach((unit) => {
// 如果进行了文件上传
if (Object.keys(filesObj).length > 0) {
for (const key in filesObj) {
let type = key.split("-")[1];
let euId = key.split("-")[2];
if (euId == unit.euId) {
switch (type) {
case "images":
unit.images = filesObj[key].join(",");
break;
case "videos":
unit.videos = filesObj[key].join(",");
break;
}
}
}
}
let crIdArr = JSON.parse(JSON.stringify(unit.crIds));
if (crIdArr) {
if (crIdArr instanceof Array) {
unit.crIds = crIdArr.join(",");
} else if (crIdArr instanceof String) {
unit.crIds = [crIdArr];
}
} else {
unit.crIds = "";
}
var deleteArr = ["euId"];
deleteArr.forEach((i) => {
if (unit[i]) {
delete unit[i];
}
});
if (unit.children) {
backFillUnit(unit.children);
}
});
}
}
},
// 清空编辑组件中的所有值
reload() {
//父组件将清空form绑定的值
// this.$emit("handleClose");
// 清空文献
this.literatureIdArr = [];
// 清空文物
......@@ -1009,6 +778,7 @@ export default {
this.videos = [];
this.audios = [];
this.faceImage = [];
this.removedIds = [];
},
handleClose(done) {
......@@ -1105,3 +875,4 @@ export default {
right: -8%;
}
</style>
@/utils/bizTransform@/utils/bizUploadFunctions
\ No newline at end of file
src/views/display/components/submit.js
浏览文件 @ 7328c1b0
// 单独写上传的处理函数
import { addOrUpdateDisplayTemp } from "@/api/display";
import fileUploadFuctions from "@/utils/bizUploadFunctions";
import bizTransform from "@/utils/bizTransform";
import { uploadV1 } from "@/utils/file";
const { getNeedUploadFormData, isFileRaw, isFormDataHasData } =
fileUploadFuctions;
const { getDeptIdStr } = bizTransform;
const mediaKeys = ["faceImage", "images", "videos", "audios"];
const getUnitData = ($el) => {
const units = $el.$refs["exhibitionUnits"].getUnitData();
return units;
};
/**
*
* @param {Boolean} submitFlag 上传的类别，是仅保存还是
* @param {*} $el
* 添加展览单元的媒体文件至formData
* @param {*} $el 当前this对象
* @param {FormData} formData 当前this对象
* @returns {Object} form 表单对象
*/
const submit = (submitFlag, $el) => {
// this.loading = true;
this.$refs.form.validate(async (valid) => {
if (valid) {
params.literature = getLtStrByArr(this.literatureIdArr); //文献
params.status = getStatusNumByBool(this.dialogForm.status);
params.crIds = that.crIds.join(",");
params.bvIds = that.vrIds.join(",");
params.displayCharacter = 1; //传布展
params.submitFlag = submitFlag;
return;
addOrUpdateDisplayTemp(params)
.then((res) => {
if (res.code == 0) {
setTimeout(() => {
that.$emit("refresh");
that.reload();
that.submitLoading = false;
that.$message.success("提交成功！");
that.visible = false;
}, 1000);
}
})
.catch((err) => {
that.submitLoading = false;
});
const getFormDataUnits = ($el, formData) => {
const units = getUnitData($el);
appendUnitToForm(units, formData);
return formData;
};
const appendUnitToForm = (arr, formData) => {
arr.forEach((item) => {
if (item.imagesVo && item.imagesVo.length > 0) {
item.imagesVo.forEach((imgFile) => {
if (isFileRaw(imgFile)) {
const { euId } = item;
const { raw } = imgFile;
formData.append(`unit-images-${euId}`, raw);
}
});
}
if (item.children && item.children.length > 0) {
appendUnitToForm(item.children, formData);
}
});
};
/**
* 上传文件
* @param {*} $el 当前this对象
* @returns {Object} form 表单对象
*/
const uploadFile = ($el) => {
return new Promise(async (resolve, reject) => {
const formData = getNeedUploadFormData($el, mediaKeys);
const formDataFull = getFormDataUnits($el, formData);
try {
if (isFormDataHasData(formDataFull)) {
const res = await uploadV1(formDataFull);
if (res.code == 0) {
resolve(res);
}
} else {
resolve({});
}
} catch (error) {
reject(error);
}
});
};
const getUnitRemovedIds = ($el) => {
return $el.$refs["exhibitionUnits"].getRemovedIds();
};
const getUnitExsitedObj = ($el, units) => {
const obj = {};
loopUnits(units, obj);
return obj;
function loopUnits(arr, obj) {
arr.forEach((item) => {
if (item.images) {
const { euId } = item;
const key = `unit-images-${euId}`;
const removedIds = getUnitRemovedIds($el);
const imgArr = item.images.split(",");
// 筛选存在在images字符串中，并且没有被删除的id，这些是仍然要保留的
const ids = imgArr.filter((id) => {
return !removedIds.includes(id);
});
obj[key] = ids;
}
if (item.children && item.children.length > 0) {
loopUnits(item.children, obj);
}
});
}
};
const getUploadedIdByKey = (key, res) => {
if (!res.data) {
return [];
}
const items = res.data.filter((item) => {
return item.fileKey == key;
});
if (items.length > 0) {
return items.map((item) => {
return item.fileId;
});
} else {
return [];
}
};
// 获取已经上传了的文件的id集合
const getUnitSuccessObj = ($el, units, res) => {
const obj = {};
loopUnits(units, obj, res);
return obj;
function loopUnits(arr, obj, res) {
arr.forEach((item) => {
// 只有图片长度大于0的才会有新上传的
if (item.imagesVo && item.imagesVo.length) {
// 通过key去查找res中的fileId
const { euId } = item;
const key = `unit-images-${euId}`;
const idsArr = getUploadedIdByKey(key, res);
obj[key] = idsArr;
}
if (item.children && item.children.length > 0) {
loopUnits(item.children, obj, res);
}
});
}
};
const mergeObjects = (objA, objB) => {
let result = {};
// 遍历对象A，复制键值对
for (let key in objA) {
if (objA.hasOwnProperty(key)) {
result[key] = objA[key];
}
}
// 遍历对象B，合并相同的键对应的值
for (let key in objB) {
if (objB.hasOwnProperty(key)) {
if (result.hasOwnProperty(key)) {
if (Array.isArray(result[key])) {
result[key].push(...objB[key]);
} else {
console.log(
`Warning: Key ${key} exists in both objA and objB, but the value is not an array in objA.`
);
}
} else {
result[key] = objB[key]; // 如果键在result中不存在，就创建一个新的键值对
}
}
}
return result;
};
// 获取最终的布展单元
const getUploadedUnits = ($el, res) => {
const units = getUnitData($el);
const exsitedObj = getUnitExsitedObj($el, units);
const successObj = getUnitSuccessObj($el, units, res);
// 将存在的和新上传的取交集，因为当key重复时，已存在的会被新上传的覆盖，因此需要再和已存在的进行取并集
const mergeObj = mergeObjects(exsitedObj, successObj);
loopUnits(units);
return units;
function loopUnits(arr) {
arr.forEach((item) => {
const { euId } = item;
const key = `unit-images-${euId}`;
if (mergeObj[key]) {
item.images = mergeObj[key].join(",");
}
// 处理关联文物
if (item.crIds && item.crIds instanceof Array) {
item.crIds = item.crIds.join(",");
}
// 删除imagesVo不要传到后台
delete item.imagesVo;
if (item.children && item.length > 0) {
loopUnits(item.children);
}
});
}
export default submit
\ No newline at end of file
}
};
const getFormExsitedObj = ($el) => {
const obj = {};
mediaKeys.forEach((key) => {
// 已存在的不为空再继续
if ($el.dialogForm[key]) {
const removedIds = $el.getRemovedIds();
const arr = $el.dialogForm[key].split(",");
// 筛选存在在媒体字符串中，并且没有被删除的id，这些是仍然要保留的
const ids = arr.filter((id) => {
return !removedIds.includes(id);
});
obj[key] = ids;
}
});
return obj;
};
// 获取已经上传了的文件的id集合
const getFormSuccessObj = ($el, res) => {
const obj = {};
mediaKeys.forEach((key) => {
// 通过key去查找res中的fileId
const idsArr = getUploadedIdByKey(key, res);
obj[key] = idsArr;
});
return obj;
};
const getLtStrByArr = (arr) => {
if (arr.length == 0) {
return "";
}
return arr.join(",");
};
const getStatusNumByBool = (bool) => {
if (!bool instanceof Boolean) {
return;
}
return bool ? 1 : 0;
};
// 获取最终的展览表单
const getUploadedForm = ($el, res, submitFlag) => {
const form = JSON.parse(JSON.stringify($el.dialogForm));
const exsitedObj = getFormExsitedObj($el);
const successObj = getFormSuccessObj($el, res);
// 将存在的和新上传的取交集，因为当key重复时，已存在的会被新上传的覆盖，因此需要再和已存在的进行取并集
const mergeObj = mergeObjects(exsitedObj, successObj);
mediaKeys.forEach((key) => {
if (mergeObj[key] && mergeObj[key].length > 0) {
form[key] = mergeObj[key].join(",");
}
});
form.literature = getLtStrByArr($el.literatureIdArr); //文献
form.status = getStatusNumByBool($el.dialogForm.status);
form.crIds = $el.crIds?.join(",");
form.bvIds = $el.vrIds?.join(",");
form.displayCharacter = 1; //传布展
form.submitFlag = submitFlag;
form.deptId = getDeptIdStr(form.deptId);
return form;
};
/**
*
* @param {Boolean} submitFlag 上传的类别，是仅保存还是
* @param {*} $el 当前this对象
*/
const submit = (submitFlag, $el) => {
// this.loading = true;
$el.$refs.form.validate(async (valid) => {
if (valid) {
const res = await uploadFile($el);
const unitsUploaded = getUploadedUnits($el, res);
const formUploaded = getUploadedForm($el, res, submitFlag);
const params = {
...formUploaded,
exhibitionUnits: unitsUploaded,
};
// console.log("unitsUploaded", unitsUploaded);
// console.log("formUploaded", formUploaded);
addOrUpdateDisplayTemp(params)
.then((res) => {
if (res.code == 0) {
setTimeout(() => {
$el.$emit("refresh");
$el.reload();
$el.submitLoading = false;
$el.$message.success("提交成功！");
$el.visible = false;
// TODO:删除文件
}, 1000);
}
})
.catch((err) => {
$el.submitLoading = false;
});
}
});
};
export default submit;
src/views/display/components/units.js
浏览文件 @ 7328c1b0
import fileUploadFuctions from "@/utils/fileUploadFuctions";
import fileUploadFuctions from "@/utils/bizUploadFunctions";
const unitsFunctions = {
/**
* 获取新的布展单元，实装媒体id，
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论