@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/es/skeleton/index.js

@@ -1,66 +1,22 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-
-// src/skeleton/index.tsx
-import React from "react";
-import DescriptionsPageSkeleton, {
-  DescriptionsSkeleton,
-  TableItemSkeleton,
-  TableSkeleton
-} from "./components/Descriptions";
-import ListPageSkeleton, {
-  ListSkeleton,
-  ListSkeletonItem,
-  ListToolbarSkeleton,
-  PageHeaderSkeleton
-} from "./components/List";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["type"];
+import React from 'react';
+import DescriptionsPageSkeleton, { DescriptionsSkeleton, TableItemSkeleton, TableSkeleton } from "./components/Descriptions";
+import ListPageSkeleton, { ListSkeleton, ListSkeletonItem, ListToolbarSkeleton, PageHeaderSkeleton } from "./components/List";
 import ResultPageSkeleton from "./components/Result";
-var ProSkeleton = (_a) => {
-  var _b = _a, { type = "list" } = _b, rest = __objRest(_b, ["type"]);
-  if (type === "result") {
-    return /* @__PURE__ */ React.createElement(ResultPageSkeleton, __spreadValues({}, rest));
+import { jsx as _jsx } from "react/jsx-runtime";
+var ProSkeleton = function ProSkeleton(_ref) {
+  var _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'list' : _ref$type,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  if (type === 'result') {
+    return /*#__PURE__*/_jsx(ResultPageSkeleton, _objectSpread({}, rest));
   }
-  if (type === "descriptions") {
-    return /* @__PURE__ */ React.createElement(DescriptionsPageSkeleton, __spreadValues({}, rest));
+  if (type === 'descriptions') {
+    return /*#__PURE__*/_jsx(DescriptionsPageSkeleton, _objectSpread({}, rest));
   }
-  return /* @__PURE__ */ React.createElement(ListPageSkeleton, __spreadValues({}, rest));
-};
-var skeleton_default = ProSkeleton;
-export {
-  DescriptionsSkeleton,
-  ListPageSkeleton,
-  ListSkeleton,
-  ListSkeletonItem,
-  ListToolbarSkeleton,
-  PageHeaderSkeleton,
-  ProSkeleton,
-  TableItemSkeleton,
-  TableSkeleton,
-  skeleton_default as default
+  return /*#__PURE__*/_jsx(ListPageSkeleton, _objectSpread({}, rest));
 };
+export { DescriptionsSkeleton, ListPageSkeleton, ListSkeleton, ListSkeletonItem, ListToolbarSkeleton, PageHeaderSkeleton, ProSkeleton, TableItemSkeleton, TableSkeleton };
+export default ProSkeleton;

package/es/table/Store/Provide.d.ts

@@ -13,7 +13,6 @@ export type ColumnsState = {
 };
 export type ProTableColumn<T> = ColumnsState & TableColumnType<T>;
 export type UseContainerProps<T = any> = {
-    columnsStateMap?: Record<string, ColumnsState>;
     onColumnsStateChange?: (map: Record<string, ColumnsState>) => void;
     size?: DensitySize;
     defaultSize?: DensitySize;

package/es/table/Store/Provide.js

@@ -1,63 +1,74 @@
-// src/table/Store/Provide.tsx
-import merge from "lodash-es/merge";
-import useMergedState from "rc-util/lib/hooks/useMergedState";
-import { noteOnce } from "rc-util/lib/warning";
-import {
-  createContext,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState
-} from "react";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useMergedState } from '@rc-component/util';
+import merge from 'lodash-es/merge';
+import { createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { genColumnKey } from "../utils";
-function useContainer(props = {}) {
-  var _a, _b, _c, _d, _e, _f;
-  const actionRef = useRef();
-  const rootDomRef = useRef(null);
-  const prefixNameRef = useRef();
-  const propsRef = useRef();
-  const [keyWords, setKeyWords] = useState("");
-  const sortKeyColumns = useRef([]);
-  const [tableSize, setTableSize] = useMergedState(
-    () => props.size || props.defaultSize || "middle",
-    {
+import { jsx as _jsx } from "react/jsx-runtime";
+function useContainer() {
+  var _props$columnsState6, _props$columnsState7, _props$columnsState10, _props$columnsState11, _props$columnsState15, _props$columnsState16;
+  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var actionRef = useRef();
+  var rootDomRef = useRef(null);
+  /** 父 form item 的 name */
+  var prefixNameRef = useRef();
+
+  /** 自己 props 的引用 */
+  var propsRef = useRef();
+
+  // 共享状态比较难，就放到这里了
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    keyWords = _useState2[0],
+    _setKeyWords = _useState2[1];
+  // 用于排序的数组
+  var sortKeyColumns = useRef([]);
+  var _useMergedState = useMergedState(function () {
+      return props.size || props.defaultSize || 'middle';
+    }, {
       value: props.size,
       onChange: props.onSizeChange
-    }
-  );
-  const defaultColumnKeyMap = useMemo(() => {
-    var _a2, _b2;
-    if ((_a2 = props == null ? void 0 : props.columnsState) == null ? void 0 : _a2.defaultValue)
-      return props.columnsState.defaultValue;
-    const columnKeyMap = {};
-    (_b2 = props.columns) == null ? void 0 : _b2.forEach(({ key, dataIndex, fixed, disable }, index) => {
-      const columnKey = genColumnKey(key != null ? key : dataIndex, index);
+    }),
+    _useMergedState2 = _slicedToArray(_useMergedState, 2),
+    tableSize = _useMergedState2[0],
+    setTableSize = _useMergedState2[1];
+
+  /** 默认全选中 */
+  var defaultColumnKeyMap = useMemo(function () {
+    var _props$columnsState, _props$columns;
+    if (props !== null && props !== void 0 && (_props$columnsState = props.columnsState) !== null && _props$columnsState !== void 0 && _props$columnsState.defaultValue) return props.columnsState.defaultValue;
+    var columnKeyMap = {};
+    (_props$columns = props.columns) === null || _props$columns === void 0 || _props$columns.forEach(function (_ref, index) {
+      var key = _ref.key,
+        dataIndex = _ref.dataIndex,
+        fixed = _ref.fixed,
+        disable = _ref.disable;
+      var columnKey = genColumnKey(key !== null && key !== void 0 ? key : dataIndex, index);
       if (columnKey) {
         columnKeyMap[columnKey] = {
           show: true,
-          fixed,
-          disable
+          fixed: fixed,
+          disable: disable
         };
       }
     });
     return columnKeyMap;
   }, [props.columns]);
-  const [columnsMap, setColumnsMap] = useMergedState(
-    () => {
-      var _a2, _b2, _c2, _d2;
-      const { persistenceType, persistenceKey } = props.columnsState || {};
-      if (persistenceKey && persistenceType && typeof window !== "undefined") {
-        const storage = window[persistenceType];
+  var _useMergedState3 = useMergedState(function () {
+      var _props$columnsState4, _props$columnsState5;
+      var _ref2 = props.columnsState || {},
+        persistenceType = _ref2.persistenceType,
+        persistenceKey = _ref2.persistenceKey;
+      if (persistenceKey && persistenceType && typeof window !== 'undefined') {
+        /** 从持久化中读取数据 */
+        var storage = window[persistenceType];
         try {
-          const storageValue = storage == null ? void 0 : storage.getItem(persistenceKey);
+          var storageValue = storage === null || storage === void 0 ? void 0 : storage.getItem(persistenceKey);
           if (storageValue) {
-            if ((_a2 = props == null ? void 0 : props.columnsState) == null ? void 0 : _a2.defaultValue) {
-              return merge(
-                {},
-                (_b2 = props == null ? void 0 : props.columnsState) == null ? void 0 : _b2.defaultValue,
-                JSON.parse(storageValue)
-              );
+            var _props$columnsState2;
+            if (props !== null && props !== void 0 && (_props$columnsState2 = props.columnsState) !== null && _props$columnsState2 !== void 0 && _props$columnsState2.defaultValue) {
+              var _props$columnsState3;
+              // 实际生产中，defaultValue往往作为系统方默认配置，则优先级不应高于用户配置的storageValue
+              return merge({}, props === null || props === void 0 || (_props$columnsState3 = props.columnsState) === null || _props$columnsState3 === void 0 ? void 0 : _props$columnsState3.defaultValue, JSON.parse(storageValue));
             }
             return JSON.parse(storageValue);
           }
@@ -65,29 +76,30 @@ function useContainer(props = {}) {
           console.warn(error);
         }
       }
-      return props.columnsStateMap || ((_c2 = props.columnsState) == null ? void 0 : _c2.value) || ((_d2 = props.columnsState) == null ? void 0 : _d2.defaultValue) || defaultColumnKeyMap;
-    },
-    {
-      value: ((_a = props.columnsState) == null ? void 0 : _a.value) || props.columnsStateMap,
-      onChange: ((_b = props.columnsState) == null ? void 0 : _b.onChange) || props.onColumnsStateChange
-    }
-  );
-  useEffect(() => {
-    var _a2, _b2;
-    const { persistenceType, persistenceKey } = props.columnsState || {};
-    if (persistenceKey && persistenceType && typeof window !== "undefined") {
-      const storage = window[persistenceType];
+      return ((_props$columnsState4 = props.columnsState) === null || _props$columnsState4 === void 0 ? void 0 : _props$columnsState4.value) || ((_props$columnsState5 = props.columnsState) === null || _props$columnsState5 === void 0 ? void 0 : _props$columnsState5.defaultValue) || defaultColumnKeyMap;
+    }, {
+      value: (_props$columnsState6 = props.columnsState) === null || _props$columnsState6 === void 0 ? void 0 : _props$columnsState6.value,
+      onChange: ((_props$columnsState7 = props.columnsState) === null || _props$columnsState7 === void 0 ? void 0 : _props$columnsState7.onChange) || props.onColumnsStateChange
+    }),
+    _useMergedState4 = _slicedToArray(_useMergedState3, 2),
+    columnsMap = _useMergedState4[0],
+    setColumnsMap = _useMergedState4[1];
+
+  /**  配置或列更改时对columnsMap重新赋值 */
+  useEffect(function () {
+    var _ref3 = props.columnsState || {},
+      persistenceType = _ref3.persistenceType,
+      persistenceKey = _ref3.persistenceKey;
+    if (persistenceKey && persistenceType && typeof window !== 'undefined') {
+      /** 从持久化中读取数据 */
+      var storage = window[persistenceType];
       try {
-        const storageValue = storage == null ? void 0 : storage.getItem(persistenceKey);
+        var storageValue = storage === null || storage === void 0 ? void 0 : storage.getItem(persistenceKey);
         if (storageValue) {
-          if ((_a2 = props == null ? void 0 : props.columnsState) == null ? void 0 : _a2.defaultValue) {
-            setColumnsMap(
-              merge(
-                {},
-                (_b2 = props == null ? void 0 : props.columnsState) == null ? void 0 : _b2.defaultValue,
-                JSON.parse(storageValue)
-              )
-            );
+          var _props$columnsState8;
+          if (props !== null && props !== void 0 && (_props$columnsState8 = props.columnsState) !== null && _props$columnsState8 !== void 0 && _props$columnsState8.defaultValue) {
+            var _props$columnsState9;
+            setColumnsMap(merge({}, props === null || props === void 0 || (_props$columnsState9 = props.columnsState) === null || _props$columnsState9 === void 0 ? void 0 : _props$columnsState9.defaultValue, JSON.parse(storageValue)));
           } else {
             setColumnsMap(JSON.parse(storageValue));
           }
@@ -98,92 +110,93 @@ function useContainer(props = {}) {
         console.warn(error);
       }
     }
-  }, [
-    (_c = props.columnsState) == null ? void 0 : _c.persistenceKey,
-    (_d = props.columnsState) == null ? void 0 : _d.persistenceType,
-    defaultColumnKeyMap
-  ]);
-  noteOnce(
-    !props.columnsStateMap,
-    "columnsStateMap已经废弃，请使用 columnsState.value 替换"
-  );
-  noteOnce(
-    !props.columnsStateMap,
-    "columnsStateMap has been discarded, please use columnsState.value replacement"
-  );
-  const clearPersistenceStorage = useCallback(() => {
-    const { persistenceType, persistenceKey } = props.columnsState || {};
-    if (!persistenceKey || !persistenceType || typeof window === "undefined")
-      return;
-    const storage = window[persistenceType];
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [(_props$columnsState10 = props.columnsState) === null || _props$columnsState10 === void 0 ? void 0 : _props$columnsState10.persistenceKey, (_props$columnsState11 = props.columnsState) === null || _props$columnsState11 === void 0 ? void 0 : _props$columnsState11.persistenceType, defaultColumnKeyMap]);
+
+  /** 清空一下当前的 key */
+  var clearPersistenceStorage = useCallback(function () {
+    var _ref4 = props.columnsState || {},
+      persistenceType = _ref4.persistenceType,
+      persistenceKey = _ref4.persistenceKey;
+    if (!persistenceKey || !persistenceType || typeof window === 'undefined') return;
+
+    /** 给持久化中设置数据 */
+    var storage = window[persistenceType];
     try {
-      storage == null ? void 0 : storage.removeItem(persistenceKey);
+      storage === null || storage === void 0 || storage.removeItem(persistenceKey);
     } catch (error) {
       console.warn(error);
     }
   }, [props.columnsState]);
-  useEffect(() => {
-    var _a2, _b2;
-    if (!((_a2 = props.columnsState) == null ? void 0 : _a2.persistenceKey) || !((_b2 = props.columnsState) == null ? void 0 : _b2.persistenceType)) {
+  useEffect(function () {
+    var _props$columnsState12, _props$columnsState13;
+    if (!((_props$columnsState12 = props.columnsState) !== null && _props$columnsState12 !== void 0 && _props$columnsState12.persistenceKey) || !((_props$columnsState13 = props.columnsState) !== null && _props$columnsState13 !== void 0 && _props$columnsState13.persistenceType)) {
       return;
     }
-    if (typeof window === "undefined")
-      return;
-    const { persistenceType, persistenceKey } = props.columnsState;
-    const storage = window[persistenceType];
+    if (typeof window === 'undefined') return;
+    /** 给持久化中设置数据 */
+    var _props$columnsState14 = props.columnsState,
+      persistenceType = _props$columnsState14.persistenceType,
+      persistenceKey = _props$columnsState14.persistenceKey;
+    var storage = window[persistenceType];
     try {
-      storage == null ? void 0 : storage.setItem(persistenceKey, JSON.stringify(columnsMap));
+      storage === null || storage === void 0 || storage.setItem(persistenceKey, JSON.stringify(columnsMap));
     } catch (error) {
       console.warn(error);
       clearPersistenceStorage();
     }
-  }, [
-    (_e = props.columnsState) == null ? void 0 : _e.persistenceKey,
-    columnsMap,
-    (_f = props.columnsState) == null ? void 0 : _f.persistenceType
-  ]);
-  const renderValue = {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [(_props$columnsState15 = props.columnsState) === null || _props$columnsState15 === void 0 ? void 0 : _props$columnsState15.persistenceKey, columnsMap, (_props$columnsState16 = props.columnsState) === null || _props$columnsState16 === void 0 ? void 0 : _props$columnsState16.persistenceType]);
+  var renderValue = {
     action: actionRef.current,
-    setAction: (newAction) => {
+    setAction: function setAction(newAction) {
       actionRef.current = newAction;
     },
     sortKeyColumns: sortKeyColumns.current,
-    setSortKeyColumns: (keys) => {
+    setSortKeyColumns: function setSortKeyColumns(keys) {
       sortKeyColumns.current = keys;
     },
-    propsRef,
-    columnsMap,
-    keyWords,
-    setKeyWords: (k) => setKeyWords(k),
-    setTableSize,
-    tableSize,
+    propsRef: propsRef,
+    columnsMap: columnsMap,
+    keyWords: keyWords,
+    setKeyWords: function setKeyWords(k) {
+      return _setKeyWords(k);
+    },
+    setTableSize: setTableSize,
+    tableSize: tableSize,
     prefixName: prefixNameRef.current,
-    setPrefixName: (name) => {
+    setPrefixName: function setPrefixName(name) {
       prefixNameRef.current = name;
     },
-    setColumnsMap,
+    setColumnsMap: setColumnsMap,
     columns: props.columns,
-    rootDomRef,
-    clearPersistenceStorage,
-    defaultColumnKeyMap
+    rootDomRef: rootDomRef,
+    clearPersistenceStorage: clearPersistenceStorage,
+    defaultColumnKeyMap: defaultColumnKeyMap
   };
-  Object.defineProperty(renderValue, "prefixName", {
-    get: () => prefixNameRef.current
+  Object.defineProperty(renderValue, 'prefixName', {
+    get: function get() {
+      return prefixNameRef.current;
+    }
   });
-  Object.defineProperty(renderValue, "sortKeyColumns", {
-    get: () => sortKeyColumns.current
+  Object.defineProperty(renderValue, 'sortKeyColumns', {
+    get: function get() {
+      return sortKeyColumns.current;
+    }
   });
-  Object.defineProperty(renderValue, "action", {
-    get: () => actionRef.current
+  Object.defineProperty(renderValue, 'action', {
+    get: function get() {
+      return actionRef.current;
+    }
   });
   return renderValue;
 }
-var TableContext = createContext({});
-var Container = (props) => {
-  const value = useContainer(props.initValue);
-  return /* @__PURE__ */ React.createElement(TableContext.Provider, { value }, props.children);
-};
-export {
-  Container,
-  TableContext
+var TableContext = /*#__PURE__*/createContext({});
+var Container = function Container(props) {
+  var value = useContainer(props.initValue);
+  return /*#__PURE__*/_jsx(TableContext.Provider, {
+    value: value,
+    children: props.children
+  });
 };
+export { Container, TableContext };