From fe903b2a6834ac06a2d1b49b705c74ad1ccb10d8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 28 七月 2023 12:04:53 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 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: {
-      // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙f樉绀洪殣钘忕殑鍊�
-      visible (){
-          this.isShowformulaEdit = this.visible;
-      }
+      // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙f樉绀洪殣钘忕殑鍊硷紝浠ュ強鍊肩殑鍥炲~
+      visible() {
+        this.isShowformulaEdit = this.visible;
+        this.formulaContent=this.componentRuleText || '';
+      },
+  },
+  mounted() {
+
   },
   methods: {
 

--
Gitblit v1.9.3