From 4fc262011d2b60429dc570f2259a997fff941a29 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 31 七月 2023 16:29:56 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 0e22d34..1a3157b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -207,8 +207,8 @@
         </el-container>
       </el-dialog>
       <!--        鍏ㄥ睆缂栬緫-->
-      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
-        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
+      <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true" :before-close="escEdit" >
+        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :editStyleFlag="editStyleFlag" :editOpenFlag="editOpenFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
       </el-dialog>
       <!--      缁勫悎瑙勫垯-->
       <formula-editor :systemVariableTableData="systemVariableTableData"
@@ -252,7 +252,7 @@
     </div>
     <el-table :data="ProData"
               style="width: 100%"
-              :height="!this.editStyleFlag ? 450 : 900"
+              :height="this.editStyleFlag? 800 : 343"
               @cell-click="handleCellClicks"
               @select="selectHandle"
               @selection-change="selectionChange"
@@ -332,6 +332,10 @@
       default: false
     },
     editOpenFlag:{
+      type: Boolean,
+      default: false
+    },
+    editStyleFlag:{
       type: Boolean,
       default: false
     },
@@ -1904,7 +1908,6 @@
         this.$message.warning('璇烽�夋嫨涓�涓ā鏉�')
       } else {
         this.editStyleFlag=true;
-        // this.editOpenFlag=true;
         this.attrEditVisible = true;
         this.attrFlag = true;
       }

--
Gitblit v1.9.3