@zat-design/sisyphus-react 3.14.6 → 3.14.7

package/.yarnrc

@@ -0,0 +1 @@
+--ignore-engines true

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -96,10 +96,11 @@ export function useRequestList(service, options, useRequestOptions) {
   }, [onPageChange]);
   var onSearch = useCallback(values => {
     if (!isEqual(searchValues, values)) {
-      onChange(defaultPage.pageNum, defaultPage.pageSize);
+      // 保留当前页码和每页条数
+      onChange(page.pageNum, page.pageSize);
       setSearchValues(values);
     }
-  }, [onChange, searchValues]);
+  }, [onChange, searchValues, page]);
 
   // 重置查询条件
   var onReset = useCallback(() => {

package/es/ProSelect/index.js

@@ -21,7 +21,22 @@ import locale from "../locale";
 import { getSelectList } from "./utils";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var Option = _Select.Option;
+var Option = _Select.Option,
+  OptGroup = _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;
+}
 export var ProSelect = (props, ref) => {
   var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
@@ -122,16 +137,17 @@ export 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);
   };
   useImperativeHandle(ref, () => ({
     getValueObject,
@@ -176,11 +192,11 @@ export var ProSelect = (props, ref) => {
     });
   }
   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];
         }
@@ -192,7 +208,7 @@ export 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];
         }
@@ -291,8 +307,7 @@ export var ProSelect = (props, ref) => {
       return undefined;
     }
     if (defaultOne && !value && !isDefaultOne) {
-      var option = selectList === null || selectList === void 0 ? void 0 : selectList[0];
-      // selectList 可能是异步回来的值
+      var option = flatOptions[0];
       if (option) {
         setIsDefaultOne(true);
         onChange === null || onChange === void 0 || onChange(option === null || option === void 0 ? void 0 : option[code], option);
@@ -328,6 +343,7 @@ export var ProSelect = (props, ref) => {
       showSearch: true,
       filterOption: isFunction(_onSearch) ? false : (input, option) => {
         var _option$children;
+        if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
         var value = 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());
       },
@@ -339,7 +355,28 @@ export var ProSelect = (props, ref) => {
       }
     }, omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map(item => {
+      children: Array.isArray(newSelectList) && newSelectList.map((item, idx) => {
+        var groupOpts = item.options;
+        if (Array.isArray(groupOpts)) {
+          var _item$label;
+          return /*#__PURE__*/_jsx(OptGroup, {
+            label: item[label],
+            children: groupOpts.map(opt => /*#__PURE__*/_jsx(Option, {
+              label: opt[label],
+              value: opt[code],
+              record: opt,
+              disabled: !!opt.disabled,
+              children: /*#__PURE__*/_jsx(TooltipOption, {
+                title: OptionRender ? OptionRender(opt) : selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
+                children: OptionRender ? /*#__PURE__*/_jsx("span", {
+                  children: OptionRender(opt)
+                }) : /*#__PURE__*/_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-${idx}`);
+        }
         return /*#__PURE__*/_jsx(Option, {
           label: item[label],
           value: item[code],

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -105,10 +105,11 @@ function useRequestList(service, options, useRequestOptions) {
   }, [onPageChange]);
   var onSearch = (0, _react.useCallback)(values => {
     if (!(0, _lodash.isEqual)(searchValues, values)) {
-      onChange(defaultPage.pageNum, defaultPage.pageSize);
+      // 保留当前页码和每页条数
+      onChange(page.pageNum, page.pageSize);
       setSearchValues(values);
     }
-  }, [onChange, searchValues]);
+  }, [onChange, searchValues, page]);
 
   // 重置查询条件
   var onReset = (0, _react.useCallback)(() => {

package/lib/ProSelect/index.js

@@ -29,7 +29,22 @@ var _utils = require("./utils");
 require("./index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
-var Option = _select.default.Option;
+var Option = _select.default.Option,
+  OptGroup = _select.default.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') || {},
@@ -130,16 +145,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,
@@ -184,11 +200,11 @@ var ProSelect = (props, ref) => {
     });
   }
   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];
         }
@@ -200,7 +216,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];
         }
@@ -299,8 +315,7 @@ var ProSelect = (props, ref) => {
       return undefined;
     }
     if (defaultOne && !value && !isDefaultOne) {
-      var option = selectList === null || selectList === void 0 ? void 0 : selectList[0];
-      // selectList 可能是异步回来的值
+      var option = flatOptions[0];
       if (option) {
         setIsDefaultOne(true);
         onChange === null || onChange === void 0 || onChange(option === null || option === void 0 ? void 0 : option[code], option);
@@ -336,6 +351,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());
       },
@@ -347,7 +363,28 @@ var ProSelect = (props, ref) => {
       }
     }, (0, _lodash.omit)((0, _objectSpread2.default)({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map(item => {
+      children: Array.isArray(newSelectList) && newSelectList.map((item, idx) => {
+        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-${idx}`);
+        }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
           label: item[label],
           value: item[code],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.6",
+  "version": "3.14.7",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"
@@ -55,12 +55,14 @@
   "overrides": {
     "react-resizable": {
       "react-draggable": "4.4.3"
-    }
+    },
+    "minimatch": "^9.0.0"
   },
   "resolutions": {
     "@types/react": "^17.0.53",
     "mockjs/commander": "9.2.0",
-    "react-draggable": "4.4.3"
+    "react-draggable": "4.4.3",
+    "minimatch": "^9.0.0"
   },
   "dependencies": {
     "@ant-design/icons": "^4.2.2",