From a8894e0347bbabe6d4d570bafa2a166e18c66e83 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 九月 2023 14:52:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index d8893cf..f73ca39 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,8 +1,8 @@
<template>
<div v-if="display">
- <vciWebReferTree v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTree>
- <vciWebReferTable v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTable>
- <vciWebReferDefalut v-else @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferDefalut>
+ <vciWebReferTree :key="referConfig.field" :data-key="referConfig.field" ref="vciWebReferTree" v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTree>
+ <vciWebReferTable :key="referConfig.field" :data-key="referConfig.field" v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTable>
+ <vciWebReferDefalut :key="referConfig.field" :data-key="referConfig.field" v-else @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferDefalut>
</div>
</template>
@@ -17,12 +17,21 @@
components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
data() {
return {
+ reterTypeLeavl:'213',
refertype: this.referConfig.options.type,
emitData:{},
- title:''
+ title:'',
+ display:this.display || true,
+ disabled:this.disabled || false
};
},
- created() {},
+ created() {
+ if (!this.referConfig.options && this.referConfig.options.isMuti==undefined) {
+ this.referConfig.options = {
+ isMuti: this.referConfig.options.muti || false
+ }
+ }
+ },
mounted() {
var title = this.referConfig.title || '';
title = title.replace(":", "");
@@ -40,9 +49,11 @@
deep: true,
immediate: true,
handler(newV) {
+ this.text=newV.text;
+ this.value=newV.value;
this.$emit("setReferValue", newV);
- },
- }
+ }
+ },
}
}
</script>
--
Gitblit v1.9.3