@fe-free/core 2.5.7 → 2.6.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @fe-free/core
 
+## 2.6.1
+
+### Patch Changes
+
+- feat: page layout tabs
+  - @fe-free/tool@2.6.1
+
+## 2.6.0
+
+### Minor Changes
+
+- feat: slider
+
+### Patch Changes
+
+- @fe-free/tool@2.6.0
+
 ## 2.5.7
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.5.7",
+  "version": "2.6.1",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.5.7"
+    "@fe-free/tool": "2.6.1"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/index.ts

@@ -41,8 +41,11 @@ export { downloadInterceptor } from './global/interceptors';
 export { InfiniteList } from './infinite_list';
 export type { InfiniteListProps } from './infinite_list';
 export { Markdown } from './markdown';
-export { PageLayout } from './page_layout';
+export { PageLayout, PageLayoutTabs } from './page_layout';
+export type { PageLayoutProps, PageLayoutTabsProps } from './page_layout';
 export { routeTool } from './route';
+export { NumberSlider, PercentageSlider } from './slider';
+export type { NumberSliderProps, PercentageSliderProps } from './slider';
 export { Table } from './table';
 export type { TableProps } from './table';
 export { Tabs } from './tabs';

package/src/page_layout/index.tsx

@@ -1,4 +1,8 @@
 import cn from 'classnames';
+import { Fragment, useMemo } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import type { TabsProps } from '../tabs';
+import { Tabs } from '../tabs';
 
 interface PageLayoutProps {
   direction?: 'horizontal' | 'vertical';
@@ -24,7 +28,7 @@ function PageLayout({
   return (
     <div
       className={cn(
-        'flex w-full h-full',
+        'flex h-full w-full',
         {
           'flex-row': direction === 'horizontal',
           'flex-col': direction === 'vertical',
@@ -39,4 +43,56 @@ function PageLayout({
   );
 }
 
-export { PageLayout };
+interface PageLayoutTabsProps extends PageLayoutProps {
+  tabsProps: Omit<TabsProps, 'items' | 'withSearchParams'> & {
+    items: {
+      key: string;
+      label: React.ReactNode;
+      children: React.ReactNode;
+    }[];
+  };
+}
+
+function PageLayoutTabs(props: PageLayoutTabsProps) {
+  const { tabsProps, ...rest } = props;
+
+  const [searchParams] = useSearchParams();
+  const tab = searchParams.get(tabsProps.tabKey || 'tab') || undefined;
+
+  const { children, newItems } = useMemo(() => {
+    const items = props.tabsProps.items;
+
+    const item = items.find((item) => item.key === tab);
+    const children = item?.children || items[0]?.children;
+
+    const newItems = items.map((item) => ({
+      ...item,
+      children: undefined,
+    }));
+
+    return { children, newItems };
+  }, [props.tabsProps.items, tab]);
+
+  return (
+    <PageLayout
+      direction="vertical"
+      start={
+        <Tabs
+          tabBarExtraContent={{
+            left: <div className="w-4" />,
+            right: <div className="w-4" />,
+          }}
+          {...tabsProps}
+          items={newItems}
+          withSearchParams
+        />
+      }
+      {...rest}
+    >
+      <Fragment key={tab}>{children}</Fragment>
+    </PageLayout>
+  );
+}
+
+export { PageLayout, PageLayoutTabs };
+export type { PageLayoutProps, PageLayoutTabsProps };

package/src/slider/index.tsx

@@ -0,0 +1,124 @@
+import { InputNumber, Slider } from 'antd';
+import classNames from 'classnames';
+import { useCallback, useMemo } from 'react';
+import './style.scss';
+
+interface NumberSliderProps {
+  /** 默认 0 */
+  value?: number;
+  onChange: (value: number) => void;
+  /** 默认 0 */
+  min?: number;
+  /** 默认 100 */
+  max?: number;
+  /** 默认 1 */
+  step?: number;
+  /** 输入框的数值精度，默认 0 */
+  precision?: number;
+}
+
+function NumberSlider(props: NumberSliderProps) {
+  const { value = 0, onChange, min = 0, max = 100, step = 1, precision = 0 } = props;
+  return (
+    <div className="flex gap-2">
+      <div className="flex-1">
+        <Slider
+          value={value}
+          onChange={onChange}
+          min={min}
+          max={max}
+          step={step}
+          marks={{
+            [min]: min,
+            [value]: value,
+            [max]: max,
+          }}
+        />
+      </div>
+      <div>
+        <InputNumber
+          value={value}
+          onChange={(v) => onChange(v ?? 0)}
+          min={min}
+          max={max}
+          step={step}
+          precision={precision}
+        />
+      </div>
+    </div>
+  );
+}
+
+interface PercentageSliderProps {
+  /** 百分占比数组 */
+  value: number[];
+  onChange: (value: number[]) => void;
+  /** 默认 0 */
+  min?: number;
+  /** 默认 100 */
+  max?: number;
+  /** 默认 1 */
+  step?: number;
+  className?: string;
+}
+
+function PercentageSlider(props: PercentageSliderProps) {
+  const { value, onChange, min = 0, max = 100, step = 1, className } = props;
+
+  const sliderValue = useMemo(() => {
+    let sum = min;
+    return value
+      .map((v) => {
+        sum += v;
+        return sum;
+      })
+      .slice(0, -1);
+  }, [value, min]);
+
+  const handleChange = useCallback(
+    (newValue: number[]) => {
+      const result = [...newValue, max].map((v, i) => v - (newValue[i - 1] || min));
+      onChange(result);
+    },
+    [max, min, onChange],
+  );
+
+  const marks = useMemo(() => {
+    const result = {
+      [min]: min,
+      [max]: max,
+    };
+
+    [...sliderValue, max].forEach((v, i) => {
+      const m = value[i] / 2 + (sliderValue[i - 1] || min);
+      result[m] = value[i];
+      // result[v] = value[i];
+    });
+
+    return result;
+  }, [min, max, sliderValue, value]);
+
+  return (
+    <Slider
+      value={sliderValue}
+      onChange={handleChange}
+      min={min}
+      max={max}
+      step={step}
+      range
+      marks={marks}
+      styles={{
+        rail: {
+          backgroundColor: '#91caff',
+        },
+        track: {
+          backgroundColor: 'transparent',
+        },
+      }}
+      className={classNames('fec-slider', className)}
+    />
+  );
+}
+
+export { NumberSlider, PercentageSlider };
+export type { NumberSliderProps, PercentageSliderProps };

package/src/slider/number_slider.stories.tsx

@@ -0,0 +1,32 @@
+import { NumberSlider } from '@fe-free/core';
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+
+const meta: Meta<typeof NumberSlider> = {
+  title: '@fe-free/core/NumberSlider',
+  component: NumberSlider,
+  tags: ['autodocs'],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof NumberSlider>;
+
+function Render(args: Story['args']) {
+  const [value, setValue] = useState(0);
+  return <NumberSlider value={value} onChange={setValue} {...args} />;
+}
+
+export const Basic: Story = {
+  args: {},
+  render: Render,
+};
+
+export const One: Story = {
+  args: {
+    max: 1,
+    step: 0.1,
+    precision: 1,
+  },
+  render: Render,
+};

package/src/slider/percentage_slider.stories.tsx

@@ -0,0 +1,23 @@
+import { PercentageSlider } from '@fe-free/core';
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+
+const meta: Meta<typeof PercentageSlider> = {
+  title: '@fe-free/core/PercentageSlider',
+  component: PercentageSlider,
+  tags: ['autodocs'],
+};
+
+export default meta;
+
+type Story = StoryObj<typeof PercentageSlider>;
+
+function Render(args: Story['args']) {
+  const [value, setValue] = useState([10, 30, 60]);
+  return <PercentageSlider value={value} onChange={setValue} {...args} />;
+}
+
+export const Basic: Story = {
+  args: {},
+  render: Render,
+};

package/src/slider/style.scss

@@ -0,0 +1,16 @@
+.fec-slider {
+  .ant-slider-step {
+    .ant-slider-dot {
+      visibility: hidden;
+
+      &:first-child,
+      &:last-child {
+        visibility: visible;
+      }
+    }
+  }
+
+  .ant-slider-mark-text {
+    color: inherit !important;
+  }
+}

package/src/tabs/index.tsx

@@ -1,37 +1,46 @@
 import type { TabsProps as AntdTabsProps } from 'antd';
 import { Tabs as AntdTabs } from 'antd';
-import { useEffect } from 'react';
+import classNames from 'classnames';
 import { useSearchParams } from 'react-router-dom';
+import { routeTool } from '../route';
+import './style.scss';
 
 interface TabsProps extends AntdTabsProps {
   /** 自动时设置和同步 searchParams tab */
   withSearchParams?: boolean;
+  /** 设置 searchParams 的类型，默认 set */
+  searchParamsType?: 'set' | 'change';
+  /** 默认 tab */
+  tabKey?: string;
 }
 
 function Tabs(props: TabsProps) {
-  const { withSearchParams, activeKey, onChange, ...rest } = props;
-  const [searchParams, setSearchParams] = useSearchParams();
-  const tab = searchParams.get('tab') || undefined;
-
-  useEffect(() => {
-    if (withSearchParams) {
-      if (!tab && props.items?.[0]?.key) {
-        setSearchParams({ tab: props.items?.[0]?.key });
-      }
-    }
-    // tab 清空的时候要重新设置第一个
-  }, [tab]);
+  const {
+    withSearchParams,
+    searchParamsType = 'set',
+    tabKey = 'tab',
+    activeKey,
+    onChange,
+    className,
+    ...rest
+  } = props;
+  const [searchParams] = useSearchParams();
+  const tab = searchParams.get(tabKey) || undefined;
 
   return (
     <AntdTabs
       {...rest}
+      className={classNames('fec-tabs', className)}
       activeKey={withSearchParams ? tab : activeKey}
       onChange={(key) => {
         onChange?.(key);
-        if (props.withSearchParams) {
-          searchParams.set('tab', key);
 
-          setSearchParams({ tab: key });
+        if (props.withSearchParams) {
+          if (searchParamsType === 'set') {
+            routeTool.setSearchParams({ [tabKey]: key });
+          } else {
+            routeTool.changeSearchParams({ [tabKey]: key });
+          }
         }
       }}
     />

package/src/tabs/style.scss

@@ -0,0 +1,5 @@
+.fec-tabs {
+  .ant-tabs-nav {
+    margin: 0;
+  }
+}