Skip to content

Commit

Permalink
PullRequest: 293 Fixes oceanbase/odc#1303, reset baseOffset if not ca…
Browse files Browse the repository at this point in the history
…ll by selectdSQL

Merge branch 'fix/dev-4.2.3-odc-1303 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.2.3

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/293


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* Fixes oceanbase/odc#1303, reset baseOffset if not call by selectdSQL
  • Loading branch information
UnknownAdventurer committed Dec 25, 2023
1 parent a3400d6 commit a6acfbe
Showing 1 changed file with 24 additions and 12 deletions.
36 changes: 24 additions & 12 deletions src/page/Workspace/components/SQLPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,19 @@ export class SQLPage extends Component<IProps, ISQLPageState> {
false,
selectedSQL ? await utils.getCurrentSelectRange(this.editor) : null,
);
if (range.begin === range.end) {
this.setState({
baseOffset: selectedSQL ? range.begin - this.editor?.getSelectionContent()?.length : 0,
});
} else if (range.begin < range.end) {
if (selectedSQL) {
if (range.begin === range.end) {
this.setState({
baseOffset: selectedSQL ? range.begin - this.editor?.getSelectionContent()?.length : 0,
});
} else if (range.begin < range.end) {
this.setState({
baseOffset: selectedSQL ? range.begin : 0,
});
}
} else {
this.setState({
baseOffset: selectedSQL ? range.begin : 0,
baseOffset: 0,
});
}
if (result?.hasLintResults) {
Expand Down Expand Up @@ -567,13 +573,19 @@ export class SQLPage extends Component<IProps, ISQLPageState> {
this.getSession()?.params?.delimiter,
value,
);
if (range.begin === range.end) {
this.setState({
baseOffset: range.begin - this.editor?.getSelectionContent()?.length || 0,
});
} else if (range.begin < range.end) {
if (selectted) {
if (range.begin === range.end) {
this.setState({
baseOffset: range.begin - this.editor?.getSelectionContent()?.length || 0,
});
} else if (range.begin < range.end) {
this.setState({
baseOffset: range.begin || 0,
});
}
} else {
this.setState({
baseOffset: range.begin || 0,
baseOffset: 0,
});
}
this.setState({
Expand Down

0 comments on commit a6acfbe

Please sign in to comment.