centaline-data-driven 1.4.46 → 1.4.48

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 (12) hide show
  1. package/package.json +1 -1
  2. package/src/centaline/css/common.css +1 -1
  3. package/src/centaline/css/max.css +0 -3
  4. package/src/centaline/dynamicLayout/src/dynamicLayout.vue +1 -1
  5. package/src/centaline/dynamicSearchList/src/dynamicTableTip.vue +0 -1
  6. package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue +2 -2
  7. package/src/centaline/loader/src/ctl/CellLayout.js +1 -1
  8. package/src/centaline/loader/src/ctl/Form.js +2 -1
  9. package/src/centaline/loader/src/ctl/SearchScreen.js +2 -1
  10. package/src/main.js +1 -1
  11. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  12. 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.46",
3
+ "version": "1.4.48",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/centaline/css/common.css CHANGED
@@ -584,7 +584,7 @@ html {
584
584
 
585
585
  .ct-searchtable{
586
586
  margin-top: 10px;
587
- padding: 20px 10px 0 15px;
587
+ padding: 20px 10px 0 10px;
588
588
  background: #fff;
589
589
  -webkit-box-sizing: border-box;
590
590
  border-radius:6px;
package/src/centaline/css/max.css CHANGED
@@ -281,9 +281,6 @@
281
281
  display: flex;
282
282
  justify-content: flex-start;
283
283
  align-items: center;
284
- }
285
- .max-tableToolbar {
286
- padding-top: 10px !important;
287
284
  }
288
285
  .st-serach-screen .max-shortcutFollow {
289
286
  padding-left: 0px !important;
package/src/centaline/dynamicLayout/src/dynamicLayout.vue CHANGED
@@ -188,7 +188,7 @@
188
188
  return b.id === attribute.nodeValue;
189
189
  });
190
190
  if (typeof field !== "undefined") {
191
- if (!field.rightField || self.vmodel[field.rightField] == 1) {
191
+ if ((!field.rightField || self.vmodel[field.rightField] == 1) && field.show) {
192
192
  obj["rightRouter"] = true;
193
193
  }
194
194
 
package/src/centaline/dynamicSearchList/src/dynamicTableTip.vue CHANGED
@@ -19,7 +19,6 @@ export default {
19
19
  font-size: 18px;
20
20
  line-height: 40px;
21
21
  min-height: 40px;
22
- padding-left: 15px;
23
22
  display: table
24
23
  }
25
24
 
package/src/centaline/dynamicSearchList/src/dynamicTableToolbar.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div class="ct-tableToolbar max-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
2
+ <div class="ct-tableToolbar" style="width:100%;" v-if="buttons && buttons.length > 0">
3
3
 
4
4
  <div v-if="buttonsLeft&&buttonsLeft.length>0" class="bool_btn_l">
5
5
  <ul>
@@ -73,7 +73,7 @@ export default {
73
73
  width: 100%;
74
74
  position: relative;
75
75
  float: left;
76
- padding: 0 5px 10px 0px;
76
+ padding: 0 5px 5px 0px;
77
77
  background-color: #fff;
78
78
  border-radius: 6px;
79
79
  }
package/src/centaline/loader/src/ctl/CellLayout.js CHANGED
@@ -55,7 +55,7 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
55
55
  return b.id === source.routerKey;
56
56
  });
57
57
  if (typeof field !== "undefined") {
58
- if (!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) {
58
+ if ((!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) && field.show) {
59
59
  forrightRouter=true;
60
60
  }
61
61
  }
package/src/centaline/loader/src/ctl/Form.js CHANGED
@@ -772,7 +772,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
772
772
  return JSON.stringify(submitData);
773
773
  }
774
774
  else{
775
- return submitData[parentFieldNameArr[0]];
775
+ let parentNameArr = parentFieldNameArr[0].split('.');
776
+ return submitData[parentNameArr[parentNameArr.length-1]];
776
777
  }
777
778
  }
778
779
  },
package/src/centaline/loader/src/ctl/SearchScreen.js CHANGED
@@ -352,7 +352,8 @@ const SearchScreen = function (source, callBack, screenPara) {
352
352
  return JSON.stringify(submitData);
353
353
  }
354
354
  else{
355
- return submitData[parentFieldNameArr[0]];
355
+ let parentNameArr = parentFieldNameArr[0].split('.');
356
+ return submitData[parentNameArr[parentNameArr.length-1]];
356
357
  }
357
358
  }
358
359
  },
package/src/main.js CHANGED
@@ -44,7 +44,7 @@ Vue.use(centaline, {
44
44
  getRequestHeaders: function () {
45
45
  return {
46
46
  oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
47
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsKwzAQRO-ytRekaK2V3CWy0-QQxvoYnCr4Awkhd48Ccuc-r5hiGJj3hmXz0AAX8CB2elvAg9jppSTLUnd4tuyQNCk00hl0pB1d2065SwsVpOcDGqm5ViavbQXTsJZCCP4V25LmW3r9Q-6-TvlWBOGjZI0mGyENKaEN7PEUgvFiHLmOET5fAAAA__8.dZ5OFjf3w9XBqMpSe0r1BWH_VSRuJH9nu_4Zw1kiaRs',
47
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laibZYWZ3WDpdsPEjyPLYBCsjkGiM_26I0NF7ilOc5t43TEsLJegGHmin8Rt4oJ2GSLySq_HkNaA4YSwoFBjEBblUNYdzBRkMzzuU5NSKsuaSwRjnX-BCeQ3LNDyuw-sf527zuM4K2y4mwhhNjhK5xehdQt_bXsm0pusSfL4AAAD__w.fIxeWo0MVh2Rh-dilRePjsm6InCs0-x4ui0uNSwzPfU',
48
48
 
49
49
  originalRequestURL: 'http://10.88.22.67:8080',
50
50
  EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',