ele-admin-plus 1.1.9-beta.9 → 1.2.0-beta.1

package/lib/ele-pro-layout/style/header.scss

@@ -13,6 +13,11 @@
   z-index: calc(#{eleVar('layout', 'index')} + 3);
   flex-shrink: 0;
 
+  &.is-ghost {
+    background: hsla(0, 0%, 100%, 0.04);
+    backdrop-filter: blur(8px);
+  }
+
   /* 图标 */
   .ele-admin-logo {
     color: eleVar('logo', 'color');
@@ -41,7 +46,9 @@
 
   /* 面包屑 */
   .ele-admin-breadcrumb {
+    $tool-padding: eleVar('header', 'tool-padding');
     flex-shrink: 0;
+    margin-left: calc(#{eleVar('header', 'tools-padding')} + #{$tool-padding});
   }
 
   /* 菜单 */
@@ -59,21 +66,79 @@
     }
   }
 
-  /* 工具栏 */
-  .ele-admin-tools {
-    height: 100%;
-    flex-shrink: 0;
-    padding: 0 12px;
-    display: flex;
-    align-items: center;
-    box-sizing: border-box;
+  /* 页签栏 */
+  & > .ele-admin-tabs {
+    flex: 1;
+    overflow: hidden;
+    line-height: normal;
+
+    &.ele-tab-wrap {
+      padding-right: 0;
+      background: none;
+      box-shadow: none;
+    }
+
+    & + .ele-admin-tools {
+      padding-left: 0;
+    }
+
+    &.is-simple,
+    &.is-indicator {
+      align-self: flex-end;
+    }
+  }
+
+  & > .ele-admin-tabs.ele-tab-wrap.is-simple,
+  & > .ele-admin-tabs.ele-tab-wrap.is-indicator,
+  & > .ele-tab-wrap .ele-tabs.is-simple,
+  & > .ele-tab-wrap .ele-tabs.is-indicator {
+    $height: eleVar('header', 'height');
+    $tool-height: eleVar('header', 'tool-height');
+    $tab-height: calc(#{$height} - (#{$height} - #{$tool-height}) / 2);
+    #{eleVarName('tab', 'height')}: #{$tab-height};
+  }
+}
+
+/* 工具栏 */
+.ele-admin-tools {
+  display: flex;
+  align-items: center;
+  padding: 0 eleVar('header', 'tools-padding');
+  box-sizing: border-box;
+  flex-shrink: 0;
+  height: 100%;
+
+  & + .ele-admin-breadcrumb {
+    margin-left: 0;
+  }
+
+  & + .ele-admin-tabs {
+    &.ele-tab-wrap,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: 0;
+    }
+  }
+
+  & + .is-simple,
+  & + .is-indicator {
+    &.is-fixed-home,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'simple-angle-size');
+    }
+  }
+
+  & + .is-button {
+    &.is-fixed-home,
+    &:not(.is-fixed-home) .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'button-space');
+    }
   }
 }
 
 /* 操作按钮 */
 .ele-admin-tool {
   height: eleVar('header', 'tool-height');
-  padding: 0 12px;
+  padding: 0 eleVar('header', 'tool-padding');
   display: flex;
   align-items: center;
   border-radius: eleVar('header', 'tool-radius');

package/lib/ele-pro-layout/style/layout-mobile.scss

@@ -30,7 +30,7 @@
     width: 100% !important;
   }
 
-  .ele-admin-tabs {
+  .ele-admin-body > .ele-admin-tabs {
     left: 0 !important;
   }
 
@@ -56,7 +56,7 @@
 
     &.is-dark,
     &.is-primary {
-      box-shadow: eleVar('header-dark', 'shadow');
+      box-shadow: eleVar('header', 'dark-shadow');
     }
   }
 }

package/lib/ele-pro-layout/style/layout-style.scss

@@ -8,7 +8,7 @@
     top: 0;
   }
 
-  .ele-admin-tabs {
+  .ele-admin-body > .ele-admin-tabs {
     position: sticky;
     top: eleVar('header', 'height');
   }
@@ -85,6 +85,7 @@
 
   .ele-admin-main,
   .ele-admin-body,
+  .ele-admin-wrapper,
   .ele-admin-content {
     overflow-x: hidden;
     overflow-y: auto;
@@ -95,6 +96,10 @@
   .ele-admin-sidebox {
     height: 100%;
   }
+
+  .ele-admin-wrapper > .el-backtop {
+    z-index: eleVar('layout', 'index');
+  }
 }
 
 /* 内容全屏 */
@@ -102,11 +107,11 @@
   .ele-admin-header,
   .ele-admin-sidebar,
   .ele-admin-sidebox,
-  &.ele-admin-expanded .ele-admin-tabs {
+  &.ele-admin-expanded .ele-admin-body > .ele-admin-tabs {
     display: none;
   }
 
-  &.ele-admin-fixed-header .ele-admin-tabs {
+  &.ele-admin-fixed-header .ele-admin-body > .ele-admin-tabs {
     top: 0;
   }
 

package/lib/ele-pro-layout/style/layout-theme.scss

@@ -4,9 +4,9 @@
 /* 暗色顶栏 */
 .ele-admin-header.is-dark,
 .ele-admin-header.is-primary {
-  color: eleVar('menu-dark', 'active-color');
-  background: eleVar('header-dark', 'bg');
-  box-shadow: eleVar('header-dark', 'shadow');
+  color: eleVar('header', 'dark-color');
+  background: eleVar('header', 'dark-bg');
+  box-shadow: eleVar('header', 'dark-shadow');
 
   /* 操作按钮 */
   .ele-admin-tool:hover {
@@ -15,32 +15,63 @@
 
   /* 面包屑 */
   .ele-breadcrumb .el-breadcrumb__item {
-    .el-breadcrumb__inner {
-      color: eleVar('menu-dark', 'color');
-
-      &.is-link:hover {
-        color: eleVar('menu-dark', 'active-color');
-      }
+    .el-breadcrumb__inner,
+    .el-breadcrumb__separator {
+      color: rgba(255, 255, 255, 0.8);
     }
 
+    .el-breadcrumb__inner.is-link:hover,
     &:last-child .el-breadcrumb__inner {
-      color: eleVar('menu-dark', 'active-color');
+      color: eleVar('header', 'dark-color');
     }
+  }
 
-    .el-breadcrumb__separator {
-      color: eleVar('menu-dark', 'color');
-    }
+  /* 页签栏 */
+  & > .ele-admin-tabs.ele-tab-wrap,
+  & > .ele-admin-tabs .ele-tabs {
+    $color: eleVar('header', 'dark-color');
+    $hover-bg: eleVar('header', 'dark-tool-hover-bg');
+    #{eleVarName('tab', 'color')}: #{$color};
+    #{eleVarName('tab', 'hover-color')}: #{$color};
+    #{eleVarName('tab', 'close-color')}: #{$color};
+    #{eleVarName('tab', 'close-hover-color')}: #{$color};
+    #{eleVarName('tab', 'close-hover-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'tool-color')}: #{$color};
+    #{eleVarName('tab', 'tool-hover-color')}: #{$color};
+    #{eleVarName('tab', 'simple-hover-color')}: #{$color};
+    #{eleVarName('tab', 'simple-hover-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'simple-active-bg')}: #{elVar('bg-color', 'overlay')};
+    #{eleVarName('tab', 'simple-active-line')}: 0px;
+    #{eleVarName('tab', 'simple-tool-hover-bg')}: transparent;
+    #{eleVarName('tab', 'indicator-dot-color')}: rgba(255, 255, 255, 0.4);
+    #{eleVarName('tab', 'indicator-dot-hover-color')}: rgba(255, 255, 255, 0.6);
+    #{eleVarName('tab', 'button-bg')}: #{$hover-bg};
+    #{eleVarName('tab', 'button-hover-bg')}: rgba(255, 255, 255, 0.2);
+    #{eleVarName('tab', 'button-hover-color')}: #{$color};
   }
 }
 
+.ele-admin-header.is-dark > .ele-admin-tabs.ele-tab-wrap,
+.ele-admin-header.is-dark > .ele-admin-tabs .ele-tabs {
+  $color: eleVar('header', 'dark-color');
+  $hover-bg: eleVar('header', 'dark-tool-hover-bg');
+  #{eleVarName('tab', 'active-close-color')}: #{$color};
+  #{eleVarName('tab', 'active-close-hover-color')}: #{$color};
+  #{eleVarName('tab', 'active-close-hover-bg')}: #{$hover-bg};
+  #{eleVarName('tab', 'simple-active-color')}: #{$color};
+  #{eleVarName('tab', 'simple-active-bg')}: #{elVar('color-primary')};
+  #{eleVarName('tab', 'indicator-dot-active-color')}: #{$color};
+  #{eleVarName('tab', 'button-active-color')}: #{$color};
+  #{eleVarName('tab', 'button-active-bg')}: #{elVar('color-primary')};
+}
+
 /* 主色顶栏 */
 .ele-admin-header.is-primary {
   background: elVar('color-primary');
 
+  /* 菜单 */
   .ele-admin-menus > .ele-menu {
-    $hover-bg: eleVar('header-primary', 'hover-bg');
-    $active-bg: eleVar('header-primary', 'active-bg');
-    #{eleVarName('menu-horizontal', 'dark-hover-bg')}: #{$hover-bg};
+    $active-bg: eleVar('header', 'primary-active-bg');
     #{eleVarName('menu-horizontal', 'dark-active-bg')}: #{$active-bg};
   }
 }
@@ -68,18 +99,12 @@
 
     .ele-admin-sidebox {
       background: eleVar('sidebar', 'dark-bg');
-
-      .ele-admin-menus > .el-scrollbar__wrap > .el-scrollbar__view > .ele-menu {
-        & > .el-sub-menu.is-active > .el-sub-menu__title {
-          background: eleVar('menu-dark', 'active-bg');
-        }
-      }
     }
   }
 
   .ele-admin-sidebox .ele-sidebar-tool,
   &:not(.ele-admin-mix-sidebar) .ele-admin-sidebar .ele-sidebar-tool {
-    color: eleVar('menu-dark', 'active-color');
+    color: eleVar('header', 'dark-color');
 
     &:hover {
       background: eleVar('header', 'dark-tool-hover-bg');

package/lib/ele-pro-layout/style/layout.scss

@@ -19,14 +19,21 @@
     transition: width $ele-transition;
   }
 
-  .ele-admin-content {
+  .ele-admin-wrapper {
     flex: auto;
     display: flex;
     flex-direction: column;
+    position: relative;
+
+    & > .el-backtop {
+      z-index: calc(#{eleVar('layout', 'index')} + 1);
+    }
   }
 
-  & > .el-backtop {
-    z-index: eleVar('layout', 'index');
+  .ele-admin-content {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
   }
 }
 
@@ -58,17 +65,40 @@
 }
 
 /* iframe */
+.ele-admin-iframe-wrap {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  pointer-events: none;
+  overflow: hidden;
+}
+
 .ele-admin-iframe {
+  flex-shrink: 0;
   width: 100%;
   height: 100%;
-  box-sizing: border-box;
-  display: block;
   border: none;
+  box-sizing: border-box;
+  pointer-events: auto;
 }
 
-.ele-admin-iframe-wrap {
+/* 弹窗容器 */
+.ele-admin-modals {
+  flex-shrink: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   width: 100%;
   height: 100%;
-  flex-shrink: 0;
-  overflow: hidden;
+  pointer-events: none;
+  z-index: eleVar('layout', 'index');
 }

package/lib/ele-pro-layout/style/sidebar.scss

@@ -103,7 +103,6 @@
         }
 
         & > .el-sub-menu.is-active > .el-sub-menu__title {
-          background: eleVar('menu-item', 'active-bg');
           transition: none;
         }
 

package/lib/ele-pro-layout/style/tabs.scss

@@ -15,6 +15,25 @@
   /* 固定主页页签 */
   &.is-fixed-home {
     padding-left: eleVar('page', 'padding');
+
+    &.is-tag .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'tag-space');
+    }
+
+    &.is-button .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
+      padding-left: eleVar('tab', 'button-space');
+    }
+  }
+
+  /* 页签风格适配 */
+  &.is-tag {
+    padding-right: eleVar('tab', 'tag-space');
+  }
+
+  &.is-button {
+    padding-right: eleVar('page', 'padding');
+    background: eleVar('layout', 'bg');
+    box-shadow: none;
   }
 }
 
@@ -24,14 +43,3 @@
     box-shadow: 0 -0.8px 0 eleVar('header', 'line-color') inset;
   }
 }
-
-/* 按钮风格页签 */
-.ele-admin-tab-card .ele-admin-tabs {
-  padding-right: eleVar('page', 'padding');
-  background: eleVar('layout', 'bg');
-  box-shadow: none;
-
-  &.is-fixed-home .el-tabs__nav-wrap:not(.is-scrollable) .el-tabs__nav {
-    padding-left: eleVar('tab-button', 'space');
-  }
-}

package/lib/ele-pro-layout/types.d.ts

@@ -1,4 +1,4 @@
-import type { RouteMeta, RouteLocationMatched } from 'vue-router';
+import type { RouteLocationMatched } from 'vue-router';
 import type { ElMenuProps, ElBreadcrumbProps } from '../ele-app/el';
 import type { EleMenuItemProps } from '../ele-app/plus';
 import type TabTitle from '../ele-tabs/components/tab-title';
@@ -7,11 +7,11 @@ export type MenuItemProps = EleMenuItemProps;
 /**
  * 菜单元数据
  */
-export interface MenuMeta extends RouteMeta {
+export interface MenuMeta extends Record<string, any> {
   /** 菜单标题 */
   title?: string;
   /** 菜单图标 */
-  icon?: EleMenuItemProps['icon'];
+  icon?: any;
   /** 菜单是否隐藏 */
   hide?: boolean;
   /** 选中其它菜单 */
@@ -31,7 +31,7 @@ export interface MenuMeta extends RouteMeta {
   /** 是否在面包屑中显示 */
   breadcrumb?: boolean;
   /** 菜单组件其它属性 */
-  props?: EleMenuItemProps;
+  props?: Record<string, any>;
   /** 是否需要外层布局 */
   layout?: boolean;
   /** 路由地址 */
@@ -117,7 +117,7 @@ export type SidebarStyle = 'light' | 'dark';
 /**
  * 页签风格
  */
-export type TabStyle = 'simple' | 'indicator' | 'button';
+export type TabStyle = 'simple' | 'indicator' | 'button' | 'tag';
 
 /**
  * 菜单标题国际化方法

package/lib/ele-pro-layout/util.cjs

@@ -111,14 +111,13 @@ function getMatchedComponents(matched) {
   });
   return components;
 }
-function getRouteTab(current, tabs, homePath, fixedHome, routeTitle) {
+function getRouteTab(current, tabs, homePath, routeTitle) {
   const { path, fullPath, meta, matched } = current;
   const key = meta.tabUnique === false ? fullPath : path;
   const t = findTabByPath(key, tabs);
   const title = (t == null ? void 0 : t.title) || routeTitle;
   const home = isHomeRoute(current, homePath);
-  const isFixedHome = fixedHome && home;
-  const closable = isFixedHome ? false : (t == null ? void 0 : t.closable) ?? meta.closable !== false;
+  const closable = (t == null ? void 0 : t.closable) ?? meta.closable !== false;
   const components = getMatchedComponents(matched);
   return { key, path, fullPath, title, closable, home, components, meta };
 }

package/lib/ele-pro-layout/util.d.ts

@@ -1,6 +1,7 @@
-import type { RouteLocationMatched } from 'vue-router';
-import type { ProLayoutProps } from './props';
-import type { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
+import { ProLayoutProps } from './props';
+import { RouteLocationMatched } from 'vue-router';
+
 /**
  * 判断路由是否是主页
  * @param route 路由信息
@@ -57,11 +58,10 @@ export declare function getMatchedComponents(matched: RouteLocationMatched[]): s
  * @param current 路由信息
  * @param tabs 当前页签数据
  * @param homePath 主页地址
- * @param fixedHome 是否固定主页
  * @param repeatableTabs 可重复打开的页签
  * @param routeTitle 路由对应的标题
  */
-export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, fixedHome?: boolean, routeTitle?: string): TabItem;
+export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, routeTitle?: string): TabItem;
 /**
  * 获取混合导航布局选中
  * @param matched 路由匹配的菜单层级数据
@@ -95,4 +95,4 @@ export declare function useDisableTransition(): {
  * @param menus 菜单数据
  * @param link 是否使用超链接
  */
-export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import("../ele-menus/types").MenuItem>[];
+export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import('../ele-menus/types').MenuItem>[];

package/lib/ele-pro-table/components/table-tools.cjs

@@ -49,6 +49,8 @@ const _sfc_main = vue.defineComponent({
     pageData: Array,
     /** 单元格合并行列方法 */
     spanMethod: Function,
+    /** 表格是否有表头 */
+    tableHeader: Boolean,
     /** 是否显示合计行 */
     showSummary: Boolean,
     /** 合计行文本 */
@@ -65,6 +67,8 @@ const _sfc_main = vue.defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
+    /** 子级字段名 */
+    childrenField: String,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 导出配置 */
@@ -214,53 +218,36 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, 1032, ["placement", "title", "onClick"])) : tool === "export" ? (vue.openBlock(), vue.createBlock(_component_ToolExport, {
         key: index + "-export",
         placement: _ctx.placement,
-        title: _ctx.lang.export,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        fileNameText: _ctx.lang.exportFileName,
-        fileNamePlaceholderText: _ctx.lang.exportFileNamePlaceholder,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.exportConfig.modalProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.exportConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
         pageIndex: _ctx.pageIndex,
+        childrenField: _ctx.childrenField,
         fetch: _ctx.fetch,
         defaultFileName: _ctx.exportConfig.fileName,
         defaultDataType: _ctx.exportConfig.dataType,
         beforeExport: _ctx.exportConfig.beforeExport
-      }, null, 8, ["placement", "title", "checkAllText", "resetText", "untitledText", "fileNameText", "fileNamePlaceholderText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "pageIndex", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(_component_ToolPrint, {
+      }, null, 8, ["placement", "locale", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "childrenField", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(_component_ToolPrint, {
         key: index + "-print",
         placement: _ctx.placement,
-        title: _ctx.lang.print,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.printConfig.modalProps,
+        printerProps: _ctx.printConfig.printerProps,
+        tableProps: _ctx.printConfig.tableProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.printConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
@@ -269,6 +256,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         headerCellStyle: _ctx.headerCellStyle,
         headerCellClassName: _ctx.headerCellClassName,
         pageIndex: _ctx.pageIndex,
+        childrenField: _ctx.childrenField,
         fetch: _ctx.fetch,
         defaultDataType: _ctx.printConfig.dataType,
         beforePrint: _ctx.printConfig.beforePrint
@@ -281,7 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1032, ["placement", "title", "checkAllText", "resetText", "untitledText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "defaultDataType", "beforePrint"])) : tool && tool !== "default" && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, {
+      ]), 1032, ["placement", "locale", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "childrenField", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, {
         key: 6,
         pageIndex: _ctx.pageIndex,
         fetch: _ctx.fetch