npm - @zat-design/sisyphus-react - Versions diffs - 3.6.0-beta.12 → 3.6.0-beta.14 - Mend

@zat-design/sisyphus-react 3.6.0-beta.12 → 3.6.0-beta.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

package/dist/index.esm.css CHANGED Viewed

@@ -2141,12 +2141,6 @@
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
   text-align: right;
 }
-.ant-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.ant-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;
 }

package/dist/less.esm.css CHANGED Viewed

@@ -2141,12 +2141,6 @@
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
   text-align: right;
 }
-.ant-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.ant-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;
 }

package/es/ProConfigProvider/index.d.ts CHANGED Viewed

@@ -29,5 +29,6 @@ interface Actions {
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
+    onSuccess?: (data: any, params: any) => void;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js CHANGED Viewed

@@ -75,7 +75,7 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  var enumRes = useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
   useEffect(function () {
     // 本地配置取出
     var localConfigStr = localStorage.getItem('localConfig');
@@ -93,6 +93,11 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     // 设置默认语言
     setLanguage(props === null || props === void 0 ? void 0 : props.locale);
   }
+  useEffect(function () {
+    if (enumRes === null || enumRes === void 0 ? void 0 : enumRes.data) {
+      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
+    }
+  }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
   return _jsx(ProConfigContext.Provider, {
     value: {
       state: merge(state, props.value),

package/es/ProEnum/hooks/useEnumRequest.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import { ProEnumConfig } from '../propsType';
 import '../utils/eventCenter';
-declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => void;
+declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
 export default useEnumRequest;

package/es/ProEnum/hooks/useEnumRequest.js CHANGED Viewed

@@ -45,120 +45,119 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       console.info('proEnum：', msg);
     }
   };
-  var _useRequestFunc = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
-      manual: true,
-      cacheKey: cacheKey,
-      cacheTime: -1,
-      staleTime: 6e4 * 60
-    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
-      setCache: function () {
-        var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                response = res.data;
-                if (!(transformResponse && typeof transformResponse === 'function')) {
-                  _context.next = 10;
-                  break;
-                }
-                _context.next = 4;
-                return transformResponse(res.data);
-              case 4:
-                response = _context.sent;
-                if (!(_typeof(response) !== 'object' || response == null)) {
-                  _context.next = 9;
-                  break;
-                }
-                throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-              case 9:
-                res.data = response;
-              case 10:
-                if (!(_typeof(response) !== 'object' || response === null)) {
-                  _context.next = 12;
-                  break;
-                }
-                throw Error('response enum data must be object');
-              case 12:
-                if (!(Object.keys(response).length === 0)) {
-                  _context.next = 14;
-                  break;
-                }
-                throw Error('Please return valid enumeration data');
-              case 14:
-                // 只返回fieldNames对象的key
-                if (clear) {
-                  // 忽略清洗的 codes
-                  ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
-                  Object.keys(response).forEach(function (key) {
-                    var options = _toConsumableArray(response[key]) || [];
-                    if (ignoreCodes.includes(key)) {
-                      response[key] = options;
-                    } else {
-                      response[key] = options.map(function (item) {
-                        return cacheFieldNames(fieldNames, item);
-                      });
-                    }
-                  });
-                  res.data = response;
-                }
-                cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
-                  data: {}
-                }; // 合并缓存数据
-                res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
-                setEnumData(storage, cacheKey, res);
-                // 同步数据到全局
-                dispatch({
-                  type: 'setProEnumDic',
-                  payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+  var enumRes = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    cacheKey: cacheKey,
+    cacheTime: -1,
+    staleTime: 6e4 * 60
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    setCache: function () {
+      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+        var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              response = res.data;
+              if (!(transformResponse && typeof transformResponse === 'function')) {
+                _context.next = 10;
+                break;
+              }
+              _context.next = 4;
+              return transformResponse(res.data);
+            case 4:
+              response = _context.sent;
+              if (!(_typeof(response) !== 'object' || response == null)) {
+                _context.next = 9;
+                break;
+              }
+              throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+            case 9:
+              res.data = response;
+            case 10:
+              if (!(_typeof(response) !== 'object' || response === null)) {
+                _context.next = 12;
+                break;
+              }
+              throw Error('response enum data must be object');
+            case 12:
+              if (!(Object.keys(response).length === 0)) {
+                _context.next = 14;
+                break;
+              }
+              throw Error('Please return valid enumeration data');
+            case 14:
+              // 只返回fieldNames对象的key
+              if (clear) {
+                // 忽略清洗的 codes
+                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                Object.keys(response).forEach(function (key) {
+                  var options = _toConsumableArray(response[key]) || [];
+                  if (ignoreCodes.includes(key)) {
+                    response[key] = options;
+                  } else {
+                    response[key] = options.map(function (item) {
+                      return cacheFieldNames(fieldNames, item);
+                    });
+                  }
                 });
-                if (main) {
-                  setTimeout(function () {
-                    var _locale$ProEnum3;
-                    window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
-                  }, 10000);
-                }
-                return _context.abrupt("return", res);
-              case 21:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function setCache(_x) {
-          return _setCache.apply(this, arguments);
-        }
-        return setCache;
-      }(),
-      getCache: function getCache() {
-        var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
-          data: {}
-        };
-        dispatch({
-          type: 'setProEnumDic',
-          payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
-        });
-        if (main) {
-          setTimeout(function () {
-            var _locale$ProEnum4;
-            window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
-          }, 10000);
-        }
-        return res;
-      },
-      onSuccess: function onSuccess(res) {
-        var _res$status = res.status,
-          status = _res$status === void 0 ? 200 : _res$status,
-          msg = res.message;
-        if (status !== 200) {
-          var _locale$ProEnum5;
-          throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
-        }
+                res.data = response;
+              }
+              cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
+                data: {}
+              }; // 合并缓存数据
+              res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
+              setEnumData(storage, cacheKey, res);
+              // 同步数据到全局
+              dispatch({
+                type: 'setProEnumDic',
+                payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res.data)
+              });
+              if (main) {
+                setTimeout(function () {
+                  var _locale$ProEnum3;
+                  window.eventCenter.publish('zat-design-pro-component-event', res.data);
+                  logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                }, 10000);
+              }
+              return _context.abrupt("return", res);
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function setCache(_x) {
+        return _setCache.apply(this, arguments);
       }
-    })),
-    run = _useRequestFunc.run;
+      return setCache;
+    }(),
+    getCache: function getCache() {
+      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
+        data: {}
+      };
+      dispatch({
+        type: 'setProEnumDic',
+        payload: _objectSpread(_objectSpread(_objectSpread({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+      });
+      if (main) {
+        setTimeout(function () {
+          var _locale$ProEnum4;
+          window.eventCenter.publish('zat-design-pro-component-event', res.data);
+          logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+        }, 10000);
+      }
+      return res;
+    },
+    onSuccess: function onSuccess(res) {
+      var _res$status = res.status,
+        status = _res$status === void 0 ? 200 : _res$status,
+        msg = res.message;
+      if (status !== 200) {
+        var _locale$ProEnum5;
+        throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+      }
+    }
+  }));
   var mergeData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
@@ -258,7 +257,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
       }
-      run(defaultParams);
+      enumRes.run(defaultParams);
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -304,5 +303,6 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
     };
   }, []);
+  return enumRes;
 };
 export default useEnumRequest;

package/es/ProTooltip/style/index.less CHANGED Viewed

@@ -1,14 +1,6 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
-.@{ant-prefix}-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.@{ant-prefix}-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;

package/lib/ProConfigProvider/index.d.ts CHANGED Viewed

@@ -29,5 +29,6 @@ interface Actions {
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
+    onSuccess?: (data: any, params: any) => void;
 }>;
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js CHANGED Viewed

@@ -84,7 +84,7 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
-  (0, _useEnumRequest.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  var enumRes = (0, _useEnumRequest.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
   (0, _react.useEffect)(function () {
     // 本地配置取出
     var localConfigStr = localStorage.getItem('localConfig');
@@ -102,6 +102,11 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     // 设置默认语言
     (0, _locale.setLanguage)(props === null || props === void 0 ? void 0 : props.locale);
   }
+  (0, _react.useEffect)(function () {
+    if (enumRes === null || enumRes === void 0 ? void 0 : enumRes.data) {
+      (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
+    }
+  }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
   return (0, _jsxRuntime.jsx)(ProConfigContext.Provider, {
     value: {
       state: (0, _merge.default)(state, props.value),

package/lib/ProEnum/hooks/useEnumRequest.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import { ProEnumConfig } from '../propsType';
 import '../utils/eventCenter';
-declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => void;
+declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
 export default useEnumRequest;

package/lib/ProEnum/hooks/useEnumRequest.js CHANGED Viewed

@@ -52,120 +52,119 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       console.info('proEnum：', msg);
     }
   };
-  var _useRequestFunc = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      manual: true,
-      cacheKey: cacheKey,
-      cacheTime: -1,
-      staleTime: 6e4 * 60
-    }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
-      setCache: function () {
-        var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
-          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
-          return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                response = res.data;
-                if (!(transformResponse && typeof transformResponse === 'function')) {
-                  _context.next = 10;
-                  break;
-                }
-                _context.next = 4;
-                return transformResponse(res.data);
-              case 4:
-                response = _context.sent;
-                if (!((0, _typeof2.default)(response) !== 'object' || response == null)) {
-                  _context.next = 9;
-                  break;
-                }
-                throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
-              case 9:
-                res.data = response;
-              case 10:
-                if (!((0, _typeof2.default)(response) !== 'object' || response === null)) {
-                  _context.next = 12;
-                  break;
-                }
-                throw Error('response enum data must be object');
-              case 12:
-                if (!(Object.keys(response).length === 0)) {
-                  _context.next = 14;
-                  break;
-                }
-                throw Error('Please return valid enumeration data');
-              case 14:
-                // 只返回fieldNames对象的key
-                if (clear) {
-                  // 忽略清洗的 codes
-                  ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
-                  Object.keys(response).forEach(function (key) {
-                    var options = (0, _toConsumableArray2.default)(response[key]) || [];
-                    if (ignoreCodes.includes(key)) {
-                      response[key] = options;
-                    } else {
-                      response[key] = options.map(function (item) {
-                        return (0, _utils.cacheFieldNames)(fieldNames, item);
-                      });
-                    }
-                  });
-                  res.data = response;
-                }
-                cacheData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
-                  data: {}
-                }; // 合并缓存数据
-                res.data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
-                (0, _utils.setEnumData)(storage, cacheKey, res);
-                // 同步数据到全局
-                dispatch({
-                  type: 'setProEnumDic',
-                  payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), res.data)
+  var enumRes = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    manual: true,
+    cacheKey: cacheKey,
+    cacheTime: -1,
+    staleTime: 6e4 * 60
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    setCache: function () {
+      var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
+        var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
+        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              response = res.data;
+              if (!(transformResponse && typeof transformResponse === 'function')) {
+                _context.next = 10;
+                break;
+              }
+              _context.next = 4;
+              return transformResponse(res.data);
+            case 4:
+              response = _context.sent;
+              if (!((0, _typeof2.default)(response) !== 'object' || response == null)) {
+                _context.next = 9;
+                break;
+              }
+              throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+            case 9:
+              res.data = response;
+            case 10:
+              if (!((0, _typeof2.default)(response) !== 'object' || response === null)) {
+                _context.next = 12;
+                break;
+              }
+              throw Error('response enum data must be object');
+            case 12:
+              if (!(Object.keys(response).length === 0)) {
+                _context.next = 14;
+                break;
+              }
+              throw Error('Please return valid enumeration data');
+            case 14:
+              // 只返回fieldNames对象的key
+              if (clear) {
+                // 忽略清洗的 codes
+                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                Object.keys(response).forEach(function (key) {
+                  var options = (0, _toConsumableArray2.default)(response[key]) || [];
+                  if (ignoreCodes.includes(key)) {
+                    response[key] = options;
+                  } else {
+                    response[key] = options.map(function (item) {
+                      return (0, _utils.cacheFieldNames)(fieldNames, item);
+                    });
+                  }
                 });
-                if (main) {
-                  setTimeout(function () {
-                    var _locale$ProEnum3;
-                    window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
-                  }, 10000);
-                }
-                return _context.abrupt("return", res);
-              case 21:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function setCache(_x) {
-          return _setCache.apply(this, arguments);
-        }
-        return setCache;
-      }(),
-      getCache: function getCache() {
-        var res = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
-          data: {}
-        };
-        dispatch({
-          type: 'setProEnumDic',
-          payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
-        });
-        if (main) {
-          setTimeout(function () {
-            var _locale$ProEnum4;
-            window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
-          }, 10000);
-        }
-        return res;
-      },
-      onSuccess: function onSuccess(res) {
-        var _res$status = res.status,
-          status = _res$status === void 0 ? 200 : _res$status,
-          msg = res.message;
-        if (status !== 200) {
-          var _locale$ProEnum5;
-          throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum5 = _locale.default.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
-        }
+                res.data = response;
+              }
+              cacheData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
+                data: {}
+              }; // 合并缓存数据
+              res.data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
+              (0, _utils.setEnumData)(storage, cacheKey, res);
+              // 同步数据到全局
+              dispatch({
+                type: 'setProEnumDic',
+                payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), res.data)
+              });
+              if (main) {
+                setTimeout(function () {
+                  var _locale$ProEnum3;
+                  window.eventCenter.publish('zat-design-pro-component-event', res.data);
+                  logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                }, 10000);
+              }
+              return _context.abrupt("return", res);
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function setCache(_x) {
+        return _setCache.apply(this, arguments);
       }
-    })),
-    run = _useRequestFunc.run;
+      return setCache;
+    }(),
+    getCache: function getCache() {
+      var res = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
+        data: {}
+      };
+      dispatch({
+        type: 'setProEnumDic',
+        payload: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, dics), dataSource), res === null || res === void 0 ? void 0 : res.data)
+      });
+      if (main) {
+        setTimeout(function () {
+          var _locale$ProEnum4;
+          window.eventCenter.publish('zat-design-pro-component-event', res.data);
+          logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+        }, 10000);
+      }
+      return res;
+    },
+    onSuccess: function onSuccess(res) {
+      var _res$status = res.status,
+        status = _res$status === void 0 ? 200 : _res$status,
+        msg = res.message;
+      if (status !== 200) {
+        var _locale$ProEnum5;
+        throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum5 = _locale.default.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+      }
+    }
+  }));
   var mergeData = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
@@ -265,7 +264,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
       }
-      run(defaultParams);
+      enumRes.run(defaultParams);
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -311,5 +310,6 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);
     };
   }, []);
+  return enumRes;
 };
 var _default = exports.default = useEnumRequest;

package/lib/ProTooltip/style/index.less CHANGED Viewed

@@ -1,14 +1,6 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
-.@{ant-prefix}-table-cell-fix-right {
-  z-index: 999 !important;
-}
-.@{ant-prefix}-table-cell-fix-left {
-  z-index: 999 !important;
-}
 .pro-tooltip {
   cursor: pointer;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.0-beta.12",
+  "version": "3.6.0-beta.14",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",