centaline-data-driven 1.3.80 → 1.3.82

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 (13) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +5 -5
  3. package/src/assets/T.png +0 -0
  4. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue +1 -0
  5. package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue +1 -0
  6. package/src/centaline/dynamicForm/src/dynamicForm.vue +17 -7
  7. package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue +2 -0
  8. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +1 -2
  9. package/src/centaline/dynamicTree/src/dynamicSearchTree.vue +1 -1
  10. package/src/centaline/progress/src/progress.vue +3 -1
  11. package/src/main.js +4 -4
  12. package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
  13. 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.3.80",
3
+ "version": "1.3.82",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/SearchList.vue CHANGED
@@ -4,17 +4,17 @@
4
4
 
5
5
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
6
6
 
7
- <ct-searchlist :apiParam="para"
7
+ <!-- <ct-searchlist :apiParam="para"
8
8
  :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'"
9
9
  :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
10
10
  :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'"
11
11
  :searchStatsApi="'/ProfileWorklistList/getListStats'">
12
- </ct-searchlist>
13
-
14
- <!-- <ct-searchlist :searchConditionApi="'/PropertyDutyList/getLayoutOfSearch'"
15
- :searchDataApi="'/PropertyDutyList/getListOfSearchModelForRET'">
16
12
  </ct-searchlist> -->
17
13
 
14
+ <ct-searchlist :searchConditionApi="'/salemattersmanage/priceuploadlist/getLayoutOfSearch'"
15
+ :searchDataApi="'/salemattersmanage/priceuploadlist/getList'">
16
+ </ct-searchlist>
17
+
18
18
  <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
19
19
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
20
20
  :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
package/src/assets/T.png CHANGED
Binary file
package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue CHANGED
@@ -1101,6 +1101,7 @@ export default {
1101
1101
  margin-left: auto;
1102
1102
  font-size: 12px;
1103
1103
  text-align: right;
1104
+ min-width: 400px;
1104
1105
  .max-report {
1105
1106
  height: 26px;
1106
1107
  color: #333333;
package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue CHANGED
@@ -1094,6 +1094,7 @@ export default {
1094
1094
  margin-left: auto;
1095
1095
  font-size: 12px;
1096
1096
  text-align: right;
1097
+ min-width: 400px;
1097
1098
  .max-report {
1098
1099
  height: 26px;
1099
1100
  color: #333333;
package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
14
14
  :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
15
15
  @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
16
- @input="inputHandler(col,$event)" @importComplete="importComplete"
16
+ @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
17
17
  @popupSearchList="popupSearchListHandler"
18
18
  @tableButtonClick="clickHandler"></component>
19
19
  </el-col>
@@ -28,7 +28,7 @@
28
28
  <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
29
29
  :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
30
30
  @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
31
- @input="inputHandler(col,$event)" @importComplete="importComplete"
31
+ @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
32
32
  @popupSearchList="popupSearchListHandler"
33
33
  @tableButtonClick="clickHandler"></component>
34
34
  </el-col>
@@ -48,7 +48,7 @@
48
48
  <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
49
49
  :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
50
50
  @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
51
- @input="inputHandler(col,$event)" @importComplete="importComplete"
51
+ @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
52
52
  @popupSearchList="popupSearchListHandler"
53
53
  @tableButtonClick="clickHandler"></component>
54
54
  </el-col>
@@ -61,8 +61,8 @@
61
61
  <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
62
62
  <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara"
63
63
  :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
64
- @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
65
- @input="inputHandler(col,$event)" @importComplete="importComplete"
64
+ @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
65
+ @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
66
66
  @popupSearchList="popupSearchListHandler"
67
67
  @tableButtonClick="clickHandler"></component>
68
68
  </el-col>
@@ -457,7 +457,7 @@
457
457
  attrs: {
458
458
  progressAction: res.content.action,
459
459
  progressKey: res.content.key,
460
- progressType:'import',
460
+ progressType:field.isExport?'export':'import',
461
461
  width: '350px',
462
462
  height: '165px'
463
463
  },
@@ -614,7 +614,7 @@
614
614
  self.model.requiredHandle(field);
615
615
  //self.model.validMrf(field);
616
616
 
617
- if(field.onAfterChanged){
617
+ if(field.onAfterChanged && field.type!==4){
618
618
  var router =self.model.actionRouters.find((v) => {
619
619
  return v.id === field.onAfterChanged;
620
620
  });
@@ -623,6 +623,16 @@
623
623
 
624
624
  self.$forceUpdate();
625
625
  },
626
+ blurHandler(field) {
627
+ var self = this;
628
+ if(field.onAfterChanged){
629
+ var router =self.model.actionRouters.find((v) => {
630
+ return v.id === field.onAfterChanged;
631
+ });
632
+ self.clickHandler(router);
633
+ }
634
+ self.$forceUpdate();
635
+ },
626
636
  enterHandler(field) {
627
637
  var self = this;
628
638
  if (typeof field.change !== 'undefined') {
package/src/centaline/dynamicInputNumber/src/dynamicInputNumber.vue CHANGED
@@ -71,6 +71,7 @@
71
71
  this.model.value = '';
72
72
  this.inputHandler(this.model.value);
73
73
  this.changeHandler(this.model.value);
74
+ this.$emit('blur',event);
74
75
  this.isShowClear();
75
76
  event.stopPropagation();
76
77
  },
@@ -90,6 +91,7 @@
90
91
  onBlurHandler:function(event){
91
92
  this.model.value = this.$common.numToFloat(this.model.value, this.model.decimals);//保留n位小数
92
93
  this.inputHandler();
94
+ this.$emit('blur', event);
93
95
  },
94
96
  //不能共用的数据校验
95
97
  selfValidExcute: function (eventName) {
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -926,7 +926,7 @@
926
926
  attrs: {
927
927
  progressAction: res.content.action,
928
928
  progressKey: res.content.key,
929
- progressType: 'import',
929
+ progressType: field.isExport?'export':'import',
930
930
  width: '350px',
931
931
  height: '165px'
932
932
  },
@@ -1437,7 +1437,6 @@
1437
1437
  var self = this;
1438
1438
  if (field.flagAsync) {
1439
1439
  if (res.content && res.content.action) {
1440
- console.log(field.pageTitle || field.label)
1441
1440
  var dialogOption = {
1442
1441
  title: field.pageTitle || field.label,
1443
1442
  content: [{
package/src/centaline/dynamicTree/src/dynamicSearchTree.vue CHANGED
@@ -152,7 +152,7 @@
152
152
  attrs: {
153
153
  progressAction: res.content.action,
154
154
  progressKey: res.content.key,
155
- progressType: 'import',
155
+ progressType: field.isExport?'export':'import',
156
156
  width: '350px',
157
157
  height: '165px'
158
158
  },
package/src/centaline/progress/src/progress.vue CHANGED
@@ -54,10 +54,11 @@
54
54
  self.message = response.rtnMsg;
55
55
  }
56
56
  }
57
+
57
58
  if (response.rtnCode === 200 && data.rtnCode === 200) {
58
59
  this.percentage = data.percentage;
59
60
  if (data.flagFinished) {
60
- if(this.progressType=='export'){
61
+ if(this.progressType=='export' && data.content){
61
62
  window.open(data.content, "_blank");
62
63
  }
63
64
  setTimeout(() => { self.$emit('finished',data); }, 800);
@@ -67,6 +68,7 @@
67
68
  }
68
69
  }
69
70
  else {
71
+ self.isDestroy = true;
70
72
  self.$emit('error',data);
71
73
  }
72
74
  });
package/src/main.js CHANGED
@@ -14,7 +14,7 @@ Vue.config.productionTip = false;
14
14
  Vue.use(centaline, {
15
15
  baseUrl: "http://10.88.22.46:7070/v1/form/router",
16
16
  // baseUrl: "http://10.88.23.25:9999/v1/form/router",
17
- // baseUrl: "http://10.88.22.42:9999/v1/form/router",
17
+ // baseUrl: "http://10.25.10.63:9999/v1/form/router",
18
18
  // baseUrl: "http://10.88.22.40:8080/",
19
19
  // baseUrl: "http://tjcptest.centaline.com.cn/",
20
20
  // flagRouterSelf: true,
@@ -43,14 +43,14 @@ Vue.use(centaline, {
43
43
  getRequestHeaders: function () {
44
44
  return {
45
45
  oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
46
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZPswDC7Q6cLNh6CrOtugpURSDTGu6sROnpf8YrX_P-EcT5BA3YBN7TS6wJuaKUnYrUkHe7UemThCh15h57F86HtKr9voYB0v0JDIixGykoKGML0CzWp-4Z5TLdjevzj3GUaPrPKQbmsDaZAZ-Q6ZwxOHRqV6HIkiinD6w0AAP__.wPEHSZ2zu23Cf4v2l_KHdhstyAgBFY54UciD69X-TgM',
46
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbykr319pWxacPEjSFs74GQEEo3x38UIG7tnOMNZ7n3BOCdowK3gjjZ6v4I72uiJ2DuSDg_eBWRhgzWFGgNL4FPbmXBsoYLyuEFDIlbMYl3BEKdfsGz1N8xjuZ_L8x_nrtOwzApbQ4UjZiWMnJPBmAyjck5blb328QLvDwAAAP__.b1UTfg-eMfXXKVsyKE8gc8OcWo42HrH6hlgzimGLWNY',
47
47
 
48
48
  originalRequestURL: 'http://10.88.22.67:8080',
49
49
  EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
50
50
  estateId: '20210729104021C49F04B55C50F6AF58',
51
51
 
52
- authObject: '{"currentEstate":{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
53
- Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjA2MGI3YmMzLTI1NjgtNDYzNS1iMmM4LTBlM2NlMmUyYjQzMyJ9.hZOUnj7eGNlpjNmdQbfGbZsSWJgF-PUNyn8dgUMtOUjV0pRwKUQU60lc5H0JllH2AuecDe0dhx4iwm5_HndB1A',
52
+ authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"OSVersion":"","clientVersion":"","machineCode":""}',
53
+ Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImUzOWE4NDQwLTYwYTYtNDI0MC05Y2QzLTBlMmRmNWYyNDEzOSJ9.w3aKWpGoMFfx1haNo8FSiZrdbS9dXZM60FJw43tBRgrV2uSRJubJ6ec5FaYSs-O9empUtP577jEsjpvG1Msuyw',
54
54
  };
55
55
  },
56
56
  // 请求完成事件，可判断是否登录过期执行响应操作