fmui-base 2.1.70 → 2.1.71

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 +1 -0
  2. package/lib/process_info/processInfo.js +23 -49
  3. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,7 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.1.71：传阅支持选择到组织、职务、群组
6
7
  - 2.1.70：移动端流程发起推送标题实时更新
7
8
  - 2.1.69：移动端流程办理推送标题
8
9
  - 2.1.68：移动端流程办理推送标题
package/lib/process_info/processInfo.js CHANGED
@@ -4720,32 +4720,15 @@ var PageHome = function (_React$Component) {
4720
4720
  param.nextTaskId = nextTaskId;
4721
4721
  if (circulatePersonValue.length > 0) {
4722
4722
  circulatePersonValue.map(function (item, index) {
4723
- if (item.scopeType == 'org') {
4724
- orgIds += item.scopeValue + ',';
4725
- } else if (item.scopeType == 'user') {
4726
- assignId += item.scopeValue + ',';
4727
- assignName += item.scopeName + ',';
4728
- }
4723
+ assignName += item.scopeName + ',';
4729
4724
  });
4730
- if (orgIds != '') {
4731
- orgIds = orgIds.substring(0, orgIds.length - 1);
4732
- var orgUserList = getUsersByOrgIDs(orgIds);
4733
- var orgUserids = '';
4734
- var orgUsernames = '';
4735
- for (var j = 0; j < orgUserList.length; j++) {
4736
- if (assignId.indexOf(orgUserList[j].id) < 0) {
4737
- orgUserids += orgUserList[j].id + ",";
4738
- orgUsernames += orgUserList[j].userName + ",";
4739
- }
4740
- }
4741
- assignId += orgUserids;
4742
- assignName += orgUsernames;
4743
- }
4744
- if (assignId) {
4745
- assignId = assignId.substring(0, assignId.length - 1);
4725
+
4726
+ if (assignName && assignName != '') {
4746
4727
  assignName = assignName.substring(0, assignName.length - 1);
4747
4728
  }
4748
4729
  }
4730
+ param.scopeJsonData = JSON.stringify(circulatePersonValue);
4731
+ console.log(JSON.stringify(circulatePersonValue));
4749
4732
  param.circulateIds = assignId;
4750
4733
  param.circulateNames = assignName;
4751
4734
  param.dealReminderContent = dealReminderContent;
@@ -5545,39 +5528,29 @@ var PageHome = function (_React$Component) {
5545
5528
  var orgIds = "";
5546
5529
  var isPush = t.state.isPush;
5547
5530
  for (var i = 0; i < value.length; i++) {
5548
- if (value[i].scopeType == 'org') {
5549
- orgIds += value[i].scopeValue + ',';
5550
- } else if (value[i].scopeType == 'user') {
5551
- targetUserIds += value[i].scopeValue + ',';
5552
- targetUserNames += value[i].scopeName + ',';
5553
- }
5554
- }
5555
- if (orgIds != '') {
5556
- orgIds = orgIds.substring(0, orgIds.length - 1);
5557
- var orgUserList = getUsersByOrgIDs(orgIds);
5558
- var orgUserids = '';
5559
- var orgUsernames = '';
5560
- for (var j = 0; j < orgUserList.length; j++) {
5561
- if (targetUserIds.indexOf(orgUserList[j].id) < 0) {
5562
- orgUserids += orgUserList[j].id + ",";
5563
- orgUsernames += orgUserList[j].userName + ",";
5564
- }
5565
- }
5566
- targetUserIds += orgUserids;
5567
- targetUserNames += orgUsernames;
5531
+ targetUserNames += value[i].scopeName + ',';
5568
5532
  }
5569
- if (targetUserIds) {
5570
- targetUserIds = targetUserIds.substring(0, targetUserIds.length - 1);
5533
+
5534
+ if (targetUserNames && targetUserNames != '') {
5535
+ // targetUserIds = targetUserIds.substring(0,targetUserIds.length-1);
5571
5536
  targetUserNames = targetUserNames.substring(0, targetUserNames.length - 1);
5572
5537
  }
5573
5538
 
5574
- if (targetUserIds == '') {
5539
+ // if(targetUserIds == ''){
5540
+ // Toast.show({
5541
+ // type: 'error',
5542
+ // content: '请选择传阅人',
5543
+ // });
5544
+ // return false;
5545
+ // }
5546
+ if (value.length == 0) {
5575
5547
  _Toast2.default.show({
5576
5548
  type: 'error',
5577
5549
  content: '请选择传阅人'
5578
5550
  });
5579
5551
  return false;
5580
5552
  }
5553
+
5581
5554
  var shortMessage = '0';
5582
5555
  var circulateShortMessage = t.state.circulateShortMessage;
5583
5556
  /* if(circulateShortMessage.length>0){
@@ -5599,6 +5572,7 @@ var PageHome = function (_React$Component) {
5599
5572
  taskId: t.state.taskId,
5600
5573
  targetUserIds: targetUserIds,
5601
5574
  targetUserNames: targetUserNames,
5575
+ scopeJsonData: JSON.stringify(value),
5602
5576
  module: t.state.module,
5603
5577
  formId: t.state.formId,
5604
5578
  permissionCode: t.state.permissionCode,
@@ -7742,8 +7716,8 @@ var PageHome = function (_React$Component) {
7742
7716
  readOnly: false,
7743
7717
  label: '传阅人',
7744
7718
  placeholder: '\u8BF7\u9009\u62E9',
7745
- code: 'user,org,group',
7746
- chooseType: 'userNotOrg,userNotGroup',
7719
+ code: 'user,org,group,duty,politicalOutlook,station,personGroup',
7720
+ chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
7747
7721
  checkType: 'checkbox',
7748
7722
  defaultValue: this.state.readScopeList,
7749
7723
  ref: "selectMember_circulate1",
@@ -7970,8 +7944,8 @@ var PageHome = function (_React$Component) {
7970
7944
  readOnly: false,
7971
7945
  label: '传阅人',
7972
7946
  placeholder: '\u8BF7\u9009\u62E9',
7973
- code: 'user,org,group',
7974
- chooseType: 'userNotOrg,userNotGroup',
7947
+ code: 'user,org,group,duty,politicalOutlook,station,personGroup',
7948
+ chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
7975
7949
  checkType: 'checkbox',
7976
7950
  defaultValue: this.state.readScopeList,
7977
7951
  ref: "selectMember_circulate",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.1.70",
3
+ "version": "2.1.71",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",