|
|
@@ -625,13 +625,14 @@ $(document).ready(() => {
|
|
|
};
|
|
|
const range = info.cellRange;
|
|
|
const sortData = info.sheet.zh_data || [];
|
|
|
+ console.log(range, sortData);
|
|
|
if (range.row + range.rowCount > sortData.length) {
|
|
|
toastMessageUniq(hint.cellError);
|
|
|
SpreadJsObj.reLoadSheetHeader(materialSpread.getActiveSheet());
|
|
|
SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
|
|
|
return;
|
|
|
}
|
|
|
- if (sortData.length > 0 && range.col + range.colCount > 4) {
|
|
|
+ if (sortData.length > 0 && range.col + range.colCount > 5) {
|
|
|
toastMessageUniq(hint.cellError);
|
|
|
SpreadJsObj.reLoadSheetHeader(materialSpread.getActiveSheet());
|
|
|
SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
|
|
|
@@ -643,7 +644,6 @@ $(document).ready(() => {
|
|
|
const curRow = range.row + iRow;
|
|
|
const materialData = { id: sortData[curRow].id, mb_id: sortData[curRow].mb_id };
|
|
|
const hintRow = range.rowCount > 1 ? curRow : '';
|
|
|
- console.log(range);
|
|
|
let sameCol = 0;
|
|
|
for (let iCol = 0; iCol < range.colCount; iCol++) {
|
|
|
const curCol = range.col + iCol;
|
|
|
@@ -666,10 +666,8 @@ $(document).ready(() => {
|
|
|
quantity: 0,
|
|
|
};
|
|
|
const [valid, msg] = materialSpreadObj._checkExpr(validText, exprQuantity);
|
|
|
- console.log(exprQuantity);
|
|
|
if (!valid) {
|
|
|
toastMessageUniq(getPasteHint(msg, hintRow));
|
|
|
- // toastr.error(msg);
|
|
|
bPaste = false;
|
|
|
continue;
|
|
|
}
|
