fmui-base 2.3.55 → 2.3.56
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 +8 -1
- package/lib/process_info/processInfo.js +3 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -702,11 +702,18 @@ var PageHome = function (_React$Component) {
|
|
|
702
702
|
// if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
|
|
703
703
|
// value = form.defaultValue;
|
|
704
704
|
// }
|
|
705
|
-
// 宏值新需求,赋值字段取defaultValue
|
|
705
|
+
// 宏值新需求,赋值字段取defaultValue;自动编号额外兜底 form.value,避免 formData 偶发缺字段导致空白/丢数
|
|
706
706
|
if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && fuzhiFields != '') {
|
|
707
|
+
var isBizCodeMacro = itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode';
|
|
707
708
|
if (fuzhiFields.split(",").indexOf(itemParam.uniqueName) != -1 && form.defaultValue && form.defaultValue != null) {
|
|
708
709
|
value = form.defaultValue;
|
|
710
|
+
} else if (isBizCodeMacro && (value === '' || value == null || typeof value == 'undefined') && form.value) {
|
|
711
|
+
value = form.value;
|
|
709
712
|
}
|
|
713
|
+
} else if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode' && (value === '' || value == null || typeof value == 'undefined') && form.value) {
|
|
714
|
+
value = form.value;
|
|
715
|
+
} else if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'bizCode' && (value === '' || value == null || typeof value == 'undefined') && form.defaultValue) {
|
|
716
|
+
value = form.defaultValue;
|
|
710
717
|
}
|
|
711
718
|
// 当前用户签名:展示用预览 URL,落库必须保留 xxx_sinPic(与 PC TextProcessor 一致)
|
|
712
719
|
if (itemParam.dataAttr && itemParam.dataAttr.dataSrc == '2' && itemParam.dataAttr.fromMacro && itemParam.dataAttr.fromMacro.value == 'currentUserSignPic') {
|
|
@@ -315,6 +315,7 @@ var PageHome = function (_React$Component) {
|
|
|
315
315
|
if (isSub != '') {
|
|
316
316
|
editType = 'readd';
|
|
317
317
|
permissionCode = 'start';
|
|
318
|
+
status = '0'; // 按新增态取 defaultValue,自动编号才能展示/重生
|
|
318
319
|
setPageTitle("新建");
|
|
319
320
|
}
|
|
320
321
|
var isPush = props.isPush;
|
|
@@ -8888,10 +8889,11 @@ var PageHome = function (_React$Component) {
|
|
|
8888
8889
|
permissionCode = 'other';
|
|
8889
8890
|
}
|
|
8890
8891
|
}
|
|
8891
|
-
//子流程打开
|
|
8892
|
+
//子流程打开 / 再次发起
|
|
8892
8893
|
if (isSub != '') {
|
|
8893
8894
|
editType = 'readd';
|
|
8894
8895
|
permissionCode = 'start';
|
|
8896
|
+
status = '0';
|
|
8895
8897
|
setPageTitle("新建");
|
|
8896
8898
|
}
|
|
8897
8899
|
var isPush = nextProps.isPush;
|