@creekjs/web-components 1.0.3 → 1.0.4

package/.turbo/turbo-father$colon$build.log

@@ -3,3 +3,37 @@
 > @creekjs/web-components@1.0.3 father:build /Users/ernestwang/Documents/code-resoorce/creek/packages/web-components
 > father build
 
+info  - Clean output directories
+info  - Bundless for src directory to cjs format
+event - Bundless index.tsx to dist/creek-config-provider/index.js (with declaration)
+event - Bundless CreekConfigContext.tsx to dist/creek-config-provider/CreekConfigContext.js (with declaration)
+event - Bundless index.ts to dist/creek-hooks/index.js (with declaration)
+event - Bundless DrawerHelper.tsx to dist/creek-hooks/useApp/DrawerHelper.js (with declaration)
+event - Bundless index.tsx to dist/creek-hooks/useApp/index.js (with declaration)
+event - Bundless ModalHelper.tsx to dist/creek-hooks/useApp/ModalHelper.js (with declaration)
+event - Bundless types.ts to dist/creek-hooks/useApp/types.js (with declaration)
+event - Bundless useViewportHeight.tsx to dist/creek-hooks/useViewportHeight.js (with declaration)
+event - Bundless index.tsx to dist/creek-icon/index.js (with declaration)
+event - Bundless index.tsx to dist/creek-keep-alive/index.js (with declaration)
+event - Bundless CollapseButton.tsx to dist/creek-layout/CollapseButton.js (with declaration)
+event - Bundless NotFound.tsx to dist/creek-layout/Exception/NotFound.js (with declaration)
+event - Bundless index.tsx to dist/creek-layout/Exception/index.js (with declaration)
+event - Bundless NotFoundPage.tsx to dist/creek-layout/Exception/NotFoundPage.js (with declaration)
+event - Bundless FullScreen.tsx to dist/creek-layout/HeaderContent/FullScreen.js (with declaration)
+event - Bundless UserInfo.tsx to dist/creek-layout/HeaderContent/UserInfo.js (with declaration)
+event - Bundless index.tsx to dist/creek-layout/HeaderContent/index.js (with declaration)
+event - Bundless index.tsx to dist/creek-layout/index.js (with declaration)
+event - Bundless index.tsx to dist/creek-loading/index.js (with declaration)
+event - Bundless useAdaptiveToolBar.tsx to dist/creek-table/hooks/useAdaptiveToolBar.js (with declaration)
+event - Bundless index.ts to dist/creek-table/hooks/index.js (with declaration)
+event - Bundless useAutoWidthColumns.tsx to dist/creek-table/hooks/useAutoWidthColumns.js (with declaration)
+event - Bundless useTableScrollHeight.tsx to dist/creek-table/hooks/useTableScrollHeight.js (with declaration)
+event - Bundless TableOptionRender.tsx to dist/creek-table/TableOptionRender.js (with declaration)
+event - Bundless index.tsx to dist/creek-table/index.js (with declaration)
+event - Bundless useElementDistance.tsx to dist/creek-table/hooks/useElementDistance.js (with declaration)
+event - Bundless type.ts to dist/creek-table/type.js (with declaration)
+event - Bundless toolBarRender.tsx to dist/creek-table/toolBarRender.js (with declaration)
+event - Bundless index.tsx to dist/index.js (with declaration)
+event - Bundless SearchTable.tsx to dist/creek-table/SearchTable.js (with declaration)
+event - Generate declaration files...
+event - Transformed successfully in 13711 ms (30 files)

package/dist/creek-hooks/useApp/DrawerHelper.js

@@ -35,7 +35,7 @@ var DrawerHelper = ({ open, config, onClose }) => {
         open,
         onOpenChange: (visible) => !visible && onClose(),
         drawerProps: {
-          destroyOnClose: true,
+          destroyOnHidden: true,
           onClose,
           ...config.drawerProps || {}
         },
@@ -49,7 +49,7 @@ var DrawerHelper = ({ open, config, onClose }) => {
     {
       open,
       onClose,
-      destroyOnClose: true,
+      destroyOnHidden: true,
       ...restConfig,
       children: content
     }

package/dist/creek-hooks/useApp/DrawerHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/creek-hooks/useApp/DrawerHelper.tsx"],
-  "sourcesContent": ["import { DrawerForm } from '@ant-design/pro-components';\nimport { Drawer } from 'antd';\nimport { omit } from 'lodash';\nimport React from 'react';\nimport { DrawerConfig, FormDrawerConfig, NormalDrawerConfig } from './types';\n\ninterface DrawerHelperProps {\n  open: boolean;\n  config: DrawerConfig;\n  onClose: () => void;\n}\n\nexport const DrawerHelper: React.FC<DrawerHelperProps> = ({ open, config, onClose }) => {\n  const { content, type, ...restConfig } = config;\n\n  if (type === 'form') {\n    return (\n      <DrawerForm\n        open={open}\n        onOpenChange={(visible) => !visible && onClose()}\n        drawerProps={{\n          destroyOnClose: true,\n          onClose,\n          ...((config as FormDrawerConfig).drawerProps || {}),\n        }}\n        {...(omit(restConfig, 'drawerProps') as any)}\n      >\n        {content}\n      </DrawerForm>\n    );\n  }\n\n  return (\n    <Drawer\n      open={open}\n      onClose={onClose}\n      destroyOnClose\n      {...(restConfig as NormalDrawerConfig)}\n    >\n      {content}\n    </Drawer>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2B;AAC3B,kBAAuB;AACvB,oBAAqB;AAef;AALC,IAAM,eAA4C,CAAC,EAAE,MAAM,QAAQ,QAAQ,MAAM;AACtF,QAAM,EAAE,SAAS,MAAM,GAAG,WAAW,IAAI;AAEzC,MAAI,SAAS,QAAQ;AACnB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,cAAc,CAAC,YAAY,CAAC,WAAW,QAAQ;AAAA,QAC/C,aAAa;AAAA,UACX,gBAAgB;AAAA,UAChB;AAAA,UACA,GAAK,OAA4B,eAAe,CAAC;AAAA,QACnD;AAAA,QACC,OAAI,oBAAK,YAAY,aAAa;AAAA,QAElC;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,gBAAc;AAAA,MACb,GAAI;AAAA,MAEJ;AAAA;AAAA,EACH;AAEJ;",
+  "sourcesContent": ["import { DrawerForm } from '@ant-design/pro-components';\nimport { Drawer } from 'antd';\nimport { omit } from 'lodash';\nimport React from 'react';\nimport { DrawerConfig, FormDrawerConfig, NormalDrawerConfig } from './types';\n\ninterface DrawerHelperProps {\n  open: boolean;\n  config: DrawerConfig;\n  onClose: () => void;\n}\n\nexport const DrawerHelper: React.FC<DrawerHelperProps> = ({ open, config, onClose }) => {\n  const { content, type, ...restConfig } = config;\n\n  if (type === 'form') {\n    return (\n      <DrawerForm\n        open={open}\n        onOpenChange={(visible) => !visible && onClose()}\n        drawerProps={{\n          destroyOnHidden: true,\n          onClose,\n          ...((config as FormDrawerConfig).drawerProps || {}),\n        }}\n        {...(omit(restConfig, 'drawerProps') as any)}\n      >\n        {content}\n      </DrawerForm>\n    );\n  }\n\n  return (\n    <Drawer\n      open={open}\n      onClose={onClose}\n      destroyOnHidden\n      {...(restConfig as NormalDrawerConfig)}\n    >\n      {content}\n    </Drawer>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA2B;AAC3B,kBAAuB;AACvB,oBAAqB;AAef;AALC,IAAM,eAA4C,CAAC,EAAE,MAAM,QAAQ,QAAQ,MAAM;AACtF,QAAM,EAAE,SAAS,MAAM,GAAG,WAAW,IAAI;AAEzC,MAAI,SAAS,QAAQ;AACnB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,cAAc,CAAC,YAAY,CAAC,WAAW,QAAQ;AAAA,QAC/C,aAAa;AAAA,UACX,iBAAiB;AAAA,UACjB;AAAA,UACA,GAAK,OAA4B,eAAe,CAAC;AAAA,QACnD;AAAA,QACC,OAAI,oBAAK,YAAY,aAAa;AAAA,QAElC;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,iBAAe;AAAA,MACd,GAAI;AAAA,MAEJ;AAAA;AAAA,EACH;AAEJ;",
   "names": []
 }

package/dist/creek-hooks/useApp/ModalHelper.js

@@ -35,7 +35,7 @@ var ModalHelper = ({ open, config, onClose }) => {
         open,
         onOpenChange: (visible) => !visible && onClose(),
         modalProps: {
-          destroyOnClose: true,
+          destroyOnHidden: true,
           onCancel: onClose,
           ...config.modalProps || {}
         },
@@ -49,7 +49,7 @@ var ModalHelper = ({ open, config, onClose }) => {
     {
       open,
       onCancel: onClose,
-      destroyOnClose: true,
+      destroyOnHidden: true,
       ...restConfig,
       children: content
     }

package/dist/creek-hooks/useApp/ModalHelper.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/creek-hooks/useApp/ModalHelper.tsx"],
-  "sourcesContent": ["import { ModalForm } from '@ant-design/pro-components';\nimport { Modal } from 'antd';\nimport { omit } from 'lodash';\nimport React from 'react';\nimport { FormModalConfig, ModalConfig, NormalModalConfig } from './types';\n\ninterface ModalHelperProps {\n  open: boolean;\n  config: ModalConfig;\n  onClose: () => void;\n}\n\nexport const ModalHelper: React.FC<ModalHelperProps> = ({ open, config, onClose }) => {\n  const { content, type, ...restConfig } = config;\n\n  if (type === 'form') {\n    return (\n      <ModalForm\n        open={open}\n        onOpenChange={(visible) => !visible && onClose()}\n        modalProps={{\n          destroyOnClose: true,\n          onCancel: onClose,\n          ...((config as FormModalConfig).modalProps || {}),\n        }}\n        {...(omit(restConfig, 'modalProps') as any)}\n      >\n        {content}\n      </ModalForm>\n    );\n  }\n\n  return (\n    <Modal\n      open={open}\n      onCancel={onClose}\n      destroyOnClose\n      {...(restConfig as NormalModalConfig)}\n    >\n      {content}\n    </Modal>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA0B;AAC1B,kBAAsB;AACtB,oBAAqB;AAef;AALC,IAAM,cAA0C,CAAC,EAAE,MAAM,QAAQ,QAAQ,MAAM;AACpF,QAAM,EAAE,SAAS,MAAM,GAAG,WAAW,IAAI;AAEzC,MAAI,SAAS,QAAQ;AACnB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,cAAc,CAAC,YAAY,CAAC,WAAW,QAAQ;AAAA,QAC/C,YAAY;AAAA,UACV,gBAAgB;AAAA,UAChB,UAAU;AAAA,UACV,GAAK,OAA2B,cAAc,CAAC;AAAA,QACjD;AAAA,QACC,OAAI,oBAAK,YAAY,YAAY;AAAA,QAEjC;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA,UAAU;AAAA,MACV,gBAAc;AAAA,MACb,GAAI;AAAA,MAEJ;AAAA;AAAA,EACH;AAEJ;",
+  "sourcesContent": ["import { ModalForm } from '@ant-design/pro-components';\nimport { Modal } from 'antd';\nimport { omit } from 'lodash';\nimport React from 'react';\nimport { FormModalConfig, ModalConfig, NormalModalConfig } from './types';\n\ninterface ModalHelperProps {\n  open: boolean;\n  config: ModalConfig;\n  onClose: () => void;\n}\n\nexport const ModalHelper: React.FC<ModalHelperProps> = ({ open, config, onClose }) => {\n  const { content, type, ...restConfig } = config;\n\n  if (type === 'form') {\n    return (\n      <ModalForm\n        open={open}\n        onOpenChange={(visible) => !visible && onClose()}\n        modalProps={{\n          destroyOnHidden: true,\n          onCancel: onClose,\n          ...((config as FormModalConfig).modalProps || {}),\n        }}\n        {...(omit(restConfig, 'modalProps') as any)}\n      >\n        {content}\n      </ModalForm>\n    );\n  }\n\n  return (\n    <Modal\n      open={open}\n      onCancel={onClose}\n      destroyOnHidden\n      {...(restConfig as NormalModalConfig)}\n    >\n      {content}\n    </Modal>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA0B;AAC1B,kBAAsB;AACtB,oBAAqB;AAef;AALC,IAAM,cAA0C,CAAC,EAAE,MAAM,QAAQ,QAAQ,MAAM;AACpF,QAAM,EAAE,SAAS,MAAM,GAAG,WAAW,IAAI;AAEzC,MAAI,SAAS,QAAQ;AACnB,WACE;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,cAAc,CAAC,YAAY,CAAC,WAAW,QAAQ;AAAA,QAC/C,YAAY;AAAA,UACV,iBAAiB;AAAA,UACjB,UAAU;AAAA,UACV,GAAK,OAA2B,cAAc,CAAC;AAAA,QACjD;AAAA,QACC,OAAI,oBAAK,YAAY,YAAY;AAAA,QAEjC;AAAA;AAAA,IACH;AAAA,EAEJ;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA,UAAU;AAAA,MACV,iBAAe;AAAA,MACd,GAAI;AAAA,MAEJ;AAAA;AAAA,EACH;AAEJ;",
   "names": []
 }

package/dist/creek-layout/index.js

@@ -99,8 +99,8 @@ var CreekLayout = (props) => {
           colorTextMenu: "#333"
         },
         pageContainer: {
-          paddingBlockPageContainerContent: 20,
-          paddingInlinePageContainerContent: 20,
+          paddingBlockPageContainerContent: token.padding,
+          paddingInlinePageContainerContent: token.padding,
           colorBgPageContainer: "linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);"
         }
       },

package/dist/creek-layout/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-layout/index.tsx"],
-  "sourcesContent": ["import { ProLayout, ProLayoutProps } from \"@ant-design/pro-components\";\nimport { useMemoizedFn } from \"ahooks\";\nimport { theme } from \"antd\";\nimport classnames from \"classnames\";\n\nimport { CollapsedButton, useCollapsedStore } from \"./CollapseButton\";\nimport { Exception } from \"./Exception\";\nimport { HeaderContent } from \"./HeaderContent\";\n\nexport type LayoutProps = ProLayoutProps & {\n  runtimeConfig: ProLayoutProps;\n  userConfig?: ProLayoutProps;\n  navigate?: (path?: string | number) => void;\n  initialInfo?: {\n    initialState: any;\n    loading: boolean;\n    setInitialState: () => void;\n  };\n};\n\nexport const CreekLayout = (props: LayoutProps) => {\n  const {\n    route,\n    userConfig,\n    runtimeConfig,\n    children,\n    location,\n    navigate,\n    ...more\n  } = props;\n\n  const { useToken } = theme;\n  const { token } = useToken();\n\n  const { collapsed } = useCollapsedStore();\n\n  const menuItemRender: ProLayoutProps[\"menuItemRender\"] = useMemoizedFn(\n    (itemProps, defaultDom) => {\n      return (\n        <span\n          onClick={() => {\n            if (navigate) {\n              navigate(itemProps.path);\n            }\n          }}\n        >\n          {defaultDom}\n        </span>\n      );\n    }\n  );\n\n  return (\n    <ProLayout\n      className={classnames(\"creek-layout-container\", userConfig?.className)}\n      layout=\"mix\"\n      route={route}\n      title={userConfig?.title}\n      siderWidth={212}\n      location={location}\n      menuItemRender={menuItemRender}\n      headerContentRender={() => {\n        return <HeaderContent />;\n      }}\n      token={{\n        header: {\n          colorBgHeader: \"#fff\",\n          colorHeaderTitle: \"rgba(0, 0, 0, 0.80);\",\n          colorTextMenuSelected: token.colorPrimary,\n          heightLayoutHeader: 48,\n        },\n        sider: {\n          colorMenuBackground: \"#f7f8fa\",\n          colorBgMenuItemSelected: \"transparent\",\n          colorTextMenuActive: token.colorPrimary,\n          colorTextMenuSelected: token.colorPrimary,\n          colorTextMenuItemHover: token.colorPrimary,\n          colorTextMenu: \"#333\",\n        },\n        pageContainer: {\n          paddingBlockPageContainerContent: 20,\n          paddingInlinePageContainerContent: 20,\n          colorBgPageContainer: 'linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);'\n        },\n      }}\n      fixSiderbar\n      fixedHeader\n      collapsed={collapsed}\n      collapsedButtonRender={(collapsed) => {\n        return <CollapsedButton collapsed={collapsed} />;\n      }}\n      {...more}\n    >\n      <Exception>{children}</Exception>\n    </ProLayout>\n  );\n};\n\nexport * from \"./Exception\";\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA0C;AAC1C,oBAA8B;AAC9B,kBAAsB;AACtB,wBAAuB;AAEvB,4BAAmD;AACnD,uBAA0B;AAC1B,2BAA8B;AA2F9B,iCAAc,wBAlGd;AAuCQ;AAnBD,IAAM,cAAc,CAAC,UAAuB;AACjD,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,EAAE,SAAS,IAAI;AACrB,QAAM,EAAE,MAAM,IAAI,SAAS;AAE3B,QAAM,EAAE,UAAU,QAAI,yCAAkB;AAExC,QAAM,qBAAmD;AAAA,IACvD,CAAC,WAAW,eAAe;AACzB,aACE;AAAA,QAAC;AAAA;AAAA,UACC,SAAS,MAAM;AACb,gBAAI,UAAU;AACZ,uBAAS,UAAU,IAAI;AAAA,YACzB;AAAA,UACF;AAAA,UAEC;AAAA;AAAA,MACH;AAAA,IAEJ;AAAA,EACF;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC,eAAW,kBAAAA,SAAW,0BAA0B,yCAAY,SAAS;AAAA,MACrE,QAAO;AAAA,MACP;AAAA,MACA,OAAO,yCAAY;AAAA,MACnB,YAAY;AAAA,MACZ;AAAA,MACA;AAAA,MACA,qBAAqB,MAAM;AACzB,eAAO,4CAAC,sCAAc;AAAA,MACxB;AAAA,MACA,OAAO;AAAA,QACL,QAAQ;AAAA,UACN,eAAe;AAAA,UACf,kBAAkB;AAAA,UAClB,uBAAuB,MAAM;AAAA,UAC7B,oBAAoB;AAAA,QACtB;AAAA,QACA,OAAO;AAAA,UACL,qBAAqB;AAAA,UACrB,yBAAyB;AAAA,UACzB,qBAAqB,MAAM;AAAA,UAC3B,uBAAuB,MAAM;AAAA,UAC7B,wBAAwB,MAAM;AAAA,UAC9B,eAAe;AAAA,QACjB;AAAA,QACA,eAAe;AAAA,UACb,kCAAkC;AAAA,UAClC,mCAAmC;AAAA,UACnC,sBAAsB;AAAA,QACxB;AAAA,MACF;AAAA,MACA,aAAW;AAAA,MACX,aAAW;AAAA,MACX;AAAA,MACA,uBAAuB,CAACC,eAAc;AACpC,eAAO,4CAAC,yCAAgB,WAAWA,YAAW;AAAA,MAChD;AAAA,MACC,GAAG;AAAA,MAEJ,sDAAC,8BAAW,UAAS;AAAA;AAAA,EACvB;AAEJ;",
+  "sourcesContent": ["import { ProLayout, ProLayoutProps } from \"@ant-design/pro-components\";\nimport { useMemoizedFn } from \"ahooks\";\nimport { theme } from \"antd\";\nimport classnames from \"classnames\";\n\nimport { CollapsedButton, useCollapsedStore } from \"./CollapseButton\";\nimport { Exception } from \"./Exception\";\nimport { HeaderContent } from \"./HeaderContent\";\n\nexport type LayoutProps = ProLayoutProps & {\n  runtimeConfig: ProLayoutProps;\n  userConfig?: ProLayoutProps;\n  navigate?: (path?: string | number) => void;\n  initialInfo?: {\n    initialState: any;\n    loading: boolean;\n    setInitialState: () => void;\n  };\n};\n\nexport const CreekLayout = (props: LayoutProps) => {\n  const {\n    route,\n    userConfig,\n    runtimeConfig,\n    children,\n    location,\n    navigate,\n    ...more\n  } = props;\n\n  const { useToken } = theme;\n  const { token } = useToken();\n\n  const { collapsed } = useCollapsedStore();\n\n  const menuItemRender: ProLayoutProps[\"menuItemRender\"] = useMemoizedFn(\n    (itemProps, defaultDom) => {\n      return (\n        <span\n          onClick={() => {\n            if (navigate) {\n              navigate(itemProps.path);\n            }\n          }}\n        >\n          {defaultDom}\n        </span>\n      );\n    }\n  );\n\n  return (\n    <ProLayout\n      className={classnames(\"creek-layout-container\", userConfig?.className)}\n      layout=\"mix\"\n      route={route}\n      title={userConfig?.title}\n      siderWidth={212}\n      location={location}\n      menuItemRender={menuItemRender}\n      headerContentRender={() => {\n        return <HeaderContent />;\n      }}\n      token={{\n        header: {\n          colorBgHeader: \"#fff\",\n          colorHeaderTitle: \"rgba(0, 0, 0, 0.80);\",\n          colorTextMenuSelected: token.colorPrimary,\n          heightLayoutHeader: 48,\n        },\n        sider: {\n          colorMenuBackground: \"#f7f8fa\",\n          colorBgMenuItemSelected: \"transparent\",\n          colorTextMenuActive: token.colorPrimary,\n          colorTextMenuSelected: token.colorPrimary,\n          colorTextMenuItemHover: token.colorPrimary,\n          colorTextMenu: \"#333\",\n        },\n        pageContainer: {\n          paddingBlockPageContainerContent: token.padding,\n          paddingInlinePageContainerContent: token.padding,\n          colorBgPageContainer: 'linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);'\n        },\n      }}\n      fixSiderbar\n      fixedHeader\n      collapsed={collapsed}\n      collapsedButtonRender={(collapsed) => {\n        return <CollapsedButton collapsed={collapsed} />;\n      }}\n      {...more}\n    >\n      <Exception>{children}</Exception>\n    </ProLayout>\n  );\n};\n\nexport * from \"./Exception\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA0C;AAC1C,oBAA8B;AAC9B,kBAAsB;AACtB,wBAAuB;AAEvB,4BAAmD;AACnD,uBAA0B;AAC1B,2BAA8B;AA2F9B,iCAAc,wBAlGd;AAuCQ;AAnBD,IAAM,cAAc,CAAC,UAAuB;AACjD,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,EAAE,SAAS,IAAI;AACrB,QAAM,EAAE,MAAM,IAAI,SAAS;AAE3B,QAAM,EAAE,UAAU,QAAI,yCAAkB;AAExC,QAAM,qBAAmD;AAAA,IACvD,CAAC,WAAW,eAAe;AACzB,aACE;AAAA,QAAC;AAAA;AAAA,UACC,SAAS,MAAM;AACb,gBAAI,UAAU;AACZ,uBAAS,UAAU,IAAI;AAAA,YACzB;AAAA,UACF;AAAA,UAEC;AAAA;AAAA,MACH;AAAA,IAEJ;AAAA,EACF;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC,eAAW,kBAAAA,SAAW,0BAA0B,yCAAY,SAAS;AAAA,MACrE,QAAO;AAAA,MACP;AAAA,MACA,OAAO,yCAAY;AAAA,MACnB,YAAY;AAAA,MACZ;AAAA,MACA;AAAA,MACA,qBAAqB,MAAM;AACzB,eAAO,4CAAC,sCAAc;AAAA,MACxB;AAAA,MACA,OAAO;AAAA,QACL,QAAQ;AAAA,UACN,eAAe;AAAA,UACf,kBAAkB;AAAA,UAClB,uBAAuB,MAAM;AAAA,UAC7B,oBAAoB;AAAA,QACtB;AAAA,QACA,OAAO;AAAA,UACL,qBAAqB;AAAA,UACrB,yBAAyB;AAAA,UACzB,qBAAqB,MAAM;AAAA,UAC3B,uBAAuB,MAAM;AAAA,UAC7B,wBAAwB,MAAM;AAAA,UAC9B,eAAe;AAAA,QACjB;AAAA,QACA,eAAe;AAAA,UACb,kCAAkC,MAAM;AAAA,UACxC,mCAAmC,MAAM;AAAA,UACzC,sBAAsB;AAAA,QACxB;AAAA,MACF;AAAA,MACA,aAAW;AAAA,MACX,aAAW;AAAA,MACX;AAAA,MACA,uBAAuB,CAACC,eAAc;AACpC,eAAO,4CAAC,yCAAgB,WAAWA,YAAW;AAAA,MAChD;AAAA,MACC,GAAG;AAAA,MAEJ,sDAAC,8BAAW,UAAS;AAAA;AAAA,EACvB;AAEJ;",
   "names": ["classnames", "collapsed"]
 }

package/dist/creek-table/SearchTable.js

@@ -33,74 +33,87 @@ __export(SearchTable_exports, {
 });
 module.exports = __toCommonJS(SearchTable_exports);
 var import_pro_components = require("@ant-design/pro-components");
+var import_antd = require("antd");
 var import_antd_style = require("antd-style");
 var import_classnames = __toESM(require("classnames"));
 var import_lodash = __toESM(require("lodash"));
 var import_react = require("react");
 var import_hooks = require("./hooks");
 var import_TableOptionRender = require("./TableOptionRender");
-var import_TableViewContent = require("./TableViewContent");
 var import_toolBarRender = require("./toolBarRender");
 var import_jsx_runtime = require("react/jsx-runtime");
-var useStyles = (0, import_antd_style.createStyles)(({ prefixCls }) => {
+var useStyles = (0, import_antd_style.createStyles)(({ css, token }, { scrollY, prefixCls }) => {
   return {
-    "creek-table-container": {
-      [`.${prefixCls}-pagination`]: {
-        [`.${prefixCls}-pagination-total-text`]: {
-          flex: `1`
+    "creek-table-container": css`
+      .${prefixCls}-table-body {
+        overflow-y: auto !important;
+        min-height: ${typeof scrollY === "number" ? `${scrollY}px` : scrollY ?? "auto"};
+
+        /* Firefox 滚动条样式 */
+        scrollbar-width: thin;
+        scrollbar-color: ${token.colorFillSecondary} transparent;
+      }
+
+      /* Webkit (Chrome, Safari, Edge) 滚动条样式 */
+      & *::-webkit-scrollbar {
+        width: 6px !important;
+        height: 6px !important;
+        background-color: transparent !important;
+      }
+
+      & *::-webkit-scrollbar-thumb {
+        background-color: ${token.colorFillSecondary} !important;
+        border-radius: 3px !important;
+        transition: all 0.3s;
+      }
+
+      & *::-webkit-scrollbar-thumb:hover {
+        background-color: ${token.colorFill} !important;
+      }
+
+      & *::-webkit-scrollbar-track {
+        background-color: transparent !important;
+      }
+
+      .${prefixCls}-pagination {
+        .${prefixCls}-pagination-total-text {
+          flex: 1;
         }
       }
-    }
+    `
   };
 });
 var SearchProTable = (props) => {
-  const {
-    columns,
-    params,
-    prefixCls = "ant",
-    autoAddFilterForColumn = true,
-    className,
-    optionsRender,
-    tableViewRender,
-    pagination,
-    pageFixedBottom = true,
-    pageFixedBottomConfig,
-    ...restProps
-  } = props;
+  var _a;
+  const { columns, prefixCls = "ant", autoAddFilterForColumn = true, className, optionsRender, tableViewRender, pagination, pageFixedBottom = true, pageFixedBottomConfig, ...restProps } = props;
   const proTableRef = (0, import_react.useRef)(null);
+  const { token } = import_antd.theme.useToken();
   const { columns: adaptiveColumns, totalWidth } = (0, import_hooks.useAutoWidthColumns)(columns, proTableRef);
-  const { styles } = useStyles();
+  const scrollY = (0, import_hooks.useTableScrollHeight)(prefixCls, proTableRef, pageFixedBottom, token.paddingContentVerticalLG, (pageFixedBottomConfig == null ? void 0 : pageFixedBottomConfig.bottomFix) || token.padding);
+  const { styles } = useStyles({ scrollY, prefixCls });
+  console.log("scrollY", scrollY);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ref: proTableRef, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_pro_components.ProTable,
     {
-      ...restProps,
+      ...props,
       className: (0, import_classnames.default)(styles["creek-table-container"], className),
       columns: adaptiveColumns,
       scroll: {
         x: totalWidth,
-        ...restProps.scroll
+        y: scrollY ?? ((_a = restProps.scroll) == null ? void 0 : _a.y)
       },
       toolbar: {
         ...restProps.toolbar
       },
-      pagination: {
-        showTotal: (total) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
-          "共 ",
-          total,
-          " 条"
-        ] }),
-        showSizeChanger: true,
-        ...pagination
-      },
       optionsRender: (defaultProps, dom) => {
-        var _a, _b;
-        return import_lodash.default.isFunction(optionsRender) ? optionsRender(defaultProps, dom) : (restProps == null ? void 0 : restProps.options) ? [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_TableOptionRender.TableOptionRender, { defaultDom: dom, importConfig: (_a = restProps == null ? void 0 : restProps.options) == null ? void 0 : _a.importConfig, exportConfig: (_b = restProps == null ? void 0 : restProps.options) == null ? void 0 : _b.exportConfig }, "option")] : [];
+        var _a2, _b;
+        return import_lodash.default.isFunction(optionsRender) ? optionsRender(defaultProps, dom) : (restProps == null ? void 0 : restProps.options) ? [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_TableOptionRender.TableOptionRender, { defaultDom: dom, importConfig: (_a2 = restProps == null ? void 0 : restProps.options) == null ? void 0 : _a2.importConfig, exportConfig: (_b = restProps == null ? void 0 : restProps.options) == null ? void 0 : _b.exportConfig }, "option")] : [];
       },
-      toolBarRender: () => {
-        return (0, import_toolBarRender.toolBarRender)({ shouldCollapse: false, restProps });
+      toolBarRender: (...args) => {
+        return (0, import_toolBarRender.toolBarRender)({ shouldCollapse: false, restProps, args });
       },
       tableViewRender: (defaultProps, defaultDom) => {
-        return import_lodash.default.isFunction(tableViewRender) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: tableViewRender(defaultProps, defaultDom) }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_TableViewContent.TableViewContent, { pageFixedBottom, pageFixedBottomConfig, prefixCls, children: defaultDom });
+        return import_lodash.default.isFunction(tableViewRender) ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: tableViewRender(defaultProps, defaultDom) }) : defaultDom;
       }
     }
   ) });

package/dist/creek-table/SearchTable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-table/SearchTable.tsx"],
-  "sourcesContent": ["import { ParamsType, ProTable } from '@ant-design/pro-components';\nimport { createStyles } from 'antd-style';\nimport classnames from 'classnames';\nimport _ from 'lodash';\nimport { useRef } from 'react';\n\nimport { useAutoWidthColumns } from './hooks';\nimport { TableOptionRender } from './TableOptionRender';\nimport { TableViewContent } from './TableViewContent';\nimport { toolBarRender } from './toolBarRender';\nimport { CreekTableProps } from './type';\n\nconst useStyles = createStyles(({ prefixCls }) => {\n  return {\n    'creek-table-container': {\n      [`.${prefixCls}-pagination`]: {\n        [`.${prefixCls}-pagination-total-text`]: {\n          flex: `1`,\n        },\n      },\n    },\n  };\n});\n\n// 独立的 ProTable 组件\nexport const SearchProTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {\n  const {\n    columns,\n    params,\n    prefixCls = 'ant',\n    autoAddFilterForColumn = true,\n    className,\n    optionsRender,\n    tableViewRender,\n    pagination,\n    pageFixedBottom = true,\n    pageFixedBottomConfig,\n    ...restProps\n  } = props;\n\n  const proTableRef = useRef<HTMLDivElement>(null);\n\n  // // 使用自定义 hook 处理工具栏的自适应功能\n  // const { shouldCollapse } = useAdaptiveToolBar({\n  //   containerRef: proTableRef,\n  //   prefixCls,\n  // });\n\n  const { columns: adaptiveColumns, totalWidth } = useAutoWidthColumns(columns, proTableRef);\n\n  const { styles } = useStyles();\n\n  return (\n    <div ref={proTableRef}>\n      <ProTable<T, U, ValueType>\n        {...restProps}\n        className={classnames(styles['creek-table-container'], className)}\n        columns={adaptiveColumns}\n        scroll={{\n          x: totalWidth,\n          ...restProps.scroll,\n        }}\n        toolbar={{\n          ...restProps.toolbar,\n        }}\n        pagination={{\n          showTotal: (total) => <span>共 {total} 条</span>,\n          showSizeChanger: true,\n          ...pagination,\n        }}\n        optionsRender={(defaultProps, dom) => {\n          return _.isFunction(optionsRender)\n            ? optionsRender(defaultProps, dom)\n            : restProps?.options\n              ? [<TableOptionRender key=\"option\" defaultDom={dom} importConfig={restProps?.options?.importConfig} exportConfig={restProps?.options?.exportConfig} />]\n              : [];\n        }}\n        toolBarRender={() => {\n          return toolBarRender({  　shouldCollapse: false, restProps });\n        }}\n        // 在表格内容区上方显示筛选条件\n        tableViewRender={(defaultProps, defaultDom) => {\n          return _.isFunction(tableViewRender) ? (\n            <>{tableViewRender(defaultProps, defaultDom)}</>\n          ) : (\n            <TableViewContent<T, U, ValueType> pageFixedBottom={pageFixedBottom} pageFixedBottomConfig={pageFixedBottomConfig} prefixCls={prefixCls}>\n              {defaultDom}\n            </TableViewContent>\n          );\n        }}\n      />\n    </div>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAqC;AACrC,wBAA6B;AAC7B,wBAAuB;AACvB,oBAAc;AACd,mBAAuB;AAEvB,mBAAoC;AACpC,+BAAkC;AAClC,8BAAiC;AACjC,2BAA8B;AAyDE;AAtDhC,IAAM,gBAAY,gCAAa,CAAC,EAAE,UAAU,MAAM;AAChD,SAAO;AAAA,IACL,yBAAyB;AAAA,MACvB,CAAC,IAAI,sBAAsB,GAAG;AAAA,QAC5B,CAAC,IAAI,iCAAiC,GAAG;AAAA,UACvC,MAAM;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;AAGM,IAAM,iBAAiB,CAAiE,UAA4C;AACzI,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA,YAAY;AAAA,IACZ,yBAAyB;AAAA,IACzB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,kBAAkB;AAAA,IAClB;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,kBAAc,qBAAuB,IAAI;AAQ/C,QAAM,EAAE,SAAS,iBAAiB,WAAW,QAAI,kCAAoB,SAAS,WAAW;AAEzF,QAAM,EAAE,OAAO,IAAI,UAAU;AAE7B,SACE,4CAAC,SAAI,KAAK,aACR;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ,eAAW,kBAAAA,SAAW,OAAO,uBAAuB,GAAG,SAAS;AAAA,MAChE,SAAS;AAAA,MACT,QAAQ;AAAA,QACN,GAAG;AAAA,QACH,GAAG,UAAU;AAAA,MACf;AAAA,MACA,SAAS;AAAA,QACP,GAAG,UAAU;AAAA,MACf;AAAA,MACA,YAAY;AAAA,QACV,WAAW,CAAC,UAAU,6CAAC,UAAK;AAAA;AAAA,UAAG;AAAA,UAAM;AAAA,WAAE;AAAA,QACvC,iBAAiB;AAAA,QACjB,GAAG;AAAA,MACL;AAAA,MACA,eAAe,CAAC,cAAc,QAAQ;AAtE9C;AAuEU,eAAO,cAAAC,QAAE,WAAW,aAAa,IAC7B,cAAc,cAAc,GAAG,KAC/B,uCAAW,WACT,CAAC,4CAAC,8CAA+B,YAAY,KAAK,eAAc,4CAAW,YAAX,mBAAoB,cAAc,eAAc,4CAAW,YAAX,mBAAoB,gBAA5G,QAA0H,CAAE,IACpJ,CAAC;AAAA,MACT;AAAA,MACA,eAAe,MAAM;AACnB,mBAAO,oCAAc,EAAI,gBAAgB,OAAO,UAAU,CAAC;AAAA,MAC7D;AAAA,MAEA,iBAAiB,CAAC,cAAc,eAAe;AAC7C,eAAO,cAAAA,QAAE,WAAW,eAAe,IACjC,2EAAG,0BAAgB,cAAc,UAAU,GAAE,IAE7C,4CAAC,4CAAkC,iBAAkC,uBAA8C,WAChH,sBACH;AAAA,MAEJ;AAAA;AAAA,EACF,GACF;AAEJ;",
-  "names": ["classnames", "_"]
+  "sourcesContent": ["import { ParamsType, ProTable } from '@ant-design/pro-components';\nimport { theme } from 'antd';\nimport { createStyles } from 'antd-style';\nimport classnames from 'classnames';\nimport _ from 'lodash';\nimport { useRef } from 'react';\n\nimport { useAutoWidthColumns, useTableScrollHeight } from './hooks';\nimport { TableOptionRender } from './TableOptionRender';\nimport { toolBarRender } from './toolBarRender';\nimport { CreekTableProps } from './type';\n\nconst useStyles = createStyles(({ css, token }, { scrollY, prefixCls }: { scrollY?: number | string; prefixCls: string }) => {\n  return {\n    'creek-table-container': css`\n      .${prefixCls}-table-body {\n        overflow-y: auto !important;\n        min-height: ${typeof scrollY === 'number' ? `${scrollY}px` : (scrollY ?? 'auto')};\n\n        /* Firefox 滚动条样式 */\n        scrollbar-width: thin;\n        scrollbar-color: ${token.colorFillSecondary} transparent;\n      }\n\n      /* Webkit (Chrome, Safari, Edge) 滚动条样式 */\n      & *::-webkit-scrollbar {\n        width: 6px !important;\n        height: 6px !important;\n        background-color: transparent !important;\n      }\n\n      & *::-webkit-scrollbar-thumb {\n        background-color: ${token.colorFillSecondary} !important;\n        border-radius: 3px !important;\n        transition: all 0.3s;\n      }\n\n      & *::-webkit-scrollbar-thumb:hover {\n        background-color: ${token.colorFill} !important;\n      }\n\n      & *::-webkit-scrollbar-track {\n        background-color: transparent !important;\n      }\n\n      .${prefixCls}-pagination {\n        .${prefixCls}-pagination-total-text {\n          flex: 1;\n        }\n      }\n    `,\n  };\n});\n\n// 独立的 ProTable 组件\nexport const SearchProTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {\n  const { columns, prefixCls = 'ant', autoAddFilterForColumn = true, className, optionsRender, tableViewRender, pagination, pageFixedBottom = true, pageFixedBottomConfig, ...restProps } = props;\n\n  const proTableRef = useRef<HTMLDivElement>(null);\n\n  const { token } = theme.useToken();\n\n  // // 使用自定义 hook 处理工具栏的自适应功能\n  // const { shouldCollapse } = useAdaptiveToolBar({\n  //   containerRef: proTableRef,\n  //   prefixCls,\n  // });ƒ\n\n  const { columns: adaptiveColumns, totalWidth } = useAutoWidthColumns(columns, proTableRef);\n\n  const scrollY = useTableScrollHeight(prefixCls, proTableRef, pageFixedBottom, token.paddingContentVerticalLG, pageFixedBottomConfig?.bottomFix || token.padding);\n\n  const { styles } = useStyles({ scrollY, prefixCls });\n\n  console.log('scrollY', scrollY);\n\n  return (\n    <div ref={proTableRef}>\n      <ProTable<T, U, ValueType>\n        {...props}\n        className={classnames(styles['creek-table-container'], className)}\n        columns={adaptiveColumns}\n        scroll={{\n          x: totalWidth,\n          y: scrollY ?? restProps.scroll?.y,\n        }}\n        toolbar={{\n          ...restProps.toolbar,\n        }}\n        optionsRender={(defaultProps, dom) => {\n          return _.isFunction(optionsRender)\n            ? optionsRender(defaultProps, dom)\n            : restProps?.options\n              ? [<TableOptionRender key=\"option\" defaultDom={dom} importConfig={restProps?.options?.importConfig} exportConfig={restProps?.options?.exportConfig} />]\n              : [];\n        }}\n        toolBarRender={(...args) => {\n          return toolBarRender({ shouldCollapse: false, restProps, args });\n        }}\n        // 在表格内容区上方显示筛选条件\n        tableViewRender={(defaultProps, defaultDom) => {\n          return _.isFunction(tableViewRender) ? <>{tableViewRender(defaultProps, defaultDom)}</> : defaultDom;\n        }}\n      />\n    </div>\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAqC;AACrC,kBAAsB;AACtB,wBAA6B;AAC7B,wBAAuB;AACvB,oBAAc;AACd,mBAAuB;AAEvB,mBAA0D;AAC1D,+BAAkC;AAClC,2BAA8B;AAoFb;AAjFjB,IAAM,gBAAY,gCAAa,CAAC,EAAE,KAAK,MAAM,GAAG,EAAE,SAAS,UAAU,MAAwD;AAC3H,SAAO;AAAA,IACL,yBAAyB;AAAA,SACpB;AAAA;AAAA,sBAEa,OAAO,YAAY,WAAW,GAAG,cAAe,WAAW;AAAA;AAAA;AAAA;AAAA,2BAItD,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAWL,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAMN,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,SAOzB;AAAA,WACE;AAAA;AAAA;AAAA;AAAA;AAAA,EAKT;AACF,CAAC;AAGM,IAAM,iBAAiB,CAAiE,UAA4C;AAvD3I;AAwDE,QAAM,EAAE,SAAS,YAAY,OAAO,yBAAyB,MAAM,WAAW,eAAe,iBAAiB,YAAY,kBAAkB,MAAM,uBAAuB,GAAG,UAAU,IAAI;AAE1L,QAAM,kBAAc,qBAAuB,IAAI;AAE/C,QAAM,EAAE,MAAM,IAAI,kBAAM,SAAS;AAQjC,QAAM,EAAE,SAAS,iBAAiB,WAAW,QAAI,kCAAoB,SAAS,WAAW;AAEzF,QAAM,cAAU,mCAAqB,WAAW,aAAa,iBAAiB,MAAM,2BAA0B,+DAAuB,cAAa,MAAM,OAAO;AAE/J,QAAM,EAAE,OAAO,IAAI,UAAU,EAAE,SAAS,UAAU,CAAC;AAEnD,UAAQ,IAAI,WAAW,OAAO;AAE9B,SACE,4CAAC,SAAI,KAAK,aACR;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ,eAAW,kBAAAA,SAAW,OAAO,uBAAuB,GAAG,SAAS;AAAA,MAChE,SAAS;AAAA,MACT,QAAQ;AAAA,QACN,GAAG;AAAA,QACH,GAAG,aAAW,eAAU,WAAV,mBAAkB;AAAA,MAClC;AAAA,MACA,SAAS;AAAA,QACP,GAAG,UAAU;AAAA,MACf;AAAA,MACA,eAAe,CAAC,cAAc,QAAQ;AAzF9C,YAAAC,KAAA;AA0FU,eAAO,cAAAC,QAAE,WAAW,aAAa,IAC7B,cAAc,cAAc,GAAG,KAC/B,uCAAW,WACT,CAAC,4CAAC,8CAA+B,YAAY,KAAK,eAAcD,MAAA,uCAAW,YAAX,gBAAAA,IAAoB,cAAc,eAAc,4CAAW,YAAX,mBAAoB,gBAA5G,QAA0H,CAAE,IACpJ,CAAC;AAAA,MACT;AAAA,MACA,eAAe,IAAI,SAAS;AAC1B,mBAAO,oCAAc,EAAE,gBAAgB,OAAO,WAAW,KAAK,CAAC;AAAA,MACjE;AAAA,MAEA,iBAAiB,CAAC,cAAc,eAAe;AAC7C,eAAO,cAAAC,QAAE,WAAW,eAAe,IAAI,2EAAG,0BAAgB,cAAc,UAAU,GAAE,IAAM;AAAA,MAC5F;AAAA;AAAA,EACF,GACF;AAEJ;",
+  "names": ["classnames", "_a", "_"]
 }

package/dist/creek-table/hooks/index.d.ts

@@ -1,3 +1,4 @@
 export * from './useAdaptiveToolBar';
 export * from './useAutoWidthColumns';
 export * from './useElementDistance';
+export * from './useTableScrollHeight';

package/dist/creek-table/hooks/index.js

@@ -19,10 +19,12 @@ module.exports = __toCommonJS(hooks_exports);
 __reExport(hooks_exports, require("./useAdaptiveToolBar"), module.exports);
 __reExport(hooks_exports, require("./useAutoWidthColumns"), module.exports);
 __reExport(hooks_exports, require("./useElementDistance"), module.exports);
+__reExport(hooks_exports, require("./useTableScrollHeight"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./useAdaptiveToolBar"),
   ...require("./useAutoWidthColumns"),
-  ...require("./useElementDistance")
+  ...require("./useElementDistance"),
+  ...require("./useTableScrollHeight")
 });
 //# sourceMappingURL=index.js.map

package/dist/creek-table/hooks/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/creek-table/hooks/index.ts"],
-  "sourcesContent": ["export * from './useAdaptiveToolBar';\nexport * from './useAutoWidthColumns';\nexport * from './useElementDistance';\n\n"],
-  "mappings": ";;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,iCAAd;AACA,0BAAc,kCADd;AAEA,0BAAc,iCAFd;",
+  "sourcesContent": ["export * from './useAdaptiveToolBar';\nexport * from './useAutoWidthColumns';\nexport * from './useElementDistance';\nexport * from './useTableScrollHeight';\n\n\n"],
+  "mappings": ";;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,iCAAd;AACA,0BAAc,kCADd;AAEA,0BAAc,iCAFd;AAGA,0BAAc,mCAHd;",
   "names": []
 }

package/dist/creek-table/hooks/useTableScrollHeight.d.ts

@@ -0,0 +1 @@
+export declare const useTableScrollHeight: (prefixCls: string, tableRef: React.RefObject<HTMLDivElement>, pageFixedBottom?: boolean, contentPadding?: number, offsetBottom?: number) => number | undefined;

package/dist/creek-table/hooks/useTableScrollHeight.js

@@ -0,0 +1,72 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/creek-table/hooks/useTableScrollHeight.tsx
+var useTableScrollHeight_exports = {};
+__export(useTableScrollHeight_exports, {
+  useTableScrollHeight: () => useTableScrollHeight
+});
+module.exports = __toCommonJS(useTableScrollHeight_exports);
+var import_ahooks = require("ahooks");
+var import_react = require("react");
+var useTableScrollHeight = (prefixCls, tableRef, pageFixedBottom = true, contentPadding = 16, offsetBottom = 16) => {
+  const [scrollY, setScrollY] = (0, import_react.useState)(void 0);
+  const { run: calcHeight } = (0, import_ahooks.useDebounceFn)(
+    () => {
+      if (!pageFixedBottom || !tableRef.current)
+        return;
+      const tableEl = tableRef.current;
+      const tableHeader = tableEl.querySelector(`.${prefixCls}-table-thead`);
+      const tableBody = tableEl.querySelector(`.${prefixCls}-table-body`);
+      let top = 0;
+      if (tableHeader) {
+        top = tableHeader.getBoundingClientRect().bottom;
+      } else if (tableBody) {
+        top = tableBody.getBoundingClientRect().top;
+      }
+      const windowHeight = window.innerHeight;
+      let height = windowHeight - top - contentPadding - offsetBottom;
+      const pagination = tableEl.querySelector(`.${prefixCls}-pagination`);
+      if (pagination) {
+        const paginationHeight = pagination.clientHeight;
+        const styles = window.getComputedStyle(pagination);
+        const totalPaginationMargin = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
+        height = height - paginationHeight - totalPaginationMargin;
+      } else {
+        height = height - 40;
+      }
+      setScrollY(height);
+    },
+    { wait: 100 }
+  );
+  (0, import_react.useEffect)(() => {
+    calcHeight();
+    const observer = new MutationObserver(calcHeight);
+    if (tableRef.current) {
+      observer.observe(tableRef.current, { childList: true, subtree: true });
+    }
+    return () => observer.disconnect();
+  }, [tableRef, pageFixedBottom, prefixCls]);
+  (0, import_ahooks.useEventListener)("resize", calcHeight);
+  return scrollY;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useTableScrollHeight
+});
+//# sourceMappingURL=useTableScrollHeight.js.map

package/dist/creek-table/hooks/useTableScrollHeight.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/creek-table/hooks/useTableScrollHeight.tsx"],
+  "sourcesContent": ["import { useDebounceFn, useEventListener } from 'ahooks';\nimport { useEffect, useState } from 'react';\n\nexport const useTableScrollHeight = (prefixCls: string, tableRef: React.RefObject<HTMLDivElement>, pageFixedBottom: boolean = true, contentPadding: number = 16, offsetBottom: number = 16) => {\n  const [scrollY, setScrollY] = useState<number | undefined>(undefined);\n\n  const { run: calcHeight } = useDebounceFn(\n    () => {\n      if (!pageFixedBottom || !tableRef.current) return;\n\n      const tableEl = tableRef.current;\n\n      const tableHeader = tableEl.querySelector(`.${prefixCls}-table-thead`);\n      const tableBody = tableEl.querySelector(`.${prefixCls}-table-body`);\n\n      let top = 0;\n      if (tableHeader) {\n        top = tableHeader.getBoundingClientRect().bottom;\n      } else if (tableBody) {\n        top = tableBody.getBoundingClientRect().top;\n      }\n\n      const windowHeight = window.innerHeight;\n  \n      let height = windowHeight - top -  contentPadding - offsetBottom;\n\n      const pagination = tableEl.querySelector(`.${prefixCls}-pagination`);\n\n      if (pagination) {\n        const paginationHeight = pagination.clientHeight;\n\n        const styles = window.getComputedStyle(pagination);\n        const totalPaginationMargin = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);\n\n        height = height - paginationHeight - totalPaginationMargin;\n      } else {\n        // 如果没有找到分页，预留一个高度（假设分页高度为 24px + margin 16px = 40px）\n        // 这样可以避免初始加载时高度过大，导致出现滚动条，然后分页出现后高度又变小\n        height = height - 40;\n      }\n\n      // Minimum height to avoid crashes or ugly rendering\n      setScrollY(height);\n    },\n    { wait: 100 },\n  );\n\n  useEffect(() => {\n    // Initial calculation\n    calcHeight();\n\n    // Observer for DOM changes that might affect position\n    const observer = new MutationObserver(calcHeight);\n    if (tableRef.current) {\n      observer.observe(tableRef.current, { childList: true, subtree: true });\n    }\n    return () => observer.disconnect();\n  }, [tableRef, pageFixedBottom, prefixCls]);\n\n  useEventListener('resize', calcHeight);\n\n  return scrollY;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAgD;AAChD,mBAAoC;AAE7B,IAAM,uBAAuB,CAAC,WAAmB,UAA2C,kBAA2B,MAAM,iBAAyB,IAAI,eAAuB,OAAO;AAC7L,QAAM,CAAC,SAAS,UAAU,QAAI,uBAA6B,MAAS;AAEpE,QAAM,EAAE,KAAK,WAAW,QAAI;AAAA,IAC1B,MAAM;AACJ,UAAI,CAAC,mBAAmB,CAAC,SAAS;AAAS;AAE3C,YAAM,UAAU,SAAS;AAEzB,YAAM,cAAc,QAAQ,cAAc,IAAI,uBAAuB;AACrE,YAAM,YAAY,QAAQ,cAAc,IAAI,sBAAsB;AAElE,UAAI,MAAM;AACV,UAAI,aAAa;AACf,cAAM,YAAY,sBAAsB,EAAE;AAAA,MAC5C,WAAW,WAAW;AACpB,cAAM,UAAU,sBAAsB,EAAE;AAAA,MAC1C;AAEA,YAAM,eAAe,OAAO;AAE5B,UAAI,SAAS,eAAe,MAAO,iBAAiB;AAEpD,YAAM,aAAa,QAAQ,cAAc,IAAI,sBAAsB;AAEnE,UAAI,YAAY;AACd,cAAM,mBAAmB,WAAW;AAEpC,cAAM,SAAS,OAAO,iBAAiB,UAAU;AACjD,cAAM,wBAAwB,WAAW,OAAO,SAAS,IAAI,WAAW,OAAO,YAAY;AAE3F,iBAAS,SAAS,mBAAmB;AAAA,MACvC,OAAO;AAGL,iBAAS,SAAS;AAAA,MACpB;AAGA,iBAAW,MAAM;AAAA,IACnB;AAAA,IACA,EAAE,MAAM,IAAI;AAAA,EACd;AAEA,8BAAU,MAAM;AAEd,eAAW;AAGX,UAAM,WAAW,IAAI,iBAAiB,UAAU;AAChD,QAAI,SAAS,SAAS;AACpB,eAAS,QAAQ,SAAS,SAAS,EAAE,WAAW,MAAM,SAAS,KAAK,CAAC;AAAA,IACvE;AACA,WAAO,MAAM,SAAS,WAAW;AAAA,EACnC,GAAG,CAAC,UAAU,iBAAiB,SAAS,CAAC;AAEzC,sCAAiB,UAAU,UAAU;AAErC,SAAO;AACT;",
+  "names": []
+}

package/dist/creek-table/index.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(creek_table_exports);
 var import_SearchTable = require("./SearchTable");
 var import_jsx_runtime = require("react/jsx-runtime");
 var CreekTable = (props) => {
-  const { columns = [], onSubmit, ...restProps } = props;
+  const { columns = [], ...restProps } = props;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_SearchTable.SearchProTable, { columns, ...restProps });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/creek-table/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-table/index.tsx"],
-  "sourcesContent": ["import { ParamsType } from '@ant-design/pro-components';\n\nimport { SearchProTable } from './SearchTable';\nimport { CreekTableProps } from './type';\n\nexport const CreekTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {\n  const { columns = [],  onSubmit, ...restProps } = props;\n\n  return (\n     <SearchProTable columns={columns} {...restProps} />\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAA+B;AAO1B;AAJE,IAAM,aAAa,CAAiE,UAA4C;AACrI,QAAM,EAAE,UAAU,CAAC,GAAI,UAAU,GAAG,UAAU,IAAI;AAElD,SACG,4CAAC,qCAAe,SAAmB,GAAG,WAAW;AAEtD;",
+  "sourcesContent": ["import { ParamsType } from '@ant-design/pro-components';\n\nimport { SearchProTable } from './SearchTable';\nimport { CreekTableProps } from './type';\n\nexport const CreekTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {\n  const { columns = [],  ...restProps } = props;\n\n  return (\n     <SearchProTable columns={columns} {...restProps} />\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAA+B;AAO1B;AAJE,IAAM,aAAa,CAAiE,UAA4C;AACrI,QAAM,EAAE,UAAU,CAAC,GAAI,GAAG,UAAU,IAAI;AAExC,SACG,4CAAC,qCAAe,SAAmB,GAAG,WAAW;AAEtD;",
   "names": []
 }

package/dist/creek-table/toolBarRender.d.ts

@@ -1,4 +1,5 @@
 export declare const toolBarRender: (options: {
     shouldCollapse: boolean;
     restProps: any;
+    args?: any[];
 }) => any;

package/dist/creek-table/toolBarRender.js

@@ -27,8 +27,8 @@ var import_antd = require("antd");
 var import_jsx_runtime = require("react/jsx-runtime");
 var toolBarRender = (options) => {
   var _a;
-  const { shouldCollapse, restProps } = options;
-  const baseActions = ((_a = restProps.toolBarRender) == null ? void 0 : _a.call(restProps)) || [];
+  const { shouldCollapse, restProps, args = [] } = options;
+  const baseActions = ((_a = restProps.toolBarRender) == null ? void 0 : _a.call(restProps, ...args)) || [];
   if (!shouldCollapse || baseActions.length <= 1) {
     return baseActions;
   }

package/dist/creek-table/toolBarRender.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/creek-table/toolBarRender.tsx"],
-  "sourcesContent": ["import { DownOutlined } from '@ant-design/icons';\nimport { Button, Dropdown } from 'antd';\n\nexport const toolBarRender = (options: { shouldCollapse: boolean; restProps: any }) => {\n  const { shouldCollapse, restProps } = options;\n\n  const baseActions = restProps.toolBarRender?.() || [];\n  if (!shouldCollapse || baseActions.length <= 1) {\n    return baseActions;\n  }\n\n  const [first, ...rest] = baseActions;\n\n  return [\n    first,\n    <Dropdown\n      key=\"more\"\n      menu={{\n        items: rest.map((item: React.ReactDOM, index: number) => ({ key: index, label: item })),\n      }}\n      trigger={['click']}\n    >\n      <Button>\n        更多 <DownOutlined />\n      </Button>\n    </Dropdown>,\n  ];\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6B;AAC7B,kBAAiC;AAqB3B;AAnBC,IAAM,gBAAgB,CAAC,YAAyD;AAHvF;AAIE,QAAM,EAAE,gBAAgB,UAAU,IAAI;AAEtC,QAAM,gBAAc,eAAU,kBAAV,uCAA+B,CAAC;AACpD,MAAI,CAAC,kBAAkB,YAAY,UAAU,GAAG;AAC9C,WAAO;AAAA,EACT;AAEA,QAAM,CAAC,OAAO,GAAG,IAAI,IAAI;AAEzB,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QAEC,MAAM;AAAA,UACJ,OAAO,KAAK,IAAI,CAAC,MAAsB,WAAmB,EAAE,KAAK,OAAO,OAAO,KAAK,EAAE;AAAA,QACxF;AAAA,QACA,SAAS,CAAC,OAAO;AAAA,QAEjB,uDAAC,sBAAO;AAAA;AAAA,UACH,4CAAC,6BAAa;AAAA,WACnB;AAAA;AAAA,MARI;AAAA,IASN;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { DownOutlined } from '@ant-design/icons';\nimport { Button, Dropdown } from 'antd';\n\nexport const toolBarRender = (options: { shouldCollapse: boolean; restProps: any; args?: any[] }) => {\n  const { shouldCollapse, restProps, args = [] } = options;\n\n  const baseActions = restProps.toolBarRender?.(...args) || [];\n  if (!shouldCollapse || baseActions.length <= 1) {\n    return baseActions;\n  }\n\n  const [first, ...rest] = baseActions;\n\n  return [\n    first,\n    <Dropdown\n      key=\"more\"\n      menu={{\n        items: rest.map((item: React.ReactDOM, index: number) => ({ key: index, label: item })),\n      }}\n      trigger={['click']}\n    >\n      <Button>\n        更多 <DownOutlined />\n      </Button>\n    </Dropdown>,\n  ];\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6B;AAC7B,kBAAiC;AAqB3B;AAnBC,IAAM,gBAAgB,CAAC,YAAuE;AAHrG;AAIE,QAAM,EAAE,gBAAgB,WAAW,OAAO,CAAC,EAAE,IAAI;AAEjD,QAAM,gBAAc,eAAU,kBAAV,mCAA0B,GAAG,UAAS,CAAC;AAC3D,MAAI,CAAC,kBAAkB,YAAY,UAAU,GAAG;AAC9C,WAAO;AAAA,EACT;AAEA,QAAM,CAAC,OAAO,GAAG,IAAI,IAAI;AAEzB,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QAEC,MAAM;AAAA,UACJ,OAAO,KAAK,IAAI,CAAC,MAAsB,WAAmB,EAAE,KAAK,OAAO,OAAO,KAAK,EAAE;AAAA,QACxF;AAAA,QACA,SAAS,CAAC,OAAO;AAAA,QAEjB,uDAAC,sBAAO;AAAA;AAAA,UACH,4CAAC,6BAAa;AAAA,WACnB;AAAA;AAAA,MARI;AAAA,IASN;AAAA,EACF;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@creekjs/web-components",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/creek-hooks/useApp/DrawerHelper.tsx

@@ -19,7 +19,7 @@ export const DrawerHelper: React.FC<DrawerHelperProps> = ({ open, config, onClos
         open={open}
         onOpenChange={(visible) => !visible && onClose()}
         drawerProps={{
-          destroyOnClose: true,
+          destroyOnHidden: true,
           onClose,
           ...((config as FormDrawerConfig).drawerProps || {}),
         }}
@@ -34,7 +34,7 @@ export const DrawerHelper: React.FC<DrawerHelperProps> = ({ open, config, onClos
     <Drawer
       open={open}
       onClose={onClose}
-      destroyOnClose
+      destroyOnHidden
       {...(restConfig as NormalDrawerConfig)}
     >
       {content}

package/src/creek-hooks/useApp/ModalHelper.tsx

@@ -19,7 +19,7 @@ export const ModalHelper: React.FC<ModalHelperProps> = ({ open, config, onClose
         open={open}
         onOpenChange={(visible) => !visible && onClose()}
         modalProps={{
-          destroyOnClose: true,
+          destroyOnHidden: true,
           onCancel: onClose,
           ...((config as FormModalConfig).modalProps || {}),
         }}
@@ -34,7 +34,7 @@ export const ModalHelper: React.FC<ModalHelperProps> = ({ open, config, onClose
     <Modal
       open={open}
       onCancel={onClose}
-      destroyOnClose
+      destroyOnHidden
       {...(restConfig as NormalModalConfig)}
     >
       {content}

package/src/creek-layout/index.tsx

@@ -78,8 +78,8 @@ export const CreekLayout = (props: LayoutProps) => {
           colorTextMenu: "#333",
         },
         pageContainer: {
-          paddingBlockPageContainerContent: 20,
-          paddingInlinePageContainerContent: 20,
+          paddingBlockPageContainerContent: token.padding,
+          paddingInlinePageContainerContent: token.padding,
           colorBgPageContainer: 'linear-gradient(180deg, #F7F9FF 0%, #FFF 45.59%);'
         },
       }}

package/src/creek-table/SearchTable.tsx

@@ -1,73 +1,92 @@
 import { ParamsType, ProTable } from '@ant-design/pro-components';
+import { theme } from 'antd';
 import { createStyles } from 'antd-style';
 import classnames from 'classnames';
 import _ from 'lodash';
 import { useRef } from 'react';
 
-import { useAutoWidthColumns } from './hooks';
+import { useAutoWidthColumns, useTableScrollHeight } from './hooks';
 import { TableOptionRender } from './TableOptionRender';
-import { TableViewContent } from './TableViewContent';
 import { toolBarRender } from './toolBarRender';
 import { CreekTableProps } from './type';
 
-const useStyles = createStyles(({ prefixCls }) => {
+const useStyles = createStyles(({ css, token }, { scrollY, prefixCls }: { scrollY?: number | string; prefixCls: string }) => {
   return {
-    'creek-table-container': {
-      [`.${prefixCls}-pagination`]: {
-        [`.${prefixCls}-pagination-total-text`]: {
-          flex: `1`,
-        },
-      },
-    },
+    'creek-table-container': css`
+      .${prefixCls}-table-body {
+        overflow-y: auto !important;
+        min-height: ${typeof scrollY === 'number' ? `${scrollY}px` : (scrollY ?? 'auto')};
+
+        /* Firefox 滚动条样式 */
+        scrollbar-width: thin;
+        scrollbar-color: ${token.colorFillSecondary} transparent;
+      }
+
+      /* Webkit (Chrome, Safari, Edge) 滚动条样式 */
+      & *::-webkit-scrollbar {
+        width: 6px !important;
+        height: 6px !important;
+        background-color: transparent !important;
+      }
+
+      & *::-webkit-scrollbar-thumb {
+        background-color: ${token.colorFillSecondary} !important;
+        border-radius: 3px !important;
+        transition: all 0.3s;
+      }
+
+      & *::-webkit-scrollbar-thumb:hover {
+        background-color: ${token.colorFill} !important;
+      }
+
+      & *::-webkit-scrollbar-track {
+        background-color: transparent !important;
+      }
+
+      .${prefixCls}-pagination {
+        .${prefixCls}-pagination-total-text {
+          flex: 1;
+        }
+      }
+    `,
   };
 });
 
 // 独立的 ProTable 组件
 export const SearchProTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {
-  const {
-    columns,
-    params,
-    prefixCls = 'ant',
-    autoAddFilterForColumn = true,
-    className,
-    optionsRender,
-    tableViewRender,
-    pagination,
-    pageFixedBottom = true,
-    pageFixedBottomConfig,
-    ...restProps
-  } = props;
+  const { columns, prefixCls = 'ant', autoAddFilterForColumn = true, className, optionsRender, tableViewRender, pagination, pageFixedBottom = true, pageFixedBottomConfig, ...restProps } = props;
 
   const proTableRef = useRef<HTMLDivElement>(null);
 
+  const { token } = theme.useToken();
+
   // // 使用自定义 hook 处理工具栏的自适应功能
   // const { shouldCollapse } = useAdaptiveToolBar({
   //   containerRef: proTableRef,
   //   prefixCls,
-  // });
+  // });ƒ
 
   const { columns: adaptiveColumns, totalWidth } = useAutoWidthColumns(columns, proTableRef);
 
-  const { styles } = useStyles();
+  const scrollY = useTableScrollHeight(prefixCls, proTableRef, pageFixedBottom, token.paddingContentVerticalLG, pageFixedBottomConfig?.bottomFix || token.padding);
+
+  const { styles } = useStyles({ scrollY, prefixCls });
+
+  console.log('scrollY', scrollY);
 
   return (
     <div ref={proTableRef}>
       <ProTable<T, U, ValueType>
-        {...restProps}
+        {...props}
         className={classnames(styles['creek-table-container'], className)}
         columns={adaptiveColumns}
         scroll={{
           x: totalWidth,
-          ...restProps.scroll,
+          y: scrollY ?? restProps.scroll?.y,
         }}
         toolbar={{
           ...restProps.toolbar,
         }}
-        pagination={{
-          showTotal: (total) => <span>共 {total} 条</span>,
-          showSizeChanger: true,
-          ...pagination,
-        }}
         optionsRender={(defaultProps, dom) => {
           return _.isFunction(optionsRender)
             ? optionsRender(defaultProps, dom)
@@ -75,18 +94,12 @@ export const SearchProTable = <T extends ParamsType, U extends ParamsType, Value
               ? [<TableOptionRender key="option" defaultDom={dom} importConfig={restProps?.options?.importConfig} exportConfig={restProps?.options?.exportConfig} />]
               : [];
         }}
-        toolBarRender={() => {
-          return toolBarRender({  　shouldCollapse: false, restProps });
+        toolBarRender={(...args) => {
+          return toolBarRender({ shouldCollapse: false, restProps, args });
         }}
         // 在表格内容区上方显示筛选条件
         tableViewRender={(defaultProps, defaultDom) => {
-          return _.isFunction(tableViewRender) ? (
-            <>{tableViewRender(defaultProps, defaultDom)}</>
-          ) : (
-            <TableViewContent<T, U, ValueType> pageFixedBottom={pageFixedBottom} pageFixedBottomConfig={pageFixedBottomConfig} prefixCls={prefixCls}>
-              {defaultDom}
-            </TableViewContent>
-          );
+          return _.isFunction(tableViewRender) ? <>{tableViewRender(defaultProps, defaultDom)}</> : defaultDom;
         }}
       />
     </div>

package/src/creek-table/hooks/index.ts

@@ -1,4 +1,6 @@
 export * from './useAdaptiveToolBar';
 export * from './useAutoWidthColumns';
 export * from './useElementDistance';
+export * from './useTableScrollHeight';
+
 

package/src/creek-table/hooks/useTableScrollHeight.tsx

@@ -0,0 +1,63 @@
+import { useDebounceFn, useEventListener } from 'ahooks';
+import { useEffect, useState } from 'react';
+
+export const useTableScrollHeight = (prefixCls: string, tableRef: React.RefObject<HTMLDivElement>, pageFixedBottom: boolean = true, contentPadding: number = 16, offsetBottom: number = 16) => {
+  const [scrollY, setScrollY] = useState<number | undefined>(undefined);
+
+  const { run: calcHeight } = useDebounceFn(
+    () => {
+      if (!pageFixedBottom || !tableRef.current) return;
+
+      const tableEl = tableRef.current;
+
+      const tableHeader = tableEl.querySelector(`.${prefixCls}-table-thead`);
+      const tableBody = tableEl.querySelector(`.${prefixCls}-table-body`);
+
+      let top = 0;
+      if (tableHeader) {
+        top = tableHeader.getBoundingClientRect().bottom;
+      } else if (tableBody) {
+        top = tableBody.getBoundingClientRect().top;
+      }
+
+      const windowHeight = window.innerHeight;
+  
+      let height = windowHeight - top -  contentPadding - offsetBottom;
+
+      const pagination = tableEl.querySelector(`.${prefixCls}-pagination`);
+
+      if (pagination) {
+        const paginationHeight = pagination.clientHeight;
+
+        const styles = window.getComputedStyle(pagination);
+        const totalPaginationMargin = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
+
+        height = height - paginationHeight - totalPaginationMargin;
+      } else {
+        // 如果没有找到分页，预留一个高度（假设分页高度为 24px + margin 16px = 40px）
+        // 这样可以避免初始加载时高度过大，导致出现滚动条，然后分页出现后高度又变小
+        height = height - 40;
+      }
+
+      // Minimum height to avoid crashes or ugly rendering
+      setScrollY(height);
+    },
+    { wait: 100 },
+  );
+
+  useEffect(() => {
+    // Initial calculation
+    calcHeight();
+
+    // Observer for DOM changes that might affect position
+    const observer = new MutationObserver(calcHeight);
+    if (tableRef.current) {
+      observer.observe(tableRef.current, { childList: true, subtree: true });
+    }
+    return () => observer.disconnect();
+  }, [tableRef, pageFixedBottom, prefixCls]);
+
+  useEventListener('resize', calcHeight);
+
+  return scrollY;
+};

package/src/creek-table/index.tsx

@@ -4,7 +4,7 @@ import { SearchProTable } from './SearchTable';
 import { CreekTableProps } from './type';
 
 export const CreekTable = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {
-  const { columns = [],  onSubmit, ...restProps } = props;
+  const { columns = [],  ...restProps } = props;
 
   return (
      <SearchProTable columns={columns} {...restProps} />

package/src/creek-table/toolBarRender.tsx

@@ -1,10 +1,10 @@
 import { DownOutlined } from '@ant-design/icons';
 import { Button, Dropdown } from 'antd';
 
-export const toolBarRender = (options: { shouldCollapse: boolean; restProps: any }) => {
-  const { shouldCollapse, restProps } = options;
+export const toolBarRender = (options: { shouldCollapse: boolean; restProps: any; args?: any[] }) => {
+  const { shouldCollapse, restProps, args = [] } = options;
 
-  const baseActions = restProps.toolBarRender?.() || [];
+  const baseActions = restProps.toolBarRender?.(...args) || [];
   if (!shouldCollapse || baseActions.length <= 1) {
     return baseActions;
   }

package/dist/creek-table/TableViewContent.d.ts

@@ -1,4 +0,0 @@
-import { ParamsType } from '@ant-design/pro-components';
-import { CreekTableProps } from './type';
-export type CreekTableViewRender<T extends ParamsType, U extends ParamsType, ValueType = 'text'> = CreekTableProps<T, U, ValueType>['tableViewRender'];
-export declare const TableViewContent: <T extends ParamsType, U extends ParamsType, ValueType = "text">(props: CreekTableProps<T, U, ValueType>) => import("react/jsx-runtime").JSX.Element;

package/dist/creek-table/TableViewContent.js

@@ -1,66 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/creek-table/TableViewContent.tsx
-var TableViewContent_exports = {};
-__export(TableViewContent_exports, {
-  TableViewContent: () => TableViewContent
-});
-module.exports = __toCommonJS(TableViewContent_exports);
-var import_ahooks = require("ahooks");
-var import_creek_hooks = require("../creek-hooks");
-var import_jsx_runtime = require("react/jsx-runtime");
-var TableViewContent = (props) => {
-  const { prefixCls, pageFixedBottomConfig, pageFixedBottom, children } = props;
-  const { containerRef, viewPortHeight } = (0, import_creek_hooks.useViewportHeight)({
-    isObserverParent: true
-  });
-  const { run: setAntdTableContentHeight } = (0, import_ahooks.useDebounceFn)(
-    (mainHeight) => {
-      var _a, _b, _c;
-      const antdTableContentElement = (_a = containerRef.current) == null ? void 0 : _a.querySelector(`.${prefixCls}-table`);
-      const antdPaginationElement = (_b = containerRef.current) == null ? void 0 : _b.querySelector(`.${prefixCls}-pagination`);
-      if (antdTableContentElement) {
-        const paginationHeight = (antdPaginationElement == null ? void 0 : antdPaginationElement.clientHeight) || 0;
-        const bottomFix = (pageFixedBottomConfig == null ? void 0 : pageFixedBottomConfig.bottomFix) || 20;
-        const parentElement = (_c = containerRef.current) == null ? void 0 : _c.parentElement;
-        let parentPaddingBottom = 0;
-        if (parentElement) {
-          const style = window.getComputedStyle(parentElement);
-          parentPaddingBottom = parseFloat(style.paddingBottom) || 0;
-        }
-        const tableContentHeight = mainHeight - paginationHeight - parentPaddingBottom - bottomFix - parentPaddingBottom;
-        antdTableContentElement.setAttribute("style", `height: ${tableContentHeight}px`);
-      }
-    },
-    {
-      wait: 16
-    }
-  );
-  (0, import_ahooks.useDeepCompareEffect)(() => {
-    if (pageFixedBottom) {
-      setAntdTableContentHeight(viewPortHeight ?? 0);
-    }
-  }, [viewPortHeight, pageFixedBottom, setAntdTableContentHeight]);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { ref: containerRef, children }) });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  TableViewContent
-});
-//# sourceMappingURL=TableViewContent.js.map

package/dist/creek-table/TableViewContent.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/creek-table/TableViewContent.tsx"],
-  "sourcesContent": ["import { ParamsType } from '@ant-design/pro-components';\n\nimport { useDebounceFn, useDeepCompareEffect } from 'ahooks';\n\nimport { useViewportHeight } from '../creek-hooks';\nimport { CreekTableProps } from './type';\n\nexport type CreekTableViewRender<T extends ParamsType, U extends ParamsType, ValueType = 'text'> = CreekTableProps<T, U, ValueType>['tableViewRender'];\n\n// 独立的 TableViewWrapper 组件 - 包含所有表格视图相关逻辑\nexport const TableViewContent = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {\n  const { prefixCls, pageFixedBottomConfig, pageFixedBottom, children } = props;\n\n  const { containerRef, viewPortHeight } = useViewportHeight({\n    isObserverParent: true,\n  });\n\n  // 设置antd内容区的高度，使得分页永远在底部\n  const { run: setAntdTableContentHeight } = useDebounceFn(\n    (mainHeight: number) => {\n      const antdTableContentElement = containerRef.current?.querySelector(`.${prefixCls}-table`);\n      const antdPaginationElement = containerRef.current?.querySelector(`.${prefixCls}-pagination`);\n      if (antdTableContentElement) {\n        const paginationHeight = antdPaginationElement?.clientHeight || 0;\n        const bottomFix = pageFixedBottomConfig?.bottomFix || 20;\n        const parentElement = containerRef.current?.parentElement;\n        let parentPaddingBottom = 0;\n        if (parentElement) {\n          const style = window.getComputedStyle(parentElement);\n          parentPaddingBottom = parseFloat(style.paddingBottom) || 0;\n        }\n        const tableContentHeight = mainHeight - paginationHeight - parentPaddingBottom - bottomFix - parentPaddingBottom;\n        antdTableContentElement.setAttribute('style', `height: ${tableContentHeight}px`);\n      }\n    },\n    {\n      wait: 16,\n    },\n  );\n\n  useDeepCompareEffect(() => {\n    if (pageFixedBottom) {\n      setAntdTableContentHeight(viewPortHeight ?? 0);\n    }\n  }, [viewPortHeight, pageFixedBottom, setAntdTableContentHeight]);\n\n  // 默认渲染逻辑\n  return (\n    <>\n      <div ref={containerRef}>{children}</div>\n    </>\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAAoD;AAEpD,yBAAkC;AA4C9B;AAtCG,IAAM,mBAAmB,CAAiE,UAA4C;AAC3I,QAAM,EAAE,WAAW,uBAAuB,iBAAiB,SAAS,IAAI;AAExE,QAAM,EAAE,cAAc,eAAe,QAAI,sCAAkB;AAAA,IACzD,kBAAkB;AAAA,EACpB,CAAC;AAGD,QAAM,EAAE,KAAK,0BAA0B,QAAI;AAAA,IACzC,CAAC,eAAuB;AAnB5B;AAoBM,YAAM,2BAA0B,kBAAa,YAAb,mBAAsB,cAAc,IAAI;AACxE,YAAM,yBAAwB,kBAAa,YAAb,mBAAsB,cAAc,IAAI;AACtE,UAAI,yBAAyB;AAC3B,cAAM,oBAAmB,+DAAuB,iBAAgB;AAChE,cAAM,aAAY,+DAAuB,cAAa;AACtD,cAAM,iBAAgB,kBAAa,YAAb,mBAAsB;AAC5C,YAAI,sBAAsB;AAC1B,YAAI,eAAe;AACjB,gBAAM,QAAQ,OAAO,iBAAiB,aAAa;AACnD,gCAAsB,WAAW,MAAM,aAAa,KAAK;AAAA,QAC3D;AACA,cAAM,qBAAqB,aAAa,mBAAmB,sBAAsB,YAAY;AAC7F,gCAAwB,aAAa,SAAS,WAAW,sBAAsB;AAAA,MACjF;AAAA,IACF;AAAA,IACA;AAAA,MACE,MAAM;AAAA,IACR;AAAA,EACF;AAEA,0CAAqB,MAAM;AACzB,QAAI,iBAAiB;AACnB,gCAA0B,kBAAkB,CAAC;AAAA,IAC/C;AAAA,EACF,GAAG,CAAC,gBAAgB,iBAAiB,yBAAyB,CAAC;AAG/D,SACE,2EACE,sDAAC,SAAI,KAAK,cAAe,UAAS,GACpC;AAEJ;",
-  "names": []
-}

package/src/creek-table/TableViewContent.tsx

@@ -1,53 +0,0 @@
-import { ParamsType } from '@ant-design/pro-components';
-
-import { useDebounceFn, useDeepCompareEffect } from 'ahooks';
-
-import { useViewportHeight } from '../creek-hooks';
-import { CreekTableProps } from './type';
-
-export type CreekTableViewRender<T extends ParamsType, U extends ParamsType, ValueType = 'text'> = CreekTableProps<T, U, ValueType>['tableViewRender'];
-
-// 独立的 TableViewWrapper 组件 - 包含所有表格视图相关逻辑
-export const TableViewContent = <T extends ParamsType, U extends ParamsType, ValueType = 'text'>(props: CreekTableProps<T, U, ValueType>) => {
-  const { prefixCls, pageFixedBottomConfig, pageFixedBottom, children } = props;
-
-  const { containerRef, viewPortHeight } = useViewportHeight({
-    isObserverParent: true,
-  });
-
-  // 设置antd内容区的高度，使得分页永远在底部
-  const { run: setAntdTableContentHeight } = useDebounceFn(
-    (mainHeight: number) => {
-      const antdTableContentElement = containerRef.current?.querySelector(`.${prefixCls}-table`);
-      const antdPaginationElement = containerRef.current?.querySelector(`.${prefixCls}-pagination`);
-      if (antdTableContentElement) {
-        const paginationHeight = antdPaginationElement?.clientHeight || 0;
-        const bottomFix = pageFixedBottomConfig?.bottomFix || 20;
-        const parentElement = containerRef.current?.parentElement;
-        let parentPaddingBottom = 0;
-        if (parentElement) {
-          const style = window.getComputedStyle(parentElement);
-          parentPaddingBottom = parseFloat(style.paddingBottom) || 0;
-        }
-        const tableContentHeight = mainHeight - paginationHeight - parentPaddingBottom - bottomFix - parentPaddingBottom;
-        antdTableContentElement.setAttribute('style', `height: ${tableContentHeight}px`);
-      }
-    },
-    {
-      wait: 16,
-    },
-  );
-
-  useDeepCompareEffect(() => {
-    if (pageFixedBottom) {
-      setAntdTableContentHeight(viewPortHeight ?? 0);
-    }
-  }, [viewPortHeight, pageFixedBottom, setAntdTableContentHeight]);
-
-  // 默认渲染逻辑
-  return (
-    <>
-      <div ref={containerRef}>{children}</div>
-    </>
-  );
-};