Merge remote-tracking branch 'origin/v1.4' into v1.4
This commit is contained in:
commit
41df7ed375
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="variable-input">
|
<div class="variable-input" :class="{'show-copy': !showCopy}">
|
||||||
<el-input class="el-input__inner_pd" :disabled="isReadOnly" :value="value" v-bind="$attrs" :size="size" @change="change" @input="input"/>
|
<el-input class="el-input__inner_pd" :disabled="isReadOnly" :value="value" v-bind="$attrs" :size="size" @change="change" @input="input"/>
|
||||||
<div :class="{'hidden': !showVariable}" class="variable-combine" v-if="value">
|
<div :class="{'hidden': !showVariable}" class="variable-combine" v-if="value">
|
||||||
<div v-if="showCopy" class="variable">{{variable}}</div>
|
<div v-if="showCopy" class="variable">{{variable}}</div>
|
||||||
|
@ -75,13 +75,20 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
||||||
.variable-input {
|
.variable-input {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-input__inner_pd >>> .el-input__inner {
|
.el-input__inner_pd >>> .el-input__inner {
|
||||||
padding-right: 135px;
|
padding-right: 135px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.show-copy .el-input__inner_pd >>> .el-input__inner {
|
||||||
|
padding-right: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.variable-combine {
|
.variable-combine {
|
||||||
color: #7F7F7F;
|
color: #7F7F7F;
|
||||||
max-width: 80px;
|
max-width: 80px;
|
||||||
|
|
Loading…
Reference in New Issue