Merge remote-tracking branch 'origin/master'

k94314517

2024-10-09 8f2ad5eb040a2f3f1cae62a9c099c8f5f66750e1

 admin/src/components/common/GlobalWindow.vue

@@ -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,