fmui-base 1.0.42 → 1.0.45
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 +3 -0
- package/lib/comment_list/List.less +6 -6
- package/lib/form/form.js +33 -18
- package/lib/form/subForm.js +23 -23
- package/lib/form/table.js +6 -6
- package/lib/form_info/formInfo.js +51 -51
- package/lib/poppage/table/table.js +668 -668
- package/lib/process_info/processInfo.js +1030 -970
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
.t-PR5 {
|
|
2
|
-
padding-right: 5px;
|
|
3
|
-
}
|
|
4
|
-
.t-FBH.flex-comment.t-field-box{
|
|
5
|
-
padding-right:0px;
|
|
6
|
-
}
|
|
1
|
+
.t-PR5 {
|
|
2
|
+
padding-right: 5px;
|
|
3
|
+
}
|
|
4
|
+
.t-FBH.flex-comment.t-field-box{
|
|
5
|
+
padding-right:0px;
|
|
6
|
+
}
|
package/lib/form/form.js
CHANGED
|
@@ -122,6 +122,16 @@ var PageHome = function (_React$Component) {
|
|
|
122
122
|
var form = props.form;
|
|
123
123
|
var data = props.data;
|
|
124
124
|
var status = props.status;
|
|
125
|
+
var dataType = props.dataType; //数据类型,main:主表,sub:子表,
|
|
126
|
+
if (!dataType) {
|
|
127
|
+
dataType = "main";
|
|
128
|
+
}
|
|
129
|
+
var prefixName = dataType;
|
|
130
|
+
if (dataType == "sub") {
|
|
131
|
+
var keyNo = props.keyNo;
|
|
132
|
+
var subTblName = props.subTblName;
|
|
133
|
+
prefixName = dataType + "_" + subTblName + "_" + keyNo;
|
|
134
|
+
}
|
|
125
135
|
var commentField = props.commentField;
|
|
126
136
|
/* alert(commentField);*/
|
|
127
137
|
var context = document.getElementById("context").value;
|
|
@@ -145,6 +155,8 @@ var PageHome = function (_React$Component) {
|
|
|
145
155
|
id: '',
|
|
146
156
|
key: ''
|
|
147
157
|
},
|
|
158
|
+
dataType: dataType,
|
|
159
|
+
prefixName: prefixName,
|
|
148
160
|
loaded: false,
|
|
149
161
|
commentList: [],
|
|
150
162
|
phraseListNew: [],
|
|
@@ -255,7 +267,6 @@ var PageHome = function (_React$Component) {
|
|
|
255
267
|
if (!dataType) {
|
|
256
268
|
dataType = "main";
|
|
257
269
|
}
|
|
258
|
-
if (dataType == "sub") {}
|
|
259
270
|
|
|
260
271
|
var tableName = data.mainTblName;
|
|
261
272
|
var itemParam = {}; //元素参数
|
|
@@ -906,6 +917,10 @@ var PageHome = function (_React$Component) {
|
|
|
906
917
|
popCode = form.popuserMap.popCode;
|
|
907
918
|
chooseWay = form.popuserMap.chooseWay;
|
|
908
919
|
itemParam.chooseObj = form.popuserMap.chooseObj;
|
|
920
|
+
//表单默认值
|
|
921
|
+
if (form.popuserMap.defaultUserScopeJson) {
|
|
922
|
+
itemParam.defaultValue = JSON.parse(form.popuserMap.defaultUserScopeJson);
|
|
923
|
+
}
|
|
909
924
|
} else {
|
|
910
925
|
popCode = form.popuserMap.chooseObj;
|
|
911
926
|
chooseWay = form.popuserMap.chooseWay;
|
|
@@ -2393,7 +2408,7 @@ var PageHome = function (_React$Component) {
|
|
|
2393
2408
|
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
|
|
2394
2409
|
_react2.default.createElement(
|
|
2395
2410
|
'div',
|
|
2396
|
-
{ className: 't-FBH' },
|
|
2411
|
+
{ className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
2397
2412
|
_react2.default.createElement(_TextareaField2.default, {
|
|
2398
2413
|
className: 't-W100',
|
|
2399
2414
|
required: t.state.itemParam.required,
|
|
@@ -2413,7 +2428,7 @@ var PageHome = function (_React$Component) {
|
|
|
2413
2428
|
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle == null ? {} : t.state.itemParam.formStyleObj.contentStyle },
|
|
2414
2429
|
_react2.default.createElement(
|
|
2415
2430
|
'div',
|
|
2416
|
-
{ className: 't-FBH' },
|
|
2431
|
+
{ className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
2417
2432
|
_react2.default.createElement(_TextField2.default, {
|
|
2418
2433
|
className: 't-W100',
|
|
2419
2434
|
required: t.state.itemParam.required,
|
|
@@ -2456,7 +2471,7 @@ var PageHome = function (_React$Component) {
|
|
|
2456
2471
|
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2457
2472
|
_react2.default.createElement(
|
|
2458
2473
|
'div',
|
|
2459
|
-
{ className: 't-FBH' },
|
|
2474
|
+
{ className: 't-FBH', id: t.state.prefixName + "_" + t.state.itemParam.key },
|
|
2460
2475
|
_react2.default.createElement(_TextareaField2.default, {
|
|
2461
2476
|
className: 't-W100',
|
|
2462
2477
|
required: t.state.itemParam.required,
|
|
@@ -2475,7 +2490,7 @@ var PageHome = function (_React$Component) {
|
|
|
2475
2490
|
)
|
|
2476
2491
|
) : this.state.itemParam.itemType == 'textarea' ? _react2.default.createElement(
|
|
2477
2492
|
'div',
|
|
2478
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2493
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2479
2494
|
_react2.default.createElement(
|
|
2480
2495
|
_Group2.default.List,
|
|
2481
2496
|
{ borderTopNone: true },
|
|
@@ -2499,7 +2514,7 @@ var PageHome = function (_React$Component) {
|
|
|
2499
2514
|
)
|
|
2500
2515
|
) : this.state.itemParam.itemType == 'radio' ? _react2.default.createElement(
|
|
2501
2516
|
'div',
|
|
2502
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2517
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2503
2518
|
_react2.default.createElement(
|
|
2504
2519
|
_Group2.default.List,
|
|
2505
2520
|
{ borderTopNone: true },
|
|
@@ -2524,7 +2539,7 @@ var PageHome = function (_React$Component) {
|
|
|
2524
2539
|
)
|
|
2525
2540
|
) : this.state.itemParam.itemType == 'checkbox' ? _react2.default.createElement(
|
|
2526
2541
|
'div',
|
|
2527
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2542
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2528
2543
|
_react2.default.createElement(
|
|
2529
2544
|
_Group2.default.List,
|
|
2530
2545
|
{ borderTopNone: true },
|
|
@@ -2550,7 +2565,7 @@ var PageHome = function (_React$Component) {
|
|
|
2550
2565
|
)
|
|
2551
2566
|
) : this.state.itemParam.itemType == 'select' ? _react2.default.createElement(
|
|
2552
2567
|
'div',
|
|
2553
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2568
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2554
2569
|
_react2.default.createElement(
|
|
2555
2570
|
_Group2.default.List,
|
|
2556
2571
|
{ borderTopNone: true },
|
|
@@ -2578,7 +2593,7 @@ var PageHome = function (_React$Component) {
|
|
|
2578
2593
|
{ borderTopNone: true },
|
|
2579
2594
|
_react2.default.createElement(
|
|
2580
2595
|
'div',
|
|
2581
|
-
{ className: 't-FBH' },
|
|
2596
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: 't-FBH' },
|
|
2582
2597
|
_react2.default.createElement(_DatetimeField2.default, {
|
|
2583
2598
|
className: 't-W100',
|
|
2584
2599
|
label: t.state.itemParam.title,
|
|
@@ -2595,7 +2610,7 @@ var PageHome = function (_React$Component) {
|
|
|
2595
2610
|
)
|
|
2596
2611
|
) : this.state.itemParam.itemType == 'datetimeStep' ? _react2.default.createElement(
|
|
2597
2612
|
'div',
|
|
2598
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2613
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2599
2614
|
_react2.default.createElement(
|
|
2600
2615
|
_Group2.default.List,
|
|
2601
2616
|
{ borderTopNone: true },
|
|
@@ -2647,7 +2662,7 @@ var PageHome = function (_React$Component) {
|
|
|
2647
2662
|
)
|
|
2648
2663
|
) : this.state.itemParam.itemType == 'poppage' ? _react2.default.createElement(
|
|
2649
2664
|
'div',
|
|
2650
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2665
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2651
2666
|
_react2.default.createElement(
|
|
2652
2667
|
_Group2.default.List,
|
|
2653
2668
|
{ borderTopNone: true },
|
|
@@ -2673,7 +2688,7 @@ var PageHome = function (_React$Component) {
|
|
|
2673
2688
|
)
|
|
2674
2689
|
) : this.state.itemParam.itemType == 'popuser' ? _react2.default.createElement(
|
|
2675
2690
|
'div',
|
|
2676
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2691
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2677
2692
|
_react2.default.createElement(
|
|
2678
2693
|
_Group2.default.List,
|
|
2679
2694
|
{ borderTopNone: true },
|
|
@@ -2709,7 +2724,7 @@ var PageHome = function (_React$Component) {
|
|
|
2709
2724
|
)
|
|
2710
2725
|
) : this.state.itemParam.itemType == 'upload' ? _react2.default.createElement(
|
|
2711
2726
|
'div',
|
|
2712
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2727
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2713
2728
|
_react2.default.createElement(
|
|
2714
2729
|
_Group2.default.List,
|
|
2715
2730
|
{ borderTopNone: true },
|
|
@@ -2743,7 +2758,7 @@ var PageHome = function (_React$Component) {
|
|
|
2743
2758
|
)
|
|
2744
2759
|
) : this.state.itemParam.itemType == 'image' ? _react2.default.createElement(
|
|
2745
2760
|
'div',
|
|
2746
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2761
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2747
2762
|
_react2.default.createElement(
|
|
2748
2763
|
_Group2.default.List,
|
|
2749
2764
|
{ borderTopNone: true },
|
|
@@ -2778,7 +2793,7 @@ var PageHome = function (_React$Component) {
|
|
|
2778
2793
|
)
|
|
2779
2794
|
) : this.state.itemParam.itemType == 'comment' ? _react2.default.createElement(
|
|
2780
2795
|
'div',
|
|
2781
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2796
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2782
2797
|
_react2.default.createElement(
|
|
2783
2798
|
_Group2.default.List,
|
|
2784
2799
|
{ borderTopNone: true },
|
|
@@ -2865,7 +2880,7 @@ var PageHome = function (_React$Component) {
|
|
|
2865
2880
|
)
|
|
2866
2881
|
) : this.state.itemParam.itemType == 'switch' ? _react2.default.createElement(
|
|
2867
2882
|
'div',
|
|
2868
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2883
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2869
2884
|
_react2.default.createElement(
|
|
2870
2885
|
_Group2.default.List,
|
|
2871
2886
|
{ borderTopNone: true },
|
|
@@ -2885,7 +2900,7 @@ var PageHome = function (_React$Component) {
|
|
|
2885
2900
|
)
|
|
2886
2901
|
) : this.state.itemParam.itemType == 'positioning' ? _react2.default.createElement(
|
|
2887
2902
|
'div',
|
|
2888
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2903
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2889
2904
|
_react2.default.createElement(
|
|
2890
2905
|
_Group2.default.List,
|
|
2891
2906
|
{ borderTopNone: true },
|
|
@@ -2910,7 +2925,7 @@ var PageHome = function (_React$Component) {
|
|
|
2910
2925
|
)
|
|
2911
2926
|
) : this.state.itemParam.itemType == 'weboffice' ? _react2.default.createElement(
|
|
2912
2927
|
'div',
|
|
2913
|
-
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2928
|
+
{ id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
2914
2929
|
_react2.default.createElement(
|
|
2915
2930
|
_Group2.default.List,
|
|
2916
2931
|
{ borderTopNone: true },
|
package/lib/form/subForm.js
CHANGED
|
@@ -271,28 +271,28 @@ var PageHome = function (_React$Component) {
|
|
|
271
271
|
var itemParam = this.state.itemParam;
|
|
272
272
|
var data = this.props.data;
|
|
273
273
|
var subTblList = data.subTbl; //子表
|
|
274
|
-
/* var calculateExpList = data.calculateExpList;//计算公式列表
|
|
275
|
-
var calculateExpList1 = value.calculateExpList;//计算公式列表
|
|
276
|
-
if(calculateExpList1){
|
|
277
|
-
for(var key in calculateExpList1){
|
|
278
|
-
var calculateExpValue;
|
|
279
|
-
if(calculateExpList){
|
|
280
|
-
calculateExpValue = calculateExpList[key];
|
|
281
|
-
if(!calculateExpValue){
|
|
282
|
-
calculateExpValue = [];
|
|
283
|
-
}
|
|
284
|
-
}else{
|
|
285
|
-
calculateExpList = {};
|
|
286
|
-
calculateExpValue = [];
|
|
287
|
-
}
|
|
288
|
-
for(var j=0;j<calculateExpList1[key].length;j++){
|
|
289
|
-
calculateExpValue.push(calculateExpList1[key][j]);
|
|
290
|
-
}
|
|
291
|
-
calculateExpList[key] = calculateExpValue;
|
|
292
|
-
|
|
293
|
-
}
|
|
294
|
-
|
|
295
|
-
data.calculateExpList = calculateExpList;
|
|
274
|
+
/* var calculateExpList = data.calculateExpList;//计算公式列表
|
|
275
|
+
var calculateExpList1 = value.calculateExpList;//计算公式列表
|
|
276
|
+
if(calculateExpList1){
|
|
277
|
+
for(var key in calculateExpList1){
|
|
278
|
+
var calculateExpValue;
|
|
279
|
+
if(calculateExpList){
|
|
280
|
+
calculateExpValue = calculateExpList[key];
|
|
281
|
+
if(!calculateExpValue){
|
|
282
|
+
calculateExpValue = [];
|
|
283
|
+
}
|
|
284
|
+
}else{
|
|
285
|
+
calculateExpList = {};
|
|
286
|
+
calculateExpValue = [];
|
|
287
|
+
}
|
|
288
|
+
for(var j=0;j<calculateExpList1[key].length;j++){
|
|
289
|
+
calculateExpValue.push(calculateExpList1[key][j]);
|
|
290
|
+
}
|
|
291
|
+
calculateExpList[key] = calculateExpValue;
|
|
292
|
+
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
data.calculateExpList = calculateExpList;
|
|
296
296
|
}*/
|
|
297
297
|
|
|
298
298
|
this.dealwithSubData(subTblList, subTblNo, value);
|
|
@@ -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, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
|
|
659
|
+
return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, 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
|
@@ -1356,12 +1356,12 @@ var PageHome = function (_React$Component) {
|
|
|
1356
1356
|
});
|
|
1357
1357
|
return false;
|
|
1358
1358
|
}
|
|
1359
|
-
/*if(newValue=''){
|
|
1360
|
-
Toast.show({
|
|
1361
|
-
type: 'error',
|
|
1362
|
-
content: '意见不能为空!',
|
|
1363
|
-
});
|
|
1364
|
-
return false;
|
|
1359
|
+
/*if(newValue=''){
|
|
1360
|
+
Toast.show({
|
|
1361
|
+
type: 'error',
|
|
1362
|
+
content: '意见不能为空!',
|
|
1363
|
+
});
|
|
1364
|
+
return false;
|
|
1365
1365
|
}*/
|
|
1366
1366
|
if (newValue.length > 2000) {
|
|
1367
1367
|
newValue = newValue.substring(0, 2000);
|
|
@@ -762,17 +762,17 @@ var PageHome = function (_React$Component) {
|
|
|
762
762
|
activityId = "";
|
|
763
763
|
}
|
|
764
764
|
|
|
765
|
-
/* let sysMailSetting=content.sysMailSetting;
|
|
766
|
-
var remindersLists=[];
|
|
767
|
-
if(sysMailSetting=='1' || sysMailSetting=='2'){
|
|
768
|
-
var option = {};
|
|
769
|
-
option.value = "0";
|
|
770
|
-
option.content = '邮件';
|
|
771
|
-
option.disable = false;
|
|
772
|
-
option.checked = false;
|
|
773
|
-
remindersLists.push(option);
|
|
774
|
-
}*/ /*
|
|
775
|
-
var evoRemind2 = this.state.evoRemind;
|
|
765
|
+
/* let sysMailSetting=content.sysMailSetting;
|
|
766
|
+
var remindersLists=[];
|
|
767
|
+
if(sysMailSetting=='1' || sysMailSetting=='2'){
|
|
768
|
+
var option = {};
|
|
769
|
+
option.value = "0";
|
|
770
|
+
option.content = '邮件';
|
|
771
|
+
option.disable = false;
|
|
772
|
+
option.checked = false;
|
|
773
|
+
remindersLists.push(option);
|
|
774
|
+
}*/ /*
|
|
775
|
+
var evoRemind2 = this.state.evoRemind;
|
|
776
776
|
var sysSMSsetting2 = this.state.sysSMSsetting;*/
|
|
777
777
|
var remindersLists = [];
|
|
778
778
|
if (sysSMSsetting == '1' || sysSMSsetting == '2') {
|
|
@@ -1192,8 +1192,8 @@ var PageHome = function (_React$Component) {
|
|
|
1192
1192
|
return "";
|
|
1193
1193
|
}
|
|
1194
1194
|
|
|
1195
|
-
/**
|
|
1196
|
-
* 提交按钮的点击事件(获得下一个活动节点列表)
|
|
1195
|
+
/**
|
|
1196
|
+
* 提交按钮的点击事件(获得下一个活动节点列表)
|
|
1197
1197
|
*/
|
|
1198
1198
|
|
|
1199
1199
|
}, {
|
|
@@ -1651,13 +1651,13 @@ var PageHome = function (_React$Component) {
|
|
|
1651
1651
|
if (participantList != null && participantList != "" && participantList.length > 0) {
|
|
1652
1652
|
for (var i = 0; i < participantList.length; i++) {
|
|
1653
1653
|
if (participantList[i].type != "user") {
|
|
1654
|
-
/* var children = participantList[i];
|
|
1655
|
-
for(var j=0; j<children.length; j++ ){
|
|
1656
|
-
var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
|
|
1657
|
-
if(commonUsedId.indexOf(children[j].id) == -1){
|
|
1658
|
-
commonUsedId += children[j].id+',';
|
|
1659
|
-
commonUsedData.push(personValueItem);
|
|
1660
|
-
}
|
|
1654
|
+
/* var children = participantList[i];
|
|
1655
|
+
for(var j=0; j<children.length; j++ ){
|
|
1656
|
+
var personValueItem = {scopeType:"user",scopeValue:children[j].id,scopeName:children[j].userName,imageId:""};
|
|
1657
|
+
if(commonUsedId.indexOf(children[j].id) == -1){
|
|
1658
|
+
commonUsedId += children[j].id+',';
|
|
1659
|
+
commonUsedData.push(personValueItem);
|
|
1660
|
+
}
|
|
1661
1661
|
}*/
|
|
1662
1662
|
} else if (participantList[i].secretLevel == 0 || participantList[i].secretLevel || !participantList[i].orgId) {
|
|
1663
1663
|
var personValueItem = { scopeType: "user", scopeValue: participantList[i].id, scopeName: participantList[i].name, imageId: "", orgNamePath: participantList[i].orgPath };
|
|
@@ -2571,13 +2571,13 @@ var PageHome = function (_React$Component) {
|
|
|
2571
2571
|
}
|
|
2572
2572
|
var sshortMessage = '0';
|
|
2573
2573
|
var sendShortMessage = t.state.sendShortMessage;
|
|
2574
|
-
/*if(sendShortMessage.length>0){
|
|
2575
|
-
sshortMessage=sendShortMessage[0].value;
|
|
2574
|
+
/*if(sendShortMessage.length>0){
|
|
2575
|
+
sshortMessage=sendShortMessage[0].value;
|
|
2576
2576
|
}*/
|
|
2577
2577
|
var cshortMessage = '0';
|
|
2578
2578
|
var circulateShortMessage = t.state.circulateShortMessage;
|
|
2579
|
-
/* if(circulateShortMessage.length>0){
|
|
2580
|
-
cshortMessage=circulateShortMessage[0].value;
|
|
2579
|
+
/* if(circulateShortMessage.length>0){
|
|
2580
|
+
cshortMessage=circulateShortMessage[0].value;
|
|
2581
2581
|
}*/
|
|
2582
2582
|
var param = {
|
|
2583
2583
|
taskId: this.state.taskId,
|
|
@@ -2630,8 +2630,8 @@ var PageHome = function (_React$Component) {
|
|
|
2630
2630
|
var selectBackActivity = this.state.selectBackActivity;
|
|
2631
2631
|
var shortMessage = '0';
|
|
2632
2632
|
var backShortMessage = this.state.backShortMessage;
|
|
2633
|
-
/* if(backShortMessage.length>0){
|
|
2634
|
-
shortMessage=backShortMessage[0].value;
|
|
2633
|
+
/* if(backShortMessage.length>0){
|
|
2634
|
+
shortMessage=backShortMessage[0].value;
|
|
2635
2635
|
}*/
|
|
2636
2636
|
var param = {
|
|
2637
2637
|
taskId: this.state.taskId,
|
|
@@ -2662,13 +2662,13 @@ var PageHome = function (_React$Component) {
|
|
|
2662
2662
|
var editFormData = this.state.editFormData;
|
|
2663
2663
|
var sshortMessage = '0';
|
|
2664
2664
|
var sendShortMessage = t.state.sendShortMessage;
|
|
2665
|
-
/*if(sendShortMessage.length>0){
|
|
2666
|
-
sshortMessage=sendShortMessage[0].value;
|
|
2665
|
+
/*if(sendShortMessage.length>0){
|
|
2666
|
+
sshortMessage=sendShortMessage[0].value;
|
|
2667
2667
|
}*/
|
|
2668
2668
|
var cshortMessage = '0';
|
|
2669
2669
|
var circulateShortMessage = t.state.circulateShortMessage;
|
|
2670
|
-
/*if(circulateShortMessage.length>0){
|
|
2671
|
-
cshortMessage=circulateShortMessage[0].value;
|
|
2670
|
+
/*if(circulateShortMessage.length>0){
|
|
2671
|
+
cshortMessage=circulateShortMessage[0].value;
|
|
2672
2672
|
}*/
|
|
2673
2673
|
var param = {
|
|
2674
2674
|
taskId: this.state.taskId,
|
|
@@ -3625,8 +3625,8 @@ var PageHome = function (_React$Component) {
|
|
|
3625
3625
|
}
|
|
3626
3626
|
var shortMessage = '0';
|
|
3627
3627
|
var circulateShortMessage = t.state.circulateShortMessage;
|
|
3628
|
-
/* if(circulateShortMessage.length>0){
|
|
3629
|
-
shortMessage=circulateShortMessage[0].value;
|
|
3628
|
+
/* if(circulateShortMessage.length>0){
|
|
3629
|
+
shortMessage=circulateShortMessage[0].value;
|
|
3630
3630
|
}*/
|
|
3631
3631
|
_Dialog2.default.confirm({
|
|
3632
3632
|
locale: 'zh_CN',
|
|
@@ -4184,7 +4184,7 @@ var PageHome = function (_React$Component) {
|
|
|
4184
4184
|
var buttonIsMore = false;
|
|
4185
4185
|
var buttonList = [];
|
|
4186
4186
|
var sysWatermark = _this2.state.sysWatermark;
|
|
4187
|
-
/* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
|
|
4187
|
+
/* buttonCodeList.push({'buttonCode':'BASE_SUMBIT','buttonName':'通过'});
|
|
4188
4188
|
buttonCodeList.push({'buttonCode':'PAGE_SAVE','buttonName':'保存'});*/
|
|
4189
4189
|
if (buttonCodeList.length > 4) {
|
|
4190
4190
|
buttonList.push({ name: '更多', type: 'secondary', display: 'banner', no: -1 });
|
|
@@ -4540,22 +4540,22 @@ var PageHome = function (_React$Component) {
|
|
|
4540
4540
|
});
|
|
4541
4541
|
}
|
|
4542
4542
|
|
|
4543
|
-
/*//修改审批意见
|
|
4544
|
-
changeSpyj(newValue) {
|
|
4545
|
-
let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
|
|
4546
|
-
if(newValue.match(regRule)){
|
|
4547
|
-
Toast.show({
|
|
4548
|
-
type: 'error',
|
|
4549
|
-
content: '不能输入表情',
|
|
4550
|
-
});
|
|
4551
|
-
return false;
|
|
4552
|
-
}
|
|
4553
|
-
if(newValue.length>200){
|
|
4554
|
-
newValue=newValue.substring(0,200);
|
|
4555
|
-
}
|
|
4556
|
-
this.setState({
|
|
4557
|
-
spyj: newValue,
|
|
4558
|
-
});
|
|
4543
|
+
/*//修改审批意见
|
|
4544
|
+
changeSpyj(newValue) {
|
|
4545
|
+
let regRule= /\uD83C[\uDF00-\uDFFF]|\uD83D[\uDC00-\uDE4F]/g;
|
|
4546
|
+
if(newValue.match(regRule)){
|
|
4547
|
+
Toast.show({
|
|
4548
|
+
type: 'error',
|
|
4549
|
+
content: '不能输入表情',
|
|
4550
|
+
});
|
|
4551
|
+
return false;
|
|
4552
|
+
}
|
|
4553
|
+
if(newValue.length>200){
|
|
4554
|
+
newValue=newValue.substring(0,200);
|
|
4555
|
+
}
|
|
4556
|
+
this.setState({
|
|
4557
|
+
spyj: newValue,
|
|
4558
|
+
});
|
|
4559
4559
|
}*/
|
|
4560
4560
|
|
|
4561
4561
|
//修改催办内容
|
|
@@ -4635,8 +4635,8 @@ var PageHome = function (_React$Component) {
|
|
|
4635
4635
|
});
|
|
4636
4636
|
}
|
|
4637
4637
|
|
|
4638
|
-
/**
|
|
4639
|
-
* 取消操作
|
|
4638
|
+
/**
|
|
4639
|
+
* 取消操作
|
|
4640
4640
|
**/
|
|
4641
4641
|
|
|
4642
4642
|
}, {
|