centaline-data-driven 1.4.37 → 1.4.39

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 (10) hide show
  1. package/package.json +1 -1
  2. package/src/SearchList.vue +6 -6
  3. package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue +1 -1
  4. package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue +1 -1
  5. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +5 -1
  6. package/src/centaline/loader/src/ctl/Base.js +9 -0
  7. package/src/centaline/loader/src/ctl/Dtd.js +3 -5
  8. package/src/main.js +3 -2
  9. package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
  10. 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.4.37",
3
+ "version": "1.4.39",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/SearchList.vue CHANGED
@@ -11,10 +11,10 @@
11
11
  :searchStatsApi="'/ProfileWorklistList/getListStats'">
12
12
  </ct-searchlist> -->
13
13
 
14
- <!-- <ct-searchlist :apiParam="para"
15
- :searchConditionApi="'/PropertyTrustList/getLayoutOfSearch'"
16
- :searchDataApi="'/PropertyTrustList/getListOfSearchModel'">
17
- </ct-searchlist> -->
14
+ <ct-searchlist :apiParam="para"
15
+ :searchConditionApi="'/distribution/jumpPoint/getLayoutOfSearch'"
16
+ :searchDataApi="'/distribution/jumpPoint/list'">
17
+ </ct-searchlist>
18
18
 
19
19
  <!-- <ct-searchlist
20
20
  :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'"
@@ -22,11 +22,11 @@
22
22
  :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
23
23
  </ct-searchlist> -->
24
24
 
25
- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
25
+ <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
26
26
  :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
27
27
  :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
28
28
  :searchStatsApi="'/PropertyRETList/getListStats'">
29
- </ct-searchlist>
29
+ </ct-searchlist> -->
30
30
 
31
31
  <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
32
32
  :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  </el-table-column>
14
14
  </el-table>
15
15
  <div style="margin-top: 20px;width: 100%;display: inline-block;height: 30px;margin-bottom: 10px;">
16
- <span class="ct-table-tip-mini" v-if="!loading && model" v-html="model.footer"></span> <span class="ct-table-tip-mini" v-if="!loading && model" style="color:red;">已勾选 {{selectCount}} 条</span>
16
+ <span class="ct-table-tip-mini" v-if="!loading && model" v-html="model.footer"></span> <span class="ct-table-tip-mini" v-if="!loading &&!singleSelectio&& model" style="color:red;">已勾选 {{selectCount}} 条</span>
17
17
  <el-input v-if="jumpBtnName" size="mini" v-model="jumpStr" placeholder="定位" style="width:150px"></el-input>
18
18
  <el-button v-if="jumpBtnName" size="mini" @click="jumpClickHandler()">{{jumpBtnName}}</el-button>
19
19
  <el-button v-if="filterBtnName" size="mini" @click="filterClickHandler()" style="margin-left: 0px;">{{filterBtnName}}</el-button>
package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue CHANGED
@@ -207,7 +207,7 @@
207
207
  }
208
208
  .max-seachpopper {
209
209
  position: absolute;
210
- z-index: 9999;
210
+ z-index: 999;
211
211
  width: 100%;
212
212
  padding: 5px 10px 10px 10px!important;
213
213
  background-color: #fff !important;
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -977,7 +977,11 @@ export default {
977
977
  if (data.rtnMsg) {
978
978
  self.$message.success(data.rtnMsg);
979
979
  }
980
- self.getPage(1);
980
+ if(!field.isExport)
981
+ {
982
+ self.getPage(1);
983
+ }
984
+
981
985
  },
982
986
  error(data) {
983
987
  self.$common.closeDialog(dialogOption.dialog);
package/src/centaline/loader/src/ctl/Base.js CHANGED
@@ -46,12 +46,21 @@ const Base = function (source) {
46
46
  set code1(v) {
47
47
  source.code1 = v;
48
48
  },
49
+ get code2() {
50
+ return source.code2;
51
+ },
49
52
  set code2(v) {
50
53
  source.code2 = v;
51
54
  },
55
+ get code3() {
56
+ return source.code3;
57
+ },
52
58
  set code3(v) {
53
59
  source.code3 = v;
54
60
  },
61
+ get code4() {
62
+ return source.code4;
63
+ },
55
64
  set code4(v) {
56
65
  source.code4 = v;
57
66
  },
package/src/centaline/loader/src/ctl/Dtd.js CHANGED
@@ -6,7 +6,6 @@ import Vue from 'vue';
6
6
  import common from '../../../common';
7
7
 
8
8
  const Dtd = function (source, dateType) {
9
- var self = this;
10
9
  if (!dateType) {
11
10
  dateType = "date";
12
11
  }
@@ -38,7 +37,7 @@ const Dtd = function (source, dateType) {
38
37
  else
39
38
  return '';
40
39
  },
41
- defaultFormat: [source.code1, source.code2],
40
+ defaultFormat: [source.defaultCode1 || '', source.defaultCode2 || ''],
42
41
  get value() {
43
42
  return source.code1;
44
43
  },
@@ -63,9 +62,8 @@ const Dtd = function (source, dateType) {
63
62
  return source.fieldName2;
64
63
  },
65
64
  reset() {
66
- this.formatValue = this.defaultFormat;
67
- rtn.value = this.formatValue[0];
68
- rtn.value1 = this.formatValue[1];
65
+ source.code1 = rtn.defaultFormat[0];
66
+ source.code2 = rtn.defaultFormat[1];
69
67
  },
70
68
  getFormObj() {
71
69
  var rtnFormObj = {};
package/src/main.js CHANGED
@@ -16,8 +16,9 @@ Vue.use(centaline, {
16
16
  // baseUrl: "http://10.25.10.63:9999/v1/form/router",
17
17
  // baseUrl: "http://10.88.22.42:9999/v1/form/router",
18
18
  // baseUrl: "http://10.88.22.69:8080/api/",
19
+ baseUrl: "http://10.88.22.40:8080/api/",
19
20
  // baseUrl: "http://tjcptest.centaline.com.cn/",
20
- // flagRouterSelf: true,
21
+ flagRouterSelf: true,
21
22
  zindex: 999,
22
23
  showRequestSuccessMessage: true,
23
24
  showRequestErrorMessage: true,
@@ -42,7 +43,7 @@ Vue.use(centaline, {
42
43
  // 获取请求头
43
44
  getRequestHeaders: function () {
44
45
  return {
45
- oldToken: '9a73e482-db16-4a24-81e7-67daef02b64d',
46
+ oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
46
47
  token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9laza59fZ27-j0wMaPIAeeCVZGINEY_12M0NH7ildMJpl5wTC1UIIu4IZWmrCAG1ppiDgoSY37oBFZ2KKn6DGyRD5WtY2HCgrIjxuUJHPTiFUtoE_jL3AUwjeYhnw_5ec_zl3Hfp7NZNRll7FN3iBb12G6dIwiGsRx2p07B-8PAAAA__8.znyY_zAn4f_Xdz-2UVSafJIf9z5zDANUKWzpMIPEJdA',
47
48
 
48
49
  originalRequestURL: 'http://10.88.22.67:8080',