@dovetail-v2/refine 0.3.18-alpha.0 → 0.3.18

package/dist/components/Dropdowns/K8sDropdown/index.d.ts

@@ -1,4 +1,3 @@
-import { DeleteDialogProps } from '@cloudtower/eagle';
 import React from 'react';
 import { ResourceModel } from '../../../models';
 export type DropdownSize = 'normal' | 'large';
@@ -6,10 +5,6 @@ interface K8sDropdownProps {
     record: ResourceModel;
     size?: DropdownSize;
     customButton?: React.ReactNode;
-    resourceName?: string;
-    displayName?: string;
-    deleteDialogProps?: Partial<DeleteDialogProps>;
-    hideEdit?: boolean;
 }
 export declare function K8sDropdown(props: React.PropsWithChildren<K8sDropdownProps>): JSX.Element;
 export default K8sDropdown;

package/dist/components/InternalBaseTable/index.d.ts

@@ -36,8 +36,8 @@ export type InternalTableProps<Data extends {
     }>;
     empty?: string;
     showMenuColumn?: boolean;
-    hideNamespacesFilter?: boolean;
-    customNamespaceFilter?: React.ReactNode;
+    nonNsResource?: boolean;
+    customFilterBar?: React.ReactNode;
     onClearSearchKeyword?: () => void;
 };
 declare function Table<Data extends {

package/dist/components/ListPage/index.d.ts

@@ -6,8 +6,6 @@ interface ListPageProps<T extends ResourceModel> {
     tableProps: InternalTableProps<T>;
     contentClassName?: string;
     belowToolBarContent?: React.ReactNode;
-    customNamespaceFilter?: React.ReactNode;
-    isSearching?: boolean;
 }
 export declare function ListPage<T extends ResourceModel>(props: ListPageProps<T>): JSX.Element;
 export {};

package/dist/components/Table/index.d.ts

@@ -6,7 +6,6 @@ interface TableProps<Model extends ResourceModel> {
     tableProps: InternalTableProps<Model>;
     displayName: string;
     errorContentProps?: WidgetErrorContentProps;
-    isSearching?: boolean;
 }
 export declare function Table<Model extends ResourceModel>(props: TableProps<Model>): JSX.Element;
 export {};

package/dist/hooks/useDeleteModal/useDeleteModal.d.ts

@@ -1,14 +1,12 @@
 import { DeleteDialogProps } from '@cloudtower/eagle';
 type useDeleteDialogProps = {
     resourceName: string;
-    displayName?: string;
-    meta?: Record<string, string>;
     deleteDialogProps?: Partial<DeleteDialogProps>;
 };
 /**
  * 打开确认删除弹窗，如果失败会自动弹出回绝弹窗
  */
-export declare const useDeleteModal: ({ resourceName, displayName, meta, deleteDialogProps, }: useDeleteDialogProps) => {
+export declare const useDeleteModal: ({ resourceName, deleteDialogProps, }: useDeleteDialogProps) => {
     openDeleteConfirmModal: (id: string) => void;
     closeDeleteConfirmModal: () => void;
 };

package/dist/hooks/useDeleteModal/useDeleteModalOnly.d.ts

@@ -2,12 +2,10 @@ import { DeleteDialogProps } from '@cloudtower/eagle';
 import { HttpError } from '@refinedev/core';
 type useDeleteModalOnlyProps = {
     resource: string;
-    displayName?: string;
-    meta?: Record<string, string>;
     onError?: (resourceId: string, error?: HttpError) => void;
     deleteDialogProps?: Partial<DeleteDialogProps>;
 };
-export declare const useDeleteModalOnly: ({ resource: resourceFromProps, displayName: displayNameFromProps, deleteDialogProps, meta, onError, }: useDeleteModalOnlyProps) => {
+export declare const useDeleteModalOnly: ({ resource: resourceFromProps, deleteDialogProps, onError, }: useDeleteModalOnlyProps) => {
     openDeleteConfirmModal: (id: string) => void;
     closeDeleteConfirmModal: () => void;
 };

package/dist/hooks/useDeleteModal/useFailedModal.d.ts

@@ -1,7 +1,4 @@
-export declare const useFailedModal: (props: {
-    resource: string;
-    displayName?: string;
-}) => {
+export declare const useFailedModal: (resource: string) => {
     openFailedModal: (id: string, errorMsgs: string[]) => void;
     closeFailedModal: () => void;
 };

package/dist/hooks/useEagleTable/useEagleTable.d.ts

@@ -25,7 +25,6 @@ export declare function addDefaultRenderToColumns<Data, Col extends RequiredColu
     render(value: unknown): JSX.Element;
 } & Col)[];
 export declare const useEagleTable: <Model extends ResourceModel<import("k8s-api-provider").Unstructured>>(params: Params<Model>) => {
-    setCurrent: (current: number) => void;
     tableQueryResult: import("@tanstack/query-core").QueryObserverResult<import("@refinedev/core").GetListResponse<Model>, import("@refinedev/core").HttpError>;
     sorter: import("@refinedev/core").CrudSorting;
     sorters: import("@refinedev/core").CrudSorting;
@@ -43,6 +42,7 @@ export declare const useEagleTable: <Model extends ResourceModel<import("k8s-api
         filters: import("@refinedev/core").CrudFilters;
     }) => string;
     current: number;
+    setCurrent: (value: React.SetStateAction<number>) => void;
     pageSize: number;
     setPageSize: (value: React.SetStateAction<number>) => void;
     pageCount: number;

package/dist/refine.cjs

@@ -7433,21 +7433,18 @@ function transformResourceKindInSentence(str, language) {
 }
 const useDeleteModalOnly = ({
   resource: resourceFromProps,
-  displayName: displayNameFromProps,
   deleteDialogProps,
-  meta,
   onError
 }) => {
   const { resource } = core.useResource();
   const configs = React.useContext(ConfigsContext);
   const config = configs[resourceFromProps];
   const { mutateAsync } = core.useDelete();
-  const [deleting, setDeleting] = React.useState(false);
   const pushModal = eagle.usePushModal();
   const popModal = eagle.usePopModal();
   const navigation = core.useNavigation();
   const { t: t2, i18n: i18n2 } = common.useTranslation();
-  const displayName = displayNameFromProps || (config == null ? void 0 : config.displayName) || (meta == null ? void 0 : meta.kind) || (config == null ? void 0 : config.kind);
+  const displayName = config.displayName || config.kind;
   const resourceDisplayName = transformResourceKindInSentence(displayName, i18n2.language);
   function openDeleteConfirmModal(id) {
     pushModal({
@@ -7470,13 +7467,10 @@ const useDeleteModalOnly = ({
         ),
         secondaryDesc: t2("dovetail.delete_tip"),
         okText: t2("dovetail.delete"),
-        confirmLoading: deleting,
         onOk: async (popModal2) => {
           try {
-            setDeleting(true);
             await mutateAsync({
               resource: resourceFromProps,
-              meta,
               id,
               successNotification() {
                 return {
@@ -7500,7 +7494,6 @@ const useDeleteModalOnly = ({
             }
             popModal2();
           } finally {
-            setDeleting(false);
           }
         },
         ...deleteDialogProps
@@ -7509,14 +7502,13 @@ const useDeleteModalOnly = ({
   }
   return { openDeleteConfirmModal, closeDeleteConfirmModal: popModal };
 };
-const useFailedModal = (props) => {
-  const { resource, displayName: displayNameFromProps } = props;
+const useFailedModal = (resource) => {
   const configs = React.useContext(ConfigsContext);
   const config = configs[resource];
   const { t: t2, i18n: i18n2 } = common.useTranslation();
   const pushModal = eagle.usePushModal();
   const popModal = eagle.usePopModal();
-  const displayName = displayNameFromProps || (config == null ? void 0 : config.displayName) || (config == null ? void 0 : config.kind);
+  const displayName = config.displayName || config.kind;
   const resourceDisplayName = transformResourceKindInSentence(displayName, i18n2.language);
   function openFailedModal(id, errorMsgs) {
     pushModal({
@@ -7550,25 +7542,15 @@ const useFailedModal = (props) => {
 };
 const useDeleteModal = ({
   resourceName,
-  displayName,
-  meta,
   deleteDialogProps
 }) => {
   const { i18n: i18n2 } = common.useTranslation();
   const configs = React.useContext(ConfigsContext);
   const config = configs[resourceName];
-  const { openFailedModal } = useFailedModal({
-    resource: resourceName,
-    displayName
-  });
+  const { openFailedModal } = useFailedModal(resourceName);
   const { openDeleteConfirmModal, closeDeleteConfirmModal } = useDeleteModalOnly({
     resource: resourceName,
-    displayName,
-    meta,
-    deleteDialogProps: {
-      secondaryDesc: (config == null ? void 0 : config.deleteTip) || i18n2.t("dovetail.delete_tip"),
-      ...deleteDialogProps
-    },
+    deleteDialogProps: { secondaryDesc: config.deleteTip, ...deleteDialogProps },
     onError: async (id, error) => {
       closeDeleteConfirmModal();
       openFailedModal(id, getCommonErrors(await (error == null ? void 0 : error.response.json()), i18n2));
@@ -10203,7 +10185,7 @@ const ServiceOutClusterAccessComponent = ({
     case ServiceTypeEnum.NodePort:
       if (!breakLine) {
         content = (_a = spec.ports) == null ? void 0 : _a.filter((v) => !!v).map((p) => [/* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Link, {
-          href: `//${clusterVip}:${p.nodePort}`,
+          href: `http://${clusterVip}:${p.nodePort}`,
           target: "_blank",
           className: common.cx_default(LinkStyle$2, eagle.Typo.Label.l4_regular_title),
           children: `${clusterVip}:${p.nodePort}`
@@ -10222,7 +10204,7 @@ const ServiceOutClusterAccessComponent = ({
       }
       content = (_b = spec.ports) == null ? void 0 : _b.filter((v) => !!v).map((p) => /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.OverflowTooltip, {
         content: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Link, {
-          href: `//${clusterVip}:${p.nodePort}`,
+          href: `http://${clusterVip}:${p.nodePort}`,
           target: "_blank",
           className: common.cx_default(eagle.Typo.Label.l4_regular_title, BreakLineStyle, LinkStyle$2),
           children: [clusterVip, ":", p.nodePort]
@@ -10258,7 +10240,8 @@ const ServiceOutClusterAccessComponent = ({
   }
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
     style: {
-      whiteSpace: "pre-wrap"
+      whiteSpace: "pre-wrap",
+      color: "#0080ff"
     },
     children: content || "-"
   });
@@ -10832,34 +10815,18 @@ function validateNodePort(nodePort, allNodePorts, i18n2) {
   return { isValid: true };
 }
 function K8sDropdown(props) {
-  var _a, _b, _c;
-  const {
-    record,
-    size = "normal",
-    resourceName: resourceNameFromProps,
-    customButton,
-    deleteDialogProps,
-    displayName,
-    hideEdit
-  } = props;
+  var _a, _b;
+  const { record, size = "normal", customButton } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = core.useResource();
   const configs = React.useContext(ConfigsContext);
-  const resourceName = resourceNameFromProps || getResourceNameByKind(record.kind || "", configs);
+  const resourceName = getResourceNameByKind(record.kind || "", configs);
   const config = configs[resourceName || ""];
   const { t: t2, i18n: i18n2 } = common.useTranslation();
-  const { openDeleteConfirmModal } = useDeleteModal({
-    resourceName: resourceName || "",
-    deleteDialogProps,
-    displayName,
-    meta: record.apiVersion ? {
-      kind: record.kind || "",
-      resourceBasePath: (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
-    } : void 0
-  });
+  const { openDeleteConfirmModal } = useDeleteModal({ resourceName: resourceName || "" });
   const download2 = useDownloadYAML();
   const openForm = useOpenForm();
-  const isInShowPage = useResourceResult.action === "show" && ((_b = useResourceResult.resource) == null ? void 0 : _b.name) === resourceName;
+  const isInShowPage = useResourceResult.action === "show" && ((_a = useResourceResult.resource) == null ? void 0 : _a.name) === config.name;
   const { data: canEditData } = core.useCan({
     resource: resourceName,
     action: AccessControlAuth.Edit,
@@ -10874,12 +10841,12 @@ function K8sDropdown(props) {
       namespace: record.namespace
     }
   });
-  const formType = (_c = config == null ? void 0 : config.formConfig) == null ? void 0 : _c.formType;
+  const formType = ((_b = config.formConfig) == null ? void 0 : _b.formType) || FormType.FORM;
   return /* @__PURE__ */ common.jsxRuntimeExports.jsx(common.jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(
     eagle.Dropdown,
     {
       overlay: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.Menu, { children: [
-        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Menu.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || config.hideEdit ? null : /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Menu.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Icon, { src: iconsReact.EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
           (config == null ? void 0 : config.displayName) || record.kind || "",
           i18n2.language
         )}` : t2("dovetail.edit_yaml") }) }),
@@ -10944,7 +10911,12 @@ var ColumnKeys = /* @__PURE__ */ ((ColumnKeys2) => {
 function addDefaultRenderToColumns(columns) {
   return columns.map((col) => ({
     render(value2) {
-      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(ValueDisplay, { value: value2 });
+      return /* @__PURE__ */ common.jsxRuntimeExports.jsx(
+        ValueDisplay,
+        {
+          value: value2
+        }
+      );
     },
     ...col
   }));
@@ -10980,23 +10952,18 @@ const useEagleTable = (params) => {
     },
     [setCurrentPage, table]
   );
-  const onSorterChange = React.useCallback(
-    (order, key2) => {
-      var _a2;
-      const ORDER_MAP = {
-        descend: "desc",
-        ascend: "asc"
-      };
-      const sorters = [
-        {
-          field: (_a2 = columns.find((col) => col.key === key2)) == null ? void 0 : _a2.dataIndex,
-          order: order ? ORDER_MAP[order] : order
-        }
-      ];
-      table.setSorters(sorters);
-    },
-    [table, columns]
-  );
+  const onSorterChange = React.useCallback((order, key2) => {
+    var _a2;
+    const ORDER_MAP = {
+      descend: "desc",
+      ascend: "asc"
+    };
+    const sorters = [{
+      field: (_a2 = columns.find((col) => col.key === key2)) == null ? void 0 : _a2.dataIndex,
+      order: order ? ORDER_MAP[order] : order
+    }];
+    table.setSorters(sorters);
+  }, [table, columns]);
   const data2 = (_a = table.tableQueryResult.data) == null ? void 0 : _a.data;
   const total = ((_b = table.tableQueryResult.data) == null ? void 0 : _b.total) || 0;
   const finalDataSource = formatter ? data2 == null ? void 0 : data2.map(formatter) : data2;
@@ -11019,23 +10986,12 @@ const useEagleTable = (params) => {
     defaultSize: currentSize
   };
   React.useEffect(() => {
-    table.setSorters([
-      {
-        field: "metadata.creationTimestamp",
-        order: "desc"
-      }
-    ]);
+    table.setSorters([{
+      field: "metadata.creationTimestamp",
+      order: "desc"
+    }]);
   }, []);
-  return {
-    tableProps: finalProps,
-    selectedKeys,
-    ...table,
-    setCurrent: (current) => {
-      var _a2;
-      setCurrentPage(current);
-      (_a2 = table.setCurrent) == null ? void 0 : _a2.call(table, current);
-    }
-  };
+  return { tableProps: finalProps, selectedKeys, ...table };
 };
 function CreateButton(props) {
   var _a;
@@ -12210,7 +12166,7 @@ function PVVolumeModeDisplay(props) {
 }
 function Table(props) {
   var _a;
-  const { tableProps, displayName, errorContentProps, isSearching } = props;
+  const { tableProps, displayName, errorContentProps } = props;
   const { Table: TableComponent } = React.useContext(ComponentContext);
   const Table2 = TableComponent || Table$1;
   const { params } = core.useParsed();
@@ -12218,7 +12174,7 @@ function Table(props) {
   const resourceType = transformResourceKindInSentence(displayName, i18n2.language);
   if (!((_a = tableProps.data) == null ? void 0 : _a.length) && !tableProps.loading) {
     const nameKeyword = (params == null ? void 0 : params[NAME_KEYWORD_PARAM]) || "";
-    if (nameKeyword || isSearching) {
+    if (nameKeyword) {
       const onClear = () => {
         var _a2;
         (_a2 = tableProps.onClearSearchKeyword) == null ? void 0 : _a2.call(tableProps);
@@ -14411,7 +14367,7 @@ const useNamespacesFilter = () => {
     resource
   } = core.useResource();
   const configs = React.useContext(ConfigsContext);
-  if ((resource == null ? void 0 : resource.name) && configs[resource == null ? void 0 : resource.name].hideNamespacesFilter) {
+  if ((resource == null ? void 0 : resource.name) && configs[resource == null ? void 0 : resource.name].nonNsResource) {
     return {
       value: []
     };
@@ -14592,9 +14548,7 @@ function ListPage(props) {
     selectedKeys,
     tableProps,
     contentClassName,
-    belowToolBarContent,
-    customNamespaceFilter,
-    isSearching
+    belowToolBarContent
   } = props;
   const {
     resource
@@ -14619,12 +14573,12 @@ function ListPage(props) {
       })]
     }) : void 0, /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
       className: common.cx_default(ListContentStyle, contentClassName),
-      style: config.hideNamespacesFilter ? {
+      style: !config.customFilterBar && config.nonNsResource ? {
         paddingTop: 0
       } : {},
-      children: [!config.hideNamespacesFilter ? customNamespaceFilter || config.customNamespaceFilter || /* @__PURE__ */ common.jsxRuntimeExports.jsx(NamespacesFilter, {
+      children: [config.customFilterBar || !config.nonNsResource && /* @__PURE__ */ common.jsxRuntimeExports.jsx(NamespacesFilter, {
         className: NamespaceFilterStyle
-      }) : void 0, /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
+      }), /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
         className: TableStyle,
         children: /* @__PURE__ */ common.jsxRuntimeExports.jsx(Table, {
           tableProps: {
@@ -14633,8 +14587,7 @@ function ListPage(props) {
               y: "calc(100% - 48px)"
             }
           },
-          displayName: (config == null ? void 0 : config.displayName) || config.kind,
-          isSearching
+          displayName: (config == null ? void 0 : config.displayName) || config.kind
         })
       })]
     })]

package/dist/refine.js

@@ -7414,21 +7414,18 @@ function transformResourceKindInSentence(str, language) {
 }
 const useDeleteModalOnly = ({
   resource: resourceFromProps,
-  displayName: displayNameFromProps,
   deleteDialogProps,
-  meta,
   onError
 }) => {
   const { resource } = useResource();
   const configs = useContext(ConfigsContext);
   const config = configs[resourceFromProps];
   const { mutateAsync } = useDelete();
-  const [deleting, setDeleting] = useState(false);
   const pushModal = usePushModal();
   const popModal = usePopModal();
   const navigation = useNavigation();
   const { t: t2, i18n: i18n2 } = useTranslation();
-  const displayName = displayNameFromProps || (config == null ? void 0 : config.displayName) || (meta == null ? void 0 : meta.kind) || (config == null ? void 0 : config.kind);
+  const displayName = config.displayName || config.kind;
   const resourceDisplayName = transformResourceKindInSentence(displayName, i18n2.language);
   function openDeleteConfirmModal(id) {
     pushModal({
@@ -7451,13 +7448,10 @@ const useDeleteModalOnly = ({
         ),
         secondaryDesc: t2("dovetail.delete_tip"),
         okText: t2("dovetail.delete"),
-        confirmLoading: deleting,
         onOk: async (popModal2) => {
           try {
-            setDeleting(true);
             await mutateAsync({
               resource: resourceFromProps,
-              meta,
               id,
               successNotification() {
                 return {
@@ -7481,7 +7475,6 @@ const useDeleteModalOnly = ({
             }
             popModal2();
           } finally {
-            setDeleting(false);
           }
         },
         ...deleteDialogProps
@@ -7490,14 +7483,13 @@ const useDeleteModalOnly = ({
   }
   return { openDeleteConfirmModal, closeDeleteConfirmModal: popModal };
 };
-const useFailedModal = (props) => {
-  const { resource, displayName: displayNameFromProps } = props;
+const useFailedModal = (resource) => {
   const configs = useContext(ConfigsContext);
   const config = configs[resource];
   const { t: t2, i18n: i18n2 } = useTranslation();
   const pushModal = usePushModal();
   const popModal = usePopModal();
-  const displayName = displayNameFromProps || (config == null ? void 0 : config.displayName) || (config == null ? void 0 : config.kind);
+  const displayName = config.displayName || config.kind;
   const resourceDisplayName = transformResourceKindInSentence(displayName, i18n2.language);
   function openFailedModal(id, errorMsgs) {
     pushModal({
@@ -7531,25 +7523,15 @@ const useFailedModal = (props) => {
 };
 const useDeleteModal = ({
   resourceName,
-  displayName,
-  meta,
   deleteDialogProps
 }) => {
   const { i18n: i18n2 } = useTranslation();
   const configs = useContext(ConfigsContext);
   const config = configs[resourceName];
-  const { openFailedModal } = useFailedModal({
-    resource: resourceName,
-    displayName
-  });
+  const { openFailedModal } = useFailedModal(resourceName);
   const { openDeleteConfirmModal, closeDeleteConfirmModal } = useDeleteModalOnly({
     resource: resourceName,
-    displayName,
-    meta,
-    deleteDialogProps: {
-      secondaryDesc: (config == null ? void 0 : config.deleteTip) || i18n2.t("dovetail.delete_tip"),
-      ...deleteDialogProps
-    },
+    deleteDialogProps: { secondaryDesc: config.deleteTip, ...deleteDialogProps },
     onError: async (id, error) => {
       closeDeleteConfirmModal();
       openFailedModal(id, getCommonErrors(await (error == null ? void 0 : error.response.json()), i18n2));
@@ -10184,7 +10166,7 @@ const ServiceOutClusterAccessComponent = ({
     case ServiceTypeEnum.NodePort:
       if (!breakLine) {
         content = (_a = spec.ports) == null ? void 0 : _a.filter((v) => !!v).map((p) => [/* @__PURE__ */ jsxRuntimeExports.jsx(Link$1, {
-          href: `//${clusterVip}:${p.nodePort}`,
+          href: `http://${clusterVip}:${p.nodePort}`,
           target: "_blank",
           className: cx_default(LinkStyle$2, Typo.Label.l4_regular_title),
           children: `${clusterVip}:${p.nodePort}`
@@ -10203,7 +10185,7 @@ const ServiceOutClusterAccessComponent = ({
       }
       content = (_b = spec.ports) == null ? void 0 : _b.filter((v) => !!v).map((p) => /* @__PURE__ */ jsxRuntimeExports.jsx(OverflowTooltip, {
         content: /* @__PURE__ */ jsxRuntimeExports.jsxs(Link$1, {
-          href: `//${clusterVip}:${p.nodePort}`,
+          href: `http://${clusterVip}:${p.nodePort}`,
           target: "_blank",
           className: cx_default(Typo.Label.l4_regular_title, BreakLineStyle, LinkStyle$2),
           children: [clusterVip, ":", p.nodePort]
@@ -10239,7 +10221,8 @@ const ServiceOutClusterAccessComponent = ({
   }
   return /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
     style: {
-      whiteSpace: "pre-wrap"
+      whiteSpace: "pre-wrap",
+      color: "#0080ff"
     },
     children: content || "-"
   });
@@ -10813,34 +10796,18 @@ function validateNodePort(nodePort, allNodePorts, i18n2) {
   return { isValid: true };
 }
 function K8sDropdown(props) {
-  var _a, _b, _c;
-  const {
-    record,
-    size = "normal",
-    resourceName: resourceNameFromProps,
-    customButton,
-    deleteDialogProps,
-    displayName,
-    hideEdit
-  } = props;
+  var _a, _b;
+  const { record, size = "normal", customButton } = props;
   const globalStore = useGlobalStore();
   const useResourceResult = useResource();
   const configs = useContext(ConfigsContext);
-  const resourceName = resourceNameFromProps || getResourceNameByKind(record.kind || "", configs);
+  const resourceName = getResourceNameByKind(record.kind || "", configs);
   const config = configs[resourceName || ""];
   const { t: t2, i18n: i18n2 } = useTranslation();
-  const { openDeleteConfirmModal } = useDeleteModal({
-    resourceName: resourceName || "",
-    deleteDialogProps,
-    displayName,
-    meta: record.apiVersion ? {
-      kind: record.kind || "",
-      resourceBasePath: (((_a = record.apiVersion) == null ? void 0 : _a.includes("/")) ? "apis" : "api") + `/${record.apiVersion}`
-    } : void 0
-  });
+  const { openDeleteConfirmModal } = useDeleteModal({ resourceName: resourceName || "" });
   const download2 = useDownloadYAML();
   const openForm = useOpenForm();
-  const isInShowPage = useResourceResult.action === "show" && ((_b = useResourceResult.resource) == null ? void 0 : _b.name) === resourceName;
+  const isInShowPage = useResourceResult.action === "show" && ((_a = useResourceResult.resource) == null ? void 0 : _a.name) === config.name;
   const { data: canEditData } = useCan({
     resource: resourceName,
     action: AccessControlAuth.Edit,
@@ -10855,12 +10822,12 @@ function K8sDropdown(props) {
       namespace: record.namespace
     }
   });
-  const formType = (_c = config == null ? void 0 : config.formConfig) == null ? void 0 : _c.formType;
+  const formType = ((_b = config.formConfig) == null ? void 0 : _b.formType) || FormType.FORM;
   return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     Dropdown,
     {
       overlay: /* @__PURE__ */ jsxRuntimeExports.jsxs(Menu$1, { children: [
-        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || hideEdit || (config == null ? void 0 : config.hideEdit) ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(Menu$1.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { src: EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
+        isInShowPage || (canEditData == null ? void 0 : canEditData.can) === false || config.hideEdit ? null : /* @__PURE__ */ jsxRuntimeExports.jsx(Menu$1.Item, { onClick: () => openForm({ id: record.id, resourceName }), children: /* @__PURE__ */ jsxRuntimeExports.jsx(Icon, { src: EditPen16PrimaryIcon, children: formType === FormType.FORM ? `${t2("dovetail.edit")}${transformResourceKindInSentence(
           (config == null ? void 0 : config.displayName) || record.kind || "",
           i18n2.language
         )}` : t2("dovetail.edit_yaml") }) }),
@@ -10925,7 +10892,12 @@ var ColumnKeys = /* @__PURE__ */ ((ColumnKeys2) => {
 function addDefaultRenderToColumns(columns) {
   return columns.map((col) => ({
     render(value2) {
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(ValueDisplay, { value: value2 });
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(
+        ValueDisplay,
+        {
+          value: value2
+        }
+      );
     },
     ...col
   }));
@@ -10961,23 +10933,18 @@ const useEagleTable = (params) => {
     },
     [setCurrentPage, table]
   );
-  const onSorterChange = useCallback(
-    (order, key2) => {
-      var _a2;
-      const ORDER_MAP = {
-        descend: "desc",
-        ascend: "asc"
-      };
-      const sorters = [
-        {
-          field: (_a2 = columns.find((col) => col.key === key2)) == null ? void 0 : _a2.dataIndex,
-          order: order ? ORDER_MAP[order] : order
-        }
-      ];
-      table.setSorters(sorters);
-    },
-    [table, columns]
-  );
+  const onSorterChange = useCallback((order, key2) => {
+    var _a2;
+    const ORDER_MAP = {
+      descend: "desc",
+      ascend: "asc"
+    };
+    const sorters = [{
+      field: (_a2 = columns.find((col) => col.key === key2)) == null ? void 0 : _a2.dataIndex,
+      order: order ? ORDER_MAP[order] : order
+    }];
+    table.setSorters(sorters);
+  }, [table, columns]);
   const data2 = (_a = table.tableQueryResult.data) == null ? void 0 : _a.data;
   const total = ((_b = table.tableQueryResult.data) == null ? void 0 : _b.total) || 0;
   const finalDataSource = formatter ? data2 == null ? void 0 : data2.map(formatter) : data2;
@@ -11000,23 +10967,12 @@ const useEagleTable = (params) => {
     defaultSize: currentSize
   };
   useEffect(() => {
-    table.setSorters([
-      {
-        field: "metadata.creationTimestamp",
-        order: "desc"
-      }
-    ]);
+    table.setSorters([{
+      field: "metadata.creationTimestamp",
+      order: "desc"
+    }]);
   }, []);
-  return {
-    tableProps: finalProps,
-    selectedKeys,
-    ...table,
-    setCurrent: (current) => {
-      var _a2;
-      setCurrentPage(current);
-      (_a2 = table.setCurrent) == null ? void 0 : _a2.call(table, current);
-    }
-  };
+  return { tableProps: finalProps, selectedKeys, ...table };
 };
 function CreateButton(props) {
   var _a;
@@ -12191,7 +12147,7 @@ function PVVolumeModeDisplay(props) {
 }
 function Table(props) {
   var _a;
-  const { tableProps, displayName, errorContentProps, isSearching } = props;
+  const { tableProps, displayName, errorContentProps } = props;
   const { Table: TableComponent } = useContext(ComponentContext);
   const Table2 = TableComponent || Table$1;
   const { params } = useParsed();
@@ -12199,7 +12155,7 @@ function Table(props) {
   const resourceType = transformResourceKindInSentence(displayName, i18n2.language);
   if (!((_a = tableProps.data) == null ? void 0 : _a.length) && !tableProps.loading) {
     const nameKeyword = (params == null ? void 0 : params[NAME_KEYWORD_PARAM]) || "";
-    if (nameKeyword || isSearching) {
+    if (nameKeyword) {
       const onClear = () => {
         var _a2;
         (_a2 = tableProps.onClearSearchKeyword) == null ? void 0 : _a2.call(tableProps);
@@ -14392,7 +14348,7 @@ const useNamespacesFilter = () => {
     resource
   } = useResource();
   const configs = useContext(ConfigsContext);
-  if ((resource == null ? void 0 : resource.name) && configs[resource == null ? void 0 : resource.name].hideNamespacesFilter) {
+  if ((resource == null ? void 0 : resource.name) && configs[resource == null ? void 0 : resource.name].nonNsResource) {
     return {
       value: []
     };
@@ -14573,9 +14529,7 @@ function ListPage(props) {
     selectedKeys,
     tableProps,
     contentClassName,
-    belowToolBarContent,
-    customNamespaceFilter,
-    isSearching
+    belowToolBarContent
   } = props;
   const {
     resource
@@ -14600,12 +14554,12 @@ function ListPage(props) {
       })]
     }) : void 0, /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
       className: cx_default(ListContentStyle, contentClassName),
-      style: config.hideNamespacesFilter ? {
+      style: !config.customFilterBar && config.nonNsResource ? {
         paddingTop: 0
       } : {},
-      children: [!config.hideNamespacesFilter ? customNamespaceFilter || config.customNamespaceFilter || /* @__PURE__ */ jsxRuntimeExports.jsx(NamespacesFilter, {
+      children: [config.customFilterBar || !config.nonNsResource && /* @__PURE__ */ jsxRuntimeExports.jsx(NamespacesFilter, {
         className: NamespaceFilterStyle
-      }) : void 0, /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
+      }), /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
         className: TableStyle,
         children: /* @__PURE__ */ jsxRuntimeExports.jsx(Table, {
           tableProps: {
@@ -14614,8 +14568,7 @@ function ListPage(props) {
               y: "calc(100% - 48px)"
             }
           },
-          displayName: (config == null ? void 0 : config.displayName) || config.kind,
-          isSearching
+          displayName: (config == null ? void 0 : config.displayName) || config.kind
         })
       })]
     })]

package/dist/types/resource.d.ts

@@ -171,10 +171,10 @@ export type ResourceConfig<Model extends ResourceModel = ResourceModel> = {
     displayName?: string;
     /** 是否隐藏列表页的工具栏。会连标题和描述一起去掉 */
     hideListToolBar?: boolean;
-    /** 是否隐藏命名空间过滤器 */
-    hideNamespacesFilter?: boolean;
-    /** 自定义命名空间过滤器 */
-    customNamespaceFilter?: React.ReactNode;
+    /** 非命名空间资源，不展示默认的 NsFilter，并且禁用根据 ns 筛选的逻辑 */
+    nonNsResource?: boolean;
+    /** 自定义过滤栏 */
+    customFilterBar?: React.ReactNode;
     /** 是否隐藏编辑功能。会隐藏 Dropdown 和详情中的编辑按钮 */
     hideEdit?: boolean;
     /** 是否隐藏创建功能 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.3.18-alpha.0",
+  "version": "0.3.18",
   "type": "module",
   "files": [
     "dist",