qiangmj / report-ui

Commit 237fd13d5841dceab6c0bb14f012ad4a2495d73b

Authored by qianbao
1 parent 1ea22c3f

1、添加表格自动换行 

2添加表格列字体对其方式特殊属性
3添加折线图滑块默认100%
Inline Side-by-side
Showing 9 changed files with 86 additions and 21 deletions
config/dev.env.js
  View file @237fd13
... ... @@ -5,7 +5,7 @@ const prodEnv = require('./prod.env')
5 5 const isDev = false;
6 6 //开发API地址
7 7 // const devAdrress='"http://weberp.xlyprint.cn/xlyReport"';
8   -const devAdrress='"http://127.0.0.1:8080/xlyReport"';
  8 +const devAdrress='"http://172.16.114.9:8085/xlyReport"';
9 9 //正式打包API地址
10 10 const ipAdrress='"http://"+location.host+"/xlyReport"';
11 11  
... ...
src/mixins/queryform.js
  View file @237fd13
... ... @@ -178,8 +178,6 @@ export default {
178 178 const value = chartProperties[key];
179 179 obj["type"] = value;
180 180 obj["name"] = key;
181   - console.log("3333333",value,key);
182   - console.log("22222222",chartProperties,data);
183 181 for (let i = 0; i < data.length; i++) {
184 182 if (value.startsWith("xAxis")) {
185 183 // 代表为x轴
... ... @@ -216,7 +214,7 @@ export default {
216 214 const value = chartProperties[key];
217 215 obj["type"] = value;
218 216 obj["name"] = key;
219   - console.log("value",value);
  217 + // console.log("value",value);
220 218 if(value=='xAxis' || value=='bar'|| value=='line'){
221 219 for (let i = 0; i < data.length; i++) {
222 220 if (value.startsWith("xAxis")) {
... ...
src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue
  View file @237fd13
... ... @@ -12,6 +12,7 @@
12 12 <el-table-column prop="name" label="名称" width="60" />
13 13 <el-table-column prop="key" label="key值" width="70" />
14 14 <el-table-column prop="width" label="宽度" width="50" />
  15 + <el-table-column prop="textAlignCol" label="对齐" width="50" />
15 16 <el-table-column label="操作" width="100">
16 17 <template slot-scope="scope">
17 18 <div class="button-group">
... ... @@ -63,6 +64,19 @@
63 64 >
64 65 </el-input>
65 66 </el-form-item>
  67 + <el-form-item label="对齐:">
  68 + <el-select
  69 + v-model.trim="rowFormData['textAlignCol']"
  70 + placeholder="请选择"
  71 + size="mini"
  72 + >
  73 + <el-option label="无" value="none"></el-option>
  74 + <el-option label="居中" value="center"></el-option>
  75 + <el-option label="左对齐" value="left"></el-option>
  76 + <el-option label="右对齐" value="right"></el-option>
  77 + <el-option label="两端对齐" value="justify"></el-option>
  78 + </el-select>
  79 + </el-form-item>
66 80 </el-form>
67 81 <span slot="footer" class="dialog-footer">
68 82 <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
... ... @@ -89,7 +103,8 @@ export default {
89 103 rowFormData: {
90 104 name: "",
91 105 key: "",
92   - width: ""
  106 + width: "",
  107 + textAlignCol: ""
93 108 },
94 109 flag: true, // true 新增， false 编辑
95 110 indexEditor: -1, // 编辑第几个数据
... ...
src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js
  View file @237fd13
... ... @@ -596,7 +596,7 @@ export const widgetLinechart = {
596 596 name: 'startZoom',
597 597 required: false,
598 598 placeholder: '',
599   - value: 80,
  599 + value: 0,
600 600 },
601 601 {
602 602 type: 'el-slider',
... ...
src/views/bigscreenDesigner/designer/tools/configure/table/widget-table.js
  View file @237fd13
... ... @@ -63,6 +63,14 @@ export const widgetTable = {
63 63 value: true
64 64 },
65 65 {
  66 + type: 'el-switch',
  67 + label: '是否自动换行',
  68 + name: 'bAutoHeight',
  69 + required: false,
  70 + placeholder: '',
  71 + value: true
  72 + },
  73 + {
66 74 type: 'el-select',
67 75 label: '动画效果',
68 76 name: 'effect',
... ...
src/views/bigscreenDesigner/designer/widget/div/widgetDtImage.vue
  View file @237fd13
... ... @@ -108,10 +108,15 @@ export default {
108 108 }
109 109 },
110 110 getEchartData() {
111   - this.imageAdress=this.getShowPic();
  111 + const imageAdressOld =this.imageAdress;
  112 + const imageAdressNew =this.getShowPic();
  113 + //this.imageAdress = this.getShowPic();
112 114 this.imageAdressShow = this.isNotBlank(this.imageAdress);
113   - // console.log("this.imageAdress",this.imageAdress, this.imageAdressShow)
114   - this.reload();
  115 + // console.log("this.imageAdress",imageAdressOld, imageAdressNew,(imageAdressOld!==imageAdressNew) )
  116 + if(imageAdressOld!==imageAdressNew){
  117 + this.imageAdress = imageAdressNew;
  118 + this.reload();
  119 + }
115 120 },
116 121 getShowPic() {
117 122 const {textPic, slectedDataType} = this.transStyle;
... ...
src/views/bigscreenDesigner/designer/widget/div/widgetHtmlSlider.vue
  View file @237fd13
... ... @@ -100,7 +100,7 @@ export default {
100 100 urlData[i] = url;
101 101 }
102 102 }
103   - console.log("12",urlData);
  103 + // console.log("12",urlData);
104 104 this.urlData = urlData;
105 105 this.urlData={...this.urlData};
106 106 },
... ...
src/views/bigscreenDesigner/designer/widget/table/widgetTable.vue
  View file @237fd13
... ... @@ -20,11 +20,12 @@
20 20 :key="index"
21 21 :style="tableRowHeight()"
22 22 >
  23 + <!-- class="contentStyle"-->
23 24 <div
24   - class="content"
25 25 v-for="(itemChild, idx) in header"
26 26 :key="idx"
27 27 :style="[
  28 + contentStyle(),
28 29 bodyTableStyle,
29 30 bodyTable(index),
30 31 tableFiledWidth(idx),
... ... @@ -59,13 +60,15 @@ export default {
59 60 autoPage: true,
60 61 //effect: "top",
61 62 autoPlay: true,
  63 + bAutoHeight: true,
62 64 vis: 5,
63   - rowHeight: "50px"
  65 + rowHeight: "50px",
64 66 },
65 67 header: [],
66 68 list: [],
67 69 optionsSetUp: {},
68 70 optionsPosition: {},
  71 + // contentStyle:{},
69 72 optionsData: {}
70 73 };
71 74 },
... ... @@ -146,6 +149,19 @@ export default {
146 149 this.options = options;
147 150 this.hackResetFun();
148 151 },
  152 + contentStyle(){
  153 + let styleJson={};
  154 + const rollSet = this.optionsSetUp;
  155 + if(!rollSet.bAutoHeight){
  156 + styleJson["white-space"]="nowrap";
  157 + styleJson["overflow"]="nowrap";
  158 + styleJson["text-overflow"]="ellipsis";
  159 + styleJson["overflow-wrap"]="";
  160 + }else{
  161 + styleJson["overflow-wrap"]="break-word";
  162 + }
  163 + return styleJson;
  164 + },
149 165 handlerHead() {
150 166 const head = this.optionsSetUp.dynamicAddTable;
151 167 this.header = head;
... ... @@ -196,12 +212,18 @@ export default {
196 212 },
197 213 tableRowHeight() {
198 214 let styleJson = {};
199   - if (this.optionsSetUp.rowHeight) {
200   - styleJson["height"] = this.optionsSetUp.rowHeight + "px";
201   - styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
202   - } else {
203   - styleJson["height"] = this.options.rowHeight;
204   - styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
  215 + const bAutoHeight = this.optionsSetUp.bAutoHeight;
  216 + if(!bAutoHeight){
  217 + if (this.optionsSetUp.rowHeight) {
  218 + styleJson["height"] = this.optionsSetUp.rowHeight + "px";
  219 + styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
  220 + } else {
  221 + styleJson["height"] = this.options.rowHeight;
  222 + styleJson["line-height"] = this.optionsSetUp.rowHeight + "px";
  223 + }
  224 + }else{
  225 + styleJson["height"] = "auto";
  226 + styleJson["line-height"]=this.optionsSetUp.rowHeight+ "px";
205 227 }
206 228 return styleJson;
207 229 },
... ... @@ -210,6 +232,9 @@ export default {
210 232 if (this.optionsSetUp.dynamicAddTable[index].width) {
211 233 styleJson["width"] = this.optionsSetUp.dynamicAddTable[index].width;
212 234 }
  235 + if (this.optionsSetUp.dynamicAddTable[index].textAlignCol) {
  236 + styleJson["text-align"] = this.optionsSetUp.dynamicAddTable[index].textAlignCol;
  237 + }
213 238 return styleJson;
214 239 }
215 240 }
... ... @@ -239,8 +264,8 @@ export default {
239 264 }
240 265  
241 266 .txtScroll-top .infoList li {
242   - height: 50px;
243   - line-height: 50px;
  267 + //height: 50px;
  268 + //line-height: 50px;
244 269 display: flex;
245 270 flex-direction: row;
246 271 }
... ...
src/views/screenDesigner/components/dynamicAddTable.vue
  View file @237fd13
... ... @@ -12,6 +12,7 @@
12 12 <el-table-column prop="name" label="名称" width="60" />
13 13 <el-table-column prop="key" label="key值" width="70" />
14 14 <el-table-column prop="width" label="宽度" width="50" />
  15 + <el-table-column prop="textAlignCol" label="对齐" width="50" />
15 16 <el-table-column label="操作" width="100">
16 17 <template slot-scope="scope">
17 18 <div class="button-group">
... ... @@ -63,6 +64,18 @@
63 64 >
64 65 </el-input>
65 66 </el-form-item>
  67 + <el-form-item label="对齐方式:">
  68 + <el-select
  69 + v-model.trim="rowFormData['textAlignCol']"
  70 + placeholder="请选择"
  71 + >
  72 + <el-option label="无" value="none"></el-option>
  73 + <el-option label="居中" value="center"></el-option>
  74 + <el-option label="左对齐" value="left"></el-option>
  75 + <el-option label="右对齐" value="right"></el-option>
  76 + <el-option label="两端对齐" value="justify"></el-option>
  77 + </el-select>
  78 + </el-form-item>
66 79 </el-form>
67 80 <span slot="footer" class="dialog-footer">
68 81 <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
... ... @@ -88,7 +101,8 @@ export default {
88 101 rowFormData: {
89 102 name: "",
90 103 key: "",
91   - width: ""
  104 + width: "",
  105 + textAlignCol: ""
92 106 },
93 107 flag: true, // true 新增， false 编辑
94 108 indexEditor: -1, // 编辑第几个数据
... ...