From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/components/makepager/StatusCommonView.vue | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/src/components/makepager/StatusCommonView.vue b/src/components/makepager/StatusCommonView.vue
index d8b23c8..9361001 100644
--- a/src/components/makepager/StatusCommonView.vue
+++ b/src/components/makepager/StatusCommonView.vue
@@ -1,15 +1,16 @@
<template>
<div class="common-status">
<div v-if="showButton" style="margin-left: 30px">
- <el-button plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
- <el-button plain size="mini" disabled>鎵撳嵃</el-button>
+ <el-button v-if="isValidateClick" plain size="mini" @click="validateClick">楠岃瘉</el-button>
+ <el-button v-if="showOther" plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
+ <el-button v-if="showOther" plain size="mini" disabled>鎵撳嵃</el-button>
</div>
<div class="arrowsBox">
<div
class="arrowsItem"
v-for="(item, index) in list"
:key="index"
- :style="item.status === 'active' && index === 0 ? { background: '#495057' } : ''"
+ :style="item.status === 'active' && index === 0 ? { background: '#2a78fb' } : ''"
>
<div
class="arrows_up arrows"
@@ -57,26 +58,42 @@
isDelClick: {
type: Boolean,
default: false
+ },
+ isValidateClick: {
+ type: Boolean,
+ default: false
+ },
+ showOther: {
+ type: Boolean,
+ default: true
}
},
data() {
- return {
- delClick() {
- this.$emit("delClick")
- }
- }
+ return {}
},
- methods: {}
+ methods: {
+ // 楠岃瘉
+ validateClick() {
+ this.$emit("validateClick")
+ },
+ // 鍒犻櫎
+ delClick() {
+ this.$emit("delClick")
+ }
+ }
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.common-status {
- overflow: hidden;
- border: 1px solid #e9e9e9;
+ // overflow: hidden;
+ // border: 1px solid #e9e9e9;
display: flex;
align-items: center;
+ margin: 10px 30px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #e9e9e9;
.arrowsBox {
margin-left: auto;
display: flex;
@@ -88,15 +105,20 @@
position: relative;
height: 100%;
width: 80px;
+ z-index: 9999;
.arrows_up {
+ box-sizing: border-box;
transform-origin: right top;
transform: skewX(30deg);
+ border-top: 1px solid #e9e9e9;
border-right: 1px solid #e9e9e9;
}
.arrows_down {
+ box-sizing: border-box;
transform-origin: right bottom;
transform: skewX(-30deg);
border-right: 1px solid #e9e9e9;
+ border-bottom: 1px solid #e9e9e9;
}
&:first-child {
border-left: 1px solid #e9e9e9;
@@ -118,7 +140,7 @@
// background: #edf9ff;
// }
.arrows_active {
- background: #495057;
+ background: #2a78fb;
}
// .arrows_todo {
// background: #2c2c2c;
--
Gitblit v1.8.0