From 1b2642c615001b3435a9e99e478517a917f656af Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 26 四月 2024 17:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/PLT-basic-component/basicForm.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/components/PLT-basic-component/BasicForm.vue b/Source/ProjectWeb/src/components/PLT-basic-component/basicForm.vue
similarity index 90%
rename from Source/ProjectWeb/src/components/PLT-basic-component/BasicForm.vue
rename to Source/ProjectWeb/src/components/PLT-basic-component/basicForm.vue
index f7bc17b..cf56bf7 100644
--- a/Source/ProjectWeb/src/components/PLT-basic-component/BasicForm.vue
+++ b/Source/ProjectWeb/src/components/PLT-basic-component/basicForm.vue
@@ -1,8 +1,9 @@
<template>
<!--鍔ㄦ�佹ā鏉�-->
<avue-form ref="formRef" :option="option" v-model="form">
- <template v-for="item in allColumn" :slot="`${item.prop}`" v-if="item.propType === 'refer' || item.type === 'refer'">
+ <template v-for="item in allColumn" :slot="item.prop+ ''">
<vciWebRefer
+ v-if="item.propType === 'refer' || item.type === 'refer'"
:key="item.prop"
referType="master"
:data-key="item.prop"
@@ -14,6 +15,10 @@
:value="form[item.prop]"
@setReferValue="setReferValue"
></vciWebRefer>
+ <!-- 瀵屾枃鏈帶浠� -->
+ <rich-text v-if="item.type === 'richText'" :value="form[subitemName]" @input="form[subitemName] = $event"></rich-text>
+ <!-- 琛ㄥ崟涓婁紶鏂囦欢缁勪欢 -->
+ <form-upload v-if="item.type === 'upload'"></form-upload>
</template>
</avue-form>
</template>
@@ -75,8 +80,10 @@
datetime: "datetime",
date: "date",
refer: "refer",
- multiFile:"upload"
- }
+ multiFile:"upload",
+ richText:'richText'
+ },
+ subitemName:""
};
},
watch: {
@@ -133,6 +140,7 @@
code = this.initItem(code);
column.push(code);
this.allColumn.push(code);
+ console.log('allColumn',this.allColumn)
}
this.option.column = column;
},
@@ -177,7 +185,13 @@
trigger: "blur"
}]
}
+ if(col.type === 'richText'){
+ this.subitemName = col.field;
+ }else if(col.type === 'upload'){
+ console.log('col',col)
+ }
if (col.type === "select") {
+ // console.log('col',col)
if(!validatenull(col.dictCode)) {
getDicts(col.dictCode).then((res) => {
if (res.data.success){
--
Gitblit v1.9.3