jufubao-admin-library 1.1.122 → 1.1.124
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -920,6 +920,7 @@ export default {
|
|
|
920
920
|
loading.close();
|
|
921
921
|
let resData = res.data || res;
|
|
922
922
|
if(type === 'name') this.editVisible = false;
|
|
923
|
+
|
|
923
924
|
if (resData.file_type !== "D") {
|
|
924
925
|
this.$emit("replace", this.$xdHelper.cloneDeep(resData));
|
|
925
926
|
}
|
|
@@ -927,8 +928,7 @@ export default {
|
|
|
927
928
|
this.uploadKey = new Date().getTime();
|
|
928
929
|
//后端更新列表有延迟,添加延时通知更新列表
|
|
929
930
|
setTimeout(() => {
|
|
930
|
-
this.$emit('refresh')
|
|
931
|
-
if(resData.file_type === "F") this.handleClose();
|
|
931
|
+
this.$emit('refresh')
|
|
932
932
|
}, 500);
|
|
933
933
|
})
|
|
934
934
|
.catch((err) => {
|
|
@@ -268,7 +268,6 @@ export default {
|
|
|
268
268
|
};
|
|
269
269
|
if(this.file_name) data = {...data, file_name: this.file_name};
|
|
270
270
|
let loading = Loading.service({zIndex: 4000,background:'rgba(255,255,255,0)'});
|
|
271
|
-
this.selectMaterialId = '';
|
|
272
271
|
this.getPlatformMaterialList(data)
|
|
273
272
|
.then((res) => {
|
|
274
273
|
if (res.data) {
|
|
@@ -92,9 +92,16 @@ export default {
|
|
|
92
92
|
},
|
|
93
93
|
watch: {
|
|
94
94
|
show(value) {
|
|
95
|
-
|
|
95
|
+
if(value === false) {
|
|
96
|
+
console.warn('dialogVisible.a'+value);
|
|
97
|
+
}
|
|
96
98
|
this.dialogVisible = value;
|
|
97
99
|
},
|
|
100
|
+
dialogVisible(value) {
|
|
101
|
+
if(value === false) {
|
|
102
|
+
console.warn('dialogVisible.a'+value);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
98
105
|
},
|
|
99
106
|
components: {
|
|
100
107
|
Menu: menu,
|
|
@@ -117,7 +124,7 @@ export default {
|
|
|
117
124
|
isConfirm(){
|
|
118
125
|
return !this.selectMaterial.filter(item=>{
|
|
119
126
|
//只提交图片文件
|
|
120
|
-
return item.file_type === 'F'
|
|
127
|
+
return (item.file_type === 'F'||!item.file_type)
|
|
121
128
|
}).length > 0
|
|
122
129
|
}
|
|
123
130
|
},
|
|
@@ -171,14 +178,15 @@ export default {
|
|
|
171
178
|
this.selectMaterial = this.selectMaterial.filter((i) => i.file_id !== data.file_id);
|
|
172
179
|
},
|
|
173
180
|
handleClosed() {
|
|
174
|
-
|
|
181
|
+
console.warn('handleClosed' + this.show);
|
|
182
|
+
this.$emit("update:show", this.show);
|
|
175
183
|
this.$emit("onClose");
|
|
176
184
|
},
|
|
177
185
|
handleConfirm() {
|
|
178
186
|
let selectMaterial;
|
|
179
187
|
selectMaterial = this.selectMaterial.filter(item=>{
|
|
180
188
|
//只提交图片文件
|
|
181
|
-
return item.file_type === 'F'
|
|
189
|
+
return (item.file_type === 'F'||!item.file_type)
|
|
182
190
|
}).map((item) => {
|
|
183
191
|
return {
|
|
184
192
|
url: item.file_url,
|
|
@@ -256,7 +264,7 @@ export default {
|
|
|
256
264
|
& .material ::v-deep {
|
|
257
265
|
.material-wrap {
|
|
258
266
|
height: 100%;
|
|
259
|
-
|
|
267
|
+
min-height: auto;
|
|
260
268
|
& > div:nth-child(2) {
|
|
261
269
|
height: calc(100% - 56px);
|
|
262
270
|
justify-content: space-between;
|