fmui-base 2.3.34 → 2.3.35
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 +32 -32
- package/lib/form/subForm.js +22 -22
- package/lib/selectMember/select copy.js +11393 -0
- package/lib/tblform/FlowCommentPane.js +2 -2
- package/lib/upload/upload.js +72 -3
- package/package.json +1 -1
- package/lib/nvoice/index.js +0 -16
- package/lib/nvoice/nvoice.js +0 -177
- package/lib/nvoice/nvoice.less +0 -0
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -695,8 +695,8 @@ var PageHome = function (_React$Component) {
|
|
|
695
695
|
itemParam.decimalPlace = form.decimalPlace; //小数位数
|
|
696
696
|
itemParam.dataAttr = form['dataAttr'];
|
|
697
697
|
itemParam.maxlength = form['length'];
|
|
698
|
-
/*if(itemParam.dataAttr){
|
|
699
|
-
alert("265====="+itemParam.dataAttr.textLineFeed);
|
|
698
|
+
/*if(itemParam.dataAttr){
|
|
699
|
+
alert("265====="+itemParam.dataAttr.textLineFeed);
|
|
700
700
|
}*/
|
|
701
701
|
//宏值签名图片
|
|
702
702
|
// if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
|
|
@@ -968,11 +968,11 @@ var PageHome = function (_React$Component) {
|
|
|
968
968
|
if (value == item.value) {
|
|
969
969
|
value = { value: value, text: item.name };
|
|
970
970
|
}
|
|
971
|
-
/*}else{
|
|
972
|
-
var defaultValue=form.defaultValue;
|
|
973
|
-
if(defaultValue == item.value){
|
|
974
|
-
value = {value:value,text:item.name};
|
|
975
|
-
}
|
|
971
|
+
/*}else{
|
|
972
|
+
var defaultValue=form.defaultValue;
|
|
973
|
+
if(defaultValue == item.value){
|
|
974
|
+
value = {value:value,text:item.name};
|
|
975
|
+
}
|
|
976
976
|
}*/
|
|
977
977
|
selectOptions.push(option);
|
|
978
978
|
}
|
|
@@ -2498,21 +2498,21 @@ var PageHome = function (_React$Component) {
|
|
|
2498
2498
|
var length = item.maxlength;
|
|
2499
2499
|
var patrn = /^-?\d+(\.\d+)?$/;
|
|
2500
2500
|
if (newValue !== '' && newValue != '-') {
|
|
2501
|
-
/* var validAttr=item['validAttr'];
|
|
2502
|
-
if(validAttr!=null && validAttr.length>0){
|
|
2503
|
-
for(var va=0;va<validAttr.length;va++){
|
|
2504
|
-
var regular=validAttr[va]['regular'];
|
|
2505
|
-
var tips=validAttr[va]['tips'];
|
|
2506
|
-
var reg=new RegExp(regular.slice(1,-1),"g");
|
|
2507
|
-
if(!reg.test(newValue)){
|
|
2508
|
-
Toast.show({
|
|
2509
|
-
type: 'error',
|
|
2510
|
-
content:item.title+':'+tips
|
|
2511
|
-
});
|
|
2512
|
-
return false;
|
|
2513
|
-
}
|
|
2514
|
-
|
|
2515
|
-
}
|
|
2501
|
+
/* var validAttr=item['validAttr'];
|
|
2502
|
+
if(validAttr!=null && validAttr.length>0){
|
|
2503
|
+
for(var va=0;va<validAttr.length;va++){
|
|
2504
|
+
var regular=validAttr[va]['regular'];
|
|
2505
|
+
var tips=validAttr[va]['tips'];
|
|
2506
|
+
var reg=new RegExp(regular.slice(1,-1),"g");
|
|
2507
|
+
if(!reg.test(newValue)){
|
|
2508
|
+
Toast.show({
|
|
2509
|
+
type: 'error',
|
|
2510
|
+
content:item.title+':'+tips
|
|
2511
|
+
});
|
|
2512
|
+
return false;
|
|
2513
|
+
}
|
|
2514
|
+
|
|
2515
|
+
}
|
|
2516
2516
|
}*/
|
|
2517
2517
|
if (this.checkEmoji(newValue)) {
|
|
2518
2518
|
_Toast2.default.show({
|
|
@@ -3671,12 +3671,12 @@ var PageHome = function (_React$Component) {
|
|
|
3671
3671
|
});
|
|
3672
3672
|
return false;
|
|
3673
3673
|
}
|
|
3674
|
-
/* if(newValue=''){
|
|
3675
|
-
Toast.show({
|
|
3676
|
-
type: 'error',
|
|
3677
|
-
content: '意见不能为空!',
|
|
3678
|
-
});
|
|
3679
|
-
return false;
|
|
3674
|
+
/* if(newValue=''){
|
|
3675
|
+
Toast.show({
|
|
3676
|
+
type: 'error',
|
|
3677
|
+
content: '意见不能为空!',
|
|
3678
|
+
});
|
|
3679
|
+
return false;
|
|
3680
3680
|
}*/
|
|
3681
3681
|
if (newValue.length > 2000) {
|
|
3682
3682
|
newValue = newValue.substring(0, 2000);
|
|
@@ -3907,10 +3907,10 @@ var PageHome = function (_React$Component) {
|
|
|
3907
3907
|
return resolved.strategy === 'wpsWebOffice' || resolved.officeType === 'wpsWebOffice';
|
|
3908
3908
|
}
|
|
3909
3909
|
|
|
3910
|
-
/**
|
|
3911
|
-
* 解析正文类型,决定是否显示「编辑正文」。
|
|
3912
|
-
* 可编辑且未解析完成:不挂 Upload(占位),避免 initData 把 recordId 冲成附件 id。
|
|
3913
|
-
* 解析后:wps → 编辑正文;非 wps → Upload 只读样式。
|
|
3910
|
+
/**
|
|
3911
|
+
* 解析正文类型,决定是否显示「编辑正文」。
|
|
3912
|
+
* 可编辑且未解析完成:不挂 Upload(占位),避免 initData 把 recordId 冲成附件 id。
|
|
3913
|
+
* 解析后:wps → 编辑正文;非 wps → Upload 只读样式。
|
|
3914
3914
|
*/
|
|
3915
3915
|
|
|
3916
3916
|
}, {
|
package/lib/form/subForm.js
CHANGED
|
@@ -342,28 +342,28 @@ var PageHome = function (_React$Component) {
|
|
|
342
342
|
var data = this.props.data;
|
|
343
343
|
var subTblList = data.subTbl; //子表
|
|
344
344
|
var relatedTbl = data.relatedTbl; //关联表
|
|
345
|
-
/* var calculateExpList = data.calculateExpList;//计算公式列表
|
|
346
|
-
var calculateExpList1 = value.calculateExpList;//计算公式列表
|
|
347
|
-
if(calculateExpList1){
|
|
348
|
-
for(var key in calculateExpList1){
|
|
349
|
-
var calculateExpValue;
|
|
350
|
-
if(calculateExpList){
|
|
351
|
-
calculateExpValue = calculateExpList[key];
|
|
352
|
-
if(!calculateExpValue){
|
|
353
|
-
calculateExpValue = [];
|
|
354
|
-
}
|
|
355
|
-
}else{
|
|
356
|
-
calculateExpList = {};
|
|
357
|
-
calculateExpValue = [];
|
|
358
|
-
}
|
|
359
|
-
for(var j=0;j<calculateExpList1[key].length;j++){
|
|
360
|
-
calculateExpValue.push(calculateExpList1[key][j]);
|
|
361
|
-
}
|
|
362
|
-
calculateExpList[key] = calculateExpValue;
|
|
363
|
-
|
|
364
|
-
}
|
|
365
|
-
|
|
366
|
-
data.calculateExpList = calculateExpList;
|
|
345
|
+
/* var calculateExpList = data.calculateExpList;//计算公式列表
|
|
346
|
+
var calculateExpList1 = value.calculateExpList;//计算公式列表
|
|
347
|
+
if(calculateExpList1){
|
|
348
|
+
for(var key in calculateExpList1){
|
|
349
|
+
var calculateExpValue;
|
|
350
|
+
if(calculateExpList){
|
|
351
|
+
calculateExpValue = calculateExpList[key];
|
|
352
|
+
if(!calculateExpValue){
|
|
353
|
+
calculateExpValue = [];
|
|
354
|
+
}
|
|
355
|
+
}else{
|
|
356
|
+
calculateExpList = {};
|
|
357
|
+
calculateExpValue = [];
|
|
358
|
+
}
|
|
359
|
+
for(var j=0;j<calculateExpList1[key].length;j++){
|
|
360
|
+
calculateExpValue.push(calculateExpList1[key][j]);
|
|
361
|
+
}
|
|
362
|
+
calculateExpList[key] = calculateExpValue;
|
|
363
|
+
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
data.calculateExpList = calculateExpList;
|
|
367
367
|
}*/
|
|
368
368
|
|
|
369
369
|
this.dealwithSubData(subTblList, subTblNo, value, relatedTbl);
|