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 | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 dc5648d..4f61aaa 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -312,9 +312,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="40">
+ <el-table-column prop="formula" width="120">
</el-table-column>
- <el-table-column prop="desc" width="100"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="绯荤粺鍙橀噺" name="second">
@@ -324,9 +324,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="150">
+ <el-table-column prop="formula" width="200">
</el-table-column>
- <el-table-column prop="desc" width="150"> </el-table-column>
+ <el-table-column prop="desc" width="200"> </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -338,15 +338,19 @@
</el-dialog>
</template>
-
+
<script>
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: {
@@ -675,14 +683,14 @@
}
//鍏紡鍐呭鍥炴樉
// 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
- this.$emit('updateFormulaContent', this.formulaContent)
- this.isShowformulaEdit = false;
+ this.$emit('updateFormulaContent', this.formulaContent)
+ this.isShowformulaEdit = false;
},
},
};
</script>
-
+
<style scoped>
.formula-box-card >>> .el-card__body {
@@ -690,7 +698,7 @@
height: 85%;
width: 100%;
}
-
+
.formula-editor-total {
/* margin-top: 3px; */
height: 100%;
@@ -718,7 +726,7 @@
height: auto;
justify-content: space-between;
align-items: center;
- }
+ }
.formula-editor-btn-sm {
width: 4.5vw;
@@ -732,4 +740,3 @@
}
</style>
-
\ No newline at end of file
--
Gitblit v1.9.3