Copyright OceanBase

package.json

@@ -72,8 +72,8 @@
   "devDependencies": {
     "@ant-design/icons": "^4.0.0",
     "@oceanbase-odc/monaco-plugin-ob": "^0.2.2",
-    "@oceanbase-odc/ob-intl-cli": "^2.0.4",
-    "@oceanbase-odc/ob-parser-js": "^3.0.1",
+    "@oceanbase-odc/ob-intl-cli": "^2.0.6",
+    "@oceanbase-odc/ob-parser-js": "^3.0.2",
     "@oceanbase-odc/ob-react-data-grid": "^3.0.10",
     "@sentry/react": "^7.88.0",
     "@svgr/webpack": "^6.5.1",

src/common/datasource/doris/index.tsx

@@ -70,7 +70,6 @@ const items: Record<ConnectType.DORIS, IDataSourceModeConfig> = {
       task: [
         TaskType.ASYNC,
         TaskType.SQL_PLAN,
-        TaskType.DATA_DELETE,
         TaskType.IMPORT,
         TaskType.EXPORT,
         TaskType.EXPORT_RESULT_SET,
@@ -93,6 +92,7 @@ const items: Record<ConnectType.DORIS, IDataSourceModeConfig> = {
     sql: {
       language: 'mysql',
       escapeChar: '`',
+      caseSensitivity: true,
     },
   },
 };

src/common/datasource/interface.ts

@@ -132,6 +132,7 @@ export interface IDataSourceModeConfig {
     plEdit?: boolean;
     anonymousBlock?: boolean;
     supportOBProxy?: boolean;
+    disableTriggerSwitch?: boolean;
     plRun?: boolean;
     export: {
       fileLimit: boolean;

src/common/datasource/oracle/index.tsx

@@ -75,6 +75,7 @@ const items: Record<ConnectType.ORACLE, IDataSourceModeConfig> = {
       recycleBin: false,
       sqlExplain: false,
       sessionManage: true,
+      disableTriggerSwitch: true,
       compile: false,
       plEdit: true,
       anonymousBlock: true,

src/common/network/projectNotification.ts

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { IResponseData } from '@/d.ts';
 import {
   IChannel,

src/common/network/sql/executeSQL.tsx

@@ -35,6 +35,7 @@ export interface IExecuteSQLParams {
    * 是否拆分执行，传空的话像等于true
    */
   split?: boolean;
+  addROWID?: boolean;
 }
 export interface ISQLExecuteTaskSQL {
   sqlTuple: {

src/common/network/task.ts

@@ -142,7 +142,7 @@ export async function getTaskList<T>(params: {
   sort?: string;
   page?: number;
   size?: number;
-}): Promise<IResponseData<TaskRecord<TaskRecordParameters>>> {
+}): Promise<IResponseData<TaskRecord<T>>> {
   const res = await request.get('/api/v2/flow/flowInstances/', {
     params,
   });

src/component/CommonTable/index.less

@@ -77,7 +77,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding-bottom: 16px;
+  padding-bottom: 8px;
   .titleContent {
     font-size: 16px;
     .desc {

src/component/CommonTable/index.tsx

@@ -487,7 +487,7 @@ const CommonTable: <RecordType extends object = any>(
             }}
             scroll={{
               x: scroll?.x ?? DEFAULT_MIN_TABLE_WIDTH,
-              y: wrapperValidHeight,
+              y: scroll?.y ?? wrapperValidHeight,
             }}
           />
         </Spin>

src/component/Crontab/index.less

@@ -7,9 +7,15 @@
   }
   .content {
     width: 100%;
+    display: grid;
+    grid-gap: 8px;
     &.default-mode {
       padding: 8px;
       background: var(--background-tertraiy-color);
+      grid-template-columns: 120px 210px 1fr;
+      &.daily {
+        grid-template-columns: 120px 1fr;
+      }
     }
   }
   .custom-editor {

src/component/Crontab/index.tsx

@@ -191,11 +191,11 @@ const Crontab = (props, ref) => {
           />
         </Space>
       </div>
-      <Space
+      <div
         className={classnames(styles.content, {
           [styles['default-mode']]: mode !== CrontabMode.custom,
+          [styles.daily]: dateType === CrontabDateType.daily,
         })}
-        direction={mode === CrontabMode.custom ? 'vertical' : 'horizontal'}
       >
         {mode === CrontabMode.custom ? (
           <>
@@ -215,19 +215,13 @@ const Crontab = (props, ref) => {
           </>
         ) : (
           <>
-            <Select
-              value={dateType}
-              style={{ width: 120 }}
-              options={dateOptions}
-              onChange={handleDateTypeChange}
-            />
+            <Select value={dateType} options={dateOptions} onChange={handleDateTypeChange} />
 
             {dateType === CrontabDateType.weekly && (
               <Select
                 mode="multiple"
                 maxTagCount={2}
                 value={dayOfWeek}
-                style={{ width: 210 }}
                 options={weekOptions}
                 onChange={(value) => {
                   handleValueChange({
@@ -243,7 +237,6 @@ const Crontab = (props, ref) => {
                 mode="multiple"
                 maxTagCount={3}
                 value={dayOfMonth}
-                style={{ width: 210 }}
                 options={dayOptions}
                 onChange={(value) => {
                   handleValueChange({
@@ -258,7 +251,6 @@ const Crontab = (props, ref) => {
               mode="multiple"
               maxTagCount={3}
               value={hour}
-              style={{ width: 310 }}
               options={hourOptions}
               onChange={(value) => {
                 handleValueChange({
@@ -269,7 +261,7 @@ const Crontab = (props, ref) => {
             />
           </>
         )}
-      </Space>
+      </div>
       <Collapse
         bordered={false}
         expandIconPosition="end"

src/component/EditorToolBar/actions/pl.tsx

@@ -26,7 +26,7 @@ import {
 } from '@ant-design/icons';
 
 import { IConStatus } from '@/component/Toolbar/statefulIcon';
-import plType from '@/constant/plType';
+import plType, { PLType } from '@/constant/plType';
 import { PLPage } from '@/page/Workspace/components/PLPage';
 import { DebugStatus } from '@/store/debug/type';
 import sqlStore from '@/store/sql';
@@ -196,10 +196,14 @@ const plActions: ToolBarActions = {
       return IConStatus.INIT;
     },
     isVisible(ctx: PLPage) {
-      if (!getDataSourceModeConfig(ctx.getSession()?.connection?.type)?.features?.plRun) {
+      const plSchema = ctx.getFormatPLSchema();
+      const isAnonymous = plSchema.plType === PLType.ANONYMOUSBLOCK;
+      if (
+        !getDataSourceModeConfig(ctx.getSession()?.connection?.type)?.features?.plRun &&
+        !isAnonymous
+      ) {
         return false;
       }
-      const plSchema = ctx.getFormatPLSchema();
       return plSchema.plType != plType.PKG_HEAD && plSchema.plType != plType.PKG_BODY;
     },
     async action(ctx: PLPage) {

src/component/ErrorBoundary/index.tsx

@@ -48,7 +48,9 @@ export default class ErrorBoundary extends React.Component {
     });
   }
   public render() {
-    const isChunkError = this.state.errorStack?.toString().includes('ChunkLoadError');
+    const isChunkError =
+      this.state.errorStack?.toString().includes('ChunkLoadError') ||
+      this.state.errorStack?.toString().includes('Loading CSS chunk');
     if (isChunkError) {
       return (
         <Result

src/component/Input/Case/index.tsx

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { removeTableQuote } from '@/util/sql';
 import { getQuoteTableName } from '@/util/utils';
 import { Input, InputProps } from 'antd';

src/component/Input/Keymap/index.tsx

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { useControllableValue } from 'ahooks';
 import { Select, Tag } from 'antd';
 import React, { useMemo } from 'react';

src/component/Input/Keymap/keycodemap.ts

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2023 OceanBase
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { isMac } from '@/util/env';
 import { KeyCode, KeyMod } from 'monaco-editor';
 

src/component/Log/index.tsx

@@ -15,7 +15,7 @@
  */
 
 import { formatMessage } from '@/util/intl';
-import { getPrefixCls } from '@/util/utils';
+import { getPrefixCls, downloadFile } from '@/util/utils';
 import {
   CopyOutlined,
   DownloadOutlined,
@@ -55,6 +55,7 @@ const Log: React.FC<LogProps> = ({
   enableCopy = true,
   enableHighLight = false,
   language,
+  downloadUrl,
 }) => {
   /** 关键字 */
   const [keyword, setkeyword] = useState('');
@@ -94,7 +95,11 @@ const Log: React.FC<LogProps> = ({
       icon: <DownloadOutlined />,
       text: formatMessage({ id: 'odc.component.Log.Download' }), //下载
       visible: enableDownload,
-      onClick: () => (logData.data.length ? download(logData.data) : noop),
+      onClick: () => {
+        if (logData.data.length) {
+          downloadUrl ? downloadFile(downloadUrl) : download(logData.data);
+        }
+      },
     },
 
     {

src/component/Log/typings.ts

@@ -122,6 +122,7 @@ export interface LogProps {
    * @description 指定日志语言类型，详见：Highlight组件语言支持情况
    */
   language?: string;
+  downloadUrl?: string;
 }
 
 // eslint-disable-next-line

src/component/Login/LoginForm.tsx

@@ -43,6 +43,7 @@ export interface ILoginFormProps extends FormProps {
   showAuthCode?: boolean;
   showOtherLoginButton?: boolean;
   ssoLoginType?: ESSOLgoinType;
+  ssoLoginName?: string;
   authCodeImg?: string;
   otherLoginProps?: any;
   switchSSOLoginType?: () => void;
@@ -56,6 +57,7 @@ const Login: React.FC<ILoginFormProps> = ({
   showAuthCode,
   showOtherLoginButton,
   ssoLoginType,
+  ssoLoginName,
   authCodeImg,
   otherLoginProps,
   onAuthCodeImgChange,
@@ -186,7 +188,6 @@ const Login: React.FC<ILoginFormProps> = ({
           <Button
             htmlType="button"
             loading={otherLoginProps.loading}
-            type="primary"
             style={{ marginTop: 0 }}
             block={true}
             onClick={
@@ -196,12 +197,10 @@ const Login: React.FC<ILoginFormProps> = ({
                   }
                 : otherLoginProps.onFinish
             }
-            className={classNames(`${prefix}-submit-btn`, {
-              [`${prefix}-submit-ldap-btn`]: ssoLoginType === ESSOLgoinType.LDAP,
-            })}
+            className={classNames(`${prefix}-submit-btn`, `${prefix}-submit-ldap-btn`)}
           >
             {
-              setting.serverSystemInfo?.ssoLoginType ||
+              ssoLoginName ||
                 formatMessage({
                   id: 'odc.component.Login.LoginForm.ThirdPartyLogin',
                 }) /*第三方登录*/

src/component/Login/index.tsx

@@ -79,6 +79,7 @@ export interface LoginProps extends FormProps {
   showAuthCode?: boolean;
   showOtherLoginButton?: boolean;
   ssoLoginType?: ESSOLgoinType;
+  ssoLoginName?: string;
   authCodeImg?: string;
   onShowRegisterChange?: (isShow: boolean) => void;
   onShowActivateChange?: (isShow: boolean) => void;
@@ -103,6 +104,7 @@ const Login: React.FC<LoginProps> = (props) => {
     showAuthCode,
     showOtherLoginButton,
     ssoLoginType,
+    ssoLoginName,
     authCodeImg,
     onAuthCodeImgChange,
     style = {},
@@ -206,7 +208,7 @@ const Login: React.FC<LoginProps> = (props) => {
                   />
                 </>
               ) : isLDAPLogin ? (
-                <LDAPLogin switchSSOLoginType={switchSSOLoginType} />
+                <LDAPLogin ssoLoginName={ssoLoginName} switchSSOLoginType={switchSSOLoginType} />
               ) : (
                 <>
                   <img src={logo} alt="" className={`${prefix}-logo`} />
@@ -215,6 +217,7 @@ const Login: React.FC<LoginProps> = (props) => {
                     otherLoginProps={otherLoginProps}
                     locale={locale}
                     ssoLoginType={ssoLoginType}
+                    ssoLoginName={ssoLoginName}
                     switchSSOLoginType={switchSSOLoginType}
                     errorMessage={alertProps?.message}
                     showAuthCode={showAuthCode}

src/component/Manage/ResourceSelector/index.less

@@ -6,11 +6,6 @@
 
 .connectionPopover {
   padding: 0;
-  :global {
-    .ant-popover-inner-content {
-      padding: 0;
-    }
-  }
 }
 
 .labelName {