yuand 1.0.5 → 1.0.6

package/es/components/Table/index.js

@@ -163,13 +163,22 @@ var ProTable = function ProTable(props) {
     }
   }, [data, useData]);
   var _useMemo = useMemo(function () {
+      var isFunctionColumns = typeof columns === 'function';
+      var column = isFunctionColumns ? columns(data) : columns;
+      if (!isFunctionColumns) {
+        column.map(function (col) {
+          if (col.sorter) {
+            col.sortOrder = sorter && sorter.field === col.dataIndex ? sorter.order : null;
+          }
+        });
+      }
       return {
-        column: typeof columns === "function" ? columns(data) : columns,
+        column: column,
         dataSource: getDataSource(data, dataKey),
         renderAlert: typeof alert === "function" ? alert(data) : alert,
         total: getTotal(totalKey, data)
       };
-    }, [columns, data, dataKey, totalKey]),
+    }, [columns, data, dataKey, totalKey, sorter]),
     dataSource = _useMemo.dataSource,
     total = _useMemo.total,
     column = _useMemo.column,
@@ -224,7 +233,7 @@ var ProTable = function ProTable(props) {
     return function () {
       table.resetStore();
     };
-  }, [table]);
+  }, []);
   var onFinish = useCallback(function (values) {
     if (formHandleValues) {
       values = formHandleValues(values);

package/es/components/Table/types.d.ts

@@ -26,7 +26,6 @@ export interface TableInstance<TData = any> {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => any;
     update: () => void;
     resetStore: () => void;
     form?: FormInstance;

package/es/components/Table/useTable.js

@@ -40,13 +40,6 @@ var useTable = function useTable() {
       clear: function clear() {},
       refresh: function refresh() {},
       reset: function reset() {},
-      sortOrder: function sortOrder(key) {
-        var sorter = useStore.getState().sorter;
-        if (sorter && sorter.field === key) {
-          return sorter.order;
-        }
-        return null;
-      },
       resetStore: function resetStore() {
         useStore.getState().setState(initState);
       },
@@ -56,20 +49,6 @@ var useTable = function useTable() {
         });
       }
     };
-    useStore.subscribe(function (state, prevState) {
-      var _state$sorter, _prevState$sorter, _state$sorter2, _prevState$sorter2;
-      // 只在排序真正变化时才触发更新
-      var sorterChanged = state.sorter !== prevState.sorter;
-      var orderChanged = ((_state$sorter = state.sorter) === null || _state$sorter === void 0 ? void 0 : _state$sorter.order) !== ((_prevState$sorter = prevState.sorter) === null || _prevState$sorter === void 0 ? void 0 : _prevState$sorter.order);
-      var fieldChanged = ((_state$sorter2 = state.sorter) === null || _state$sorter2 === void 0 ? void 0 : _state$sorter2.field) !== ((_prevState$sorter2 = prevState.sorter) === null || _prevState$sorter2 === void 0 ? void 0 : _prevState$sorter2.field);
-      if (sorterChanged && (orderChanged || fieldChanged)) {
-        // 创建新的引用以触发使用 tableRef.current 的组件更新
-        tableRef.current = _objectSpread({}, tableRef.current);
-        _update(function (v) {
-          return v + 1;
-        });
-      }
-    });
   }
   return [tableRef.current];
 };

package/es/components/TableUseFetch/index.js

@@ -119,13 +119,22 @@ var ProTable = function ProTable(props) {
     }),
     loading = _useFetch.loading;
   var _useMemo = useMemo(function () {
+      var isFunctionColumns = typeof columns === 'function';
+      var column = isFunctionColumns ? columns(data) : columns;
+      if (!isFunctionColumns) {
+        column.map(function (col) {
+          if (col.sorter) {
+            col.sortOrder = sorter && sorter.field === col.dataIndex ? sorter.order : null;
+          }
+        });
+      }
       return {
-        column: typeof columns === "function" ? columns(data) : columns,
+        column: column,
         dataSource: getDataSource(data, dataKey),
         renderAlert: typeof alert === "function" ? alert(data) : alert,
         total: getTotal(totalKey, data)
       };
-    }, [columns, data, dataKey, totalKey]),
+    }, [columns, data, dataKey, totalKey, sorter]),
     dataSource = _useMemo.dataSource,
     total = _useMemo.total,
     column = _useMemo.column,
@@ -175,7 +184,7 @@ var ProTable = function ProTable(props) {
     return function () {
       table.resetStore();
     };
-  }, [table]);
+  }, []);
   var onFinish = function onFinish(values) {
     if (formHandleValues) {
       values = formHandleValues(values);

package/es/components/TableUseFetch/types.d.ts

@@ -25,7 +25,6 @@ export interface TableInstance<TData = any> {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => any;
     update: () => void;
     resetStore: () => void;
     form?: FormInstance;
@@ -86,7 +85,6 @@ export interface TableRef {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => "ascend" | "descend" | null;
     resetStore: () => void;
     update: () => void;
 }

package/es/components/TableUseFetch/useTable.js

@@ -47,13 +47,6 @@ var useTable = function useTable() {
         });
       },
       reset: function reset() {},
-      sortOrder: function sortOrder(key) {
-        var sorter = useStore.getState().sorter;
-        if (sorter && sorter.field === key) {
-          return sorter.order;
-        }
-        return null;
-      },
       resetStore: function resetStore() {
         useStore.getState().setState(initState);
       },
@@ -63,15 +56,6 @@ var useTable = function useTable() {
         });
       }
     };
-    useStore.subscribe(function (state, prevState) {
-      var _state$sorter, _prevState$sorter;
-      if (state.sorter !== prevState.sorter && ((_state$sorter = state.sorter) === null || _state$sorter === void 0 ? void 0 : _state$sorter.order) !== ((_prevState$sorter = prevState.sorter) === null || _prevState$sorter === void 0 ? void 0 : _prevState$sorter.order)) {
-        tableRef.current = _objectSpread({}, tableRef.current);
-        _update(function (v) {
-          return v + 1;
-        });
-      }
-    });
   }
   return [tableRef.current];
 };

package/lib/components/Table/index.js

@@ -154,13 +154,22 @@ var ProTable = (props) => {
     }
   }, [data, useData]);
   const { dataSource, total, column, renderAlert } = (0, import_react.useMemo)(() => {
+    const isFunctionColumns = typeof columns === "function";
+    let column2 = isFunctionColumns ? columns(data) : columns;
+    if (!isFunctionColumns) {
+      column2.map((col) => {
+        if (col.sorter) {
+          col.sortOrder = sorter && sorter.field === col.dataIndex ? sorter.order : null;
+        }
+      });
+    }
     return {
-      column: typeof columns === "function" ? columns(data) : columns,
+      column: column2,
       dataSource: (0, import_table.getDataSource)(data, dataKey),
       renderAlert: typeof alert === "function" ? alert(data) : alert,
       total: (0, import_table.getTotal)(totalKey, data)
     };
-  }, [columns, data, dataKey, totalKey]);
+  }, [columns, data, dataKey, totalKey, sorter]);
   const onSearch = () => {
     if (formItems) {
       table.form.submit();
@@ -211,7 +220,7 @@ var ProTable = (props) => {
     return () => {
       table.resetStore();
     };
-  }, [table]);
+  }, []);
   const onFinish = (0, import_react.useCallback)((values) => {
     if (formHandleValues) {
       values = formHandleValues(values);

package/lib/components/Table/types.d.ts

@@ -26,7 +26,6 @@ export interface TableInstance<TData = any> {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => any;
     update: () => void;
     resetStore: () => void;
     form?: FormInstance;

package/lib/components/Table/useTable.js

@@ -57,28 +57,11 @@ var useTable = (options = {}) => {
       },
       reset: () => {
       },
-      sortOrder(key) {
-        const sorter = useStore.getState().sorter;
-        if (sorter && sorter.field === key) {
-          return sorter.order;
-        }
-        return null;
-      },
       resetStore() {
         useStore.getState().setState(initState);
       },
       update: () => update((v) => v + 1)
     };
-    useStore.subscribe((state, prevState) => {
-      var _a, _b, _c, _d;
-      const sorterChanged = state.sorter !== prevState.sorter;
-      const orderChanged = ((_a = state.sorter) == null ? void 0 : _a.order) !== ((_b = prevState.sorter) == null ? void 0 : _b.order);
-      const fieldChanged = ((_c = state.sorter) == null ? void 0 : _c.field) !== ((_d = prevState.sorter) == null ? void 0 : _d.field);
-      if (sorterChanged && (orderChanged || fieldChanged)) {
-        tableRef.current = { ...tableRef.current };
-        update((v) => v + 1);
-      }
-    });
   }
   return [tableRef.current];
 };

package/lib/components/TableUseFetch/index.js

@@ -128,13 +128,22 @@ var ProTable = (props) => {
     }
   });
   const { dataSource, total, column, renderAlert } = (0, import_react.useMemo)(() => {
+    const isFunctionColumns = typeof columns === "function";
+    let column2 = isFunctionColumns ? columns(data) : columns;
+    if (!isFunctionColumns) {
+      column2.map((col) => {
+        if (col.sorter) {
+          col.sortOrder = sorter && sorter.field === col.dataIndex ? sorter.order : null;
+        }
+      });
+    }
     return {
-      column: typeof columns === "function" ? columns(data) : columns,
+      column: column2,
       dataSource: (0, import_table.getDataSource)(data, dataKey),
       renderAlert: typeof alert === "function" ? alert(data) : alert,
       total: (0, import_table.getTotal)(totalKey, data)
     };
-  }, [columns, data, dataKey, totalKey]);
+  }, [columns, data, dataKey, totalKey, sorter]);
   const onSearch = () => {
     if (formItems) {
       table.form.submit();
@@ -182,7 +191,7 @@ var ProTable = (props) => {
     return () => {
       table.resetStore();
     };
-  }, [table]);
+  }, []);
   const onFinish = (values) => {
     if (formHandleValues) {
       values = formHandleValues(values);

package/lib/components/TableUseFetch/types.d.ts

@@ -25,7 +25,6 @@ export interface TableInstance<TData = any> {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => any;
     update: () => void;
     resetStore: () => void;
     form?: FormInstance;
@@ -86,7 +85,6 @@ export interface TableRef {
     clear: () => void;
     refresh: () => void;
     reset: () => void;
-    sortOrder: (key: string) => "ascend" | "descend" | null;
     resetStore: () => void;
     update: () => void;
 }

package/lib/components/TableUseFetch/useTable.js

@@ -62,25 +62,11 @@ var useTable = (options = {}) => {
       },
       reset: () => {
       },
-      sortOrder(key) {
-        const sorter = useStore.getState().sorter;
-        if (sorter && sorter.field === key) {
-          return sorter.order;
-        }
-        return null;
-      },
       resetStore() {
         useStore.getState().setState(initState);
       },
       update: () => update((v) => v + 1)
     };
-    useStore.subscribe((state, prevState) => {
-      var _a, _b;
-      if (state.sorter !== prevState.sorter && ((_a = state.sorter) == null ? void 0 : _a.order) !== ((_b = prevState.sorter) == null ? void 0 : _b.order)) {
-        tableRef.current = { ...tableRef.current };
-        update((v) => v + 1);
-      }
-    });
   }
   return [tableRef.current];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuand",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "hyu",
   "module": "./es/index",
   "main": "./lib/index",
@@ -10,11 +10,7 @@
     "dev": "father dev",
     "build": "sudo father build",
     "build:deps": "father prebundle",
-    "prepublishOnly": "father doctor && npm run build",
-    "publish": "npm publish --access public",
-    "test": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest --coverage"
+    "prepublishOnly": "father doctor && npm run build"
   },
   "keywords": [],
   "authors": [

package/README.test.md

@@ -1,112 +0,0 @@
-# Table 组件测试说明
-
-## 安装测试依赖
-
-```bash
-npm install -D vitest @vitest/ui @vitejs/plugin-react jsdom
-npm install -D @testing-library/react @testing-library/user-event @testing-library/jest-dom
-npm install -D @types/testing-library__jest-dom
-```
-
-## 运行测试
-
-```bash
-# 运行所有测试
-npm test
-
-# 监听模式
-npm test -- --watch
-
-# 生成覆盖率报告
-npm test -- --coverage
-
-# 运行 UI 界面
-npm test -- --ui
-
-# 运行特定测试文件
-npm test src/components/Table/__tests__/index.test.tsx
-```
-
-## 测试覆盖范围
-
-### 1. 组件基础功能测试 (`index.test.tsx`)
-- ✅ 基础渲染
-- ✅ 加载状态
-- ✅ 自定义 classNames 和 styles
-- ✅ 自定义 dataKey 和 totalKey
-- ✅ 表单搜索功能
-- ✅ 表单提交和重置
-- ✅ handleValues 表单值处理
-- ✅ 分页器显示和切换
-- ✅ 每页大小变化
-- ✅ 列排序功能
-- ✅ Table 实例方法（run, reset, refresh, sortOrder）
-- ✅ 动态列配置（函数形式 columns）
-- ✅ Alert 和 Toolbar 渲染
-- ✅ 国际化支持
-- ✅ 静态方法（config, formatDate, removeEmpty）
-
-### 2. useTable Hook 测试 (`useTable.test.ts`)
-- ✅ 返回正确的实例结构
-- ✅ 默认和自定义初始状态
-- ✅ 状态更新
-- ✅ sortOrder 方法
-- ✅ resetStore 方法
-- ✅ 实例稳定性（多次渲染）
-- ✅ subscribe 回调
-- ✅ sorter 变化触发更新
-- ✅ Form 实例
-- ✅ 多实例独立性
-
-### 3. 集成测试 (`integration.test.tsx`)
-- ✅ 完整的搜索-分页-排序流程
-- ✅ 表单验证与条件搜索
-- ✅ 自定义 handleValues 转换
-- ✅ 动态列与数据联动
-- ✅ Alert 统计信息显示
-- ✅ 外部控制刷新与清空
-
-## 测试配置文件
-
-### vitest.config.ts
-配置了测试环境、覆盖率报告、路径别名等。
-
-### src/test/setup.ts
-测试环境初始化，包括：
-- jest-dom 断言扩展
-- 自动清理
-- window.matchMedia mock
-- IntersectionObserver mock
-- ResizeObserver mock
-
-## 覆盖率目标
-
-- **语句覆盖率**: > 80%
-- **分支覆盖率**: > 75%
-- **函数覆盖率**: > 80%
-- **行覆盖率**: > 80%
-
-## 常见问题
-
-### Q: 如何调试测试？
-A: 使用 `--ui` 参数打开 Vitest UI 界面进行可视化调试。
-
-### Q: 测试运行很慢怎么办？
-A: 可以使用 `--run` 参数禁用监听模式，或使用 `--isolate=false` 提升性能。
-
-### Q: 如何 mock API 请求？
-A: 在测试文件中使用 `vi.mock()` mock fetch 模块，参考测试文件中的示例。
-
-## package.json 脚本配置
-
-在 package.json 中添加以下脚本：
-
-```json
-{
-  "scripts": {
-    "test": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest --coverage"
-  }
-}
-```