diff --git a/.gitignore b/.gitignore
index 2caf52a70..9589496e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ public/bound
 .worktrees/
 coverage/
 .playwright-mcp/
+docs/
+midscene_run/
diff --git a/src/components/PromGraphCpt/Graph.tsx b/src/components/PromGraphCpt/Graph.tsx
index aff9ca1fd..25795dda0 100644
--- a/src/components/PromGraphCpt/Graph.tsx
+++ b/src/components/PromGraphCpt/Graph.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-import React, { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect, useContext, useRef, useCallback } from 'react';
 import moment from 'moment';
 import _ from 'lodash';
 import { Space, InputNumber, Radio, Button, Popover, Tooltip } from 'antd';
@@ -57,6 +57,7 @@ interface IProps {
   graphStandardOptionsPlacement?: TooltipPlacement;
   defaultUnit?: string;
   panelWidth?: number; // 用于 Graph 组件的宽度计算
+  refetchOnZoom?: boolean;
 }
 
 enum ChartType {
@@ -100,8 +101,17 @@ export default function Graph(props: IProps) {
     graphStandardOptionsPlacement = 'left',
     defaultUnit,
     panelWidth,
+    refetchOnZoom = false,
   } = props;
   const [data, setData] = useState<any[]>([]);
+  const [zoomRangeState, setZoomRangeState] = useState<{ range: IRawTimeRange; sourceKey: string }>();
+  const [resetZoomVersion, setResetZoomVersion] = useState(0);
+  const querySeqRef = useRef(0);
+  const rangeKey = JSON.stringify(range);
+  const zoomSourceKey = JSON.stringify({ datasourceValue, promql, range });
+  const activeZoomRange = refetchOnZoom && zoomRangeState?.sourceKey === zoomSourceKey ? zoomRangeState.range : undefined;
+  const effectiveRange = activeZoomRange || range;
+  const effectiveRangeKey = JSON.stringify(effectiveRange);
   const [highLevelConfig, setHighLevelConfig] = useState({
     shared: false,
     sharedSortDirection: 'desc',
@@ -144,9 +154,35 @@ export default function Graph(props: IProps) {
     }
   }, [defaultUnit]);
 
+  useEffect(() => {
+    if (refetchOnZoom) {
+      setZoomRangeState(undefined);
+      setResetZoomVersion((v) => v + 1);
+    }
+  }, [refetchOnZoom, zoomSourceKey]);
+
+  const handleZoomWithoutDefault = useCallback(
+    (times?: Date[]) => {
+      if (!refetchOnZoom) return;
+      if (times?.length === 2) {
+        setZoomRangeState({
+          range: {
+            start: moment(times[0]),
+            end: moment(times[1]),
+          },
+          sourceKey: zoomSourceKey,
+        });
+      } else {
+        setZoomRangeState(undefined);
+        setResetZoomVersion((v) => v + 1);
+      }
+    },
+    [refetchOnZoom, zoomSourceKey],
+  );
+
   useEffect(() => {
     if (datasourceValue && promql) {
-      const parsedRange = parseRange(range);
+      const parsedRange = parseRange(effectiveRange);
       const start = moment(parsedRange.start).unix();
       const end = moment(parsedRange.end).unix();
       const realStep = getRealStep({
@@ -156,11 +192,12 @@ export default function Graph(props: IProps) {
         toUnix: end,
       });
       const queryStart = Date.now();
+      const querySeq = ++querySeqRef.current;
       setLoading(true);
       getPromData(`${url}/${datasourceValue}/api/v1/query_range`, {
         query: interpolateString({
           query: promql,
-          range,
+          range: effectiveRange,
           minStep,
           maxDataPoints: maxDataPoints || panelWidth,
         }),
@@ -169,6 +206,7 @@ export default function Graph(props: IProps) {
         step: realStep,
       })
         .then((res) => {
+          if (querySeq !== querySeqRef.current) return;
           const series = _.map(res?.result, (item) => {
             return {
               id: _.uniqueId('series_'),
@@ -187,17 +225,19 @@ export default function Graph(props: IProps) {
           setErrorContent('');
         })
         .catch((err) => {
+          if (querySeq !== querySeqRef.current) return;
           const msg = _.get(err, 'message');
           setErrorContent(`Error executing query: ${msg}`);
         })
         .finally(() => {
+          if (querySeq !== querySeqRef.current) return;
           setLoading(false);
         });
     }
-  }, [JSON.stringify(range), minStep, maxDataPoints, datasourceValue, promql, refreshFlag]);
+  }, [effectiveRangeKey, minStep, maxDataPoints, datasourceValue, promql, refreshFlag]);
 
   return (
-    <div className='prom-graph-graph-container'>
+    <div className={activeZoomRange ? 'prom-graph-graph-container prom-graph-graph-zoom-owner' : 'prom-graph-graph-container'}>
       <div className='prom-graph-graph-controls'>
         <Space wrap>
           <TimeRangePicker value={range} onChange={setRange} dateFormat='YYYY-MM-DD HH:mm:ss' />
@@ -294,7 +334,7 @@ export default function Graph(props: IProps) {
                         version: DASHBOARD_VERSION,
                         name: promql,
                         step: minStep,
-                        range,
+                        range: effectiveRange,
                         ...lineGraphProps,
                         targets: [
                           {
@@ -336,7 +376,15 @@ export default function Graph(props: IProps) {
           )}
         </Space>
       </div>
-      <Timeseries inDashboard={false} values={lineGraphProps as any} series={data} time={range} themeMode={darkMode ? 'dark' : undefined} />
+      <Timeseries
+        key={refetchOnZoom ? `${resetZoomVersion}-${zoomSourceKey}` : undefined}
+        inDashboard={false}
+        values={lineGraphProps as any}
+        series={data}
+        time={effectiveRange}
+        themeMode={darkMode ? 'dark' : undefined}
+        onZoomWithoutDefult={refetchOnZoom ? (handleZoomWithoutDefault as any) : undefined}
+      />
     </div>
   );
 }
diff --git a/src/components/PromGraphCpt/index.tsx b/src/components/PromGraphCpt/index.tsx
index e65825a02..2ca09e257 100644
--- a/src/components/PromGraphCpt/index.tsx
+++ b/src/components/PromGraphCpt/index.tsx
@@ -64,6 +64,7 @@ interface IProps {
   promQLInputTooltip?: string;
   extra?: React.ReactElement;
   showExportButton?: boolean; // 是否显示导出按钮
+  refetchOnZoom?: boolean;
 }
 
 const TabPane = Tabs.TabPane;
@@ -98,6 +99,7 @@ export default function index(props: IProps) {
     extra,
     defaultRange,
     showExportButton,
+    refetchOnZoom = false,
   } = props;
   const [value, setValue] = useState<string | undefined>(promQL); // for promQLInput
   const [queryStats, setQueryStats] = useState<QueryStats | null>(null);
@@ -292,6 +294,7 @@ export default function index(props: IProps) {
                 graphStandardOptionsType={graphStandardOptionsType}
                 graphStandardOptionsPlacement={graphStandardOptionsPlacement}
                 defaultUnit={defaultUnit}
+                refetchOnZoom={refetchOnZoom}
               />
             </Panel>
           </TabPane>
diff --git a/src/components/PromGraphCpt/style.less b/src/components/PromGraphCpt/style.less
index c2b53892e..45c6fb366 100644
--- a/src/components/PromGraphCpt/style.less
+++ b/src/components/PromGraphCpt/style.less
@@ -118,6 +118,12 @@
   display: flex;
   flex-direction: column;
 
+  &.prom-graph-graph-zoom-owner {
+    .ts-graph-zoom-resetBtn {
+      display: block !important;
+    }
+  }
+
   .renderer-timeseries-container {
     display: flex !important;
     flex-direction: column;
@@ -148,4 +154,4 @@
   &:hover {
     background-color: var(--fc-fill-3);
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/common/locale/zh_CN.ts b/src/locales/common/locale/zh_CN.ts
index 1282f3271..6053e2cce 100644
--- a/src/locales/common/locale/zh_CN.ts
+++ b/src/locales/common/locale/zh_CN.ts
@@ -4,7 +4,7 @@ const zh_CN = {
     '403_admin': '管理员：',
     '403_back': '返回上一页',
     404: '你访问的页面不存在!',
-    '404_btn': '回到首页',
+    '404_btn': '返回首页',
   },
   business_group: '业务组',
   business_groups: '业务组',
diff --git a/src/locales/common/locale/zh_HK.ts b/src/locales/common/locale/zh_HK.ts
index fec41a3be..bfa88fd33 100644
--- a/src/locales/common/locale/zh_HK.ts
+++ b/src/locales/common/locale/zh_HK.ts
@@ -4,7 +4,7 @@ const zh_HK = {
     '403_admin': '管理員：',
     '403_back': '返回上一頁',
     404: '您訪問的頁面不存在！',
-    '404_btn': '回到首頁',
+    '404_btn': '返回首頁',
   },
   business_group: '業務組',
   business_groups: '業務組',
diff --git a/src/main.tsx b/src/main.tsx
index e58aff816..44632266a 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -20,10 +20,14 @@ import { i18nInit } from './i18n'; // loaded and initialized first
 import App from './App';
 import { I18nextProvider } from 'react-i18next';
 import { initTheme } from './utils/darkMode';
+import { initFlashcatFrom } from './utils/flashcatFrom';
 
 // 在页面渲染前初始化主题，避免样式闪烁
 initTheme();
 
+// 指向官网/Flashduty 的链接统一携带 from=n9e-user 渠道参数
+initFlashcatFrom();
+
 ReactDOM.render(
   <I18nextProvider i18n={i18nInit}>
     <App />
diff --git a/src/pages/dashboard/Editor/Fields/Legend/index.tsx b/src/pages/dashboard/Editor/Fields/Legend/index.tsx
index 71e9bedc1..57ce8ca94 100644
--- a/src/pages/dashboard/Editor/Fields/Legend/index.tsx
+++ b/src/pages/dashboard/Editor/Fields/Legend/index.tsx
@@ -71,6 +71,35 @@ export default function index() {
             </Select>
           </Form.Item>
         </Col>
+        <Col span={12}>
+          <Form.Item label={t('panel.options.legend.sortBy')} name={[...namePrefix, 'sortBy']} tooltip={t('panel.options.legend.sortBy_tip')} hidden={displayMode === 'hidden'}>
+            <Select allowClear placeholder={t('panel.options.legend.sortBy_tip')}>
+              {_.map(tableColumn, (item) => {
+                return (
+                  <Select.Option key={item} value={item}>
+                    {t(`panel.options.legend.${item}`)}
+                  </Select.Option>
+                );
+              })}
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col span={12}>
+          <Form.Item label={t('panel.options.legend.sortDir')} name={[...namePrefix, 'sortDir']} initialValue='asc' hidden={displayMode === 'hidden'}>
+            <Select
+              options={[
+                {
+                  label: t('panel.options.legend.sortDirAsc'),
+                  value: 'asc',
+                },
+                {
+                  label: t('panel.options.legend.sortDirDesc'),
+                  value: 'desc',
+                },
+              ]}
+            />
+          </Form.Item>
+        </Col>
         <Col span={12}>
           <Form.Item label={t('panel.options.legend.behaviour.label')} name={[...namePrefix, 'behaviour']} initialValue='showItem' hidden={displayMode === 'hidden'}>
             <Select
diff --git a/src/pages/dashboard/Editor/config.tsx b/src/pages/dashboard/Editor/config.tsx
index bb417dd28..da1e67d83 100644
--- a/src/pages/dashboard/Editor/config.tsx
+++ b/src/pages/dashboard/Editor/config.tsx
@@ -113,6 +113,8 @@ export const defaultOptionsValues = {
   },
   legend: {
     displayMode: 'hidden',
+    sortBy: '',
+    sortDir: 'asc',
   },
   thresholds: {
     steps: [defaultThreshold],
diff --git a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/LegendTable.tsx b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/LegendTable.tsx
index 4ff6db166..f88ff8781 100644
--- a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/LegendTable.tsx
+++ b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/LegendTable.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Table } from 'antd';
 import { ColumnProps } from 'antd/lib/table';
+import { useSize } from 'ahooks';
 import _ from 'lodash';
 import { useTranslation } from 'react-i18next';
 
@@ -10,66 +11,187 @@ import NameWithTooltip from '../NameWithTooltip';
 
 import Link from './Link';
 
+const ROW_HEIGHT = 24;
+const HEADER_HEIGHT = 24;
+const OVERSCAN_COUNT = 8;
+const MOCK_ROWS_KEY = '__legend_mock_rows';
+
 interface Props {
   panel: IPanel;
   data: DataItem[];
   legendColumns?: string[];
+  legendSortBy?: string;
+  legendSortDir?: string;
   onRowClick: (record: DataItem) => void;
 }
 
+function getMockRowsCount() {
+  if (!import.meta.env.DEV || typeof window === 'undefined') {
+    return 0;
+  }
+  const raw = window.localStorage.getItem(MOCK_ROWS_KEY);
+  const count = Number(raw);
+  if (!Number.isFinite(count) || count <= 0) {
+    return 0;
+  }
+  return Math.min(Math.floor(count), 50000);
+}
+
+function mockLegendData(data: DataItem[], count: number) {
+  if (!count || data.length === 0 || data.length >= count) {
+    return data;
+  }
+  return _.times(count, (idx) => {
+    const source = data[idx % data.length];
+    return {
+      ...source,
+      id: `${source.id}__mock_${idx}`,
+      name: `${source.name} #${idx + 1}`,
+    };
+  });
+}
+
 export default function LegendTable(props: Props) {
   const { t } = useTranslation('dashboard');
-  const { panel, data, legendColumns, onRowClick } = props;
+  const { panel, data, legendColumns, legendSortBy, legendSortDir, onRowClick } = props;
   const options = panel.options || {};
   const detailName = options.legend?.detailName;
   const detailUrl = options.legend?.detailUrl;
 
-  let columns: ColumnProps<DataItem>[] = [
-    {
-      title: `Series (${data.length})`,
-      dataIndex: 'name',
-      width: '100%',
-      render: (text, record: any) => {
-        return (
-          <div className='w-full flex items-center gap-2 whitespace-nowrap'>
-            <div className='w-[14px] h-[4px] rounded-[10px] inline-block flex-shrink-0' style={{ backgroundColor: record.color }} />
-            <NameWithTooltip record={record}>
-              <div className='whitespace-nowrap bg-transparent border-0 text-inherit padding-0 max-w-[600px] text-ellipsis overflow-hidden select-text'>
-                {record.offset && record.offset !== 'current' ? <span style={{ paddingRight: 4 }}>offfset {record.offset}</span> : ''}
-                <span>{text}</span>
-              </div>
-            </NameWithTooltip>
-            <Link data={record} name={detailName} url={detailUrl} />
-          </div>
-        );
-      },
-    },
-  ];
-  _.forEach(legendColumns, (column) => {
-    columns = [
-      ...columns,
+  const containerRef = useRef<HTMLDivElement>(null);
+  const containerSize = useSize(containerRef);
+  const bodyHeight = Math.max((containerSize?.height || 0) - HEADER_HEIGHT, 0);
+  const [scrollTop, setScrollTop] = useState(0);
+  const [sortState, setSortState] = useState<{ column?: string; dir?: 'asc' | 'desc' }>({
+    column: legendSortBy,
+    dir: legendSortBy ? (legendSortDir === 'desc' ? 'desc' : 'asc') : undefined,
+  });
+  const tableData = useMemo(() => mockLegendData(data, getMockRowsCount()), [data]);
+
+  const columns: ColumnProps<DataItem>[] = useMemo(() => {
+    const cols: ColumnProps<DataItem>[] = [
       {
+        title: `Series (${tableData.length})`,
+        dataIndex: 'name',
+        width: '100%',
+        render: (text, record: any) => {
+          return (
+            <div className='w-full flex items-center gap-2 whitespace-nowrap'>
+              <div className='w-[14px] h-[4px] rounded-[10px] inline-block flex-shrink-0' style={{ backgroundColor: record.color }} />
+              <NameWithTooltip record={record}>
+                <div className='whitespace-nowrap bg-transparent border-0 text-inherit padding-0 max-w-[600px] text-ellipsis overflow-hidden select-text'>
+                  {record.offset && record.offset !== 'current' ? <span style={{ paddingRight: 4 }}>offset {record.offset}</span> : ''}
+                  <span>{text}</span>
+                </div>
+              </NameWithTooltip>
+              <Link data={record} name={detailName} url={detailUrl} />
+            </div>
+          );
+        },
+      },
+    ];
+    _.forEach(legendColumns, (column) => {
+      cols.push({
         title: t(`panel.options.legend.${column}`, {
           lng: 'en_US', // fixed to en_US, optimize column width
         }),
         dataIndex: column,
         sorter: (a, b) => a[column].stat - b[column].stat,
+        sortOrder: sortState.column === column ? (sortState.dir === 'desc' ? 'descend' : 'ascend') : null,
         render: (text) => {
           return text.text;
         },
-      },
-    ];
-  });
+      });
+    });
+    return cols;
+  }, [tableData.length, legendColumns, sortState.column, sortState.dir, t, detailName, detailUrl]);
+
+  useEffect(() => {
+    setSortState({
+      column: legendSortBy,
+      dir: legendSortBy ? (legendSortDir === 'desc' ? 'desc' : 'asc') : undefined,
+    });
+  }, [legendSortBy, legendSortDir]);
+
+  const sortedData = useMemo(() => {
+    if (!sortState.column || !sortState.dir) {
+      return tableData;
+    }
+    return _.orderBy(tableData, [(item) => item[sortState.column!]?.stat], [sortState.dir]);
+  }, [tableData, sortState.column, sortState.dir]);
+
+  const visibleRange = useMemo(() => {
+    if (!bodyHeight) {
+      return {
+        start: 0,
+        end: sortedData.length,
+      };
+    }
+    const bodyScrollTop = Math.max(scrollTop - HEADER_HEIGHT, 0);
+    const start = Math.max(Math.floor(bodyScrollTop / ROW_HEIGHT) - OVERSCAN_COUNT, 0);
+    const visibleCount = Math.ceil(bodyHeight / ROW_HEIGHT) + OVERSCAN_COUNT * 2;
+    const end = Math.min(start + visibleCount, sortedData.length);
+    return { start, end };
+  }, [bodyHeight, scrollTop, sortedData.length]);
+
+  const visibleData = useMemo(() => sortedData.slice(visibleRange.start, visibleRange.end), [sortedData, visibleRange.start, visibleRange.end]);
+  const topPadding = visibleRange.start * ROW_HEIGHT;
+  const bottomPadding = Math.max(sortedData.length - visibleRange.end, 0) * ROW_HEIGHT;
+
+  const VirtualBodyWrapper = useCallback(
+    (wrapperProps: any) => {
+      const { children, ...restProps } = wrapperProps;
+
+      return (
+        <tbody {...restProps}>
+          {topPadding > 0 && (
+            <tr className='renderer-timeseries-ng-legend-table-spacer'>
+              <td colSpan={columns.length} style={{ height: topPadding }} />
+            </tr>
+          )}
+          {children}
+          {bottomPadding > 0 && (
+            <tr className='renderer-timeseries-ng-legend-table-spacer'>
+              <td colSpan={columns.length} style={{ height: bottomPadding }} />
+            </tr>
+          )}
+        </tbody>
+      );
+    },
+    [bottomPadding, columns.length, topPadding],
+  );
 
   return (
-    <div className='min-w-0 h-full overflow-auto'>
+    <div
+      ref={containerRef}
+      className='min-w-0 h-full overflow-auto renderer-timeseries-ng-legend-table-scroll'
+      onScroll={(e) => {
+        setScrollTop(e.currentTarget.scrollTop);
+      }}
+    >
       <Table
-        className='mt-2 renderer-timeseries-ng-legend-table'
+        className='renderer-timeseries-ng-legend-table'
         size='small'
         pagination={false}
         rowKey='id'
         columns={columns}
-        dataSource={data}
+        dataSource={visibleData}
+        components={{
+          body: {
+            wrapper: VirtualBodyWrapper,
+          },
+        }}
+        onChange={(pagination, filters, sorter: any) => {
+          if (_.isArray(sorter)) {
+            return;
+          }
+          setScrollTop(0);
+          containerRef.current?.scrollTo({ top: 0 });
+          setSortState({
+            column: sorter?.order ? sorter?.field : undefined,
+            dir: sorter?.order === 'descend' ? 'desc' : sorter?.order === 'ascend' ? 'asc' : undefined,
+          });
+        }}
         rowClassName={(record) => {
           return !record.show ? 'cursor-pointer text-soft' : 'cursor-pointer';
         }}
diff --git a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/style.less b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/style.less
index c4b4a1b9f..8758334dd 100644
--- a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/style.less
+++ b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/components/Legend/style.less
@@ -8,6 +8,12 @@
   }
 
   .renderer-timeseries-ng-legend-table {
+    .ant-table-thead > tr > th {
+      position: sticky;
+      top: 0;
+      z-index: 1;
+    }
+
     .renderer-timeseries-ng-legend-table-name-column {
       width: 100%;
       display: flex;
@@ -40,9 +46,14 @@
     .ant-table-tbody {
       .ant-table-cell {
         padding: 2px 4px !important;
-        white-space: nowrap; // 强制不换行解决换行可能会产生的宽度抖动问题
+        white-space: nowrap;
       }
     }
+
+    .renderer-timeseries-ng-legend-table-spacer > td {
+      padding: 0 !important;
+      border: 0 !important;
+    }
   }
 
   .renderer-timeseries-ng-legend-list {
@@ -75,11 +86,11 @@
     border-radius: 0 !important;
   }
 
-  .ant-table-container table>thead>tr:first-child th:first-child {
+  .ant-table-container table > thead > tr:first-child th:first-child {
     border-top-left-radius: 0 !important;
   }
 
-  .ant-table-container table>thead>tr:first-child th:last-child {
+  .ant-table-container table > thead > tr:first-child th:last-child {
     border-top-right-radius: 0 !important;
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/index.tsx b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/index.tsx
index eb8506e34..29514866e 100644
--- a/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/index.tsx
+++ b/src/pages/dashboard/Renderer/Renderer/TimeSeriesNG/index.tsx
@@ -69,9 +69,11 @@ export default function index(props: Props) {
   const legend = options?.legend;
   const legendPlacement = legend?.placement || 'bottom'; // 适配旧版的默认值
   const legendDisplayMode = options.legend?.displayMode || 'table';
-  const legendColumns = !_.isEmpty(options.legend?.columns) ? options.legend?.columns : legendDisplayMode === 'table' ? ['max', 'min', 'avg', 'sum', 'last'] : [];
-  const legendBehaviour = options.legend?.behaviour || 'showItem';
-  const legendSelectMode = options.legend?.selectMode || 'single';
+  const legendColumns = !_.isEmpty(legend?.columns) ? legend?.columns : legendDisplayMode === 'table' ? ['max', 'min', 'avg', 'sum', 'last'] : [];
+  const legendBehaviour = legend?.behaviour || 'showItem';
+  const legendSelectMode = legend?.selectMode || 'single';
+  const legendSortBy = legend?.sortBy;
+  const legendSortDir = legend?.sortDir || 'asc';
   const chartContainerSize = getChartContainerSize(PADDING, containerSize, legendSize, legendDisplayMode, legendPlacement);
   const [dataRefresh, setDataRefresh] = useState(_.uniqueId('dataRefresh_'));
   const [activeLegend, setActiveLegend] = useState<string>(); // legendSelectMode === 'single'
@@ -161,6 +163,8 @@ export default function index(props: Props) {
               panel={mainProps.panel}
               data={legendData}
               legendColumns={legendColumns}
+              legendSortBy={legendSortBy}
+              legendSortDir={legendSortDir}
               onRowClick={(record) => {
                 if (legendSelectMode === 'multiple') {
                   setActiveLegends(_.xor(activeLegends, [record.id]));
diff --git a/src/pages/dashboard/locale/en_US.ts b/src/pages/dashboard/locale/en_US.ts
index 598332947..9bce9bbfa 100644
--- a/src/pages/dashboard/locale/en_US.ts
+++ b/src/pages/dashboard/locale/en_US.ts
@@ -256,6 +256,11 @@ const en_US = {
           multiple: 'Multiple',
         },
         heightInPercentage: 'Height in percentage',
+        sortBy: 'Sort column',
+        sortBy_tip: 'Select a statistic column to sort by. Leave empty to keep original order',
+        sortDir: 'Sort direction',
+        sortDirAsc: 'Ascending',
+        sortDirDesc: 'Descending',
         heightInPercentage_tip: 'Legend height occupies the maximum height percentage of the panel, the minimum value is 20%, the maximum value is 80%',
         widthInPercentage: 'Width in percentage',
         widthInPercentage_tip: 'Legend width occupies the maximum width percentage of the panel, the minimum value is 20%, the maximum value is 80%',
diff --git a/src/pages/dashboard/locale/ja_JP.ts b/src/pages/dashboard/locale/ja_JP.ts
index 9cebf12e2..05fee5e8b 100644
--- a/src/pages/dashboard/locale/ja_JP.ts
+++ b/src/pages/dashboard/locale/ja_JP.ts
@@ -256,6 +256,11 @@ const ja_JP = {
           multiple: '複数選択',
         },
         heightInPercentage: '高さパーセンテージ',
+        sortBy: '並び替え列',
+        sortBy_tip: '並び替える統計列を選択。未選択の場合は元の順序を維持',
+        sortDir: '並び替え方向',
+        sortDirAsc: '昇順',
+        sortDirDesc: '降順',
         heightInPercentage_tip: 'Legendの高さはパネルの最大高さのパーセンテージを占めます。最小値は20%、最大値は80%です',
         widthInPercentage: '幅パーセンテージ',
         widthInPercentage_tip: 'Legendの幅はパネルの最大幅のパーセンテージを占めます。最小値は20%、最大値は80%です',
diff --git a/src/pages/dashboard/locale/ru_RU.ts b/src/pages/dashboard/locale/ru_RU.ts
index e7fa82740..9a92ed47f 100644
--- a/src/pages/dashboard/locale/ru_RU.ts
+++ b/src/pages/dashboard/locale/ru_RU.ts
@@ -230,6 +230,11 @@ const ru_RU = {
           multiple: 'Множественный выбор',
         },
         heightInPercentage: 'Высота в процентах',
+        sortBy: 'Колонка сортировки',
+        sortBy_tip: 'Выберите столбец для сортировки. Оставьте пустым для сохранения исходного порядка',
+        sortDir: 'Направление сортировки',
+        sortDirAsc: 'По возрастанию',
+        sortDirDesc: 'По убыванию',
         heightInPercentage_tip: 'Legend высота занимает максимальную высоту панели, минимальное значение 20%, максимальное значение 80%',
         widthInPercentage: 'Ширина в процентах',
         widthInPercentage_tip: 'Legend ширина занимает максимальную ширину панели, минимальное значение 20%, максимальное значение 80%',
diff --git a/src/pages/dashboard/locale/zh_CN.ts b/src/pages/dashboard/locale/zh_CN.ts
index 09067f969..8467fe022 100644
--- a/src/pages/dashboard/locale/zh_CN.ts
+++ b/src/pages/dashboard/locale/zh_CN.ts
@@ -257,6 +257,11 @@ const zh_CN = {
           multiple: '多选',
         },
         heightInPercentage: '高度百分比',
+        sortBy: '排序列',
+        sortBy_tip: '选择按哪个统计列排序，不选则不排序',
+        sortDir: '排序方向',
+        sortDirAsc: '升序',
+        sortDirDesc: '降序',
         heightInPercentage_tip: 'Legend 高度占据面板的最大高度百分比，最小值为 20%，最大值为 80%',
         widthInPercentage: '宽度百分比',
         widthInPercentage_tip: 'Legend 宽度占据面板的最大宽度百分比，最小值为 20%，最大值为 80%',
diff --git a/src/pages/dashboard/locale/zh_HK.ts b/src/pages/dashboard/locale/zh_HK.ts
index 56218a8c8..66e471614 100644
--- a/src/pages/dashboard/locale/zh_HK.ts
+++ b/src/pages/dashboard/locale/zh_HK.ts
@@ -256,6 +256,11 @@ const zh_HK = {
           multiple: '多選',
         },
         heightInPercentage: '高度百分比',
+        sortBy: '排序列',
+        sortBy_tip: '選擇按哪個統計列排序，不選則不排序',
+        sortDir: '排序方向',
+        sortDirAsc: '升序',
+        sortDirDesc: '降序',
         heightInPercentage_tip: 'Legend 高度佔據面板的最大高度百分比，最小值為 20%，最大值為 80%',
         widthInPercentage: '寬度百分比',
         widthInPercentage_tip: 'Legend 寬度佔據面板的最大寬度百分比，最小值為 20%，最大值為 80%',
diff --git a/src/pages/dashboard/types.ts b/src/pages/dashboard/types.ts
index 1afd243c9..de5af9357 100644
--- a/src/pages/dashboard/types.ts
+++ b/src/pages/dashboard/types.ts
@@ -108,6 +108,8 @@ export interface IOptions {
     detailUrl: string;
     behaviour: 'showItem' | 'hideItem';
     selectMode: 'single' | 'multiple';
+    sortBy?: string;
+    sortDir?: 'asc' | 'desc';
   };
   tooltip?: {
     mode: 'single' | 'all';
diff --git a/src/pages/event/DetailNG/index.tsx b/src/pages/event/DetailNG/index.tsx
index 016dfd682..52d346d7b 100644
--- a/src/pages/event/DetailNG/index.tsx
+++ b/src/pages/event/DetailNG/index.tsx
@@ -7,7 +7,7 @@ import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { CommonStateContext, basePrefix } from '@/App';
 import { getESIndexPatternsWithParmas } from '@/pages/log/IndexPatterns/services';
-import { DatasourceCateEnum } from '@/utils/constant';
+import { DatasourceCateEnum, IS_ENT } from '@/utils/constant';
 import { AiButton } from '@/components/AiChatNG/FlashAiButton';
 import { getAlertEventDetailPrompts } from '@/components/AiChatNG/recommend';
 
@@ -108,7 +108,12 @@ export default function DetailNG(props: Props) {
               <AiButton
                 size='small'
                 queryAction={{
-                  content: t('detail.ai_analysis_content'),
+                  content: IS_ENT
+                    ? t('detail.ai_analysis_content_ent', {
+                        id: eventDetail.id,
+                      })
+                    : t('detail.ai_analysis_content'),
+                  prefillOnly: false,
                   key: 'troubleshooting',
                   param: {
                     event_id: eventDetail.id,
diff --git a/src/pages/event/locale/en_US.ts b/src/pages/event/locale/en_US.ts
index 784986006..9f9ea95b0 100644
--- a/src/pages/event/locale/en_US.ts
+++ b/src/pages/event/locale/en_US.ts
@@ -101,6 +101,7 @@ const en_US = {
     current_anomaly_time: 'Current Anomaly Time',
     ai_analysis: 'AI Analysis',
     ai_analysis_content: 'Analyze the root cause of this alert event',
+    ai_analysis_content_ent: 'Analyze the root cause of alert event (id={{id}})',
   },
 
   sharing_link: {
diff --git a/src/pages/event/locale/ja_JP.ts b/src/pages/event/locale/ja_JP.ts
index ca69a602b..b876da043 100644
--- a/src/pages/event/locale/ja_JP.ts
+++ b/src/pages/event/locale/ja_JP.ts
@@ -99,6 +99,7 @@ const ja_JP = {
     current_anomaly_time: '今回の異常時間',
     ai_analysis: 'AI 解析',
     ai_analysis_content: 'このアラートイベントの原因を分析',
+    ai_analysis_content_ent: 'アラートイベント (id={{id}}) の原因を分析',
   },
 
   sharing_link: {
diff --git a/src/pages/event/locale/ru_RU.ts b/src/pages/event/locale/ru_RU.ts
index a79cf3d45..40a8f722e 100644
--- a/src/pages/event/locale/ru_RU.ts
+++ b/src/pages/event/locale/ru_RU.ts
@@ -99,6 +99,7 @@ const ru_RU = {
     current_anomaly_time: 'Время текущей аномалии',
     ai_analysis: 'AI Анализ',
     ai_analysis_content: 'Анализировать причину этого события предупреждения',
+    ai_analysis_content_ent: 'Анализировать причину события предупреждения (id={{id}})',
   },
 
   sharing_link: {
diff --git a/src/pages/event/locale/zh_CN.ts b/src/pages/event/locale/zh_CN.ts
index e258986b1..201630870 100644
--- a/src/pages/event/locale/zh_CN.ts
+++ b/src/pages/event/locale/zh_CN.ts
@@ -101,6 +101,7 @@ const zh_CN = {
     current_anomaly_time: '本次异常时间',
     ai_analysis: 'AI 分析',
     ai_analysis_content: '分析这条告警事件的根因',
+    ai_analysis_content_ent: '分析告警事件 (id={{id}}) 的根因',
   },
 
   sharing_link: {
diff --git a/src/pages/event/locale/zh_HK.ts b/src/pages/event/locale/zh_HK.ts
index 12f856771..06fbf6295 100644
--- a/src/pages/event/locale/zh_HK.ts
+++ b/src/pages/event/locale/zh_HK.ts
@@ -99,6 +99,7 @@ const zh_HK = {
     current_anomaly_time: '本次異常時間',
     ai_analysis: 'AI 分析',
     ai_analysis_content: '分析這條告警事件的根因',
+    ai_analysis_content_ent: '分析告警事件 (id={{id}}) 的根因',
   },
 
   sharing_link: {
diff --git a/src/pages/explorer/Explorer.tsx b/src/pages/explorer/Explorer.tsx
index 98f66cb25..fa75fcc1c 100644
--- a/src/pages/explorer/Explorer.tsx
+++ b/src/pages/explorer/Explorer.tsx
@@ -119,6 +119,13 @@ const Panel = (props: IProps) => {
   const params = new URLSearchParams(location.search);
   const defaultDatasourceCate = params.get('data_source_name') || getDefaultDatasourceCate(datasourceList, defaultCate, type);
   const defaultDatasourceValue = params.get('data_source_id') ? _.toNumber(params.get('data_source_id')) : getDefaultDatasourceValue(defaultDatasourceCate, groupedDatasourceList);
+  // 从 URL 参数中提取 query/range，目前仅 CK 数据源支持从 URL 填充查询语句
+  const urlQuery = params.get('query');
+  const rangeStart = params.get('start');
+  const rangeEnd = params.get('end');
+  const urlRange = rangeStart && rangeEnd ? { start: rangeStart, end: rangeEnd } : undefined;
+  // 仅 CK 数据源从 URL 参数初始化 query，其他数据源暂不涉及以免影响面过大
+  const isCKUrlShare = defaultDatasourceCate === DatasourceCateEnum.ck && (urlQuery || urlRange);
   const datasourceCate = Form.useWatch('datasourceCate', form);
   const explorerContainerRef = useRef<HTMLDivElement>(null);
   const [promql, setPromql] = React.useState<string>();
@@ -140,6 +147,15 @@ const Panel = (props: IProps) => {
         initialValues={{
           datasourceCate: defaultDatasourceCate,
           datasourceValue: defaultDatasourceValue,
+          // 仅 CK 数据源支持从 URL 参数填充 query/range，避免影响其他数据源
+          ...(isCKUrlShare
+            ? {
+                query: {
+                  ...(urlQuery ? { query: urlQuery } : {}),
+                  ...(urlRange ? { range: urlRange } : {}),
+                },
+              }
+            : {}),
         }}
       >
         <div className='explorer-content'>
diff --git a/src/pages/logExplorer/Header.tsx b/src/pages/logExplorer/Header.tsx
index 5c4a18b26..080e97202 100644
--- a/src/pages/logExplorer/Header.tsx
+++ b/src/pages/logExplorer/Header.tsx
@@ -1,6 +1,10 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Tabs } from 'antd';
+import { Input, Modal, Tabs, Tooltip } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
+import { DndContext, DragEndEvent, PointerSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core';
+import { SortableContext, horizontalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
 import _ from 'lodash';
 
 import { CommonStateContext } from '@/App';
@@ -20,10 +24,102 @@ interface Props {
   defaultDatasourceValue: number;
 }
 
+function SortableTabNode(props: { id: string; children: React.ReactElement }) {
+  const { id, children } = props;
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
+  const horizontalTransform = transform
+    ? {
+        ...transform,
+        y: 0,
+      }
+    : null;
+
+  const style: React.CSSProperties = {
+    ...children.props.style,
+    transform: CSS.Translate.toString(horizontalTransform),
+    transition,
+    cursor: 'move',
+    opacity: isDragging ? 0.6 : children.props.style?.opacity,
+  };
+
+  return React.cloneElement(children, {
+    ref: setNodeRef,
+    style,
+    ...attributes,
+    ...listeners,
+  });
+}
+
 export default function Header(props: Props) {
   const { t } = useTranslation(NAME_SPACE);
   const { logsDefaultRange } = useContext(CommonStateContext);
   const { items, setItems, activeKey, setActiveKey, defaultDatasourceCate, defaultDatasourceValue } = props;
+  const [renameModalState, setRenameModalState] = useState<{
+    visible: boolean;
+    key?: string;
+    name: string;
+  }>({
+    visible: false,
+    name: '',
+  });
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 8,
+      },
+    }),
+  );
+
+  const getTabName = (item: LogExplorerTabItem, idx: number) => item.name || `Query ${idx + 1}`;
+
+  const handleDragEnd = (event: DragEndEvent) => {
+    const { active, over } = event;
+    if (!over || active.id === over.id) {
+      return;
+    }
+
+    setItems((prev) => {
+      const activeId = String(active.id);
+      const overId = String(over.id);
+      const oldIndex = _.findIndex(prev, { key: activeId });
+      const newIndex = _.findIndex(prev, { key: overId });
+      if (oldIndex === -1 || newIndex === -1) {
+        return prev;
+      }
+
+      const newItems = [...prev];
+      const [movedItem] = newItems.splice(oldIndex, 1);
+      newItems.splice(newIndex, 0, movedItem);
+      setLocalItems(newItems);
+      return newItems;
+    });
+  };
+
+  const handleRename = () => {
+    const tabKey = renameModalState.key;
+    if (!tabKey) {
+      return;
+    }
+
+    setItems((prev) => {
+      const newItems = _.map(prev, (item, idx) => {
+        if (item.key !== tabKey) {
+          return item;
+        }
+        const nextName = renameModalState.name.trim();
+        return {
+          ...item,
+          name: nextName || getTabName(item, idx),
+        };
+      });
+      setLocalItems(newItems);
+      return newItems;
+    });
+    setRenameModalState({
+      visible: false,
+      name: '',
+    });
+  };
 
   return (
     <div className='log-explorer-ng-header w-full flex items-center gap-4'>
@@ -33,6 +129,19 @@ export default function Header(props: Props) {
         size='small'
         type='editable-card'
         activeKey={activeKey}
+        renderTabBar={(tabBarProps, DefaultTabBar) => (
+          <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
+            <SortableContext items={_.map(items, 'key')} strategy={horizontalListSortingStrategy}>
+              <DefaultTabBar {...tabBarProps}>
+                {(node) => (
+                  <SortableTabNode key={node.key as string} id={node.key as string}>
+                    {node}
+                  </SortableTabNode>
+                )}
+              </DefaultTabBar>
+            </SortableContext>
+          </DndContext>
+        )}
         onEdit={(targetKey: string, action: 'add' | 'remove') => {
           if (action === 'add') {
             const newActiveKey = getUUID();
@@ -40,7 +149,7 @@ export default function Header(props: Props) {
               const activeItem = _.find(prev, { key: activeKey });
               const newItem = activeItem
                 ? {
-                    ...activeItem,
+                    ..._.omit(activeItem, ['name']),
                     key: newActiveKey,
                     isInited: false,
                   }
@@ -83,13 +192,64 @@ export default function Header(props: Props) {
         }}
       >
         {_.map(items, (item, idx) => {
+          const tabName = getTabName(item, idx);
           return (
-            <Tabs.TabPane closable={items.length !== 1} tab={`Query ${idx + 1}`} key={item.key}>
+            <Tabs.TabPane
+              closable={items.length !== 1}
+              tab={
+                <span className='log-explorer-ng-tab-label'>
+                  <span className='log-explorer-ng-tab-name' title={tabName}>
+                    {tabName}
+                  </span>
+                  <Tooltip title={t('tab.rename')}>
+                    <span
+                      className='log-explorer-ng-tab-edit'
+                      onClick={(event) => {
+                        event.stopPropagation();
+                        setRenameModalState({
+                          visible: true,
+                          key: item.key,
+                          name: tabName,
+                        });
+                      }}
+                    >
+                      <EditOutlined />
+                    </span>
+                  </Tooltip>
+                </span>
+              }
+              key={item.key}
+            >
               <></>
             </Tabs.TabPane>
           );
         })}
       </Tabs>
+      <Modal
+        title={t('tab.rename')}
+        visible={renameModalState.visible}
+        okText={t('common:btn.save')}
+        onOk={handleRename}
+        onCancel={() => {
+          setRenameModalState({
+            visible: false,
+            name: '',
+          });
+        }}
+      >
+        <Input
+          autoFocus
+          value={renameModalState.name}
+          maxLength={50}
+          onChange={(event) => {
+            setRenameModalState((prev) => ({
+              ...prev,
+              name: event.target.value,
+            }));
+          }}
+          onPressEnter={handleRename}
+        />
+      </Modal>
     </div>
   );
 }
diff --git a/src/pages/logExplorer/locale/en_US.ts b/src/pages/logExplorer/locale/en_US.ts
index 10567c589..13eb2b9f4 100644
--- a/src/pages/logExplorer/locale/en_US.ts
+++ b/src/pages/logExplorer/locale/en_US.ts
@@ -1,5 +1,8 @@
 const en_US = {
   title: 'Log Explorer',
+  tab: {
+    rename: 'Rename',
+  },
   query: 'Query Conditions',
   query_is_required: 'Query conditions cannot be empty',
   execute: 'Query',
diff --git a/src/pages/logExplorer/locale/ja_JP.ts b/src/pages/logExplorer/locale/ja_JP.ts
index 90d022fbc..621059c05 100644
--- a/src/pages/logExplorer/locale/ja_JP.ts
+++ b/src/pages/logExplorer/locale/ja_JP.ts
@@ -1,5 +1,8 @@
 const ja_JP = {
   title: 'ログ検索',
+  tab: {
+    rename: '名前を変更',
+  },
   query: 'クエリ条件',
   query_is_required: 'クエリ条件は空にできません',
   execute: '検索',
diff --git a/src/pages/logExplorer/locale/ru_RU.ts b/src/pages/logExplorer/locale/ru_RU.ts
index 458f5dd82..dcf785c77 100644
--- a/src/pages/logExplorer/locale/ru_RU.ts
+++ b/src/pages/logExplorer/locale/ru_RU.ts
@@ -1,5 +1,8 @@
 const ru_RU = {
   title: 'Поиск по логам',
+  tab: {
+    rename: 'Переименовать',
+  },
   query: 'Условия запроса',
   query_is_required: 'Условия запроса не могут быть пустыми',
   execute: 'Запрос',
diff --git a/src/pages/logExplorer/locale/zh_CN.ts b/src/pages/logExplorer/locale/zh_CN.ts
index 6d5f2a214..9819f2a6f 100644
--- a/src/pages/logExplorer/locale/zh_CN.ts
+++ b/src/pages/logExplorer/locale/zh_CN.ts
@@ -1,5 +1,8 @@
 const zh_CN = {
   title: '日志检索',
+  tab: {
+    rename: '重命名',
+  },
   query: '查询条件',
   query_is_required: '查询条件不能为空',
   execute: '查询',
diff --git a/src/pages/logExplorer/locale/zh_HK.ts b/src/pages/logExplorer/locale/zh_HK.ts
index 11acbced6..13705fcc4 100644
--- a/src/pages/logExplorer/locale/zh_HK.ts
+++ b/src/pages/logExplorer/locale/zh_HK.ts
@@ -1,5 +1,8 @@
 const zh_HK = {
   title: '日誌檢索',
+  tab: {
+    rename: '重命名',
+  },
   query: '查詢條件',
   query_is_required: '查詢條件不能為空',
   execute: '查詢',
diff --git a/src/pages/logExplorer/style.less b/src/pages/logExplorer/style.less
index 5ff739da4..ed8b76731 100644
--- a/src/pages/logExplorer/style.less
+++ b/src/pages/logExplorer/style.less
@@ -12,6 +12,16 @@
       margin-left: 0 !important;
       margin-right: -1px !important;
       background-color: var(--fc-fill-2) !important;
+
+      &:hover {
+        .log-explorer-ng-tab-edit {
+          opacity: 1;
+        }
+      }
+
+      .anticon-edit {
+        margin-right: 0 !important;
+      }
     }
 
     .ant-tabs-tab-active {
@@ -19,5 +29,40 @@
       border-bottom: none !important;
       background-color: var(--fc-fill-1) !important;
     }
+
+    .ant-tabs-tab-remove {
+      margin-left: 0 !important;
+    }
+
+    .log-explorer-ng-tab-label {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      max-width: 180px;
+      min-width: 0;
+      line-height: 1;
+    }
+
+    .log-explorer-ng-tab-name {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    .log-explorer-ng-tab-edit {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 14px;
+      height: 14px;
+      color: var(--fc-text-3);
+      cursor: pointer;
+      opacity: 0;
+      transition: opacity 0.2s;
+
+      &:hover {
+        color: var(--fc-text-1);
+      }
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/logExplorer/types.ts b/src/pages/logExplorer/types.ts
index eb240371f..974df5279 100644
--- a/src/pages/logExplorer/types.ts
+++ b/src/pages/logExplorer/types.ts
@@ -20,6 +20,7 @@ export interface Query {
 
 export interface LogExplorerTabItem {
   key: string;
+  name?: string;
   isInited?: boolean;
   formValues?: any;
 }
diff --git a/src/pages/logExplorer/utils/getFormValuesBySearchParams.ts b/src/pages/logExplorer/utils/getFormValuesBySearchParams.ts
index 7adef5d05..398ecf575 100644
--- a/src/pages/logExplorer/utils/getFormValuesBySearchParams.ts
+++ b/src/pages/logExplorer/utils/getFormValuesBySearchParams.ts
@@ -71,6 +71,12 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
         ? { start: !isMathString(range_start) ? moment(Number(range_start)) : range_start, end: !isMathString(range_end) ? moment(Number(range_end)) : range_end }
         : undefined;
 
+    let organizeFields: string[] = [];
+    const rawOrganizeFields = params?.organize_fields;
+    if (rawOrganizeFields) {
+      organizeFields = Array.isArray(rawOrganizeFields) ? rawOrganizeFields : [rawOrganizeFields];
+    }
+
     if (data_source_name === DatasourceCateEnum.doris) {
       const navMode = _.get(params, 'navMode');
       const syntax = _.get(params, 'syntax');
@@ -98,9 +104,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
           defaultSearchField,
           query,
           sql,
+          organizeFields,
           keys: {
-            labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-            valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+            labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+            valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
           },
         },
       };
@@ -126,9 +133,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             logstore,
             query,
             power_sql,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
               timeKey,
               timeFormat,
             },
@@ -153,7 +161,7 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
       try {
         if (params?.filters) {
           const parsedFilters = JSON.parse(params.filters);
-          if (_.isArray(parsedFilters)) {
+          if (Array.isArray(parsedFilters)) {
             filters = parsedFilters;
           }
         }
@@ -175,9 +183,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             filters,
             sql,
             sqlVizType,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
             },
           },
         };
@@ -195,9 +204,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             filters,
             sql,
             sqlVizType,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
             },
           },
         };
@@ -221,9 +231,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             group_id,
             stream_id,
             query,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
               timeKey,
             },
           },
@@ -248,9 +259,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             logNamespace,
             logSource,
             query,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
               timeKey,
             },
           },
@@ -277,9 +289,10 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
             logstore,
             logstream,
             query,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
               timeKey,
             },
           },
@@ -300,14 +313,15 @@ export default function getFormValuesBySearchParams(params: { [index: string]: s
           ...formValues,
           query: {
             region,
-            log_group_names: _.isArray(log_group_names) ? log_group_names : [log_group_names],
+            log_group_names: Array.isArray(log_group_names) ? log_group_names : [log_group_names],
             stackByField,
             query_language,
             vizType,
             query,
+            organizeFields,
             keys: {
-              labelKey: _.isArray(labelKey) ? labelKey : [labelKey],
-              valueKey: _.isArray(valueKey) ? valueKey : [valueKey],
+              labelKey: Array.isArray(labelKey) ? labelKey : [labelKey],
+              valueKey: Array.isArray(valueKey) ? valueKey : [valueKey],
               timeKey,
             },
           },
@@ -354,6 +368,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.sql = formValues.query?.sql;
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.aliyunSLS) {
@@ -367,12 +384,15 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.valueKey = formValues.query?.keys?.valueKey;
     query.timeKey = formValues.query?.keys?.timeKey;
     query.timeFormat = formValues.query?.keys?.timeFormat;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.elasticsearch) {
     let filtersString = '';
     const filters = formValues.query?.filters;
-    if (filters && _.isArray(filters) && filters.length > 0) {
+    if (filters && Array.isArray(filters) && filters.length > 0) {
       try {
         filtersString = JSON.stringify(filters);
       } catch (error) {
@@ -392,6 +412,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.sqlVizType = formValues.query?.sqlVizType;
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.huaweiLTS) {
@@ -403,6 +426,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
     query.timeKey = formValues.query?.keys?.timeKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.tencentCLS) {
@@ -414,6 +440,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
     query.timeKey = formValues.query?.keys?.timeKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.bceBLS) {
@@ -426,6 +455,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
     query.timeKey = formValues.query?.keys?.timeKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   if (data_source_name === DatasourceCateEnum.cloudwatchLogs) {
@@ -438,6 +470,9 @@ export function getLocationSearchByFormValues(formValues: FormValue) {
     query.labelKey = formValues.query?.keys?.labelKey;
     query.valueKey = formValues.query?.keys?.valueKey;
     query.timeKey = formValues.query?.keys?.timeKey;
+    if (formValues.query?.organizeFields && Array.isArray(formValues.query?.organizeFields) && formValues.query?.organizeFields.length > 0) {
+      query.organize_fields = formValues.query?.organizeFields;
+    }
     return queryString.stringify(query);
   }
   return '';
diff --git a/src/pages/notificationChannels/pages/Form/DingtalkApp.tsx b/src/pages/notificationChannels/pages/Form/DingtalkApp.tsx
index 68d41cfe0..f94917fed 100644
--- a/src/pages/notificationChannels/pages/Form/DingtalkApp.tsx
+++ b/src/pages/notificationChannels/pages/Form/DingtalkApp.tsx
@@ -35,7 +35,7 @@ export default function DingtalkApp() {
               <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_times')} name={[...names, 'retry_times']} initialValue={3}>
-              <InputNumber min={0} className='w-full' />
+              <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_interval')} name={[...names, 'retry_interval']} initialValue={3}>
               <InputNumber min={0} className='w-full' />
diff --git a/src/pages/notificationChannels/pages/Form/FeishuApp.tsx b/src/pages/notificationChannels/pages/Form/FeishuApp.tsx
index 98b2d4883..216cf5b01 100644
--- a/src/pages/notificationChannels/pages/Form/FeishuApp.tsx
+++ b/src/pages/notificationChannels/pages/Form/FeishuApp.tsx
@@ -38,7 +38,7 @@ export default function FeishuApp() {
               <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_times')} name={[...names, 'retry_times']} initialValue={3}>
-              <InputNumber min={0} className='w-full' />
+              <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_interval')} name={[...names, 'retry_interval']} initialValue={3}>
               <InputNumber min={0} className='w-full' />
diff --git a/src/pages/notificationChannels/pages/Form/Flashduty.tsx b/src/pages/notificationChannels/pages/Form/Flashduty.tsx
index 6ebfb9731..f8f4a3682 100644
--- a/src/pages/notificationChannels/pages/Form/Flashduty.tsx
+++ b/src/pages/notificationChannels/pages/Form/Flashduty.tsx
@@ -38,7 +38,7 @@ export default function Flashduty() {
         <InputNumber min={0} className='w-full' />
       </Form.Item>
       <Form.Item label={t('flashduty_request_config.retry_times')} name={[...names, 'retry_times']}>
-        <InputNumber min={0} className='w-full' />
+        <InputNumber min={1} className='w-full' />
       </Form.Item>
     </div>
   );
diff --git a/src/pages/notificationChannels/pages/Form/HTTP.tsx b/src/pages/notificationChannels/pages/Form/HTTP.tsx
index d3a09f0f3..b969fe248 100644
--- a/src/pages/notificationChannels/pages/Form/HTTP.tsx
+++ b/src/pages/notificationChannels/pages/Form/HTTP.tsx
@@ -121,7 +121,7 @@ export default function HTTP() {
           <InputNumber min={0} />
         </Form.Item>
         <Form.Item label={t('http_request_config.retry_times')} name={[...names, 'retry_times']}>
-          <InputNumber min={0} />
+          <InputNumber min={1} />
         </Form.Item>
         <Form.Item label={t('http_request_config.retry_interval')} name={[...names, 'retry_interval']}>
           <InputNumber min={0} />
diff --git a/src/pages/notificationChannels/pages/Form/Pagerduty.tsx b/src/pages/notificationChannels/pages/Form/Pagerduty.tsx
index c86cd494b..3da18bf6d 100644
--- a/src/pages/notificationChannels/pages/Form/Pagerduty.tsx
+++ b/src/pages/notificationChannels/pages/Form/Pagerduty.tsx
@@ -37,7 +37,7 @@ export default function Pagerduty() {
         <InputNumber min={0} className='w-full' />
       </Form.Item>
       <Form.Item label={t('pagerduty_request_config.retry_times')} name={[...names, 'retry_times']}>
-        <InputNumber min={0} className='w-full' />
+        <InputNumber min={1} className='w-full' />
       </Form.Item>
     </div>
   );
diff --git a/src/pages/notificationChannels/pages/Form/WecomApp.tsx b/src/pages/notificationChannels/pages/Form/WecomApp.tsx
index 64cee5861..ccb686fff 100644
--- a/src/pages/notificationChannels/pages/Form/WecomApp.tsx
+++ b/src/pages/notificationChannels/pages/Form/WecomApp.tsx
@@ -38,7 +38,7 @@ export default function WecomApp() {
               <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_times')} name={[...names, 'retry_times']} initialValue={3}>
-              <InputNumber min={0} className='w-full' />
+              <InputNumber min={1} className='w-full' />
             </Form.Item>
             <Form.Item label={t('http_request_config.retry_interval')} name={[...names, 'retry_interval']} initialValue={3}>
               <InputNumber min={0} className='w-full' />
diff --git a/src/pages/notificationTemplates/pages/List/index.tsx b/src/pages/notificationTemplates/pages/List/index.tsx
index be2eb8194..c105f734a 100644
--- a/src/pages/notificationTemplates/pages/List/index.tsx
+++ b/src/pages/notificationTemplates/pages/List/index.tsx
@@ -120,20 +120,13 @@ export default function ListCpt() {
                     }
                   }}
                 >
-                  <div className='flex justify-between w-full gap-1'>
-                    <span
-                      style={{
-                        wordBreak: 'break-all',
-                        lineHeight: 1.2,
-                      }}
-                    >
-                      {item.name}
-                    </span>
+                  <div className='flex justify-between w-full gap-1 leading-[1.2]'>
+                    <span className='break-all'>{item.name}</span>
                     {item.private === 0 && (
                       <span
+                        className='shrink-0'
                         style={{
                           color: 'var(--fc-text-5)',
-                          flexShrink: 0,
                         }}
                       >
                         {t('common:public')}
diff --git a/src/plugins/doris/ExplorerNG/index.tsx b/src/plugins/doris/ExplorerNG/index.tsx
index 5f21996d0..4f13c96c2 100644
--- a/src/plugins/doris/ExplorerNG/index.tsx
+++ b/src/plugins/doris/ExplorerNG/index.tsx
@@ -143,13 +143,28 @@ export default function index(props: Props) {
     if (defaultFormValuesControl?.isInited) {
       const datasourceValue = form.getFieldValue('datasourceValue');
       const queryValues = form.getFieldValue('query');
-      setOrganizeFields(
-        getOrganizeFieldsFromLocalstorage({
-          datasourceValue,
-          database: queryValues?.database,
-          table: queryValues?.table,
-        }),
-      );
+
+      // 优先使用 URL 传入的 organizeFields
+      const urlOrganizeFields = queryValues?.organizeFields;
+      if (urlOrganizeFields && _.isArray(urlOrganizeFields) && urlOrganizeFields.length > 0) {
+        setOrganizeFields(urlOrganizeFields);
+        setOrganizeFieldsToLocalstorage(
+          {
+            datasourceValue,
+            database: queryValues?.database,
+            table: queryValues?.table,
+          },
+          urlOrganizeFields,
+        );
+      } else {
+        setOrganizeFields(
+          getOrganizeFieldsFromLocalstorage({
+            datasourceValue,
+            database: queryValues?.database,
+            table: queryValues?.table,
+          }),
+        );
+      }
     }
   }, [defaultFormValuesControl?.isInited]);
 
diff --git a/src/plugins/elasticsearch/ExplorerNG/index.tsx b/src/plugins/elasticsearch/ExplorerNG/index.tsx
index b5db3577d..6f6782176 100644
--- a/src/plugins/elasticsearch/ExplorerNG/index.tsx
+++ b/src/plugins/elasticsearch/ExplorerNG/index.tsx
@@ -150,12 +150,26 @@ export default function index(props: Props) {
     if (defaultFormValuesControl?.isInited) {
       const datasourceValue = form.getFieldValue('datasourceValue');
       const queryValues = form.getFieldValue('query');
-      setOrganizeFields(
-        getOrganizeFieldsFromLocalstorage({
-          datasourceValue,
-          index: queryValues?.index,
-        }),
-      );
+
+      // 优先使用 URL 传入的 organizeFields
+      const urlOrganizeFields = queryValues?.organizeFields;
+      if (urlOrganizeFields && _.isArray(urlOrganizeFields) && urlOrganizeFields.length > 0) {
+        setOrganizeFields(urlOrganizeFields);
+        setOrganizeFieldsToLocalstorage(
+          {
+            datasourceValue,
+            index: queryValues?.index,
+          },
+          urlOrganizeFields,
+        );
+      } else {
+        setOrganizeFields(
+          getOrganizeFieldsFromLocalstorage({
+            datasourceValue,
+            index: queryValues?.index,
+          }),
+        );
+      }
     }
   }, [defaultFormValuesControl?.isInited]);
 
diff --git a/src/utils/flashcatFrom.test.ts b/src/utils/flashcatFrom.test.ts
new file mode 100644
index 000000000..d10db8e1a
--- /dev/null
+++ b/src/utils/flashcatFrom.test.ts
@@ -0,0 +1,61 @@
+import { withFlashcatFrom, initFlashcatFrom } from './flashcatFrom';
+
+const listeners: Record<string, (e: any) => void> = {};
+
+beforeAll(() => {
+  (global as any).window = { location: { href: 'http://localhost:17000/dashboards' } };
+  (global as any).document = {
+    addEventListener: (type: string, fn: (e: any) => void) => {
+      listeners[type] = fn;
+    },
+  };
+});
+
+afterAll(() => {
+  delete (global as any).window;
+  delete (global as any).document;
+});
+
+describe('withFlashcatFrom', () => {
+  it('appends from=n9e-user to flashcat.cloud and console links', () => {
+    expect(withFlashcatFrom('https://flashcat.cloud')).toBe('https://flashcat.cloud/?from=n9e-user');
+    expect(withFlashcatFrom('https://flashcat.cloud/product/flashduty/')).toBe('https://flashcat.cloud/product/flashduty/?from=n9e-user');
+    expect(withFlashcatFrom('https://console.flashcat.cloud/settings/source/alert/add/n9e')).toBe(
+      'https://console.flashcat.cloud/settings/source/alert/add/n9e?from=n9e-user',
+    );
+  });
+
+  it('preserves existing query and hash', () => {
+    expect(withFlashcatFrom('https://flashcat.cloud/media/?type=夜莺监控&source=abc')).toBe(
+      `https://flashcat.cloud/media/?type=${encodeURIComponent('夜莺监控')}&source=abc&from=n9e-user`,
+    );
+    expect(withFlashcatFrom('https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v9/quickstart/ad-hoc/#step1')).toBe(
+      'https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v9/quickstart/ad-hoc/?from=n9e-user#step1',
+    );
+  });
+
+  it('keeps links that already carry a from param', () => {
+    expect(withFlashcatFrom('https://flashcat.cloud/?from=custom')).toBe('https://flashcat.cloud/?from=custom');
+  });
+
+  it('leaves non-target hosts and ENT relative paths unchanged', () => {
+    expect(withFlashcatFrom('https://github.com/ccfos/nightingale')).toBe('https://github.com/ccfos/nightingale');
+    expect(withFlashcatFrom('https://download.flashcat.cloud/n9e.tar.gz')).toBe('https://download.flashcat.cloud/n9e.tar.gz');
+    expect(withFlashcatFrom('/docs/content/flashcat-monitor/nightingale-v9/')).toBe('/docs/content/flashcat-monitor/nightingale-v9/');
+  });
+});
+
+describe('initFlashcatFrom', () => {
+  it('rewrites anchor href on click before navigation', () => {
+    initFlashcatFrom();
+    const link = { href: 'https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v9/prologue/introduction/' };
+    const event = { target: { closest: () => link } };
+    listeners.click(event);
+    expect(link.href).toBe('https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v9/prologue/introduction/?from=n9e-user');
+  });
+
+  it('ignores clicks outside target links', () => {
+    const event = { target: { closest: () => null } };
+    expect(() => listeners.mousedown(event)).not.toThrow();
+  });
+});
diff --git a/src/utils/flashcatFrom.ts b/src/utils/flashcatFrom.ts
new file mode 100644
index 000000000..e92e09525
--- /dev/null
+++ b/src/utils/flashcatFrom.ts
@@ -0,0 +1,33 @@
+const FROM_PARAM = 'from';
+const FROM_VALUE = 'n9e-user';
+
+// 需要携带渠道参数的目标站点（快猫官网与 Flashduty 控制台）
+const TARGET_HOSTS = ['flashcat.cloud', 'www.flashcat.cloud', 'console.flashcat.cloud', 'flashduty.com', 'www.flashduty.com'];
+
+// 指向官网/控制台的链接补充 from=n9e-user 渠道参数；已带 from 的链接保留原值
+export function withFlashcatFrom(url: string): string {
+  try {
+    const u = new URL(url, window.location.href);
+    if (!TARGET_HOSTS.includes(u.hostname)) return url;
+    if (u.searchParams.get(FROM_PARAM)) return url;
+    u.searchParams.set(FROM_PARAM, FROM_VALUE);
+    return u.toString();
+  } catch (e) {
+    return url;
+  }
+}
+
+// 全局拦截 <a> 链接点击，在跳转发生前改写 href（覆盖散落各处的文档/官网链接，无需逐一修改）
+export function initFlashcatFrom() {
+  const rewriteLink = (e: Event) => {
+    const target = e.target as Element | null;
+    if (!target || typeof target.closest !== 'function') return;
+    const link = target.closest('a[href*="flashcat.cloud"], a[href*="flashduty.com"]') as HTMLAnchorElement | null;
+    if (link) {
+      link.href = withFlashcatFrom(link.href);
+    }
+  };
+  document.addEventListener('mousedown', rewriteLink, true);
+  document.addEventListener('touchstart', rewriteLink, true);
+  document.addEventListener('click', rewriteLink, true);
+}
diff --git a/src/utils/request.tsx b/src/utils/request.tsx
index a1b5bdb94..a23510924 100644
--- a/src/utils/request.tsx
+++ b/src/utils/request.tsx
@@ -9,12 +9,21 @@ import i18next from 'i18next';
 import { basePrefix } from '@/App';
 import ErrorWithDetail from '@/components/ErrorWithDetail';
 
+const getErrorStatus = (error: any) => {
+  return error?.response?.status ?? error?.status;
+};
+
+const isServiceUnavailableError = (error: any) => {
+  const status = getErrorStatus(error);
+  return status >= 500 && status < 600;
+};
+
 /** 异常处理程序，所有的error都被这里处理，页面无法感知具体error */
 const errorHandler = (error: ResponseError<any>): Response => {
   // 忽略掉 setting getter-only property "data" 的错误
   // 这是 umi-request 的一个 bug，当触发 abort 时 catch callback 里面不能 set data
   if (error.name !== 'AbortError' && error.message !== 'setting getter-only property "data"' && !Request.isCancel(error)) {
-    if (error.request.options.sourcePathname !== location.pathname) {
+    if (error.request?.options?.sourcePathname && error.request.options.sourcePathname !== location.pathname) {
       throw error;
     }
     // @ts-ignore
@@ -26,7 +35,7 @@ const errorHandler = (error: ResponseError<any>): Response => {
     }
     // 暂时认定只有开启 silence 的时候才需要传递 error 详情以便更加精确的处理错误
     // @ts-ignore
-    if (error.silence) {
+    if (error.silence || isServiceUnavailableError(error)) {
       throw error;
     } else {
       throw new Error(error.message);
@@ -144,6 +153,7 @@ request.interceptors.response.use(
                 silence: options.silence,
                 data,
                 response,
+                status,
               };
             }
           } else {
@@ -157,6 +167,7 @@ request.interceptors.response.use(
                 silence: options.silence,
                 data,
                 response,
+                status,
               };
             }
           }
@@ -208,9 +219,13 @@ request.interceptors.response.use(
             return data;
           });
       }
-    } else if ([502, 503, 504].includes(status)) {
+    } else if (status >= 500 && status < 600) {
       throw {
+        name: i18next.t('common:request_fail_msg'),
         message: i18next.t('common:request_fail_msg'),
+        silence: options.silence,
+        response,
+        status,
       };
     } else {
       return response
@@ -235,6 +250,8 @@ request.interceptors.response.use(
           throw {
             ...errObj,
             silence: options.silence,
+            response,
+            status,
           };
         });
     }