@zat-design/sisyphus-react 3.4.5-beta.4 → 3.4.5-beta.6

package/dist/index.esm.css

@@ -686,7 +686,10 @@
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
-  display: block !important;
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
   margin-bottom: 16px;

package/dist/less.esm.css

@@ -686,7 +686,10 @@
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {
-  display: block !important;
+  display: -webkit-box !important;
+  display: -webkit-flex !important;
+  display: -ms-flexbox !important;
+  display: flex !important;
 }
 .pro-collapse.ant-collapse .pro-collapse-panel {
   margin-bottom: 16px;

package/es/ProForm/components/combination/ProCascader/index.js

@@ -32,7 +32,6 @@ var filterDataSource = function filterDataSource(dataSource, level) {
 var getViewLabel = function getViewLabel(_ref) {
   var dataSource = _ref.dataSource,
     value = _ref.value;
-  // const cascaderValue = hasDetail ? value?.slice(0, level) : value;
   var viewLabel = [];
   // 根据dataSource得到label数组，查看模式展示需要
   value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
@@ -94,16 +93,13 @@ var ProCascader = function ProCascader(props) {
     _ref5$ = _ref5[0],
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
-    console.log(enumDataSource);
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
-  }, [addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+    return isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa,
-    _useRequest$parentKey = _useRequest.parentKey,
-    parentKey = _useRequest$parentKey === void 0 ? 'parentCode' : _useRequest$parentKey;
+    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     serviceData = _useState2[0],
@@ -132,7 +128,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -156,19 +152,19 @@ var ProCascader = function ProCascader(props) {
       if (service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
-          value: hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
       } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
-          value: hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
       }
     }
   }, [realIsView, value, realDataSource, serviceData]);
   var handleChange = function handleChange(changeValue, selectedOptions) {
     if (onChange) {
-      if (hasDetail && detail) {
+      if (isAddressMode && hasDetail && detail) {
         // 有详情地址
         var realValue = changeValue || [];
         realValue[realLevel] = detail;

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -341,7 +341,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 16:
             _context2.prev = 16;
             _context2.t0 = _context2["catch"](0);
-            console.log('error', _context2.t0);
+            console.warn('error', _context2.t0);
           case 19:
           case "end":
             return _context2.stop();
@@ -670,9 +670,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      onClick: function onClick() {
-        // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+      onFocus: function onFocus() {
+        if (useRequest) {
           var _useRequest$options9;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {

package/es/ProIcon/index.js

@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useExternal } from 'ahooks';
 import classNames from 'classnames';
@@ -45,6 +45,7 @@ var ProIcon = function ProIcon(props) {
     mapList = _config$mapList === void 0 ? [] : _config$mapList,
     src = _config.src,
     actionMap = _config.actionMap,
+    tooltip = _config.tooltip,
     reset = _objectWithoutProperties(_config, _excluded);
   // 主题色
   var _ref = antdTheme !== null && antdTheme !== void 0 ? antdTheme : {},
@@ -76,7 +77,7 @@ var ProIcon = function ProIcon(props) {
   var _type = type;
   var _text = children;
   // svg图标对应文本
-  var iconText = '';
+  var iconText = tooltip || '';
   var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
   // 模式为icon下，对传入的text进行指定语言-icon 映射
   if (isIconMode && !type) {
@@ -141,13 +142,16 @@ var ProIcon = function ProIcon(props) {
   var _RenderIcon = useMemo(function () {
     return RenderIcon;
   }, [primaryColor]);
-  return !isExtendButtonMode ? _RenderIcon : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
-    type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
-    className: proIconClassNames,
-    disabled: disabled,
-    icon: isIconMode ? RenderIcon : null
-  }, reset), buttonProps), {}, {
-    children: _text
-  }));
+  return !isExtendButtonMode ? _RenderIcon : _jsx(_Tooltip, {
+    title: tooltip,
+    children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
+      type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
+      className: proIconClassNames,
+      disabled: disabled,
+      icon: isIconMode ? RenderIcon : null
+    }, reset), buttonProps), {}, {
+      children: _text
+    }))
+  });
 };
 export default ProIcon;

package/es/ProIcon/propsTypes.d.ts

@@ -54,6 +54,11 @@ export interface ProIconProps {
      * @default           false
      */
     disabled?: boolean;
+    /**
+     * @description      提示
+     * @default           -
+     */
+    tooltip?: string | React.ReactNode;
     /**
      * @description      是否跟随主题色
      * @default           false

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -16,7 +16,7 @@
     }
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
-        display: block !important;
+        display: flex !important;
       }
     }
   }

package/es/ProSelect/index.js

@@ -239,7 +239,7 @@ export var ProSelect = function ProSelect(props, ref) {
       if (!isObject(value)) {
         return undefined;
       }
-      return value === null || value === void 0 ? void 0 : value[code];
+      return (value === null || value === void 0 ? void 0 : value[code]) || (value === null || value === void 0 ? void 0 : value.value);
     }
     if (labelInValue && selectProps.mode) {
       // 对传入的值做一些基础判断

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -32,7 +32,6 @@ var filterDataSource = function filterDataSource(dataSource, level) {
 var getViewLabel = function getViewLabel(_ref) {
   var dataSource = _ref.dataSource,
     value = _ref.value;
-  // const cascaderValue = hasDetail ? value?.slice(0, level) : value;
   var viewLabel = [];
   // 根据dataSource得到label数组，查看模式展示需要
   value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
@@ -94,16 +93,13 @@ var ProCascader = function ProCascader(props) {
     _ref5$ = _ref5[0],
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
-    console.log(enumDataSource);
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
-  }, [addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+    return isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread2.default)({}, useRequest),
     service = _useRequest.service,
     _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa,
-    _useRequest$parentKey = _useRequest.parentKey,
-    parentKey = _useRequest$parentKey === void 0 ? 'parentCode' : _useRequest$parentKey;
+    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     serviceData = _useState2[0],
@@ -132,7 +128,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -156,19 +152,19 @@ var ProCascader = function ProCascader(props) {
       if (service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
-          value: hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
       } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
-          value: hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
       }
     }
   }, [realIsView, value, realDataSource, serviceData]);
   var handleChange = function handleChange(changeValue, selectedOptions) {
     if (onChange) {
-      if (hasDetail && detail) {
+      if (isAddressMode && hasDetail && detail) {
         // 有详情地址
         var realValue = changeValue || [];
         realValue[realLevel] = detail;

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -338,7 +338,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 16:
             _context2.prev = 16;
             _context2.t0 = _context2["catch"](0);
-            console.log('error', _context2.t0);
+            console.warn('error', _context2.t0);
           case 19:
           case "end":
             return _context2.stop();
@@ -667,9 +667,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      onClick: function onClick() {
-        // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+      onFocus: function onFocus() {
+        if (useRequest) {
           var _useRequest$options9;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {

package/lib/ProIcon/index.js

@@ -18,7 +18,7 @@ var _ProConfigProvider = require("../ProConfigProvider");
 var _config2 = require("./config");
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
 var ProIcon = function ProIcon(props) {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     state = _useProConfig.state;
@@ -49,6 +49,7 @@ var ProIcon = function ProIcon(props) {
     mapList = _config$mapList === void 0 ? [] : _config$mapList,
     src = _config.src,
     actionMap = _config.actionMap,
+    tooltip = _config.tooltip,
     reset = (0, _objectWithoutProperties2.default)(_config, _excluded);
   // 主题色
   var _ref = antdTheme !== null && antdTheme !== void 0 ? antdTheme : {},
@@ -80,7 +81,7 @@ var ProIcon = function ProIcon(props) {
   var _type = type;
   var _text = children;
   // svg图标对应文本
-  var iconText = '';
+  var iconText = tooltip || '';
   var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
   // 模式为icon下，对传入的text进行指定语言-icon 映射
   if (isIconMode && !type) {
@@ -145,13 +146,16 @@ var ProIcon = function ProIcon(props) {
   var _RenderIcon = (0, _react.useMemo)(function () {
     return RenderIcon;
   }, [primaryColor]);
-  return !isExtendButtonMode ? _RenderIcon : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
-    className: proIconClassNames,
-    disabled: disabled,
-    icon: isIconMode ? RenderIcon : null
-  }, reset), buttonProps), {}, {
-    children: _text
-  }));
+  return !isExtendButtonMode ? _RenderIcon : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    title: tooltip,
+    children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+      type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
+      className: proIconClassNames,
+      disabled: disabled,
+      icon: isIconMode ? RenderIcon : null
+    }, reset), buttonProps), {}, {
+      children: _text
+    }))
+  });
 };
 var _default = exports.default = ProIcon;

package/lib/ProIcon/propsTypes.d.ts

@@ -54,6 +54,11 @@ export interface ProIconProps {
      * @default           false
      */
     disabled?: boolean;
+    /**
+     * @description      提示
+     * @default           -
+     */
+    tooltip?: string | React.ReactNode;
     /**
      * @description      是否跟随主题色
      * @default           false

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -16,7 +16,7 @@
     }
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
-        display: block !important;
+        display: flex !important;
       }
     }
   }

package/lib/ProSelect/index.js

@@ -240,7 +240,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       if (!(0, _lodash.isObject)(value)) {
         return undefined;
       }
-      return value === null || value === void 0 ? void 0 : value[code];
+      return (value === null || value === void 0 ? void 0 : value[code]) || (value === null || value === void 0 ? void 0 : value.value);
     }
     if (labelInValue && selectProps.mode) {
       // 对传入的值做一些基础判断

package/package.json

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