fmui-base 2.0.21 → 2.0.23
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 +9 -1
- package/lib/process_info/FlowChart.js +3 -3
- package/lib/process_info/processInfo.js +18 -14
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -863,6 +863,7 @@ var PageHome = function (_React$Component) {
|
|
|
863
863
|
dateFormatShow = "zhDate";
|
|
864
864
|
} else if (dateDisplayFormat == "AmPmDate") {
|
|
865
865
|
dateFormat = "YMDT";
|
|
866
|
+
dateFormatShow = "AmPmDate";
|
|
866
867
|
} else {
|
|
867
868
|
dateFormat = "YMDHM";
|
|
868
869
|
}
|
|
@@ -2108,7 +2109,7 @@ var PageHome = function (_React$Component) {
|
|
|
2108
2109
|
var dateStr = this.dateFormat(value.value, dateFormat);
|
|
2109
2110
|
if (dateFormat == "YMDT") {
|
|
2110
2111
|
//年月日，上下午修改数据
|
|
2111
|
-
value.value = new Date(dateStr).getTime();
|
|
2112
|
+
value.value = new Date(dateStr.replace(/-/g, "/")).getTime();
|
|
2112
2113
|
}
|
|
2113
2114
|
data = this.editData(code, dateStr, data);
|
|
2114
2115
|
|
|
@@ -2156,6 +2157,13 @@ var PageHome = function (_React$Component) {
|
|
|
2156
2157
|
if (dateFormatShow) {
|
|
2157
2158
|
if (dateFormatShow == "zhDate") {
|
|
2158
2159
|
return year + '年' + month + '月' + dates + '日';
|
|
2160
|
+
} else if (dateFormatShow == "AmPmDate") {
|
|
2161
|
+
var hour = this.dealwithDate(date.getHours());
|
|
2162
|
+
if (hour == "11") {
|
|
2163
|
+
return year + '年' + month + '月' + dates + '日 上午';
|
|
2164
|
+
} else {
|
|
2165
|
+
return year + '年' + month + '月' + dates + '日 下午';
|
|
2166
|
+
}
|
|
2159
2167
|
}
|
|
2160
2168
|
}
|
|
2161
2169
|
if (formatStr == 'YMD') {
|
|
@@ -110,11 +110,11 @@ var Page = function (_React$Component) {
|
|
|
110
110
|
_react2.default.createElement('div', { className: 'dd-process-dec' }),
|
|
111
111
|
this.state.processLogList.map(function (item, i) {
|
|
112
112
|
var nameHtml = "";
|
|
113
|
-
if (item.
|
|
114
|
-
var
|
|
113
|
+
if (item.dealusername != null && item.dealusername != '') {
|
|
114
|
+
var dealusername = item.dealusername.split('|');
|
|
115
115
|
var delContent = '（该用户账号已被删除，请联系管理员修改流程）';
|
|
116
116
|
var delContent1 = '（该用户账号已被删除）';
|
|
117
|
-
nameHtml =
|
|
117
|
+
nameHtml = dealusername.map(function (item, index) {
|
|
118
118
|
var names = item.replace(delContent, '');
|
|
119
119
|
if (item.indexOf(delContent1) > -1) {
|
|
120
120
|
names = "";
|
|
@@ -1449,6 +1449,9 @@ var PageHome = function (_React$Component) {
|
|
|
1449
1449
|
for (var d = 0; d < extensionButtonList.length; d++) {
|
|
1450
1450
|
buttonList.push(extensionButtonList[d]);
|
|
1451
1451
|
}
|
|
1452
|
+
} else if (listType == "3") {
|
|
1453
|
+
buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
|
|
1454
|
+
buttonList.push({ name: t.state.finalButtons.get("HELP_FORWARD"), type: 'secondary', display: 'inline', no: 20 });
|
|
1452
1455
|
} else if (listType == "4") {
|
|
1453
1456
|
//我的
|
|
1454
1457
|
if (this.state.processIsComplete == "0") {
|
|
@@ -2573,7 +2576,7 @@ var PageHome = function (_React$Component) {
|
|
|
2573
2576
|
//if(hasCommentField=="1"){
|
|
2574
2577
|
t.setState({
|
|
2575
2578
|
pageStatus: '1',
|
|
2576
|
-
transferShortMessage:
|
|
2579
|
+
transferShortMessage: t.state.shortMessageList,
|
|
2577
2580
|
operate: operate
|
|
2578
2581
|
}, function () {
|
|
2579
2582
|
$(window).scrollTop(0);
|
|
@@ -2688,7 +2691,8 @@ var PageHome = function (_React$Component) {
|
|
|
2688
2691
|
t.setState({
|
|
2689
2692
|
pageStatus: '1',
|
|
2690
2693
|
operate: 12,
|
|
2691
|
-
urgeContent: '请您尽快审批！'
|
|
2694
|
+
urgeContent: '请您尽快审批！',
|
|
2695
|
+
reminders: t.state.remindersList
|
|
2692
2696
|
});
|
|
2693
2697
|
t.state.selectUrgeActivity = [];
|
|
2694
2698
|
for (var n = 0; n < t.state.urgeDataList.length; n++) {
|
|
@@ -6661,7 +6665,7 @@ var PageHome = function (_React$Component) {
|
|
|
6661
6665
|
this.state.buttonList.map(function (item, i) {
|
|
6662
6666
|
return item.type == 'text' ? _react2.default.createElement(
|
|
6663
6667
|
'span',
|
|
6664
|
-
{ 'class': '
|
|
6668
|
+
{ 'class': 't-FCblue', onClick: t.handleSubmit.bind(t, item.no) },
|
|
6665
6669
|
item.name
|
|
6666
6670
|
) : _react2.default.createElement(
|
|
6667
6671
|
_Button2.default,
|
|
@@ -6679,7 +6683,7 @@ var PageHome = function (_React$Component) {
|
|
|
6679
6683
|
{ className: this.state.nextActivityList.length == 0 && this.state.nextRadomList.length == 0 ? '' : '', style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
6680
6684
|
_react2.default.createElement(
|
|
6681
6685
|
'span',
|
|
6682
|
-
{ className: '
|
|
6686
|
+
{ className: 't-FCblue' },
|
|
6683
6687
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
6684
6688
|
'\u5BA1\u6279\u73AF\u8282'
|
|
6685
6689
|
)
|
|
@@ -6791,7 +6795,7 @@ var PageHome = function (_React$Component) {
|
|
|
6791
6795
|
{ flex: 1, className: 't-PL16 t-PT10 t-PB10', onClick: this.handleChecked.bind(this, i, i, item, "next") },
|
|
6792
6796
|
_react2.default.createElement(
|
|
6793
6797
|
Box,
|
|
6794
|
-
{ id: i, className: item.checked == false ? "t-checkbox-field-icon-list un-checked" : item.disable ? "t-checkbox-field-icon checked disable t-checkbox-field-icon-list" : "t-checkbox-field-icon-list
|
|
6798
|
+
{ id: i, className: item.checked == false ? "t-checkbox-field-icon-list un-checked" : item.disable ? "t-checkbox-field-icon checked disable t-checkbox-field-icon-list" : "t-checkbox-field-icon-list" },
|
|
6795
6799
|
_react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
|
|
6796
6800
|
),
|
|
6797
6801
|
_react2.default.createElement(
|
|
@@ -6912,7 +6916,7 @@ var PageHome = function (_React$Component) {
|
|
|
6912
6916
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
6913
6917
|
_react2.default.createElement(
|
|
6914
6918
|
'span',
|
|
6915
|
-
{ className: '
|
|
6919
|
+
{ className: 't-FCblue' },
|
|
6916
6920
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
6917
6921
|
'\u8F6C\u4EA4\u73AF\u8282'
|
|
6918
6922
|
)
|
|
@@ -6974,7 +6978,7 @@ var PageHome = function (_React$Component) {
|
|
|
6974
6978
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
6975
6979
|
_react2.default.createElement(
|
|
6976
6980
|
'span',
|
|
6977
|
-
{ className: '
|
|
6981
|
+
{ className: 't-FCblue' },
|
|
6978
6982
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
6979
6983
|
'\u9000\u56DE\u73AF\u8282'
|
|
6980
6984
|
)
|
|
@@ -7035,7 +7039,7 @@ var PageHome = function (_React$Component) {
|
|
|
7035
7039
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7036
7040
|
_react2.default.createElement(
|
|
7037
7041
|
'span',
|
|
7038
|
-
{ className: '
|
|
7042
|
+
{ className: 't-FCblue' },
|
|
7039
7043
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7040
7044
|
'\u8DF3\u8F6C\u73AF\u8282'
|
|
7041
7045
|
)
|
|
@@ -7074,7 +7078,7 @@ var PageHome = function (_React$Component) {
|
|
|
7074
7078
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7075
7079
|
_react2.default.createElement(
|
|
7076
7080
|
'span',
|
|
7077
|
-
{ className: '
|
|
7081
|
+
{ className: 't-FCblue' },
|
|
7078
7082
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7079
7083
|
'\u52A0\u7B7E'
|
|
7080
7084
|
)
|
|
@@ -7106,7 +7110,7 @@ var PageHome = function (_React$Component) {
|
|
|
7106
7110
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7107
7111
|
_react2.default.createElement(
|
|
7108
7112
|
'span',
|
|
7109
|
-
{ className: '
|
|
7113
|
+
{ className: 't-FCblue' },
|
|
7110
7114
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7111
7115
|
'\u4F20\u9605'
|
|
7112
7116
|
)
|
|
@@ -7138,7 +7142,7 @@ var PageHome = function (_React$Component) {
|
|
|
7138
7142
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7139
7143
|
_react2.default.createElement(
|
|
7140
7144
|
'span',
|
|
7141
|
-
{ className: '
|
|
7145
|
+
{ className: 't-FCblue' },
|
|
7142
7146
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7143
7147
|
'\u8F6C\u53D1'
|
|
7144
7148
|
)
|
|
@@ -7170,7 +7174,7 @@ var PageHome = function (_React$Component) {
|
|
|
7170
7174
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7171
7175
|
_react2.default.createElement(
|
|
7172
7176
|
'span',
|
|
7173
|
-
{ className: '
|
|
7177
|
+
{ className: 't-FCblue' },
|
|
7174
7178
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7175
7179
|
'\u50AC\u529E\u73AF\u8282'
|
|
7176
7180
|
)
|
|
@@ -7211,7 +7215,7 @@ var PageHome = function (_React$Component) {
|
|
|
7211
7215
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7212
7216
|
_react2.default.createElement(
|
|
7213
7217
|
'span',
|
|
7214
|
-
{ className: '
|
|
7218
|
+
{ className: 't-FCblue' },
|
|
7215
7219
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7216
7220
|
'\u6536\u56DE\u73AF\u8282'
|
|
7217
7221
|
)
|
|
@@ -7233,7 +7237,7 @@ var PageHome = function (_React$Component) {
|
|
|
7233
7237
|
{ style: { background: '#f2f3f5', padding: '10px 5px' } },
|
|
7234
7238
|
_react2.default.createElement(
|
|
7235
7239
|
'span',
|
|
7236
|
-
{ className: '
|
|
7240
|
+
{ className: 't-FCblue' },
|
|
7237
7241
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
7238
7242
|
'\u90AE\u4EF6\u8F6C\u53D1'
|
|
7239
7243
|
)
|