@fe-free/core 6.0.2 → 6.0.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @fe-free/core
 
+## 6.0.4
+
+### Patch Changes
+
+- feat: some
+  - @fe-free/icons@6.0.4
+  - @fe-free/tool@6.0.4
+
+## 6.0.3
+
+### Patch Changes
+
+- feat: antd6
+  - @fe-free/icons@6.0.3
+  - @fe-free/tool@6.0.3
+
 ## 6.0.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -44,16 +44,16 @@
   },
   "peerDependencies": {
     "@ant-design/plots": "^2.5.0",
-    "@ant-design/pro-components": "2.8.9",
-    "antd": "^5.27.1",
+    "@ant-design/pro-components": "3.1.6-0",
+    "antd": "^6.2.1",
     "dayjs": "~1.11.10",
     "i18next": "^25.7.2",
     "i18next-browser-languagedetector": "^8.2.0",
     "i18next-icu": "^2.4.1",
     "react": "^19.2.0",
     "react-i18next": "^16.4.0",
-    "@fe-free/icons": "6.0.2",
-    "@fe-free/tool": "6.0.2"
+    "@fe-free/tool": "6.0.4",
+    "@fe-free/icons": "6.0.4"
   },
   "scripts": {
     "i18n-extract": "rm -rf ./src/locales/zh-CN && npx i18next-cli extract"

package/src/button/{button.stories.ts → button.stories.tsx}

@@ -1,5 +1,6 @@
 import { LoadingButton } from '@fe-free/core';
 import type { Meta, StoryObj } from '@storybook/react-vite';
+import { Tag } from 'antd';
 
 const meta: Meta<typeof LoadingButton> = {
   title: '@fe-free/core/LoadingButton',
@@ -39,3 +40,14 @@ export const Reject = {
     },
   },
 };
+
+export const Debug = {
+  render: () => {
+    return (
+      <div>
+        <Tag>xxx</Tag>
+        <Tag>xxx</Tag>
+      </div>
+    );
+  },
+};

package/src/crud/style.scss

@@ -47,7 +47,7 @@
       flex: 1;
       overflow: auto;
 
-      .ant-spin-nested-loading {
+      & > div {
         height: 100%;
 
         .ant-spin-container {

package/src/crud_of_list/style.scss

@@ -3,14 +3,14 @@
     border-bottom: 1px solid #f0f0f0;
   }
 
-  .ant-table-cell-fix-right {
+  .ant-table-cell-fix-end {
     position: absolute !important;
     display: none;
   }
 
   .ant-table-row {
     &:hover {
-      .ant-table-cell-fix-right {
+      .ant-table-cell-fix-end {
         display: block;
 
         // 如果操作列没有内容，则隐藏操作列

package/src/upload/index.tsx

@@ -18,7 +18,12 @@ interface UploadBaseProps {
   listType?: AntdUploadProps['listType'];
   accept?: string;
   directory?: AntdUploadProps['directory'];
-  children?: ReactNode | ((props: { isDisabled: boolean }) => ReactNode);
+  children?:
+    | ReactNode
+    | ((
+        props: ImageUploadProps,
+        other: { fileList: UploadFile[]; isDisabled: boolean },
+      ) => ReactNode);
 }
 
 interface UploadProps extends UploadBaseProps {
@@ -292,7 +297,7 @@ function AvatarImageUpload(props: AvatarImageUploadProps) {
           <div className="group relative h-20 w-20 cursor-pointer">
             <Avatar size={80} src={value} shape="square" className="bg-01 shadow" />
             <CloseOutlined
-              className="absolute right-1 top-1 cursor-pointer rounded-full bg-black/50 p-1 text-[10px] text-white opacity-0 transition-opacity group-hover:opacity-100"
+              className="absolute top-1 right-1 cursor-pointer rounded-full bg-black/50 p-1 text-[10px] text-white opacity-0 transition-opacity group-hover:opacity-100"
               onClick={(e) => {
                 e.stopPropagation();
                 onChange?.();
@@ -300,8 +305,8 @@ function AvatarImageUpload(props: AvatarImageUploadProps) {
             />
           </div>
         ) : (
-          <div className="flex h-20 w-20 cursor-pointer items-center justify-center rounded bg-01 shadow transition-colors hover:bg-02">
-            <PlusOutlined className="text-xl text-02" />
+          <div className="bg-01 hover:bg-02 flex h-20 w-20 cursor-pointer items-center justify-center rounded shadow transition-colors">
+            <PlusOutlined className="text-02 text-xl" />
           </div>
         )}
       </AntdUpload>

package/src/value_type_map/date.tsx

@@ -15,9 +15,10 @@ const renderMap = {
   },
 };
 
-const renderFormItemMap = {
+const formItemRenderMap = {
   dateRange: (_, props) => {
     // @ts-ignore onBlur 类型错误
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { onBlur, fieldProps, ...rest } = props;
 
     return (
@@ -38,6 +39,6 @@ const renderFormItemMap = {
   },
 };
 
-const dateRender = { renderMap, renderFormItemMap };
+const dateRender = { renderMap, formItemRenderMap };
 
 export { dateRender };

package/src/value_type_map/index.tsx

@@ -26,35 +26,35 @@ enum CustomValueTypeEnum {
 const customValueTypeMap: Record<string, ProRenderFieldPropsType> = {
   [CustomValueTypeEnum.CustomDateTimeAndDateRange]: {
     render: dateRender.renderMap.dateTime,
-    renderFormItem: dateRender.renderFormItemMap.dateRange,
+    formItemRender: dateRender.formItemRenderMap.dateRange,
   },
   [CustomValueTypeEnum.CustomDateAndDateRange]: {
     render: dateRender.renderMap.date,
-    renderFormItem: dateRender.renderFormItemMap.dateRange,
+    formItemRender: dateRender.formItemRenderMap.dateRange,
   },
   [CustomValueTypeEnum.CustomJSON]: {
     render: jsonRender.render,
-    renderFormItem: jsonRender.renderFormItem,
+    formItemRender: jsonRender.formItemRender,
   },
   [CustomValueTypeEnum.CustomJSONModal]: {
     render: jsonModalRender.render,
-    renderFormItem: jsonModalRender.renderFormItem,
+    formItemRender: jsonModalRender.formItemRender,
   },
   [CustomValueTypeEnum.CustomMarkdownModal]: {
     render: markdownModalRender.render,
-    renderFormItem: markdownModalRender.renderFormItem,
+    formItemRender: markdownModalRender.formItemRender,
   },
   [CustomValueTypeEnum.CustomSwitchNumber]: {
     render: switchNumberRender.render,
-    renderFormItem: switchNumberRender.renderFormItem,
+    formItemRender: switchNumberRender.formItemRender,
   },
   [CustomValueTypeEnum.CustomSwitchOptions]: {
     render: switchOptionsRender.render,
-    renderFormItem: switchOptionsRender.renderFormItem,
+    formItemRender: switchOptionsRender.formItemRender,
   },
   [CustomValueTypeEnum.CustomSerialNumber]: {
     render: () => <></>,
-    renderFormItem: () => <></>,
+    formItemRender: () => <></>,
   },
 };
 

package/src/value_type_map/json.tsx

@@ -38,7 +38,7 @@ function render(text) {
 
 const jsonRender = {
   render,
-  renderFormItem: () => <></>,
+  formItemRender: () => <></>,
 };
 
 export { jsonRender };

package/src/value_type_map/json_modal.tsx

@@ -54,7 +54,7 @@ function Render(text, props: ProFormItemProps<JSONModalProps>) {
 
 const jsonModalRender = {
   render: Render,
-  renderFormItem: () => <></>,
+  formItemRender: () => <></>,
 };
 
 export { jsonModalRender };

package/src/value_type_map/markdown_modal.tsx

@@ -13,7 +13,7 @@ function Render(text) {
     <>
       <div onClick={() => setShow(true)} className="flex cursor-pointer items-center">
         <div className="flex-1 truncate">{text}</div>
-        <span className="min-w-0 text-primary">查看</span>
+        <span className="text-primary min-w-0">查看</span>
       </div>
       {show && (
         <Modal
@@ -39,7 +39,7 @@ function Render(text) {
 
 const markdownModalRender = {
   render: Render,
-  renderFormItem: () => <></>,
+  formItemRender: () => <></>,
 };
 
 export { markdownModalRender };

package/src/value_type_map/switch.tsx

@@ -11,7 +11,7 @@ const switchNumberRender = {
 
     return <SwitchNumber value={text} />;
   },
-  renderFormItem: (_, props) => {
+  formItemRender: (_, props) => {
     return <ProFormSwitchNumber {...props} />;
   },
 };
@@ -23,7 +23,7 @@ const switchOptionsRender = {
 
     return <SwitchOptions value={text} {...props.fieldProps} />;
   },
-  renderFormItem: (_, props) => {
+  formItemRender: (_, props) => {
     return <ProFormSwitchOptions {...props} />;
   },
 };