@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.4

package/lib/ProEditTable/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-edit-table {
   td[rowspan]{
@@ -81,7 +79,7 @@
     }
   }
 
-  .drag-wrapper {
+  .pro-edit-table-drag-wrapper {
     display: flex;
     justify-content: flex-end;
     .anticon {
@@ -90,7 +88,7 @@
       cursor: pointer;
     }
   }
-  .drag-wrapper.no-check {
+  .pro-edit-table-drag-wrapper.no-check {
     .anticon {
       margin-right: 0;
     }

package/lib/ProEditTable/utils/diffOriginal.d.ts

@@ -4,6 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -25,6 +25,50 @@ module.exports = __toCommonJS(diffOriginal_exports);
 var import_lodash = require("lodash");
 var import_utils = require("@zat-design/utils");
 var { isEmpty } = import_utils.validate;
+var normalizeNumberValue = (value) => {
+  if (value === null || value === void 0 || value === "")
+    return null;
+  const num = Number(value);
+  return Number.isNaN(num) ? null : num;
+};
+var inputNumberStrategy = {
+  compare: (val1, val2) => {
+    const num1 = normalizeNumberValue(val1);
+    const num2 = normalizeNumberValue(val2);
+    return num1 === num2;
+  }
+};
+var proNumberRangeStrategy = {
+  compare: (val1, val2) => {
+    if (!Array.isArray(val1) || !Array.isArray(val2))
+      return false;
+    if (val1.length !== val2.length)
+      return false;
+    return val1.every((item, index) => {
+      const num1 = normalizeNumberValue(item);
+      const num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+var handleNumberTypeDiff = (params) => {
+  const { originalValue, value, type } = params;
+  const isEmptyVal = isEmpty(value);
+  const isEmptyOrg = isEmpty(originalValue);
+  if (isEmptyOrg && isEmptyVal)
+    return "same";
+  if (isEmptyOrg && !isEmptyVal)
+    return "add";
+  let compareStrategy;
+  if (type === "InputNumber") {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === "ProNumberRange") {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return "changed";
+  }
+  return compareStrategy.compare(value, originalValue) ? "same" : "changed";
+};
 var filterObject = (data) => {
   if (!(0, import_lodash.isObject)(data) || data === null)
     return data;
@@ -50,7 +94,7 @@ var filterObject = (data) => {
   return resData;
 };
 var diffOriginal = (params) => {
-  const { originalValue, value, onDiff, originRecord, record, index } = params;
+  const { originalValue, value, onDiff, originRecord, record, index, type } = params;
   if ((0, import_lodash.isFunction)(onDiff)) {
     const diffRes = onDiff({
       originValue: originalValue,
@@ -66,6 +110,9 @@ var diffOriginal = (params) => {
       return diffRes;
     }
   }
+  if (["InputNumber", "ProNumberRange"].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
   const _value = filterObject(value);
   const _originalValue = filterObject(originalValue);
   const isEmptyVal = isEmpty(_value);

package/lib/ProEnum/hooks/useEnum.js

@@ -33,6 +33,9 @@ function useEnum(codes, value, compose) {
     fieldNames = {},
     clear = true
   } = (0, import_ProConfigProvider.useProConfig)("ProEnum") || {};
+  if (cacheKey !== "zat-design-pro-component-cacheKey") {
+    baseEnumStorage = null;
+  }
   const catchData = (0, import_utils.getEnumData)(storage, cacheKey, baseEnumStorage);
   baseEnumStorage = catchData;
   if (!codes) {

package/lib/ProEnum/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 @zaui-disabled-bg: var(--zaui-disabled-bg);
 

package/lib/ProForm/components/FormFooter/index.js

@@ -64,7 +64,7 @@ var FormFooter = (props) => {
       form.setFieldsValue(searchCache[formId]);
     }
   }, [formId]);
-  const _onOk = () => {
+  const nextOnOk = () => {
     var _a;
     if (formId) {
       const values = form.getFieldsValue();
@@ -75,13 +75,14 @@ var FormFooter = (props) => {
     if ((_a = modifiedForm.__INTERNAL_CONFIG__) == null ? void 0 : _a.stopOnFirstError) {
       form.validateFields().then(() => {
         onOk();
-      }).catch(() => {
+      }).catch((error) => {
+        console.warn("ProForm validateFields error", error);
       });
     } else {
       onOk();
     }
   };
-  const _onCancel = () => {
+  const nextOnCancel = () => {
     if (formId && searchCache[formId]) {
       delete searchCache[formId];
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
@@ -93,13 +94,13 @@ var FormFooter = (props) => {
     {
       type: "primary",
       htmlType: onOk ? "button" : "submit",
-      onClick: _onOk,
+      onClick: nextOnOk,
       disabled: confirmLoading,
       loading: confirmLoading,
       ...okButtonProps
     },
     okChildren || okText || `${import_locale.default.ProForm.search}`
-  ), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: _onCancel, ...cancelButtonProps }, cancelChildren || cancelText || `${import_locale.default.ProForm.reset}`), children);
+  ), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: nextOnCancel, ...cancelButtonProps }, cancelChildren || cancelText || `${import_locale.default.ProForm.reset}`), children);
 };
 var FormFooter_default = FormFooter;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/ProForm/components/base/DatePicker/index.js

@@ -45,24 +45,12 @@ var DatePicker = (props) => {
   const { className, format = "YYYY-MM-DD", ...rest } = props;
   const { isView: isViewCon, viewEmpty, valueType } = import_ProForm.default.useFieldProps() || {};
   const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
-  const initialConfig = (0, import_ProConfigProvider.useProConfig)("DatePicker");
-  const _className = (0, import_classnames.default)({
+  const initialConfig = (0, import_ProConfigProvider.useProConfig)("DatePicker") || {};
+  let nextFormat = format;
+  const nextClassName = (0, import_classnames.default)({
     "full-form-item": true,
     [className]: !!className
   });
-  const _viewFormat = Array.isArray(format) ? format[0] : format;
-  let tempFormat = Array.isArray(format) ? format : [format];
-  if ((0, import_lodash.isFunction)(format)) {
-    tempFormat = [];
-  }
-  const _format = (0, import_lodash.uniq)([
-    ...tempFormat,
-    "YYYY-MM-DD",
-    "YYYYMMDD",
-    "YYYY/MM/DD",
-    "YYYY_MM_DD",
-    "YYYY.MM.DD"
-  ]).filter((formatKey) => !!formatKey);
   if (isView) {
     const { value } = rest;
     let viewChildren = null;
@@ -73,30 +61,30 @@ var DatePicker = (props) => {
     } else if ((0, import_lodash.isFunction)(format)) {
       viewChildren = format(value);
     } else if ((0, import_lodash.isString)(value)) {
-      viewChildren = (0, import_dayjs.default)(value).format(_viewFormat);
+      viewChildren = (0, import_dayjs.default)(value).format(format);
     }
     return /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty }, viewChildren);
   }
-  const _defaultShowTime = {
-    format: "HH:mm:ss"
-  };
-  const _rest = {
+  const restProps = {
     ...rest
   };
-  if (rest.showTime === void 0) {
-    if (valueType === "dateTime") {
-      _rest.showTime = true;
-    }
+  if (restProps.showTime === false) {
+    restProps.showTime = false;
+  } else if (valueType === "dateTime") {
+    restProps.showTime = true;
+    nextFormat = "YYYY-MM-DD HH:mm:ss";
   }
-  if ((0, import_lodash.isString)(_rest.value)) {
-    _rest.value = (0, import_dayjs.default)(_rest.value);
+  if ((0, import_lodash.isString)(restProps.value)) {
+    restProps.value = (0, import_dayjs.default)(restProps.value);
   }
-  if (_rest.showTime === true) {
-    _rest.showTime = { ..._defaultShowTime };
-  }
-  if ((0, import_lodash.isObject)(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
-  }
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.DatePicker, { ...initialConfig, format: _format, ..._rest, className: _className });
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.DatePicker,
+    {
+      ...initialConfig,
+      format: nextFormat,
+      ...(0, import_lodash.omit)(restProps, ["otherProps"]),
+      className: nextClassName
+    }
+  );
 };
 var DatePicker_default = DatePicker;

package/lib/ProForm/components/base/SwitchCheckbox/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .switch-checkbox-view {
   display    : flex;

package/lib/ProForm/components/base/TextArea/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 div.pro-textarea-view {
   .@{ant-prefix}-input-disabled {

package/lib/ProForm/components/base/TimePicker/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 /* 适配antd 5.x，不再导入antd样式 */
 

package/lib/ProForm/components/combination/Container/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-container {
   &.pro-container-empty{

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -33,6 +33,7 @@ __export(ComRender_exports, {
 });
 module.exports = __toCommonJS(ComRender_exports);
 var import_react = __toESM(require("react"));
+var import_lodash = require("lodash");
 var import_ConfirmWrapper = __toESM(require("../../../../components/render/ConfirmWrapper"));
 var import_useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = __toESM(require("../../../../../index"));
@@ -44,14 +45,14 @@ var wrapperMap = {
 };
 var getComRender = (component, props, componentProps) => {
   const wrappers = Object.keys(wrapperMap);
-  let Com = component;
+  let renderComponent = component;
   wrappers.forEach((item) => {
     if (item in props) {
       const Wrapper = wrapperMap[item];
-      Com = /* @__PURE__ */ import_react.default.createElement(Wrapper, { ...componentProps, ...{ [item]: props[item] } }, Com);
+      renderComponent = /* @__PURE__ */ import_react.default.createElement(Wrapper, { ...componentProps, ...{ [item]: props[item] } }, renderComponent);
     }
   });
-  return Com;
+  return renderComponent;
 };
 var ComRender = (props) => {
   var _a, _b, _c, _d;
@@ -72,8 +73,8 @@ var ComRender = (props) => {
   } = props;
   const TypeComponent = componentMap[type];
   const mergedGetValueProps = getValueProps || ((val) => ({ [valuePropName]: val }));
-  const _props = mergedGetValueProps(fieldProps.value);
-  const componentProps = { ...fieldProps, ...rest, ..._props };
+  const nextProps = mergedGetValueProps(fieldProps.value);
+  const componentProps = (0, import_lodash.omit)({ ...fieldProps, ...rest, ...nextProps }, ["onFieldChange"]);
   const isSeparator = ((_b = (_a = props == null ? void 0 : props.component) == null ? void 0 : _a.props) == null ? void 0 : _b.className) === "group-separator";
   if (isSeparator && isView) {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, " ", (_d = (_c = props == null ? void 0 : props.component) == null ? void 0 : _c.props) == null ? void 0 : _d.children, " ");
@@ -82,7 +83,7 @@ var ComRender = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: { ...contextProps, valueType, type, isView } }, viewRender(componentProps));
   }
   const Component = component ? import_react.default.cloneElement(component, { ...componentProps }) : /* @__PURE__ */ import_react.default.createElement(TypeComponent, { ...componentProps });
-  const Com = getComRender(Component, props, componentProps);
-  return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: { ...contextProps, valueType, type, isView } }, Com);
+  const renderComponent = getComRender(Component, props, componentProps);
+  return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: { ...contextProps, valueType, type, isView } }, renderComponent);
 };
 var ComRender_default = ComRender;

package/lib/ProForm/components/combination/Group/hooks/index.js

@@ -57,7 +57,7 @@ var useTransformColumns = (params) => {
       clearNotShow,
       desensitization
     } = column;
-    const { mode, onChange, onFieldChange, disabled: comDisabled, onBlur } = fieldProps || {};
+    const { mode, onChange, disabled: comDisabled } = fieldProps || {};
     const _disabled = disabled || comDisabled;
     const columnName = names ? names[index] : [].concat(name, index);
     const changedCallback = (lastDependency, current) => {
@@ -96,6 +96,7 @@ var useTransformColumns = (params) => {
       changedCallback,
       [value, show, fieldProps, _disabled, columnName, type]
     );
+    const { onFieldChange, onBlur } = reactiveProps.fieldProps || {};
     if (reactiveProps.show === false) {
       return [];
     }
@@ -116,7 +117,12 @@ var useTransformColumns = (params) => {
       } else if (normalize) {
         newValue = normalize == null ? void 0 : normalize(newValue);
       }
-      internalChange == null ? void 0 : internalChange(newValue, args[1], index);
+      if (names) {
+        form.setFieldValue(columnName, newValue);
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
+      } else {
+        internalChange == null ? void 0 : internalChange(newValue, args[1], index);
+      }
       const values = form.getFieldValue(namePath);
       const originRow = (namePath == null ? void 0 : namePath.length) ? (0, import_lodash.cloneDeep)(values) : void 0;
       onChange == null ? void 0 : onChange(...args);

package/lib/ProForm/components/combination/Group/index.d.ts

@@ -1,4 +1,10 @@
 import React from 'react';
 import type { GroupType } from './propsType';
-declare const _default: React.NamedExoticComponent<GroupType>;
-export default _default;
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+declare const Group: React.FC<GroupType>;
+export default Group;

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

@@ -57,12 +57,12 @@ var Group = (props) => {
   const { desensitizationKey } = otherProps || {};
   const contextProps = import_ProForm.default.useFieldProps() || {};
   const { names, name, form, namePath, index, isView } = contextProps;
-  const _option = import_react.default.useRef([]);
+  const nextOption = import_react.default.useRef([]);
   const handleChange = (value2, option, index2) => {
-    const _value = props.value ? [...props.value] : [];
-    _value[index2] = value2;
-    _option.current[index2] = option;
-    onChange(_value, _option.current);
+    const nextValue = props.value ? [...props.value] : [];
+    nextValue[index2] = value2;
+    nextOption.current[index2] = option;
+    onChange(nextValue, nextOption.current);
   };
   const columnsProps = (0, import_hooks.useTransformColumns)({
     columns: children,
@@ -78,7 +78,7 @@ var Group = (props) => {
     desensitizationKey
   });
   const columns = (0, import_utils.insertSeparator)(columnsProps, space);
-  const _className = (0, import_classnames.default)({
+  const nextClassName = (0, import_classnames.default)({
     "pro-group": true,
     "pro-group-diy-width": columns.some((item) => {
       var _a, _b;
@@ -89,7 +89,7 @@ var Group = (props) => {
     }),
     [`${className}`]: className
   });
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: _className, id }, space.compact || (space == null ? void 0 : space.separator) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, null, columns.map((column, index2) => {
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: nextClassName, id }, space.compact || (space == null ? void 0 : space.separator) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, null, columns.map((column, index2) => {
     column.otherProps = otherProps;
     if (column == null ? void 0 : column.separator) {
       delete column.separator;
@@ -121,9 +121,4 @@ var Group = (props) => {
     );
   })));
 };
-var Group_default = (0, import_react.memo)(Group, (prevProps, nextProps) => {
-  if (!(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.value, nextProps == null ? void 0 : nextProps.value) || (prevProps == null ? void 0 : prevProps.disabled) !== (nextProps == null ? void 0 : nextProps.disabled) || !(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.children, nextProps == null ? void 0 : nextProps.children)) {
-    return false;
-  }
-  return true;
-});
+var Group_default = Group;

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

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(ProCascader_exports);
 var import_react = require("react");
 var import_antd = require("antd");
 var import_lodash = require("lodash");
+var import_ahooks = require("ahooks");
 var import_utils = require("./utils/index");
 var import_ProConfigProvider = require("../../../../ProConfigProvider");
 var import_Input = __toESM(require("../../base/Input"));
@@ -63,7 +64,7 @@ var getViewLabel = ({ dataSource, value }) => {
   return viewLabel;
 };
 var ProCascader = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const {
     detailMaxLength: configDetailMaxLength,
     enumCode: configEnumCode,
@@ -121,11 +122,14 @@ var ProCascader = (props) => {
     }
     return disabled;
   }, [disabled]);
-  const { service, defaultParams = {} } = { ...useRequest };
   const [serviceData, setServiceData] = (0, import_react.useState)([]);
   const [defaultLabel, setDefaultLabel] = (0, import_react.useState)([]);
-  const getFirstLevelOptions = async () => {
-    const { data } = await service(defaultParams);
+  const defaultOnSuccessFun = (res) => {
+    const { status = 200, message: msg, data } = res || {};
+    if (status !== 200) {
+      import_antd.message.error(msg);
+      return;
+    }
     let newData = data;
     if (transformResponse) {
       newData = transformResponse(data);
@@ -138,17 +142,69 @@ var ProCascader = (props) => {
     const serviceData2 = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
     setServiceData(serviceData2);
   };
+  const successTransformDataHandle = (0, import_react.useCallback)(
+    (res) => {
+      if (transformResponse && typeof transformResponse === "function") {
+        return transformResponse(res);
+      }
+      const { status = 200, message: msg, data } = res || {};
+      if (status !== 200) {
+        import_antd.message.error(msg);
+        return;
+      }
+      return data;
+    },
+    [transformResponse]
+  );
+  const fetchFunction = (0, import_ahooks.useRequest)(useRequest == null ? void 0 : useRequest.service, {
+    manual: true,
+    debounceWait: 300,
+    ...useRequest == null ? void 0 : useRequest.options,
+    onSuccess: (data) => {
+      var _a2, _b2, _c2;
+      if (transformResponse && typeof transformResponse === "function") {
+        const responseData = transformResponse(data);
+        const transFormData = (0, import_utils.transformDataName)(responseData, {
+          label: fieldNames.label,
+          value: fieldNames.value,
+          children: (fieldNames == null ? void 0 : fieldNames.children) || "children"
+        });
+        const serviceData2 = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+        setServiceData(serviceData2);
+      } else {
+        defaultOnSuccessFun(data);
+      }
+      (_c2 = (_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.onSuccess) == null ? void 0 : _c2.call(_a2, data, (_b2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _b2.defaultParams);
+    }
+  });
+  const cacheList = ((_b = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _b.cacheKey) ? successTransformDataHandle(fetchFunction == null ? void 0 : fetchFunction.data) : [];
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
   }
-  (0, import_react.useEffect)(() => {
-    if (service) {
-      getFirstLevelOptions();
+  (0, import_ahooks.useDeepCompareEffect)(() => {
+    var _a2;
+    if (!(serviceData == null ? void 0 : serviceData.length) && ((_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.cacheKey)) {
+      if (cacheList == null ? void 0 : cacheList.length) {
+        setServiceData(cacheList);
+      }
+    }
+  }, [fetchFunction == null ? void 0 : fetchFunction.data]);
+  (0, import_ahooks.useDeepCompareEffect)(() => {
+    var _a2;
+    if (!(useRequest == null ? void 0 : useRequest.service)) {
+      return;
+    }
+    const { manual } = (useRequest == null ? void 0 : useRequest.options) || {};
+    if (manual || (cacheList == null ? void 0 : cacheList.length)) {
+      return;
     }
-  }, [service]);
+    const defaultParams = ((_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.defaultParams) || (useRequest == null ? void 0 : useRequest.defaultParams);
+    const params = Array.isArray(defaultParams) ? defaultParams == null ? void 0 : defaultParams[0] : defaultParams || {};
+    fetchFunction.run(params);
+  }, [useRequest == null ? void 0 : useRequest.options]);
   (0, import_react.useEffect)(() => {
     if (realIsView && value) {
-      if (service) {
+      if (useRequest == null ? void 0 : useRequest.service) {
         setDefaultLabel(
           getViewLabel({
             dataSource: serviceData,
@@ -184,8 +240,8 @@ var ProCascader = (props) => {
   const displayRender = (label) => {
     return label == null ? void 0 : label.filter((item) => !!item).join("/");
   };
-  const addressValue = isAddressMode ? value && ((_b = value.slice(0, realLevel)) == null ? void 0 : _b.some((item) => !!item)) ? value.slice(0, realLevel) : void 0 : value;
-  const viewValue = isAddressMode ? ((_d = (_c = [...defaultLabel, value == null ? void 0 : value[realLevel]]) == null ? void 0 : _c.filter((item) => !!item)) == null ? void 0 : _d.join(separator)) || "-" : ((_e = defaultLabel == null ? void 0 : defaultLabel.filter((item) => !!item)) == null ? void 0 : _e.join(separator)) || "-";
+  const addressValue = isAddressMode ? value && ((_c = value.slice(0, realLevel)) == null ? void 0 : _c.some((item) => !!item)) ? value.slice(0, realLevel) : void 0 : value;
+  const viewValue = isAddressMode ? ((_e = (_d = [...defaultLabel, value == null ? void 0 : value[realLevel]]) == null ? void 0 : _d.filter((item) => !!item)) == null ? void 0 : _e.join(separator)) || "-" : ((_f = defaultLabel == null ? void 0 : defaultLabel.filter((item) => !!item)) == null ? void 0 : _f.join(separator)) || "-";
   const findSelectedOptions = (options, value2, path = []) => {
     const _value = value2 ?? [];
     if ((_value == null ? void 0 : _value.length) === 0 && (path == null ? void 0 : path.length) > 0) {
@@ -205,8 +261,8 @@ var ProCascader = (props) => {
     return null;
   };
   const _selectedOptions = (0, import_react.useMemo)(() => {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
+    return findSelectedOptions((useRequest == null ? void 0 : useRequest.service) ? serviceData : realDataSource, addressValue);
+  }, [useRequest == null ? void 0 : useRequest.service, serviceData, realDataSource, addressValue]);
   const handleAddressChange = (e) => {
     const cascaderValue = value == null ? void 0 : value.slice(0, realLevel);
     if (onChange) {
@@ -223,10 +279,11 @@ var ProCascader = (props) => {
     import_antd.Cascader,
     {
       className: hasDetail ? "" : "no-detail",
-      placeholder: (_g = (_f = import_locale.default) == null ? void 0 : _f.ProAddressBar) == null ? void 0 : _g.placeholder,
+      placeholder: (_h = (_g = import_locale.default) == null ? void 0 : _g.ProAddressBar) == null ? void 0 : _h.placeholder,
       value: addressValue,
-      options: service ? serviceData : realDataSource,
+      options: (useRequest == null ? void 0 : useRequest.service) ? serviceData : realDataSource,
       disabled: lastDisabled[0],
+      loading: fetchFunction == null ? void 0 : fetchFunction.loading,
       displayRender,
       showSearch: { filter: handlefilter, limit: 1e3 },
       onChange: handleChange,
@@ -251,7 +308,7 @@ var ProCascader = (props) => {
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: detailPlaceholder || ((_i = (_h = import_locale.default) == null ? void 0 : _h.ProAddressBar) == null ? void 0 : _i.detailPlaceholder),
+      placeholder: detailPlaceholder || ((_j = (_i = import_locale.default) == null ? void 0 : _i.ProAddressBar) == null ? void 0 : _j.detailPlaceholder),
       onChange: handleAddressChange,
       desensitization,
       otherProps

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
-import { Service } from 'ahooks/lib/useRequest/src/types';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -19,10 +19,18 @@ export interface ProCascaderType {
     fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
-        loadData?: boolean;
-        service: Service<any, any>;
+        /**
+         * @description 请求服务函数
+         */
+        service?: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
+        options?: Options<any, any>;
+        /**
+         * @deprecated 保留向后兼容性，使用 options.defaultParams 替代
+         */
         defaultParams?: any;
-        parentKey?: string;
     };
     onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];

package/lib/ProForm/components/combination/ProCascader/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-address {
   display: flex;
@@ -9,7 +7,7 @@
     width: 45%;
 
     &.no-detail {
-      width: 100% !important;
+      width: 100%;
     }
   }
 

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

@@ -70,7 +70,7 @@ function useRequestList(service, options, useRequestOptions) {
       queryBean: _condition ?? {}
     } : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
-  }, [page, searchValues]);
+  }, [page, searchValues, _defaultParams, transformParams]);
   const result = (0, import_ahooks.useRequest)(service || defaultService, {
     ...useRequestOptions,
     defaultParams: [params]
@@ -109,7 +109,7 @@ function useRequestList(service, options, useRequestOptions) {
     [onChange, searchValues]
   );
   const onReset = (0, import_react.useCallback)(() => {
-    onSearch({ d: Date.now() });
+    onSearch({});
   }, [onSearch]);
   const dataSource = (0, import_react.useMemo)(() => {
     var _a2;