Merge remote-tracking branch 'origin/master'

jiangping

2024-05-20 dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9

 admin/src/components/common/GlobalWindow.vue

@@ -21,7 +21,8 @@
    <div v-if="withFooter" class="window__footer">
      <slot name="footer">
        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
        <el-button @click="close">返回</el-button>
        <slot name="btns" />
        <el-button @click="close">{{ backText }}</el-button>
      </slot>
    </div>
  </el-drawer>
@@ -45,6 +46,10 @@
      type: String,
      default: '确定'
    },
    backText: {
      type: String,
      default: '返回'
    },
    // 确认按钮loading状态
    confirmWorking: {
      type: Boolean,
@@ -66,6 +71,7 @@
      this.$emit('confirm')
    },
    close () {
      this.$emit('close')
      this.$emit('update:visible', false)
    }
  }