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 | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
index 3d555d7..65e77a0 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
@@ -1,6 +1,7 @@
<template>
- <avue-form v-model="form" :option="option">
- <template v-for="item in slotData" :slot="item.prop + 'Label'">
+ <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
@@ -13,11 +14,12 @@
<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>
+ </template>
+ <template slot="menuForm">
+ <dynamic-button type="form" :butttonList="componentVO.buttons" @buttonClick="buttonClick"></dynamic-button>
+ </template>
+ </avue-form>
+ </div>
</template>
<script>
@@ -78,7 +80,7 @@
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,
--
Gitblit v1.9.3