@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

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

@@ -11,12 +11,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "tooltip"];
-import React, { useEffect, useState, memo, useMemo } from 'react';
+var _excluded = ["getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState, memo, useMemo } from 'react';
 import { useSetState } from 'ahooks';
-import { useProConfig } from 'zat-design-pro-component';
-import { tools } from '@zat-design-pro-component/utils';
-import useEnum from '../../../../ProEnum/useEnum';
+import { tools } from '@zat-design/utils';
+import { useProConfig } from '../../../../ProConfigProvider';
+import useEnum from '../../../../ProEnum/hooks/useEnum';
 var transformDataName = tools.transformDataName;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
@@ -50,7 +51,8 @@ var ProAddressBar = function ProAddressBar(props) {
     configDataSource = _ref.dataSource,
     configDetailMaxLength = _ref.detailMaxLength,
     configFieldNames = _ref.fieldNames,
-    configEnumCode = _ref.enumCode;
+    configEnumCode = _ref.enumCode,
+    configCode = _ref.code;
   // console.count('地址组件渲染次数');
   var getPopupContainer = props.getPopupContainer,
     _props$hasDetail = props.hasDetail,
@@ -76,8 +78,13 @@ var ProAddressBar = function ProAddressBar(props) {
     isView = _props$isView === void 0 ? false : _props$isView,
     _props$enumCode = props.enumCode,
     enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
+    _props$code = props.code,
+    code = _props$code === void 0 ? configCode : _props$code,
     tooltip = props.tooltip,
+    _props$separator = props.separator,
+    separator = _props$separator === void 0 ? '' : _props$separator,
     otherProps = _objectWithoutProperties(props, _excluded);
+  var addressCode = code || enumCode;
   var realIsView = isView || (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$otherProp = otherProps.otherProps) === null || _otherProps$otherProp === void 0 ? void 0 : _otherProps$otherProp.isView);
   var _ref2 = value || [],
     _ref3 = _slicedToArray(_ref2, 2),
@@ -86,15 +93,15 @@ var ProAddressBar = function ProAddressBar(props) {
   var realLevel = Math.max(2, level);
   var county = realLevel === 3 ? value === null || value === void 0 ? void 0 : value[realLevel - 1] : undefined;
   var address = value === null || value === void 0 ? void 0 : value[realLevel];
-  var enumData = useEnum(enumCode);
+  var enumData = useEnum(addressCode);
   var _ref4 = Array.isArray(enumData) ? enumData : [],
     _ref5 = _slicedToArray(_ref4, 1),
     _ref5$ = _ref5[0],
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
-    var innerDataSource = dataSource || (enumCode ? enumDataSource : []);
+    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
-  }, [enumCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  }, [addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _configUseRequest$use = _objectSpread(_objectSpread({}, configUseRequest), useRequest),
     service = _configUseRequest$use.service,
     _configUseRequest$use2 = _configUseRequest$use.defaultParams,
@@ -324,6 +331,11 @@ var ProAddressBar = function ProAddressBar(props) {
       }
     }
   };
+  var handlefilter = function handlefilter(inputValue, path) {
+    return path.some(function (option) {
+      return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
+    });
+  };
   var handleAddressChange = function handleAddressChange(e) {
     if (onChange) {
       if (!e.target.value && !province && !city && !county) {
@@ -349,50 +361,58 @@ var ProAddressBar = function ProAddressBar(props) {
   var addressValue = value && (province || city || county) ? [province, city, county].slice(0, realLevel) : undefined;
   var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
     return !!item;
-  })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join('')) || '-';
-  return /*#__PURE__*/React.createElement("div", {
-    className: "pro-address"
-  }, realIsView ? viewValue : /*#__PURE__*/React.createElement(React.Fragment, null, dataSource || enumCode || !loadData ? /*#__PURE__*/React.createElement(_Cascader, {
-    className: hasDetail ? '' : 'no-detail',
-    placeholder: "\u8BF7\u9009\u62E9",
-    value: addressValue,
-    options: !loadData ? serviceData : realDataSource,
-    disabled: disabled,
-    displayRender: function displayRender(label) {
-      return label === null || label === void 0 ? void 0 : label.filter(function (item) {
-        return !!item;
-      }).join('/');
-    },
-    // @ts-ignore
-    onChange: handleChange
-  }) : /*#__PURE__*/React.createElement(_Cascader, {
-    className: hasDetail ? '' : 'no-detail',
-    placeholder: "\u8BF7\u9009\u62E9",
-    value: addressValue,
-    loadData: handleLoadData,
-    // @ts-ignore
-    options: provinces,
-    disabled: disabled,
-    displayRender: displayRender,
-    changeOnSelect: true,
-    // @ts-ignore
-    onChange: handleChange
-  }), hasDetail && (tooltip && disabled && address ? /*#__PURE__*/React.createElement(_Tooltip, {
-    title: address
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "pro-address-detail"
-  }, /*#__PURE__*/React.createElement(_Input, {
-    disabled: disabled,
-    value: address
-  }))) : /*#__PURE__*/React.createElement(_Input, {
-    allowClear: true,
-    disabled: disabled,
-    value: address,
-    maxLength: detailMaxLength,
-    placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
-    // @ts-ignore
-    onChange: handleAddressChange
-  }))));
+  })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
+  return _jsx("div", {
+    className: "pro-address",
+    children: realIsView ? viewValue : _jsxs(_Fragment, {
+      children: [dataSource || addressCode || !loadData ? _jsx(_Cascader, {
+        className: hasDetail ? '' : 'no-detail',
+        placeholder: "\u8BF7\u9009\u62E9",
+        value: addressValue,
+        options: !loadData ? serviceData : realDataSource,
+        disabled: disabled,
+        displayRender: function displayRender(label) {
+          return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+            return !!item;
+          }).join('/');
+        },
+        showSearch: {
+          filter: handlefilter
+        },
+        onChange: handleChange
+      }) : _jsx(_Cascader, {
+        className: hasDetail ? '' : 'no-detail',
+        placeholder: "\u8BF7\u9009\u62E9",
+        value: addressValue,
+        loadData: handleLoadData,
+        // @ts-ignore
+        options: provinces,
+        disabled: disabled,
+        displayRender: displayRender,
+        changeOnSelect: true,
+        // @ts-ignore
+        onChange: handleChange
+      }), hasDetail && (tooltip && disabled && address ? _jsx(_Tooltip, {
+        title: address,
+        children: _jsx("span", {
+          className: "pro-address-detail",
+          children: _jsx(_Input, {
+            disabled: disabled,
+            value: address
+          })
+        })
+      }) : _jsx(_Input, {
+        allowClear: true,
+        autoComplete: "off",
+        disabled: disabled,
+        value: address,
+        maxLength: detailMaxLength,
+        placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
+        // @ts-ignore
+        onChange: handleAddressChange
+      }))]
+    })
+  });
 };
 // @ts-ignore
 export default /*#__PURE__*/memo(ProAddressBar);

package/es/ProForm/components/combination/ProAddressBar/propsType.d.ts

@@ -24,5 +24,8 @@ export interface AddressProps {
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;
+    code?: string;
     otherProps?: any;
+    /** 查看分隔符 */
+    separator?: string;
 }

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

@@ -7,9 +7,9 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // @ts-nocheck
-import React, { useMemo, useState } from 'react';
-import { cloneDeep } from 'lodash';
+import { useMemo, useState } from 'react';
 import classNames from 'classnames';
 import Container from '../../Container';
 import * as componentMap from '../../index';
@@ -109,7 +109,7 @@ export var ProCombination = function ProCombination(props) {
     if (!values || !Array.isArray(values)) {
       return otherProps.viewEmpty;
     }
-    var childData = cloneDeep(childProps);
+    var childData = childProps;
     if (!childData || Array.isArray(childData) && !childData.length) {
       childData.push({
         renderType: 'Input'
@@ -130,7 +130,7 @@ export var ProCombination = function ProCombination(props) {
     childData.forEach(function (item, index) {
       if (index === 0 && (values === null || values === void 0 ? void 0 : values[0])) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          oneValue = /*#__PURE__*/React.createElement(BeforeCom, _objectSpread(_objectSpread({}, beforeProps), {}, {
+          oneValue = _jsx(BeforeCom, _objectSpread(_objectSpread({}, beforeProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[0],
             otherProps: _objectSpread(_objectSpread({}, beforeOtherProps), {}, {
               isView: isView
@@ -142,7 +142,7 @@ export var ProCombination = function ProCombination(props) {
       }
       if (index === 1 && (values === null || values === void 0 ? void 0 : values[1])) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          twoValue = /*#__PURE__*/React.createElement(AfterCom, _objectSpread(_objectSpread({}, afterProps), {}, {
+          twoValue = _jsx(AfterCom, _objectSpread(_objectSpread({}, afterProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[1],
             otherProps: _objectSpread(_objectSpread({}, afterOtherProps), {}, {
               isView: isView
@@ -153,40 +153,46 @@ export var ProCombination = function ProCombination(props) {
         }
       }
     });
-    return /*#__PURE__*/React.createElement(Container, {
-      viewEmpty: viewEmpty
-    }, /*#__PURE__*/React.createElement(_Space, {
-      size: 8
-    }, !oneValue && !twoValue ? viewEmpty : /*#__PURE__*/React.createElement(React.Fragment, null, oneValue, twoValue)));
+    return _jsx(Container, {
+      viewEmpty: viewEmpty,
+      children: _jsx(_Space, {
+        size: 8,
+        children: !oneValue && !twoValue ? viewEmpty : _jsxs(_Fragment, {
+          children: [oneValue, separator, twoValue]
+        })
+      })
+    });
   }
-  return /*#__PURE__*/React.createElement(_Input.Group, {
+  return _jsxs(_Input.Group, {
     compact: true,
-    className: className
-  }, /*#__PURE__*/React.createElement(BeforeCom, _objectSpread(_objectSpread({
-    disabled: disabled
-  }, beforeProps), {}, {
-    value: values === null || values === void 0 ? void 0 : values[0],
-    onChange: function onChange(value) {
-      for (var _len3 = arguments.length, rest = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-        rest[_key3 - 1] = arguments[_key3];
-      }
-      return handleChange(value, rest, 0);
-    },
-    otherProps: beforeOtherProps
-  })), isView ? separator : separator && /*#__PURE__*/React.createElement(_Button, {
-    disabled: true
-  }, separator), /*#__PURE__*/React.createElement(AfterCom, _objectSpread(_objectSpread({
-    disabled: disabled
-  }, afterProps), {}, {
-    value: values === null || values === void 0 ? void 0 : values[1],
-    onChange: function onChange(value) {
-      for (var _len4 = arguments.length, rest = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-        rest[_key4 - 1] = arguments[_key4];
-      }
-      return handleChange(value, rest, 1);
-    },
-    otherProps: afterOtherProps
-  })));
+    className: className,
+    children: [_jsx(BeforeCom, _objectSpread(_objectSpread({
+      disabled: disabled
+    }, beforeProps), {}, {
+      value: values === null || values === void 0 ? void 0 : values[0],
+      onChange: function onChange(value) {
+        for (var _len3 = arguments.length, rest = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+          rest[_key3 - 1] = arguments[_key3];
+        }
+        return handleChange(value, rest, 0);
+      },
+      otherProps: beforeOtherProps
+    })), isView ? separator : separator && _jsx(_Button, {
+      disabled: true,
+      children: separator
+    }), _jsx(AfterCom, _objectSpread(_objectSpread({
+      disabled: disabled
+    }, afterProps), {}, {
+      value: values === null || values === void 0 ? void 0 : values[1],
+      onChange: function onChange(value) {
+        for (var _len4 = arguments.length, rest = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+          rest[_key4 - 1] = arguments[_key4];
+        }
+        return handleChange(value, rest, 1);
+      },
+      otherProps: afterOtherProps
+    }))]
+  });
 };
 ProCombination.defaultProps = {
   disabled: false

package/es/ProForm/components/combination/ProModalSelect/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ProModalSelectPropsType } from './propsType';
-declare const _default: React.ForwardRefExoticComponent<Pick<ProModalSelectPropsType, "title" | "id" | "hidden" | "color" | "content" | "size" | "style" | "multiple" | "disabled" | "children" | "form" | "slot" | "pattern" | "className" | "max" | "required" | "type" | "height" | "width" | "name" | "translate" | "value" | "dir" | "accessKey" | "draggable" | "lang" | "prefix" | "role" | "contentEditable" | "inputMode" | "nonce" | "tabIndex" | "accept" | "alt" | "autoComplete" | "autoFocus" | "capture" | "checked" | "crossOrigin" | "formAction" | "formEncType" | "formMethod" | "formNoValidate" | "formTarget" | "list" | "maxLength" | "min" | "minLength" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "contextMenu" | "placeholder" | "spellCheck" | "radioGroup" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "readOnly" | "rel" | "src" | "step" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "prefixCls" | "rev" | "status" | "viewEmpty" | "allowClear" | "fieldNames" | "labelInValue" | "bordered" | "otherProps" | "isView" | "showCount" | "onPressEnter" | "htmlSize" | "suffix" | "addonBefore" | "addonAfter" | `data-${string}` | "configOption" | "onFormat" | "optionRender" | "customRender" | "beforeOpen" | "isTooltip" | "showCodeName" | "searchForm"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<ProModalSelectPropsType, "ref"> & React.RefAttributes<unknown>>;
 export default _default;