|
@@ -253,7 +253,7 @@ $(document).ready(() => {
|
|
|
if (!colSetting) continue;
|
|
|
|
|
|
let validText = info.sheet.getText(curRow, curCol);
|
|
|
- validText = is_numeric(validText) ? parseFloat(validText) : (validText ? trimInvalidChar(validText) : null);
|
|
|
+ validText = is_numeric(validText) ? parseFloat(validText) : (validText ? trimInvalidChar(validText) : '');
|
|
|
const orgValue = sortData[curRow][colSetting.field];
|
|
|
if (orgValue == validText || ((!orgValue || orgValue === '') && (validText === ''))) {
|
|
|
sameCol++;
|
|
@@ -275,6 +275,10 @@ $(document).ready(() => {
|
|
|
}
|
|
|
}
|
|
|
if (colSetting.field === 'unit') {
|
|
|
+ //粘贴内容要为下拉列表里所有的单位,不然为空
|
|
|
+ if (changeUnits.indexOf(validText) === -1) {
|
|
|
+ validText = '';
|
|
|
+ }
|
|
|
cLData.camount = ZhCalc.round(sortData[curRow].camount, findDecimal(validText)) || 0;
|
|
|
cLData.oamount = ZhCalc.round(sortData[curRow].oamount, findDecimal(validText)) || 0;
|
|
|
}
|