Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 admin/src/components/common/GlobalWindow.vue

@@ -8,7 +8,7 @@
    :close-on-press-escape="false"
    :wrapper-closable="false"
    :append-to-body="true"
    :modal="false"
    :modal="true"
    @close="close"
  >
    <div slot="title" class="window__header">
@@ -20,7 +20,7 @@
    </div>
    <div v-if="withFooter" class="window__footer">
      <slot name="footer">
        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
        <el-button v-if="showConfirm" @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
        <slot name="btns" />
        <el-button @click="close">{{ backText }}</el-button>
      </slot>
@@ -55,6 +55,10 @@
      type: Boolean,
      default: false
    },
    showConfirm: {
      type: Boolean,
      default: true
    },
    // 标题
    title: {
      type: String,