Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 admin/src/components/common/GlobalAlertWindow.vue

@@ -6,8 +6,10 @@
    :with-header="true"
    :width="width"
    :close-on-press-escape="false"
    :close-on-click-modal="false"
    :wrapper-closable="false"
    :append-to-body="true"
    :show-close="!showClose"
    @close="close"
  >
    <div slot="title" class="window__header">
@@ -19,7 +21,7 @@
    <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 v-if="!showCancel" @click="close">取消</el-button>
      </slot>
    </div>
  </el-dialog>
@@ -33,6 +35,14 @@
      type: String,
      default: '50%'
    },
    showClose: {
      type: Boolean,
      default: false
    },
    showCancel: {
      type: Boolean,
      default: false
    },
    // 是否包含底部操作
    withFooter: {
      type: Boolean,