centaline-data-driven 1.4.45 → 1.4.46

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue +24 -14
  3. package/src/centaline/loader/src/ctl/Form.js +2 -1
  4. package/src/centaline/loader/src/ctl/SearchScreen.js +4 -1
  5. package/src/main.js +1 -1
  6. package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
  7. 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.45",
3
+ "version": "1.4.46",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue CHANGED
@@ -103,14 +103,19 @@
103
103
  return typeof v.parentName !== 'undefined';
104
104
  });
105
105
  hasParent.forEach((v, index) => {
106
- var parent = self.model.screen.find((v1) => {
107
- return v1.id === v.parentName;
106
+ var parentNames=v.parentName.split(',');
107
+ parentNames.forEach((parname)=>{
108
+ var parent = self.model.screen.find((v1) => {
109
+ return v1.id===parname;
110
+ });
111
+
112
+ if (parent) {
113
+ parent.child = parent.child ? parent.child : [];
114
+ parent.child.push(v);
115
+ v.parent = v.parent ? v.parent : [];
116
+ v.parent.push(parent);
117
+ }
108
118
  });
109
- if (parent) {
110
- parent.child = parent.child ? parent.child : [];
111
- parent.child.push(v);
112
- v.parent = parent;
113
- }
114
119
  });
115
120
  },
116
121
  loadHighScreen() {
@@ -121,14 +126,19 @@
121
126
  return typeof v.parentName !== 'undefined';
122
127
  });
123
128
  hasParent.forEach((v, index) => {
124
- var parent = self.model.highScreen.find((v1) => {
125
- return v1.id === v.parentName;
129
+ var parentNames=v.parentName.split(',');
130
+ parentNames.forEach((parname)=>{
131
+ var parent = self.model.highScreen.find((v1) => {
132
+ return v1.id===parname;
133
+ });
134
+
135
+ if (parent) {
136
+ parent.child = parent.child ? parent.child : [];
137
+ parent.child.push(v);
138
+ v.parent = v.parent ? v.parent : [];
139
+ v.parent.push(parent);
140
+ }
126
141
  });
127
- if (parent) {
128
- parent.child = parent.child ? parent.child : [];
129
- parent.child.push(v);
130
- v.parent = parent;
131
- }
132
142
  });
133
143
  },
134
144
  //无任何筛选条件时，不显示该div
package/src/centaline/loader/src/ctl/Form.js CHANGED
@@ -760,7 +760,8 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
760
760
  let submitData = {};
761
761
  var tempFormData = rtn.getFormObj();
762
762
  parentFieldNameArr.forEach((v) => {
763
- submitData[v] = tempFormData[v];
763
+ let vs=v.split('.');
764
+ submitData[vs[vs.length-1]] = tempFormData[v];
764
765
  });
765
766
 
766
767
  if(JSON.stringify(submitData) == "{}"){
package/src/centaline/loader/src/ctl/SearchScreen.js CHANGED
@@ -338,7 +338,10 @@ const SearchScreen = function (source, callBack, screenPara) {
338
338
  var tempFormData = rtn.searchData;
339
339
  parentFieldNameArr.forEach((v) => {
340
340
  tempFormData.fields.forEach((n)=>{
341
- if(n.fieldName1==v)submitData[v] = n.searchValue1;
341
+ if(n.fieldName1==v){
342
+ let vs=v.split('.');
343
+ submitData[vs[vs.length-1]] = n.searchValue1;
344
+ }
342
345
  });
343
346
  });
344
347
  if(JSON.stringify(submitData) == "{}"){
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.eNrEjjsOwjAQBe-ydVbyZ72204ETGg4R2ZYthQqRRAIh7g6IpEvPFFNM894TpiVBC3YFd7Qx-BXc0cYgJXkruceDtwGJSaOTwWEgDnTqeh2OHTRQ7ldoJVsjNbPRDYxx_gVhhPqGZSq3c3n849xlHj-zVCg6WxMWoRRSsQJ9TB5rzqrqXEk4Da83AAAA__8.cb-yxMKDgBK9Hmytc12QtOZf2gNm-2TfF44YGlgp0pM',
47
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsKwzAQRO-ytRekaK2V3CWy0-QQxvoYnCr4Awkhd48Ccuc-r5hiGJj3hmXz0AAX8CB2elvAg9jppSTLUnd4tuyQNCk00hl0pB1d2065SwsVpOcDGqm5ViavbQXTsJZCCP4V25LmW3r9Q-6-TvlWBOGjZI0mGyENKaEN7PEUgvFiHLmOET5fAAAA__8.dZ5OFjf3w9XBqMpSe0r1BWH_VSRuJH9nu_4Zw1kiaRs',
48
48
 
49
49
  originalRequestURL: 'http://10.88.22.67:8080',
50
50
  EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',