@byteluck-fe/model-driven-engine 2.4.1-beta.1 → 2.4.1-beta.10

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.
@@ -843,15 +843,19 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
843
843
  var data = getFieldData.map(function(item) {
844
844
  var obj = {};
845
845
  for(var key in item){
846
- var ref, ref2, ref3, ref4;
847
- if ((ref2 = (ref = controlIdMapping[controlId]) === null || ref === void 0 ? void 0 : ref.children[key]) === null || ref2 === void 0 ? void 0 : (ref3 = ref2.dataBind) === null || ref3 === void 0 ? void 0 : ref3.fieldCode) {
848
- var ref5;
849
- obj[(ref5 = controlIdMapping[controlId].children[key]) === null || ref5 === void 0 ? void 0 : ref5.dataBind.fieldCode] = item[key];
850
- } else if ((ref4 = controlIdMapping[controlId]) === null || ref4 === void 0 ? void 0 : ref4.children[key]) {
851
- // 兼容一个控件需要绑定多个字段的情况
852
- for(var keyChi in item[key]){
853
- var ref6, ref7;
854
- obj[(ref7 = (ref6 = controlIdMapping[controlId]) === null || ref6 === void 0 ? void 0 : ref6.children[key]) === null || ref7 === void 0 ? void 0 : ref7.dataBind[keyChi].fieldCode] = item[key][keyChi];
846
+ var ref, ref2, ref3;
847
+ var fieldCode = (ref2 = (ref = controlIdMapping[controlId]) === null || ref === void 0 ? void 0 : ref.children[key]) === null || ref2 === void 0 ? void 0 : (ref3 = ref2.dataBind) === null || ref3 === void 0 ? void 0 : ref3.fieldCode;
848
+ //未绑定字段的控件,直接抛弃
849
+ if (fieldCode !== '') {
850
+ var ref4;
851
+ if (fieldCode) {
852
+ obj[fieldCode] = item[key];
853
+ } else if ((ref4 = controlIdMapping[controlId]) === null || ref4 === void 0 ? void 0 : ref4.children[key]) {
854
+ // 兼容一个控件需要绑定多个字段的情况
855
+ for(var keyChi in item[key]){
856
+ var ref5, ref6;
857
+ obj[(ref6 = (ref5 = controlIdMapping[controlId]) === null || ref5 === void 0 ? void 0 : ref5.children[key]) === null || ref6 === void 0 ? void 0 : ref6.dataBind[keyChi].fieldCode] = item[key][keyChi];
858
+ }
855
859
  }
856
860
  }
857
861
  }
@@ -860,25 +864,27 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
860
864
  return data;
861
865
  } else {
862
866
  var _loop = function(key1) {
863
- var ref17, ref8, ref9, ref10;
864
- if ((ref17 = controlIdMapping[key1]) === null || ref17 === void 0 ? void 0 : (ref8 = ref17.dataBind) === null || ref8 === void 0 ? void 0 : ref8.fieldCode) {
867
+ var ref15, ref7, ref8, ref9;
868
+ if ((ref15 = controlIdMapping[key1]) === null || ref15 === void 0 ? void 0 : (ref7 = ref15.dataBind) === null || ref7 === void 0 ? void 0 : ref7.fieldCode) {
869
+ var ref10;
870
+ obj1[(ref10 = controlIdMapping[key1]) === null || ref10 === void 0 ? void 0 : ref10.dataBind.fieldCode] = getFieldData[key1];
871
+ } else if ((ref8 = controlIdMapping[key1]) === null || ref8 === void 0 ? void 0 : (ref9 = ref8.dataBind) === null || ref9 === void 0 ? void 0 : ref9.dataCode) {
865
872
  var ref11;
866
- obj1[(ref11 = controlIdMapping[key1]) === null || ref11 === void 0 ? void 0 : ref11.dataBind.fieldCode] = getFieldData[key1];
867
- } else if ((ref9 = controlIdMapping[key1]) === null || ref9 === void 0 ? void 0 : (ref10 = ref9.dataBind) === null || ref10 === void 0 ? void 0 : ref10.dataCode) {
868
- var ref12;
869
873
  // 明细字表只循环一层明细子表未递归
870
- obj1[(ref12 = controlIdMapping[key1]) === null || ref12 === void 0 ? void 0 : ref12.dataBind.dataCode] = getFieldData[key1].map(function(item) {
874
+ obj1[(ref11 = controlIdMapping[key1]) === null || ref11 === void 0 ? void 0 : ref11.dataBind.dataCode] = getFieldData[key1].map(function(item) {
871
875
  var objChi = {};
872
876
  for(var keyChi in item){
873
877
  var ref;
874
- if ((ref = controlIdMapping[key1].children[keyChi]) === null || ref === void 0 ? void 0 : ref.dataBind.fieldCode) {
875
- var ref15;
876
- objChi[(ref15 = controlIdMapping[key1].children[keyChi]) === null || ref15 === void 0 ? void 0 : ref15.dataBind.fieldCode] = item[keyChi];
877
- } else {
878
- for(var keyChi1 in item[keyChi]){
879
- var ref16;
880
- objChi[(ref16 = controlIdMapping[key1].children[keyChi]) === null || ref16 === void 0 ? void 0 : ref16.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
881
- //
878
+ var fieldCode = (ref = controlIdMapping[key1].children[keyChi]) === null || ref === void 0 ? void 0 : ref.dataBind.fieldCode;
879
+ //未绑定字段的控件,直接抛弃
880
+ if (fieldCode !== '') {
881
+ if (fieldCode) {
882
+ objChi[fieldCode] = item[keyChi];
883
+ } else {
884
+ for(var keyChi1 in item[keyChi]){
885
+ var ref14;
886
+ objChi[(ref14 = controlIdMapping[key1].children[keyChi]) === null || ref14 === void 0 ? void 0 : ref14.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
887
+ }
882
888
  }
883
889
  }
884
890
  }
@@ -887,8 +893,8 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
887
893
  } else if (controlIdMapping[key1]) {
888
894
  // 兼容一个控件需要绑定多个字段的情况
889
895
  for(var keyChi2 in getFieldData[key1]){
890
- var ref13, ref14;
891
- obj1[(ref14 = (ref13 = controlIdMapping[key1]) === null || ref13 === void 0 ? void 0 : ref13.dataBind[keyChi2]) === null || ref14 === void 0 ? void 0 : ref14.fieldCode] = getFieldData[key1][keyChi2];
896
+ var ref12, ref13;
897
+ obj1[(ref13 = (ref12 = controlIdMapping[key1]) === null || ref12 === void 0 ? void 0 : ref12.dataBind[keyChi2]) === null || ref13 === void 0 ? void 0 : ref13.fieldCode] = getFieldData[key1][keyChi2];
892
898
  }
893
899
  }
894
900
  };
@@ -1046,19 +1052,19 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1046
1052
  var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值,为了避免重复赋值,设置了此变量
1047
1053
  ;
1048
1054
  Object.keys(row).map(function(fieldCode) {
1049
- var ref, ref22;
1055
+ var ref, ref20;
1050
1056
  if (skipKey.includes(fieldCode)) {
1051
1057
  return;
1052
1058
  }
1053
- var fieldMapping = (ref = _this.store.dataBindMapping[dataCode]) === null || ref === void 0 ? void 0 : (ref22 = ref.fields) === null || ref22 === void 0 ? void 0 : ref22.find(function(i) {
1059
+ var fieldMapping = (ref = _this.store.dataBindMapping[dataCode]) === null || ref === void 0 ? void 0 : (ref20 = ref.fields) === null || ref20 === void 0 ? void 0 : ref20.find(function(i) {
1054
1060
  return i.fieldCode === fieldCode;
1055
1061
  });
1056
1062
  if (fieldMapping) {
1057
1063
  if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
1058
1064
  newRow[fieldMapping.controlId] = row[fieldCode];
1059
1065
  } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
1060
- var ref23;
1061
- var objValue = JSONCopy((ref23 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref23 !== void 0 ? ref23 : {});
1066
+ var ref21;
1067
+ var objValue = JSONCopy((ref21 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref21 !== void 0 ? ref21 : {});
1062
1068
  Object.keys(fieldMapping.dataBind).map(function(key) {
1063
1069
  var dataBind = fieldMapping.dataBind[key];
1064
1070
  if (row[dataBind.fieldCode] !== undefined) {
@@ -1079,17 +1085,17 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1079
1085
  newState[mapping.dataViewId][mapping.controlId].push(newRow);
1080
1086
  });
1081
1087
  } else if (entity) {
1082
- var ref24;
1088
+ var ref22;
1083
1089
  var skipKey1 = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值,为了避免重复赋值,设置了此变量
1084
1090
  ;
1085
1091
  var emptyState = JSONCopy(_this7.store.emptyState);
1086
- if (!((ref24 = Object.keys(entity)) === null || ref24 === void 0 ? void 0 : ref24.length)) {
1092
+ if (!((ref22 = Object.keys(entity)) === null || ref22 === void 0 ? void 0 : ref22.length)) {
1087
1093
  var _this3 = _this7;
1088
- var ref18;
1094
+ var ref16;
1089
1095
  //判断entity 为空对象就给表单赋值默认值
1090
1096
  newState = JSONCopy(emptyState);
1091
- var ref19;
1092
- var dataViewControlId = (ref19 = (ref18 = _this7.getDataBindMapping(dataCode)) === null || ref18 === void 0 ? void 0 : ref18.controlId) !== null && ref19 !== void 0 ? ref19 : '';
1097
+ var ref17;
1098
+ var dataViewControlId = (ref17 = (ref16 = _this7.getDataBindMapping(dataCode)) === null || ref16 === void 0 ? void 0 : ref16.controlId) !== null && ref17 !== void 0 ? ref17 : '';
1093
1099
  var _dataViewControlId;
1094
1100
  var state = (_dataViewControlId = emptyState[dataViewControlId]) !== null && _dataViewControlId !== void 0 ? _dataViewControlId : {};
1095
1101
  Object.keys(state).map(function(key) {
@@ -1127,13 +1133,13 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1127
1133
  }
1128
1134
  var newMapping = _this7.getDataBindMapping(dataCode);
1129
1135
  if (newMapping) {
1130
- var ref20;
1131
- var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (ref20 = newMapping.fields) === null || ref20 === void 0 ? void 0 : ref20.map(function(item) {
1136
+ var ref18;
1137
+ var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (ref18 = newMapping.fields) === null || ref18 === void 0 ? void 0 : ref18.map(function(item) {
1132
1138
  return item === null || item === void 0 ? void 0 : item.controlId;
1133
1139
  });
1134
1140
  var mappingValue = _this7.getEmptyState(newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId);
1135
- var ref21;
1136
- var mainStateKeys = Object.keys((ref21 = newState === null || newState === void 0 ? void 0 : newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) !== null && ref21 !== void 0 ? ref21 : {});
1141
+ var ref19;
1142
+ var mainStateKeys = Object.keys((ref19 = newState === null || newState === void 0 ? void 0 : newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) !== null && ref19 !== void 0 ? ref19 : {});
1137
1143
  mappingKeys === null || mappingKeys === void 0 ? void 0 : mappingKeys.forEach(function(key) {
1138
1144
  if (!mainStateKeys.includes(key) && key !== 'uid' && newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) {
1139
1145
  if (Object.keys(newState).length) {
@@ -1212,11 +1218,11 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1212
1218
  } else {
1213
1219
  var ref;
1214
1220
  var controlIdMapping = (ref = this.getControlIdMapping()) !== null && ref !== void 0 ? ref : {};
1215
- var ref25;
1216
- var ref26 = _slicedToArray((ref25 = Object.entries(controlIdMapping).find(function(param) {
1221
+ var ref23;
1222
+ var ref24 = _slicedToArray((ref23 = Object.entries(controlIdMapping).find(function(param) {
1217
1223
  var _param = _slicedToArray(param, 2), _ = _param[0], mapping = _param[1];
1218
1224
  return mapping.children && controlId in mapping.children;
1219
- })) !== null && ref25 !== void 0 ? ref25 : [], 1), subtableId = ref26[0];
1225
+ })) !== null && ref23 !== void 0 ? ref23 : [], 1), subtableId = ref24[0];
1220
1226
  if (subtableId) {
1221
1227
  var subtable = this.getInstance(subtableId);
1222
1228
  // @ts-ignore
@@ -1439,8 +1445,8 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1439
1445
  var _controlIdMapping;
1440
1446
  var mapping = (_controlIdMapping = this.store.controlIdMapping) !== null && _controlIdMapping !== void 0 ? _controlIdMapping : {};
1441
1447
  var result = Object.keys(mapping).some(function(key) {
1442
- var ref, ref27;
1443
- return (ref = mapping[key]) === null || ref === void 0 ? void 0 : (ref27 = ref.children) === null || ref27 === void 0 ? void 0 : ref27.hasOwnProperty(controlId);
1448
+ var ref, ref25;
1449
+ return (ref = mapping[key]) === null || ref === void 0 ? void 0 : (ref25 = ref.children) === null || ref25 === void 0 ? void 0 : ref25.hasOwnProperty(controlId);
1444
1450
  });
1445
1451
  return result;
1446
1452
  }