From f3e598d835be2a0ca97a1453b74f2d3d5de46bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=9C=9D=E4=BF=8A?= Date: Tue, 2 Jan 2024 09:32:58 +0800 Subject: [PATCH 1/6] PullRequest: 294 Fixes oceanbase/odc#1324 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'fix/dev-4.2.3-bp-odc-1324 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/294 Signed-off-by: 晓康 * Fixes oceanbase/odc#1324 --- src/page/Secure/Env/components/EnvironmentTable.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/page/Secure/Env/components/EnvironmentTable.tsx b/src/page/Secure/Env/components/EnvironmentTable.tsx index 520349862..2da9e887b 100644 --- a/src/page/Secure/Env/components/EnvironmentTable.tsx +++ b/src/page/Secure/Env/components/EnvironmentTable.tsx @@ -85,7 +85,7 @@ const EnvironmentTable = ({ ruleType }) => { } if (supportedDialectTypes) { filteredRules = filteredRules?.filter((item) => - item?.metadata?.supportedDialectTypes?.some((supportedDialectType) => + item?.appliedDialectTypes?.some((supportedDialectType) => supportedDialectTypes?.includes(supportedDialectType), ), ); @@ -119,7 +119,7 @@ const EnvironmentTable = ({ ruleType }) => { } if (supportedDialectTypes) { filteredRules = filteredRules?.filter((item) => - item?.metadata?.supportedDialectTypes?.some((supportedDialectType) => + item?.appliedDialectTypes?.some((supportedDialectType) => supportedDialectTypes?.includes(supportedDialectType), ), ); From 1184cc522e45304f8004e19e212582e322fedbe3 Mon Sep 17 00:00:00 2001 From: xiaokang Date: Tue, 2 Jan 2024 10:18:35 +0800 Subject: [PATCH 2/6] fix adduser overflow text --- src/component/SelectTransfer/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/component/SelectTransfer/index.tsx b/src/component/SelectTransfer/index.tsx index da63428e1..53f5a65c5 100644 --- a/src/component/SelectTransfer/index.tsx +++ b/src/component/SelectTransfer/index.tsx @@ -120,7 +120,7 @@ export default function SelectTransfer(props: IProps) { /> -
+
From d6a15b13ad79b72d5e20862f81bf626d49b67a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=92=8F=E5=92=8C?= Date: Tue, 2 Jan 2024 11:36:11 +0800 Subject: [PATCH 3/6] PullRequest: 295 fix: connection string parsing (password parsing) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'fix/dev-4.2.3-bugs-xyh-0102 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/295 Signed-off-by: 晓康 * fix: connection string parsing (password parsing) --- src/util/dataSourceParser.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/dataSourceParser.ts b/src/util/dataSourceParser.ts index 84181360d..f71a38620 100644 --- a/src/util/dataSourceParser.ts +++ b/src/util/dataSourceParser.ts @@ -15,7 +15,7 @@ */ import { formatMessage } from '@/util/intl'; -import { isUndefined } from 'lodash'; +import { isUndefined, isNil } from 'lodash'; function unifiedStr(value: string) { return value?.replace(/\\"|\\t|\'/g, ''); @@ -150,7 +150,7 @@ class Parser { const next = args[i + 1]; const isNextValid = !next?.startsWith('-'); let value: any = isNextValid ? next : null; - result[name] = isUndefined(value) ? value : type(value, name, result[name]); + result[name] = isNil(value) ? value : type(value, name, result[name]); if (isNextValid) { ++i; } From d84fa6087323062cb2e3a4ba0344f140d121ef15 Mon Sep 17 00:00:00 2001 From: xiaokang Date: Tue, 2 Jan 2024 14:47:53 +0800 Subject: [PATCH 4/6] add ob editor style --- package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- src/component/MonacoEditor/index.tsx | 6 ++++++ src/store/setting.ts | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3e9c9baed..fac78bfad 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ }, "devDependencies": { "@ant-design/icons": "^4.0.0", - "@oceanbase-odc/monaco-plugin-ob": "^0.1.1", + "@oceanbase-odc/monaco-plugin-ob": "^0.1.2", "@oceanbase-odc/ob-intl-cli": "^1.1.5", "@oceanbase-odc/ob-parser-js": "^3.0.1", "@oceanbase-odc/ob-react-data-grid": "^3.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd2605749..eb6eb93ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,8 +41,8 @@ devDependencies: specifier: ^4.0.0 version: 4.8.0(react-dom@17.0.2)(react@17.0.2) '@oceanbase-odc/monaco-plugin-ob': - specifier: ^0.1.1 - version: 0.1.1(monaco-editor@0.36.1) + specifier: ^0.1.2 + version: 0.1.2(monaco-editor@0.36.1) '@oceanbase-odc/ob-intl-cli': specifier: ^1.1.5 version: 1.1.5 @@ -3860,8 +3860,8 @@ packages: fastq: 1.15.0 dev: true - /@oceanbase-odc/monaco-plugin-ob@0.1.1(monaco-editor@0.36.1): - resolution: {integrity: sha512-P9wgRNIb724NgXZOqKaXNLG+W8QB6m62vvHX+Z4EC4zb/dTZfy9pb8bXDWW8D0Rt7m7CqAhoO/Pkk9OR8Jnd8Q==} + /@oceanbase-odc/monaco-plugin-ob@0.1.2(monaco-editor@0.36.1): + resolution: {integrity: sha512-h8k/S17ql1qj0YpEHIBxQjYMdOtU34d8qg6SCPP4MychInNYL6T0PzYYvLMEH0f9CiEmVl6zcCyvC5paGZbjJw==} peerDependencies: monaco-editor: ^0.34.1 dependencies: @@ -4716,7 +4716,7 @@ packages: resolution: {integrity: sha512-hy8b7Y1J8OGe6LbAjj3xniQrj3v6lsivCcrmf4TzSgPzLkhIeKgc5IZnT7ReIqmEuodjfO8EYAuoFvIrHi/+jQ==} deprecated: This is a stub types definition. history provides its own type definitions, so you do not need this installed. dependencies: - history: 4.10.1 + history: 5.3.0 dev: true /@types/hoist-non-react-statics@3.3.1: @@ -5717,7 +5717,7 @@ packages: axios: 0.27.2 babel-plugin-import: 1.13.6 dayjs: 1.11.7 - dva-core: 2.0.4(redux@3.7.2) + dva-core: 2.0.4(redux@4.2.1) dva-immer: 1.0.0(dva@2.5.0-beta.2) dva-loading: 3.0.23(dva-core@2.0.4) event-emitter: 0.3.5 @@ -8688,7 +8688,7 @@ packages: warning: 3.0.0 dev: true - /dva-core@2.0.4(redux@3.7.2): + /dva-core@2.0.4(redux@4.2.1): resolution: {integrity: sha512-Zh39llFyItu9HKXKfCZVf9UFtDTcypdAjGBew1S+wK8BGVzFpm1GPTdd6uIMeg7O6STtCvt2Qv+RwUut1GFynA==} peerDependencies: redux: 4.x @@ -8698,7 +8698,7 @@ packages: global: 4.4.0 invariant: 2.2.4 is-plain-object: 2.0.4 - redux: 3.7.2 + redux: 4.2.1 redux-saga: 0.16.2 warning: 3.0.0 dev: true @@ -8719,7 +8719,7 @@ packages: dva-core: ^1.1.0 || ^1.5.0-0 || ^1.6.0-0 dependencies: '@babel/runtime': 7.23.2 - dva-core: 2.0.4(redux@3.7.2) + dva-core: 2.0.4(redux@4.2.1) dev: true /dva@2.5.0-beta.2(react-dom@17.0.2)(react@17.0.2): @@ -15856,7 +15856,7 @@ packages: /react-redux@8.0.5(@types/react-dom@16.9.18)(@types/react@16.14.35)(react-dom@17.0.2)(react@17.0.2)(redux@4.2.1): resolution: {integrity: sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw==} peerDependencies: - '@types/react': ^16.8 || ^17.0 || ^18.0 + '@types/react': ^16.0.0 '@types/react-dom': ^16.8 || ^17.0 || ^18.0 react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 diff --git a/src/component/MonacoEditor/index.tsx b/src/component/MonacoEditor/index.tsx index 6c694b968..bc3bbd31c 100644 --- a/src/component/MonacoEditor/index.tsx +++ b/src/component/MonacoEditor/index.tsx @@ -28,6 +28,7 @@ import styles from './index.less'; import * as groovy from './plugins/languageSupport/groovy'; import { apply as markerPluginApply } from './plugins/marker'; import { getModelService } from './plugins/ob-language/service'; +import logger from '@/util/logger'; export interface IEditor extends monaco.editor.IStandaloneCodeEditor { doFormat: () => void; getSelectionContent: () => string; @@ -138,6 +139,7 @@ const MonacoEditor: React.FC = function (props) { ), ); markerPluginApply(editorRef.current.getModel()); + logger.debug('init plugin done') } async function initEditor() { @@ -154,6 +156,10 @@ const MonacoEditor: React.FC = function (props) { readOnly: readOnly, }); await initPlugin(); + editorRef.current.updateOptions({ + readOnly, + theme: themeValue, + }); if (!editorRef.current?.getModel?.()) { return; } diff --git a/src/store/setting.ts b/src/store/setting.ts index 7c25a5c6a..40cf50783 100644 --- a/src/store/setting.ts +++ b/src/store/setting.ts @@ -58,7 +58,7 @@ const themeConfig: { [key: string]: IThemeConfig } = { }, [EThemeConfigKey.ODC_DARK]: { key: 'odc-dark', - editorTheme: 'vs-dark', + editorTheme: 'obdark', className: 'odc-dark', sheetTheme: 'dark', cmdTheme: 'dark', From cbec0b8f37d01186fbd648816e01a27d1329bffb Mon Sep 17 00:00:00 2001 From: xiaokang Date: Wed, 3 Jan 2024 14:13:20 +0800 Subject: [PATCH 5/6] add ellipsis --- src/page/Project/Project/ListItem/index.less | 2 ++ src/page/Project/Project/ListItem/index.tsx | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/page/Project/Project/ListItem/index.less b/src/page/Project/Project/ListItem/index.less index e4435485c..131b89eea 100644 --- a/src/page/Project/Project/ListItem/index.less +++ b/src/page/Project/Project/ListItem/index.less @@ -34,5 +34,7 @@ flex-basis: 20%; min-width: 260px; color: var(--text-color-secondary); + overflow: hidden; + text-overflow: ellipsis; } } diff --git a/src/page/Project/Project/ListItem/index.tsx b/src/page/Project/Project/ListItem/index.tsx index 9f4b695c3..207ef1ac3 100644 --- a/src/page/Project/Project/ListItem/index.tsx +++ b/src/page/Project/Project/ListItem/index.tsx @@ -45,13 +45,11 @@ export default forwardRef(function ListItem(
{data.name}
{data.description || '-'}
- - - {data.members - ?.filter((item) => item.role === ProjectRole.OWNER) - ?.map((a) => a.name) - ?.join(', ') || '-'} - + + {data.members + ?.filter((item) => item.role === ProjectRole.OWNER) + ?.map((a) => a.name) + ?.join(', ') || '-'}
); From 9c38cc8336ba5051f66f8874b24c0053bbad4b0b Mon Sep 17 00:00:00 2001 From: xiaokang Date: Wed, 3 Jan 2024 16:28:47 +0800 Subject: [PATCH 6/6] add year --- .licenserc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index 72fa801fe..e9f635b43 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -2,6 +2,7 @@ header: license: spdx-id: Apache-2.0 copyright-owner: OceanBase + copyright-year: '2023' paths: - 'src/**/*.ts' - 'src/**/*.js'