fmui-base 2.1.54 → 2.1.56

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 (3) hide show
  1. package/README.md +3 -1
  2. package/lib/form/table.js +11 -9
  3. package/package.json +1 -1
package/README.md CHANGED
@@ -2,7 +2,9 @@
2
2
 
3
3
  ---npm publish
4
4
 
5
- ## 更新日志
5
+ ## 更新日志
6
+ - 2.1.56：子表字段关联多个字段关联一个字段冲突问题处理
7
+ - 2.1.55：主子表支持时间differHalfDay函数
6
8
  - 2.1.54：子表必填项校验定位位置不对
7
9
  - 2.1.53：上传组件根据文件大小显示单位不同
8
10
  - 2.1.52：流程提交到最后结束节点保存批示意见
package/lib/form/table.js CHANGED
@@ -862,6 +862,7 @@ var PageHome = function (_React$Component) {
862
862
  var itemKey = thisItem.key;
863
863
  var tableName = thisItem.tableName;
864
864
  var thisSubTblNo = thisItem.subTblNo;
865
+ var mustFields = [];
865
866
  console.log("dealwithRelaField===");
866
867
  if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
867
868
  //解决同一字段 关联字段 编辑方式相同时冲突
@@ -927,7 +928,8 @@ var PageHome = function (_React$Component) {
927
928
  triggerFieldValBoolean = true;
928
929
  mustFlag = true;
929
930
  editFlag = true;
930
- } else if (!mustFlag) {
931
+ mustFields.push(relaFieldTblNameArrayItem);
932
+ } else if (!mustFlag && mustFields.indexOf(relaFieldTblNameArrayItem) == -1) {
931
933
  relaFieldMap["value"] = false;
932
934
  triggerFieldValBoolean = false;
933
935
  } else {
@@ -1068,8 +1070,8 @@ var PageHome = function (_React$Component) {
1068
1070
  //当为时间时且有differDate或者differHour函数
1069
1071
  var differDateRegExp = new RegExp("differDate\\(", "g");
1070
1072
  var differHourRegExp = new RegExp("differHour\\(", "g");
1071
- var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
1072
- if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
1073
+ var differHalfDayRegExp = new RegExp("differHalfDay\\(", "g");
1074
+ if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDayRegExp)) {
1073
1075
  //当有differDate函数
1074
1076
  if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
1075
1077
  //filedItemValue = 0;
@@ -1115,7 +1117,7 @@ var PageHome = function (_React$Component) {
1115
1117
  exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
1116
1118
  exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
1117
1119
  exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
1118
- exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
1120
+ exp = exp.replace(new RegExp("differHalfDay\\(", "g"), 'calculate.differHalfDay(');
1119
1121
  exp = exp.replace(new RegExp("adddays\\(", "g"), 'calculate.adddays(');
1120
1122
  try {
1121
1123
  var res = eval(exp);
@@ -1140,7 +1142,7 @@ var PageHome = function (_React$Component) {
1140
1142
  decimalPlace = item.decimalPlace;
1141
1143
  }
1142
1144
  });
1143
- if (exp.indexOf("differHalfDate") < 0) {
1145
+ if (exp.indexOf("differHalfDay") < 0) {
1144
1146
  if (fieldType == 'int' || fieldType == 'float') {
1145
1147
  res = Number(res).toFixed(decimalPlace) + '';
1146
1148
  } else {
@@ -1233,8 +1235,8 @@ var PageHome = function (_React$Component) {
1233
1235
  //当为时间时且有differDate或者differHour函数
1234
1236
  var differDateRegExp = new RegExp("differDate\\(", "g");
1235
1237
  var differHourRegExp = new RegExp("differHour\\(", "g");
1236
- var differHalfDateRegExp = new RegExp("differHalfDate\\(", "g");
1237
- if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDateRegExp)) {
1238
+ var differHalfDayRegExp = new RegExp("differHalfDay\\(", "g");
1239
+ if (exp.match(differDateRegExp) || exp.match(differHourRegExp) || exp.match(differHalfDayRegExp)) {
1238
1240
  //当有differDate函数
1239
1241
  if (typeof filedItemValue == 'undefined' || filedItemValue == "" || filedItemValue == null) {
1240
1242
  //filedItemValue = 0;
@@ -1267,7 +1269,7 @@ var PageHome = function (_React$Component) {
1267
1269
  exp = exp.replace(new RegExp("rmb\\(", "g"), 'calculate.rmb(');
1268
1270
  exp = exp.replace(new RegExp("differDate\\(", "g"), 'calculate.differDate(');
1269
1271
  exp = exp.replace(new RegExp("differHour\\(", "g"), 'calculate.differHour(');
1270
- exp = exp.replace(new RegExp("differHalfDate\\(", "g"), 'calculate.differHalfDate(');
1272
+ exp = exp.replace(new RegExp("differHalfDay\\(", "g"), 'calculate.differHalfDay(');
1271
1273
  try {
1272
1274
  var res = eval(exp);
1273
1275
  } catch (e) {
@@ -1302,7 +1304,7 @@ var PageHome = function (_React$Component) {
1302
1304
  // decimalPlace = data.subTbl[h].subTblData[l].decimalPlace;
1303
1305
 
1304
1306
 
1305
- if (exp.indexOf("differHalfDate") < 0) {
1307
+ if (exp.indexOf("differHalfDay") < 0) {
1306
1308
  if (fieldType == 'int' || fieldType == 'float') {
1307
1309
  res = Number(res).toFixed(decimalPlace) + '';
1308
1310
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.54",
3
+ "version": "2.1.56",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",