fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
Showing only changes of commit 5d8f537d05 - Show all commits

View File

@ -6,14 +6,14 @@
<el-col v-for="c in COLUMN_PER_ROW" :key="`${n}+'col'+${c}`" :span="24 / COLUMN_PER_ROW"> <el-col v-for="c in COLUMN_PER_ROW" :key="`${n}+'col'+${c}`" :span="24 / COLUMN_PER_ROW">
<el-form-item <el-form-item
v-if="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]" v-if="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]"
:prop="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name || configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]" :prop="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name"
:key="`${n}-col-${c}-item`" :key="`${n}-col-${c}-item`"
:label="getLabel(n, c)" :label="getLabel(n, c)"
> >
<!-- 暂时先不实现部分输入方式 --> <!-- 暂时先不实现部分输入方式 -->
<el-input <el-input
v-if="getType(n, c) === 'input'" v-if="getType(n, c) === 'input'"
:placeholder="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].placeholder || ''" :placeholder="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].placeholder || '...'"
v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]" v-model="dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]"
/> />
<el-radio v-if="getType(n, c) === 'radio'"></el-radio> <el-radio v-if="getType(n, c) === 'radio'"></el-radio>
@ -127,22 +127,19 @@ export default {
// '' // ''
return Math.ceil(this.configs.fields.length / COLUMN_PER_ROW) return Math.ceil(this.configs.fields.length / COLUMN_PER_ROW)
} }
// computedModel: {
// get(n, c) {
// return this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name
// ? dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].name]
// : dataForm[configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]]
// },
// set() {}
// }
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
/** 转换 configs.fields 的结构,把纯字符串转为对象 */
this.configs.fields = this.configs.fields.map(item => {
if (typeof item === 'string') {
return { name: item }
}
return item
})
/** 动态设置dataForm字段 */ /** 动态设置dataForm字段 */
this.configs.fields.forEach(item => { this.configs.fields.forEach(item => {
if (typeof item === 'string') {
this.$set(this.dataForm, [item], '')
} else if (typeof item === 'object') {
this.$set(this.dataForm, [item.name], '') this.$set(this.dataForm, [item.name], '')
if (item.api) { if (item.api) {
/** 自动请求并填充 */ /** 自动请求并填充 */
@ -188,7 +185,6 @@ export default {
this.$set(this.dataFormRules, [item.name], [...item.rules]) this.$set(this.dataFormRules, [item.name], [...item.rules])
} }
} // end if (item.rules) } // end if (item.rules)
}
}) })
/** 检查是否需要额外的组件 */ /** 检查是否需要额外的组件 */
@ -225,7 +221,7 @@ export default {
const opt = this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)] const opt = this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]
if (opt) { if (opt) {
// if opt is valid // if opt is valid
return typeof opt === 'string' ? this.defaultNames[opt] : opt.label ? opt.label : this.defaultNames[opt.name] return opt.label ? opt.label : this.defaultNames[opt.name]
} }
}, },
getType(n, c) { getType(n, c) {