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

package/es/ProTable/hooks/useAntdTable.js

@@ -24,6 +24,9 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var previousSearchValues = null;
+export var SELECTION_ALL = 'SELECTION_ALL';
+export var CURRENT_PAGE = 'CURRENT_PAGE';
+export var UNCHECK_ALL = 'UNCHECK_ALL';
 function useAntdTable(service, options, useRequestOptions) {
   var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params, _form$getFieldsValue3;
   var _useSetState = useSetState({
@@ -341,6 +344,93 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
+
+  // 内置选择下拉
+  var defaultSelections = [{
+    key: 'currentPage',
+    text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.selectCurPage, {
+      total: (data === null || data === void 0 ? void 0 : data.length) || 0
+    }),
+    onSelect: function onSelect(changeableRowKeys) {
+      setState({
+        allSelected: false,
+        selectedRecords: _toConsumableArray(data),
+        selectedRowKeys: changeableRowKeys
+      });
+    }
+  }, {
+    key: 'all',
+    text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
+      total: total
+    }),
+    onSelect: function () {
+      var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              setState({
+                allSelected: true,
+                selectedRecords: _toConsumableArray(data),
+                selectedRowKeys: changeableRowKeys
+              });
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function onSelect(_x) {
+        return _onSelect.apply(this, arguments);
+      }
+      return onSelect;
+    }()
+  }, {
+    key: 'uncheckAll',
+    text: locale === null || locale === void 0 || (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
+    onSelect: function () {
+      var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              setState({
+                allSelected: false,
+                selectedRecords: [],
+                selectedRowKeys: []
+              });
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function onSelect() {
+        return _onSelect2.apply(this, arguments);
+      }
+      return onSelect;
+    }()
+  }];
+  var selections = useMemo(function () {
+    if (rowSelections === true) {
+      return defaultSelections;
+    }
+    if (Array.isArray(rowSelections)) {
+      return rowSelections.map(function (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]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -363,7 +453,7 @@ function useAntdTable(service, options, useRequestOptions) {
         }, {});
         setState({
           selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(function (item) {
-            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[item];
+            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)];
           }),
           selectedRowKeys: newSelectedKeys
         });
@@ -388,69 +478,7 @@ function useAntdTable(service, options, useRequestOptions) {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
     },
-    selections: rowSelections ? [{
-      key: 'currentPage',
-      text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.selectCurPage, {
-        total: (data === null || data === void 0 ? void 0 : data.length) || 0
-      }),
-      onSelect: function onSelect(changeableRowKeys) {
-        setState({
-          allSelected: false,
-          selectedRecords: _toConsumableArray(data),
-          selectedRowKeys: changeableRowKeys
-        });
-      }
-    }, {
-      key: 'all',
-      text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
-        total: total
-      }),
-      onSelect: function () {
-        var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                setState({
-                  allSelected: true,
-                  selectedRecords: _toConsumableArray(data),
-                  selectedRowKeys: changeableRowKeys
-                });
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }, _callee2);
-        }));
-        function onSelect(_x) {
-          return _onSelect.apply(this, arguments);
-        }
-        return onSelect;
-      }()
-    }, {
-      key: 'uncheckAll',
-      text: locale === null || locale === void 0 || (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
-      onSelect: function () {
-        var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
-              case 0:
-                setState({
-                  allSelected: false,
-                  selectedRecords: [],
-                  selectedRowKeys: []
-                });
-              case 1:
-              case "end":
-                return _context3.stop();
-            }
-          }, _callee3);
-        }));
-        function onSelect() {
-          return _onSelect2.apply(this, arguments);
-        }
-        return onSelect;
-      }()
-    }] : false
+    selections: selections
   };
   var rowSelection = isObject(returnRowSelection) ? merge(_rowSelection, returnRowSelection) : _rowSelection;
   if (isObject(returnRowSelection) && !isEqual(rowSelection, _rowSelection)) {

package/es/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/es/ProTable/index.js

@@ -13,7 +13,7 @@ import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from "../index";
 import { RenderTableHeader, RenderFooter, RenderTabs } from "./components";
-import useAntdTable from "./hooks/useAntdTable";
+import useAntdTable, { SELECTION_ALL, CURRENT_PAGE, UNCHECK_ALL } from "./hooks/useAntdTable";
 import { BaseTable, DraggableTable } from "./components/RcTable";
 import { formatColumn } from "./components/FormatColumn";
 import empty from "../assets/empty.png";
@@ -44,14 +44,19 @@ var ProTable = function ProTable(props) {
   var tableId = props.tableId,
     headerRender = props.headerRender,
     footerRender = props.footerRender,
-    quickConfig = props.quickConfig,
-    stripe = props.stripe,
+    _props$quickConfig = props.quickConfig,
+    quickConfig = _props$quickConfig === void 0 ? false : _props$quickConfig,
+    _props$stripe = props.stripe,
+    stripe = _props$stripe === void 0 ? true : _props$stripe,
     _props$columns = props.columns,
     propsColumns = _props$columns === void 0 ? [] : _props$columns,
     className = props.className,
-    draggable = props.draggable,
-    disabled = props.disabled,
-    isView = props.isView,
+    _props$draggable = props.draggable,
+    draggable = _props$draggable === void 0 ? false : _props$draggable,
+    _props$disabled = props.disabled,
+    disabled = _props$disabled === void 0 ? false : _props$disabled,
+    _props$isView = props.isView,
+    isView = _props$isView === void 0 ? false : _props$isView,
     rowDisabled = props.rowDisabled,
     summary = props.summary,
     _props$emptyText = props.emptyText,
@@ -465,13 +470,8 @@ var ProTable = function ProTable(props) {
     })
   });
 };
-ProTable.defaultProps = {
-  quickConfig: false,
-  // 默认关闭快速配置
-  stripe: true,
-  draggable: false,
-  disabled: false,
-  isView: false
-};
 ProTable.useAntdTable = useAntdTable;
+ProTable.SELECTION_ALL = SELECTION_ALL;
+ProTable.CURRENT_PAGE = CURRENT_PAGE;
+ProTable.UNCHECK_ALL = UNCHECK_ALL;
 export default ProTable;

package/es/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/es/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/es/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/es/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/es/ProThemeTools/index.js

@@ -42,12 +42,17 @@ var defaultThemeConfig = {
   zauiStripe: true
 };
 var ProThemeTools = function ProThemeTools(_ref) {
-  var size = _ref.size,
+  var _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 24 : _ref$size,
     className = _ref.className,
-    cacheTime = _ref.cacheTime,
-    color = _ref.color,
-    mode = _ref.mode,
-    iconFollowTheme = _ref.iconFollowTheme,
+    _ref$cacheTime = _ref.cacheTime,
+    cacheTime = _ref$cacheTime === void 0 ? false : _ref$cacheTime,
+    _ref$color = _ref.color,
+    color = _ref$color === void 0 ? '#343434' : _ref$color,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? 'prd' : _ref$mode,
+    _ref$iconFollowTheme = _ref.iconFollowTheme,
+    iconFollowTheme = _ref$iconFollowTheme === void 0 ? false : _ref$iconFollowTheme,
     _ref$prefixCls = _ref.prefixCls,
     prefixCls = _ref$prefixCls === void 0 ? 'ant' : _ref$prefixCls,
     _ref$tableBorder = _ref.tableBorder,
@@ -242,13 +247,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
     })]
   }));
 };
-ProThemeTools.defaultProps = {
-  size: 24,
-  mode: 'prd',
-  color: '#343434',
-  iconFollowTheme: false,
-  cacheTime: false
-};
 ProThemeTools.setThemes = setThemes;
 export default ProThemeTools;
 

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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/jest.config.js

@@ -1,8 +1,50 @@
-const React = require('react');
-
 module.exports = {
   setupFiles: ['jest-canvas-mock'],
-  globals: {
-    React,
+  setupFilesAfterEnv: ['<rootDir>/tests/setup.ts'],
+  testEnvironment: 'jsdom',
+  testEnvironmentOptions: {
+    url: 'http://localhost',
   },
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+    '^@zat-design/sisyphus-react$': '<rootDir>/src/index.ts',
+    '\\.(css|less|scss)$': 'identity-obj-proxy',
+    '\\.(png|jpg|jpeg|gif|svg)$': '<rootDir>/tests/__mocks__/fileMock.js',
+    '@zat-design/utils': '<rootDir>/tests/__mocks__/zatUtils.js',
+  },
+  collectCoverageFrom: [
+    'src/**/*.{ts,tsx}',
+    '!src/**/*.d.ts',
+    '!src/**/demos/**',
+    '!src/**/test/**',
+    '!src/old/**',
+    '!src/style/**',
+    '!src/**/symbolIcon.js',
+    '!src/index.ts',
+    '!src/tokens.ts',
+    '!src/utils/**',
+    '!src/locale/**',
+  ],
+  testMatch: [
+    '<rootDir>/src/**/__tests__/**/*.{ts,tsx}',
+    '<rootDir>/src/**/*.(test|spec).{ts,tsx}',
+  ],
+  testTimeout: 15000,
+  transform: {
+    '^.+\\.(ts|tsx)$': 'babel-jest',
+    '^.+\\.(js|jsx)$': 'babel-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+  transformIgnorePatterns: [
+    'node_modules/(?!(antd|@ant-design|@pansy|rc-.+|@babel/runtime|@zat-design)/)',
+  ],
+  coverageThreshold: {
+    global: {
+      branches: 80,
+      functions: 80,
+      lines: 80,
+      statements: 80,
+    },
+  },
+  coverageReporters: ['text', 'lcov', 'html'],
 };

package/lib/ProAction/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-action-error-modal {
   .ant-modal-content {

package/lib/ProConfigProvider/index.d.ts

@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 import { FormInstance } from 'antd';
+import 'dayjs/locale/zh-cn';
 import type { PropSelectType } from '../ProSelect/propsType';
 import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';

package/lib/ProConfigProvider/index.js

@@ -39,6 +39,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_zh_CN = __toESM(require("antd/es/locale/zh_CN"));
 var import_en_US = __toESM(require("antd/es/locale/en_US"));
+var import_zh_cn = require("dayjs/locale/zh-cn");
 var import_merge = __toESM(require("lodash/merge"));
 var import_useEnumRequest = __toESM(require("../ProEnum/hooks/useEnumRequest"));
 var import_locale = require("../locale");
@@ -131,9 +132,9 @@ var ProConfigProvider = (props) => {
   }, []);
   const cacheLang = localStorage.getItem("locale");
   const lang = (state == null ? void 0 : state.locale) || cacheLang || (props == null ? void 0 : props.locale);
-  if (!(state == null ? void 0 : state.locale) && !cacheLang && (props == null ? void 0 : props.locale)) {
-    (0, import_locale.setLanguage)(props == null ? void 0 : props.locale);
-  }
+  (0, import_react.useEffect)(() => {
+    (0, import_locale.setLanguage)(lang);
+  }, [lang]);
   (0, import_react.useEffect)(() => {
     if (enumRes == null ? void 0 : enumRes.data) {
       (props == null ? void 0 : props.onSuccess) && (props == null ? void 0 : props.onSuccess(enumRes == null ? void 0 : enumRes.data, enumRes == null ? void 0 : enumRes.params));

package/lib/ProDownload/style/index.less

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

package/lib/ProDrawerForm/index.js

@@ -41,23 +41,27 @@ var import_locale = __toESM(require("../locale"));
 var ProDrawerFormContext = (0, import_react.createContext)(null);
 var useProDrawerFormContext = () => (0, import_react.useContext)(ProDrawerFormContext);
 var ProDrawerForm = (0, import_react.forwardRef)((props, ref) => {
-  var _a2, _b2, _c, _d;
-  let { showType, okText, isView } = props;
+  var _a, _b, _c, _d, _e, _f;
   const {
     open,
-    mode,
-    size,
+    mode = "Drawer",
+    size = "middle",
     disabled,
+    isView,
     form: originalForm,
-    proFormProps,
+    proFormProps = {},
     onCancel,
-    onCloseClean,
-    children
+    onCloseClean = true,
+    children,
+    okText,
+    isConfirmClose = true,
+    maskClosable = false,
+    cancelText = (_b = (_a = import_locale.default) == null ? void 0 : _a.ProDrawerForm) == null ? void 0 : _b.cancel,
+    ...restProps
   } = props;
-  showType = mode || showType;
-  isView = isView || disabled;
-  okText = okText ?? (showType === "Drawer" ? (_b2 = (_a2 = import_locale.default) == null ? void 0 : _a2.ProDrawerForm) == null ? void 0 : _b2.save : (_d = (_c = import_locale.default) == null ? void 0 : _c.ProDrawerForm) == null ? void 0 : _d.confirm);
-  let { width } = props;
+  const nextIsView = isView || disabled;
+  const nextOkText = okText ?? (mode === "Drawer" ? (_d = (_c = import_locale.default) == null ? void 0 : _c.ProDrawerForm) == null ? void 0 : _d.save : (_f = (_e = import_locale.default) == null ? void 0 : _e.ProDrawerForm) == null ? void 0 : _f.confirm);
+  let { width } = restProps;
   if (!width && size) {
     width = (0, import_utils.transformBySize)(size);
   }
@@ -74,32 +78,25 @@ var ProDrawerForm = (0, import_react.forwardRef)((props, ref) => {
     return {
       Drawer: import_components.ProDrawer,
       Modal: import_components.ProModal
-    }[showType];
-  }, [showType]);
+    }[mode];
+  }, [mode]);
   return /* @__PURE__ */ import_react.default.createElement(ProDrawerFormContext.Provider, { value: { source: "ProDrawerForm" } }, open ? /* @__PURE__ */ import_react.default.createElement(
     DrawerModal,
     {
-      ...props,
-      isView,
+      ...restProps,
+      isView: nextIsView,
       open,
       form,
       width,
-      okText,
-      onCancel: handleCancel
+      okText: nextOkText,
+      onCancel: handleCancel,
+      isConfirmClose,
+      maskClosable,
+      cancelText
     },
-    children || /* @__PURE__ */ import_react.default.createElement(import_ProForm.default, { form, disabled: isView, footer: false, ...proFormProps })
+    children || /* @__PURE__ */ import_react.default.createElement(import_ProForm.default, { form, disabled: nextIsView, footer: false, ...proFormProps })
   ) : null);
 });
-var _a, _b;
-ProDrawerForm.defaultProps = {
-  showType: "Drawer",
-  size: "middle",
-  isConfirmClose: true,
-  onCloseClean: true,
-  maskClosable: false,
-  cancelText: (_b = (_a = import_locale.default) == null ? void 0 : _a.ProDrawerForm) == null ? void 0 : _b.cancel,
-  proFormProps: {}
-};
 var ProDrawerForm_default = ProDrawerForm;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/ProDrawerForm/style/index.less

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

package/lib/ProEditLabel/style/index.less

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

package/lib/ProEditTable/components/RcTable/DraggableTable.js

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

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -153,7 +153,8 @@ var ListChangedWrapper = (props) => {
       onDiff,
       originRecord: originalDTO == null ? void 0 : originalDTO.originRecord,
       record: originalDTO == null ? void 0 : originalDTO.record,
-      index
+      index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   const isAdd = diffType === "add";
@@ -170,11 +171,18 @@ var ListChangedWrapper = (props) => {
       }
       _children = viewRender;
     }
+    let processedValue = orgValue;
+    if (type === "ProNumberRange" && Array.isArray(orgValue)) {
+      processedValue = orgValue.map((item) => {
+        const num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
     return import_react.default.isValidElement(children) ? import_react.default.cloneElement(children, {
       ...children,
       // @ts-ignore
       isView: true,
-      [valuePropName]: orgValue,
+      [valuePropName]: processedValue,
       checked: type === "Switch" ? originalValue : void 0
     }) : void 0;
   }, [originalValue, children]);

package/lib/ProEditTable/propsType.d.ts

@@ -7,7 +7,7 @@ import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
-import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
+import type { DiffOriginalParams } from './utils/diffOriginal';
 /**
  * 操作类型定义
  */