centaline-data-driven 1.2.84 → 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.
Files changed (11) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +4 -9
  3. package/src/centaline/css/common.css +9 -0
  4. package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue +6 -1
  5. package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +3 -1
  6. package/src/centaline/loader/src/ctl/ContactList.js +2 -2
  7. package/src/centaline/loader/src/ctl/Detail.js +4 -1
  8. package/src/centaline/loader/src/ctl/SearchTable.js +2 -2
  9. package/src/main.js +4 -4
  10. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  11. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.2.84",
3
+ "version": "1.2.87",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/SearchList.vue CHANGED
@@ -4,14 +4,14 @@
4
4
 
5
5
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
6
6
 
7
- <ct-searchlist :searchConditionApi="'/api/distribution/agentRelationProperty/getLayoutOfSearch'"
8
- :searchDataApi="'/api/distribution/agentRelationProperty/list'" :apiParam="para"></ct-searchlist>
7
+ <!-- <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'"
8
+ :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
9
9
 
10
- <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
10
+ <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
11
11
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
12
12
  :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
13
13
  :searchStatsApi="'/exampleList/getListStats'"
14
- ></ct-searchlist> -->
14
+ ></ct-searchlist>
15
15
 
16
16
  <!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
17
17
  <!-- <ct-searchlist :searchConditionApi="'/PropertyStatusList/getLayoutOfSearch'" :searchDataApi="'/PropertyStatusList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
@@ -26,11 +26,6 @@
26
26
  data() {
27
27
  return {
28
28
  para:{
29
- agentId: "1491335181504401409",
30
- delegateType: "1",
31
- estateId: "18721",
32
- estateName: "凯旋路1798号"
33
-
34
29
  },
35
30
  // para: {searchFields: {fields: []}, pageAttribute: {pageIndex: 1}, flagSearch: true}
36
31
  // para: {publishID: "1503900718229229568"}
package/src/centaline/css/common.css CHANGED
@@ -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
 
package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue CHANGED
@@ -67,7 +67,10 @@
67
67
  </component>
68
68
  </div>
69
69
  <span :slot="showIndex>0?'reference':''" class="more" style="margin-left: 10px;"></span>
70
- </el-popover>
70
+ </el-popover>
71
+ </div>
72
+ <div ref="shortcutFollow" v-if="model.shortcutFollowForm!==undefined && model.shortcutFollowForm!==null" class="shortcutFollow" style="margin-top: 16px;">
73
+ <ct-form :source="model.shortcutFollowForm"></ct-form>
71
74
  </div>
72
75
  <div class="tablist-info base-box">
73
76
  <div class="details-tabs-box">
@@ -90,11 +93,13 @@
90
93
  <script>
91
94
  import dynamicElement from '../../mixins/dynamicElement';
92
95
  import dynamicContact from '../../dynamicContact/src/dynamicContact.vue';
96
+ import dynamicForm from '../../dynamicForm/src/dynamicForm.vue';
93
97
  export default {
94
98
  name: 'ct-PropertySimpleDetailRET',
95
99
  mixins: [dynamicElement],
96
100
  components: {
97
101
  'ct-contact': dynamicContact,
102
+ 'ct-form': dynamicForm,
98
103
  },
99
104
  props: {
100
105
  vmodel: Object,
package/src/centaline/dynamicForm/src/dynamicFormListTable.vue CHANGED
@@ -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>
package/src/centaline/loader/src/ctl/ContactList.js CHANGED
@@ -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
  });
package/src/centaline/loader/src/ctl/Detail.js CHANGED
@@ -32,7 +32,7 @@ const Detail = function (source,para ,callBack) {
32
32
  _commissionList:null,
33
33
  get title() {
34
34
  return data.title;
35
- },
35
+ },
36
36
  get fields1() {
37
37
  return data.fields1;
38
38
  },
@@ -370,6 +370,9 @@ const Detail = function (source,para ,callBack) {
370
370
  }
371
371
  return rtn._commissionList;
372
372
  },
373
+ get shortcutFollowForm() {
374
+ return data.shortcutFollowForm;
375
+ },
373
376
  doAction(response,field) {
374
377
  if (response.responseData) {
375
378
  response = response.responseData;
package/src/centaline/loader/src/ctl/SearchTable.js CHANGED
@@ -609,7 +609,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
609
609
  rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
610
610
  }
611
611
  });
612
- if (rtn.cellLayout != "") {
612
+ if (rtn.cellLayout) {
613
613
  rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
614
614
  }
615
615
  }
@@ -764,7 +764,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
764
764
  }
765
765
 
766
766
  source.page.rows = source.page.rows - deleteRow.length;
767
- if (rtn.cellLayout != "") {
767
+ if (rtn.cellLayout) {
768
768
  rtn.$vue.$delete(rtn.listData, rtn.selectIndex);
769
769
  }
770
770
  break;
package/src/main.js CHANGED
@@ -12,10 +12,10 @@ Vue.use(ElementUI, { size: 'mini'});
12
12
  // 关闭生产模式下给出的提示
13
13
  Vue.config.productionTip = false;
14
14
  Vue.use(centaline, {
15
- // baseUrl: "http://10.88.22.46:7070/v1/form/router",
15
+ baseUrl: "http://10.88.22.46:7070/v1/form/router",
16
16
  // baseUrl: "http://10.88.23.22:9999/v1/form/router",
17
- baseUrl: "http://10.88.22.69:8080/",
18
- flagRouterSelf: true,
17
+ // baseUrl: "http://10.88.22.69:8080/",
18
+ // flagRouterSelf: true,
19
19
  zindex: 999,
20
20
  showRequestErrorMessage: true,
21
21
  handler: {
@@ -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',