ele-admin-plus 1.2.2-beta.4 → 1.3.1-beta.1

package/lib/ele-virtual-table/util.cjs

@@ -417,12 +417,12 @@ function getTreeProps(treeProps) {
 }
 function getIndexValue(rowIndex, index, pageIndex) {
   if (index == null) {
-    return String((pageIndex ?? 1) + rowIndex);
+    return (pageIndex ?? 1) + rowIndex;
   }
   if (typeof index === "function") {
-    return String(index(rowIndex));
+    return index(rowIndex);
   }
-  return String(index + rowIndex);
+  return index + rowIndex;
 }
 function getCellSpan(params, spanMethod) {
   var _a;
@@ -543,7 +543,7 @@ function useAutoResize(getEl) {
     updateWrapSize();
     observe();
   });
-  vue.onBeforeMount(() => {
+  vue.onBeforeUnmount(() => {
     observer.disconnect();
   });
   vue.onActivated(() => {

package/lib/ele-virtual-table/util.d.ts

@@ -125,9 +125,7 @@ export declare function isAutoRowHeight(hasExpandCol: boolean, bodyCols: BodyCol
  * @param props 属性
  * @param ctx SetupContext
  */
-export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): (string | number | VNode<import('vue').RendererNode, import('vue').RendererElement, {
-    [key: string]: any;
-}>)[] | undefined;
+export declare function CellRender(props: CustomRenderProps, ctx: SetupContext): any[] | undefined;
 /**
  * 获取表头点击后的排序值
  * @param current 当前排序值
@@ -176,7 +174,7 @@ export declare function getTreeProps(treeProps?: TreeProps): TreeTableProps;
  * @param index 自定义起始索引
  * @param pageIndex 表格分页起始索引
  */
-export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): string;
+export declare function getIndexValue(rowIndex: number, index?: ColumnIndex, pageIndex?: number): number;
 /**
  * 获取单元格的跨行和跨列
  * @param column 列配置

package/lib/ele-watermark/util.cjs

@@ -57,7 +57,7 @@ function useMutation(option) {
     falsifiedObserver.disconnect();
     deletedObserver.disconnect();
   };
-  vue.onBeforeMount(() => {
+  vue.onBeforeUnmount(() => {
     disconnect();
   });
   return { observe, disconnect };

package/lib/style/plus.scss

@@ -27,6 +27,8 @@
 @use '../ele-pagination/style/index.scss' as pagination;
 @use '../ele-popconfirm/style/index.scss' as popconfirm;
 @use '../ele-printer/style/index.scss' as printer;
+@use '../ele-pro-form/style/index.scss' as proForm;
+@use '../ele-pro-form-builder/style/index.scss' as proFormBuilder;
 @use '../ele-pro-layout/style/index.scss' as proLayout;
 @use '../ele-pro-table/style/index.scss' as proTable;
 @use '../ele-segmented/style/index.scss' as segmented;
@@ -36,6 +38,7 @@
 @use '../ele-table/style/index.scss' as table;
 @use '../ele-table-select/style/index.scss' as tableSelect;
 @use '../ele-text/style/index.scss' as text;
+@use '../ele-timeline/style/index.scss' as timeline;
 @use '../ele-tool/style/index.scss' as tool;
 @use '../ele-toolbar/style/index.scss' as toolbar;
 @use '../ele-tooltip/style/index.scss' as tooltip;

package/lib/style/themes/default.scss

@@ -526,6 +526,33 @@ $ele: map.deep-merge(
       'lg-gap': 8px 12px,
       'lg-font-size': 14px
     ),
+    'pro-form': (
+      // 高级表单
+      'descriptions-label-wdith': 110px,
+      'handle-color': #fff,
+      'handle-font-size': 12px,
+      'handle-height': 18px,
+      'handle-bg': elVar('color-primary'),
+      'handle-shadow': 2px 2px 4px 0 rgba(255, 255, 255, 0.6),
+      'handle-padding': 0 4px,
+      'handle-space': 4px,
+      'handle-index': 9999,
+      'item-wrapper-padding': 4px,
+      'item-wrapper-border': 1px dashed elVar('border-color'),
+      'item-wrapper-hover-border': 1px dashed elVar('color-primary'),
+      'item-wrapper-active-border': 2px solid elVar('color-primary'),
+      'item-wrapper-active-border-offset': -1px,
+      'item-wrapper-active-index': 8,
+      'container-wrapper-border-offset': -1px,
+      'container-wrapper-active-border-offset': -2px,
+      'container-wrapper-min-height': 48px,
+      'container-div-min-height': 24px,
+      'container-description-min-height': 32px
+    ),
+    'pro-form-builder': (
+      // 表单构建器
+      'descriptions-label-wdith': 110px
+    ),
     'segmented': (
       // 分段器
       'padding': 3px,
@@ -669,6 +696,19 @@ $ele: map.deep-merge(
       'xxl': calc(#{elVar('font-size', 'extra-large')} + 6px),
       'xxxl': calc(#{elVar('font-size', 'extra-large')} + 34px)
     ),
+    'timeline': (
+      // 时间线
+      'body-padding': 8px 16px 48px 16px,
+      'title-font-size': 16px,
+      'title-margin': 0 0 4px 0,
+      'description-font-size': 13px,
+      'icon-margin': 0 8px,
+      'icon-font-size': 22px,
+      'icon-color': elVar('text-color', 'placeholder'),
+      'line-size': 2px,
+      'line-color': elVar('border-color'),
+      'turn-line-offset': 11px
+    ),
     'table': (
       // 表格
       'radius': 0,

package/lib/style/themes/theme-util.scss

@@ -19,6 +19,8 @@
 @use '../../ele-page/style/css-var.scss' as *;
 @use '../../ele-pagination/style/css-var.scss' as *;
 @use '../../ele-popconfirm/style/css-var.scss' as *;
+@use '../../ele-pro-form/style/css-var.scss' as *;
+@use '../../ele-pro-form-builder/style/css-var.scss' as *;
 @use '../../ele-pro-table/style/css-var.scss' as *;
 @use '../../ele-segmented/style/css-var.scss' as *;
 @use '../../ele-steps/style/css-var.scss' as *;
@@ -26,6 +28,7 @@
 @use '../../ele-table-select/style/css-var.scss' as *;
 @use '../../ele-tabs/style/css-var.scss' as *;
 @use '../../ele-text/style/css-var.scss' as *;
+@use '../../ele-timeline/style/css-var.scss' as *;
 @use '../../ele-tool/style/css-var.scss' as *;
 @use '../../ele-toolbar/style/css-var.scss' as *;
 @use '../../ele-tooltip/style/css-var.scss' as *;
@@ -57,6 +60,8 @@
     @include set-page-var($var);
     @include set-pagination-var($var);
     @include set-popconfirm-var($var);
+    @include set-pro-form-var($var);
+    @include set-pro-form-builder-var($var);
     @include set-pro-table-var($var);
     @include set-segmented-var($var);
     @include set-step-var($var);
@@ -64,6 +69,7 @@
     @include set-table-select-var($var);
     @include set-tab-var($var);
     @include set-text-var($var);
+    @include set-timeline-var($var);
     @include set-tool-var($var);
     @include set-toolbar-var($var);
     @include set-tooltip-var($var);

package/lib/style/util.scss

@@ -57,3 +57,14 @@
 @function elVarName($args...) {
   @return el.getCssVarName($args...);
 }
+
+/* 生成 not 选择器 */
+@function joinNotSelectors($list) {
+  $selector: '';
+  @each $item in $list {
+    @if $item != '' {
+      $selector: $selector + ':not(' + $item + ')';
+    }
+  }
+  @return $selector;
+}

package/lib/utils/hook.cjs

@@ -56,6 +56,34 @@ function useMediaQuery(query, onChange) {
   });
   return [mediaQuery, startWatch, stopWatch];
 }
+function useMobile(onChange) {
+  const mobile = vue.ref(false);
+  const [media, startMedia, stopMedia] = useMediaQuery(
+    "(max-width: 768px)",
+    () => {
+      const isMobile = media.matches;
+      if (mobile.value !== isMobile) {
+        mobile.value = isMobile;
+        onChange && onChange(isMobile);
+      }
+    }
+  );
+  return [mobile, startMedia, stopMedia];
+}
+function useMobileDevice(onChange) {
+  const mobileDevice = vue.ref(false);
+  const [media, startMedia, stopMedia] = useMediaQuery(
+    "(pointer: coarse)",
+    () => {
+      const isMobileDevice = media.matches;
+      if (mobileDevice.value !== isMobileDevice) {
+        mobileDevice.value = isMobileDevice;
+        onChange && onChange(isMobileDevice);
+      }
+    }
+  );
+  return [mobileDevice, startMedia, stopMedia];
+}
 function useWindowListener(event, listener) {
   const eventName = typeof event === "string" ? event : "resize";
   const callback = typeof event === "function" ? event : listener;
@@ -270,6 +298,8 @@ function useMoveEvent(option) {
 exports.useCollapseAnim = useCollapseAnim;
 exports.useFormItemRest = useFormItemRest;
 exports.useMediaQuery = useMediaQuery;
+exports.useMobile = useMobile;
+exports.useMobileDevice = useMobileDevice;
 exports.useMousewheel = useMousewheel;
 exports.useMoveEvent = useMoveEvent;
 exports.useTimer = useTimer;

package/lib/utils/hook.d.ts

@@ -28,6 +28,24 @@ export type UseMediaQueryResult = [MediaQueryList, () => void, () => void];
  * @param onChange 改变回调
  */
 export declare function useMediaQuery(query: string, onChange?: () => void): UseMediaQueryResult;
+/**
+ * useMobile 返回结果
+ */
+export type UseMobileResult = [Ref<boolean>, () => void, () => void];
+/**
+ * 获取是否是移动端小屏幕
+ * @param onChange 值改变回调
+ */
+export declare function useMobile(onChange?: (isMobile: boolean) => void): UseMobileResult;
+/**
+ * useMobileDevice 返回结果
+ */
+export type UseMobileDeviceResult = [Ref<boolean>, () => void, () => void];
+/**
+ * 获取是否是移动端触摸设备
+ * @param onChange 值改变回调
+ */
+export declare function useMobileDevice(onChange?: (isMobile: boolean) => void): UseMobileDeviceResult;
 /**
  * 窗口事件监听
  * @param event 事件

package/lib/utils/menu-util.cjs

@@ -12,7 +12,7 @@ function pathIsAdd(path, data) {
   return core.findTree(data, (d) => path === d.path) != null;
 }
 function getRoutePath(path) {
-  if (!path || !path.includes("?")) {
+  if (!path || !path.includes("?") || path.endsWith("?")) {
     return path;
   }
   return path.substring(0, path.indexOf("?"));
@@ -54,7 +54,7 @@ function menuToRoutes(menus, getComponent, added) {
   const addedRoutes = added ? [...added] : [];
   menus.forEach((item) => {
     const meta = { ...item.meta };
-    const path = getRoutePath(meta.routePath || item.path);
+    const path = meta.routePath || getRoutePath(item.path);
     if (path && !core.isExternalLink(path) && !pathIsAdd(path, addedRoutes)) {
       const name = item.name || camelCase(path);
       const { component, link } = getRouteComponent(item, name, getComponent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.2.2-beta.4",
+  "version": "1.3.1-beta.1",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",

package/typings/global.d.ts

@@ -26,6 +26,7 @@ declare module 'vue' {
     EleEllipsis: (typeof import('ele-admin-plus'))['EleEllipsis'];
     EleFileList: (typeof import('ele-admin-plus'))['EleFileList'];
     EleFileListTool: (typeof import('ele-admin-plus'))['EleFileListTool'];
+    EleIcon: (typeof import('ele-admin-plus'))['EleIcon'];
     EleIconSelect: (typeof import('ele-admin-plus'))['EleIconSelect'];
     EleImageViewer: (typeof import('ele-admin-plus'))['EleImageViewer'];
     EleLoading: (typeof import('ele-admin-plus'))['EleLoading'];
@@ -37,6 +38,8 @@ declare module 'vue' {
     ElePopconfirm: (typeof import('ele-admin-plus'))['ElePopconfirm'];
     ElePopover: (typeof import('ele-admin-plus'))['ElePopover'];
     ElePrinter: (typeof import('ele-admin-plus'))['ElePrinter'];
+    EleProForm: (typeof import('ele-admin-plus'))['EleProForm'];
+    EleProFormBuilder: (typeof import('ele-admin-plus'))['EleProFormBuilder'];
     EleProLayout: (typeof import('ele-admin-plus'))['EleProLayout'];
     EleProTable: (typeof import('ele-admin-plus'))['EleProTable'];
     EleQrCode: (typeof import('ele-admin-plus'))['EleQrCode'];
@@ -50,6 +53,7 @@ declare module 'vue' {
     EleTableSelect: (typeof import('ele-admin-plus'))['EleTableSelect'];
     EleTabs: (typeof import('ele-admin-plus'))['EleTabs'];
     EleText: (typeof import('ele-admin-plus'))['EleText'];
+    EleTimeline: (typeof import('ele-admin-plus'))['EleTimeline'];
     EleTool: (typeof import('ele-admin-plus'))['EleTool'];
     EleToolbar: (typeof import('ele-admin-plus'))['EleToolbar'];
     EleTooltip: (typeof import('ele-admin-plus'))['EleTooltip'];