From 6af6557a8d8a525ec3cab33607b8a041ef0968fa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 11:15:31 +0800
Subject: [PATCH] 历史导入生成编码时添加前后缀代码逻辑添加；历史导入模板下载时查询模板返回的key不区分大小写。
---
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 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 ff11590..2f380b6 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -3,18 +3,19 @@
<el-dialog
title="鍏紡缂栬緫妗�"
append-to-body
+ :close-on-click-modal="false"
:visible.sync="isShowformulaEdit"
@close="closeFormulaEdit"
- width="78%"
- style="height: 150vh; margin-top: -13vh; overflow: hidden">
-
- <div style="overflow-y: auto; height: 80vh">
+ width="75%"
+ class="avue-dialog avue-dialog--top" top="-3%"
+ style="height: 100vh;">
+ <div>
<el-row>
<!-- 宸︿晶鍏紡鍐呭 -->
<el-col :span="14" style="overflow: hidden">
<el-card
class="box-card"
- style="height: 33vh; overflow-y: auto; overflow-x: auto">
+ style="height: 29.5vh; overflow-y: auto; overflow-x: auto;margin-right: 10px">
<div slot="header" class="clearfix">
<span style="font-size: medium">鍏紡鍐呭</span>
<el-button
@@ -35,8 +36,8 @@
<div class="text item">
<el-input
type="textarea"
- :rows="5"
- style="width: 560px"
+ :rows="6"
+ style="width: 100%"
v-model="formulaContent"
></el-input>
</div>
@@ -47,7 +48,7 @@
<el-card
class="box-card formula-box-card"
data-v-49729759
- style="height: 35vh;">
+ style="height: 29.5vh;">
<div slot="header" class="clearfix">
<span style="font-size: medium">杩愮畻绗�</span>
</div>
@@ -216,11 +217,10 @@
</el-row>
<el-row>
<!-- 宸︿晶鍏紡閫夋嫨鍖哄煙 -->
- <el-col :span="14" style="overflow: hidden">
+ <el-col :span="14" style="overflow: hidden;">
<el-card
class="box-card"
- style="height: 40vh; overflow-y: auto; overflow-x: auto"
- >
+ style="height: 35vh; overflow-y: auto; overflow-x: auto;margin-right: 10px">
<div slot="header" class="clearfix">
<span style="font-size: medium">鍏紡閫夋嫨</span>
</div>
@@ -235,7 +235,7 @@
>
<el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="300"> </el-table-column>
+ <el-table-column prop="desc"> </el-table-column>
</el-table>
</el-tab-pane>
@@ -248,7 +248,7 @@
>
<el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="300"> </el-table-column>
+ <el-table-column prop="desc"> </el-table-column>
</el-table>
</el-tab-pane>
@@ -261,7 +261,7 @@
>
<el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="300"> </el-table-column>
+ <el-table-column prop="desc"> </el-table-column>
</el-table>
</el-tab-pane>
@@ -274,7 +274,7 @@
>
<el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="300"> </el-table-column>
+ <el-table-column prop="desc"> </el-table-column>
</el-table>
</el-tab-pane>
@@ -287,7 +287,7 @@
>
<el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="300"> </el-table-column>
+ <el-table-column prop="desc" > </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -298,7 +298,7 @@
<el-col :span="10" style="overflow: hidden">
<el-card
class="box-card"
- style="height: 40vh; overflow-y: auto; overflow-x: auto"
+ style="height: 35vh; overflow-y: auto; overflow-x: auto"
>
<div slot="header" class="clearfix">
<span style="font-size: medium">鍙橀噺</span>
@@ -312,9 +312,9 @@
:show-header="false"
style="width: 100%"
>
- <el-table-column prop="formula" width="120">
+ <el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="200"> </el-table-column>
+ <el-table-column prop="desc"> </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="200">
+ <el-table-column prop="formula" width="300">
</el-table-column>
- <el-table-column prop="desc" width="200"> </el-table-column>
+ <el-table-column prop="desc"> </el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -339,7 +339,7 @@
</el-dialog>
</template>
- <script>
+<script>
export default {
name: "formulaEditor",
props: {
@@ -649,13 +649,14 @@
};
},
watch: {
- // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
- visible (){
- this.isShowformulaEdit = this.visible;
- }
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊硷紝浠ュ強鍊肩殑鍥炲～
+ visible() {
+ this.isShowformulaEdit = this.visible;
+ this.formulaContent=this.componentRuleText || '';
+ },
},
mounted() {
- this.formulaContent=this.componentRuleText
+
},
methods: {
@@ -728,8 +729,8 @@
}
.formula-editor-btn-sm {
- width: 4.5vw;
- height: 4vh;
+ width: 68px;
+ height: 34px;
margin-left: 10px;
text-align: center;
line-height: 0;
--
Gitblit v1.9.3