|
@@ -665,26 +665,26 @@ $(document).ready(() => {
|
|
|
data.updateData.name = validText;
|
|
|
} else {
|
|
|
data.updateData.id = select.pid;
|
|
|
- if (validText) {
|
|
|
- if (col.field === 'sprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkSExpr(select, validText, data.updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- return;
|
|
|
- }
|
|
|
- } else if (col.field === 'rprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkRExpr(select, validText, data.updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- return;
|
|
|
- }
|
|
|
- } else {
|
|
|
- data.updateData[col.field] = validText;
|
|
|
+ if (col.field === 'sprice') {
|
|
|
+ const [valid, msg] = paySpreadObj._checkSExpr(select, validText, data.updateData);
|
|
|
+ if (!valid) {
|
|
|
+ toastr.warning(msg);
|
|
|
+ SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else if (col.field === 'rprice') {
|
|
|
+ const [valid, msg] = paySpreadObj._checkRExpr(select, validText, data.updateData);
|
|
|
+ if (!valid) {
|
|
|
+ toastr.warning(msg);
|
|
|
+ SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
+ return;
|
|
|
}
|
|
|
} else {
|
|
|
- data.updateData[col.field] = null;
|
|
|
+ if (validText) {
|
|
|
+ data.updateData[col.field] = validText;
|
|
|
+ } else {
|
|
|
+ data.updateData[col.field] = null;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 更新至服务器
|
|
@@ -841,26 +841,27 @@ $(document).ready(() => {
|
|
|
updateData.name = validText;
|
|
|
} else {
|
|
|
updateData.id = node.pid;
|
|
|
- if (validText) {
|
|
|
- if (col.field === 'sprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkSExpr(node, validText, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
- return;
|
|
|
- }
|
|
|
- } else if (col.field === 'rprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkRExpr(node, validText, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
- return;
|
|
|
- }
|
|
|
- } else {
|
|
|
- updateData[col.field] = validText;
|
|
|
+
|
|
|
+ if (col.field === 'sprice') {
|
|
|
+ const [valid, msg] = paySpreadObj._checkSExpr(node, validText, updateData);
|
|
|
+ if (!valid) {
|
|
|
+ toastr.warning(msg);
|
|
|
+ SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ } else if (col.field === 'rprice') {
|
|
|
+ const [valid, msg] = paySpreadObj._checkRExpr(node, validText, updateData);
|
|
|
+ if (!valid) {
|
|
|
+ toastr.warning(msg);
|
|
|
+ SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
+ return;
|
|
|
}
|
|
|
} else {
|
|
|
- updateData[col.field] = null;
|
|
|
+ if (validText) {
|
|
|
+ updateData[col.field] = validText;
|
|
|
+ } else {
|
|
|
+ updateData[col.field] = null;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
data.updateData.push(updateData);
|