@byteluck-fe/model-driven-engine 2.4.1-beta.8 → 2.4.1-beta.9

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.
@@ -860,8 +860,8 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
860
860
  return data;
861
861
  } else {
862
862
  var _loop = function(key1) {
863
- var ref19, ref8, ref9, ref10;
864
- if ((ref19 = controlIdMapping[key1]) === null || ref19 === void 0 ? void 0 : (ref8 = ref19.dataBind) === null || ref8 === void 0 ? void 0 : ref8.fieldCode) {
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) {
865
865
  var ref11;
866
866
  obj1[(ref11 = controlIdMapping[key1]) === null || ref11 === void 0 ? void 0 : ref11.dataBind.fieldCode] = getFieldData[key1];
867
867
  } else if ((ref9 = controlIdMapping[key1]) === null || ref9 === void 0 ? void 0 : (ref10 = ref9.dataBind) === null || ref10 === void 0 ? void 0 : ref10.dataCode) {
@@ -873,18 +873,13 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
873
873
  var ref;
874
874
  if ((ref = controlIdMapping[key1].children[keyChi]) === null || ref === void 0 ? void 0 : ref.dataBind.fieldCode) {
875
875
  var ref15;
876
- var testKeyObject = objChi[(ref15 = controlIdMapping[key1].children[keyChi]) === null || ref15 === void 0 ? void 0 : ref15.dataBind.fieldCode];
877
- if (testKeyObject !== undefined) {
878
- var ref16;
879
- objChi[(ref16 = controlIdMapping[key1].children[keyChi]) === null || ref16 === void 0 ? void 0 : ref16.dataBind.fieldCode] = item[keyChi];
880
- }
876
+ objChi[(ref15 = controlIdMapping[key1].children[keyChi]) === null || ref15 === void 0 ? void 0 : ref15.dataBind.fieldCode] = item[keyChi];
881
877
  } else {
882
- for(var keyChi1 in item[keyChi]){
883
- var ref17;
884
- var testKeyObject1 = objChi[(ref17 = controlIdMapping[key1].children[keyChi]) === null || ref17 === void 0 ? void 0 : ref17.dataBind[keyChi1].fieldCode];
885
- if (testKeyObject1 !== undefined) {
886
- var ref18;
887
- objChi[(ref18 = controlIdMapping[key1].children[keyChi]) === null || ref18 === void 0 ? void 0 : ref18.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
878
+ //qiyu 2023-5-25 vue容器未绑定字段,item[keyChi]值会是undefined
879
+ if (item[keyChi] !== undefined) {
880
+ for(var keyChi1 in item[keyChi]){
881
+ var ref16;
882
+ objChi[(ref16 = controlIdMapping[key1].children[keyChi]) === null || ref16 === void 0 ? void 0 : ref16.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
888
883
  }
889
884
  }
890
885
  }
@@ -1053,19 +1048,19 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1053
1048
  var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值,为了避免重复赋值,设置了此变量
1054
1049
  ;
1055
1050
  Object.keys(row).map(function(fieldCode) {
1056
- var ref, ref24;
1051
+ var ref, ref22;
1057
1052
  if (skipKey.includes(fieldCode)) {
1058
1053
  return;
1059
1054
  }
1060
- var fieldMapping = (ref = _this.store.dataBindMapping[dataCode]) === null || ref === void 0 ? void 0 : (ref24 = ref.fields) === null || ref24 === void 0 ? void 0 : ref24.find(function(i) {
1055
+ 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) {
1061
1056
  return i.fieldCode === fieldCode;
1062
1057
  });
1063
1058
  if (fieldMapping) {
1064
1059
  if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
1065
1060
  newRow[fieldMapping.controlId] = row[fieldCode];
1066
1061
  } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
1067
- var ref25;
1068
- var objValue = JSONCopy((ref25 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref25 !== void 0 ? ref25 : {});
1062
+ var ref23;
1063
+ var objValue = JSONCopy((ref23 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref23 !== void 0 ? ref23 : {});
1069
1064
  Object.keys(fieldMapping.dataBind).map(function(key) {
1070
1065
  var dataBind = fieldMapping.dataBind[key];
1071
1066
  if (row[dataBind.fieldCode] !== undefined) {
@@ -1086,17 +1081,17 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1086
1081
  newState[mapping.dataViewId][mapping.controlId].push(newRow);
1087
1082
  });
1088
1083
  } else if (entity) {
1089
- var ref26;
1084
+ var ref24;
1090
1085
  var skipKey1 = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值,为了避免重复赋值,设置了此变量
1091
1086
  ;
1092
1087
  var emptyState = JSONCopy(_this7.store.emptyState);
1093
- if (!((ref26 = Object.keys(entity)) === null || ref26 === void 0 ? void 0 : ref26.length)) {
1088
+ if (!((ref24 = Object.keys(entity)) === null || ref24 === void 0 ? void 0 : ref24.length)) {
1094
1089
  var _this3 = _this7;
1095
- var ref20;
1090
+ var ref18;
1096
1091
  //判断entity 为空对象就给表单赋值默认值
1097
1092
  newState = JSONCopy(emptyState);
1098
- var ref21;
1099
- var dataViewControlId = (ref21 = (ref20 = _this7.getDataBindMapping(dataCode)) === null || ref20 === void 0 ? void 0 : ref20.controlId) !== null && ref21 !== void 0 ? ref21 : '';
1093
+ var ref19;
1094
+ var dataViewControlId = (ref19 = (ref18 = _this7.getDataBindMapping(dataCode)) === null || ref18 === void 0 ? void 0 : ref18.controlId) !== null && ref19 !== void 0 ? ref19 : '';
1100
1095
  var _dataViewControlId;
1101
1096
  var state = (_dataViewControlId = emptyState[dataViewControlId]) !== null && _dataViewControlId !== void 0 ? _dataViewControlId : {};
1102
1097
  Object.keys(state).map(function(key) {
@@ -1134,13 +1129,13 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1134
1129
  }
1135
1130
  var newMapping = _this7.getDataBindMapping(dataCode);
1136
1131
  if (newMapping) {
1137
- var ref22;
1138
- var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (ref22 = newMapping.fields) === null || ref22 === void 0 ? void 0 : ref22.map(function(item) {
1132
+ var ref20;
1133
+ var mappingKeys = newMapping === null || newMapping === void 0 ? void 0 : (ref20 = newMapping.fields) === null || ref20 === void 0 ? void 0 : ref20.map(function(item) {
1139
1134
  return item === null || item === void 0 ? void 0 : item.controlId;
1140
1135
  });
1141
1136
  var mappingValue = _this7.getEmptyState(newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId);
1142
- var ref23;
1143
- var mainStateKeys = Object.keys((ref23 = newState === null || newState === void 0 ? void 0 : newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) !== null && ref23 !== void 0 ? ref23 : {});
1137
+ var ref21;
1138
+ 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 : {});
1144
1139
  mappingKeys === null || mappingKeys === void 0 ? void 0 : mappingKeys.forEach(function(key) {
1145
1140
  if (!mainStateKeys.includes(key) && key !== 'uid' && newState[newMapping === null || newMapping === void 0 ? void 0 : newMapping.controlId]) {
1146
1141
  if (Object.keys(newState).length) {
@@ -1219,11 +1214,11 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1219
1214
  } else {
1220
1215
  var ref;
1221
1216
  var controlIdMapping = (ref = this.getControlIdMapping()) !== null && ref !== void 0 ? ref : {};
1222
- var ref27;
1223
- var ref28 = _slicedToArray((ref27 = Object.entries(controlIdMapping).find(function(param) {
1217
+ var ref25;
1218
+ var ref26 = _slicedToArray((ref25 = Object.entries(controlIdMapping).find(function(param) {
1224
1219
  var _param = _slicedToArray(param, 2), _ = _param[0], mapping = _param[1];
1225
1220
  return mapping.children && controlId in mapping.children;
1226
- })) !== null && ref27 !== void 0 ? ref27 : [], 1), subtableId = ref28[0];
1221
+ })) !== null && ref25 !== void 0 ? ref25 : [], 1), subtableId = ref26[0];
1227
1222
  if (subtableId) {
1228
1223
  var subtable = this.getInstance(subtableId);
1229
1224
  // @ts-ignore
@@ -1446,8 +1441,8 @@ var Engine = // 整体渲染引擎 并且 提供发布订阅能力
1446
1441
  var _controlIdMapping;
1447
1442
  var mapping = (_controlIdMapping = this.store.controlIdMapping) !== null && _controlIdMapping !== void 0 ? _controlIdMapping : {};
1448
1443
  var result = Object.keys(mapping).some(function(key) {
1449
- var ref, ref29;
1450
- return (ref = mapping[key]) === null || ref === void 0 ? void 0 : (ref29 = ref.children) === null || ref29 === void 0 ? void 0 : ref29.hasOwnProperty(controlId);
1444
+ var ref, ref27;
1445
+ return (ref = mapping[key]) === null || ref === void 0 ? void 0 : (ref27 = ref.children) === null || ref27 === void 0 ? void 0 : ref27.hasOwnProperty(controlId);
1451
1446
  });
1452
1447
  return result;
1453
1448
  }