centaline-data-driven 1.2.60 → 1.2.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.60",
3
+ "version": "1.2.63",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
@@ -0,0 +1,4 @@
1
+ .ccai.ct-Sw .ct-radios {
2
+ padding-top: 0px;
3
+ padding-bottom: 0;
4
+ }
@@ -98,6 +98,8 @@
98
98
  </component>
99
99
  </div>
100
100
  <!--正常的列-->
101
+ <div v-else-if="column.flagHtml" v-html="row[column.id]" :class="column.autoRowHeight ? 'lineFeedCell':'cell'" :style="column.style ? column.style:''">
102
+ </div>
101
103
  <div v-else-if="typeof column.template === 'undefined'" :class="column.autoRowHeight ? 'lineFeedCell':'cell'">
102
104
  {{row.rowHiddenColumns && row.rowHiddenColumns.includes(column.id)?"":row[column.id]}}
103
105
  </div>
@@ -30,7 +30,7 @@
30
30
  <component v-if="model.otherTradeActionRouter!==null" v-bind="model.otherTradeActionRouter" class="max-default"
31
31
  :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" @click="fieldClickHandler(model.otherTradeActionRouter,$event)"></component>
32
32
  <img :class="{'domDisabled':parentModel && parentModel.selectIndex<=0}" @click="clickPrevHandler" src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:11px;cursor: pointer">
33
- <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
33
+ <img :class="{'domDisabled':parentModel && parentModel.listData && parentModel.selectIndex===parentModel.listData.length-1}" @click="clickNextHandler" src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left:8px;cursor: pointer">
34
34
  </div>
35
35
  <div class="mt5">
36
36
  <component class="max-report w93" v-if="model.actionRouters!==null && model.actionRouters[0]!==null"
@@ -138,15 +138,17 @@
138
138
  </div>
139
139
  </div>
140
140
  <div class="contacts-info base-box">
141
- <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" ></ct-contactList>
141
+ <ct-contactList v-if="model.contactApiRouter!==null" :apiRouter="model.contactApiRouter" :key="'contact'+refershKey" ></ct-contactList>
142
142
  </div>
143
143
  <div class="tablist-info base-box">
144
144
  <div class="details-tabs-box">
145
145
  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
146
146
  <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID"
147
- :index="index.toString()" :name="index.toString()" :label="col.appName"></el-tab-pane>
147
+ :index="index.toString()" :name="index.toString()">
148
+ <div slot="label" v-html="col.appName"></div>
149
+ </el-tab-pane>
148
150
  </el-tabs>
149
- <ct-searchlist v-if="model.searchConditionApiTags1" :key="model.searchlistKey"
151
+ <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list'+listKey.toString()+refershKey"
150
152
  :apiParam="model.paramDataTags1" :flagFocus="false"
151
153
  :searchConditionApi="model.searchConditionApiTags1"
152
154
  :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
@@ -175,7 +177,7 @@
175
177
  <div v-if="model.operationList!==null" :key="model.operationKey" class="operation-table base-box">
176
178
  <div v-for="(col, index) in model.operationList" :key="index" class="table-box">
177
179
  <div class="t-item">
178
- <span class="i">{{col.operationName}}</span>
180
+ <span class="i" v-html="col.operationName"></span>
179
181
  </div>
180
182
  <div class="t-item"><span class="i" :class="'operation'+col.flagKey" :style="{color:col.descColor}">{{col.desc}}</span></div>
181
183
  <div class="t-item" style="min-height: 50px;">
@@ -314,7 +316,9 @@
314
316
  ],
315
317
  },
316
318
  allInfo: false,
317
- allIn:false,
319
+ allIn:false,
320
+ refershKey:0,
321
+ listKey:0,
318
322
  }
319
323
  },
320
324
  mounted() {
@@ -341,6 +345,7 @@
341
345
  var self = this;
342
346
  this.model = data;
343
347
  this.model.$vue = self;
348
+ this.refershKey=this.refershKey+1;
344
349
  this.loadFields();
345
350
  if(this.model.tags2 && this.model.tags2[0]){
346
351
  this.model.getTags2List(0);
@@ -430,7 +435,7 @@
430
435
  let i=key.index;
431
436
  this.model.activeIndex1=i;
432
437
  if(this.model.tags1 && this.model.tags1[i]){
433
- this.model.searchlistKey=this.model.searchlistKey+1;
438
+ this.listKey=this.listKey+1;
434
439
  this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
435
440
  this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
436
441
  this.model.paramDataTags1=this.model.tags1[i].paramData||'';
@@ -594,6 +599,7 @@
594
599
  },
595
600
  clickNextHandler() {
596
601
  if(this.parentModel){
602
+ console.log(this.parentModel)
597
603
  let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
598
604
  this.parentModel.$vue.rowKeyDownHandle(null,1);
599
605
  let newValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
@@ -604,7 +610,7 @@
604
610
  }
605
611
  }
606
612
  },
607
- clickPrevHandler() {
613
+ clickPrevHandler() {
608
614
  if(this.parentModel){
609
615
  let oldValue=this.parentModel.listData[this.parentModel.selectIndex][this.parentModel.primaryKey];
610
616
  this.parentModel.$vue.rowKeyDownHandle(null,-1);
@@ -223,10 +223,10 @@
223
223
  let i=key.index;
224
224
  this.model.activeIndex1=i;
225
225
  if(this.model.tags1 && this.model.tags1[i]){
226
- this.model.searchlistKey=this.model.searchlistKey+1;
227
- this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
228
- this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
229
- this.model.paramDataTags1=this.model.tags1[i].paramData||'';
226
+ // this.model.searchlistKey=this.model.searchlistKey+1;
227
+ // this.model.searchConditionApiTags1=this.model.tags1[i].searchConditionApiUrl||'';
228
+ // this.model.searchDataApiTags1=this.model.tags1[i].searchDataApiUrl||'';
229
+ // this.model.paramDataTags1=this.model.tags1[i].paramData||'';
230
230
  }
231
231
  },
232
232
  fieldClickHandler(field) {
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="field-top">
3
- <div v-if="model !== null" class="ct-Sw">
3
+ <div v-if="model !== null" class="ccai ct-Sw">
4
4
  <div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
5
5
  <div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
6
6
  {{model.label}}
@@ -247,7 +247,10 @@ const ContactList = function (source,para ,callBack) {
247
247
  get title() {
248
248
  return v.columnToolTip;
249
249
  }
250
- }
250
+ },
251
+ get flagHtml() {
252
+ return v.flagHtml;
253
+ },
251
254
  };
252
255
  if (col.show) {
253
256
  //合并表头时暂不支持固定列
@@ -20,8 +20,7 @@ const Detail = function (source,para ,callBack) {
20
20
  detailHeight:750,
21
21
  midlWidth:1200,
22
22
  activeIndex1:'0',
23
- activeIndex2:'0',
24
- searchlistKey:0,
23
+ activeIndex2:'0',
25
24
  tags2Key:0,
26
25
  operationKey:0,
27
26
  _searchConditionApiTags1:null,