From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platform/src/components/common/GlobalWindow.vue |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/platform/src/components/common/GlobalWindow.vue b/platform/src/components/common/GlobalWindow.vue
index 56150c5..298b468 100644
--- a/platform/src/components/common/GlobalWindow.vue
+++ b/platform/src/components/common/GlobalWindow.vue
@@ -8,18 +8,20 @@
     :close-on-press-escape="false"
     :wrapper-closable="false"
     :append-to-body="true"
+    :modal="false"
     @close="close"
   >
     <div slot="title" class="window__header">
       <span class="header__btn-back" @click="close"><i class="el-icon-arrow-left"></i></span>{{title}}
+      <!-- {{title}} -->
     </div>
     <div class="window__body">
       <slot></slot>
     </div>
     <div v-if="withFooter" class="window__footer">
       <slot name="footer">
-        <el-button @click="confirm" :loading="confirmWorking" type="primary">纭畾</el-button>
-        <el-button @click="close">鍙栨秷</el-button>
+        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
+        <el-button @click="close">杩斿洖</el-button>
       </slot>
     </div>
   </el-drawer>
@@ -31,12 +33,17 @@
   props: {
     width: {
       type: String,
-      default: '36%'
+      default: '100%'
     },
     // 鏄惁鍖呭惈搴曢儴鎿嶄綔
     withFooter: {
       type: Boolean,
       default: true
+    },
+    // 鎻愪氦鎸夐挳鏂囧瓧
+    text: {
+      type: String,
+      default: '纭畾'
     },
     // 纭鎸夐挳loading鐘舵��
     confirmWorking: {
@@ -70,11 +77,16 @@
 // 杈撳叆妗嗛珮搴�
 $input-height: 32px;
 .global-window {
+  top: 80px !important;
+  left: 250px !important;
   // 澶撮儴鏍囬
-  /deep/ .el-drawer__header {
+  ::v-deep .el-drawer__header {
     padding: 0 10px 0 0;
     line-height: 40px;
     border-bottom: 1px solid #eee;
+    // text-align: center;
+    font-weight: 500;
+    color: #222;
     // 杩斿洖鎸夐挳
     .header__btn-back {
       display: inline-block;
@@ -90,7 +102,7 @@
     }
   }
   // 涓讳綋
-  /deep/ .el-drawer__body {
+  ::v-deep .el-drawer__body {
     display: flex;
     flex-direction: column;
     position: absolute;
@@ -98,12 +110,24 @@
     bottom: 0;
     width: 100%;
     overflow: hidden;
+    // background-color: #f7f7f7;
     // 鍐呭
     .window__body {
+      // width: 1100px;
+      // margin: 0 auto;
+      // background-color: #fff;
+      width: 100%;
       height: 100%;
       overflow-y: auto;
       padding: 12px 16px;
-      
+      // 鏍囩
+      // .el-form-item__label {
+      //   float: none;
+      // }
+      // 鍏冪礌瀹藉害涓�100%
+      .el-form-item__content > *{
+        width: 100%;
+      }
     }
     // 灏鹃儴
     .window__footer {

--
Gitblit v1.9.3