@zat-design/sisyphus-react 3.11.6 → 3.11.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/es/ProEditTable/components/RcTable/BaseTable.js +19 -9
  2. package/es/ProEditTable/index.js +24 -15
  3. package/es/ProEditTable/propsType.d.ts +0 -1
  4. package/es/ProEditTable/utils/tools.d.ts +2 -2
  5. package/es/ProEditTable/utils/tools.js +4 -11
  6. package/es/ProEditTable/utils/useEditTableError.d.ts +7 -0
  7. package/es/ProEditTable/utils/useEditTableError.js +81 -0
  8. package/es/ProEnum/hooks/useEnumRequest.js +2 -1
  9. package/es/ProEnum/index.js +2 -1
  10. package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
  11. package/es/ProForm/components/combination/ProModalSelect/index.js +49 -44
  12. package/es/ProForm/components/combination/ProRangeLimit/index.d.ts +4 -0
  13. package/es/ProForm/components/combination/ProRangeLimit/index.js +4 -2
  14. package/es/ProForm/components/combination/ProTimeLimit/index.d.ts +4 -0
  15. package/es/ProForm/components/combination/ProTimeLimit/index.js +4 -2
  16. package/es/ProForm/components/render/RenderFields.d.ts +2 -0
  17. package/es/ProForm/components/render/RenderFields.js +5 -2
  18. package/es/ProForm/components/render/propsType.d.ts +4 -0
  19. package/es/ProSelect/index.js +2 -1
  20. package/es/ProTable/hooks/useAntdTable.js +9 -2
  21. package/es/ProTabs/index.js +2 -1
  22. package/es/ProTree/components/ProTree.js +2 -1
  23. package/es/ProTree/components/ProTreeSelect/index.js +2 -1
  24. package/es/ProTreeModal/index.js +2 -1
  25. package/lib/ProEditTable/components/RcTable/BaseTable.js +19 -9
  26. package/lib/ProEditTable/index.js +24 -15
  27. package/lib/ProEditTable/propsType.d.ts +0 -1
  28. package/lib/ProEditTable/utils/tools.d.ts +2 -2
  29. package/lib/ProEditTable/utils/tools.js +4 -11
  30. package/lib/ProEditTable/utils/useEditTableError.d.ts +7 -0
  31. package/lib/ProEditTable/utils/useEditTableError.js +88 -0
  32. package/lib/ProEnum/hooks/useEnumRequest.js +2 -1
  33. package/lib/ProEnum/index.js +2 -1
  34. package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +2 -1
  35. package/lib/ProForm/components/combination/ProModalSelect/index.js +49 -44
  36. package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts +4 -0
  37. package/lib/ProForm/components/combination/ProRangeLimit/index.js +4 -2
  38. package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts +4 -0
  39. package/lib/ProForm/components/combination/ProTimeLimit/index.js +4 -2
  40. package/lib/ProForm/components/render/RenderFields.d.ts +2 -0
  41. package/lib/ProForm/components/render/RenderFields.js +5 -2
  42. package/lib/ProForm/components/render/propsType.d.ts +4 -0
  43. package/lib/ProSelect/index.js +2 -1
  44. package/lib/ProTable/hooks/useAntdTable.js +9 -2
  45. package/lib/ProTabs/index.js +2 -1
  46. package/lib/ProTree/components/ProTree.js +2 -1
  47. package/lib/ProTree/components/ProTreeSelect/index.js +2 -1
  48. package/lib/ProTreeModal/index.js +2 -1
  49. package/package.json +1 -1
@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
29
29
  _excluded2 = ["onOk"],
30
30
  _excluded3 = ["rowKey", "columns", "rowSelection"];
31
31
  var ProModalSelect = function ProModalSelect(props, ref) {
32
- var _useRequest$options9, _formColumns$;
32
+ var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
33
33
  var value = props.value,
34
34
  onChange = props.onChange,
35
35
  disabled = props.disabled,
@@ -102,6 +102,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
102
102
  rowSelection = _ref4.rowSelection,
103
103
  restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
104
104
  var preValue = (0, _react.useRef)(value);
105
+ var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
106
+ var defaultParamsRef = (0, _react.useRef)(defaultParams); // 缓存 defaultParams 的引用
105
107
  var _useSetState = (0, _ahooks.useSetState)({
106
108
  _value: value,
107
109
  isInit: true,
@@ -311,7 +313,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
311
313
  };
312
314
  }();
313
315
  var handleClose = function handleClose() {
314
- var _useRequest$options;
316
+ var _useRequest$options4;
315
317
  form.resetFields();
316
318
  setState({
317
319
  onOff: false,
@@ -319,7 +321,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
319
321
  isInit: false
320
322
  });
321
323
  // 当设置manual为true时,清空当前弹框内已搜索出来的值
322
- if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.manual) {
324
+ if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
323
325
  mutate(function () {
324
326
  return [];
325
327
  });
@@ -466,7 +468,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
466
468
  // 初始化回显,当传入initParams时,前端用来回险
467
469
  var getInitValues = /*#__PURE__*/function () {
468
470
  var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
469
- var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
471
+ var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
470
472
  return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
471
473
  while (1) switch (_context4.prev = _context4.next) {
472
474
  case 0:
@@ -474,11 +476,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
474
476
  _context4.next = 9;
475
477
  break;
476
478
  }
477
- queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
479
+ queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams || {});
478
480
  page = (0, _objectSpread3.default)({
479
481
  pageNum: 1,
480
482
  pageSize: 10
481
- }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
483
+ }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
482
484
  params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
483
485
  queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
484
486
  }) : queryBean;
@@ -527,16 +529,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
527
529
  // 初始化回显,当传入initParams时,前端用来回险
528
530
  var getDefaultOneValues = /*#__PURE__*/function () {
529
531
  var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
530
- var _useRequest$options4, _useRequest$options5;
532
+ var _useRequest$options6;
531
533
  var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
532
534
  return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
533
535
  while (1) switch (_context5.prev = _context5.next) {
534
536
  case 0:
535
- queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
537
+ queryBean = (0, _objectSpread3.default)({}, defaultParams);
536
538
  page = (0, _objectSpread3.default)({
537
539
  pageNum: 1,
538
540
  pageSize: 10
539
- }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
541
+ }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
540
542
  params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
541
543
  queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
542
544
  }) : queryBean;
@@ -611,8 +613,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
611
613
  });
612
614
  (0, _react.useEffect)(function () {
613
615
  if (onOff && !visible) {
614
- var _useRequest$options6;
615
- if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
616
+ var _useRequest$options7;
617
+ if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
616
618
  onReset();
617
619
  }
618
620
  var nextState = {
@@ -663,18 +665,48 @@ var ProModalSelect = function ProModalSelect(props, ref) {
663
665
  if (useRequest) {
664
666
  // 加定时器 修复依赖数据同步更新未取到问题
665
667
  setTimeout(function () {
666
- var _useRequest$options7, _useRequest$options8;
667
668
  var params = withPagination ? {
668
669
  pageNum: 1,
669
670
  pageSize: 50,
670
- queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
671
- } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
671
+ queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams)
672
+ } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams);
672
673
  var nextParams = transformParams ? transformParams(params) : params;
673
674
  run(nextParams);
674
675
  }, 300);
675
676
  }
676
677
  }
677
- }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
678
+ }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
679
+ var handleSelectFocus = function handleSelectFocus() {
680
+ if (useRequest) {
681
+ var queryBean = defaultParams || {};
682
+ var params = withPagination ? {
683
+ pageNum: 1,
684
+ pageSize: 50,
685
+ queryBean: queryBean
686
+ } : queryBean;
687
+ var nextParams = transformParams ? transformParams(params) : params;
688
+ // 减少请求条件一致时,且请求过时,focus的重复请求
689
+ if (!(0, _lodash.isEqual)(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
690
+ run(nextParams); // 触发 run 请求
691
+ defaultParamsRef.current = queryBean; // 更新缓存
692
+ }
693
+ setState({
694
+ isInit: false
695
+ });
696
+ }
697
+ };
698
+ var handleSelectSearch = (0, _lodash.debounce)(function (val) {
699
+ if (useRequest) {
700
+ var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
701
+ var params = withPagination ? {
702
+ pageNum: 1,
703
+ pageSize: 50,
704
+ queryBean: queryBean
705
+ } : queryBean;
706
+ var nextParams = transformParams ? transformParams(params) : params;
707
+ run(nextParams);
708
+ }
709
+ }, 1000);
678
710
  (0, _ahooks.useDebounceEffect)(function () {
679
711
  if (!value) {
680
712
  if (defaultOne) {
@@ -724,35 +756,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
724
756
  notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
725
757
  size: "small"
726
758
  }) : null,
727
- onFocus: function onFocus() {
728
- if (useRequest) {
729
- var _useRequest$options10;
730
- var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
731
- var params = withPagination ? {
732
- pageNum: 1,
733
- pageSize: 50,
734
- queryBean: queryBean
735
- } : queryBean;
736
- var nextParams = transformParams ? transformParams(params) : params;
737
- run(nextParams);
738
- setState({
739
- isInit: false
740
- });
741
- }
742
- },
743
- onSearch: (0, _lodash.debounce)(function (val) {
744
- if (useRequest) {
745
- var _useRequest$options11;
746
- var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
747
- var params = withPagination ? {
748
- pageNum: 1,
749
- pageSize: 50,
750
- queryBean: queryBean
751
- } : queryBean;
752
- var nextParams = transformParams ? transformParams(params) : params;
753
- run(nextParams);
754
- }
755
- }, 2000),
759
+ onFocus: handleSelectFocus,
760
+ onSearch: handleSelectSearch,
756
761
  style: {
757
762
  width: isView || disabled ? '100%' : 'calc(100% - 30px)'
758
763
  }
@@ -13,6 +13,10 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
13
13
  isView?: boolean;
14
14
  showTime?: any;
15
15
  valueType?: any;
16
+ /**
17
+ * 是否限制时间范围
18
+ */
19
+ limit?: boolean;
16
20
  };
17
21
  type Value = [Moment?, Moment?, boolean?] | null;
18
22
  type ValueStr = [string?, string?, string?] | null;
@@ -19,7 +19,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
19
19
  var _Container = _interopRequireDefault(require("../../Container"));
20
20
  var _locale = _interopRequireDefault(require("../../../../locale"));
21
21
  var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
22
- var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
22
+ var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
23
23
  var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
24
24
  var useControlled = function useControlled(props) {
25
25
  var _useState = (0, _react.useState)(),
@@ -59,6 +59,8 @@ var ProRangeLimit = function ProRangeLimit(props) {
59
59
  otherProps = props.otherProps,
60
60
  _props$separator = props.separator,
61
61
  separator = _props$separator === void 0 ? '~' : _props$separator,
62
+ _props$limit = props.limit,
63
+ limit = _props$limit === void 0 ? true : _props$limit,
62
64
  rest = (0, _objectWithoutProperties2.default)(props, _excluded);
63
65
  var _ref = _ProForm.default.useFieldProps() || {},
64
66
  isViewCon = _ref.isView,
@@ -176,7 +178,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
176
178
  format: _format,
177
179
  value: value,
178
180
  onChange: handleRangeChange
179
- })), (0, _jsxRuntime.jsx)("div", {
181
+ })), limit && (0, _jsxRuntime.jsx)("div", {
180
182
  className: className,
181
183
  children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
182
184
  checked: _isForever,
@@ -18,6 +18,10 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
18
18
  otherProps?: ProFormOtherProps;
19
19
  mode?: 'DatePicker';
20
20
  isView?: boolean;
21
+ /**
22
+ * 是否限制时间范围
23
+ */
24
+ limit?: boolean;
21
25
  } & TimePickerProps & {
22
26
  showTime?: PickerPanelDateProps<Moment>['showTime'];
23
27
  showNow?: boolean;
@@ -21,7 +21,7 @@ var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
21
21
  var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
22
22
  var _locale = _interopRequireDefault(require("../../../../locale"));
23
23
  var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
24
- var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
24
+ var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
25
25
  _excluded2 = ["mode"];
26
26
  // 永久有效默认值
27
27
  var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
@@ -35,6 +35,8 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
35
35
  _props$valueType = props.valueType,
36
36
  valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
37
37
  otherProps = props.otherProps,
38
+ _props$limit = props.limit,
39
+ limit = _props$limit === void 0 ? true : _props$limit,
38
40
  rest = (0, _objectWithoutProperties2.default)(props, _excluded);
39
41
  var _ref = _ProForm.default.useFieldProps() || {},
40
42
  isViewCon = _ref.isView,
@@ -131,7 +133,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
131
133
  format: _format,
132
134
  value: value,
133
135
  onChange: onChange
134
- })), (0, _jsxRuntime.jsx)("div", {
136
+ })), limit && (0, _jsxRuntime.jsx)("div", {
135
137
  className: className,
136
138
  children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
137
139
  checked: isForever,
@@ -10,6 +10,8 @@ interface Props<T = any> {
10
10
  form: FormInstance<T>;
11
11
  expand?: boolean | number;
12
12
  colProps?: ColProps;
13
+ /** 列宽占比 */
14
+ span?: number;
13
15
  viewEmpty?: React.ReactNode;
14
16
  openState?: boolean;
15
17
  labelWidth?: string | number;
@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
17
17
  var _utils = require("../../utils");
18
18
  var _useFieldProps = require("../../utils/useFieldProps");
19
19
  var _locale = _interopRequireDefault(require("../../../locale"));
20
- var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
20
+ var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
21
21
  var RenderFields = function RenderFields(props) {
22
22
  var isView = props.isView,
23
23
  _props$columns = props.columns,
@@ -83,6 +83,7 @@ var RenderFields = function RenderFields(props) {
83
83
  columnRequired = column.required,
84
84
  confirm = column.confirm,
85
85
  desensitization = column.desensitization,
86
+ span = column.span,
86
87
  otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
87
88
  var component = column.component;
88
89
  var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -177,7 +178,9 @@ var RenderFields = function RenderFields(props) {
177
178
  if (!TargetComponent) {
178
179
  return [];
179
180
  }
180
- var _colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
181
+ var _colProps = span ? {
182
+ span: span
183
+ } : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
181
184
  // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
182
185
  var otherProps = {
183
186
  label: _formItemProps.label,
@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
182
182
  }) => React.ReactElement<any, any> | string | undefined | null;
183
183
  viewType?: ViewType;
184
184
  colProps?: ColProps;
185
+ /** 列宽占比 */
186
+ span?: number;
185
187
  /** 依赖刷新字段列表 */
186
188
  dependNames?: NamePath[];
187
189
  /**
@@ -265,6 +267,8 @@ export interface RenderProps<Values = any> {
265
267
  disabledStrictly?: boolean;
266
268
  [name: string]: any;
267
269
  };
270
+ /** 列宽占比 */
271
+ span?: number;
268
272
  show?: boolean | ((values: Values, { form, index, namePath, }: {
269
273
  form: FormInstance<Values>;
270
274
  index?: number;
@@ -161,7 +161,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
161
161
  if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
162
162
  return;
163
163
  }
164
- fetchFunction.run(defaultParams);
164
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
165
+ fetchFunction.run(params);
165
166
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
166
167
  // disable默认值
167
168
  if (defaultDisableValue) {
@@ -124,8 +124,7 @@ function useAntdTable(service, options, useRequestOptions) {
124
124
  }, [extraParams]);
125
125
  // 调接口
126
126
  var result = (0, _ahooks.useRequest)(service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
127
- debounceWait: 300,
128
- refreshDeps: [curService, curExtraParams]
127
+ debounceWait: 300
129
128
  }, useRequestOptions), {}, {
130
129
  defaultParams: [getTransformParams()],
131
130
  onSuccess: function onSuccess(res, params) {
@@ -158,6 +157,14 @@ function useAntdTable(service, options, useRequestOptions) {
158
157
  selectedRowKeys: []
159
158
  });
160
159
  }, []);
160
+ /**
161
+ * 手动触发时,手动调用run
162
+ */
163
+ (0, _react.useEffect)(function () {
164
+ if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
165
+ run(getTransformParams());
166
+ }
167
+ }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
161
168
  (0, _ahooks.useDeepCompareEffect)(function () {
162
169
  if (allSelected) {
163
170
  var filterList = data.filter(function (item) {
@@ -91,10 +91,11 @@ var ProTabs = function ProTabs(props, ref) {
91
91
  var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
92
92
  defaultParams = _ref.defaultParams,
93
93
  manual = _ref.manual;
94
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
94
95
  if (manual || !useRequest) {
95
96
  return;
96
97
  }
97
- fetchFunction.run(defaultParams);
98
+ fetchFunction.run(params);
98
99
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
99
100
  (0, _react.useImperativeHandle)(ref, function () {
100
101
  return {
@@ -174,11 +174,12 @@ var ProTree = function ProTree(props) {
174
174
  var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
175
175
  defaultParams = _ref.defaultParams,
176
176
  manual = _ref.manual;
177
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
177
178
  if (manual) {
178
179
  return;
179
180
  }
180
181
  // 执行用户配置的枚举服务,拉取枚举数据进行更新
181
- fetchFunction.run(defaultParams);
182
+ fetchFunction.run(params);
182
183
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
183
184
  var handleSignalSelect = function handleSignalSelect(value) {
184
185
  var checkedValues = [];
@@ -219,8 +219,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
219
219
  // 如果配置手动加载,不执行请求
220
220
  var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
221
221
  defaultParams = _ref4.defaultParams;
222
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
222
223
  // 执行用户配置的枚举服务,拉取枚举数据进行更新
223
- fetchFunction.run(defaultParams);
224
+ fetchFunction.run(params);
224
225
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
225
226
  // disable默认值
226
227
  if (defaultDisableValue) {
@@ -168,11 +168,12 @@ var ProTreeModal = function ProTreeModal(props) {
168
168
  var _ref = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
169
169
  defaultParams = _ref.defaultParams,
170
170
  manual = _ref.manual;
171
+ var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
171
172
  if (manual) {
172
173
  return;
173
174
  }
174
175
  // 执行用户配置的枚举服务,拉取枚举数据进行更新
175
- fetchFunction.run(defaultParams);
176
+ fetchFunction.run(params);
176
177
  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
177
178
  (0, _react.useEffect)(function () {
178
179
  setState({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.11.6",
3
+ "version": "3.11.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",