From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3ba7da9..a5cb7ef 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,6 +26,7 @@
</template>
<template :slot="item.prop + ''" v-for="item in slotColumnList">
<vciWebRefer
+ :key="item.prop" :data-key="item.prop"
v-if="item.type == 'refer'"
:referConfig="item.referConfig || {}"
:value="form[item.referConfig.field] || item.value"
@@ -89,9 +90,13 @@
type: String,
default: "",
},
+ eventList:{
+ type:Array
+ }
},
data() {
return {
+ eventFlag:{},
TreeValueForm:'',
updateIndex: 0,
form: {},
@@ -119,9 +124,12 @@
slotColumnList: [],
};
},
- mounted() {
+ mounted() {
this.handleResize();
},
+ created() {
+
+ },
computed: {
localTrendsSpan() {
if (this.trendsSpan) {
@@ -156,6 +164,16 @@
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList,TreeValue) {
+ if (this.eventList) {
+ this.eventFlag= this.eventList.some(item => {
+ if (item.classifyInvokeEditFlag === 'true') {
+ console.log('even', item);
+ this.eventObject = item;
+ return true;
+ }
+ });
+ // console.log('add',add)
+ }
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
let group = [];
@@ -164,6 +182,7 @@
let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ console.log(formItem)
// console.log('formItem.dicData.value',formItem.dicData)
if (formItem.type === "line") {
group.push({
@@ -221,7 +240,7 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
+ (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
--
Gitblit v1.9.3