diff --git a/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx b/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx
index 687ef4ff1..ff5609fad 100644
--- a/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx
+++ b/src/component/Task/DataArchiveTask/CreateModal/VariableConfig.tsx
@@ -25,9 +25,13 @@ import styles from './index.less';
 
 export const timeUnitOptions = [
   {
-    label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Points' }), //分
+    label: '秒',
     value: 's',
   },
+  {
+    label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Points' }), //分
+    value: 'm',
+  },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Hours' }), //小时
     value: 'h',
@@ -42,7 +46,7 @@ export const timeUnitOptions = [
   },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Month' }), //月
-    value: 'm',
+    value: 'M',
   },
   {
     label: formatMessage({ id: 'odc.DataArchiveTask.CreateModal.VariableConfig.Year' }), //年
@@ -51,7 +55,7 @@ export const timeUnitOptions = [
 ];
 
 const ENABLE_PATTERN_OPERATOR = false;
-const timeFormatOptions = ['yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
+const timeFormatOptions = ['yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
   label: item,
   value: item,
 }));
@@ -62,150 +66,146 @@ interface IProps {
 
 const VariableConfig: React.FC<IProps> = (props) => {
   const variables = Form.useWatch('variables', props.form);
-  
+
   return (
-      <Space direction="vertical" style={{ width: '100%'}}>
-        <Space>
-          自定义变量
-          <span className={styles.desc}>
-            <HelpDoc leftText isTip doc="dataArchiveVariablesDoc">
-              {
-                formatMessage({
-                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.VariablesCanBeReferencedIn.1',
-                }) /*变量可在归档配置的过滤条件中引用 (可选)*/
-              }
+    <Space direction="vertical" style={{ width: '100%' }}>
+      <Space>
+        自定义变量
+        <span className={styles.desc}>
+          <HelpDoc leftText isTip doc="dataArchiveVariablesDoc">
+            {
+              formatMessage({
+                id: 'odc.DataArchiveTask.CreateModal.VariableConfig.VariablesCanBeReferencedIn.1',
+              }) /*变量可在归档配置的过滤条件中引用 (可选)*/
+            }
+          </HelpDoc>
+        </span>
+      </Space>
+      {!!variables?.length && (
+        <Space style={{ width: '100%' }}>
+          <div style={{ width: '194px' }}>
+            {
+              formatMessage({
+                id: 'odc.DataArchiveTask.CreateModal.VariableConfig.VariableName',
+              }) /*变量名*/
+            }
+          </div>
+          <div style={{ width: '170px' }}>
+            {
+              formatMessage({
+                id: 'odc.DataArchiveTask.CreateModal.VariableConfig.TimeFormat',
+              }) /*时间格式*/
+            }
+          </div>
+          <div style={{ width: '305px' }}>
+            <HelpDoc leftText isTip doc="dataArchiveTimeDoc">
+              时间偏移
             </HelpDoc>
-          </span>
+          </div>
         </Space>
-        {
-          !!variables?.length &&
-          <Space style={{ width: '100%'}}>
-            <div style={{ width: '194px' }}>
-              {
-                formatMessage({
-                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.VariableName',
-                }) /*变量名*/
-              }
-            </div>
-            <div style={{ width: '170px' }}>
-              {
-                formatMessage({
-                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.TimeFormat',
-                }) /*时间格式*/
-              }
-            </div>
-            <div style={{ width: '305px' }}>
-              <HelpDoc leftText isTip doc="dataArchiveTimeDoc">
-                时间偏移
-              </HelpDoc>
-            </div>
-          </Space>
-        }
-        <Form.List name="variables">
-          {(fields, { add, remove }) => (
-            <div className={styles.infoBlock}>
-              {fields.map(({ key, name, ...restField }) => (
-                <div
-                  key={key}
-                  className={classNames(styles.variables, {
-                    [styles.delete]: true,
-                  })}
+      )}
+      <Form.List name="variables">
+        {(fields, { add, remove }) => (
+          <div className={styles.infoBlock}>
+            {fields.map(({ key, name, ...restField }) => (
+              <div
+                key={key}
+                className={classNames(styles.variables, {
+                  [styles.delete]: true,
+                })}
+              >
+                <Form.Item {...restField} name={[name, 'name']}>
+                  <Input
+                    placeholder={formatMessage({
+                      id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseEnter',
+                    })} /*请输入*/
+                  />
+                </Form.Item>
+                <Form.Item {...restField} name={[name, 'format']}>
+                  <Select
+                    placeholder={formatMessage({
+                      id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
+                    })}
+                    /*请选择*/ options={timeFormatOptions}
+                  />
+                </Form.Item>
+                <Form.List name={[name, 'pattern']}>
+                  {(subFields, { add: _add, remove: _remove }) => {
+                    const disabledAdd = subFields.length >= 3;
+                    return (
+                      <div className={styles.infoBlock}>
+                        {subFields.map(({ key, name, ...restField }) => (
+                          <div className={styles.pattern}>
+                            <Form.Item {...restField} name={[name, 'operator']}>
+                              <Select
+                                placeholder={formatMessage({
+                                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
+                                })} /*请选择*/
+                                options={operatorOptions}
+                              />
+                            </Form.Item>
+                            <Form.Item {...restField} name={[name, 'step']}>
+                              <InputNumber
+                                placeholder={formatMessage({
+                                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseEnter',
+                                })}
+                                /*请输入*/ min={1}
+                              />
+                            </Form.Item>
+                            <Form.Item {...restField} name={[name, 'unit']}>
+                              <Select
+                                placeholder={formatMessage({
+                                  id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
+                                })} /*请选择*/
+                                options={timeUnitOptions}
+                              />
+                            </Form.Item>
+                            {ENABLE_PATTERN_OPERATOR && (
+                              <>
+                                <Tooltip title="添加时间偏移">
+                                  <Button type="text" disabled={disabledAdd}>
+                                    <PlusOutlined onClick={() => _add()} />
+                                  </Button>
+                                </Tooltip>
+                                <Tooltip title="删除时间偏移">
+                                  <Button type="text">
+                                    <MinusOutlined
+                                      onClick={() => {
+                                        if (subFields?.length > 1) _remove(name);
+                                      }}
+                                    />
+                                  </Button>
+                                </Tooltip>
+                              </>
+                            )}
+                          </div>
+                        ))}
+                      </div>
+                    );
+                  }}
+                </Form.List>
+                <Tooltip
+                  title={formatMessage({
+                    id: 'odc.DataArchiveTask.CreateModal.VariableConfig.DeleteAVariable',
+                  })} /*删除变量*/
                 >
-                  <Form.Item {...restField} name={[name, 'name']}>
-                    <Input
-                      placeholder={formatMessage({
-                        id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseEnter',
-                      })} /*请输入*/
-                    />
-                  </Form.Item>
-                  <Form.Item {...restField} name={[name, 'format']}>
-                    <Select
-                      placeholder={formatMessage({
-                        id: 'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
-                      })}
-                      /*请选择*/ options={timeFormatOptions}
-                    />
-                  </Form.Item>
-                  <Form.List name={[name, 'pattern']}>
-                    {(subFields, { add: _add, remove: _remove }) => {
-                      const disabledAdd = subFields.length >= 3;
-                      return (
-                        <div className={styles.infoBlock}>
-                          {subFields.map(({ key, name, ...restField }) => (
-                            <div className={styles.pattern}>
-                              <Form.Item {...restField} name={[name, 'operator']}>
-                                <Select
-                                  placeholder={formatMessage({
-                                    id:
-                                      'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
-                                  })} /*请选择*/
-                                  options={operatorOptions}
-                                />
-                              </Form.Item>
-                              <Form.Item {...restField} name={[name, 'step']}>
-                                <InputNumber
-                                  placeholder={formatMessage({
-                                    id:
-                                      'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseEnter',
-                                  })}
-                                  /*请输入*/ min={1}
-                                />
-                              </Form.Item>
-                              <Form.Item {...restField} name={[name, 'unit']}>
-                                <Select
-                                  placeholder={formatMessage({
-                                    id:
-                                      'odc.DataArchiveTask.CreateModal.VariableConfig.PleaseSelect',
-                                  })} /*请选择*/
-                                  options={timeUnitOptions}
-                                />
-                              </Form.Item>
-                              {ENABLE_PATTERN_OPERATOR && (
-                                <>
-                                  <Tooltip title='添加时间偏移'>
-                                    <Button type="text" disabled={disabledAdd}>
-                                      <PlusOutlined onClick={() => _add()} />
-                                    </Button>
-                                  </Tooltip>
-                                  <Tooltip title='删除时间偏移'>
-                                    <Button type="text">
-                                      <MinusOutlined
-                                        onClick={() => {
-                                          if (subFields?.length > 1) _remove(name);
-                                        }}
-                                      />
-                                    </Button>
-                                  </Tooltip>
-                                </>
-                              )}
-                            </div>
-                          ))}
-                        </div>
-                      );
-                    }}
-                  </Form.List>
-                  <Tooltip
-                    title={formatMessage({
-                      id: 'odc.DataArchiveTask.CreateModal.VariableConfig.DeleteAVariable',
-                    })} /*删除变量*/
-                  >
-                    <DeleteOutlined onClick={() => remove(name)} />
-                  </Tooltip>
-                </div>
-              ))}
-              <Form.Item style={{ width: '100%' }}>
-                <Button type="dashed" onClick={() => add(variable)} block icon={<PlusOutlined />}>
-                  {
-                    formatMessage({
-                      id: 'odc.DataArchiveTask.CreateModal.VariableConfig.AddVariables',
-                    }) /*添加变量*/
-                  }
-                </Button>
-              </Form.Item>
-            </div>
-          )}
-        </Form.List>
-      </Space>
+                  <DeleteOutlined onClick={() => remove(name)} />
+                </Tooltip>
+              </div>
+            ))}
+            <Form.Item style={{ width: '100%' }}>
+              <Button type="dashed" onClick={() => add(variable)} block icon={<PlusOutlined />}>
+                {
+                  formatMessage({
+                    id: 'odc.DataArchiveTask.CreateModal.VariableConfig.AddVariables',
+                  }) /*添加变量*/
+                }
+              </Button>
+            </Form.Item>
+          </div>
+        )}
+      </Form.List>
+    </Space>
   );
 };
 
diff --git a/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx b/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx
index 38c20f4a4..b0cbea96f 100644
--- a/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx
+++ b/src/component/Task/DataClearTask/CreateModal/VariableConfig.tsx
@@ -22,9 +22,10 @@ import type { FormInstance } from 'antd';
 import classNames from 'classnames';
 import { variable } from './index';
 import styles from './index.less';
+import { timeUnitOptions } from '../../DataArchiveTask/CreateModal/VariableConfig';
 const ENABLE_PATTERN_OPERATOR = false;
 
-const timeFormatOptions = ['yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
+const timeFormatOptions = ['yyyy-MM-dd HH:mm:ss', 'yyyy-MM-dd', 'yyyyMMdd'].map((item) => ({
   label: item,
   value: item,
 }));
@@ -32,76 +33,32 @@ const operatorOptions = ['+', '-'].map((item) => ({
   label: item,
   value: item,
 }));
-const timeUnitOptions = [
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Points',
-    }),
-    //分
-    value: 's',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Hours',
-    }),
-    //小时
-    value: 'h',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Day',
-    }),
-    //日
-    value: 'd',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Zhou',
-    }),
-    //周
-    value: 'w',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Month',
-    }),
-    //月
-    value: 'm',
-  },
-  {
-    label: formatMessage({
-      id: 'odc.DataClearTask.CreateModal.VariableConfig.Year',
-    }),
-    //年
-    value: 'y',
-  },
-];
 interface IProps {
   form: FormInstance;
 }
+
+interface IProps {}
 const VariableConfig: React.FC<IProps> = (props) => {
-  
   const variables = Form.useWatch('variables', props.form);
 
   return (
-      <Space direction="vertical" style={{ width: '100%'}}>
+    <Space direction="vertical" style={{ width: '100%' }}>
       <Space>
         自定义变量
-          <span className={styles.desc}>
-            <HelpDoc leftText isTip doc="dataClearVariablesDoc">
-              {
-                formatMessage({
-                  id: 'odc.src.component.Task.DataClearTask.CreateModal.VariablesCanBeReferencedIn',
-                }) /* 
+        <span className={styles.desc}>
+          <HelpDoc leftText isTip doc="dataClearVariablesDoc">
+            {
+              formatMessage({
+                id: 'odc.src.component.Task.DataClearTask.CreateModal.VariablesCanBeReferencedIn',
+              }) /* 
               变量可在清理范围的清理条件中引用 (可选)
              */
-              }
-            </HelpDoc>
-          </span>
-        </Space>
-        {
-          !!variables?.length &&
-          <Space className={styles.infoLabel}>
+            }
+          </HelpDoc>
+        </span>
+      </Space>
+      {!!variables?.length && (
+        <Space className={styles.infoLabel}>
           <div
             style={{
               width: '194px',
@@ -134,113 +91,111 @@ const VariableConfig: React.FC<IProps> = (props) => {
             </HelpDoc>
           </div>
         </Space>
-        }
-        <Form.List name="variables">
-          {(fields, { add, remove }) => (
-            <div className={styles.infoBlock}>
-              {fields.map(({ key, name, ...restField }) => (
-                <div
-                  key={key}
-                  className={classNames(styles.variables, {
-                    [styles.delete]: true,
-                  })}
-                >
-                  <Form.Item
-                    {...restField}
-                    style={{
-                      width: '194px',
-                    }}
-                    name={[name, 'name']}
-                  >
-                    <Input
-                      placeholder={formatMessage({
-                        id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseEnter',
-                      })} /*请输入*/
-                    />
-                  </Form.Item>
-                  <Form.Item
-                    {...restField}
-                    style={{
-                      width: '170px',
-                    }}
-                    name={[name, 'format']}
-                  >
-                    <Select
-                      placeholder={formatMessage({
-                        id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
-                      })}
-                      /*请选择*/ options={timeFormatOptions}
-                    />
-                  </Form.Item>
-                  <Form.List name={[name, 'pattern']}>
-                    {(subFields, { add: _add, remove: _remove }) => {
-                      const disabledAdd = subFields.length >= 3;
-                      return (
-                        <div className={styles.infoBlock}>
-                          {subFields.map(({ key, name, ...restField }) => (
-                            <div className={styles.pattern}>
-                              <Form.Item {...restField} name={[name, 'operator']}>
-                                <Select
-                                  placeholder={formatMessage({
-                                    id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
-                                  })}
-                                  /*请选择*/ options={operatorOptions}
-                                />
-                              </Form.Item>
-                              <Form.Item {...restField} name={[name, 'step']}>
-                                <InputNumber
-                                  placeholder={formatMessage({
-                                    id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseEnter',
-                                  })}
-                                  /*请输入*/ min={1}
-                                />
-                              </Form.Item>
-                              <Form.Item {...restField} name={[name, 'unit']}>
-                                <Select
-                                  placeholder={formatMessage({
-                                    id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
-                                  })}
-                                  /*请选择*/ options={timeUnitOptions}
-                                />
-                              </Form.Item>
-                              {ENABLE_PATTERN_OPERATOR && (
-                                <>
-                                  <Button type="text" disabled={disabledAdd}>
-                                    <PlusOutlined onClick={() => _add()} />
-                                  </Button>
-                                  <Button type="text">
-                                    <MinusOutlined
-                                      onClick={() => {
-                                        if (subFields?.length > 1) _remove(name);
-                                      }}
-                                    />
-                                  </Button>
-                                </>
-                              )}
-                            </div>
-                          ))}
-                        </div>
-                      );
-                    }}
-                  </Form.List>
-                  <DeleteOutlined onClick={() => remove(name)} />
-                </div>
-              ))}
-              <Form.Item
-                style={{ width: '100%' }}
+      )}
+      <Form.List name="variables">
+        {(fields, { add, remove }) => (
+          <div className={styles.infoBlock}>
+            {fields.map(({ key, name, ...restField }) => (
+              <div
+                key={key}
+                className={classNames(styles.variables, {
+                  [styles.delete]: true,
+                })}
               >
-                <Button type="dashed" onClick={() => add(variable)} block icon={<PlusOutlined />}>
-                  {
-                    formatMessage({
-                      id: 'odc.DataClearTask.CreateModal.VariableConfig.AddVariables',
-                    }) /*添加变量*/
-                  }
-                </Button>
-              </Form.Item>
-            </div>
-          )}
-        </Form.List>
-      </Space>
+                <Form.Item
+                  {...restField}
+                  style={{
+                    width: '194px',
+                  }}
+                  name={[name, 'name']}
+                >
+                  <Input
+                    placeholder={formatMessage({
+                      id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseEnter',
+                    })} /*请输入*/
+                  />
+                </Form.Item>
+                <Form.Item
+                  {...restField}
+                  style={{
+                    width: '170px',
+                  }}
+                  name={[name, 'format']}
+                >
+                  <Select
+                    placeholder={formatMessage({
+                      id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
+                    })}
+                    /*请选择*/ options={timeFormatOptions}
+                  />
+                </Form.Item>
+                <Form.List name={[name, 'pattern']}>
+                  {(subFields, { add: _add, remove: _remove }) => {
+                    const disabledAdd = subFields.length >= 3;
+                    return (
+                      <div className={styles.infoBlock}>
+                        {subFields.map(({ key, name, ...restField }) => (
+                          <div className={styles.pattern}>
+                            <Form.Item {...restField} name={[name, 'operator']}>
+                              <Select
+                                placeholder={formatMessage({
+                                  id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
+                                })}
+                                /*请选择*/ options={operatorOptions}
+                              />
+                            </Form.Item>
+                            <Form.Item {...restField} name={[name, 'step']}>
+                              <InputNumber
+                                placeholder={formatMessage({
+                                  id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseEnter',
+                                })}
+                                /*请输入*/ min={1}
+                              />
+                            </Form.Item>
+                            <Form.Item {...restField} name={[name, 'unit']}>
+                              <Select
+                                placeholder={formatMessage({
+                                  id: 'odc.DataClearTask.CreateModal.VariableConfig.PleaseSelect',
+                                })}
+                                /*请选择*/ options={timeUnitOptions}
+                              />
+                            </Form.Item>
+                            {ENABLE_PATTERN_OPERATOR && (
+                              <>
+                                <Button type="text" disabled={disabledAdd}>
+                                  <PlusOutlined onClick={() => _add()} />
+                                </Button>
+                                <Button type="text">
+                                  <MinusOutlined
+                                    onClick={() => {
+                                      if (subFields?.length > 1) _remove(name);
+                                    }}
+                                  />
+                                </Button>
+                              </>
+                            )}
+                          </div>
+                        ))}
+                      </div>
+                    );
+                  }}
+                </Form.List>
+                <DeleteOutlined onClick={() => remove(name)} />
+              </div>
+            ))}
+            <Form.Item style={{ width: '100%' }}>
+              <Button type="dashed" onClick={() => add(variable)} block icon={<PlusOutlined />}>
+                {
+                  formatMessage({
+                    id: 'odc.DataClearTask.CreateModal.VariableConfig.AddVariables',
+                  }) /*添加变量*/
+                }
+              </Button>
+            </Form.Item>
+          </div>
+        )}
+      </Form.List>
+    </Space>
   );
 };
 export default VariableConfig;
diff --git a/src/component/Task/component/VariableConfigTable/index.tsx b/src/component/Task/component/VariableConfigTable/index.tsx
index edae9e701..a0828ba8c 100644
--- a/src/component/Task/component/VariableConfigTable/index.tsx
+++ b/src/component/Task/component/VariableConfigTable/index.tsx
@@ -19,7 +19,7 @@ import { timeUnitOptions } from '@/component/Task/DataArchiveTask/CreateModal/Va
 import { formatMessage } from '@/util/intl';
 import React from 'react';
 
-const oprationReg = /^[-+]\d+[shdwmy]$/;
+const oprationReg = /^[-+]\d+[shdwmMy]$/;
 
 const columns = [
   {
diff --git a/src/page/Auth/Role/component/FormModal/index.tsx b/src/page/Auth/Role/component/FormModal/index.tsx
index 3b9cf11e3..5286fc026 100644
--- a/src/page/Auth/Role/component/FormModal/index.tsx
+++ b/src/page/Auth/Role/component/FormModal/index.tsx
@@ -24,6 +24,7 @@ import { Button, Drawer, message, Modal, Radio, Space } from 'antd';
 import type { FormInstance } from 'antd/lib/form';
 import { isNull, set } from 'lodash';
 import React, { useContext, useEffect, useRef, useState } from 'react';
+import odc from '@/plugins/odc';
 import { ResourceContext } from '../../../context';
 import { resourceManagementActionMap } from '../../../utils';
 import { SystemAction, systemActionMap } from '../ResourceSelector/const';
@@ -330,13 +331,17 @@ const FormModal: React.FC<IProps> = (props) => {
           systemActionMap,
         );
         if (createAbleResource?.length) {
-          createAbleResource?.forEach((type) => {
-            formData.resourceManagementPermissions?.push({
-              resourceType: type,
-              resourceId: null,
-              actions: ['create'],
+          createAbleResource
+            ?.filter((resourceType) =>
+              odc.appConfig.manage.user.create ? true : resourceType !== IManagerResourceType.user,
+            )
+            ?.forEach((type) => {
+              formData.resourceManagementPermissions?.push({
+                resourceType: type,
+                resourceId: null,
+                actions: ['create'],
+              });
             });
-          });
         }
 
         if (
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx
index 4c657b699..54129d7d9 100644
--- a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ExtraConfig/index.tsx
@@ -24,6 +24,7 @@ import SSLItem from '../SSLItem';
 import styles from './index.less';
 import InitScriptItem from '../InitScriptItem';
 import JDBCParamsItem from '../JDBCParamsItem';
+import { haveOCP } from '@/util/env';
 interface IProps {}
 const ExtraConfig: React.FC<IProps> = function () {
   const context = useContext(DatasourceFormContext);
@@ -84,12 +85,16 @@ const ExtraConfig: React.FC<IProps> = function () {
               <Tabs
                 size="small"
                 type="card"
-                items={[
-                  config?.sys && sysItem,
-                  config?.ssl && sslItem,
-                  initScriptItem,
-                  jdbcItem,
-                ].filter(Boolean)}
+                items={
+                  !haveOCP()
+                    ? [
+                        config?.sys && sysItem,
+                        config?.ssl && sslItem,
+                        initScriptItem,
+                        jdbcItem,
+                      ].filter(Boolean)
+                    : [initScriptItem]
+                }
               />
             );
           }}
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
index 573092d3e..1aaa18826 100644
--- a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
@@ -291,7 +291,7 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
                   </Select>
                 </Form.Item>
                 {!login.isPrivateSpace() && <ProjectItem />}
-                {!haveOCP() && <ExtraConfig />}
+                <ExtraConfig />
               </>
             );
           }}