Commit 15ba059d6cd6bc5af8bc8ce987b7109b02d58db5

Authored by qianbao
1 parent db113db3

1、添加表格自动换行

2添加表格列字体对其方式特殊属性
3添加折线图滑块默认100%
config/dev.env.js
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 const merge = require('webpack-merge') 2 const merge = require('webpack-merge')
3 const prodEnv = require('./prod.env') 3 const prodEnv = require('./prod.env')
4 //是否开发状态 4 //是否开发状态
5 -const isDev = false; 5 +const isDev = true;
6 //开发API地址 6 //开发API地址
7 // const devAdrress='"http://weberp.xlyprint.cn/xlyReport"'; 7 // const devAdrress='"http://weberp.xlyprint.cn/xlyReport"';
8 const devAdrress='"http://weberp.xlyprint.cn:8888/xlyReport"'; 8 const devAdrress='"http://weberp.xlyprint.cn:8888/xlyReport"';
src/views/bigscreenDesigner/designer/widget/div/widgetHtmlSlider.vue
@@ -22,6 +22,9 @@ @@ -22,6 +22,9 @@
22 :autoplay="autoPlay" 22 :autoplay="autoPlay"
23 :loop="true" 23 :loop="true"
24 @change="handleSlideChange" 24 @change="handleSlideChange"
  25 + @mouseenter.native="handleMouseEnter"
  26 + arrow="always"
  27 + :hover="false"
25 ref="carousel"> 28 ref="carousel">
26 <el-carousel-item v-for="(slide, index) in slides" :key="index"> 29 <el-carousel-item v-for="(slide, index) in slides" :key="index">
27 <div class="slide"> 30 <div class="slide">
@@ -164,6 +167,7 @@ export default { @@ -164,6 +167,7 @@ export default {
164 this.options = this.value; 167 this.options = this.value;
165 }, 168 },
166 mounted() { 169 mounted() {
  170 + this.$refs.carousel.handleMouseEnter=()=>{};
167 // 初始加载第一个幻灯片 171 // 初始加载第一个幻灯片
168 this.slides[0].loading = true; 172 this.slides[0].loading = true;
169 this.startProgressBar(); 173 this.startProgressBar();
@@ -270,6 +274,10 @@ export default { @@ -270,6 +274,10 @@ export default {
270 this.slides[index].error = true; 274 this.slides[index].error = true;
271 } 275 }
272 }, 276 },
  277 + handleMouseEnter(){
  278 + this.$refs.carousel.handleMouseEnter=()=>{};
  279 + },
  280 +
273 handleSlideChange(currentIndex, prevIndex) { 281 handleSlideChange(currentIndex, prevIndex) {
274 this.currentSlide = currentIndex; 282 this.currentSlide = currentIndex;
275 // 计算下一个幻灯片索引(用于预加载) 283 // 计算下一个幻灯片索引(用于预加载)