Commit 787cb1a1 authored by youjie's avatar youjie

no message

parent 110c1be7
......@@ -24,10 +24,11 @@
<el-tooltip class="item" effect="dark" :content="'尺寸'+x+'*'+y" placement="top" v-if="x&&y">
<div class="cursorInitial fz14">{{x}} * {{y}}</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="设置字体大小(默认34px)" placement="top" v-if="isFontSize">
<p class="row-aic">
<el-tooltip class="item" effect="dark" content="设置字体大小(默认34px),最小值30,最大值40" placement="top" v-if="isFontSize">
<p class="row-aic" style="padding: 0 0 8px 0;">
<span class="fz14" style="flex-shrink: 0;margin-right: 3px;">字体大小</span>
<el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize2" style="width: 80px;height: 34px;"></el-input>
<el-input-number class="" min="30" max="40" v-model="FeatureData.dataObj.ShadowFontSize2"></el-input-number>
<!-- <el-input class="ShadowFontSize" type="number" size="mini" v-model="FeatureData.dataObj.ShadowFontSize2" style="width: 80px;height: 34px;"></el-input> -->
<span class="cursorInitial fz14" style="flex-shrink: 0;margin-left: 5px;">
<span class="relative" style="top: -3px;">px</span>
</span>
......
......@@ -58,12 +58,13 @@
</div>
</div>
<div class="UpgradedVersion-Hover">
<div class="absolute z-index3" style="top: 204px;right: 44px;">
<div class="absolute z-index3" style="top: 192px;right: 42px;">
<FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
:isFontSize="true"></FeatureControls>
</div>
<div class="featureHome-right-three z-index1"
:class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active relative':'absolute']">
:class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active relative':'absolute']"
:style="{'max-height':FeatureItem.dataObj.ShadowFontSize2>0?'1000px':'',}">
<div>
<div class="featureHomeBjH1 featureHomeBj1"
:class="[FeatureItem.dataObj.ShadowFontSize>0||FeatureItem.dataObj.ShadowFontSize2>0?'active absolute':'relative']" :style="{'background':TripColor}">&nbsp;</div>
......@@ -83,7 +84,8 @@
'width':FeatureItem.dataObj.ShadowFontSize2>0?'50%':'',
'overflow':FeatureItem.dataObj.ShadowFontSize2>0?'initial':'initial',
'writing-mode':FeatureItem.dataObj.ShadowFontSize2>0?'vertical-lr':'',
'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',}">
'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',
'max-height':FeatureItem.dataObj.ShadowFontSize2>0?'900px':'',}">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"
:fontSize="FeatureItem.dataObj.ShadowFontSize2"></vEditDiv>
</div>
......@@ -93,7 +95,8 @@
'width':FeatureItem.dataObj.ShadowFontSize2>0?'50%':'',
'overflow':FeatureItem.dataObj.ShadowFontSize2>0?'initial':'initial',
'writing-mode':FeatureItem.dataObj.ShadowFontSize2>0?'vertical-lr':'',
'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',}">
'letter-spacing':FeatureItem.dataObj.ShadowFontSize2>0?'25px':'',
'max-height':FeatureItem.dataObj.ShadowFontSize2>0?'1000px':'',}">
<vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"
:fontSize="FeatureItem.dataObj.ShadowFontSize2"></vEditDiv>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment