hz/ylst-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 模型上传loading

Browse Source
This commit is contained in:
wanganmao
2023-02-08 10:15:41 +08:00
parent 83931fcc58
commit 8347e60ca3
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/Creative/components/CreateMaterial/ThreedMaterial.vue
View File

@@ -31,8 +31,8 @@
</a-form-item>
</a-form>
<div style="text-align: right; margin-top: 20px;">
<a-button style="margin-right: 10px;" @click="cancel">{{cancelText}}</a-button>
<a-button type="primary" @click="ok">{{okText}}</a-button>
<a-button :loading="stepLoading" style="margin-right: 10px;" @click="cancel">{{cancelText}}</a-button>
<a-button :loading="stepLoading" type="primary" @click="ok">{{okText}}</a-button>
</div>
</a-modal>
</template>
@@ -76,6 +76,9 @@ const okText = computed(() => {
return "下一步"
})
const stepLoading = ref(false);
const cancel = () => {
if(step.value <= 0) {
visible.value = false;
@@ -154,7 +157,10 @@ const onCustomRequest = async (upload) => {
reader.readAsArrayBuffer(upload.file);
}
stepLoading.value = true;
const data = await common.cosUpload3D(upload.file);
stepLoading.value = false;
upload.onSuccess(data);
}
@@ -176,6 +182,8 @@ const ok = async () => {
if(step.value >= 1) {
stepLoading.value = true;
if([THREE_D_TYPE.ENV_3D, THREE_D_TYPE.SHELF, THREE_D_TYPE.EXHIBITION_BOOTH, THREE_D_TYPE.WARE, THREE_D_TYPE.EMPTY_3D].includes(formData.value.type)){
var blob = await viewerRef.value.snapshot();
const data = await common.cosUpload3DCompress(blob);
@@ -184,6 +192,9 @@ const ok = async () => {
const data = JSON.parse(JSON.stringify(formData.value));
await createMaterialLibrary(buildData(data));
stepLoading.value = false;
visible.value = false;
emit("complete");
}

16
src/views/Creative/components/CreateMaterial/ThreedMaterialShelfUploadCells.vue
View File

@@ -50,8 +50,8 @@
</a-form-item>
</a-form>
<div style="text-align: right; margin-top: 20px;">
<a-button style="margin-right: 10px;" @click="cancel">{{cancelText}}</a-button>
<a-button type="primary" @click="ok">{{okText}}</a-button>
<a-button :loading="stepLoading" style="margin-right: 10px;" @click="cancel">{{cancelText}}</a-button>
<a-button :loading="stepLoading" type="primary" @click="ok">{{okText}}</a-button>
</div>
</a-modal>
</template>
@@ -95,6 +95,8 @@ const okText = computed(() => {
return "下一步"
})
const stepLoading = ref(false);
const cancel = () => {
if(step.value <= 0) {
visible.value = false;
@@ -172,8 +174,9 @@ const onCustomRequest = async (upload) => {
reader.readAsArrayBuffer(upload.file);
}
stepLoading.value = true;
const data = await common.cosUpload3D(upload.file);
stepLoading.value = false;
upload.onSuccess(data);
}
@@ -212,9 +215,12 @@ const ok = async () => {
}
if([THREE_D_TYPE.SHELF].includes(formData.value.type)){
stepLoading.value = true;
var blob = await viewerRef.value.snapshot();
const data = await common.cosUpload3DCompress(blob);
formData.value.cover = data.url;
stepLoading.value = false;
}
}
@@ -232,8 +238,10 @@ const ok = async () => {
message.warning("请上传货位");
return;
}
stepLoading.value = true;
await createMaterialLibrary(data);
stepLoading.value = false;
visible.value = false;
emit("complete");
}