From c83e5706898ca1d479d4d078157e16a73c4eaba2 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 21 三月 2024 11:41:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue | 80 ++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue index d0ccd6c..65e77a0 100644 --- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue +++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue @@ -1,9 +1,25 @@ <template> - <basic-container> - <el-dialog v-if="dialogFormVisible" :title="title" :visible.sync="dialogFormVisible" @close="closeHandler" append-to-body> - <avue-form v-model="form" :option="option" @submit="submitHandler" @reset-change="changeHandler"></avue-form> - </el-dialog> - </basic-container> + <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid"> + <avue-form v-model="form" :option="option"> + <template v-for="item in slotData" :slot="item.prop + 'Label'"> + <span> + <span>{{ item.label }} </span> + <el-tooltip + v-if="item.keyAttr" + class="item" + content="璇ュ睘鎬т负鍏抽敭灞炴��" + effect="dark" + placement="top-start" + > + <i class="el-icon-star-on" style="font-size: 17px !important; color: red;vertical-align: baseline;"></i> + </el-tooltip> + </span> + </template> + <template slot="menuForm"> + <dynamic-button type="form" :butttonList="componentVO.buttons" @buttonClick="buttonClick"></dynamic-button> + </template> + </avue-form> + </div> </template> <script> @@ -31,48 +47,30 @@ type: Object, default: {} }, - visible: { - type: Boolean, - default: false, - }, - title: { - type: String - }, - formList:{ - type:Array - }, }, data() { return { form: {}, } }, + mounted() { + // console.log('componentVO--',this.componentVO.tableDefineVO.cols[0]) + }, computed: { - dialogFormVisible: { - get() { - return this.visible; - }, - set(val) { - this.$emit("update:visible", val); - }, - }, option() { return { - column: this.formColumn(this.formList) + submitBtn: false, + emptyBtn: false, + height: 300, + column: this.formColumn(this.componentVO.tableDefineVO.cols[0]) } }, + slotData() { + return this.formColumn(this.componentVO.tableDefineVO.cols[0]) + } }, - methods:{ - //琛ㄥ崟鎻愪氦 - submitHandler(form,done){ - console.log(form) - done() - }, - changeHandler(){ - this.form = {}; - // this.clearValidate() 娓呯┖鏍¢獙 - // this.resetFields() - }, + methods: { + //杞寲鏁版嵁 formColumn(formList) { return formList.map(item => { const typeValue = item.type === 'text' ? 'input' : item.type === 'combox' ? 'select' : item.type; @@ -82,13 +80,15 @@ prop: item.field, type: typeValue, value: item.defaultValue, - dicData: item.type === 'combox' ? item.dicData : null, + dicData: item.type === 'combox' ? item.dicData : item.dicUrl, readonly: item.readOnly, disabled: item.disabled, labelSuffix: item.suffix, suffixIcon: item.prefix, - placeholder:item.placeholder, - clearable:item.clearable, + placeholder: item.placeholder, + clearable: item.clearable, + tip: item.tooltips, + keyAttr: item.keyAttr, rules: [{ required: item.required, message: `璇疯緭鍏�${item.text}!`, @@ -97,8 +97,8 @@ } }) }, - closeHandler(){ - this.form = {}; + buttonClick(item) { + console.log(item.id) }, } } -- Gitblit v1.9.3