PullRequest: 848 434bp3

Merge branch 'feat/434bp3 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.4

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


Reviewed-by: 之瑛 <lijunying.ljy@digital-engine.com>


* feat: support enableWorkbench
* feat: support showResultSets in async task
* fix: rename function name
* fix: replace allowShowResultSets name

Author: yezaoshu

config/routes.js

@@ -31,7 +31,7 @@ module.exports = [
                 { path: '/auth/:page', component: '@/page/Auth', spmBPos: 'b64007' },
                 { path: '/secure/:page', component: '@/page/Secure', spmBPos: 'b64008' },
                 { path: '/externalIntegration/:page', component: '@/page/ExternalIntegration', spmBPos: 'b64009' },
-                { path: '/', redirect: '/console'},
+                { path: '/', component: '@/layout/DefaultRedirect'},
               ],
             },
             {

src/component/CommonIDE/index.tsx

@@ -82,7 +82,10 @@ interface ICommonIDEProps {
    */
   bordered?: boolean;
   session?: SessionStore;
-
+  /**
+   * 是否显示运行结果
+   */
+  showLog?: boolean;
   /**
    * 创建后监听事件
    */
@@ -193,16 +196,19 @@ class CommonIDE extends React.PureComponent<ICommonIDEProps, ICommonIDEState> {
                 <Tabs
                   className={styles.tabs}
                   animated={false}
-                  items={[
-                    {
-                      key: ITabType.LOG as string,
-                      label: formatMessage({
-                        id: 'odc.component.CommonIDE.Result',
-                        defaultMessage: '运行结果',
-                      }),
-                      children: log,
-                    },
-                  ]
+                  items={(this.props.showLog
+                    ? [
+                        {
+                          key: ITabType.LOG as string,
+                          label: formatMessage({
+                            id: 'odc.component.CommonIDE.Result',
+                            defaultMessage: '运行结果',
+                          }),
+                          children: log,
+                        },
+                      ]
+                    : []
+                  )
                     .concat(
                       resultSets?.map((set, i) => {
                         return {

src/component/ODCSetting/Item/CheckboxItem.tsx

@@ -0,0 +1,37 @@
+import React, { useState } from 'react';
+import { Checkbox } from 'antd';
+
+interface CheckboxOption {
+  label: string;
+  value: string;
+}
+
+interface CheckboxItemProps {
+  options: CheckboxOption[];
+  value?: string[];
+  onChange?: (value: string[]) => Promise<void>;
+}
+
+export default function CheckboxItem(props: CheckboxItemProps) {
+  const [loading, setLoading] = useState(false);
+
+  const handleChange = async (checkedValues: string[]) => {
+    if (props.onChange) {
+      setLoading(true);
+      try {
+        await props.onChange(checkedValues);
+      } finally {
+        setLoading(false);
+      }
+    }
+  };
+
+  return (
+    <Checkbox.Group
+      options={props.options}
+      value={props.value || []}
+      disabled={loading}
+      onChange={handleChange}
+    />
+  );
+}

src/component/ODCSetting/config/common.tsx

@@ -0,0 +1,71 @@
+import CheckboxItem from '../Item/CheckboxItem';
+import RadioItem from '../Item/RadioItem';
+import { ODCSettingGroup } from '../config';
+import { resultSetsGroup } from '../utils/configHelper';
+
+export const getExecutionStrategyConfig = (taskGroup: ODCSettingGroup) => {
+  return [
+    {
+      label: '数据库变更默认执行方式',
+      key: 'odc.task.databaseChange.executionStrategy',
+      locationKey: 'executionStrategy',
+      group: taskGroup,
+      storeType: 'server' as const,
+      render: (value, onChange) => {
+        return (
+          <RadioItem
+            options={[
+              {
+                label: '立即执行',
+                value: 'AUTO',
+              },
+              {
+                label: '定时执行',
+                value: 'TIMER',
+              },
+              {
+                label: '手动执行',
+                value: 'MANUAL',
+              },
+            ]}
+            value={value}
+            onChange={onChange}
+          />
+        );
+      },
+    },
+  ];
+};
+
+export const getDatabaseChangeResultSetsConfig = (taskGroup: ODCSettingGroup) => {
+  return [
+    {
+      label: '支持查看查询结果',
+      key: 'odc.task.databaseChange.allowShowResultSets',
+      locationKey: 'allowShowResultSets',
+      group: taskGroup,
+      storeType: 'server' as const,
+      hidden: true,
+      render: () => null,
+    },
+    {
+      label: '支持下载查询结果',
+      key: 'odc.task.databaseChange.allowDownloadResultSets',
+      locationKey: 'allowDownloadResultSets',
+      group: taskGroup,
+      storeType: 'server' as const,
+      hidden: true,
+      render: () => null,
+    },
+    {
+      label: '数据库变更查询结果',
+      key: 'databaseChangeResultSets',
+      locationKey: 'databaseChangeResultSets',
+      group: taskGroup,
+      storeType: 'server' as const,
+      render: (value, onChange) => {
+        return <CheckboxItem value={value} options={resultSetsGroup} onChange={onChange} />;
+      },
+    },
+  ];
+};

src/component/ODCSetting/config/group/task.tsx

@@ -17,6 +17,7 @@ import { formatMessage } from '@/util/intl';
 import { IODCSetting, ODCSettingGroup } from '../../config';
 import RadioItem from '../../Item/RadioItem';
 import TextAreaItem from '../../Item/TextItem';
+import { getExecutionStrategyConfig, getDatabaseChangeResultSetsConfig } from '../common';
 
 const taskGroup: ODCSettingGroup = {
   label: formatMessage({
@@ -157,6 +158,8 @@ const taskSetting: IODCSetting[] = [
       );
     },
   },
+  ...getDatabaseChangeResultSetsConfig(taskGroup),
+  ...getExecutionStrategyConfig(taskGroup),
   {
     label: formatMessage({
       id: 'src.component.ODCSetting.config.group.0ACF68C5',

src/component/ODCSetting/config/personal/personalTask.tsx

@@ -16,6 +16,7 @@ import { formatMessage } from '@/util/intl';
  */
 import { IODCSetting, ODCSettingGroup } from '../../config';
 import RadioItem from '../../Item/RadioItem';
+import { getExecutionStrategyConfig, getDatabaseChangeResultSetsConfig } from '../common';
 
 const taskGroup: ODCSettingGroup = {
   label: formatMessage({
@@ -60,6 +61,8 @@ const personalTaskSetting: IODCSetting[] = [
       );
     },
   },
+  ...getDatabaseChangeResultSetsConfig(taskGroup),
+  ...getExecutionStrategyConfig(taskGroup),
 ];
 
 export default personalTaskSetting;

src/component/ODCSetting/index.tsx

@@ -47,6 +47,7 @@ import { inject, observer } from 'mobx-react';
 import styles from './index.less';
 import odc from '@/plugins/odc';
 import login from '@/store/login';
+import { ConfigHelper } from './utils/configHelper';
 
 interface IProps {
   modalStore?: ModalStore;
@@ -289,10 +290,13 @@ const ODCSetting: React.FC<IProps> = ({ modalStore }) => {
       const clientData = safeParseJson(await getODCSetting(), {});
       data = { ...data, ...clientData };
     }
-    formRef.setFieldsValue(data);
+    const transformedData = ConfigHelper.transformLoadData(data);
+    formRef.setFieldsValue(transformedData);
 
     let spaceData = (await setting.getSpaceConfig()) || {};
-    spaceFormRef.setFieldsValue(spaceData);
+
+    const transformedSpaceData = ConfigHelper.transformLoadData(spaceData);
+    spaceFormRef.setFieldsValue(transformedSpaceData);
   }
 
   useEffect(() => {
@@ -313,33 +317,42 @@ const ODCSetting: React.FC<IProps> = ({ modalStore }) => {
     const serverData: Record<string, string> = {},
       localData = {};
     const spaceServerData: Record<string, string> = {};
-    Object.keys(values).forEach((key) => {
+
+    const expandedValues = ConfigHelper.transformSaveData(values);
+    const expandedSpaceValues = ConfigHelper.transformSaveData(spaceValues);
+
+    Object.keys(expandedValues).forEach((key) => {
       const info = odcSettingMap[key];
+      if (!info) return;
+
       switch (info.storeType) {
         case 'server': {
-          serverData[key] = values[key] || '';
+          serverData[key] = expandedValues[key] || '';
           break;
         }
         case 'local': {
-          localData[key] = values[key];
+          localData[key] = expandedValues[key];
           break;
         }
       }
     });
 
-    Object.keys(spaceValues).forEach((key) => {
+    Object.keys(expandedSpaceValues).forEach((key) => {
       const info = odcSettingMap[key];
+      if (!info) return;
+
       switch (info.storeType) {
         case 'server': {
-          spaceServerData[key] = spaceValues[key];
+          spaceServerData[key] = expandedSpaceValues[key];
           break;
         }
         case 'local': {
-          localData[key] = spaceValues[key];
+          localData[key] = expandedSpaceValues[key];
           break;
         }
       }
     });
+
     if (
       serverData['odc.editor.shortcut.executeStatement'] ===
       serverData['odc.editor.shortcut.executeCurrentStatement']

src/component/ODCSetting/utils/configHelper.ts

@@ -0,0 +1,69 @@
+// 聚合配置项定义
+interface AggregateConfig {
+  key: string; // 聚合配置的 key
+  subKeys: string[]; // 包含的子配置项 keys
+}
+
+// 定义聚合配置映射
+const AGGREGATE_CONFIGS: AggregateConfig[] = [
+  {
+    key: 'databaseChangeResultSets',
+    subKeys: [
+      'odc.task.databaseChange.allowShowResultSets',
+      'odc.task.databaseChange.allowDownloadResultSets',
+    ],
+  },
+];
+
+export const resultSetsGroup = [
+  {
+    label: '支持查看查询结果',
+    value: 'odc.task.databaseChange.allowShowResultSets',
+  },
+  {
+    label: '支持下载查询结果',
+    value: 'odc.task.databaseChange.allowDownloadResultSets',
+  },
+];
+
+export class ConfigHelper {
+  /**
+   * 将原始配置数据转换为包含聚合配置的数据
+   */
+  static transformLoadData(rawData: Record<string, any>): Record<string, any> {
+    const transformedData = { ...rawData };
+
+    AGGREGATE_CONFIGS.forEach((config) => {
+      // 将子配置项聚合成数组
+      const aggregateValue = config.subKeys.filter(
+        (subKey) => rawData[subKey] === 'true' || rawData[subKey] === true,
+      );
+      transformedData[config.key] = aggregateValue;
+    });
+
+    return transformedData;
+  }
+
+  /**
+   * 将包含聚合配置的数据展开为原始配置数据
+   */
+  static transformSaveData(formData: Record<string, any>): Record<string, any> {
+    const expandedData = { ...formData };
+
+    AGGREGATE_CONFIGS.forEach((config) => {
+      const aggregateValue = formData[config.key];
+
+      if (Array.isArray(aggregateValue)) {
+        // 展开聚合配置
+        config.subKeys.forEach((subKey) => {
+          expandedData[subKey] = aggregateValue.includes(subKey) ? 'true' : 'false';
+        });
+
+        // 删除聚合配置项
+        delete expandedData[config.key];
+      }
+    });
+
+    return expandedData;
+  }
+}

src/component/ProfileFlow/customComponents/index.less

@@ -3,11 +3,11 @@
 .customDetailBox {
   position: absolute;
   right: 16px;
-  width: 336px;
+  width: 360px;
   background-color: var(--profile-secondry-background-color);
   border: 1px solid var(--profile-border-color);
   border-left: none;
-  height: calc(100% - 151px);
+  height: calc(100% - 175px);
   overflow-y: auto;
   padding: 12px 8px;
   .value {

src/component/Task/AsyncTask/CreateModal/index.tsx

@@ -483,6 +483,7 @@ const CreateModal: React.FC<IProps> = (props) => {
       queryLimit: Number(setting.getSpaceConfigByKey('odc.sqlexecute.default.queryLimit')),
       generateRollbackPlan:
         setting.getSpaceConfigByKey('odc.task.default.rollbackPlanEnabled') === 'true',
+      executionStrategy: setting.getSpaceConfigByKey('odc.task.databaseChange.executionStrategy'),
     };
     form.setFieldsValue(initialFormData);
   };
@@ -562,7 +563,6 @@ const CreateModal: React.FC<IProps> = (props) => {
       <Form
         name="basic"
         initialValues={{
-          executionStrategy: TaskExecStrategy.MANUAL,
           databaseId: asyncTaskData?.databaseId,
           retryTimes: 0,
         }}