@fe-free/core 3.0.24 → 3.0.26

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @fe-free/core
 
+## 3.0.26
+
+### Patch Changes
+
+- @fe-free/tool@3.0.26
+
+## 3.0.25
+
+### Patch Changes
+
+- feat: ui
+  - @fe-free/tool@3.0.25
+
 ## 3.0.24
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.24",
+  "version": "3.0.26",
   "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.24"
+    "@fe-free/tool": "3.0.26"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/crud/crud.tsx

@@ -1,6 +1,6 @@
 import { EditOutlined, EyeOutlined } from '@ant-design/icons';
 import type { ActionType } from '@ant-design/pro-components';
-import { Button, message } from 'antd';
+import { Button, message, Tooltip } from 'antd';
 import classNames from 'classnames';
 import { isString } from 'lodash-es';
 import { useCallback, useImperativeHandle, useMemo, useRef } from 'react';
@@ -112,7 +112,7 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
       title: '操作',
       fixed: 'right',
       align: 'center',
-      width: operateColumnProps?.width || 80,
+      width: operateColumnProps?.width || 120,
       render: function (_, record) {
         const btns: React.ReactNode[] = [];
 
@@ -122,9 +122,11 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
             const disabled = readProps?.operateIsDisabled?.(record) || false;
             if (disabled) {
               btns.push(
-                <span key="read" className="cursor-not-allowed text-03">
-                  {readProps?.operateText || <EyeOutlined />}
-                </span>,
+                <Tooltip title={readProps?.operateText || '查看'}>
+                  <span key="read" className="cursor-not-allowed text-lg text-03">
+                    {readProps?.operateText || <EyeOutlined />}
+                  </span>
+                </Tooltip>,
               );
             } else {
               btns.push(
@@ -133,7 +135,11 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
                   id={record[idField]}
                   record={record}
                   onSuccess={handleReload}
-                  trigger={<a>{readProps?.operateText || <EyeOutlined />}</a>}
+                  trigger={
+                    <Tooltip title={readProps?.operateText || '查看'}>
+                      <a className="text-lg">{readProps?.operateText || <EyeOutlined />}</a>
+                    </Tooltip>
+                  }
                   action="read"
                   {...detailProps}
                 />,
@@ -148,19 +154,24 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
             const disabled = readProps?.operateIsDisabled?.(record) || false;
             if (disabled) {
               btns.push(
-                <span key="read" className="cursor-not-allowed text-03">
-                  {readProps?.operateText || <EyeOutlined />}
-                </span>,
+                <Tooltip title={readProps?.operateText || '查看'}>
+                  <span key="read" className="cursor-not-allowed text-lg text-03">
+                    {readProps?.operateText || <EyeOutlined />}
+                  </span>
+                </Tooltip>,
               );
             } else {
               btns.push(
-                <Link
-                  key="read_detail"
-                  to={`./detail/${record[detailIdIndex || 'id']}`}
-                  target={readProps?.target}
-                >
-                  {readProps?.operateText || <EyeOutlined />}
-                </Link>,
+                <Tooltip title={readProps?.operateText || '查看'}>
+                  <Link
+                    key="read_detail"
+                    to={`./detail/${record[detailIdIndex || 'id']}`}
+                    target={readProps?.target}
+                    className="text-lg"
+                  >
+                    {readProps?.operateText || <EyeOutlined />}
+                  </Link>
+                </Tooltip>,
               );
             }
           }
@@ -173,9 +184,11 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
 
             if (disabled) {
               btns.push(
-                <span key="update" className="cursor-not-allowed text-03">
-                  {updateProps?.operateText || <EditOutlined />}
-                </span>,
+                <Tooltip title={updateProps?.operateText || '编辑'}>
+                  <span key="update" className="cursor-not-allowed text-lg text-03">
+                    {updateProps?.operateText || <EditOutlined />}
+                  </span>
+                </Tooltip>,
               );
             } else {
               btns.push(
@@ -184,7 +197,11 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
                   id={record[idField]}
                   record={record}
                   onSuccess={handleReload}
-                  trigger={<a>{updateProps?.operateText || <EditOutlined />}</a>}
+                  trigger={
+                    <Tooltip title={updateProps?.operateText || '编辑'}>
+                      <a className="text-lg">{updateProps?.operateText || <EditOutlined />}</a>
+                    </Tooltip>
+                  }
                   action="update"
                   {...detailProps}
                 />,
@@ -211,7 +228,7 @@ function CRUD<DataSource extends Record<string, any> = any, Key extends string |
         }
 
         return (
-          <div className="fec-crud-operate-column flex justify-center gap-2">
+          <div className="fec-crud-operate-column flex justify-center gap-4">
             {operateColumnProps?.moreOperator && operateColumnProps.moreOperator(record)}
             {btns}
             {operateColumnProps?.moreOperatorAfter && operateColumnProps.moreOperatorAfter(record)}

package/src/crud/crud_delete.tsx

@@ -1,5 +1,5 @@
 import { DeleteOutlined } from '@ant-design/icons';
-import { Modal } from 'antd';
+import { Modal, Tooltip } from 'antd';
 import { useCallback } from 'react';
 
 interface Params {
@@ -40,13 +40,21 @@ function OperateDelete(props: Params) {
   const { doDelete } = useDelete({ name, desc, onDelete, operateText });
 
   if (disabled) {
-    return <span className="cursor-not-allowed text-03">{operateText || <DeleteOutlined />}</span>;
+    return (
+      <Tooltip title="删除">
+        <span className="cursor-not-allowed text-lg text-03">
+          {operateText || <DeleteOutlined />}
+        </span>
+      </Tooltip>
+    );
   }
 
   return (
-    <a style={{ color: 'red' }} onClick={doDelete}>
-      {operateText || <DeleteOutlined />}
-    </a>
+    <Tooltip title="删除">
+      <a style={{ color: 'red' }} className="text-lg" onClick={doDelete}>
+        {operateText || <DeleteOutlined />}
+      </a>
+    </Tooltip>
   );
 }
 

package/src/crud/table/index.tsx

@@ -75,6 +75,7 @@ function Table<
       columns={newColumns}
       scroll={getTableScroll(newColumns)}
       search={newSearch}
+      bordered
       {...rest}
       className={classNames('fec-table', rest.className)}
     />

package/src/crud/table/style.scss

@@ -5,6 +5,22 @@
     }
   }
 
+  .ant-table-container {
+    border-inline-start-color: transparent !important;
+
+    .ant-table-thead {
+      & > tr > th:last-child {
+        border-inline-end-color: transparent !important;
+      }
+    }
+
+    .ant-table-row {
+      & > td:last-child {
+        border-inline-end-color: transparent !important;
+      }
+    }
+  }
+
   .ant-pagination {
     // gap: 8px;
 
@@ -19,6 +35,12 @@
 
     .ant-pagination-item {
       border: 1px solid #e2e7f0;
+
+      &.ant-pagination-item-active {
+        color: theme('colors.theme08');
+        background-color: theme('colors.theme03');
+        border-color: theme('colors.theme05');
+      }
     }
   }
 }

package/src/tree/file_tree.tsx

@@ -188,7 +188,7 @@ function FileTree<D extends DataNode>(props: FileTreeProps<D>) {
     return (
       <Detail
         action="create"
-        trigger={<PlusOutlined />}
+        trigger={<PlusOutlined className="text-base" />}
         requestCreateByValues={requestCreateByValues}
       />
     );