centaline-data-driven 1.3.80 → 1.3.81

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 (9) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +5 -5
  3. package/src/centaline/dynamicForm/src/dynamicForm.vue +1 -1
  4. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +1 -2
  5. package/src/centaline/dynamicTree/src/dynamicSearchTree.vue +1 -1
  6. package/src/centaline/progress/src/progress.vue +3 -1
  7. package/src/main.js +4 -4
  8. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  9. 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.81",
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/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -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
  },
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
@@ -12,9 +12,9 @@ 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.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,
@@ -49,8 +49,8 @@ Vue.use(centaline, {
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
  // 请求完成事件，可判断是否登录过期执行响应操作