Merge branch 'dev-4.2.3'

Author: HSunboy

.licenserc.yaml

@@ -2,6 +2,7 @@ header:
   license:
     spdx-id: Apache-2.0
     copyright-owner: OceanBase
+    copyright-year: '2023'
   paths:
     - 'src/**/*.ts'
     - 'src/**/*.js'

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",

pnpm-lock.yaml

@@ -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<IProps> = function (props) {
       ),
     );
     markerPluginApply(editorRef.current.getModel());
+    logger.debug('init plugin done')
   }
 
   async function initEditor() {
@@ -154,6 +156,10 @@ const MonacoEditor: React.FC<IProps> = function (props) {
       readOnly: readOnly,
     });
     await initPlugin();
+    editorRef.current.updateOptions({
+      readOnly,
+      theme: themeValue,
+    });
     if (!editorRef.current?.getModel?.()) {
       return;
     }

src/component/MonacoEditor/index.tsx

@@ -120,7 +120,7 @@ export default function SelectTransfer(props: IProps) {
           />
         </Card>
       </div>
-      <div style={{ width: '100%', height: '100%' }}>
+      <div style={{ width: '50%', height: '100%' }}>
         <Card
           title={
             formatMessage(
@@ -155,6 +155,7 @@ export default function SelectTransfer(props: IProps) {
                       overflow: 'hidden',
                       whiteSpace: 'nowrap',
                       textOverflow: 'ellipsis',
+                      wordBreak: "break-all"
                     }}
                     title={node.title}
                   >

src/component/SelectTransfer/index.tsx

@@ -34,5 +34,7 @@
     flex-basis: 20%;
     min-width: 260px;
     color: var(--text-color-secondary);
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 }

src/page/Project/Project/ListItem/index.less

@@ -45,13 +45,11 @@ export default forwardRef(function ListItem(
       <div className={classNames(styles.block, styles.name)}>{data.name}</div>
       <div className={classNames(styles.block, styles.desc)}>{data.description || '-'}</div>
       <div className={classNames(styles.block, styles.users)}>
-        <Space>
-          <Icon style={{ color: 'var(--icon-color-disable)' }} component={UserSvg} />
-          {data.members
-            ?.filter((item) => item.role === ProjectRole.OWNER)
-            ?.map((a) => a.name)
-            ?.join(', ') || '-'}
-        </Space>
+        <Icon style={{ color: 'var(--icon-color-disable)', marginRight: 5 }} component={UserSvg} />
+        {data.members
+          ?.filter((item) => item.role === ProjectRole.OWNER)
+          ?.map((a) => a.name)
+          ?.join(', ') || '-'}
       </div>
     </div>
   );

src/page/Project/Project/ListItem/index.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),
         ),
       );

src/page/Secure/Env/components/EnvironmentTable.tsx

@@ -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',

src/store/setting.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;
             }