fmui-base 2.2.23 → 2.2.24
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 +1 -0
- package/lib/form/form.js +9 -1
- package/lib/rela_obj/relaObj.js +25 -7
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -1393,6 +1393,12 @@ var PageHome = function (_React$Component) {
|
|
|
1393
1393
|
// // if(value && value!=''){
|
|
1394
1394
|
// // value = this.getRelaObjByRelaId(value);
|
|
1395
1395
|
// // }
|
|
1396
|
+
var dateFormat = form.dateFormat;
|
|
1397
|
+
if (form.dataAttr && typeof form.dataAttr != "undefined") {
|
|
1398
|
+
itemParam.relaobjType = form.dataAttr.relaobjType;
|
|
1399
|
+
} else {
|
|
1400
|
+
itemParam.relaobjType = "single";
|
|
1401
|
+
}
|
|
1396
1402
|
console.log("relaobj===1276");
|
|
1397
1403
|
if (value && value != '') {
|
|
1398
1404
|
itemParam.oldValue = value;
|
|
@@ -3858,7 +3864,9 @@ var PageHome = function (_React$Component) {
|
|
|
3858
3864
|
{ className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
|
|
3859
3865
|
_react2.default.createElement(_relaObj2.default, {
|
|
3860
3866
|
id: t.state.itemParam.oldValue ? t.state.itemParam.oldValue : "",
|
|
3861
|
-
label: t.state.itemParam.title
|
|
3867
|
+
label: t.state.itemParam.title,
|
|
3868
|
+
required: t.state.itemParam.required,
|
|
3869
|
+
relaobjType: t.state.itemParam.relaobjType
|
|
3862
3870
|
}),
|
|
3863
3871
|
t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
|
|
3864
3872
|
) : _react2.default.createElement('div', null)
|
package/lib/rela_obj/relaObj.js
CHANGED
|
@@ -47,14 +47,32 @@ var relaObj = (_temp = _class = function (_React$Component) {
|
|
|
47
47
|
_initialiseProps.call(_this);
|
|
48
48
|
|
|
49
49
|
var formId = _this.props.id;
|
|
50
|
-
var title = _this.props.
|
|
51
|
-
|
|
50
|
+
var title = _this.props.label || '相关对象';
|
|
51
|
+
var relaobjType = _this.props.relaobjType || ''; //flow,info,file
|
|
52
|
+
var required = _this.props.required || false;
|
|
53
|
+
var flowType = false;
|
|
54
|
+
var infoType = false;
|
|
55
|
+
var fileType = false;
|
|
56
|
+
if (relaobjType.indexOf('flow') != -1) {
|
|
57
|
+
flowType = true;
|
|
58
|
+
}
|
|
59
|
+
if (relaobjType.indexOf('info') != -1) {
|
|
60
|
+
infoType = true;
|
|
61
|
+
}
|
|
62
|
+
if (relaobjType.indexOf('file') != -1) {
|
|
63
|
+
fileType = true;
|
|
64
|
+
}
|
|
52
65
|
_this.state = {
|
|
53
66
|
fileData: [],
|
|
54
67
|
flowData: [],
|
|
55
68
|
infoData: [],
|
|
56
69
|
formId: formId,
|
|
57
|
-
title: title
|
|
70
|
+
title: title,
|
|
71
|
+
relaobjType: relaobjType,
|
|
72
|
+
flowType: flowType,
|
|
73
|
+
infoType: infoType,
|
|
74
|
+
fileType: fileType,
|
|
75
|
+
required: required
|
|
58
76
|
};
|
|
59
77
|
|
|
60
78
|
return _this;
|
|
@@ -96,13 +114,13 @@ var relaObj = (_temp = _class = function (_React$Component) {
|
|
|
96
114
|
{ borderTopNone: true },
|
|
97
115
|
_react2.default.createElement(
|
|
98
116
|
_Field2.default,
|
|
99
|
-
{ label: this.state.title, layout: 'h', multiLine: true },
|
|
117
|
+
{ required: this.state.required, label: this.state.title, layout: 'h', multiLine: true },
|
|
100
118
|
_react2.default.createElement(
|
|
101
119
|
'div',
|
|
102
120
|
null,
|
|
103
121
|
_react2.default.createElement(
|
|
104
122
|
'div',
|
|
105
|
-
|
|
123
|
+
{ className: this.state.flowType ? '' : 't-DN' },
|
|
106
124
|
_react2.default.createElement(
|
|
107
125
|
'div',
|
|
108
126
|
{ style: { fontWeight: '700' } },
|
|
@@ -126,7 +144,7 @@ var relaObj = (_temp = _class = function (_React$Component) {
|
|
|
126
144
|
),
|
|
127
145
|
_react2.default.createElement(
|
|
128
146
|
'div',
|
|
129
|
-
|
|
147
|
+
{ className: this.state.infoType ? '' : 't-DN' },
|
|
130
148
|
_react2.default.createElement(
|
|
131
149
|
'div',
|
|
132
150
|
{ style: { fontWeight: '700' } },
|
|
@@ -150,7 +168,7 @@ var relaObj = (_temp = _class = function (_React$Component) {
|
|
|
150
168
|
),
|
|
151
169
|
_react2.default.createElement(
|
|
152
170
|
'div',
|
|
153
|
-
|
|
171
|
+
{ className: this.state.fileType ? '' : 't-DN' },
|
|
154
172
|
_react2.default.createElement(
|
|
155
173
|
'div',
|
|
156
174
|
{ style: { fontWeight: '700' } },
|