fmui-base 1.0.36 → 1.0.38

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.
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---
4
4
 
5
5
  ## 更新日志
6
+ - 1.0.38:移动审批自动通过;选人组件增加政治面貌和职务
7
+ - 1.0.37:移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
6
8
  - 1.0.36:移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发
7
9
  - 1.0.35:流程支持CA加签验签问题修复
8
10
  - 1.0.34:退回流程支持上传附件;流程支持CA加签验签
@@ -68,7 +68,7 @@ var PageHome = function (_React$Component) {
68
68
  _this.state = {
69
69
  // attachId:props.attachId,
70
70
  loadImg: _variables2.default.loadImg + "&fid=",
71
- imgUrl: getImagePreUrl() + '/attachment/download?token=' + token + '&',
71
+ // imgUrl:getImagePreUrl()+'/attachment/download?token='+token+'&',
72
72
  // queryUrl: context + '/api/m/plugin/attachment/mobile/getAttachmentByIds?token='+token+'&ids=',
73
73
  commentList: [],
74
74
  viewType: viewType
@@ -294,7 +294,7 @@ var PageHome = function (_React$Component) {
294
294
  });
295
295
  return _react2.default.createElement(
296
296
  Box,
297
- { style: { marginLeft: "auto" } },
297
+ { style: { marginLeft: "auto", "text-align": "right" } },
298
298
  _returnHtml
299
299
  );
300
300
  } else {
@@ -319,7 +319,7 @@ var PageHome = function (_React$Component) {
319
319
  ) : _react2.default.createElement(
320
320
  HBox,
321
321
  null,
322
- _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.imgUrl + item.fullMessage })
322
+ _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.loadImg + item.fullMessage })
323
323
  ),
324
324
  _react2.default.createElement(
325
325
  'div',
package/lib/form/form.js CHANGED
@@ -584,6 +584,7 @@ var PageHome = function (_React$Component) {
584
584
  value = null;
585
585
  }
586
586
  itemParam.selectOptions = selectOptions;
587
+ itemParam.selectItem = selectOptions;
587
588
  } else if (itemType == 'checkbox') {
588
589
  //多选
589
590
  var selectItem = form.multiItems; //选项
@@ -614,6 +615,7 @@ var PageHome = function (_React$Component) {
614
615
  }
615
616
  }
616
617
  itemParam.selectOptions = selectOptions;
618
+ itemParam.selectItem = selectOptions;
617
619
  } else if (itemType == 'select') {
618
620
  //下拉选择
619
621
  var selectItem = form.multiItems; //选项
@@ -660,6 +662,7 @@ var PageHome = function (_React$Component) {
660
662
  value = null;
661
663
  }
662
664
  itemParam.selectOptions = selectOptions;
665
+ itemParam.selectItem = selectOptions;
663
666
  }
664
667
  } else if (itemType == 'datetime') {
665
668
  //时间
@@ -821,8 +824,24 @@ var PageHome = function (_React$Component) {
821
824
  var chooseWay = "checkbox";
822
825
  var scopeTable = "";
823
826
  if (form.popuserMap) {
824
- popCode = form.popuserMap.chooseObj;
825
- chooseWay = form.popuserMap.chooseWay;
827
+ if (form.popuserMap.popCode) {
828
+ //新的选人组件选项
829
+ popCode = form.popuserMap.popCode;
830
+ chooseWay = form.popuserMap.chooseWay;
831
+ itemParam.chooseObj = form.popuserMap.chooseObj;
832
+ } else {
833
+ popCode = form.popuserMap.chooseObj;
834
+ chooseWay = form.popuserMap.chooseWay;
835
+ }
836
+ if (form.popuserMap.chooseScope) {
837
+ if (form.popuserMap.chooseScope == 5) {
838
+ itemParam.queryLimit = form.popuserMap.chooseScope;
839
+ itemParam.limitData = getLoginUserInfo().orgId;
840
+ } else if (form.popuserMap.chooseScope == "all") {} else {
841
+ itemParam.queryLimit = 5;
842
+ itemParam.limitData = form.popuserMap.chooseScope;
843
+ }
844
+ }
826
845
  scopeTable = form.popuserMap.scopeTable;
827
846
  } else {
828
847
  popCode = "user";
@@ -983,6 +1002,7 @@ var PageHome = function (_React$Component) {
983
1002
  }
984
1003
  }
985
1004
 
1005
+ itemParam = t.dealwithLinkField(itemParam);
986
1006
  itemParam = t.dealwithRelaField(itemParam);
987
1007
  if (itemType != 'weboffice') {
988
1008
  itemParam.value = value;
@@ -1121,6 +1141,43 @@ var PageHome = function (_React$Component) {
1121
1141
  }
1122
1142
  }
1123
1143
 
1144
+ //级联关联字段初始化
1145
+
1146
+ }, {
1147
+ key: 'dealwithLinkField',
1148
+ value: function dealwithLinkField(itemParam) {
1149
+
1150
+ var form = this.props.form;
1151
+ if (form.multiItemsLinkField) {
1152
+ var selectOptions = [];
1153
+ form.multiItemsLinkField.map(function (item) {
1154
+ var option = {};
1155
+ option.value = item.value;
1156
+ option.text = item.name;
1157
+ selectOptions.push(option);
1158
+ });
1159
+ itemParam.selectOptions = selectOptions;
1160
+ }
1161
+ // var linkFieldArray = linkFields[itemParam.fieldId];
1162
+ // if(linkFieldArray && linkFieldArray.length>0){
1163
+ // var triggerFormFields = "";
1164
+ // var conditionArrayJSON = [];
1165
+ // linkFieldArray.map(function(linkFieldArrayItem){
1166
+ // triggerFormFields+=","+linkFieldArrayItem.formField;
1167
+ // var option = {};
1168
+ // option.value = linkFieldArrayItem.value;
1169
+ // option.formField = linkFieldArrayItem.formField;
1170
+ // conditionArrayJSON.push(option);
1171
+ // });
1172
+ // if(triggerFormFields){
1173
+ // triggerFormFields = triggerFormFields.substring(1);
1174
+ // }
1175
+
1176
+
1177
+ // }
1178
+ return itemParam;
1179
+ }
1180
+
1124
1181
  //处理关联字段初始化
1125
1182
 
1126
1183
  }, {
@@ -2464,12 +2521,15 @@ var PageHome = function (_React$Component) {
2464
2521
  label: t.state.itemParam.title,
2465
2522
  placeholder: t.state.itemParam.placeholder ? t.state.itemParam.placeholder : '请选择',
2466
2523
  code: t.state.itemParam.code,
2524
+ chooseObj: t.state.itemParam.chooseObj,
2467
2525
  checkType: t.state.itemParam.checkType,
2468
2526
  fieldDataValue: t.state.itemParam.value,
2469
2527
  scopeTable: t.state.itemParam.scopeTable,
2470
2528
  fieldTable: t.state.itemParam.fieldTable,
2471
2529
  fieldData: t.state.itemParam.fieldData,
2472
2530
  defaultValue: t.state.itemParam.defaultValue,
2531
+ queryLimit: t.state.itemParam.queryLimit,
2532
+ limitData: t.state.itemParam.limitData,
2473
2533
  ref: "selectMember_" + t.state.itemParam.fieldData,
2474
2534
  isDelete: !t.state.itemParam.readOnly,
2475
2535
  showType: 'list',
@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
656
656
  'div',
657
657
  { className: item.show ? "" : "t-DN" },
658
658
  item.form.map(function (item2, j) {
659
- return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
659
+ return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
660
660
  })
661
661
  )
662
662
  );
package/lib/form/table.js CHANGED
@@ -84,9 +84,12 @@ var PageHome = function (_React$Component) {
84
84
  var _this = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
85
85
 
86
86
  var defaultValue = props.defaultValue;
87
+ var status = props.status;
87
88
  var formRelaField = props.formRelaField; //关联字段
89
+ var linkFields = props.allForm.linkFields; //级联字段
88
90
  var formId = props.data.formId; //表单id
89
91
 
92
+ //关联字段
90
93
  var formRelaFieldMapsNew = {};
91
94
  if (formRelaField) {
92
95
  $.ajax({
@@ -156,6 +159,51 @@ var PageHome = function (_React$Component) {
156
159
  });
157
160
  }
158
161
 
162
+ var linkFieldsNew = {};
163
+ // if(linkFields){
164
+ // linkFieldsNew
165
+ // linkFields.map(function(linkFieldsItem){
166
+ // if(linkFieldsItem.relaField){
167
+
168
+ // var linkFormField = linkFieldsItem.formField;
169
+
170
+ // var defaultValue = "";
171
+ // var key = "";
172
+ // var itemType = "";
173
+ // props.form.map(function(propsFormItem){
174
+ // if(propsFormItem.fieldId == linkFormField){
175
+ // defaultValue = propsItem.defaultValue;
176
+ // key = propsFormItem.itemCode;
177
+ // itemType = propsFormItem.itemType;
178
+ // }
179
+ // })
180
+ // if(status == 1 || status == 2 ){
181
+ // var mainTblData = props.data.mainTblData;//主表数据
182
+ // var subTbl = props.data.subTbl;//子表
183
+ // mainTblData.map(function(mainTblDataItem){
184
+ // if(mainTblDataItem.key == key){
185
+ // defaultValue = propsItem.defaultValue;
186
+ // }
187
+ // })
188
+ // }
189
+ // var linkFieldsObj = {};
190
+ // linkFieldsObj.formField = linkFormField;
191
+ // linkFieldsObj.value = defaultValue;
192
+
193
+ // var linkRelaFieldArray = linkFieldsNew[linkFieldsItem.relaField];
194
+ // if(linkRelaFieldArray && linkRelaFieldArray.length>0){
195
+ // linkRelaFieldArray.push(linkFieldsObj);
196
+ // linkFieldsNew[linkFieldsItem.relaField] = linkRelaFieldArray;
197
+ // }else{
198
+ // linkFieldsNew[linkFieldsItem.relaField] = [linkFieldsObj];
199
+ // }
200
+ // }
201
+ // })
202
+
203
+
204
+ // }
205
+
206
+
159
207
  // let startUserName = decodeURI(this.props.params.startUserName);//创建人用户
160
208
  // let startUserGroupName = decodeURI(this.props.params.startUserGroupName);//创建人组织
161
209
  //let startUserId = this.props.params.startUserId;
@@ -177,7 +225,8 @@ var PageHome = function (_React$Component) {
177
225
  phraseListNew: [],
178
226
  phraseList: [], //常用语列表
179
227
  spyj: defaultValue,
180
- formRelaFieldMaps: formRelaFieldMapsNew
228
+ formRelaFieldMaps: formRelaFieldMapsNew,
229
+ linkFields: linkFieldsNew
181
230
  };
182
231
 
183
232
  var module = props.module && props.module != "undefined" ? props.module : "approve";
@@ -382,6 +431,7 @@ var PageHome = function (_React$Component) {
382
431
  if (itemParam.itemType) {
383
432
  var fieldId = itemParam.fieldId;
384
433
  var linkFields = data.linkFields;
434
+ var formItem = data.formItem;
385
435
  if (linkFields && linkFields != null) {
386
436
  for (var i = 0; i < linkFields.length; i++) {
387
437
  var formField = linkFields[i].formField;
@@ -390,12 +440,20 @@ var PageHome = function (_React$Component) {
390
440
  var conditionArrayJSON = [];
391
441
  if (formField.indexOf(fieldId) != -1) {
392
442
  for (var j = 0; j < ffid.length; j++) {
393
- for (var k = 0; k < mainTblData.length; k++) {
394
- if (ffid[j] == mainTblData[k].fieldId) {
395
- var option = {};
396
- option.value = mainTblData[k].value;
397
- option.formField = mainTblData[k].fieldId;
398
- conditionArrayJSON.push(option);
443
+ var linkFormKey = "";
444
+ for (var f = 0; f < formItem.length; f++) {
445
+ if (ffid[j] == formItem[f].fieldId) {
446
+ linkFormKey = formItem[f].itemCode;
447
+ }
448
+ }
449
+ if (linkFormKey) {
450
+ for (var k = 0; k < mainTblData.length; k++) {
451
+ if (linkFormKey == mainTblData[k].key) {
452
+ var option = {};
453
+ option.value = mainTblData[k].value;
454
+ option.formField = ffid[j];
455
+ conditionArrayJSON.push(option);
456
+ }
399
457
  }
400
458
  }
401
459
  }
@@ -411,48 +469,68 @@ var PageHome = function (_React$Component) {
411
469
  var content = content['map'];
412
470
  for (var key in content) {
413
471
  var contentValue = content[key];
414
- var textValue = '';
415
- var selectOptions = [];
416
- for (var c = 0; c < contentValue.length; c++) {
417
- textValue = textValue + "," + contentValue[c];
418
- var option = {};
419
- option.value = contentValue[c];
420
- option.text = contentValue[c];
421
- selectOptions.push(option);
422
- }
423
- var resultMap = {};
424
- resultMap.key = 'selectOptions';
425
- resultMap.value = selectOptions;
426
- var valueMap = {};
427
- valueMap.key = 'value';
428
- valueMap.value = textValue.substring(1);
429
- for (var m = 0; m < mainTblData.length; m++) {
430
- if (key == mainTblData[m].fieldId) {
431
- if (",text,textarea,datetime,datetimeStep,".indexOf("," + mainTblData[m].itemType + ",") != -1) {
432
- t.refs[mainTblData[m].uniqueName].reloadItemParam([valueMap]);
433
- mainTblData[m].value = textValue.substring(1);
434
- }
435
472
 
436
- if (",radio,checkbox,select,".indexOf("," + mainTblData[m].itemType + ",") != -1) {
437
- var valueMap1 = {};
438
- valueMap1.key = 'value';
439
- valueMap1.value = "";
440
- mainTblData[m].value = "";
441
- var tva = textValue.substring(1);
442
- if (containUniqueFlag == true) {
443
- valueMap1.value = tva;
444
- mainTblData[m].value = tva;
445
- } else {
446
- var formItem = data.formItem;
447
- for (var f = 0; f < formItem.length; f++) {
448
- if (formItem[f].uniqueName == mainTblData[m].uniqueName && formItem[f].value == tva) {
449
- valueMap1.value = tva;
450
- mainTblData[m].value = tva;
451
- break;
473
+ var linkFormKey = "";
474
+ var linkFormType = "";
475
+ for (var f = 0; f < formItem.length; f++) {
476
+ if (key == formItem[f].fieldId) {
477
+ linkFormKey = formItem[f].itemCode;
478
+ linkFormType = formItem[f].itemType;
479
+ }
480
+ }
481
+ if (linkFormKey) {
482
+ for (var m = 0; m < mainTblData.length; m++) {
483
+ if (linkFormKey == mainTblData[m].key) {
484
+ var relateItemParam = t.refs[mainTblName + "_" + mainTblData[m].key].getItemParam();
485
+ if (",text,textarea,datetime,datetimeStep,".indexOf("," + linkFormType + ",") != -1) {
486
+ var textValue = '';
487
+ var valueMap = {};
488
+ valueMap.key = 'value';
489
+ for (var c = 0; c < contentValue.length; c++) {
490
+ textValue = textValue + "," + contentValue[c];
491
+ }
492
+ valueMap.value = textValue.substring(1);
493
+
494
+ t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([valueMap]);
495
+ mainTblData[m].value = textValue.substring(1);
496
+ } else if (",radio,checkbox,select,".indexOf("," + linkFormType + ",") != -1) {
497
+ var textValue = '';
498
+ var resultMap = {};
499
+ resultMap.key = 'selectOptions';
500
+
501
+ var selectOptions = [];
502
+ for (var c = 0; c < contentValue.length; c++) {
503
+ textValue = textValue + "," + contentValue[c];
504
+ var option = {};
505
+ relateItemParam.selectItem.map(function (selectItemObj) {
506
+ if (selectItemObj.value == contentValue[c]) {
507
+ option.value = contentValue[c];
508
+ option.text = selectItemObj.text;
509
+ selectOptions.push(option);
510
+ }
511
+ });
512
+ }
513
+ resultMap.value = selectOptions;
514
+
515
+ var valueMap1 = {};
516
+ valueMap1.key = 'value';
517
+ valueMap1.value = "";
518
+ mainTblData[m].value = "";
519
+ var tva = textValue.substring(1);
520
+ if (containUniqueFlag == true) {
521
+ valueMap1.value = tva;
522
+ mainTblData[m].value = tva;
523
+ } else {
524
+ for (var f = 0; f < formItem.length; f++) {
525
+ if (formItem[f].itemCode == mainTblData[m].key && formItem[f].value == tva) {
526
+ valueMap1.value = tva;
527
+ mainTblData[m].value = tva;
528
+ break;
529
+ }
452
530
  }
453
531
  }
532
+ t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([resultMap, valueMap1]);
454
533
  }
455
- t.refs[mainTblData[m].uniqueName].reloadItemParam([resultMap, valueMap1]);
456
534
  }
457
535
  }
458
536
  }
@@ -1222,16 +1300,16 @@ var PageHome = function (_React$Component) {
1222
1300
  return _react2.default.createElement(
1223
1301
  'div',
1224
1302
  null,
1225
- _react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, onChange: this.change.bind(this) })
1303
+ _react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1226
1304
  );
1227
1305
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1228
1306
  'div',
1229
1307
  null,
1230
- _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, onChange: this.change.bind(this) })
1308
+ _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1231
1309
  ) : _react2.default.createElement(
1232
1310
  'div',
1233
1311
  null,
1234
- _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, onChange: this.change.bind(this) })
1312
+ _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
1235
1313
  );
1236
1314
  }.bind(this)) : _react2.default.createElement(
1237
1315
  'div',