fmui-base 2.2.87 → 2.2.89
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 +191 -147
- package/lib/form/formExtHelper.js +131 -55
- package/lib/form/subForm.js +272 -21
- package/lib/form/table.js +472 -76
- package/lib/process_info/processInfo.js +2 -1
- package/lib/tblform/README.md +12 -3
- package/lib/tblform/TblForm.js +2 -0
- package/lib/tblform/formFieldProps.js +1 -0
- package/lib/tblform/pureFormAdapter.js +2 -1
- package/package.json +1 -1
package/lib/tblform/TblForm.js
CHANGED
|
@@ -81,6 +81,7 @@ var TblForm = function (_BaseTable) {
|
|
|
81
81
|
allForm: null,
|
|
82
82
|
editFormData: null,
|
|
83
83
|
formStyleObj: {},
|
|
84
|
+
subColumnCount: props.subColumnCount != null && props.subColumnCount !== '' ? props.subColumnCount : 1,
|
|
84
85
|
fieldControll: {},
|
|
85
86
|
status: '0',
|
|
86
87
|
operate: '',
|
|
@@ -135,6 +136,7 @@ var TblForm = function (_BaseTable) {
|
|
|
135
136
|
allForm: normalized.allForm,
|
|
136
137
|
editFormData: normalized.editFormData,
|
|
137
138
|
formStyleObj: normalized.formStyleObj,
|
|
139
|
+
subColumnCount: normalized.subColumnCount != null ? normalized.subColumnCount : t.props.subColumnCount != null ? t.props.subColumnCount : 1,
|
|
138
140
|
fieldControll: normalized.fieldControll,
|
|
139
141
|
status: normalized.status,
|
|
140
142
|
operate: editType || 'add',
|
|
@@ -22,6 +22,7 @@ function buildFormFieldProps(t, formItem) {
|
|
|
22
22
|
form: formItem,
|
|
23
23
|
allForm: t.state.allForm,
|
|
24
24
|
formStyle: t.state.formStyleObj,
|
|
25
|
+
subColumnCount: t.state.subColumnCount,
|
|
25
26
|
data: t.state.editFormData,
|
|
26
27
|
fieldControll: t.state.fieldControll,
|
|
27
28
|
isRemoveCommentFormHtml: '1',
|
|
@@ -154,6 +154,7 @@ function normalizePureMobileForm(content, editType) {
|
|
|
154
154
|
editFormData: formData,
|
|
155
155
|
status: editTypeToStatus(editType),
|
|
156
156
|
fieldControll: buildFieldControllForEditType(formItem, form.formTblName, editType),
|
|
157
|
-
formStyleObj: form.formStyleObj || {}
|
|
157
|
+
formStyleObj: form.formStyleObj || {},
|
|
158
|
+
subColumnCount: form.subColumnCount != null && form.subColumnCount !== '' ? form.subColumnCount : 1
|
|
158
159
|
};
|
|
159
160
|
}
|