fmui-base 2.1.77 → 2.1.79
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 +2 -0
- package/lib/form/form.js +1 -1
- package/lib/process_info/processInfo.js +20 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -655,7 +655,7 @@ var PageHome = function (_React$Component) {
|
|
|
655
655
|
// }
|
|
656
656
|
// 宏值新需求，赋值字段取defaultValue
|
|
657
657
|
if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && fuzhiFields != '') {
|
|
658
|
-
if (fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1) {
|
|
658
|
+
if (fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
|
|
659
659
|
value = form.defaultValue;
|
|
660
660
|
}
|
|
661
661
|
}
|
|
@@ -444,6 +444,8 @@ var PageHome = function (_React$Component) {
|
|
|
444
444
|
mobileFlowChar: '0', //是否开启流程图 1开启 0禁用
|
|
445
445
|
readScopeId: '',
|
|
446
446
|
readScopeList: [],
|
|
447
|
+
readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
|
|
448
|
+
readRangeList: '', //传阅范围为自定义时的limitData
|
|
447
449
|
isRemoveCommentFormHtml: '0', //是否隐藏无数据的批示意见 1隐藏
|
|
448
450
|
allActivity: [], //所有环节名称
|
|
449
451
|
designActivity: '', //选择的提醒环节id
|
|
@@ -794,6 +796,8 @@ var PageHome = function (_React$Component) {
|
|
|
794
796
|
var form = content.form;
|
|
795
797
|
var readScopeId = '';
|
|
796
798
|
var readScopeList = [];
|
|
799
|
+
var readRangeType = '';
|
|
800
|
+
var readRangeList = '';
|
|
797
801
|
var isRemoveCommentFormHtml = '0';
|
|
798
802
|
var subProcessCode = '';
|
|
799
803
|
var dataInherit = '';
|
|
@@ -807,6 +811,12 @@ var PageHome = function (_React$Component) {
|
|
|
807
811
|
if (content.readScopeList && typeof content.readScopeList != "undefined") {
|
|
808
812
|
readScopeList = content.readScopeList;
|
|
809
813
|
}
|
|
814
|
+
if (content.readRangeType && typeof content.readRangeType != "undefined") {
|
|
815
|
+
readRangeType = content.readRangeType;
|
|
816
|
+
}
|
|
817
|
+
if (content.readRangeList && typeof content.readRangeList != "undefined") {
|
|
818
|
+
readRangeList = content.readRangeList;
|
|
819
|
+
}
|
|
810
820
|
var commentUpload = '';
|
|
811
821
|
if (content.commentUpload && typeof content.commentUpload != "undefined") {
|
|
812
822
|
commentUpload = content.commentUpload;
|
|
@@ -1382,6 +1392,8 @@ var PageHome = function (_React$Component) {
|
|
|
1382
1392
|
mobileFlowChar: mobileFlowChar,
|
|
1383
1393
|
readScopeId: readScopeId,
|
|
1384
1394
|
readScopeList: readScopeList,
|
|
1395
|
+
readRangeType: readRangeType,
|
|
1396
|
+
readRangeList: readRangeList,
|
|
1385
1397
|
isRemoveCommentFormHtml: isRemoveCommentFormHtml,
|
|
1386
1398
|
commentUpload: commentUpload,
|
|
1387
1399
|
subProcessCode: subProcessCode,
|
|
@@ -4841,9 +4853,11 @@ var PageHome = function (_React$Component) {
|
|
|
4841
4853
|
|
|
4842
4854
|
var nextTaskId = "";
|
|
4843
4855
|
var autoSendText = "";
|
|
4856
|
+
var newdataId = "";
|
|
4844
4857
|
if (typeof content.nextTaskId != "undefined" && content.nextTaskId != "" && content.nextTaskId != null) {
|
|
4845
4858
|
nextTaskId = content.nextTaskId;
|
|
4846
4859
|
autoSendText = content.nextTaskName;
|
|
4860
|
+
newdataId = content.dataId;
|
|
4847
4861
|
try {
|
|
4848
4862
|
t.handleCancelClick();
|
|
4849
4863
|
} catch (e) {}
|
|
@@ -4852,7 +4866,8 @@ var PageHome = function (_React$Component) {
|
|
|
4852
4866
|
taskId: nextTaskId,
|
|
4853
4867
|
nextTaskId: nextTaskId,
|
|
4854
4868
|
operate: 1,
|
|
4855
|
-
autoSendText: autoSendText
|
|
4869
|
+
autoSendText: autoSendText,
|
|
4870
|
+
dataId: newdataId
|
|
4856
4871
|
}, function () {
|
|
4857
4872
|
t.handleSubmit(1);
|
|
4858
4873
|
});
|
|
@@ -7721,6 +7736,8 @@ var PageHome = function (_React$Component) {
|
|
|
7721
7736
|
chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
|
|
7722
7737
|
checkType: 'checkbox',
|
|
7723
7738
|
defaultValue: this.state.readScopeList,
|
|
7739
|
+
limitData: this.state.readRangeList,
|
|
7740
|
+
queryLimit: this.state.readRangeList && this.state.readRangeList != '' ? '5' : '',
|
|
7724
7741
|
ref: "selectMember_circulate1",
|
|
7725
7742
|
isDelete: true,
|
|
7726
7743
|
onChange: this.getCirculatePerson.bind(this)
|
|
@@ -7949,6 +7966,8 @@ var PageHome = function (_React$Component) {
|
|
|
7949
7966
|
chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
|
|
7950
7967
|
checkType: 'checkbox',
|
|
7951
7968
|
defaultValue: this.state.readScopeList,
|
|
7969
|
+
limitData: this.state.readRangeList,
|
|
7970
|
+
queryLimit: this.state.readRangeList && this.state.readRangeList != '' ? '5' : '',
|
|
7952
7971
|
ref: "selectMember_circulate",
|
|
7953
7972
|
isDelete: true,
|
|
7954
7973
|
onChange: this.circulateCallback.bind(this)
|