瀏覽代碼

Merge branch 'master' of https://github.com/HeapsIO/hide

LeoVgr 2 周之前
父節點
當前提交
231a3c2ec3
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      hide/comp/cdb/Editor.hx

+ 4 - 4
hide/comp/cdb/Editor.hx

@@ -1023,7 +1023,7 @@ class Editor extends Component {
 				}
 				}
 				makeParent(tables[i]);
 				makeParent(tables[i]);
 			}],
 			}],
-			sheetOrder : cdbTable.sheetsOrder.copy(),
+			sheetOrder : cdbTable?.sheetsOrder.copy(),
 		};
 		};
 	}
 	}
 
 
@@ -1079,7 +1079,7 @@ class Editor extends Component {
 		var state = undoState[0];
 		var state = undoState[0];
 		var newSheet = getCurrentSheet();
 		var newSheet = getCurrentSheet();
 		var newSaparatorsState = separatorsState;
 		var newSaparatorsState = separatorsState;
-		var newSheetsOrder = cdbTable.sheetsOrder.copy();
+		var newSheetsOrder = cdbTable?.sheetsOrder.copy();
 		currentValue = newValue;
 		currentValue = newValue;
 		save();
 		save();
 		undo.change(Custom(function(undo) {
 		undo.change(Custom(function(undo) {
@@ -1089,13 +1089,13 @@ class Editor extends Component {
 				currentValue = state.data;
 				currentValue = state.data;
 				currentSheet = state.sheet;
 				currentSheet = state.sheet;
 				separatorsState = state.separatorsState;
 				separatorsState = state.separatorsState;
-				cdbTable.sheetsOrder = state.sheetOrder;
+				if( cdbTable != null ) cdbTable.sheetsOrder = state.sheetOrder;
 			} else {
 			} else {
 				undoState.unshift(state);
 				undoState.unshift(state);
 				currentValue = newValue;
 				currentValue = newValue;
 				currentSheet = newSheet;
 				currentSheet = newSheet;
 				separatorsState = newSaparatorsState;
 				separatorsState = newSaparatorsState;
-				cdbTable.sheetsOrder = newSheetsOrder;
+				if( cdbTable != null ) cdbTable.sheetsOrder = newSheetsOrder;
 			}
 			}
 			api.load(currentValue);
 			api.load(currentValue);
 			DataFiles.save(true); // save reloaded data
 			DataFiles.save(true); // save reloaded data