Compare commits

..

No commits in common. "96690a10639bbbca6f0c9d12e1cc772158bcd654" and "ba97fbca468ab3e46806e2d0e56efc024a20f2e5" have entirely different histories.

2 changed files with 9 additions and 15 deletions

View File

@ -60,7 +60,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<input type="file" style="display:none;" :multiple="limit>1&&$attrs.multiple" :accept="$attrs.accept" id="uploadinput" @change="onUpdate" ref="fileinputref"/> <input type="file" style="display:none;" :multiple="limit>1" :accept="$attrs.accept" id="uploadinput" @change="onUpdate" ref="fileinputref"/>
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
@ -235,12 +235,8 @@
raw:item raw:item
}); });
if(files.length==uplist.length){ if(files.length==uplist.length){
if(this.$listeners.onUpload){ this.imageList.push(...uplist);
this.fileList.push(...uplist); this.$emit('onUpload',uplist,this.imageList);
this.$emit('onUpload',uplist,this.fileList);
}else{
this.imageList.push(...uplist);
}
} }
}.bind(this); }.bind(this);
filerender.readAsDataURL(item); filerender.readAsDataURL(item);

View File

@ -47,7 +47,8 @@
<div>{{row.date}} </div> <div>{{row.date}} </div>
</template> </template>
</agTable> </agTable>
<agUpdate @onUpload="onUpload" isDrap dragmove multiple :limit="5" @onError="onError" :maxSize="1024*1024" :fileList="filelist"> <agUpdate @onUpload="onUpload" multiple isDrap :limit="5" @onError="onError" listType="picture" :maxSize="1024*1024" :fileList="['https://git.aiguoai.com/assets/img/logo.svg']">
<el-button type="primary" size="small">点击上传</el-button>
<div slot="tip">只能上传jpg/png文件且不超过500kb</div> <div slot="tip">只能上传jpg/png文件且不超过500kb</div>
</agUpdate> </agUpdate>
<!-- <el-input <!-- <el-input
@ -366,19 +367,16 @@ export default {
blur: () => {}, blur: () => {},
handleChange: () => {}, handleChange: () => {},
}, },
], ],
filelist:['https://git.aiguoai.com/assets/img/logo.svg'] };
}
}, },
mounted(){ mounted(){
this.$refs.aginputref.value=123; this.$refs.aginputref.value=123;
}, },
methods: { methods: {
onUpload(files,list){ onUpload(files,filelist){
console.log("onUpload",files,list); console.log("onUpload",files,filelist);
this.filelist=list;
}, },
onError(err){ onError(err){
console.log("onError",err); console.log("onError",err);