funda-ui 4.7.345 → 4.7.445

package/CascadingSelect/index.css

@@ -174,7 +174,8 @@
 }
 .casc-select__items-wrapper .casc-select__items-col-searchbox input {
   border: 1px solid var(--casc-select-searchbox-border-color);
-  border-radius: 0.35rem;
+  border-radius: 0.15rem;
+  width: 100%;
   background: transparent;
   font-size: 0.75rem;
 }

package/CascadingSelectE2E/index.css

@@ -174,7 +174,8 @@
 }
 .casc-select-e2e__items-wrapper .casc-select-e2e__items-col-searchbox input {
   border: 1px solid var(--casc-select-e2e-searchbox-border-color);
-  border-radius: 0.35rem;
+  border-radius: 0.15rem;
+  width: 100%;
   background: transparent;
   font-size: 0.75rem;
 }

package/Table/index.js

@@ -2087,6 +2087,8 @@ function useTableSort(_ref, deps) {
     data = _ref.data,
     spyElement = _ref.spyElement,
     fieldType = _ref.fieldType,
+    _ref$isReverse = _ref.isReverse,
+    isReverse = _ref$isReverse === void 0 ? false : _ref$isReverse,
     onColSort = _ref.onColSort,
     onClick = _ref.onClick;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
@@ -2125,7 +2127,17 @@ function useTableSort(_ref, deps) {
         node.classList.add('newsort');
       });
       setInverse(!inverse);
-      return txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+
+      // result
+      if (filterType == 'text') {
+        return isReverse ? txt1.localeCompare(txt2, 'zh-CN', {
+          sensitivity: 'base'
+        }) : txt2.localeCompare(txt1, 'zh-CN', {
+          sensitivity: 'base'
+        });
+      } else {
+        return isReverse ? txt1 < txt2 ? -1 : txt1 > txt2 ? 1 : 0 : txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+      }
     };
     targetComparator.sort(sortBy);
 
@@ -2177,6 +2189,8 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
   var fieldType = props.fieldType,
     className = props.className,
     icon = props.icon,
+    _props$isReverse = props.isReverse,
+    isReverse = _props$isReverse === void 0 ? false : _props$isReverse,
     onClick = props.onClick;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(TableContext),
     originData = _useContext.originData,
@@ -2191,6 +2205,7 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
       spyElement: rootRef.current,
       fieldType: fieldType,
       onColSort: onColSort,
+      isReverse: isReverse,
       onClick: onClick
     }, [rootRef]),
     handleSortList = _useTableSort.handleSortList;

package/lib/cjs/Table/index.js

@@ -2087,6 +2087,8 @@ function useTableSort(_ref, deps) {
     data = _ref.data,
     spyElement = _ref.spyElement,
     fieldType = _ref.fieldType,
+    _ref$isReverse = _ref.isReverse,
+    isReverse = _ref$isReverse === void 0 ? false : _ref$isReverse,
     onColSort = _ref.onColSort,
     onClick = _ref.onClick;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
@@ -2125,7 +2127,17 @@ function useTableSort(_ref, deps) {
         node.classList.add('newsort');
       });
       setInverse(!inverse);
-      return txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+
+      // result
+      if (filterType == 'text') {
+        return isReverse ? txt1.localeCompare(txt2, 'zh-CN', {
+          sensitivity: 'base'
+        }) : txt2.localeCompare(txt1, 'zh-CN', {
+          sensitivity: 'base'
+        });
+      } else {
+        return isReverse ? txt1 < txt2 ? -1 : txt1 > txt2 ? 1 : 0 : txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+      }
     };
     targetComparator.sort(sortBy);
 
@@ -2177,6 +2189,8 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
   var fieldType = props.fieldType,
     className = props.className,
     icon = props.icon,
+    _props$isReverse = props.isReverse,
+    isReverse = _props$isReverse === void 0 ? false : _props$isReverse,
     onClick = props.onClick;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(TableContext),
     originData = _useContext.originData,
@@ -2191,6 +2205,7 @@ var SortSprite = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_re
       spyElement: rootRef.current,
       fieldType: fieldType,
       onColSort: onColSort,
+      isReverse: isReverse,
       onClick: onClick
     }, [rootRef]),
     handleSortList = _useTableSort.handleSortList;

package/lib/css/CascadingSelect/index.css

@@ -174,7 +174,8 @@
 }
 .casc-select__items-wrapper .casc-select__items-col-searchbox input {
   border: 1px solid var(--casc-select-searchbox-border-color);
-  border-radius: 0.35rem;
+  border-radius: 0.15rem;
+  width: 100%;
   background: transparent;
   font-size: 0.75rem;
 }

package/lib/css/CascadingSelectE2E/index.css

@@ -174,7 +174,8 @@
 }
 .casc-select-e2e__items-wrapper .casc-select-e2e__items-col-searchbox input {
   border: 1px solid var(--casc-select-e2e-searchbox-border-color);
-  border-radius: 0.35rem;
+  border-radius: 0.15rem;
+  width: 100%;
   background: transparent;
   font-size: 0.75rem;
 }

package/lib/esm/CascadingSelect/index.scss

@@ -236,7 +236,8 @@
     .casc-select__items-col-searchbox {
         input {
             border: 1px solid var(--casc-select-searchbox-border-color);
-            border-radius: 0.35rem;
+            border-radius: 0.15rem;
+            width: 100%;
             background: transparent;
             font-size: 0.75rem;
         }

package/lib/esm/CascadingSelectE2E/index.scss

@@ -239,7 +239,8 @@
     .casc-select-e2e__items-col-searchbox {
         input {
             border: 1px solid var(--casc-select-e2e-searchbox-border-color);
-            border-radius: 0.35rem;
+            border-radius: 0.15rem;
+            width: 100%;
             background: transparent;
             font-size: 0.75rem;
         }

package/lib/esm/Table/Table.tsx

@@ -5,6 +5,7 @@ import useComId from 'funda-utils/dist/cjs/useComId';
 import { clsWrite, combinedCls } from 'funda-utils/dist/cjs/cls';
 
 
+
 import { TableProvider } from './TableContext';
 import useTableResponsive from './utils/hooks/useTableResponsive';
 import useTableDraggable from './utils/hooks/useTableDraggable';

package/lib/esm/Table/TableCell.tsx

@@ -3,7 +3,6 @@ import React, { forwardRef, useContext } from 'react';
 import { clsWrite, combinedCls } from 'funda-utils/dist/cjs/cls';
 
 
-
 import { TableContext } from './TableContext';
 
 import { cellMark, removeCellFocusClassName } from './utils/func';

package/lib/esm/Table/utils/SortSprite.tsx

@@ -7,6 +7,7 @@ export type SortSpriteProps = {
     fieldType: 'text' | 'number' | 'date';
     className?: string;
     icon?: React.ReactNode;
+    isReverse?: boolean;
     onClick?: (e: any) => void;
 };
 
@@ -16,6 +17,7 @@ const SortSprite = forwardRef((props: SortSpriteProps, externalRef: any) => {
         fieldType,
         className,
         icon,
+        isReverse = false,
         onClick
     } = props;
 
@@ -34,6 +36,7 @@ const SortSprite = forwardRef((props: SortSpriteProps, externalRef: any) => {
         spyElement: rootRef.current,
         fieldType: fieldType,
         onColSort: onColSort,
+        isReverse: isReverse,
         onClick: onClick
     }, [rootRef]);
 

package/lib/esm/Table/utils/hooks/useTableSort.tsx

@@ -30,6 +30,7 @@ export interface UseTableSortProps {
     data?: any[];
     spyElement?: any;
     fieldType: 'text' | 'number' | 'date';
+    isReverse?: boolean;
     onColSort?: (fetchData: any) => void;
     onClick?: (e: any) => void;
 }
@@ -39,6 +40,7 @@ function useTableSort({
     data,
     spyElement,
     fieldType,
+    isReverse = false,
     onColSort,
     onClick
 }: UseTableSortProps, deps: any[]) {
@@ -79,14 +81,27 @@ function useTableSort({
                 txt2 = new Date(txt2);
             }
 
+
             //add filter class
             allRows(spyElement).forEach((node: any) => {
                 node.classList.add('newsort');
             });
 
+            
             setInverse(!inverse);
 
-            return txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0;
+
+            // result
+            if (filterType == 'text') {
+                return isReverse
+                    ? txt1.localeCompare(txt2, 'zh-CN', { sensitivity: 'base' })
+                    : txt2.localeCompare(txt1, 'zh-CN', { sensitivity: 'base' });
+            } else {
+                return isReverse
+                    ? (txt1 < txt2 ? -1 : txt1 > txt2 ? 1 : 0)
+                    : (txt2 < txt1 ? -1 : txt2 > txt1 ? 1 : 0);
+            }
+            
         }
 
         targetComparator.sort(sortBy);

package/package.json

@@ -2,7 +2,7 @@
   "author": "UIUX Lab",
   "email": "uiuxlab@gmail.com",
   "name": "funda-ui",
-  "version": "4.7.345",
+  "version": "4.7.445",
   "description": "React components using pure Bootstrap 5+ which does not contain any external style and script libraries.",
   "repository": {
     "type": "git",