@bchr/bchr-front-lib 0.3.75 → 0.3.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.
Files changed (11) hide show
  1. package/lib/base/layout/ProcessLink.js +5 -1
  2. package/lib/base/layout/ui_tpl/form/FormForBrowse.js +81 -7
  3. package/lib/base/layout/ui_tpl/form/FormForModify.js +88 -13
  4. package/lib/base/layout/ui_tpl/grid/GridForBrowse.js +1 -1
  5. package/lib/style/bchrFixedComponent.less +10 -0
  6. package/package.json +1 -1
  7. package/src/base/layout/ProcessLink.js +5 -1
  8. package/src/base/layout/ui_tpl/form/FormForBrowse.js +75 -4
  9. package/src/base/layout/ui_tpl/form/FormForModify.js +77 -4
  10. package/src/base/layout/ui_tpl/grid/GridForBrowse.js +1 -1
  11. package/src/style/bchrFixedComponent.less +10 -0
package/lib/base/layout/ProcessLink.js CHANGED
@@ -14,7 +14,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
14
14
  var WorkflowLinkContext = {
15
15
  setUp: 0,
16
16
  haveInHand: 1,
17
- approved: 2
17
+ approved: 2,
18
+ abolish: 3
18
19
  };
19
20
 
20
21
  var ProcessLink = function ProcessLink(props) {
@@ -38,6 +39,9 @@ var ProcessLink = function ProcessLink(props) {
38
39
  } else if (item[status] === WorkflowLinkContext.approved) {
39
40
  status_css_class = "process-item-status-finish";
40
41
  status_icon_css_class = "icon-bchr-tick";
42
+ } else if (item[status] === WorkflowLinkContext.abolish) {
43
+ status_css_class = "process-item-status-abolish";
44
+ status_icon_css_class = "iconerror";
41
45
  } else {
42
46
  status_css_class = "process-item-status-set-up";
43
47
  status_icon_css_class = "icon-bchr-time";
package/lib/base/layout/ui_tpl/form/FormForBrowse.js CHANGED
@@ -70,9 +70,48 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
70
70
  return null;
71
71
  }
72
72
 
73
+ var groupNames = ext_form_items.filter(function (item) {
74
+ return !item.b_show_infoset_field_group && item.belong_form_group;
75
+ }).map(function (item) {
76
+ return item.belong_form_group;
77
+ }).filter(function (item, index, arr) {
78
+ return item && item.trim().length > 0 && arr.indexOf(item) === index;
79
+ });
80
+
81
+ if (groupNames && groupNames.length > 0) {
82
+ groupNames.push(null);
83
+ return groupNames.map(function (groupName, index) {
84
+ if (groupName) {
85
+ return /*#__PURE__*/_react["default"].createElement("fieldset", {
86
+ key: "fieldset_".concat(index)
87
+ }, /*#__PURE__*/_react["default"].createElement("legend", null, groupName), /*#__PURE__*/_react["default"].createElement(_antd.Row, {
88
+ className: "fix-form-ant-row"
89
+ }, ext_form_items.filter(function (item) {
90
+ return item.belong_form_group === groupName && !item.b_show_infoset_field_group;
91
+ }).map(function (item, index) {
92
+ return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
93
+ lg: 12,
94
+ md: 24,
95
+ key: "ext_col_" + index
96
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
97
+ className: "ant-form-item-group-" + _this.props.label_col + (item.className ? " " + item.className : ""),
98
+ key: item.code,
99
+ label: item.label,
100
+ name: item.name,
101
+ rules: [{
102
+ required: item.required
103
+ }]
104
+ }, item.render));
105
+ })));
106
+ }
107
+ });
108
+ }
109
+
73
110
  return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
74
111
  className: "fix-form-ant-row"
75
- }, ext_form_items.map(function (item, index) {
112
+ }, ext_form_items.filter(function (item) {
113
+ return !item.b_show_infoset_field_group;
114
+ }).map(function (item, index) {
76
115
  return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
77
116
  lg: 12,
78
117
  md: 24,
@@ -90,7 +129,9 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
90
129
  });
91
130
 
92
131
  _defineProperty(_assertThisInitialized(_this), "buildFormItems", function () {
93
- var info_set_fields = _this.props.info_set_fields;
132
+ var _this$props = _this.props,
133
+ info_set_fields = _this$props.info_set_fields,
134
+ ext_form_items = _this$props.ext_form_items;
94
135
 
95
136
  if (info_set_fields && info_set_fields.length > 0) {
96
137
  var groupNames = info_set_fields.map(function (item) {
@@ -115,6 +156,10 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
115
156
  }
116
157
 
117
158
  return _this.generatorFormItem(dataItem);
159
+ }), ext_form_items && ext_form_items.length > 0 && ext_form_items.filter(function (item) {
160
+ return item.b_show_infoset_field_group && item.belong_form_group === groupName;
161
+ }).map(function (dataItem) {
162
+ return _this.generatorFormItem(dataItem, true);
118
163
  })));
119
164
  } else {
120
165
  return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
@@ -147,10 +192,26 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
147
192
  }
148
193
  });
149
194
 
150
- _defineProperty(_assertThisInitialized(_this), "generatorFormItem", function (dataItem) {
151
- var _this$props = _this.props,
152
- initialValues = _this$props.initialValues,
153
- custom_form_items = _this$props.custom_form_items;
195
+ _defineProperty(_assertThisInitialized(_this), "generatorFormItem", function (dataItem, is_ext_field) {
196
+ if (is_ext_field) {
197
+ return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
198
+ lg: 12,
199
+ md: 24,
200
+ key: "ext_col_" + dataItem.code
201
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
202
+ className: "ant-form-item-group-" + _this.props.label_col + (dataItem.className ? " " + dataItem.className : ""),
203
+ key: dataItem.code,
204
+ label: dataItem.label,
205
+ name: dataItem.name,
206
+ rules: [{
207
+ required: dataItem.required
208
+ }]
209
+ }, dataItem.render));
210
+ }
211
+
212
+ var _this$props2 = _this.props,
213
+ initialValues = _this$props2.initialValues,
214
+ custom_form_items = _this$props2.custom_form_items;
154
215
 
155
216
  if (Array.isArray(initialValues)) {
156
217
  initialValues = initialValues[0] || {};
@@ -227,7 +288,20 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
227
288
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
228
289
  className: "ant-form-item-group-" + _this.props.label_col,
229
290
  key: dataItem.code,
230
- label: /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
291
+ label: /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, dataItem.title_of_field_label_prefix && dataItem.title_of_field_label_prefix.trim().length > 0 && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement(_antd.Tooltip, {
292
+ title: /*#__PURE__*/_react["default"].createElement("span", {
293
+ dangerouslySetInnerHTML: {
294
+ __html: dataItem.title_of_field_label_prefix
295
+ }
296
+ })
297
+ }, /*#__PURE__*/_react["default"].createElement("span", {
298
+ style: {
299
+ marginRight: '5px'
300
+ },
301
+ dangerouslySetInnerHTML: {
302
+ __html: dataItem.field_label_prefix
303
+ }
304
+ })), (!dataItem.title_of_field_label_prefix || dataItem.title_of_field_label_prefix.trim().length == 0) && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
231
305
  style: {
232
306
  marginRight: '5px'
233
307
  },
package/lib/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -79,9 +79,48 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
79
79
  }
80
80
 
81
81
  form_id = form_id || "form";
82
+ var groupNames = ext_form_items.filter(function (item) {
83
+ return !item.b_show_infoset_field_group && item.belong_form_group;
84
+ }).map(function (item) {
85
+ return item.belong_form_group;
86
+ }).filter(function (item, index, arr) {
87
+ return item && item.trim().length > 0 && arr.indexOf(item) === index;
88
+ });
89
+
90
+ if (groupNames && groupNames.length > 0) {
91
+ groupNames.push(null);
92
+ return groupNames.map(function (groupName, index) {
93
+ if (groupName) {
94
+ return /*#__PURE__*/_react["default"].createElement("fieldset", {
95
+ key: "fieldset_".concat(index)
96
+ }, /*#__PURE__*/_react["default"].createElement("legend", null, groupName), /*#__PURE__*/_react["default"].createElement(_antd.Row, {
97
+ className: "fix-form-ant-row"
98
+ }, ext_form_items.filter(function (item) {
99
+ return item.belong_form_group === groupName && !item.b_show_infoset_field_group;
100
+ }).map(function (item, index) {
101
+ return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
102
+ lg: 12,
103
+ md: 24,
104
+ key: "ext_col_" + index
105
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
106
+ className: "ant-form-item-group-" + _this2.props.label_col + (item.className ? " " + item.className : ""),
107
+ key: form_id + "_" + item.code,
108
+ label: item.label,
109
+ name: item.name,
110
+ rules: [{
111
+ required: item.required
112
+ }]
113
+ }, item.render));
114
+ })));
115
+ }
116
+ });
117
+ }
118
+
82
119
  return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
83
120
  className: "fix-form-ant-row"
84
- }, ext_form_items.map(function (item, index) {
121
+ }, ext_form_items.filter(function (item) {
122
+ return !item.b_show_infoset_field_group;
123
+ }).map(function (item, index) {
85
124
  return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
86
125
  lg: 12,
87
126
  md: 24,
@@ -99,7 +138,9 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
99
138
  });
100
139
 
101
140
  _defineProperty(_assertThisInitialized(_this2), "buildFormItems", function () {
102
- var info_set_fields = _this2.props.info_set_fields;
141
+ var _this2$props2 = _this2.props,
142
+ info_set_fields = _this2$props2.info_set_fields,
143
+ ext_form_items = _this2$props2.ext_form_items;
103
144
 
104
145
  if (info_set_fields && info_set_fields.length > 0) {
105
146
  var groupNames = info_set_fields.map(function (item) {
@@ -124,6 +165,10 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
124
165
  }
125
166
 
126
167
  return _this2.generatorFormItem(dataItem);
168
+ }), ext_form_items && ext_form_items.length > 0 && ext_form_items.filter(function (item) {
169
+ return item.b_show_infoset_field_group && item.belong_form_group === groupName;
170
+ }).map(function (dataItem) {
171
+ return _this2.generatorFormItem(dataItem, true);
127
172
  })));
128
173
  } else {
129
174
  return /*#__PURE__*/_react["default"].createElement(_antd.Row, {
@@ -156,16 +201,16 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
156
201
  }
157
202
  });
158
203
 
159
- _defineProperty(_assertThisInitialized(_this2), "generatorFormItem", function (dataItem) {
160
- var _this2$props2 = _this2.props,
161
- data = _this2$props2.data,
162
- biz_object_pk = _this2$props2.biz_object_pk,
163
- owner_object_pk = _this2$props2.owner_object_pk,
164
- file_service_path = _this2$props2.file_service_path,
165
- value_onchange_events = _this2$props2.value_onchange_events,
166
- custom_form_items = _this2$props2.custom_form_items,
167
- form_items_ext_props = _this2$props2.form_items_ext_props,
168
- form_id = _this2$props2.form_id;
204
+ _defineProperty(_assertThisInitialized(_this2), "generatorFormItem", function (dataItem, is_ext_field) {
205
+ var _this2$props3 = _this2.props,
206
+ data = _this2$props3.data,
207
+ biz_object_pk = _this2$props3.biz_object_pk,
208
+ owner_object_pk = _this2$props3.owner_object_pk,
209
+ file_service_path = _this2$props3.file_service_path,
210
+ value_onchange_events = _this2$props3.value_onchange_events,
211
+ custom_form_items = _this2$props3.custom_form_items,
212
+ form_items_ext_props = _this2$props3.form_items_ext_props,
213
+ form_id = _this2$props3.form_id;
169
214
  var name = dataItem.name,
170
215
  ui_render_type = dataItem.ui_render_type,
171
216
  max_value = dataItem.max_value,
@@ -183,6 +228,23 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
183
228
  tip_message = dataItem.tip_message,
184
229
  regexp_pattern = dataItem.regexp_pattern;
185
230
  form_id = form_id || "form";
231
+
232
+ if (is_ext_field) {
233
+ return /*#__PURE__*/_react["default"].createElement(_antd.Col, {
234
+ lg: 12,
235
+ md: 24,
236
+ key: "ext_col_" + dataItem.code
237
+ }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
238
+ className: "ant-form-item-group-" + _this2.props.label_col + (dataItem.className ? " " + dataItem.className : ""),
239
+ key: form_id + "_" + dataItem.code,
240
+ label: dataItem.label,
241
+ name: dataItem.name,
242
+ rules: [{
243
+ required: dataItem.required
244
+ }]
245
+ }, dataItem.render));
246
+ }
247
+
186
248
  display_code = display_code || code;
187
249
  var initialValue = data[code];
188
250
  var displayValue = data[display_code];
@@ -421,7 +483,20 @@ var FormForModify = /*#__PURE__*/function (_React$Component) {
421
483
  }, /*#__PURE__*/_react["default"].createElement(_antd.Form.Item, {
422
484
  className: (b_readonly ? "readonly-form-ant-col " : " ") + " ant-form-item-group-" + _this2.props.label_col,
423
485
  key: code,
424
- label: /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
486
+ label: /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, dataItem.title_of_field_label_prefix && dataItem.title_of_field_label_prefix.trim().length > 0 && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement(_antd.Tooltip, {
487
+ title: /*#__PURE__*/_react["default"].createElement("span", {
488
+ dangerouslySetInnerHTML: {
489
+ __html: dataItem.title_of_field_label_prefix
490
+ }
491
+ })
492
+ }, /*#__PURE__*/_react["default"].createElement("span", {
493
+ style: {
494
+ marginRight: '5px'
495
+ },
496
+ dangerouslySetInnerHTML: {
497
+ __html: dataItem.field_label_prefix
498
+ }
499
+ })), (!dataItem.title_of_field_label_prefix || dataItem.title_of_field_label_prefix.trim().length == 0) && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
425
500
  style: {
426
501
  marginRight: '5px'
427
502
  },
package/lib/base/layout/ui_tpl/grid/GridForBrowse.js CHANGED
@@ -178,7 +178,7 @@ var GridForBrowse = /*#__PURE__*/function (_React$Component) {
178
178
  title: name,
179
179
  headerCell: function headerCell(props) {
180
180
  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, dataItem.column_header_prefix && dataItem.column_header_prefix.trim().length > 0 && /*#__PURE__*/_react["default"].createElement(_antd.Tooltip, {
181
- title: dataItem.check_type == 1 ? '核档字段' : '核实字段'
181
+ title: dataItem.check_type == 1 ? '核档字段' : '核准字段'
182
182
  }, /*#__PURE__*/_react["default"].createElement("span", {
183
183
  style: {
184
184
  marginRight: '5px'
package/lib/style/bchrFixedComponent.less CHANGED
@@ -741,6 +741,16 @@ div.ant-modal.my-fix-auto-height .ant-modal-body {
741
741
  }
742
742
  }
743
743
  }
744
+
745
+ &.process-item-status-abolish {
746
+ .process-item-status-bar {
747
+ background: #DA0002;
748
+
749
+ &:before {
750
+ display: none;
751
+ }
752
+ }
753
+ }
744
754
  }
745
755
  }
746
756
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bchr/bchr-front-lib",
3
- "version": "0.3.75",
3
+ "version": "0.3.79",
4
4
  "description": "bchr front lib",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
package/src/base/layout/ProcessLink.js CHANGED
@@ -4,7 +4,8 @@ import {Empty} from "antd";
4
4
  const WorkflowLinkContext = {
5
5
  setUp: 0,
6
6
  haveInHand: 1,
7
- approved: 2
7
+ approved: 2,
8
+ abolish: 3
8
9
  }
9
10
 
10
11
  const ProcessLink = (props) => {
@@ -28,6 +29,9 @@ const ProcessLink = (props) => {
28
29
  } else if (item[status] === WorkflowLinkContext.approved) {
29
30
  status_css_class = "process-item-status-finish";
30
31
  status_icon_css_class = "icon-bchr-tick";
32
+ } else if (item[status] === WorkflowLinkContext.abolish) {
33
+ status_css_class = "process-item-status-abolish";
34
+ status_icon_css_class = "iconerror";
31
35
  } else {
32
36
  status_css_class = "process-item-status-set-up";
33
37
  status_icon_css_class = "icon-bchr-time";
package/src/base/layout/ui_tpl/form/FormForBrowse.js CHANGED
@@ -30,10 +30,49 @@ class FormForBrowse extends React.Component{
30
30
  return null;
31
31
  }
32
32
 
33
+ let groupNames = ext_form_items.filter(item => !item.b_show_infoset_field_group && item.belong_form_group).map(item => item.belong_form_group).filter((item, index, arr) => item && item.trim().length > 0 && arr.indexOf(item) === index);
34
+
35
+ if (groupNames && groupNames.length > 0) {
36
+
37
+ groupNames.push(null);
38
+
39
+ return (groupNames.map((groupName, index) => {
40
+
41
+ if (groupName) {
42
+ return (
43
+ <fieldset key={`fieldset_${index}`}>
44
+ <legend>{groupName}</legend>
45
+ <Row className="fix-form-ant-row">
46
+ {
47
+ ext_form_items.filter(item => item.belong_form_group === groupName && !item.b_show_infoset_field_group).map((item, index) => {
48
+ return (
49
+ <Col lg={12} md={24} key={"ext_col_" + index}>
50
+ {
51
+ <Form.Item
52
+ className={("ant-form-item-group-" + this.props.label_col) + (item.className ? " " + item.className : "")}
53
+ key={item.code}
54
+ label={item.label}
55
+ name={item.name}
56
+ rules={[{ required: item.required}]}
57
+ >
58
+ {item.render}
59
+ </Form.Item>
60
+ }
61
+ </Col>
62
+ );
63
+ })
64
+ }
65
+ </Row>
66
+ </fieldset>
67
+ )
68
+ }
69
+ }))
70
+ }
71
+
33
72
  return (
34
73
  <Row className="fix-form-ant-row">
35
74
  {
36
- ext_form_items.map((item, index) => {
75
+ ext_form_items.filter(item => !item.b_show_infoset_field_group).map((item, index) => {
37
76
  return (
38
77
  <Col lg={12} md={24} key={"ext_col_" + index}>
39
78
  {
@@ -56,7 +95,7 @@ class FormForBrowse extends React.Component{
56
95
  }
57
96
 
58
97
  buildFormItems = () => {
59
- let {info_set_fields} = this.props;
98
+ let {info_set_fields, ext_form_items} = this.props;
60
99
 
61
100
  if (info_set_fields && info_set_fields.length > 0) {
62
101
 
@@ -80,6 +119,13 @@ class FormForBrowse extends React.Component{
80
119
  return this.generatorFormItem(dataItem)
81
120
  })
82
121
  }
122
+
123
+ {
124
+ ext_form_items && ext_form_items.length > 0 &&
125
+ ext_form_items.filter(item => item.b_show_infoset_field_group && item.belong_form_group === groupName).map(dataItem => {
126
+ return this.generatorFormItem(dataItem, true)
127
+ })
128
+ }
83
129
  </Row>
84
130
  </fieldset>
85
131
  )
@@ -121,7 +167,26 @@ class FormForBrowse extends React.Component{
121
167
  }
122
168
  };
123
169
 
124
- generatorFormItem = (dataItem) => {
170
+ generatorFormItem = (dataItem, is_ext_field) => {
171
+ if (is_ext_field) {
172
+
173
+ return (
174
+ <Col lg={12} md={24} key={"ext_col_" + dataItem.code}>
175
+ {
176
+ <Form.Item
177
+ className={("ant-form-item-group-" + this.props.label_col) + (dataItem.className ? " " + dataItem.className : "")}
178
+ key={dataItem.code}
179
+ label={dataItem.label}
180
+ name={dataItem.name}
181
+ rules={[{ required: dataItem.required}]}
182
+ >
183
+ {dataItem.render}
184
+ </Form.Item>
185
+ }
186
+ </Col>
187
+ );
188
+ }
189
+
125
190
  let {initialValues, custom_form_items} = this.props;
126
191
 
127
192
  if (Array.isArray(initialValues)) {
@@ -202,7 +267,13 @@ class FormForBrowse extends React.Component{
202
267
  label={
203
268
  <Fragment>
204
269
  {
205
- dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
270
+ dataItem.title_of_field_label_prefix && dataItem.title_of_field_label_prefix.trim().length > 0 && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
271
+ <Tooltip title={<span dangerouslySetInnerHTML={{__html: dataItem.title_of_field_label_prefix}}></span>}>
272
+ <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.field_label_prefix}}></span>
273
+ </Tooltip>
274
+ }
275
+ {
276
+ (!dataItem.title_of_field_label_prefix || dataItem.title_of_field_label_prefix.trim().length == 0) && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
206
277
  <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.field_label_prefix}}></span>
207
278
  }
208
279
  <Tooltip title={dataItem.name}>{dataItem.name}</Tooltip>
package/src/base/layout/ui_tpl/form/FormForModify.js CHANGED
@@ -46,10 +46,51 @@ class FormForModify extends React.Component{
46
46
 
47
47
  form_id = form_id || "form";
48
48
 
49
+ let groupNames = ext_form_items.filter(item => !item.b_show_infoset_field_group && item.belong_form_group).map(item => item.belong_form_group).filter((item, index, arr) => item && item.trim().length > 0 && arr.indexOf(item) === index);
50
+
51
+ if (groupNames && groupNames.length > 0) {
52
+
53
+ groupNames.push(null);
54
+
55
+ return (
56
+ groupNames.map((groupName, index) => {
57
+
58
+ if (groupName) {
59
+ return (
60
+ <fieldset key={`fieldset_${index}`}>
61
+ <legend>{groupName}</legend>
62
+ <Row className="fix-form-ant-row">
63
+ {
64
+ ext_form_items.filter(item => item.belong_form_group === groupName && !item.b_show_infoset_field_group).map((item, index) => {
65
+ return (
66
+ <Col lg={12} md={24} key={"ext_col_" + index}>
67
+ {
68
+ <Form.Item
69
+ className={("ant-form-item-group-" + this.props.label_col) + (item.className ? " " + item.className : "")}
70
+ key={form_id + "_" + item.code}
71
+ label={item.label}
72
+ name={item.name}
73
+ rules={[{ required: item.required}]}
74
+ >
75
+ {item.render}
76
+ </Form.Item>
77
+ }
78
+ </Col>
79
+ );
80
+ })
81
+ }
82
+ </Row>
83
+ </fieldset>
84
+ )
85
+ }
86
+ })
87
+ )
88
+ }
89
+
49
90
  return (
50
91
  <Row className="fix-form-ant-row">
51
92
  {
52
- ext_form_items.map((item, index) => {
93
+ ext_form_items.filter(item => !item.b_show_infoset_field_group).map((item, index) => {
53
94
  return (
54
95
  <Col lg={12} md={24} key={"ext_col_" + index}>
55
96
  {
@@ -72,7 +113,7 @@ class FormForModify extends React.Component{
72
113
  }
73
114
 
74
115
  buildFormItems = () => {
75
- let {info_set_fields} = this.props;
116
+ let {info_set_fields, ext_form_items} = this.props;
76
117
 
77
118
  if (info_set_fields && info_set_fields.length > 0) {
78
119
 
@@ -96,6 +137,12 @@ class FormForModify extends React.Component{
96
137
  return this.generatorFormItem(dataItem)
97
138
  })
98
139
  }
140
+ {
141
+ ext_form_items && ext_form_items.length > 0 &&
142
+ ext_form_items.filter(item => item.b_show_infoset_field_group && item.belong_form_group === groupName).map(dataItem => {
143
+ return this.generatorFormItem(dataItem, true);
144
+ })
145
+ }
99
146
  </Row>
100
147
  </fieldset>
101
148
  )
@@ -137,12 +184,32 @@ class FormForModify extends React.Component{
137
184
  }
138
185
  };
139
186
 
140
- generatorFormItem = (dataItem) => {
187
+ generatorFormItem = (dataItem, is_ext_field) => {
141
188
  let {data, biz_object_pk, owner_object_pk, file_service_path, value_onchange_events, custom_form_items, form_items_ext_props, form_id} = this.props;
142
189
  let {name, ui_render_type, max_value, min_value, ref_pk, code, display_code, b_multiple, value_on_change_event, upload_file_biz_object_type,
143
190
  b_readonly, b_required, field_length, field_precision, tip_message, regexp_pattern} = dataItem;
144
191
 
145
192
  form_id = form_id || "form";
193
+
194
+ if (is_ext_field) {
195
+
196
+ return (
197
+ <Col lg={12} md={24} key={"ext_col_" + dataItem.code}>
198
+ {
199
+ <Form.Item
200
+ className={("ant-form-item-group-" + this.props.label_col) + (dataItem.className ? " " + dataItem.className : "")}
201
+ key={form_id + "_" + dataItem.code}
202
+ label={dataItem.label}
203
+ name={dataItem.name}
204
+ rules={[{ required: dataItem.required}]}
205
+ >
206
+ {dataItem.render}
207
+ </Form.Item>
208
+ }
209
+ </Col>
210
+ )
211
+ }
212
+
146
213
  display_code = display_code || code;
147
214
  let initialValue = data[code];
148
215
  let displayValue = data[display_code];
@@ -473,7 +540,13 @@ class FormForModify extends React.Component{
473
540
  label={
474
541
  <Fragment>
475
542
  {
476
- dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
543
+ dataItem.title_of_field_label_prefix && dataItem.title_of_field_label_prefix.trim().length > 0 && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
544
+ <Tooltip title={<span dangerouslySetInnerHTML={{__html: dataItem.title_of_field_label_prefix}}></span>}>
545
+ <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.field_label_prefix}}></span>
546
+ </Tooltip>
547
+ }
548
+ {
549
+ (!dataItem.title_of_field_label_prefix || dataItem.title_of_field_label_prefix.trim().length == 0) && dataItem.field_label_prefix && dataItem.field_label_prefix.trim().length > 0 &&
477
550
  <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.field_label_prefix}}></span>
478
551
  }
479
552
 
package/src/base/layout/ui_tpl/grid/GridForBrowse.js CHANGED
@@ -176,7 +176,7 @@ class GridForBrowse extends React.Component{
176
176
  <Fragment>
177
177
  {
178
178
  dataItem.column_header_prefix && dataItem.column_header_prefix.trim().length > 0 &&
179
- <Tooltip title={dataItem.check_type == 1? '核档字段' : '核实字段'}>
179
+ <Tooltip title={dataItem.check_type == 1? '核档字段' : '核准字段'}>
180
180
  <span style={{marginRight: '5px'}} dangerouslySetInnerHTML={{__html: dataItem.column_header_prefix}}></span>
181
181
  </Tooltip>
182
182
  }
package/src/style/bchrFixedComponent.less CHANGED
@@ -741,6 +741,16 @@ div.ant-modal.my-fix-auto-height .ant-modal-body {
741
741
  }
742
742
  }
743
743
  }
744
+
745
+ &.process-item-status-abolish {
746
+ .process-item-status-bar {
747
+ background: #DA0002;
748
+
749
+ &:before {
750
+ display: none;
751
+ }
752
+ }
753
+ }
744
754
  }
745
755
  }
746
756