@4399ywkf/design 1.3.11 → 2.0.0

package/dist/Table/utils/getSort.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var translateOrder = function translateOrder(v) {
   if (v === 'asc') {
     return 'ascend';
@@ -9,22 +10,24 @@ var translateOrder = function translateOrder(v) {
 };
 var getColumnSort = function getColumnSort(column, columnKey, queryData) {
   var sortOrder = function sortOrder() {
+    var _queryData$multipleSo;
     if (column.sortOrder) {
       return column.sortOrder;
-    } else {
-      var _column$sorter;
-      if (queryData.sort === columnKey && !((_column$sorter = column.sorter) !== null && _column$sorter !== void 0 && _column$sorter.multiple)) {
-        return translateOrder(queryData.order);
-      } else if (queryData.multipleSort && queryData.multipleSort.find(function (o) {
+    }
+    var isMultipleSorter = _typeof(column.sorter) === 'object' && column.sorter && 'multiple' in column.sorter;
+    if (queryData.sort === columnKey && !isMultipleSorter) {
+      var _queryData$order;
+      return translateOrder((_queryData$order = queryData.order) !== null && _queryData$order !== void 0 ? _queryData$order : '');
+    }
+    if ((_queryData$multipleSo = queryData.multipleSort) !== null && _queryData$multipleSo !== void 0 && _queryData$multipleSo.find(function (o) {
+      return o.key === columnKey;
+    })) {
+      var _queryData$multipleSo2, _queryData$multipleSo3;
+      return (_queryData$multipleSo2 = (_queryData$multipleSo3 = queryData.multipleSort.find(function (o) {
         return o.key === columnKey;
-      })) {
-        return queryData.multipleSort.find(function (o) {
-          return o.key === columnKey;
-        }).value;
-      } else {
-        return null;
-      }
+      })) === null || _queryData$multipleSo3 === void 0 ? void 0 : _queryData$multipleSo3.value) !== null && _queryData$multipleSo2 !== void 0 ? _queryData$multipleSo2 : null;
     }
+    return null;
   };
   return {
     sortOrder: sortOrder()

package/dist/Table/utils/index.d.ts

@@ -1,20 +1,5 @@
-import type { TablePaginationConfig } from 'antd';
-import type { ColumnProps } from 'antd/lib/table';
-import { Key } from 'react';
-import type { BearState, RichColumn } from '../type';
-export declare function genRichColumnToColumn(columns: RichColumn<any>[], queryData: BearState['queryData'], setFilter: any, columnSetting: BearState['columnSetting'], dataSource?: any[]): ColumnProps<any>[];
-/**
- * 合并用户传递的 分页参数 和 Table 内置的参数
- * @param defaultPagination
- * @param total
- */
-export declare function mergePagination(defaultPagination: TablePaginationConfig, total: number): TablePaginationConfig | false | undefined;
-export declare function mergeTablePagination(propsPagination?: TablePaginationConfig | false, cacheName?: string): TablePaginationConfig;
-/**
- * 根据 key 和 dataIndex 生成唯一 id
- *
- * @param key 用户设置的 key
- * @param dataIndex 在对象中的数据
- * @param index 序列号，理论上唯一
- */
-export declare const genColumnKey: (key?: string | number | Key, index?: number | string) => string;
+import type { ColumnsType } from 'antd/es/table';
+import type { ColumnSettingItem, QuerySnapshot, TableStore } from '../store/types';
+import type { RichColumn } from '../type';
+export { genColumnKey } from './columnKey';
+export declare function genRichColumnToColumn(columns: RichColumn<unknown>[], queryData: QuerySnapshot, setFilter: TableStore['setFilter'], columnSetting: ColumnSettingItem[], dataSource?: unknown[]): ColumnsType<unknown>;

package/dist/Table/utils/index.js

@@ -4,17 +4,16 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useContext, useEffect } from 'react';
-import { useStore } from 'zustand';
-import { StoreContext } from "../utils/Provide";
-import { columnsMap } from "../utils/getColumn";
-import { getColumnHidden } from "../utils/getColumnHidden";
-import { getColumnMerge } from "../utils/getColumnMerge";
+import { columnsMap } from "./getColumn";
+import { getColumnHidden } from "./getColumnHidden";
+import { getColumnMerge } from "./getColumnMerge";
 import { getColumnSort } from "./getSort";
+import { genColumnKey } from "./columnKey";
+export { genColumnKey } from "./columnKey";
 export function genRichColumnToColumn(columns, queryData, setFilter, columnSetting, dataSource) {
   var _columns$map$filter;
   return (_columns$map$filter = columns === null || columns === void 0 ? void 0 : columns.map(function (column, index) {
-    var _column$dataIndex, _column$fullFilter$ty, _column$fullFilter;
+    var _column$dataIndex, _column$fullFilter$ty, _column$fullFilter, _queryData$filter, _queryData$filter2;
     var columnKey = genColumnKey(column.key || (Array.isArray(column.dataIndex) ? column.dataIndex.join('.') : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.toString()), index);
     var fullFilterData = {};
     if (columnsMap[(_column$fullFilter$ty = (_column$fullFilter = column.fullFilter) === null || _column$fullFilter === void 0 ? void 0 : _column$fullFilter.type) !== null && _column$fullFilter$ty !== void 0 ? _column$fullFilter$ty : '']) {
@@ -25,133 +24,14 @@ export function genRichColumnToColumn(columns, queryData, setFilter, columnSetti
         }, column.fullFilter)
       })));
     }
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, column), fullFilterData), getColumnSort(column, columnKey, queryData)), getColumnHidden(columnKey, columnSetting)), getColumnMerge(columnKey, column, queryData, dataSource));
-  }).filter(Boolean)) !== null && _columns$map$filter !== void 0 ? _columns$map$filter : [];
-}
-
-/**
- * 合并用户传递的 分页参数 和 Table 内置的参数
- * @param defaultPagination
- * @param total
- */
-export function mergePagination(defaultPagination, total) {
-  var _defaultPagination$sh;
-  var store = useContext(StoreContext);
-  var _useStore = useStore(store),
-    setPagination = _useStore.setPagination;
-  var current = defaultPagination.current,
-    pageSize = defaultPagination.pageSize;
-  useEffect(function () {
-    setPagination(current !== null && current !== void 0 ? current : 1, pageSize !== null && pageSize !== void 0 ? pageSize : 20);
-  }, []);
-  return _objectSpread(_objectSpread({
-    showTotal: function showTotal(total) {
-      return "\u5171\u6709 ".concat(total, " \u6761\u8BB0\u5F55");
-    },
-    total: total,
-    showSizeChanger: (_defaultPagination$sh = defaultPagination === null || defaultPagination === void 0 ? void 0 : defaultPagination.showSizeChanger) !== null && _defaultPagination$sh !== void 0 ? _defaultPagination$sh : true
-  }, defaultPagination), {}, {
-    onChange: function onChange(page, newPageSize) {
-      var _ref = defaultPagination,
-        onChange = _ref.onChange;
-      onChange === null || onChange === void 0 || onChange(page, newPageSize || 20);
-    }
-  });
-}
-export function mergeTablePagination(propsPagination, cacheName) {
-  var store = useContext(StoreContext);
-  var _useStore2 = useStore(store),
-    queryData = _useStore2.queryData;
-  var storeDefaultCurrent = queryData.defaultCurrent,
-    storeDefaultPageSize = queryData.defaultPageSize,
-    limit = queryData.limit,
-    offset = queryData.offset;
-  var defaultCurrent,
-    current = 1;
-  var defaultPageSize,
-    pageSize = 20;
-  if (cacheName) {
-    // 走缓存 得到结果是 {limit: 20, offset: 20}
-    var localData = localStorage.getItem(cacheName);
-    if (localData) {
-      var localJsonData = JSON.parse(localData);
-      if (localJsonData.limit) {
-        defaultPageSize = localJsonData.limit;
-        pageSize = defaultPageSize;
-      }
-      if (localJsonData.offset && localJsonData.limit) {
-        defaultCurrent = localJsonData.offset / localJsonData.limit + 1;
-        current = defaultCurrent;
-      }
-    } else {
-      defaultPageSize = storeDefaultPageSize;
-      pageSize = limit !== null && limit !== void 0 ? limit : 20;
-      defaultCurrent = storeDefaultCurrent;
-      if (limit === 0) {
-        current = 1;
-      } else {
-        if (limit && limit !== 0 && offset) {
-          current = offset / limit + 1;
-        } else {
-          current = 1;
-        }
-      }
-    }
-  }
-  defaultCurrent = storeDefaultCurrent;
-  // pageSize = limit ?? storeDefaultPageSize;
-
-  if (!limit) {
-    if (_typeof(propsPagination) === 'object' && propsPagination.defaultPageSize) {
-      pageSize = propsPagination.defaultPageSize;
-    }
-  } else {
-    pageSize = limit;
-  }
-  defaultPageSize = storeDefaultPageSize;
-  if (limit === 0) {
-    current = 1;
-  } else {
-    if (limit && limit !== 0 && offset) {
-      current = offset / limit + 1;
-    } else {
-      current = 1;
-    }
-  }
-  if (_typeof(propsPagination) === 'object') {
-    if (propsPagination.defaultPageSize) {
-      defaultPageSize = propsPagination.defaultPageSize;
+    var storeFilterValue = (_queryData$filter = queryData.filter) === null || _queryData$filter === void 0 || (_queryData$filter = _queryData$filter[columnKey]) === null || _queryData$filter === void 0 ? void 0 : _queryData$filter.value;
+    var hasStoreFilter = Object.prototype.hasOwnProperty.call((_queryData$filter2 = queryData.filter) !== null && _queryData$filter2 !== void 0 ? _queryData$filter2 : {}, columnKey);
+    var controlledFilter = {};
+    if (column.filters || column.fullFilter) {
+      var _column$filteredValue;
+      controlledFilter.filteredValue = hasStoreFilter ? storeFilterValue !== null && storeFilterValue !== void 0 ? storeFilterValue : [] : (_column$filteredValue = column.filteredValue) !== null && _column$filteredValue !== void 0 ? _column$filteredValue : null;
+      controlledFilter.filtered = hasStoreFilter;
     }
-    if (propsPagination.defaultCurrent) {
-      defaultCurrent = propsPagination.defaultCurrent;
-    }
-    if (propsPagination !== null && propsPagination !== void 0 && propsPagination.pageSize) {
-      var _propsPagination$page;
-      pageSize = (_propsPagination$page = propsPagination === null || propsPagination === void 0 ? void 0 : propsPagination.pageSize) !== null && _propsPagination$page !== void 0 ? _propsPagination$page : 20;
-    }
-    if (propsPagination !== null && propsPagination !== void 0 && propsPagination.current) {
-      var _propsPagination$curr;
-      current = (_propsPagination$curr = propsPagination === null || propsPagination === void 0 ? void 0 : propsPagination.current) !== null && _propsPagination$curr !== void 0 ? _propsPagination$curr : 1;
-    }
-  }
-  return _objectSpread(_objectSpread({}, propsPagination), {}, {
-    defaultCurrent: defaultCurrent,
-    defaultPageSize: defaultPageSize,
-    current: current,
-    pageSize: pageSize
-  });
-}
-
-/**
- * 根据 key 和 dataIndex 生成唯一 id
- *
- * @param key 用户设置的 key
- * @param dataIndex 在对象中的数据
- * @param index 序列号，理论上唯一
- */
-export var genColumnKey = function genColumnKey(key, index) {
-  if (key) {
-    return Array.isArray(key) ? key.join('-') : key.toString();
-  }
-  return "".concat(index);
-};
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, column), controlledFilter), fullFilterData), getColumnSort(column, columnKey, queryData)), getColumnHidden(columnKey, columnSetting)), getColumnMerge(columnKey, column, queryData, dataSource));
+  }).filter(Boolean)) !== null && _columns$map$filter !== void 0 ? _columns$map$filter : [];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4399ywkf/design",
-  "version": "1.3.11",
+  "version": "2.0.0",
   "description": "4399ywkf Design React UI Library.",
   "license": "MIT",
   "module": "dist/index.js",
@@ -9,6 +9,32 @@
     "dist",
     "public"
   ],
+  "scripts": {
+    "build": "father build && gulp less",
+    "build:ci": "pnpm lint && pnpm build && pnpm docs:build",
+    "build:watch": "father dev",
+    "changeset": "changeset",
+    "changeset:publish": "changeset publish",
+    "changeset:version": "changeset version",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "father doctor && npm run build",
+    "postpublish": "git push && git push --tags",
+    "pub": "npm run pub:check && npm run build && npm publish --ignore-scripts",
+    "pub:check": "father doctor && node -e \"const p=require('./package.json');const d=require('child_process').execSync('npm view '+p.name+' version 2>/dev/null').toString().trim();if(d===p.version){console.error('\\x1b[31m✖ 版本 '+p.version+' 已存在，请先升级版本号\\x1b[0m');process.exit(1)}else{console.log('\\x1b[32m✔ 版本检查通过: '+p.version+'\\x1b[0m')}\"",
+    "pub:patch": "npm version patch --no-git-tag-version && npm run pub",
+    "pub:minor": "npm version minor --no-git-tag-version && npm run pub",
+    "pub:major": "npm version major --no-git-tag-version && npm run pub",
+    "release": "npm run build && changeset publish",
+    "start": "npm run dev",
+    "test:build": "rm -rf dist docs-dist && pnpm build:ci && echo '✅ 构建测试通过'"
+  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
@@ -34,12 +60,12 @@
   "dependencies": {
     "@4399ywkf/fr-generator": "^2.8.16",
     "@ant-design/icons": "^5.6.0",
-    "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@floating-ui/react": "^0.27.14",
     "@radix-ui/react-dropdown-menu": "^2.1.15",
     "@radix-ui/react-popover": "^1.1.14",
     "@rive-app/react-canvas": "^4.21.3",
     "ahooks": "^3.8.5",
+    "antd-style": "^4.1.0",
     "classnames": "^2.5.1",
     "clone": "^2.1.2",
     "clsx": "^2.1.1",
@@ -104,7 +130,7 @@
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/wavesurfer.js": "^6.0.12",
     "@umijs/lint": "^4.4.4",
-    "antd": "^5.25.4",
+    "antd": "^6.0.0",
     "dumi": "^2.4.21",
     "eslint": "^8.57.1",
     "father": "^4.5.2",
@@ -121,10 +147,11 @@
     "react-dom": "^18.3.0",
     "sass": "^1.89.2",
     "sass-embedded": "^1.89.2",
-    "stylelint": "^14.16.1"
+    "stylelint": "^14.16.1",
+    "v8-compile-cache": "^2.4.0"
   },
   "peerDependencies": {
-    "antd": ">=5.4.2",
+    "antd": ">=6.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
@@ -134,23 +161,5 @@
   "authors": [
     "ywjszx@4399.com"
   ],
-  "slideEffects": false,
-  "scripts": {
-    "build": "father build && gulp less",
-    "build:ci": "pnpm lint && pnpm build && pnpm docs:build",
-    "build:watch": "father dev",
-    "changeset": "changeset",
-    "changeset:publish": "changeset publish",
-    "changeset:version": "changeset version",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "release": "npm run build && changeset publish",
-    "start": "npm run dev",
-    "test:build": "rm -rf dist docs-dist && pnpm build:ci && echo '✅ 构建测试通过'"
-  }
-}
+  "slideEffects": false
+}

package/dist/Table/components/ColumnSetting/index.css

@@ -1,4 +0,0 @@
-.column-setting-popover {
-  max-height: 200px;
-  overflow-y: auto;
-}

package/dist/Table/components/EnumFilter/index.css

@@ -1,57 +0,0 @@
-.table-filter-dropdown {
-  min-width: 120px;
-}
-
-.table-filter-dropdown-search {
-  padding: 8px 4px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.dropdown-menu {
-  max-height: 264px;
-  border: 0;
-  overflow-x: hidden;
-  overflow-y: auto;
-  background: #fff;
-  padding-top: 4px;
-}
-
-.dropdown-menu-ul {
-  display: flex !important;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.dropdown-menu-item {
-  clear: both;
-  margin: 0;
-  padding: 5px 12px;
-  color: rgba(0, 0, 0, 88%);
-  font-weight: normal;
-  font-size: 14px;
-  line-height: 1.5714;
-  cursor: pointer;
-  transition: all 0.2s;
-  border-radius: 4px;
-
-  &:hover {
-    background-color: rgba(0, 0, 0, 4%);
-  }
-}
-
-.dropdown-menu-item-selected {
-  color: #1677ff;
-  background-color: #e6f4ff;
-
-  &:hover {
-    background-color: #bae0ff;
-  }
-}
-
-.dropdown-menu-action {
-  padding: 4px 12px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}

package/dist/Table/components/FilterDropdown/index.css

@@ -1,11 +0,0 @@
-.table-filter-dropdown-main {
-  padding: 4px;
-}
-
-.table-filter-dropdown-btns {
-  padding: 7px 8px;
-  display: flex;
-  justify-content: space-between;
-  overflow: hidden;
-  border-top: 1px solid #f0f0f0;
-}

package/dist/Table/components/FilterKeys/index.css

@@ -1,19 +0,0 @@
-.custom-tag {
-  height: 32px;
-}
-
-.custom-overflow {
-  display: flex;
-  flex-wrap: wrap;
-  max-width: 100%;
-  position: relative;
-  flex: 1;
-  justify-content: flex-end;
-  align-items: center;
-  margin-right: 8px;
-}
-
-
-.overflow-button {
-  cursor: pointer;
-}

package/dist/Table/components/SearchInput/style.css

@@ -1,10 +0,0 @@
-.richTableSearchInputTooltip {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-
-.filterInput {
-  flex: 0 0 200px;
-  margin-right: 8px;
-}

package/dist/Table/style.css

@@ -1,42 +0,0 @@
-div[class*='table-title'] {
-  padding: 0 !important;
-}
-
-.richTableTitle {
-  padding: 8px 0;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.richTableTitleRight {
-  display: flex;
-  flex: 1;
-  justify-content: flex-end;
-  align-items: center;
-  gap: 8px;
-}
-
-.listToolbarSettingItem {
-  margin-block: 0;
-  margin-inline: 4px;
-  color: rgba(42, 46, 54, 88%);
-  font-size: 16px;
-  cursor: pointer;
-}
-
-.listToolbarSettingItem:hover {
-  color: #1677ff;
-}
-
-.columnSettingTitle {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 32px;
-}
-
-.columnSettingContent {
-  max-height: 200px;
-  overflow: auto;
-}