fmui-base 2.2.34 → 2.2.36

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 (6) hide show
  1. package/README.md +2 -0
  2. package/lib/comment_list/List.js +2 -1
  3. package/lib/form/form.js +27 -4
  4. package/lib/form/table.js +8 -8
  5. package/lib/process_info/processInfo.js +18 -18
  6. package/package.json +1 -1
package/README.md CHANGED
@@ -3,6 +3,8 @@
3
3
  ---npm publish
4
4
 
5
5
  ## 更新日志
6
+ - 2.2.35: 流程增加ca开关
7
+ - 2.2.35: 流程选人去重问题，时分字段丢失修复
6
8
  - 2.2.34: 北京CA授权后刷新表单页
7
9
  - 2.2.33: 下移动端结束流程，结束原因提示
8
10
  - 2.2.32: 下拉多选支持联动
package/lib/comment_list/List.js CHANGED
@@ -97,7 +97,8 @@ var PageHome = function (_React$Component) {
97
97
  key: 'casigin',
98
98
  value: function casigin() {
99
99
  var commentList = this.props.list;
100
- if (commentList) {
100
+ var isCaUser = this.props.isCaUser; //是否是CA加签用户
101
+ if (commentList && isCaUser == "1") {
101
102
  commentList.map(function (item) {
102
103
  var param = {};
103
104
  param.bizSn = item.id;
package/lib/form/form.js CHANGED
@@ -142,6 +142,7 @@ var PageHome = function (_React$Component) {
142
142
  var data = props.data;
143
143
  var status = props.status;
144
144
  var dataType = props.dataType; //数据类型，main:主表，sub：子表，
145
+ var isCaUser = props.isCaUser; //是否是CA加签用户
145
146
  if (!dataType) {
146
147
  dataType = "main";
147
148
  }
@@ -194,7 +195,8 @@ var PageHome = function (_React$Component) {
194
195
  phraseList: [], //常用语列表
195
196
  spyj: props.defaultValue,
196
197
  isRemoveCommentFormHtml: isRemoveCommentFormHtml,
197
- commentInitList: []
198
+ commentInitList: [],
199
+ isCaUser: isCaUser
198
200
  };
199
201
 
200
202
  return _this;
@@ -928,6 +930,16 @@ var PageHome = function (_React$Component) {
928
930
  }
929
931
  var dateFormat = form.dateFormat;
930
932
  var dateFormatShow = "";
933
+
934
+ // 获取年月日
935
+ var now = new Date();
936
+ var year = now.getFullYear();
937
+ var month = ('0' + (now.getMonth() + 1)).slice(-2); // 月份从0开始，需要+1
938
+ var day = ('0' + now.getDate()).slice(-2);
939
+
940
+ // 格式化为 YYYY-MM-DD
941
+ var formattedDate = year + '-' + month + '-' + day;
942
+
931
943
  if (form.dataAttr && typeof form.dataAttr != "undefined") {
932
944
  var dateDisplayFormat = form.dataAttr.dateDisplayFormat;
933
945
  if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
@@ -941,7 +953,11 @@ var PageHome = function (_React$Component) {
941
953
  } else if (dateDisplayFormat == "ODate") {
942
954
  dateFormat = "YMD";
943
955
  } else if (dateDisplayFormat == "HourMin") {
944
- dateFormat = "HM";
956
+ dateFormat = "YMDHM";
957
+ if (value && value.length == 5) {
958
+ value = formattedDate + " " + value + ":00";
959
+ }
960
+ dateFormatShow = "HourMin";
945
961
  } else if (dateDisplayFormat == "zhDate") {
946
962
  dateFormat = "YMD";
947
963
  dateFormatShow = "zhDate";
@@ -1537,7 +1553,8 @@ var PageHome = function (_React$Component) {
1537
1553
  }, {
1538
1554
  key: 'casigin',
1539
1555
  value: function casigin(itemParam, data, uniqueName, value) {
1540
- if (value && value != null && value != "" && typeof value != "undefined") {
1556
+ var isCaUser = this.state.isCaUser;
1557
+ if (value && value != null && value != "" && typeof value != "undefined" && isCaUser == "1") {
1541
1558
  var t = this;
1542
1559
  var dataId = data.dataId;
1543
1560
  var param = {};
@@ -2416,6 +2433,7 @@ var PageHome = function (_React$Component) {
2416
2433
  }, {
2417
2434
  key: 'handleChangeDate',
2418
2435
  value: function handleChangeDate(code, value) {
2436
+ console.log("handleChangeDate===" + JSON.stringify(value));
2419
2437
  var data = this.props.data;
2420
2438
  var itemParam = this.state.itemParam;
2421
2439
  var dateFormat = itemParam.dateFormat;
@@ -2520,6 +2538,11 @@ var PageHome = function (_React$Component) {
2520
2538
  } else {
2521
2539
  return year + '年' + month + '月' + dates + '日 下午';
2522
2540
  }
2541
+ } else if (dateFormatShow == 'HourMin') {
2542
+ //时分
2543
+ var hour = this.dealwithDate(date.getHours());
2544
+ var min = this.dealwithDate(date.getMinutes());
2545
+ return hour + ':' + min;
2523
2546
  }
2524
2547
  }
2525
2548
  if (formatStr == 'YMD') {
@@ -3658,7 +3681,7 @@ var PageHome = function (_React$Component) {
3658
3681
  _react2.default.createElement(
3659
3682
  'div',
3660
3683
  { className: 't-PT10 t-FB1' },
3661
- _react2.default.createElement(_List2.default, { list: t.state.itemParam.value }),
3684
+ _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser }),
3662
3685
  _react2.default.createElement(
3663
3686
  'div',
3664
3687
  { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },
package/lib/form/table.js CHANGED
@@ -1850,16 +1850,16 @@ var PageHome = function (_React$Component) {
1850
1850
  return _react2.default.createElement(
1851
1851
  'div',
1852
1852
  { className: "form_" + item2.uniqueName },
1853
- _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1853
+ _react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1854
1854
  );
1855
1855
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1856
1856
  'div',
1857
1857
  { className: "subform_" + item.itemCode },
1858
- _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1858
+ _react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
1859
1859
  ) : _react2.default.createElement(
1860
1860
  'div',
1861
1861
  { className: "form_" + item.uniqueName },
1862
- _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1862
+ _react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, 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, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1863
1863
  );
1864
1864
  }.bind(this)) : "" : _react2.default.createElement(
1865
1865
  'div',
@@ -1886,16 +1886,16 @@ var PageHome = function (_React$Component) {
1886
1886
  return _react2.default.createElement(
1887
1887
  'div',
1888
1888
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1889
- _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1889
+ _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1890
1890
  );
1891
1891
  }.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
1892
1892
  'div',
1893
1893
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1894
- _react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
1894
+ _react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
1895
1895
  ) : _react2.default.createElement(
1896
1896
  'div',
1897
1897
  { className: t.state.active == item.tabCode ? "" : "t-DN" },
1898
- _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1898
+ _react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
1899
1899
  );
1900
1900
  }.bind(this))
1901
1901
  )
@@ -1916,7 +1916,7 @@ var PageHome = function (_React$Component) {
1916
1916
  _react2.default.createElement(
1917
1917
  'div',
1918
1918
  { className: 't-PT10 t-FB1' },
1919
- _react2.default.createElement(_List2.default, { list: t.props.commentBackList })
1919
+ _react2.default.createElement(_List2.default, { list: t.props.commentBackList, isCaUser: t.props.isCaUser })
1920
1920
  )
1921
1921
  )
1922
1922
  ),
@@ -1939,7 +1939,7 @@ var PageHome = function (_React$Component) {
1939
1939
  _react2.default.createElement(
1940
1940
  'div',
1941
1941
  { className: 't-PT10 t-FB1' },
1942
- t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? _react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }) : "",
1942
+ t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? _react2.default.createElement(_List2.default, { list: t.props.commentDefaultList, isCaUser: t.props.isCaUser }) : "",
1943
1943
  _react2.default.createElement(
1944
1944
  'div',
1945
1945
  { className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
package/lib/process_info/processInfo.js CHANGED
@@ -127,12 +127,12 @@ var ButtonGroup = _Button2.default.ButtonGroup,
127
127
  TextButton = _Button2.default.TextButton;
128
128
  //import UserInfo from '../approval-details/UserInfo';
129
129
 
130
- var isReload = false;
130
+ var isCaReload = false;
131
131
  window.addEventListener('pageshow', function () {
132
- console.log("isReload===" + isReload);
133
- isReload = this.localStorage.getItem("isReload");
134
- this.localStorage.setItem("isReload", false);
135
- if (isReload) {
132
+ console.log("isCaReload===" + isCaReload);
133
+ isCaReload = this.localStorage.getItem("isCaReload");
134
+ this.localStorage.setItem("isCaReload", false);
135
+ if (isCaReload == '1') {
136
136
  window.location.reload();
137
137
  }
138
138
  });
@@ -2637,7 +2637,7 @@ var PageHome = function (_React$Component) {
2637
2637
  if (participantList[i].type != "user") {
2638
2638
  var children = participantList[i];
2639
2639
  for (var j = 0; j < children.length; j++) {
2640
- if (commonUsedId.indexOf(children[j].id) == -1) {
2640
+ if (commonUsedId.split(",").indexOf(children[j].id) == -1) {
2641
2641
  commonUsedId += children[j].id + ',';
2642
2642
  commonUsedData.push(personValueItem);
2643
2643
  if (item.partType == '1') {
@@ -2647,7 +2647,7 @@ var PageHome = function (_React$Component) {
2647
2647
  }
2648
2648
  } else {
2649
2649
  var personValueItem = { scopeType: participantList[i].type, scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
2650
- if (("," + commonUsedId + ",").indexOf("," + participantList[i].id + ',') == -1) {
2650
+ if (commonUsedId.split(",").indexOf(participantList[i].id) == -1) {
2651
2651
  commonUsedId += participantList[i].id + ',';
2652
2652
  commonUsedData.push(personValueItem);
2653
2653
  if (item.partType == '1') {
@@ -2700,7 +2700,7 @@ var PageHome = function (_React$Component) {
2700
2700
  }*/
2701
2701
  } else if (participantList[i].secretLevel == 0 || participantList[i].secretLevel || !participantList[i].orgId) {
2702
2702
  var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
2703
- if (("," + commonUsedId + ",").indexOf("," + participantList[i].id + ',') == -1) {
2703
+ if (commonUsedId.split(",").indexOf(participantList[i].id) == -1) {
2704
2704
  commonUsedId += participantList[i].id + ',';
2705
2705
  commonUsedData.push(personValueItem);
2706
2706
  if (item.partType == '1') {
@@ -3398,7 +3398,7 @@ var PageHome = function (_React$Component) {
3398
3398
  var children = participantList[i];
3399
3399
  for (var j = 0; j < children.length; j++) {
3400
3400
  var personValueItem = { scopeType: "user", scopeValue: children[j].id, scopeName: children[j].userName, imageId: "", orgNamePath: children[j].orgPath };
3401
- if (commonUsedId.indexOf(children[j].id) == -1) {
3401
+ if (commonUsedId.split(',').indexOf(children[j].id) == -1) {
3402
3402
  commonUsedId += children[j].id + ',';
3403
3403
  commonUsedData.push(personValueItem);
3404
3404
  if (item.partType == '1') {
@@ -3408,7 +3408,7 @@ var PageHome = function (_React$Component) {
3408
3408
  }
3409
3409
  } else {
3410
3410
  var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
3411
- if (commonUsedId.indexOf(participantList[i].id) == -1) {
3411
+ if (commonUsedId.split(',').indexOf(participantList[i].id) == -1) {
3412
3412
  commonUsedId += participantList[i].id + ',';
3413
3413
  commonUsedData.push(personValueItem);
3414
3414
  if (item.partType == '1') {
@@ -3442,7 +3442,7 @@ var PageHome = function (_React$Component) {
3442
3442
  var children = participantList[i];
3443
3443
  for (var j = 0; j < children.length; j++) {
3444
3444
  var personValueItem = { scopeType: "user", scopeValue: children[j].id, scopeName: children[j].userName, imageId: "", orgNamePath: children[j].orgPath };
3445
- if (commonUsedId.indexOf(children[j].id) == -1) {
3445
+ if (commonUsedId.split(',').indexOf(children[j].id) == -1) {
3446
3446
  commonUsedId += children[j].id + ',';
3447
3447
  commonUsedData.push(personValueItem);
3448
3448
  if (item.partType == '1') {
@@ -3452,7 +3452,7 @@ var PageHome = function (_React$Component) {
3452
3452
  }
3453
3453
  } else {
3454
3454
  var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
3455
- if (commonUsedId.indexOf(participantList[i].id) == -1) {
3455
+ if (commonUsedId.split(',').indexOf(participantList[i].id) == -1) {
3456
3456
  commonUsedId += participantList[i].id + ',';
3457
3457
  commonUsedData.push(personValueItem);
3458
3458
  if (item.partType == '1') {
@@ -3839,7 +3839,7 @@ var PageHome = function (_React$Component) {
3839
3839
  var selectUserIds = '';
3840
3840
  var selectOrgIds = '';
3841
3841
  personValue.map(function (item, index) {
3842
- if (selectUserIds.indexOf(item.scopeValue) == -1) {
3842
+ if (selectUserIds.split(',').indexOf(item.scopeValue) == -1) {
3843
3843
  if (item.scopeType == 'user') {
3844
3844
  //用户
3845
3845
  selectUserIds += item.scopeValue + ",";
@@ -3858,7 +3858,7 @@ var PageHome = function (_React$Component) {
3858
3858
  orgUsernames = '';
3859
3859
 
3860
3860
  for (j = 0; j < orgUserList.length; j++) {
3861
- if (auditorUserIds.indexOf(orgUserList[j].id) < 0) {
3861
+ if (auditorUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
3862
3862
  orgUserids += orgUserList[j].id + ",";
3863
3863
  orgUsernames += orgUserList[j].userName + ",";
3864
3864
  }
@@ -5838,7 +5838,7 @@ var PageHome = function (_React$Component) {
5838
5838
  var orgUserids = '';
5839
5839
  var orgUsernames = '';
5840
5840
  for (var j = 0; j < orgUserList.length; j++) {
5841
- if (targetUserIds.indexOf(orgUserList[j].id) < 0) {
5841
+ if (targetUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
5842
5842
  orgUserids += orgUserList[j].id + ",";
5843
5843
  orgUsernames += orgUserList[j].userName + ",";
5844
5844
  }
@@ -5961,7 +5961,7 @@ var PageHome = function (_React$Component) {
5961
5961
  var orgUserids = '';
5962
5962
  var orgUsernames = '';
5963
5963
  for (var j = 0; j < orgUserList.length; j++) {
5964
- if (chaosongId.indexOf(orgUserList[j].id) < 0) {
5964
+ if (chaosongId.split(',').indexOf(orgUserList[j].id) < 0) {
5965
5965
  orgUserids += orgUserList[j].id + ",";
5966
5966
  }
5967
5967
  }
@@ -5985,7 +5985,7 @@ var PageHome = function (_React$Component) {
5985
5985
  var orgUserids = '';
5986
5986
  var orgUsernames = '';
5987
5987
  for (var j = 0; j < orgUserList.length; j++) {
5988
- if (targetUserIds.indexOf(orgUserList[j].id) < 0) {
5988
+ if (targetUserIds.split(',').indexOf(orgUserList[j].id) < 0) {
5989
5989
  orgUserids += orgUserList[j].id + ",";
5990
5990
  orgUsernames += orgUserList[j].userName + ",";
5991
5991
  }
@@ -7640,7 +7640,7 @@ var PageHome = function (_React$Component) {
7640
7640
  _react2.default.createElement(
7641
7641
  _Group2.default.List,
7642
7642
  null,
7643
- this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, onChange: this.change.bind(this) })
7643
+ this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, onChange: this.change.bind(this) })
7644
7644
  )
7645
7645
  )
7646
7646
  )
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fmui-base",
3
- "version": "2.2.34",
3
+ "version": "2.2.36",
4
4
  "title": "fmui-base",
5
5
  "description": "fmui移动端组件",
6
6
  "main": "lib/index.js",