|
@@ -1633,6 +1633,7 @@ $(document).ready(() => {
|
|
// $('#showAttachment').hide();
|
|
// $('#showAttachment').hide();
|
|
// }
|
|
// }
|
|
} else {
|
|
} else {
|
|
|
|
+ spSpread.getActiveSheet().zh_setting.readOnly = true;
|
|
SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', []);
|
|
SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', []);
|
|
}
|
|
}
|
|
stagePosSpreadObj.loadExprToInput(spSpread.getActiveSheet());
|
|
stagePosSpreadObj.loadExprToInput(spSpread.getActiveSheet());
|
|
@@ -1754,7 +1755,7 @@ $(document).ready(() => {
|
|
const col = info.sheet.zh_setting.cols[sel[0].col];
|
|
const col = info.sheet.zh_setting.cols[sel[0].col];
|
|
const node = SpreadJsObj.getSelectObject(info.sheet);
|
|
const node = SpreadJsObj.getSelectObject(info.sheet);
|
|
const exprInfo = getExprInfo(col.field);
|
|
const exprInfo = getExprInfo(col.field);
|
|
- if (exprInfo) {
|
|
|
|
|
|
+ if (exprInfo && node) {
|
|
if (node[exprInfo.expr] && node[exprInfo.expr] !== '') {
|
|
if (node[exprInfo.expr] && node[exprInfo.expr] !== '') {
|
|
info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
|
|
info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
|
|
}
|
|
}
|
|
@@ -1798,6 +1799,7 @@ $(document).ready(() => {
|
|
const data = { updateType: '', updateData: [], };
|
|
const data = { updateType: '', updateData: [], };
|
|
const sortData = info.sheet.zh_data;
|
|
const sortData = info.sheet.zh_data;
|
|
const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
|
|
const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
|
|
|
|
+ if (node.children && node.children.length > 0) return;
|
|
if (sortData && (info.cellRange.row >= sortData.length)) {
|
|
if (sortData && (info.cellRange.row >= sortData.length)) {
|
|
data.updateType = 'add';
|
|
data.updateType = 'add';
|
|
if (info.cellRange.col !== 0) {
|
|
if (info.cellRange.col !== 0) {
|