|
@@ -1845,7 +1845,7 @@ $(document).ready(function() {
|
|
|
const data = {};
|
|
|
if (col.field === 'name') {
|
|
|
if (newText === '' && posData) {
|
|
|
- toastr.error('部位名称不可为空');
|
|
|
+ toastr.error('计量单元名称不可为空');
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
return;
|
|
|
} else if (!posData) {
|
|
@@ -2013,6 +2013,10 @@ $(document).ready(function() {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ const hint = {
|
|
|
+ name: {type: 'warning', msg: '计量单元名称不可为空,已过滤'},
|
|
|
+ expr: {type: 'warning', msg: '粘贴了表达式非法,已过滤'},
|
|
|
+ };
|
|
|
if (info.sheet.zh_setting) {
|
|
|
const data = [];
|
|
|
const sortData = info.sheet.zh_data || [];
|
|
@@ -2048,11 +2052,18 @@ $(document).ready(function() {
|
|
|
posData[exprInfo.expr] = trimInvalidChar(info.sheet.getText(curRow, curCol));
|
|
|
}
|
|
|
bPaste = true;
|
|
|
- } catch(err) {
|
|
|
+ } catch (err) {
|
|
|
delete posData[colSetting.field];
|
|
|
- toastr.warning('粘贴了表达式非法,已过滤');
|
|
|
+ toastMessageUniq(hint.expr);
|
|
|
}
|
|
|
}
|
|
|
+ } else if (colSetting.field === 'name') {
|
|
|
+ if (!posData[colSetting.field]) {
|
|
|
+ delete posData[colSetting.field];
|
|
|
+ toastMessageUniq(hint.name);
|
|
|
+ } else {
|
|
|
+ bPaste = true;
|
|
|
+ }
|
|
|
} else {
|
|
|
bPaste = true;
|
|
|
}
|