@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.4

package/lib/ProSelect/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-select-ellipse {
   display: block;

package/lib/ProSelect/utils/index.js

@@ -44,23 +44,52 @@ var findSelectNameValues = ({
 }) => {
   let selectValues = [];
   list.forEach((item) => {
-    let result = item;
+    let result2 = item;
     if (!item || !Object.keys(item).length || Object.keys(item).length === 1 && "rowKey" in item) {
       return false;
     }
     for (const key of selectName) {
-      result = result[key];
+      result2 = result2[key];
     }
     if (mode === "multiple") {
-      selectValues = [...selectValues, ...result || []];
+      selectValues = [...selectValues, ...result2 || []];
     } else {
-      selectValues.push(result);
+      selectValues.push(result2);
     }
   });
   const diffList = import_lodash.default.difference(selectValues, mode === "multiple" ? value : [value]);
-  return dataSource.filter(
+  const result = dataSource.filter(
     (item) => !diffList.includes(labelInValue ? item : item[fieldNames == null ? void 0 : fieldNames.value] || (item == null ? void 0 : item.value))
   );
+  const isSingle = list == null ? void 0 : list.find((item) => item == null ? void 0 : item._isEditing);
+  if (mode === "multiple" && isSingle) {
+    const editingRow = list.find((item) => item == null ? void 0 : item._isEditing);
+    const otherRowsValues = [];
+    list.forEach((item) => {
+      if (item !== editingRow) {
+        let result2 = item;
+        for (const key of selectName) {
+          result2 = result2[key];
+        }
+        if (result2) {
+          otherRowsValues.push(...Array.isArray(result2) ? result2 : [result2]);
+        }
+      }
+    });
+    let currentRowValues = [];
+    if (editingRow) {
+      let result2 = editingRow;
+      for (const key of selectName) {
+        result2 = result2[key];
+      }
+      currentRowValues = Array.isArray(result2) ? result2 : result2 ? [result2] : [];
+    }
+    const diffList2 = import_lodash.default.difference(otherRowsValues, currentRowValues);
+    return dataSource.filter(
+      (item) => !diffList2.includes(labelInValue ? item : item[fieldNames == null ? void 0 : fieldNames.value] || (item == null ? void 0 : item.value))
+    );
+  }
+  return result;
 };
 var getSelectList = ({
   otherProps,

package/lib/ProStep/components/Item/index.js

@@ -73,8 +73,7 @@ var ProStepItem = ({
   const renderChildren = () => {
     if (lazyLoad) {
       const lazyLoadProps = (0, import_lodash.isBoolean)(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
-      const LazyLoadComponent = import_react_lazyload.default;
-      return /* @__PURE__ */ React.createElement(LazyLoadComponent, { ...lazyLoadProps, classNamePrefix: id }, children);
+      return /* @__PURE__ */ React.createElement(import_react_lazyload.default, { ...lazyLoadProps, classNamePrefix: id }, children);
     }
     return children;
   };

package/lib/ProStep/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-step-wrapper {
   padding-right: 48px;

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -57,7 +57,7 @@ var Row = (props) => {
     if (index === 0) {
       const { render, record, renderIndex } = (child == null ? void 0 : child.props) || {};
       return import_react.default.cloneElement(child, {
-        children: /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("span", { className: `drag-wrapper${props["data-hide"] ? " no-check" : ""}` }, /* @__PURE__ */ import_react.default.createElement(
+        children: /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("span", { className: `pro-table-drag-wrapper${props["data-hide"] ? " no-check" : ""}` }, /* @__PURE__ */ import_react.default.createElement(
           import_ProIcon.default,
           {
             className: "drag-icon",

package/lib/ProTable/hooks/useAntdTable.d.ts

@@ -1,4 +1,7 @@
 import { useRequest } from 'ahooks';
 import type { ProTableRequestOptionsType, ProTableServiceType } from '../propsType';
+export declare const SELECTION_ALL = "SELECTION_ALL";
+export declare const CURRENT_PAGE = "CURRENT_PAGE";
+export declare const UNCHECK_ALL = "UNCHECK_ALL";
 declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): any;
 export default useAntdTable;

package/lib/ProTable/hooks/useAntdTable.js

@@ -29,6 +29,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/ProTable/hooks/useAntdTable.ts
 var useAntdTable_exports = {};
 __export(useAntdTable_exports, {
+  CURRENT_PAGE: () => CURRENT_PAGE,
+  SELECTION_ALL: () => SELECTION_ALL,
+  UNCHECK_ALL: () => UNCHECK_ALL,
   default: () => useAntdTable_default
 });
 module.exports = __toCommonJS(useAntdTable_exports);
@@ -49,6 +52,9 @@ var useDefaultOptions = (options) => {
   };
 };
 var previousSearchValues = null;
+var SELECTION_ALL = "SELECTION_ALL";
+var CURRENT_PAGE = "CURRENT_PAGE";
+var UNCHECK_ALL = "UNCHECK_ALL";
 function useAntdTable(service, options, useRequestOptions) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const [
@@ -319,6 +325,63 @@ function useAntdTable(service, options, useRequestOptions) {
     const res = await refreshAsync();
     refreshPage(res);
   };
+  const defaultSelections = [
+    {
+      key: "currentPage",
+      text: (0, import_locale.formatMessage)((_b = (_a = import_locale.default) == null ? void 0 : _a.ProTable) == null ? void 0 : _b.selectCurPage, { total: (data == null ? void 0 : data.length) || 0 }),
+      onSelect: (changeableRowKeys) => {
+        setState({
+          allSelected: false,
+          selectedRecords: [...data],
+          selectedRowKeys: changeableRowKeys
+        });
+      }
+    },
+    {
+      key: "all",
+      text: (0, import_locale.formatMessage)((_d = (_c = import_locale.default) == null ? void 0 : _c.ProTable) == null ? void 0 : _d.selectAll, { total }),
+      onSelect: async (changeableRowKeys) => {
+        setState({
+          allSelected: true,
+          selectedRecords: [...data],
+          selectedRowKeys: changeableRowKeys
+        });
+      }
+    },
+    {
+      key: "uncheckAll",
+      text: (_f = (_e = import_locale.default) == null ? void 0 : _e.ProTable) == null ? void 0 : _f.deselect,
+      onSelect: async () => {
+        setState({
+          allSelected: false,
+          selectedRecords: [],
+          selectedRowKeys: []
+        });
+      }
+    }
+  ];
+  const selections = (0, import_react.useMemo)(() => {
+    if (rowSelections === true) {
+      return defaultSelections;
+    }
+    if (Array.isArray(rowSelections)) {
+      return rowSelections.map((item) => {
+        if (typeof item === "string") {
+          if (item === CURRENT_PAGE) {
+            return defaultSelections[0];
+          }
+          if (item === SELECTION_ALL) {
+            return defaultSelections[1];
+          }
+          if (item === UNCHECK_ALL) {
+            return defaultSelections[2];
+          }
+        }
+        return item;
+      });
+    }
+    return false;
+  }, [rowSelections]);
   const _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -336,7 +399,7 @@ function useAntdTable(service, options, useRequestOptions) {
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys == null ? void 0 : newSelectedKeys.map((item) => selectedRecordObj == null ? void 0 : selectedRecordObj[item]),
+          selectedRecords: newSelectedKeys == null ? void 0 : newSelectedKeys.map((item) => selectedRecordObj == null ? void 0 : selectedRecordObj[String(item)]),
           selectedRowKeys: newSelectedKeys
         });
       } else {
@@ -358,41 +421,7 @@ function useAntdTable(service, options, useRequestOptions) {
     getCheckboxProps: (record) => ({
       className: allSelected && rowSelections ? "checkbox-disabled" : ""
     }),
-    selections: rowSelections ? [
-      {
-        key: "currentPage",
-        text: (0, import_locale.formatMessage)((_b = (_a = import_locale.default) == null ? void 0 : _a.ProTable) == null ? void 0 : _b.selectCurPage, { total: (data == null ? void 0 : data.length) || 0 }),
-        onSelect: (changeableRowKeys) => {
-          setState({
-            allSelected: false,
-            selectedRecords: [...data],
-            selectedRowKeys: changeableRowKeys
-          });
-        }
-      },
-      {
-        key: "all",
-        text: (0, import_locale.formatMessage)((_d = (_c = import_locale.default) == null ? void 0 : _c.ProTable) == null ? void 0 : _d.selectAll, { total }),
-        onSelect: async (changeableRowKeys) => {
-          setState({
-            allSelected: true,
-            selectedRecords: [...data],
-            selectedRowKeys: changeableRowKeys
-          });
-        }
-      },
-      {
-        key: "uncheckAll",
-        text: (_f = (_e = import_locale.default) == null ? void 0 : _e.ProTable) == null ? void 0 : _f.deselect,
-        onSelect: async () => {
-          setState({
-            allSelected: false,
-            selectedRecords: [],
-            selectedRowKeys: []
-          });
-        }
-      }
-    ] : false
+    selections
   };
   const rowSelection = (0, import_lodash.isObject)(returnRowSelection) ? (0, import_lodash.merge)(_rowSelection, returnRowSelection) : _rowSelection;
   if ((0, import_lodash.isObject)(returnRowSelection) && !(0, import_lodash.isEqual)(rowSelection, _rowSelection)) {
@@ -466,3 +495,9 @@ function useAntdTable(service, options, useRequestOptions) {
   return useAntdTableProps;
 }
 var useAntdTable_default = useAntdTable;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CURRENT_PAGE,
+  SELECTION_ALL,
+  UNCHECK_ALL
+});

package/lib/ProTable/index.d.ts

@@ -8,13 +8,9 @@ export declare const defaultPage: {
 };
 declare const ProTable: {
     (props: ProTableType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        quickConfig: boolean;
-        stripe: boolean;
-        draggable: boolean;
-        disabled: boolean;
-        isView: boolean;
-    };
     useAntdTable: typeof useAntdTable;
+    SELECTION_ALL: string;
+    CURRENT_PAGE: string;
+    UNCHECK_ALL: string;
 };
 export default ProTable;

package/lib/ProTable/index.js

@@ -66,13 +66,13 @@ var ProTable = (props) => {
     tableId,
     headerRender,
     footerRender,
-    quickConfig,
-    stripe,
+    quickConfig = false,
+    stripe = true,
     columns: propsColumns = [],
     className,
-    draggable,
-    disabled,
-    isView,
+    draggable = false,
+    disabled = false,
+    isView = false,
     rowDisabled,
     summary,
     emptyText = (_b = (_a = import_locale.default) == null ? void 0 : _a.ProTable) == null ? void 0 : _b.noData,
@@ -427,15 +427,10 @@ var ProTable = (props) => {
     ))
   );
 };
-ProTable.defaultProps = {
-  quickConfig: false,
-  // 默认关闭快速配置
-  stripe: true,
-  draggable: false,
-  disabled: false,
-  isView: false
-};
 ProTable.useAntdTable = import_useAntdTable.default;
+ProTable.SELECTION_ALL = import_useAntdTable.SELECTION_ALL;
+ProTable.CURRENT_PAGE = import_useAntdTable.CURRENT_PAGE;
+ProTable.UNCHECK_ALL = import_useAntdTable.UNCHECK_ALL;
 var ProTable_default = ProTable;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/ProTable/propsType.d.ts

@@ -1,6 +1,7 @@
 import { Key, ReactNode } from 'react';
-import type { TableProps, FormInstance, TooltipProps } from 'antd';
+import type { TableProps, TooltipProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
+import { FormInstance } from 'antd/es/form/Form';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import type { TabsProps } from 'antd/es/tabs';
 /**
@@ -607,7 +608,7 @@ export interface ProTableRequestOptionsType<T, R> {
      * @description 启用选择当前页、选择全部、取消选择下拉菜单
      * @default false
      */
-    rowSelections?: boolean;
+    rowSelections?: boolean | object[];
     /**
      * 额外参数
      * @description 无法通过搜索表单设置的值,此值变更时也会重新发起请求,重置表单不会被清空

package/lib/ProTable/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-table {
   .pro-tooltip .singleLine {
@@ -96,9 +94,9 @@
       }
     }
   }
-  .drag-wrapper {
-    display: inline-flex;
-    width: auto;
+  .pro-table-drag-wrapper {
+    display: flex;
+    justify-content: flex-end;
     margin-right: 8px;
     .anticon {
       cursor: pointer;
@@ -107,7 +105,7 @@
       }
     }
   }
-  .drag-wrapper.no-check {
+  .pro-table-drag-wrapper.no-check {
     .anticon {
       margin-right: 0;
     }

package/lib/ProTabs/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tabs {
   .@{ant-prefix}-tabs .@{ant-prefix}-tabs-nav-list .@{ant-prefix}-tabs-tab {

package/lib/ProThemeTools/index.d.ts

@@ -1,13 +1,6 @@
 import type { ProThemeToolsType } from './propsType';
 declare const ProThemeTools: {
     ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        size: number;
-        mode: string;
-        color: string;
-        iconFollowTheme: boolean;
-        cacheTime: boolean;
-    };
     setThemes: (themes: import("./utils/index").ThemesProps) => boolean;
 };
 export default ProThemeTools;

package/lib/ProThemeTools/index.js

@@ -70,12 +70,12 @@ var defaultThemeConfig = {
   zauiStripe: true
 };
 var ProThemeTools = ({
-  size,
+  size = 24,
   className,
-  cacheTime,
-  color,
-  mode,
-  iconFollowTheme,
+  cacheTime = false,
+  color = "#343434",
+  mode = "prd",
+  iconFollowTheme = false,
   prefixCls = "ant",
   tableBorder = false,
   tableStripe = false,
@@ -224,13 +224,6 @@ var ProThemeTools = ({
     }
   ));
 };
-ProThemeTools.defaultProps = {
-  size: 24,
-  mode: "prd",
-  color: "#343434",
-  iconFollowTheme: false,
-  cacheTime: false
-};
 ProThemeTools.setThemes = import_utils.setThemes;
 var ProThemeTools_default = ProThemeTools;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/ProThemeTools/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 @import '../component/ProTools/style/index.less';
 

package/lib/ProTooltip/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tooltip {
   cursor: pointer;

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tree-select{
     .@{ant-prefix}-select-selector{

package/lib/ProTree/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tree-wrap-ellipse {
   display: block;

package/lib/ProTreeModal/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tree-modal-container .@{ant-prefix}-modal-content .@{ant-prefix}-modal-body {
   max-height: 498px !important;

package/lib/ProUpload/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-upload {
   // display: inline-flex;

package/lib/ProViewer/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-viewer {
   .@{ant-prefix}-image {

package/lib/style/theme/antd.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import './base';
 
 @zat-disabled-color: #bcbcbc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.4",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -30,7 +30,7 @@
     "docs:deploy": "gh-pages -d docs-dist",
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
-    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx",
+    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
@@ -78,7 +78,7 @@
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@zat-design/utils": "4.0.0-beta.3",
+    "@zat-design/utils": "4.0.0-beta.4",
     "ahooks": "3.8.4",
     "antd": "^5.26.4",
     "big.js": "^6.2.1",
@@ -93,13 +93,14 @@
   "peerDependencies": {
     "antd": "^5.26.4",
     "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "react-dom": ">=16.9.0",
+    "react-router-dom": "^5.1.7 || ^6.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
-    "@testing-library/jest-dom": "6.2.0",
-    "@testing-library/react": "12.1.5",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@testing-library/react": "^14.0.0",
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",

package/tests/__mocks__/fileMock.js

@@ -0,0 +1 @@
+module.exports = 'test-file-stub';

package/tests/__mocks__/zatUtils.js

@@ -0,0 +1,27 @@
+// Mock @zat-design/utils
+module.exports = {
+  tools: {
+    isValidUrl: jest.fn(() => true),
+    formatCurrency: jest.fn((value) => `¥${value}`),
+    formatDate: jest.fn((date) => new Date(date).toLocaleDateString()),
+  },
+  transforms: {
+    transformDate: jest.fn((value, params) => {
+      if (!value) return '';
+      return new Date(value).toLocaleDateString();
+    }),
+    transformSwitch: jest.fn((value) => value ? '是' : '否'),
+    transformMoney: jest.fn((value) => `¥${value || 0}`),
+    transformPercent: jest.fn((value) => `${(value || 0) * 100}%`),
+  },
+  validate: {
+    isEmail: jest.fn((email) => /\S+@\S+\.\S+/.test(email)),
+    isPhone: jest.fn((phone) => /^1[3-9]\d{9}$/.test(phone)),
+    isIdCard: jest.fn(() => true),
+  },
+  validateNameMap: {
+    email: 'isEmail',
+    phone: 'isPhone',
+    idCard: 'isIdCard',
+  },
+};