@fe-free/core 3.0.16 → 3.0.18

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 3.0.18
+
+### Patch Changes
+
+- feat: rules
+  - @fe-free/tool@3.0.18
+
+## 3.0.17
+
+### Patch Changes
+
+- feat: upload
+  - @fe-free/tool@3.0.17
+
 ## 3.0.16
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.16",
+  "version": "3.0.18",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "safe-stable-stringify": "^2.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "3.0.16"
+    "@fe-free/tool": "3.0.18"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/crud/crud.tsx

@@ -5,11 +5,11 @@ import classNames from 'classnames';
 import { isString } from 'lodash-es';
 import { useCallback, useImperativeHandle, useMemo, useRef } from 'react';
 import { Link } from 'react-router-dom';
-import type { TableProps } from '../table';
-import { getTableScroll, Table } from '../table';
 import { OperateDelete } from './crud_delete';
 import { CRUDDetail } from './crud_detail';
 import './style.scss';
+import type { TableProps } from './table';
+import { getTableScroll, Table } from './table';
 import type { CRUDProps } from './types';
 import { useRowSelection } from './use_row_selection';
 import { useTips } from './use_tips';

package/src/crud/types.tsx

@@ -1,6 +1,6 @@
 import type { ActionType, ProFormInstance } from '@ant-design/pro-components';
 import type { MouseEvent, ReactNode, Ref, RefObject } from 'react';
-import type { TableProps } from '../table';
+import type { TableProps } from './table';
 
 /**
  * create 创建

package/src/form/form.stories.tsx

@@ -16,6 +16,7 @@ import {
   ProFormUpload,
   ProFormUploadDragger,
 } from '@fe-free/core';
+import { sleep } from '@fe-free/tool';
 import type { Meta, StoryObj } from '@storybook/react-vite';
 import { useState } from 'react';
 
@@ -191,31 +192,19 @@ export const ProFormListBooleanComponent: Story = {
 };
 
 function customRequest(option: any) {
-  const { file, onProgress, onSuccess } = option;
-
-  // 模拟上传进度
-  let percent = 0;
-  const interval = setInterval(() => {
-    percent += 10;
-    onProgress({ percent });
-
-    if (percent >= 100) {
-      clearInterval(interval);
-      // 模拟上传成功
-      onSuccess({
-        data: {
-          url: `https://picsum.photos/200/300?random=${Date.now()}`,
-          name: file.name,
-          uid: file.uid,
-        },
-      });
-    }
-  }, 1000);
+  const { onSuccess } = option;
+  // fake request
+  sleep(1000).then(() => {
+    onSuccess({
+      data: {
+        url: `https://picsum.photos/200/300?random=${Date.now()}`,
+      },
+    });
+  });
 
   // 返回 abort 方法，用于取消上传
   return {
     abort: () => {
-      clearInterval(interval);
       console.log('上传已取消');
     },
   };
@@ -243,7 +232,8 @@ export const ProFormUploadComponent: Story = {
         label="knowledge_files_dragger"
         name="knowledge_files_dragger"
         fieldProps={{
-          accept: '.doc,.docx,.pdf,.ppt,.jpg, jpeg,.png,.mp3,.mp4,.txt,.markdown,.excel',
+          directory: true,
+          accept: '.doc,.docx,.pdf,.ppt,.jpg,.jpeg,.png,.mp3,.mp4,.txt,.markdown,.excel',
           multiple: true,
           maxCount: 100,
           customRequest,

package/src/form/form_list/form_list.tsx

@@ -2,6 +2,7 @@ import type { ProFormItemProps } from '@ant-design/pro-components';
 import { ProForm } from '@ant-design/pro-components';
 import { Input, InputNumber, Switch } from 'antd';
 
+import { uniq, uniqBy } from 'lodash-es';
 import { ProFormListHelper } from './form_list_helper';
 
 interface ListTextProps {
@@ -104,10 +105,18 @@ function ProFormListBase(props) {
               if (value?.some((item) => item.value === undefined)) {
                 return Promise.reject('每个选项都不能为空');
               }
+              // 不能有重复的 value
+              if (uniqBy(value, 'value').length !== value.length) {
+                return Promise.reject('不能有重复');
+              }
             } else {
               if (value?.some((item) => item === undefined)) {
                 return Promise.reject('每个选项都不能为空');
               }
+              // 不能有重复的 value
+              if (uniq(value).length !== value.length) {
+                return Promise.reject('不能有重复');
+              }
             }
             return Promise.resolve();
           },

package/src/index.ts

@@ -57,8 +57,6 @@ export type { RecordArrayProps, RecordProps } from './record';
 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';
 export type { TabsProps } from './tabs';
 export { themeVariables } from './theme';

package/src/upload/index.tsx

@@ -16,6 +16,7 @@ interface UploadBaseProps {
   customRequest?: AntdUploadProps['customRequest'];
   listType?: AntdUploadProps['listType'];
   accept?: string;
+  directory?: AntdUploadProps['directory'];
 }
 
 interface UploadProps extends UploadBaseProps {
@@ -40,7 +41,7 @@ function useUpload(
   const [fileList, setFileList] = useState<UploadFile[]>(defaultFileList);
 
   // 找到真正上传成功的。
-  const successList = fileList.map((item) => item.url || item.response?.data.url).filter(Boolean);
+  const successList = fileList.map((item) => item.url || item.response?.data?.url).filter(Boolean);
 
   const handleChange = useCallback(
     (info) => {
@@ -48,7 +49,7 @@ function useUpload(
 
       // 找到真正上传成功的。
       const newValue = info.fileList
-        .map((item) => item.url || item.response?.data.url)
+        .map((item) => item.url || item.response?.data?.url)
         .filter(Boolean);
 
       onChange?.(multiple ? newValue : newValue[0]);
@@ -92,7 +93,8 @@ function useUpload(
 }
 
 function Upload(props: ImageUploadProps) {
-  const { multiple, maxCount, showCount, action, customRequest, listType, accept } = props;
+  const { multiple, maxCount, showCount, action, customRequest, listType, accept, directory } =
+    props;
   const { onChange, beforeUpload, isDisabled, fileList } = useUpload(props);
 
   return (
@@ -106,6 +108,7 @@ function Upload(props: ImageUploadProps) {
       maxCount={multiple ? maxCount : 1}
       multiple={multiple}
       beforeUpload={beforeUpload}
+      directory={directory}
       // 不可，否则会没法删除
       // disabled={isDisabled}
     >
@@ -140,6 +143,7 @@ function UploadDragger(props: UploadDraggerProps) {
     title,
     description,
     showStatus,
+    directory,
   } = props;
   const { onChange, beforeUpload, isDisabled, fileList, successList } = useUpload(props);
 
@@ -174,6 +178,7 @@ function UploadDragger(props: UploadDraggerProps) {
       maxCount={multiple ? maxCount : 1}
       multiple={multiple}
       beforeUpload={beforeUpload}
+      directory={directory}
       // 不可，否则会没法删除
       // disabled={isDisabled}
       className={classNames('fec-upload-dragger', {
@@ -240,7 +245,7 @@ function AvatarImageUpload(props: AvatarImageUploadProps) {
             action={action}
             customRequest={customRequest}
             onChange={(info) => {
-              const url = info.file.response?.data.url;
+              const url = info.file.response?.data?.url;
               if (url) {
                 onChange?.(url);
               }

package/src/table/table.stories.tsx

@@ -1,95 +0,0 @@
-import type { ProColumns } from '@ant-design/pro-components';
-import { Table } from '@fe-free/core';
-import type { Meta, StoryObj } from '@storybook/react-vite';
-import { fakeData } from '../crud/demo/data';
-
-const meta: Meta<typeof Table> = {
-  title: '@fe-free/core/Table',
-  component: Table,
-  tags: ['autodocs'],
-  parameters: {
-    docs: {
-      description: {
-        component: `Table 基于 ProTable 做了一些封装：<br>
-- props column 需要显示的提供 search: true;
-- 列宽默认 120，和滚动条
-- 搜索样式做了默认设置，具体见代码
-- 页码做了默认设置，具体见代码
-`,
-      },
-    },
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof Table>;
-
-// 定义列配置
-const columns: ProColumns[] = [
-  {
-    title: 'id',
-    dataIndex: 'id',
-    search: true,
-  },
-  {
-    title: '名字(省略)',
-    dataIndex: 'name',
-    search: true,
-    ellipsis: true,
-  },
-  {
-    title: 'city',
-    dataIndex: 'city',
-  },
-  {
-    title: 'area',
-    dataIndex: 'area',
-  },
-];
-
-export const Basic: Story = {
-  render: () => (
-    <Table
-      rowKey="id"
-      columns={columns}
-      request={async (params) => {
-        console.log(params);
-        return {
-          data: fakeData,
-          success: true,
-          total: fakeData.length,
-        };
-      }}
-    />
-  ),
-};
-
-export const ScrollX: Story = {
-  render: () => (
-    <div className="w-[400px]">
-      <Table
-        rowKey="id"
-        columns={[
-          {
-            title: 'id',
-            dataIndex: 'id',
-          },
-          {
-            title: '名字(省略)',
-            dataIndex: 'name',
-
-            ellipsis: true,
-          },
-          {
-            title: 'city',
-            dataIndex: 'city',
-          },
-          {
-            title: 'area',
-            dataIndex: 'area',
-          },
-        ]}
-      />
-    </div>
-  ),
-};