centaline-data-driven 1.2.86 → 1.2.87

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.86",
3
+ "version": "1.2.87",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
@@ -803,5 +803,14 @@ html {
803
803
  .el-input-group{
804
804
  line-height: 26px;
805
805
  }
806
+ .shortcutFollow .ct-form{
807
+ margin:0px !important;
808
+ }
809
+ .shortcutFollow .ct-form .el-card__body{
810
+ padding:0px !important;
811
+ }
812
+ .shortcutFollow .ct-form .el-card__body .el-col{
813
+ padding:0px 5px 0 0 !important;
814
+ }
806
815
 
807
816
 
@@ -69,9 +69,9 @@
69
69
  <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
70
70
  </el-popover>
71
71
  </div>
72
- <!-- <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" style="margin-top: 16px;">
72
+ <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" class="shortcutFollow" style="margin-top: 16px;">
73
73
  <ct-form :source="model.shortcutFollowForm"></ct-form>
74
- </div> -->
74
+ </div>
75
75
  <div class="tablist-info base-box">
76
76
  <div class="details-tabs-box">
77
77
  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
@@ -52,7 +52,9 @@
52
52
  <span v-else-if="scope.row.isSet" class="el-tag el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
53
53
  取消
54
54
  </span>
55
- <span v-for="(v,i) in model.buttons" v-if="!scope.row.isSet && v.show" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
55
+ <span v-for="(v,i) in model.buttons"
56
+ v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )"
57
+ class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
56
58
  {{v.label}}
57
59
  </span>
58
60
  </template>
@@ -379,11 +379,11 @@ const ContactList = function (source,para ,callBack) {
379
379
  var deleteRow = response.content.split(',');
380
380
  if (deleteRow) {
381
381
  deleteRow.forEach((r) => {
382
- let strat=0;
382
+ let strat=-1;
383
383
  let count=0;
384
384
  rtn._listData.forEach((v,i) => {
385
385
  if(v[rtn.rowHiddenKey]===r){
386
- if(strat===0)strat=i;
386
+ if(strat===-1)strat=i;
387
387
  count=count+1;
388
388
  }
389
389
  });
@@ -371,7 +371,7 @@ const Detail = function (source,para ,callBack) {
371
371
  return rtn._commissionList;
372
372
  },
373
373
  get shortcutFollowForm() {
374
- return rtn.shortcutFollowForm;
374
+ return data.shortcutFollowForm;
375
375
  },
376
376
  doAction(response,field) {
377
377
  if (response.responseData) {
package/src/main.js CHANGED
@@ -39,7 +39,7 @@ Vue.use(centaline, {
39
39
  // 获取请求头
40
40
  getRequestHeaders: function () {
41
41
  return {
42
- oldToken: '5c3b43fb-5051-40e0-b9dc-577f37767af0',
42
+ oldToken: 'd7a1705d-d8f4-4fee-9778-f9f6e402eacd',
43
43
  originalRequestURL: 'http://10.88.22.67:8080',
44
44
  EstateInfo: ' {"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"undefined"}',
45
45
  Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6Ijk4NGM0ZjJlLTRhNTgtNDM4YS1iNjkxLWQyMTI4ZjdlYjNlMyJ9.nxO4kEXzIM2RJTXuX_AOoctKFvBiTZUEwHTu1YSFMn8JBjM9p-RK31ZB8ckJvlwgjiDGdbuGt1QOZRRP9KS3qQ',