From 09fff7d4449fe9fe9e8cd1ffca560ff57e22ed5a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:52:34 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
index d78462b..dc5648d 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -46,6 +46,7 @@
<el-col :span="10">
<el-card
class="box-card formula-box-card"
+ data-v-49729759
style="height: 35vh;">
<div slot="header" class="clearfix">
<span style="font-size: medium">杩愮畻绗�</span>
@@ -342,6 +343,11 @@
export default {
name: "formulaEditor",
props: {
+ // 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
+ visible: {
+ type: "Boolean",
+ default: false,
+ },
//鏈満鏅彉閲�
thisSceneTableData: {
type: Array,
@@ -353,7 +359,7 @@
},
data() {
return {
- isShowformulaEdit: false, //鍏紡缂栬緫妗嗗璇濇鏄剧ず鎺у埗
+ isShowformulaEdit: this.visible, //鍏紡缂栬緫妗嗗璇濇鏄剧ず鎺у埗
formulaContent: '', //鍏紡缂栬緫妗嗗唴瀹�,鏂逛究鍊肩殑鍥炰紶
activeName: 'first', //褰撳墠娲诲姩鐨則ab
activeNameAttr: 'first', //鍙橀噺涓殑褰撳墠娲诲姩tab
@@ -638,6 +644,12 @@
],
};
},
+ watch: {
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
+ visible (){
+ this.isShowformulaEdit = this.visible;
+ }
+ },
methods: {
//鍙屽嚮娣诲姞鍏紡鍐呭
@@ -652,6 +664,7 @@
//鍏抽棴鏃舵竻绌轰笂娆″叕寮忓唴瀹�
closeFormulaEdit(){
this.resetFormulaContent();
+ this.$emit('update:visible',false);
},
//缂栬緫瀹屾垚鍏紡鍐呭鍥炴樉骞跺叧闂璇濇
saveFormulaContent(){
@@ -661,7 +674,8 @@
return;
}
//鍏紡鍐呭鍥炴樉
- this.$emit('updateFormulaContent', this.formulaContent) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
+ // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
+ this.$emit('updateFormulaContent', this.formulaContent)
this.isShowformulaEdit = false;
},
@@ -669,9 +683,9 @@
};
</script>
-<style>
+<style scoped>
- .formula-box-card > .el-card__body {
+ .formula-box-card >>> .el-card__body {
padding: 0px;
height: 85%;
width: 100%;
--
Gitblit v1.9.3