From 80b00fc662651e4ee20507904364bfcebce2e4ac Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 02 八月 2023 18:23:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 2bfd2cc..4f61aaa 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -343,10 +343,14 @@
export default {
name: "formulaEditor",
props: {
- // 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
+ // 瀵硅瘽妗嗘樉绀洪殣钘忔帶鍒�
visible: {
type: "Boolean",
default: false,
+ },
+ componentRuleText:{
+ type:String,
+ default: ""
},
//鏈満鏅彉閲�
thisSceneTableData: {
@@ -645,10 +649,14 @@
};
},
watch: {
- // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
- visible (){
- this.isShowformulaEdit = this.visible;
- }
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊硷紝浠ュ強鍊肩殑鍥炲～
+ visible() {
+ this.isShowformulaEdit = this.visible;
+ this.formulaContent=this.componentRuleText || '';
+ },
+ },
+ mounted() {
+
},
methods: {
--
Gitblit v1.9.3