fmui-base 2.0.79 → 2.0.80

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 (4) hide show
  1. package/README.md +1 -0
  2. package/lib/process_batch/processBatch.js +85 -12
  3. package/lib/react_grid/react_grid.js +5 -5
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.0.80：移动端样式修改
6
7
  - 2.0.79：移动端批量办理，选人和回调问题处理
7
8
  - 2.0.78：移动门户修改布局接口数据接收
8
9
  - 2.0.77：移动门户修改样式
package/lib/process_batch/processBatch.js CHANGED
@@ -481,6 +481,7 @@ var PageHome = function (_React$Component) {
481
481
  var personValue = []; //选中的人
482
482
  var participantMode = item.participantMode; //判断选人是单选还是多选
483
483
  var commonUsedData = []; //自定义选人的范围,常用
484
+ var commonTreeData = [];
484
485
  var commonUsedId = ''; //常用选择范围
485
486
  var popCode = "";
486
487
  var chooseType = "";
@@ -494,56 +495,102 @@ var PageHome = function (_React$Component) {
494
495
  popCode = 'org,group'; //选人组件code
495
496
  chooseType = "userNotOrg,userNotGroup";
496
497
  var participantList = item.participantList;
498
+ // if(participantList != null && participantList != "" && participantList.length>0){
499
+ // for(var i=0; i<participantList.length; i++ ){
500
+ // if(participantList[i].type != "user"){
501
+ // var children = participantList[i];
502
+ // for(var j=0; j<children.length; j++ ){
503
+ // var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].name,imageId:""};
504
+ // personValue.push(personValueItem);
505
+ // }
506
+ // }else{
507
+ // var personValueItem = {scopeType:"user",scopeValue:participantList[i].id,scopeName:participantList[i].name,imageId:""};
508
+ // personValue.push(personValueItem);
509
+ // }
510
+
511
+ // }
512
+ // }
497
513
  if (participantList != null && participantList != "" && participantList.length > 0) {
498
514
  for (var i = 0; i < participantList.length; i++) {
499
515
  if (participantList[i].type != "user") {
500
516
  var children = participantList[i];
501
517
  for (var j = 0; j < children.length; j++) {
502
- var personValueItem = { scopeType: "user", scopeValue: children[j].id, scopeName: children[j].name, imageId: "" };
503
- personValue.push(personValueItem);
518
+ var personValueItem = { scopeType: "user", scopeValue: children[j].id, scopeName: children[j].userName, imageId: "", orgNamePath: children[j].orgPath };
519
+ personValues.push(personValueItem);
520
+ type3ParNum++;
504
521
  }
505
522
  } else {
506
- var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "" };
507
- personValue.push(personValueItem);
523
+ var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
524
+ personValues.push(personValueItem);
525
+ type3ParNum++;
508
526
  }
509
527
  }
528
+ if (type3ParNum > 1 && participantMode == '0') {
529
+ item.type = 2;
530
+ } else {
531
+ personValue = personValues;
532
+ }
533
+ if (type3ParNum == 0) {
534
+ item.type = 1;
535
+ }
510
536
  }
511
537
  } else if (item.type == 1) {
512
538
  //选择所有人
513
539
  selectUserReadOnly = false;
514
- chooseType = "userNotOrg";
540
+ chooseType = "userNotOrg,userNotGroup";
515
541
  if (item.nodeType == 'readtask') {
516
542
  //如果是传阅节点
517
- chooseType = "userNotOrg";
543
+ chooseType = "userNotOrg,userNotGroup";
518
544
  }
519
545
  var commonUsedId = ''; //常用选择范围
520
546
  var participantList = item.participantList;
547
+ var participantListNew = item.participantListNew;
548
+ if (participantListNew != null && participantListNew != "" && participantListNew.length > 0) {
549
+ commonTreeData = participantListNew;
550
+ }
551
+
552
+ participants = '';
521
553
  if (participantList != null && participantList != "" && participantList.length > 0) {
522
554
  for (var i = 0; i < participantList.length; i++) {
523
555
  if (participantList[i].type != "user") {
524
556
  var children = participantList[i];
525
557
  for (var j = 0; j < children.length; j++) {
526
- var personValueItem = { scopeType: participantList[i].type, scopeValue: children[j].id, scopeName: children[j].userName, imageId: "" };
527
558
  if (commonUsedId.indexOf(children[j].id) == -1) {
528
559
  commonUsedId += children[j].id + ',';
529
560
  commonUsedData.push(personValueItem);
561
+ if (item.partType == '1') {
562
+ personValue.push(personValueItem);
563
+ }
530
564
  }
531
565
  }
532
566
  } else {
533
- var personValueItem = { scopeType: participantList[i].type, scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "" };
534
- if (commonUsedId.indexOf(participantList[i].id) == -1) {
567
+ var personValueItem = { scopeType: participantList[i].type, scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
568
+ if (("," + commonUsedId + ",").indexOf("," + participantList[i].id + ',') == -1) {
535
569
  commonUsedId += participantList[i].id + ',';
536
570
  commonUsedData.push(personValueItem);
571
+ if (item.partType == '1') {
572
+ personValue.push(personValueItem);
573
+ }
537
574
  }
538
575
  }
539
576
  }
540
577
  if (commonUsedData.length > 0) {
541
- popCode = "common,org";
578
+ popCode = "common,org,group";
579
+ popCode = "common,org,group,duty,politicalOutlook";
580
+ chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
581
+ if (commonUsedData.length == 1) {
582
+ personValue = commonUsedData;
583
+ }
542
584
  } else {
543
- popCode = "org";
585
+ popCode = "org,group";
586
+ popCode = "org,group,duty,politicalOutlook";
587
+ chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
544
588
  }
545
589
  } else {
590
+ chooseType = "userNotOrg";
546
591
  popCode = "org";
592
+ popCode = "org,group,duty,politicalOutlook";
593
+ chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
547
594
  }
548
595
  }
549
596
  if (item.type == 2) {
@@ -553,6 +600,10 @@ var PageHome = function (_React$Component) {
553
600
  chooseType = "userNotOrg,userNotGroup";
554
601
  var commonUsedId = ''; //常用选择范围
555
602
  var participantList = item.participantList;
603
+ var participantListNew = item.participantListNew;
604
+ if (participantListNew != null && participantListNew != "" && participantListNew.length > 0) {
605
+ commonTreeData = participantListNew;
606
+ }
556
607
  if (participantList != null && participantList != "" && participantList.length > 0) {
557
608
  for (var i = 0; i < participantList.length; i++) {
558
609
  if (participantList[i].type != "user") {
@@ -566,12 +617,18 @@ var PageHome = function (_React$Component) {
566
617
  }*/
567
618
  } else if (participantList[i].secretLevel == 0 || participantList[i].secretLevel || !participantList[i].orgId) {
568
619
  var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
569
- if (commonUsedId.indexOf(participantList[i].id) == -1) {
620
+ if (("," + commonUsedId + ",").indexOf("," + participantList[i].id + ',') == -1) {
570
621
  commonUsedId += participantList[i].id + ',';
571
622
  commonUsedData.push(personValueItem);
623
+ if (item.partType == '1') {
624
+ personValue.push(personValueItem);
625
+ }
572
626
  }
573
627
  }
574
628
  }
629
+ if (commonUsedData.length == 1) {
630
+ personValue = commonUsedData;
631
+ }
575
632
  } else {
576
633
  item.type = 1;
577
634
  chooseType = "userNotOrg";
@@ -593,6 +650,7 @@ var PageHome = function (_React$Component) {
593
650
  checkedItem.code = popCode;
594
651
  checkedItem.chooseType = chooseType;
595
652
  checkedItem.commonUsedData = commonUsedData;
653
+ checkedItem.commonTreeData = commonTreeData;
596
654
  checkedItem.participantMode = participantMode; //选人单选还是多选，1多选，0单选
597
655
  checkedItem.personValue = personValue;
598
656
  checkedItem.selectUserReadOnly = selectUserReadOnly;
@@ -1107,6 +1165,20 @@ var PageHome = function (_React$Component) {
1107
1165
  type: 'success',
1108
1166
  content: content.successCount + '条成功,' + content.skipCount + '条失败'
1109
1167
  });
1168
+ var returnData = content.successList;
1169
+ if (typeof returnData != 'undefined' && returnData != null) {
1170
+ for (var i = 0; i < returnData.length; i++) {
1171
+
1172
+ var returnDataItem = returnData[i];
1173
+ var barStatus = returnDataItem.status;
1174
+ var barDataId = returnDataItem.dataId;
1175
+ var barModules = returnDataItem.modules;
1176
+ var FlowCommon = require('pages/flow_common/' + barModules).default ? require('pages/flow_common/' + barModules).default : require('pages/flow_common/' + barModules);
1177
+ if (FlowCommon && typeof FlowCommon.operateCallBack === "function") {
1178
+ FlowCommon.operateCallBack({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
1179
+ }
1180
+ }
1181
+ }
1110
1182
 
1111
1183
  /*let returnData = content.successList;
1112
1184
  if(typeof(returnData) != 'undefined' && returnData != null){
@@ -1678,6 +1750,7 @@ var PageHome = function (_React$Component) {
1678
1750
  isDelete: true,
1679
1751
  defaultValue: item.personValue,
1680
1752
  commonUsedData: item.commonUsedData,
1753
+ commonTreeData: item.commonTreeData,
1681
1754
  onChange: this.getChoosePerson.bind(this, i),
1682
1755
  queryLimit: item.participants == '' ? '' : '5',
1683
1756
  limitData: item.participants == '' ? '' : item.participants
package/lib/react_grid/react_grid.js CHANGED
@@ -924,7 +924,7 @@ var MyGrid = function (_React$Component) {
924
924
  }
925
925
  componentContent = _react2.default.createElement(
926
926
  'div',
927
- { className: 'component-bssx' },
927
+ { className: '' },
928
928
  _react2.default.createElement(
929
929
  'p',
930
930
  { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.jumpPage.bind(this, "/officehall") },
@@ -1276,7 +1276,7 @@ var MyGrid = function (_React$Component) {
1276
1276
  }
1277
1277
  componentContent = _react2.default.createElement(
1278
1278
  'div',
1279
- { 'class': 'component-bssx' },
1279
+ { 'class': '' },
1280
1280
  t.state['activeIndex_ggyj_' + item.id] && t.state['activeIndex_ggyj_' + item.id] === true ? _react2.default.createElement(
1281
1281
  'p',
1282
1282
  { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, 'ggyj') },
@@ -1471,7 +1471,7 @@ var MyGrid = function (_React$Component) {
1471
1471
  }
1472
1472
  componentHead = _react2.default.createElement(
1473
1473
  'div',
1474
- { className: 'component-bssx' },
1474
+ { className: '' },
1475
1475
  _react2.default.createElement(
1476
1476
  'p',
1477
1477
  { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
@@ -1498,7 +1498,7 @@ var MyGrid = function (_React$Component) {
1498
1498
  if (item.portletCode === 'lcfq') {
1499
1499
  componentHead = _react2.default.createElement(
1500
1500
  'div',
1501
- null,
1501
+ { className: '' },
1502
1502
  _react2.default.createElement(
1503
1503
  'p',
1504
1504
  { className: styleSetting.titleSet.titleStatus == 1 && styleSetting.otherSet.toolbarShow == 1 ? "rightMore" : 't-DN', onClick: t.skip2More.bind(this, item.portletCode) },
@@ -1719,7 +1719,7 @@ var MyGrid = function (_React$Component) {
1719
1719
  }
1720
1720
  return _react2.default.createElement(
1721
1721
  'div',
1722
- { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component' : 'react-grid-component noTitle', key: item.id, style: {
1722
+ { className: styleSetting.titleSet.titleStatus == 1 ? 'react-grid-component component-bssx' : 'react-grid-component noTitle', key: item.id, style: {
1723
1723
  borderTopLeftRadius: styleSetting.otherSet.radius.topLeft + 'px',
1724
1724
  borderTopRightRadius: styleSetting.otherSet.radius.topRight + 'px',
1725
1725
  borderBottomLeftRadius: styleSetting.otherSet.radius.bottomLeft + 'px',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.0.79",
3
+ "version": "2.0.80",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",