@zat-design/sisyphus-react 4.0.14 → 4.0.16

package/lib/ProSelect/index.js

@@ -32,7 +32,22 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var Option = _antd.Select.Option;
+var Option = _antd.Select.Option,
+  OptGroup = _antd.Select.OptGroup;
+
+/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
+function flattenOptions(list) {
+  if (!Array.isArray(list) || !list.length) return [];
+  var out = [];
+  list.forEach(item => {
+    if (Array.isArray(item.options)) {
+      out.push(...item.options);
+    } else {
+      out.push(item);
+    }
+  });
+  return out;
+}
 var ProSelect = (props, ref) => {
   var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
@@ -132,16 +147,17 @@ var ProSelect = (props, ref) => {
     }
   }));
   var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
+  var flatOptions = flattenOptions(selectList);
   var getValueObject = input => {
     if (Array.isArray(input) && input.length) {
       var resArr = [];
       input.forEach(i => {
-        var res = selectList.find(item => item[code] === i);
+        var res = flatOptions.find(item => item[code] === i);
         if (res) resArr.push(res);
       });
       return resArr;
     }
-    return selectList.find(item => item[code] === input);
+    return flatOptions.find(item => item[code] === input);
   };
   (0, _react.useImperativeHandle)(ref, () => ({
     getValueObject,
@@ -187,11 +203,11 @@ var ProSelect = (props, ref) => {
     }
   }, [defaultOne, value, isDefaultOne, selectList, code, onChange]);
   var transToLabel = value => {
-    if (!Array.isArray(selectList) || !selectList.length) {
+    if (!flatOptions.length) {
       return viewEmpty;
     }
     var labelList = value.map(v => {
-      var option = selectList.find(item => {
+      var option = flatOptions.find(item => {
         if (labelInValue) {
           return item[code] === v[code];
         }
@@ -203,7 +219,7 @@ var ProSelect = (props, ref) => {
       return '-';
     });
     var record = value.map(v => {
-      return selectList.find(item => {
+      return flatOptions.find(item => {
         if (labelInValue) {
           return item[code] === v[code];
         }
@@ -302,7 +318,7 @@ var ProSelect = (props, ref) => {
     }
     // 只有当 dataSource 只有一个值时才默认回填（只返回值，不进行状态更新）
     if (defaultOne && !value && !isDefaultOne && (selectList === null || selectList === void 0 ? void 0 : selectList.length) === 1) {
-      var option = selectList === null || selectList === void 0 ? void 0 : selectList[0];
+      var option = flatOptions[0];
       // selectList 可能是异步回来的值
       if (option) {
         return option === null || option === void 0 ? void 0 : option[code];
@@ -336,6 +352,7 @@ var ProSelect = (props, ref) => {
       showSearch: true,
       filterOption: (0, _lodash.isFunction)(_onSearch) ? false : (input, option) => {
         var _option$children;
+        if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
         var value = (0, _lodash.isString)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 || (_option$children = option.children) === null || _option$children === void 0 || (_option$children = _option$children.props) === null || _option$children === void 0 ? void 0 : _option$children.title;
         return value.toLowerCase().includes(input.toLowerCase());
       },
@@ -351,6 +368,27 @@ var ProSelect = (props, ref) => {
         var itemValue = item[code];
         var itemKey = itemValue != null ? `${itemValue}-${index}` : `option-${index}`;
         var optionValue = itemValue != null ? itemValue : undefined;
+        var groupOpts = item.options;
+        if (Array.isArray(groupOpts)) {
+          var _item$label;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptGroup, {
+            label: item[label],
+            children: groupOpts.map(opt => /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
+              label: opt[label],
+              value: opt[code],
+              record: opt,
+              disabled: !!opt.disabled,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
+                title: OptionRender ? OptionRender(opt) : selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
+                children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+                  children: OptionRender(opt)
+                }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+                  children: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label]
+                })
+              })
+            }, opt[code]))
+          }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
+        }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
           label: item[label],
           value: optionValue,

package/lib/ProSelect/propsType.d.ts

@@ -158,7 +158,3 @@ export interface ResponseDataType {
      */
     code?: number;
 }
-export type DataOption = DataOptionType;
-export type PropSelectProps = PropSelectType;
-export type ProSelectAction = ProSelectActionType;
-export type ResponseData = ResponseDataType;

package/lib/ProTable/propsType.d.ts

@@ -754,8 +754,4 @@ export interface ProTableUseAntdTableType<I, R> {
     allSelected: boolean;
     [key: string]: any;
 }
-export type ProTableProps<T = any> = ProTableType<T>;
-export type ProTableColumn = ProTableColumnType;
-export type ProTableSummaryProps = ProTableSummaryType;
-export type UseAntdTableState<I, R> = ProTableUseAntdTableType<I, R>;
 export {};

package/lib/ProTabs/components/Card/index.d.ts

@@ -1,3 +1,3 @@
-import { CardProps } from '../../propType';
-declare const Card: (props: CardProps) => import("react/jsx-runtime").JSX.Element;
+import { CardType } from '../../propType';
+declare const Card: (props: CardType) => import("react/jsx-runtime").JSX.Element;
 export default Card;

package/lib/ProTabs/propType.d.ts

@@ -92,7 +92,3 @@ export interface ProTabsType extends Omit<TabsProps, 'items' | 'onChange'> {
     size?: 'small' | 'middle' | 'large';
     [key: string]: any;
 }
-export type ProTabsProps = ProTabsType;
-export type ProTabsItemsProps = ProTabsItemType;
-export type ProTabsAction = ProTabsActionType;
-export type CardProps = CardType;

package/lib/ProThemeTools/propsType.d.ts

@@ -168,5 +168,3 @@ export interface LocalThemeConfigType {
      */
     zauiBaseFontSize?: string;
 }
-export type ProThemeToolsProps = ProThemeToolsType;
-export type LocalThemeConfigPropsType = LocalThemeConfigType;

package/lib/ProTooltip/propsType.d.ts

@@ -55,4 +55,3 @@ export type ProTooltipTriggerNodeType = HTMLElement & {
     /** 父节点元素 */
     parentNode: HTMLElement;
 };
-export type ProTooltipProps = ProTooltipType;

package/lib/ProTree/components/ProTreeSelect/propsType.d.ts

@@ -437,5 +437,3 @@ export interface ProTreeSelectResponseDataType {
      */
     code?: number;
 }
-export type PropTreeSelectProps = ProTreeSelectType;
-export type ProSelectAction = ProTreeSelectActionType;

package/lib/ProTree/propsType.d.ts

@@ -809,6 +809,4 @@ export interface ProTreeResponseDataType {
      */
     code?: number;
 }
-export type ProTreeProps = ProTreeType;
-export type PropTreeSelectProps = ProTreeSelectType;
 export {};

package/lib/ProTreeModal/propsType.d.ts

@@ -296,5 +296,3 @@ export interface ProTreeModalType {
      */
     openChange?: (open: boolean) => void;
 }
-export type ProTreeModalProps = ProTreeModalType;
-export type ProTreeModalAction = ProTreeModalActionType;

package/lib/ProUpload/propsType.d.ts

@@ -262,8 +262,3 @@ export interface DraggableUploadListItemType {
      */
     children: React.ReactNode;
 }
-export type UploadFileRes = UploadFileResType;
-export type ExampleModalProps = ExampleModalType;
-export type fieldNamesProps = FieldNamesType;
-export type ProUploadProps = ProUploadType;
-export type DraggableUploadListItemProps = DraggableUploadListItemType;

package/lib/index.d.ts

@@ -28,20 +28,20 @@ export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
 export type { ProConfigProviderType } from './ProConfigProvider';
-export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
+export type { ProFormType, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
-export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState, } from './ProTable/propsType';
-export type { ProUploadType, ProUploadProps } from './ProUpload/propsType';
-export type { ProTabsType, ProTabsItemType, ProTabsProps, ProTabsItemsProps } from './ProTabs/propType';
-export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps, } from './ProLayout/components/ProHeader/PropTypes';
-export type { ProLayoutTabsInstance, AddTabParams, AddTabOptions } from './ProLayout/propTypes';
-export type { ProTooltipType, ProTooltipProps } from './ProTooltip/propsType';
-export type { ProIconType, ProIconProps } from './ProIcon/propsTypes';
-export type { ProTreeType, ProTreeSelectType, ProTreeProps, PropTreeSelectProps } from './ProTree/propsType';
-export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction, } from './ProTreeModal/propsType';
-export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps, } from './ProEditTable/propsType';
-export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType, } from './ProStep/propsType';
-export type { ProDrawerFormType, ProDrawerFormPropsType } from './ProDrawerForm/propsType';
-export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType, } from './ProForm/components/combination/ProModalSelect/propsType';
+export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType } from './ProTable/propsType';
+export type { ProUploadType } from './ProUpload/propsType';
+export type { ProTabsType, ProTabsItemType } from './ProTabs/propType';
+export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, } from './ProLayout/components/ProHeader/PropTypes';
+export type { ProLayoutType } from './ProLayout/propTypes';
+export type { ProTooltipType } from './ProTooltip/propsType';
+export type { ProIconType } from './ProIcon/propsTypes';
+export type { ProTreeType, ProTreeSelectType } from './ProTree/propsType';
+export type { ProTreeModalType, ProTreeModalActionType } from './ProTreeModal/propsType';
+export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, } from './ProEditTable/propsType';
+export type { ProStepType, ProStepContextType, ProStepItemType } from './ProStep/propsType';
+export type { ProDrawerFormType } from './ProDrawerForm/propsType';
+export type { ProModalSelectType, ProModalSelectConfigType } from './ProForm/components/combination/ProModalSelect/propsType';
 export type { ProStepTabType, ProStepTabResultType } from './ProStepTab/propsType';
 export * from './tokens';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.14",
+  "version": "4.0.16",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",