diff --git a/apps/admin/src/documentation-example.tsx b/apps/admin/src/documentation-example.tsx index 717a3cd6..9b5f9ce3 100644 --- a/apps/admin/src/documentation-example.tsx +++ b/apps/admin/src/documentation-example.tsx @@ -13,7 +13,6 @@ import { getStaticAppRoutes, setAppRouteModules, } from '@/router/app-route-modules' -import { routeView } from '@/router/config/views' import { expandRoutes } from '@/router/utils/expand-routes' import { useSettingActions, useSettingGetters } from '@/store' import { useMemoryCache } from '@/utils/cache-backend' @@ -21,11 +20,13 @@ import { exampleFocusKey } from '@/views/demo/hooks/example-focus' import type { IconPackage } from '@ray-template/icons' import { iconSprites } from '@ray-template/icons/manifest' import { provideUiServices } from '@ray-template/ui/services' +import { createStorage } from '@ray-template/utils/storage' import { RouterView } from 'vue-router' import type { RouteRecordRaw } from 'vue-router' const examplePaths = new Set([ '/dashboard', + '/tables', '/form', '/modal-demo', '/echart', @@ -43,16 +44,11 @@ const examplePaths = new Set([ '/axios', '/qrcode', ]) + const params = new URLSearchParams(location.search) const withLayout = params.get('layout') === '1' const examples = [ ...getStaticAppRoutes().filter(({ path }) => examplePaths.has(path)), - { - path: '/tables/search', - name: 'TableDemoSearch', - component: routeView('demo/tables/search'), - meta: { i18nKey: 'menu.TableSearch' }, - }, { path: '/docs-core-utils', name: 'DocsCoreUtils', @@ -86,6 +82,7 @@ const DocumentationExample = defineComponent({ translate: t, iconUrl: (name, prefix) => `${iconSprites[name.split('/')[0] as IconPackage]}#${prefix}-${name}`, + columnStorage: createStorage(window.sessionStorage, 'ray-doc-examples'), reportError: (message) => window.$message?.error(message), }) diff --git a/apps/admin/src/locales/lang/en-US/menu.json b/apps/admin/src/locales/lang/en-US/menu.json index f247f39c..29844421 100644 --- a/apps/admin/src/locales/lang/en-US/menu.json +++ b/apps/admin/src/locales/lang/en-US/menu.json @@ -43,6 +43,7 @@ "TablePrinting": "Printing and custom regions", "TableCustom": "Slots and instance methods", "TableHooksQuery": "Hooks · Queries and paging", + "TableControlled": "Controlled remote paging", "TableSearch": "Advanced search", "TableHooksSelection": "Hooks · Selection and bulk actions", "TableHooksOutput": "Hooks · Export and print", diff --git a/apps/admin/src/locales/lang/zh-CN/menu.json b/apps/admin/src/locales/lang/zh-CN/menu.json index 8a54af2a..48605f84 100644 --- a/apps/admin/src/locales/lang/zh-CN/menu.json +++ b/apps/admin/src/locales/lang/zh-CN/menu.json @@ -43,6 +43,7 @@ "TablePrinting": "打印与自定义区域", "TableCustom": "插槽与实例操作", "TableHooksQuery": "Hooks · 查询与分页", + "TableControlled": "手动远端分页", "TableSearch": "高级搜索", "TableHooksSelection": "Hooks · 选择与批量操作", "TableHooksOutput": "Hooks · 导出与打印", diff --git a/apps/admin/src/router/config/views.ts b/apps/admin/src/router/config/views.ts index f3b04048..09f6eee7 100644 --- a/apps/admin/src/router/config/views.ts +++ b/apps/admin/src/router/config/views.ts @@ -111,6 +111,10 @@ const views = { load: () => import('@/views/demo/tables/columns'), name: 'TableDemoColumns', }, + 'demo/tables/controlled': { + load: () => import('@/views/demo/tables/controlled'), + name: 'TableDemoControlled', + }, 'demo/tables/custom': { load: () => import('@/views/demo/tables/custom'), name: 'TableDemoCustom', diff --git a/apps/admin/src/router/modules/demo/tables.ts b/apps/admin/src/router/modules/demo/tables.ts index a908563e..c9c6377e 100644 --- a/apps/admin/src/router/modules/demo/tables.ts +++ b/apps/admin/src/router/modules/demo/tables.ts @@ -22,6 +22,12 @@ const tables: AppRouteRecordRaw = { component: routeView('demo/tables/remote'), meta: { i18nKey: t('menu.TableRemote') }, }, + { + path: 'controlled', + name: 'TableDemoControlled', + component: routeView('demo/tables/controlled'), + meta: { i18nKey: t('menu.TableControlled') }, + }, { path: 'search', name: 'TableDemoSearch', diff --git a/apps/admin/src/views/demo/tables/controlled.tsx b/apps/admin/src/views/demo/tables/controlled.tsx new file mode 100644 index 00000000..82dc5344 --- /dev/null +++ b/apps/admin/src/views/demo/tables/controlled.tsx @@ -0,0 +1,53 @@ +import { listPeople } from '@/demo-data/people' +import { useI18n } from '@/hooks/template/useI18n' +import { RTablePro } from '@ray-template/ui/table-pro' +import { createPeopleColumns } from './people' + +export default defineComponent({ + name: 'TableDemoControlled', + setup() { + const { t } = useI18n() + const page = ref(1) + const pageSize = ref(10) + const name = ref() + const result = computed(() => + listPeople({ + page: page.value, + pageSize: pageSize.value, + name: name.value, + }), + ) + const columns = computed(() => + createPeopleColumns((key) => t(`table.${key}`)), + ) + + return () => ( + (page.value = value), + onUpdatePageSize: (value) => { + pageSize.value = value + page.value = 1 + }, + }} + search={{ + fields: [{ key: 'name', label: t('table.name'), type: 'text' }], + }} + onSearch={({ values }) => { + name.value = typeof values.name === 'string' ? values.name : void 0 + page.value = 1 + }} + /> + ) + }, +}) diff --git a/apps/docs/.vitepress/sidebar.mts b/apps/docs/.vitepress/sidebar.mts index b85763da..a4ba0e0c 100644 --- a/apps/docs/.vitepress/sidebar.mts +++ b/apps/docs/.vitepress/sidebar.mts @@ -35,6 +35,7 @@ const reference = [ collapsed: true, items: [ entry('TablePro', '/reference/table-pro'), + entry('TablePro 在线示例', '/reference/table-pro-examples'), entry('RForm 与 useForm', '/reference/components/form'), entry('RModal', '/reference/components/modal'), entry('RChart 与 useChart', '/reference/components/chart'), diff --git a/apps/docs/.vitepress/theme/RayHome.vue b/apps/docs/.vitepress/theme/RayHome.vue index c31fc265..a9c18060 100644 --- a/apps/docs/.vitepress/theme/RayHome.vue +++ b/apps/docs/.vitepress/theme/RayHome.vue @@ -71,7 +71,14 @@

表格填满可用高度,数据在表内滚动。

import { withBase } from 'vitepress' -import { demo, version } from '../source.mts' +import { version } from '../source.mts' const modules = [ { title: 'Ray Admin', name: 'apps/admin', href: '/guide/layout.html' }, diff --git a/apps/docs/README.md b/apps/docs/README.md index 32cf1b05..e18dd5bb 100644 --- a/apps/docs/README.md +++ b/apps/docs/README.md @@ -25,6 +25,6 @@ pnpm docs:preview 应用变更影响公开 API 时,同步更新对应文档和示例。示例直接使用 workspace 包的公开入口。外壳预览使用文档自己的内存路由和示例菜单。预览生产构建,检查导航、搜索、主题、窄屏、旧路径和受影响示例。 -轻量示例直接在文档中运行。依赖后台上下文的示例嵌入同一版本的 `example.html`,只注册演示路由,缓存和 Store 状态留在该示例实例。Markdown 从实际运行的文件引用源码。开发时同时运行 `pnpm dev` 和 `pnpm docs:dev`;后台端口不是 9527 时,为文档开发服务器设置 `VITE_RAY_EXAMPLE_ORIGIN`(例如 `http://127.0.0.1:9528`)。 +轻量示例直接在文档中运行。依赖后台上下文的示例嵌入同一版本的 `example.html`,只注册演示路由,普通缓存和 Store 状态留在该示例实例;TablePro 列显隐缓存使用独立的会话命名空间,允许在同一标签页刷新验证。Markdown 从实际运行的文件引用源码。开发时同时运行 `pnpm dev` 和 `pnpm docs:dev`;后台端口不是 9527 时,为文档开发服务器设置 `VITE_RAY_EXAMPLE_ORIGIN`(例如 `http://127.0.0.1:9528`)。 验收全部示例请运行 `pnpm pages:build`,然后用 `pnpm preview --outDir ../../dist/pages` 在同一地址预览后台和文档,打开 `/ray-template/docs/`。只运行 `pnpm docs:preview` 时,可预览文档和直接运行的轻量示例。 diff --git a/apps/docs/examples/AdminExample.vue b/apps/docs/examples/AdminExample.vue index cb7c54ee..b6f2dec3 100644 --- a/apps/docs/examples/AdminExample.vue +++ b/apps/docs/examples/AdminExample.vue @@ -1,25 +1,30 @@