@fe-free/core 5.0.0 → 6.0.2

package/CHANGELOG.md

@@ -1,15 +1,401 @@
 # @fe-free/core
 
-## 5.0.0
+## 6.0.2
 
-### Minor Changes
+### Patch Changes
 
-- feat: i18n
+- fix: crud ui
+  - @fe-free/icons@6.0.2
+  - @fe-free/tool@6.0.2
+
+## 6.0.1
+
+### Patch Changes
+
+- feat: tailwindcss4
+- Updated dependencies
+  - @fe-free/icons@6.0.1
+  - @fe-free/tool@6.0.1
+
+## 4.2.4
+
+### Patch Changes
+
+- @fe-free/icons@4.2.4
+- @fe-free/tool@4.2.4
+
+## 4.2.3
+
+### Patch Changes
+
+- feat: ui
+  - @fe-free/icons@4.2.3
+  - @fe-free/tool@4.2.3
+
+## 4.2.2
+
+### Patch Changes
+
+- @fe-free/icons@4.2.2
+- @fe-free/tool@4.2.2
+
+## 4.2.1
+
+### Patch Changes
+
+- @fe-free/icons@4.2.1
+- @fe-free/tool@4.2.1
+
+## 4.2.0
+
+### minor Changes
+
+- fix: crud bug
+  - @fe-free/icons@4.2.0
+  - @fe-free/tool@4.2.0
+
+## 4.1.47
+
+### Patch Changes
+
+- @fe-free/icons@4.1.47
+- @fe-free/tool@4.1.47
+
+## 4.1.46
+
+### Patch Changes
+
+- feat: crud ui
+  - @fe-free/icons@4.1.46
+  - @fe-free/tool@4.1.46
+
+## 4.1.45
+
+### Patch Changes
+
+- feat: curd table ui
+  - @fe-free/icons@4.1.45
+  - @fe-free/tool@4.1.45
+
+## 4.1.44
+
+### Patch Changes
+
+- feat: crud of list
+  - @fe-free/icons@4.1.44
+  - @fe-free/tool@4.1.44
+
+## 4.1.43
+
+### Patch Changes
+
+- fix: valueType
+  - @fe-free/icons@4.1.43
+  - @fe-free/tool@4.1.43
+
+## 4.1.42
+
+### Patch Changes
+
+- feat: add valueType CustomMarkdownModal
+  - @fe-free/icons@4.1.42
+  - @fe-free/tool@4.1.42
+
+## 4.1.41
+
+### Patch Changes
+
+- feat: some
+  - @fe-free/icons@4.1.41
+  - @fe-free/tool@4.1.41
+
+## 4.1.40
+
+### Patch Changes
+
+- fix: ScrollFixed
+  - @fe-free/icons@4.1.40
+  - @fe-free/tool@4.1.40
+
+## 4.1.39
+
+### Patch Changes
+
+- fix: ai
+  - @fe-free/icons@4.1.39
+  - @fe-free/tool@4.1.39
+
+## 4.1.38
+
+### Patch Changes
+
+- feat: ai
+  - @fe-free/icons@4.1.38
+  - @fe-free/tool@4.1.38
+
+## 4.1.37
+
+### Patch Changes
+
+- @fe-free/icons@4.1.37
+- @fe-free/tool@4.1.37
+
+## 4.1.36
+
+### Patch Changes
+
+- @fe-free/icons@4.1.36
+- @fe-free/tool@4.1.36
+
+## 4.1.35
+
+### Patch Changes
+
+- @fe-free/icons@4.1.35
+- @fe-free/tool@4.1.35
+
+## 4.1.34
+
+### Patch Changes
+
+- @fe-free/icons@4.1.34
+- @fe-free/tool@4.1.34
+
+## 4.1.33
+
+### Patch Changes
+
+- @fe-free/icons@4.1.33
+- @fe-free/tool@4.1.33
+
+## 4.1.32
+
+### Patch Changes
+
+- @fe-free/icons@4.1.32
+- @fe-free/tool@4.1.32
+
+## 4.1.31
+
+### Patch Changes
+
+- @fe-free/icons@4.1.31
+- @fe-free/tool@4.1.31
+
+## 4.1.30
+
+### Patch Changes
+
+- @fe-free/icons@4.1.30
+- @fe-free/tool@4.1.30
+
+## 4.1.29
+
+### Patch Changes
+
+- @fe-free/icons@4.1.29
+- @fe-free/tool@4.1.29
+
+## 4.1.28
+
+### Patch Changes
+
+- @fe-free/icons@4.1.28
+- @fe-free/tool@4.1.28
+
+## 4.1.27
+
+### Patch Changes
+
+- @fe-free/icons@4.1.27
+- @fe-free/tool@4.1.27
+
+## 4.1.26
+
+### Patch Changes
+
+- @fe-free/icons@4.1.26
+- @fe-free/tool@4.1.26
+
+## 4.1.25
+
+### Patch Changes
+
+- @fe-free/icons@4.1.25
+- @fe-free/tool@4.1.25
+
+## 4.1.24
+
+### Patch Changes
+
+- @fe-free/icons@4.1.24
+- @fe-free/tool@4.1.24
+
+## 4.1.23
+
+### Patch Changes
+
+- @fe-free/icons@4.1.23
+- @fe-free/tool@4.1.23
+
+## 4.1.22
+
+### Patch Changes
+
+- @fe-free/icons@4.1.22
+- @fe-free/tool@4.1.22
+
+## 4.1.21
+
+### Patch Changes
+
+- @fe-free/icons@4.1.21
+- @fe-free/tool@4.1.21
+
+## 4.1.20
+
+### Patch Changes
+
+- @fe-free/icons@4.1.20
+- @fe-free/tool@4.1.20
+
+## 4.1.19
+
+### Patch Changes
+
+- @fe-free/icons@4.1.19
+- @fe-free/tool@4.1.19
+
+## 4.1.18
+
+### Patch Changes
+
+- @fe-free/icons@4.1.18
+- @fe-free/tool@4.1.18
+
+## 4.1.17
+
+### Patch Changes
+
+- @fe-free/icons@4.1.17
+- @fe-free/tool@4.1.17
+
+## 4.1.16
+
+### Patch Changes
+
+- @fe-free/icons@4.1.16
+- @fe-free/tool@4.1.16
+
+## 4.1.15
+
+### Patch Changes
+
+- @fe-free/icons@4.1.15
+- @fe-free/tool@4.1.15
+
+## 4.1.14
 
 ### Patch Changes
 
-- @fe-free/icons@5.0.0
-- @fe-free/tool@5.0.0
+- @fe-free/icons@4.1.14
+- @fe-free/tool@4.1.14
+
+## 4.1.13
+
+### Patch Changes
+
+- @fe-free/icons@4.1.13
+- @fe-free/tool@4.1.13
+
+## 4.1.12
+
+### Patch Changes
+
+- @fe-free/icons@4.1.12
+- @fe-free/tool@4.1.12
+
+## 4.1.11
+
+### Patch Changes
+
+- @fe-free/icons@4.1.11
+- @fe-free/tool@4.1.11
+
+## 4.1.10
+
+### Patch Changes
+
+- feat: ai
+  - @fe-free/icons@4.1.10
+  - @fe-free/tool@4.1.10
+
+## 4.1.9
+
+### Patch Changes
+
+- @fe-free/icons@4.1.9
+- @fe-free/tool@4.1.9
+
+## 4.1.8
+
+### Patch Changes
+
+- @fe-free/icons@4.1.8
+- @fe-free/tool@4.1.8
+
+## 4.1.7
+
+### Patch Changes
+
+- @fe-free/icons@4.1.7
+- @fe-free/tool@4.1.7
+
+## 4.1.6
+
+### Patch Changes
+
+- @fe-free/icons@4.1.6
+- @fe-free/tool@4.1.6
+
+## 4.1.5
+
+### Patch Changes
+
+- @fe-free/icons@4.1.5
+- @fe-free/tool@4.1.5
+
+## 4.1.4
+
+### Patch Changes
+
+- feat: editor
+  - @fe-free/icons@4.1.4
+  - @fe-free/tool@4.1.4
+
+## 4.1.3
+
+### Patch Changes
+
+- fix some
+  - @fe-free/icons@4.1.3
+  - @fe-free/tool@4.1.3
+
+## 4.1.2
+
+### Patch Changes
+
+- fix some
+  - @fe-free/icons@4.1.2
+  - @fe-free/tool@4.1.2
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @fe-free/icons@4.1.1
+  - @fe-free/tool@4.1.1
 
 ## 4.0.5
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "5.0.0",
+  "version": "6.0.2",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -10,6 +10,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "@ant-design/x-markdown": "^2.1.3",
+    "@ant-design/x": "^2.1.3",
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/lang-json": "^6.0.1",
@@ -50,8 +52,8 @@
     "i18next-icu": "^2.4.1",
     "react": "^19.2.0",
     "react-i18next": "^16.4.0",
-    "@fe-free/icons": "5.0.0",
-    "@fe-free/tool": "5.0.0"
+    "@fe-free/icons": "6.0.2",
+    "@fe-free/tool": "6.0.2"
   },
   "scripts": {
     "i18n-extract": "rm -rf ./src/locales/zh-CN && npx i18next-cli extract"

package/src/copy/index.tsx

@@ -13,10 +13,11 @@ interface CopyProps {
   children?: React.ReactNode;
   /** 复制成功后的回调 */
   onCopied?: () => void;
+  className?: string;
 }
 
 function Copy(props: CopyProps) {
-  const { value, showIcon, hoverIcon, children, onCopied } = props;
+  const { value, showIcon, hoverIcon, children, onCopied, className } = props;
 
   const handleCopy = useCallback(async () => {
     await copyToClipboard(value);
@@ -26,13 +27,17 @@ function Copy(props: CopyProps) {
   if (showIcon || hoverIcon) {
     return (
       <div
-        className={classNames('flex gap-1', {
-          group: hoverIcon,
-        })}
+        className={classNames(
+          'flex gap-1',
+          {
+            group: hoverIcon,
+          },
+          className,
+        )}
       >
         {children}
         <div
-          className={classNames('cursor-pointer text-primary', {
+          className={classNames('cursor-pointer', {
             hidden: hoverIcon,
             'group-hover:block': hoverIcon,
           })}

package/src/crud/crud.stories.tsx

@@ -60,6 +60,7 @@ export const Normal: Story = {
       <CRUD
         actions={['create', 'read', 'delete', 'update']}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
         }}
@@ -105,6 +106,7 @@ export const ReadDetail: Story = {
       <CRUD
         actions={['read_detail']}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
         }}
@@ -119,6 +121,7 @@ export const BatchDelete: Story = {
       <CRUD
         actions={['batch_delete']}
         tableProps={{
+          rowKey: 'id',
           columns: [
             {
               title: 'id',
@@ -169,6 +172,7 @@ export const MoreCustom: Story = {
       <CRUD
         actions={['create', 'read', 'delete', 'update']}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
           toolBarRender: () => {
@@ -250,7 +254,7 @@ export const MoreCustom: Story = {
 
 // 表格表单和详情表单 ref
 const FormRefComponent = () => {
-  const formRef = useRef<any>();
+  const formRef = useRef<any>(null);
   const [detailFormInstance] = ProForm.useForm();
 
   const columns = [
@@ -270,6 +274,7 @@ const FormRefComponent = () => {
     <CRUD
       actions={['create', 'read', 'update']}
       tableProps={{
+        rowKey: 'id',
         formRef,
         columns,
         request: fakeRequest,
@@ -322,6 +327,7 @@ const ActionRefComponent = () => {
         ref={ref}
         actions={[]}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
         }}
@@ -396,6 +402,7 @@ export const RemoteData: Story = {
       <CRUD
         actions={[]}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
         }}
@@ -422,6 +429,7 @@ export const NoSearch: Story = {
       <CRUD
         actions={[]}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
           search: false,
@@ -451,6 +459,7 @@ export const CustomText: Story = {
       <CRUD
         actions={['create', 'read', 'delete', 'update']}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
         }}
@@ -495,6 +504,7 @@ export const RowSelection: Story = {
       <CRUD
         actions={[]}
         tableProps={{
+          rowKey: 'id',
           columns: [
             {
               title: 'id',
@@ -552,6 +562,7 @@ export const ExpandedRowRender: Story = {
       <CRUD
         actions={['create', 'read', 'delete', 'update']}
         tableProps={{
+          rowKey: 'id',
           columns,
           request: fakeRequest,
           defaultExpandAllRows: true,
@@ -614,6 +625,7 @@ export const FullPage: Story = {
           fullPage
           actions={['create', 'read', 'delete', 'update']}
           tableProps={{
+            rowKey: 'id',
             columns,
             request: fakeRequest,
           }}

package/src/crud/crud.tsx

@@ -129,6 +129,7 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
     if (fullPage) {
       return {
         ...tableProps,
+        rowKey: tableProps.rowKey || 'id',
         scroll: {
           ...getTableScroll(newColumns),
           y: '100%',
@@ -136,7 +137,10 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
       };
     }
 
-    return tableProps;
+    return {
+      ...tableProps,
+      rowKey: tableProps.rowKey || 'id',
+    };
   }, [fullPage, tableProps, newColumns]);
 
   return (
@@ -150,7 +154,6 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
       )}
     >
       <Table<DataSource>
-        rowKey="id"
         {...newTableProps}
         actionRef={actionRef}
         toolBarRender={toolBarRender}

package/src/crud/helper.tsx

@@ -15,11 +15,13 @@ function OperateBtn({
 }) {
   if (disabled) {
     if (operateText) {
-      return <span className="cursor-not-allowed text-lg text-03">{operateText || icon}</span>;
+      return <span className="fec-crud-operate-btn cursor-not-allowed text-03">{operateText}</span>;
     } else {
       return (
         <Tooltip title={title}>
-          <span className="cursor-not-allowed text-lg text-03">{icon}</span>
+          <span className="fec-crud-operate-btn fec-crud-operate-btn-icon cursor-not-allowed text-lg text-03">
+            {icon}
+          </span>
         </Tooltip>
       );
     }
@@ -27,7 +29,7 @@ function OperateBtn({
 
   if (operateText) {
     return (
-      <span className="cursor-pointer text-lg text-primary" onClick={onClick}>
+      <span className="fec-crud-operate-btn cursor-pointer text-primary" onClick={onClick}>
         {operateText}
       </span>
     );
@@ -35,8 +37,11 @@ function OperateBtn({
 
   return (
     <Tooltip title={title}>
-      <span className="cursor-pointer text-lg text-primary" onClick={onClick}>
-        {operateText || icon}
+      <span
+        className="fec-crud-operate-btn fec-crud-operate-btn-icon cursor-pointer text-lg text-primary"
+        onClick={onClick}
+      >
+        {icon}
       </span>
     </Tooltip>
   );

package/src/crud/style.scss

@@ -9,6 +9,14 @@
   }
 }
 
+.fec-crud {
+  // 只有 icon 才设置大小
+  .fec-crud-operate-btn.fec-crud-operate-btn-icon {
+    font-size: 20px;
+    line-height: 22px;
+  }
+}
+
 .fec-crud.fec-crud-full-page {
   height: 100%;
   display: flex;
@@ -67,6 +75,25 @@
           scrollbar-width: thin;
         }
       }
+
+      &.ant-table-bordered {
+        .ant-table-container {
+          border-inline-start: none !important;
+          border-bottom: 1px solid var(--ant-table-border-color) !important;
+
+          .ant-table-thead {
+            & > tr > th:first-child {
+              border-inline-start: 1px solid var(--ant-table-border-color) !important;
+            }
+          }
+
+          .ant-table-row {
+            & > td:first-child {
+              border-inline-start: 1px solid var(--ant-table-border-color) !important;
+            }
+          }
+        }
+      }
     }
   }
 }

package/src/crud/table/index.tsx

@@ -4,8 +4,13 @@ import classNames from 'classnames';
 import { useMemo } from 'react';
 import './style.scss';
 
-interface TableProps<DataSource = any, Params = any, ValueType = 'text'>
-  extends ProTableProps<DataSource, Params, ValueType> {
+interface TableProps<DataSource = any, Params = any, ValueType = 'text'> extends ProTableProps<
+  DataSource,
+  Params,
+  ValueType
+> {
+  // 要求 rowKey 必须存在
+  rowKey: string;
   /** 区别 ProTable columns，默认 search: false */
   columns?: ProTableProps<DataSource, Params, ValueType>['columns'];
 }