From 45d6fb0c9846c1a8f55958ed8fc00ed909470610 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 26 六月 2023 11:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index acb2ed6..0733ce0 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -8,6 +8,7 @@
v-loading="loading"
ref="form"
:style="{ minHeight: loading ? '300px' : '' }"
+ :key="updateIndex"
>
<template :slot="item.prop + 'Label'" v-for="item in slotColumnList">
<span>
@@ -82,7 +83,7 @@
},
data() {
return {
- formIndex: 0,
+ updateIndex: 0,
form: {},
option: {
emptyBtn: false,
@@ -517,6 +518,7 @@
collapse: true,
column: [],
});
+ return;
}
if (
formItem.type === "combox" &&
@@ -559,13 +561,16 @@
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
- referConfig:formItem.type=='refer'?{
- title:formItem.text ,
- showField:formItem.showField || formItem.field,
- field: formItem.field,
- placeholder: formItem.inputTip,
- options:formItem.referConfig
- }:{},
+ referConfig:
+ formItem.type == "refer"
+ ? {
+ title: formItem.text,
+ showField: formItem.showField || formItem.field,
+ field: formItem.field,
+ placeholder: formItem.inputTip,
+ options: formItem.referConfig,
+ }
+ : {},
span: formItem.type === "textarea" ? 24 : this.trendsSpan,
rules: [
{
@@ -595,8 +600,8 @@
this.slotColumnList = slotColumnList;
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
- this.formIndex++;
- if (this.type === 'add') {
+ this.updateIndex++;
+ if (this.type === "add") {
this.loading = false;
}
this.geDictData(dictKeys);
@@ -637,7 +642,7 @@
handleResize() {
let windowWidth = document.body.clientWidth;
this.trendsSpan = 24 / Math.floor(windowWidth / 500);
- this.formIndex++;
+ this.updateIndex++;
},
// 鍓嶅悗缂�
preOrSufFixShow(type, val) {
@@ -700,21 +705,22 @@
},
// 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
getFormDetail() {
- if (this.type === 'add') return
+ if (this.type === "add") return;
getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
(res) => {
- this.form = Object.assign(this.form, res.data.data[0])
+ this.form = Object.assign(this.form, res.data.data[0]);
this.loading = false;
}
);
},
- setReferValue(data){
- if(data.field){
- this.form[data.field]=data.value || '';
- this.form[data.showField]=data.text || '';
+ setReferValue(data) {
+ if (data.field) {
+ this.form[data.field] = data.value || "";
+ this.form[data.showField] = data.text || "";
this.$emit("getFormData", this.form);
+ this.$emit("referConfigDataUpdate", data);
}
- }
+ },
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
--
Gitblit v1.9.3