diff --git a/src/views/haomo/components/forms/HmComplexForm.vue b/src/views/haomo/components/forms/HmComplexForm.vue index e32c092872b26475d82c7e922d5f445847edffed..51a80773809a0acd5b4fcb86a260bc3542296474 100644 --- a/src/views/haomo/components/forms/HmComplexForm.vue +++ b/src/views/haomo/components/forms/HmComplexForm.vue @@ -95,7 +95,6 @@ :file-list="fileList" multiple ref="upload" - :data-code="column.codeCamel" :on-success="uploadSuccess"> <el-button slot="trigger" size="small" type="primary" :disabled="column.disabled">选喿–‡ä»¶</el-button> @@ -160,7 +159,7 @@ * nameå±žæ€§è¡¨ç¤ºè‡ªå®šä¹‰çš„å—æ®µå,如果ä¸ä¼ ,默认为数æ®åº“ä¸çš„å—æ®µå, * widgetTypeå±žæ€§è¡¨ç¤ºè¯¥å—æ®µè¦æ˜¾ç¤ºçš„表å•类型(æ™®é€šè¾“å…¥æ¡†ã€æ–‡æœ¬åŸŸã€å¯Œæ–‡æœ¬ã€ä¸‹æ‹‰æ¡†...),ä¸ä¼ 默认为普通input * change属性,值为函数类型,表示inputçš„changeäº‹ä»¶çš„æ‰§è¡Œæ–¹æ³•ï¼Œå‚æ•°å³ä¸ºinput输入内容 - * å–值1-7(1表示普通输入框,2表示下拉框,3表示å¤é€‰æ¡†,4表示文本域,5表示富文本,6表示日期,7表示å•选框), + * å–值1-8(1表示普通输入框,2表示下拉框,3表示å¤é€‰æ¡†,4表示文本域,5表示富文本,6表示日期,7表示å•选框,8è¡¨ç¤ºæ–‡ä»¶ä¸Šä¼ ), * 若表å•类型为下拉框/å¤é€‰æ¡†/å•é€‰æ¡†ï¼Œè¿˜éœ€ä¼ å…¥optionså—æ®µï¼Œå€¼ä¸ºæ•°ç»„(æ•°ç»„å…ƒç´ æ˜¯ä¸‹æ‹‰æ¡†/å¤é€‰æ¡†/å•选框的选项), * 对于å¤é€‰æ¡†ï¼Œå¦‚æžœåªæœ‰ä¸€ä¸ªå¤‡é€‰é¡¹åˆ™ä¸å¿…ä¼ options, * 若表å•类型为下拉框,还å¯ä¼ å…¥multipleå—æ®µï¼Œå–值bolean类型,true/false,表示是å¦å¤šé€‰ï¼Œé»˜è®¤false @@ -352,18 +351,31 @@ }, methods: { handleRemove(file, fileList) { - console.log(file, fileList) + // const self = this + // console.log(file, fileList) + // this.fileList.push(fileList.response) + // console.log(this.fileList) + // console.log(self.formModel) }, handlePreview(file) { console.log(file) }, uploadSuccess(response, file, fileList) { + const self = this console.log('ä¸Šä¼ æˆåŠŸ') console.log(response) - // console.log(file) - // console.log(fileList) - this.fileList = fileList - this.formModel[this.fileCode] = fileList + console.log('fileList', fileList) + console.log(self.fileList) + _.each(self.columns, function(item, index) { + if (item.widgetType === 8) { + _.forEach(self.formModel, function(value, key) { + if (item.codeCamel === key) { + self.formModel[key] = fileList + } + }) + } + }) + console.log(self.formModel) }, // inputChange(val) { // // console.log(event) @@ -474,7 +486,7 @@ // console.log(self.showUserColumns) // æå–v-model绑定的å˜é‡ _.each(self.showUserColumns, function(item) { - if (item.widgetType === 3 && item.options && item.options.length > 0) { + if (item.widgetType === 8 || (item.widgetType === 3 && item.options && item.options.length > 0)) { self.$set(self.formModel, item.codeCamel, []) } else { self.$set(self.formModel, item.codeCamel, '') @@ -533,11 +545,13 @@ }).then(resp => { console.log('修改æˆåŠŸ') self.resetForm() + self.formModel = {} // æ–°å»ºå®Œæˆæ¸…ç©ºæ•°æ® if (typeof (callback) === 'function') { callback() } }) } else { // ä¸å˜åœ¨tableId åˆ™åˆ›å»ºä¸€æ¡æ•°æ® + console.log('self.formModel', self.formModel) request(self.schema.modelUnderscorePlural + '/new', { method: 'post', headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' }, @@ -552,6 +566,7 @@ } }).then(resp => { console.log('创建æˆåŠŸ') + self.formModel = {} // æ–°å»ºå®Œæˆæ¸…ç©ºæ•°æ® // self.resetForm() if (typeof (callback) === 'function') { callback() diff --git a/src/views/haomo/components/forms/index.vue b/src/views/haomo/components/forms/index.vue index ddd45a6c95b416c13e13a703e655437a719b0db5..12bb249b909f0be2ad2c9c455d85380eec414126 100644 --- a/src/views/haomo/components/forms/index.vue +++ b/src/views/haomo/components/forms/index.vue @@ -24,7 +24,7 @@ }, data() { return { - // widgetType值 1:普通input 2:下拉框 (如果是下拉框 å†ä¼ 一个options表示下拉框选项)3:å¤é€‰æ¡† 4:文本域 5:富文本 6:日期 7:å•选框 + // widgetType值 1:普通input 2:下拉框 (如果是下拉框 å†ä¼ 一个options表示下拉框选项)3:å¤é€‰æ¡† 4:文本域 5:富文本 6:日期 7:å•选框 8: æ–‡ä»¶ä¸Šä¼ showUserColumns: [ { name: '用户åç§°', codeCamel: 'username', widgetType: 1, disabled: false, change: this.inputChange @@ -48,7 +48,7 @@ { codeCamel: 'password', widgetType: 4, change: this.inputChange }, { name: '新建时间', codeCamel: 'createTime', widgetType: 6, dateType: 'datetime', dateFormate: 'yyyy-MM-dd HH:mm:ss', change: this.inputChange }, { name: '登陆id', codeCamel: 'loginid', widgetType: 7, options: ['会员', '访客'], change: this.inputChange }, - { name: '选择头åƒ', codeCamel: 'avatar', widgetType: 8, change: this.inputChange } + { name: '选择头åƒ', codeCamel: 'avatar', widgetType: 8 } ], // è¦æ˜¾ç¤ºæŒ‰é’® showUserButtons: [