fmui-base 2.0.67 → 2.0.68

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.68：dom结构加载完成回调
 - 2.0.67：批示意见常用语样式修改和加载逻辑修改
 - 2.0.66：默认批示意见常用语编辑跳转
 - 2.0.65：移动端门户边距修改

package/lib/form/subForm.js

@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              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, allForm: t.props.allForm, 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) });
+              return _react2.default.createElement(_form2.default, { className: "subform_" + item2.uniqueName, 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, allForm: t.props.allForm, 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) });
             })
           )
         );

package/lib/form/table.js

@@ -786,8 +786,9 @@ var PageHome = function (_React$Component) {
 						$('.hejidiv-' + subTableName).find('span')[le - 1].innerText = tx.replace(';', '');
 					}
 				}
+
+				this.props.onChange(data, itemParam);
 			}
-			this.props.onChange(data);
 		}
 
 		//重新加载关联字段
@@ -1557,16 +1558,16 @@ var PageHome = function (_React$Component) {
 						return item.itemType == 'twocolumns' || item.itemType == 'threecolumns' ? item.children.map(function (item2, j) {
 							return _react2.default.createElement(
 								'div',
-								null,
-								_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
+								{ className: "form_" + item2.uniqueName },
+								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
 							);
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
-							null,
+							{ className: "subform_" + item.itemCode },
 							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
 						) : _react2.default.createElement(
 							'div',
-							null,
+							{ className: "form_" + item.uniqueName },
 							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, onChange: this.change.bind(this) })
 						);
 					}.bind(this)) : "" : _react2.default.createElement(
@@ -1594,16 +1595,16 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								);
 							}.bind(this))
 						)
@@ -1628,13 +1629,13 @@ var PageHome = function (_React$Component) {
 						)
 					)
 				),
-				_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
+				_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 || t.props.commentField == "default" ? "t-H10 t-BCf7" : 't-DN' }),
 				_react2.default.createElement(
 					'div',
-					{ className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
+					{ className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 || t.props.commentField == "default" ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
-						{ className: 'flex-comment t-field-box' },
+						{ className: 'flex-comment default-comment t-field-box' },
 						_react2.default.createElement(
 							'div',
 							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },
@@ -1647,7 +1648,7 @@ var PageHome = function (_React$Component) {
 						_react2.default.createElement(
 							'div',
 							{ className: 't-PT10 t-FB1' },
-							_react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }),
+							t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? _react2.default.createElement(_List2.default, { list: t.props.commentDefaultList }) : "",
 							_react2.default.createElement(
 								'div',
 								{ className: t.props.commentField == "default" ? 't-PL10 t-PR10' : 't-DN' },
@@ -1667,7 +1668,7 @@ var PageHome = function (_React$Component) {
 								),
 								_react2.default.createElement(_TextareaField2.default, {
 									readOnly: false,
-									minRows: 10, maxRows: 13,
+									minRows: 5, maxRows: 10,
 									placeholder: '请输入批示意见',
 									value: this.state.spyj,
 									onChange: this.changeSpyj1.bind(this) }),
@@ -1696,74 +1697,6 @@ var PageHome = function (_React$Component) {
 							)
 						)
 					)
-				),
-				_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? "t-H10 t-BCf7" : 't-DN' }),
-				_react2.default.createElement(
-					'div',
-					{ className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
-					_react2.default.createElement(
-						HBox,
-						{ className: 't-field-box' },
-						_react2.default.createElement(
-							'div',
-							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },
-							_react2.default.createElement(
-								'span',
-								null,
-								'\u6279\u793A\u610F\u89C1'
-							)
-						),
-						_react2.default.createElement(
-							'div',
-							{ className: t.props.commentField == "default" ? 't-PL10 t-PT10 t-FB1' : 't-DN' },
-							_react2.default.createElement(
-								'div',
-								{ className: 'theme-color t-P6 t-FS16 commonwords' },
-								_react2.default.createElement(
-									'div',
-									{ onClick: this.selectCommonwords.bind(this) },
-									'\u5E38\u7528\u8BED'
-								),
-								_react2.default.createElement(
-									'div',
-									{ onClick: this.skipToCommonwordsSet.bind(this) },
-									'\u7F16\u8F91'
-								)
-							),
-							_react2.default.createElement(
-								'div',
-								{ id: 'defaultCommentInput' },
-								_react2.default.createElement(_TextareaField2.default, {
-									readOnly: false,
-									minRows: 3, maxRows: 5,
-									placeholder: '请输入批示意见',
-									value: this.state.spyj,
-									onChange: this.changeSpyj1.bind(this) })
-							),
-							_react2.default.createElement(_CheckboxField2.default, {
-								className: this.state.hasCommentField == '1' ? "" : "t-DN",
-								data: this.state.savePhraseList,
-								mode: 'list',
-								onChange: this.selectSavePhrase.bind(this),
-								required: false
-							}),
-							_react2.default.createElement(
-								_FoldablePane2.default,
-								{ foldHeight: 0, isFold: this.state.fold },
-								_react2.default.createElement(
-									'div',
-									{ className: 'phrase-list' },
-									this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
-										return _react2.default.createElement(
-											'div',
-											{ className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
-											item.value
-										);
-									}.bind(this)) : ''
-								)
-							)
-						)
-					)
 				)
 			);
 		}

package/lib/process_info/processInfo.js

@@ -1315,6 +1315,33 @@ var PageHome = function (_React$Component) {
                     }, function () {
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
+
+                        //项目开发模块统一扩展
+                        var mobileModuleExt;
+                        try {
+                            if (t.state.module) {
+                                mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
+                            }
+                        } catch (e) {
+                            // alert("exception: "+e.message);
+                        }
+
+                        if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["mainDocomentLoadSuccess"] === "function") {
+                            mobileModuleExt["mainDocomentLoadSuccess"](t.state);
+                        }
+
+                        //项目开发扩展
+                        var mobileExt;
+                        try {
+                            if (formKey) {
+                                mobileExt = typeof eval(t.state.module + "_" + formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + formKey + "_mobileExt") : null;
+                            }
+                        } catch (e) {
+                            // alert("exception: "+e.message);
+                        }
+                        if (typeof mobileExt !== 'undefined' && typeof mobileExt["mainDocomentLoadSuccess"] === "function") {
+                            content = mobileExt["mainDocomentLoadSuccess"](content);
+                        }
                     });
                     t.dealWithButtons(content, formKey);
                 }, function (error) {
@@ -1540,7 +1567,8 @@ var PageHome = function (_React$Component) {
 
     }, {
         key: 'change',
-        value: function change(data) {
+        value: function change(data, itemParam) {
+            console.log("数据回调" + itemParam.key);
             this.setState({
                 editFormData: data
             });