@teamix/pro 1.4.7 → 1.4.10

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.
package/dist/pro.js CHANGED
@@ -63747,12 +63747,9 @@ var FieldDate = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forwar
63747
63747
  if (type === 'timeRange') {
63748
63748
  if (mode === 'edit') {
63749
63749
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
63750
- style: {
63751
- border: '1px solid #ddd',
63752
- display: 'inline-block'
63753
- },
63754
63750
  ref: ref,
63755
63751
  className: classnames__WEBPACK_IMPORTED_MODULE_2___default()({
63752
+ 'teamix-pro-field-time-range': true,
63756
63753
  'teamix-pro-field-date': true,
63757
63754
  'teamix-pro-field-layout-compact': true
63758
63755
  })
@@ -70610,6 +70607,11 @@ function mappingOptions(fieldVal, render, options, beforeFormatter, customOption
70610
70607
 
70611
70608
  if (render && (render === null || render === void 0 ? void 0 : render.type) === 'warningLevelTag') {
70612
70609
  return getNodeForRender(value, targetOptions, render, renderWarningLevelTag);
70610
+ } // 输出 event level tag
70611
+
70612
+
70613
+ if (render && (render === null || render === void 0 ? void 0 : render.type) === 'eventLevelTag') {
70614
+ return getNodeForRender(value, targetOptions, render, renderEventLevelTag);
70613
70615
  } // 输出 circle
70614
70616
 
70615
70617
 
@@ -70699,14 +70701,16 @@ var renderTag = function renderTag(item, render) {
70699
70701
  if (_typeof(render.color) === 'object') {
70700
70702
  return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)(_objectSpread({
70701
70703
  type: 'normal',
70702
- children: item
70704
+ children: item,
70705
+ size: render.size
70703
70706
  }, render.color));
70704
70707
  }
70705
70708
 
70706
70709
  return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
70707
70710
  color: render.color,
70708
70711
  type: 'normal',
70709
- children: item
70712
+ children: item,
70713
+ size: render.size
70710
70714
  });
70711
70715
  };
70712
70716
  /**
@@ -70735,7 +70739,31 @@ var renderWarningLevelTag = function renderWarningLevelTag(item, render) {
70735
70739
  return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
70736
70740
  type: 'normal',
70737
70741
  children: formatLabel(item),
70738
- className: "custom-field-tag-".concat(item)
70742
+ className: "custom-field-tag-".concat(item),
70743
+ size: render.size
70744
+ });
70745
+ };
70746
+ /**
70747
+ * 渲渲染事件等级tag
70748
+ * @param item 输出的文本
70749
+ * @param render Field的render。此时render一定是ProFieldRenderProps类型
70750
+ * @param beforeFormatter 开发者传入的最终输出前的处理
70751
+ * @returns
70752
+ */
70753
+
70754
+
70755
+ var renderEventLevelTag = function renderEventLevelTag(item, render) {
70756
+ if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
70757
+ var _render$emptyText6;
70758
+
70759
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText6 = render.emptyText) !== null && _render$emptyText6 !== void 0 ? _render$emptyText6 : '');
70760
+ }
70761
+
70762
+ return (0,_commonComponents__WEBPACK_IMPORTED_MODULE_8__/* .renderTags */ .as)({
70763
+ type: 'normal',
70764
+ children: item,
70765
+ className: "custom-field-tag-event-level custom-field-tag-event-level-".concat(item),
70766
+ size: render.size
70739
70767
  });
70740
70768
  };
70741
70769
  /**
@@ -70761,9 +70789,9 @@ var renderStatusTag = function renderStatusTag(item, render) {
70761
70789
  var colorTypeIsPreset = rules.test(color !== null && color !== void 0 ? color : '');
70762
70790
 
70763
70791
  if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
70764
- var _render$emptyText6;
70792
+ var _render$emptyText7;
70765
70793
 
70766
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText6 = render.emptyText) !== null && _render$emptyText6 !== void 0 ? _render$emptyText6 : '');
70794
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText7 = render.emptyText) !== null && _render$emptyText7 !== void 0 ? _render$emptyText7 : '');
70767
70795
  }
70768
70796
 
70769
70797
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_status_tag__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _objectSpread(_objectSpread({
@@ -70800,9 +70828,9 @@ var renderStatusIconTag = function renderStatusIconTag(item, render) {
70800
70828
  var colorTypeIsPreset = rules.test(processColor !== null && processColor !== void 0 ? processColor : '');
70801
70829
 
70802
70830
  if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
70803
- var _render$emptyText7;
70831
+ var _render$emptyText8;
70804
70832
 
70805
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText7 = render.emptyText) !== null && _render$emptyText7 !== void 0 ? _render$emptyText7 : '');
70833
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText8 = render.emptyText) !== null && _render$emptyText8 !== void 0 ? _render$emptyText8 : '');
70806
70834
  }
70807
70835
 
70808
70836
  var colorObject = {};
@@ -70837,9 +70865,9 @@ var renderCircle = function renderCircle(item, render) {
70837
70865
  var color = render.color;
70838
70866
 
70839
70867
  if ((0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNull */ .Ft)(item)) {
70840
- var _render$emptyText8;
70868
+ var _render$emptyText9;
70841
70869
 
70842
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText8 = render.emptyText) !== null && _render$emptyText8 !== void 0 ? _render$emptyText8 : '');
70870
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, (_render$emptyText9 = render.emptyText) !== null && _render$emptyText9 !== void 0 ? _render$emptyText9 : '');
70843
70871
  }
70844
70872
 
70845
70873
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Circle__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, _objectSpread(_objectSpread({}, (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .hasProps */ .s_)({
@@ -76036,6 +76064,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
76036
76064
 
76037
76065
 
76038
76066
 
76067
+ var toJS = _form__WEBPACK_IMPORTED_MODULE_3__/* .formilyReactive.toJS */ .SP.toJS;
76039
76068
 
76040
76069
  function getDefaultFormPropsByDialogSize(size) {
76041
76070
  if (size === 'small') {
@@ -76182,51 +76211,55 @@ function useDialogFormAction(action, context) {
76182
76211
  innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
76183
76212
  var _innerFormRef$current;
76184
76213
 
76185
- var beforeRequestContext, requestContext;
76214
+ var beforeRequestContext, fields, requestContext;
76186
76215
  return regeneratorRuntime.wrap(function _callee$(_context) {
76187
76216
  while (1) {
76188
76217
  switch (_context.prev = _context.next) {
76189
76218
  case 0:
76219
+ fields = toJS((_innerFormRef$current = innerFormRef.current) == null ? void 0 : _innerFormRef$current.values);
76220
+
76190
76221
  if (!propsBeforeRequest) {
76191
- _context.next = 13;
76222
+ _context.next = 14;
76192
76223
  break;
76193
76224
  }
76194
76225
 
76195
- _context.prev = 1;
76196
- _context.next = 4;
76197
- return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.resolveMaybePromiseMethod)(propsBeforeRequest, context);
76226
+ _context.prev = 2;
76227
+ _context.next = 5;
76228
+ return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.resolveMaybePromiseMethod)(propsBeforeRequest, _extends({}, context, {
76229
+ fields: fields
76230
+ }));
76198
76231
 
76199
- case 4:
76232
+ case 5:
76200
76233
  beforeRequestContext = _context.sent;
76201
- _context.next = 10;
76234
+ _context.next = 11;
76202
76235
  break;
76203
76236
 
76204
- case 7:
76205
- _context.prev = 7;
76206
- _context.t0 = _context["catch"](1);
76237
+ case 8:
76238
+ _context.prev = 8;
76239
+ _context.t0 = _context["catch"](2);
76207
76240
  beforeRequestContext = false;
76208
76241
 
76209
- case 10:
76242
+ case 11:
76210
76243
  if (!(beforeRequestContext === false)) {
76211
- _context.next = 13;
76244
+ _context.next = 14;
76212
76245
  break;
76213
76246
  }
76214
76247
 
76215
76248
  reject(false);
76216
76249
  return _context.abrupt("return");
76217
76250
 
76218
- case 13:
76251
+ case 14:
76219
76252
  requestContext = Object.assign({
76220
- fields: (_innerFormRef$current = innerFormRef.current) == null ? void 0 : _innerFormRef$current.values
76253
+ fields: fields
76221
76254
  }, typeof beforeRequestContext === 'object' ? beforeRequestContext : {});
76222
76255
  resolve(requestContext);
76223
76256
 
76224
- case 15:
76257
+ case 16:
76225
76258
  case "end":
76226
76259
  return _context.stop();
76227
76260
  }
76228
76261
  }
76229
- }, _callee, null, [[1, 7]]);
76262
+ }, _callee, null, [[2, 8]]);
76230
76263
  })))["catch"](function () {
76231
76264
  resolve(false);
76232
76265
  });
@@ -76321,7 +76354,7 @@ function useDialogTableAction(action, context) {
76321
76354
  /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
76322
76355
  /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
76323
76356
  /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
76324
- var _excluded = ["trigger", "url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
76357
+ var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
76325
76358
  _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
76326
76359
 
76327
76360
  function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -76356,7 +76389,9 @@ var FooterForm = function FooterForm(props) {
76356
76389
  var schema = props.schema,
76357
76390
  context = props.context,
76358
76391
  formRef = props.formRef;
76359
- var form = (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
76392
+ var form = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
76393
+ return (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
76394
+ }, []);
76360
76395
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
76361
76396
  formRef.current = form;
76362
76397
  }, []);
@@ -76388,6 +76423,7 @@ function useDialogAction(action, actionContext, hasForm) {
76388
76423
 
76389
76424
  var trigger = action.trigger,
76390
76425
  url = action.url,
76426
+ customRequest = action.customRequest,
76391
76427
  method = action.method,
76392
76428
  params = action.params,
76393
76429
  data = action.data,
@@ -76398,6 +76434,8 @@ function useDialogAction(action, actionContext, hasForm) {
76398
76434
  formatResult = action.formatResult,
76399
76435
  onSuccess = action.onSuccess,
76400
76436
  onError = action.onError,
76437
+ propsOnOk = action.onOk,
76438
+ propsOnCancel = action.onCancel,
76401
76439
  others = _objectWithoutPropertiesLoose(action, _excluded);
76402
76440
 
76403
76441
  var _getTargetValue = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(others, context),
@@ -76478,33 +76516,34 @@ function useDialogAction(action, actionContext, hasForm) {
76478
76516
 
76479
76517
  case 6:
76480
76518
  onFinish && onFinish();
76519
+ propsOnOk && propsOnOk(context);
76481
76520
  resolve(true);
76482
- _context.next = 18;
76521
+ _context.next = 19;
76483
76522
  break;
76484
76523
 
76485
- case 10:
76486
- _context.prev = 10;
76524
+ case 11:
76525
+ _context.prev = 11;
76487
76526
  _context.t0 = _context["catch"](2);
76488
76527
  setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form,则直接关闭弹窗
76489
76528
 
76490
76529
  if (!(beforeRequest && !hasForm)) {
76491
- _context.next = 16;
76530
+ _context.next = 17;
76492
76531
  break;
76493
76532
  }
76494
76533
 
76495
76534
  resolve(true);
76496
76535
  return _context.abrupt("return");
76497
76536
 
76498
- case 16:
76537
+ case 17:
76499
76538
  resolve(false);
76500
76539
  return _context.abrupt("return");
76501
76540
 
76502
- case 18:
76541
+ case 19:
76503
76542
  case "end":
76504
76543
  return _context.stop();
76505
76544
  }
76506
76545
  }
76507
- }, _callee, null, [[2, 10]]);
76546
+ }, _callee, null, [[2, 11]]);
76508
76547
  }));
76509
76548
 
76510
76549
  return function (_x) {
@@ -76527,7 +76566,9 @@ function useDialogAction(action, actionContext, hasForm) {
76527
76566
  });
76528
76567
  var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
76529
76568
 
76530
- var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
76569
+ var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
76570
+ propsOnCancel && propsOnCancel(context);
76571
+ }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
76531
76572
  className: "teamix-pro-dialog-before-content"
76532
76573
  }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
76533
76574
  className: "teamix-pro-dialog-message"
@@ -78457,9 +78498,7 @@ var Text = function Text(_ref) {
78457
78498
  /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
78458
78499
  /* harmony import */ var _ProForm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(44344);
78459
78500
  /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(51344);
78460
- var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
78461
-
78462
- function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
78501
+ var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "gridProps", "forceClear"];
78463
78502
 
78464
78503
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
78465
78504
 
@@ -78473,6 +78512,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
78473
78512
 
78474
78513
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
78475
78514
 
78515
+ function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
78516
+
78476
78517
  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; }
78477
78518
 
78478
78519
 
@@ -78493,6 +78534,8 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
78493
78534
  wrapperAlign = _ref.wrapperAlign,
78494
78535
  labelCol = _ref.labelCol,
78495
78536
  wrapperCol = _ref.wrapperCol,
78537
+ breakpoints = _ref.breakpoints,
78538
+ gridProps = _ref.gridProps,
78496
78539
  forceClear = _ref.forceClear,
78497
78540
  otherProps = _objectWithoutPropertiesLoose(_ref, _excluded);
78498
78541
 
@@ -78501,13 +78544,13 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
78501
78544
  return [{
78502
78545
  name: 'FormGrid',
78503
78546
  component: 'FormGrid',
78504
- props: {
78547
+ props: _extends({
78505
78548
  breakpoints: [480, 720, 990, 1200, Infinity],
78506
78549
  maxColumns: [1, 2, 3, 3, 4],
78507
78550
  maxWidth: [480, 360, 330, 400],
78508
78551
  columnGap: 16,
78509
78552
  rowGap: 12
78510
- },
78553
+ }, gridProps),
78511
78554
  children: [].concat(_toConsumableArray(schema), [{
78512
78555
  component: 'FormGrid.GridColumn',
78513
78556
  props: {
@@ -78539,15 +78582,22 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
78539
78582
  }];
78540
78583
  }, [schema, onReset]);
78541
78584
  var getTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
78542
- return {
78585
+ return breakpoints === true ? {
78543
78586
  breakpoints: [990],
78544
78587
  layout: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['vertical'], layout),
78545
78588
  labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
78546
78589
  wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
78547
78590
  labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)([24], labelCol),
78548
78591
  wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_3__/* .mergeArrayValue */ .UT)([24], wrapperCol)
78592
+ } : {
78593
+ breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isBool)(breakpoints) ? undefined : breakpoints,
78594
+ layout: layout,
78595
+ labelAlign: labelAlign,
78596
+ wrapperAlign: wrapperAlign,
78597
+ labelCol: labelCol,
78598
+ wrapperCol: wrapperCol
78549
78599
  };
78550
- }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
78600
+ }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
78551
78601
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
78552
78602
  className: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.cls)(prefixCls(), props.className),
78553
78603
  schema: gridSchema,
@@ -78557,6 +78607,7 @@ var AdvancedFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(fu
78557
78607
  }));
78558
78608
  });
78559
78609
  AdvancedFilter.defaultProps = {
78610
+ breakpoints: true,
78560
78611
  layout: 'horizontal',
78561
78612
  labelAlign: 'right',
78562
78613
  labelCol: 6,
@@ -79944,20 +79995,20 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
79944
79995
  var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(onSubmit, context); // todo 需要formily支持断点下的属性更新
79945
79996
 
79946
79997
  var getTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
79947
- return breakpoints ? {
79948
- breakpoints: breakpoints,
79949
- layout: layout,
79950
- labelAlign: labelAlign,
79951
- wrapperAlign: wrapperAlign,
79952
- labelCol: labelCol,
79953
- wrapperCol: wrapperCol
79954
- } : {
79998
+ return breakpoints === true ? {
79955
79999
  breakpoints: [480],
79956
80000
  layout: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['vertical'], layout),
79957
80001
  labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
79958
80002
  wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
79959
80003
  labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], labelCol),
79960
80004
  wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], wrapperCol)
80005
+ } : {
80006
+ breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isBool)(breakpoints) ? undefined : breakpoints,
80007
+ layout: layout,
80008
+ labelAlign: labelAlign,
80009
+ wrapperAlign: wrapperAlign,
80010
+ labelCol: labelCol,
80011
+ wrapperCol: wrapperCol
79961
80012
  };
79962
80013
  }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
79963
80014
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
@@ -79993,7 +80044,7 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
79993
80044
  });
79994
80045
  });
79995
80046
  }
79996
- }, [onChange]);
80047
+ }, [onChange, form]);
79997
80048
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
79998
80049
  // 配置国际化
79999
80050
  (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.setValidateLanguage)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getLanguage)() || 'zh-cn');
@@ -80012,8 +80063,9 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
80012
80063
  });
80013
80064
  ProForm.defaultProps = {
80014
80065
  colon: false,
80015
- labelAlign: 'left',
80016
- validateFirst: true
80066
+ validateFirst: true,
80067
+ breakpoints: true,
80068
+ labelAlign: 'left'
80017
80069
  };
80018
80070
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProForm);
80019
80071
 
@@ -82335,6 +82387,8 @@ __webpack_require__.r(__webpack_exports__);
82335
82387
  /* harmony import */ var _nocode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(59047);
82336
82388
  /* harmony import */ var _templates__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(3397);
82337
82389
  /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(89227);
82390
+ var _window;
82391
+
82338
82392
 
82339
82393
 
82340
82394
 
@@ -82354,7 +82408,10 @@ __webpack_require__.r(__webpack_exports__);
82354
82408
 
82355
82409
  // 设置图标源
82356
82410
 
82357
- _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConfig(_utils__WEBPACK_IMPORTED_MODULE_10__/* ["default"].getTeamixIconConfig */ .ZP.getTeamixIconConfig());
82411
+ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
82412
+ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConfig(_utils__WEBPACK_IMPORTED_MODULE_10__/* ["default"].getTeamixIconConfig */ .ZP.getTeamixIconConfig());
82413
+ }
82414
+
82358
82415
 
82359
82416
 
82360
82417
 
@@ -82368,7 +82425,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
82368
82425
 
82369
82426
 
82370
82427
 
82371
- var version = '1.4.7';
82428
+ var version = '1.4.10';
82372
82429
 
82373
82430
 
82374
82431
  /***/ }),
@@ -87178,7 +87235,7 @@ var Filter = function Filter(props) {
87178
87235
  btn: true
87179
87236
  }),
87180
87237
  onClick: function onClick() {
87181
- var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2;
87238
+ var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2, _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
87182
87239
 
87183
87240
  (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterDataSource == null ? void 0 : _actionRef$current2.filterDataSource(column.dataIndex); // 先获取此列的param
87184
87241
 
@@ -87197,24 +87254,18 @@ var Filter = function Filter(props) {
87197
87254
  rules: selected,
87198
87255
  params: param
87199
87256
  }, _extends2)));
87257
+ var targetPageKey = 'currentPage';
87258
+ var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
87200
87259
 
87201
- if (selected.length > 0) {
87202
- var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
87203
-
87204
- var targetPageKey = 'currentPage';
87205
- var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
87206
-
87207
- if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
87208
- targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
87209
- } // 发送请求
87210
-
87260
+ if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
87261
+ targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
87262
+ } // 发送请求
87211
87263
 
87212
- (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
87213
- (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
87214
87264
 
87215
- (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
87216
- }
87265
+ (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
87266
+ (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
87217
87267
 
87268
+ (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
87218
87269
  setVisible(false);
87219
87270
  }
87220
87271
  }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('ok')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Button, {
@@ -87356,11 +87407,9 @@ var Layout = function Layout(props) {
87356
87407
  setTimeout(function () {
87357
87408
  var _actionRef$current;
87358
87409
 
87359
- if ((_actionRef$current = actionRef.current) != null && _actionRef$current.getState != null && _actionRef$current.getState().fullScreenState) {
87360
- var _actionRef$current2;
87361
-
87362
- (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight();
87363
- }
87410
+ // if (actionRef.current?.getState?.().fullScreenState) {
87411
+ // 偏移量8像素为面板展开后的下margin
87412
+ (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current.resetTableMaxBodyHeight(expand ? 8 : 0); // }
87364
87413
  });
87365
87414
  (dataFilter == null ? void 0 : dataFilter.onExpand) && (dataFilter == null ? void 0 : dataFilter.onExpand(expand));
87366
87415
  },
@@ -87374,13 +87423,11 @@ var Layout = function Layout(props) {
87374
87423
  onExpand: function onExpand(expand) {
87375
87424
  // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
87376
87425
  setTimeout(function () {
87377
- var _actionRef$current3;
87426
+ var _actionRef$current2;
87378
87427
 
87379
- if ((_actionRef$current3 = actionRef.current) != null && _actionRef$current3.getState != null && _actionRef$current3.getState().fullScreenState) {
87380
- var _actionRef$current4;
87381
-
87382
- (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current4.resetTableMaxBodyHeight();
87383
- }
87428
+ // if (actionRef.current?.getState?.().fullScreenState) {
87429
+ // 偏移量8像素为面板展开后的下margin
87430
+ (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight == null ? void 0 : _actionRef$current2.resetTableMaxBodyHeight(expand ? 8 : 0); // }
87384
87431
  });
87385
87432
  (dataFilter == null ? void 0 : dataFilter.onExpand) && (dataFilter == null ? void 0 : dataFilter.onExpand(expand));
87386
87433
  },
@@ -87442,9 +87489,13 @@ var Layout = function Layout(props) {
87442
87489
  }
87443
87490
  };
87444
87491
 
87445
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
87446
- className: cls()
87447
- }, renderLayout());
87492
+ if (dataFilter != null && dataFilter.schema || mainAction || header || extra) {
87493
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
87494
+ className: cls()
87495
+ }, renderLayout());
87496
+ }
87497
+
87498
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null);
87448
87499
  };
87449
87500
 
87450
87501
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(Layout));
@@ -88673,7 +88724,7 @@ var ToolBar = function ToolBar(props) {
88673
88724
  /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28266);
88674
88725
  /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
88675
88726
  /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2781);
88676
- var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
88727
+ var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody"];
88677
88728
 
88678
88729
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
88679
88730
 
@@ -88831,6 +88882,8 @@ var ProTable = function ProTable(props) {
88831
88882
  propsSize = _props$size === void 0 ? 'medium' : _props$size,
88832
88883
  disableSelectAll = props.disableSelectAll,
88833
88884
  context = props.context,
88885
+ _props$fixedTableBody = props.fixedTableBody,
88886
+ fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
88834
88887
  otherProps = _objectWithoutPropertiesLoose(props, _excluded);
88835
88888
 
88836
88889
  var targetPageKey = pageKey || globalPageKey;
@@ -88900,9 +88953,34 @@ var ProTable = function ProTable(props) {
88900
88953
  actionRefCallback = _useState12[0]; // 存储定时器 id
88901
88954
 
88902
88955
 
88903
- var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 获取header高度,用作全屏吸底吸底高度计算
88956
+ var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
88957
+ var onResize = null;
88958
+ (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
88959
+ getHeaderHeight(fullscreenState);
88960
+
88961
+ if (window.onresize) {
88962
+ onResize = window.onresize;
88963
+
88964
+ window.onresize = function () {
88965
+ onResize == null ? void 0 : onResize();
88966
+ getHeaderHeight(fullscreenState);
88967
+ };
88968
+ } else {
88969
+ window.onresize = function () {
88970
+ getHeaderHeight(fullscreenState);
88971
+ };
88972
+ }
88973
+
88974
+ return function () {
88975
+ if (onResize) {
88976
+ window.onresize = onResize;
88977
+ } else {
88978
+ window.onresize = null;
88979
+ }
88980
+ };
88981
+ }, []); // 获取header高度,用作全屏吸底吸底高度计算以及固定body高度计算(滚动条在底部)
88904
88982
 
88905
- var getHeaderHeight = function getHeaderHeight() {
88983
+ var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
88906
88984
  var _tableDom$getElements, _tableDom$getElements2;
88907
88985
 
88908
88986
  var tableDom = tableRef.current;
@@ -88911,16 +88989,29 @@ var ProTable = function ProTable(props) {
88911
88989
  base: true
88912
88990
  });
88913
88991
  var tableHeaderDom = tableDom == null ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) == null ? void 0 : _tableDom$getElements2[0];
88914
- return new Promise(function (resolve) {
88915
- setTimeout(function () {
88916
- var _headerDom$offsetHeig, _tableHeaderDom$offse;
88992
+ var pageContainerDom = document.querySelector('.teamix-pro-page-container-header');
88993
+ var teamixNavDom = document.querySelector('.teamix-nav-console');
88994
+ var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer');
88995
+ setTimeout(function () {
88996
+ var _headerDom$offsetHeig, _tableHeaderDom$offse;
88917
88997
 
88918
- var headerHeight = (_headerDom$offsetHeig = headerDom == null ? void 0 : headerDom.offsetHeight) != null ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
88998
+ var headerHeight = (_headerDom$offsetHeig = headerDom == null ? void 0 : headerDom.offsetHeight) != null ? _headerDom$offsetHeig : 0; // table表头默认一行。即42px
88919
88999
 
88920
- var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom == null ? void 0 : tableHeaderDom.offsetHeight) != null ? _tableHeaderDom$offse : 42;
88921
- resolve(headerHeight + tableHeaderHeight);
88922
- }, 50);
88923
- });
89000
+ var tableHeaderHeight = (_tableHeaderDom$offse = tableHeaderDom == null ? void 0 : tableHeaderDom.offsetHeight) != null ? _tableHeaderDom$offse : 42;
89001
+ var footerRowSelectionHeight = (footerRowSelectionDom == null ? void 0 : footerRowSelectionDom.offsetHeight) || 50; // 固定表格主体高度
89002
+
89003
+ if (fixedTableBody && !isFullscreen) {
89004
+ var _pageContainerDom$off, _teamixNavDom$offsetH;
89005
+
89006
+ // 16px 为 padding
89007
+ var pageHeaderHeight = ((_pageContainerDom$off = pageContainerDom == null ? void 0 : pageContainerDom.offsetHeight) != null ? _pageContainerDom$off : 0) + 16;
89008
+ var teamixNavHeight = (_teamixNavDom$offsetH = teamixNavDom == null ? void 0 : teamixNavDom.offsetHeight) != null ? _teamixNavDom$offsetH : 0;
89009
+ setHeaderHeight(headerHeight + tableHeaderHeight + pageHeaderHeight + teamixNavHeight + footerRowSelectionHeight + 16 + (offset != null ? offset : 0));
89010
+ } else {
89011
+ // 24px 为 padding
89012
+ setHeaderHeight(headerHeight + tableHeaderHeight + footerRowSelectionHeight + 24 + (offset != null ? offset : 0));
89013
+ }
89014
+ }, 50);
88924
89015
  }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
88925
89016
 
88926
89017
 
@@ -89112,10 +89203,8 @@ var ProTable = function ProTable(props) {
89112
89203
 
89113
89204
  var state = !fullscreenState; // 全屏时需要重新计算header高度
89114
89205
 
89115
- getHeaderHeight().then(function (height) {
89116
- setHeaderHeight(height);
89117
- });
89118
89206
  setFullscreenState(state);
89207
+ getHeaderHeight(state);
89119
89208
  actionRef == null ? void 0 : (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.setState == null ? void 0 : _actionRef$current2.setState('fullScreenState', state);
89120
89209
  return state;
89121
89210
  },
@@ -89186,10 +89275,8 @@ var ProTable = function ProTable(props) {
89186
89275
  normalDataFilterForm: normalDataFilterForm,
89187
89276
  fullscreenDataFilterForm: fullscreenDataFilterForm,
89188
89277
  filterEnableRef: filterEnableRef,
89189
- resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
89190
- getHeaderHeight().then(function (height) {
89191
- setHeaderHeight(height);
89192
- });
89278
+ resetTableMaxBodyHeight: function resetTableMaxBodyHeight(offset) {
89279
+ getHeaderHeight(fullscreenState, offset);
89193
89280
  }
89194
89281
  }); // 将 Actions 绑定到传入的 propsActionRef 中
89195
89282
 
@@ -89471,9 +89558,8 @@ var ProTable = function ProTable(props) {
89471
89558
  rowSelection: rowSelection,
89472
89559
  emptyContent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_EmptyContent__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, null),
89473
89560
  sortIcons: (0,_utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(),
89474
- fixedHeader: fullscreenState // 102px 为 底部 50px + 空格10px + 顶部 24px padding
89475
- ,
89476
- maxBodyHeight: "calc(100vh - 84px - " + headerHeight + "px)" // 过滤出可以传到 Table 的 Props
89561
+ fixedHeader: fullscreenState || fixedTableBody,
89562
+ maxBodyHeight: "calc(100vh - " + headerHeight + "px)" // 过滤出可以传到 Table 的 Props
89477
89563
 
89478
89564
  }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z)(), otherProps))));
89479
89565
  } else {
@@ -89620,7 +89706,7 @@ var ProTable = function ProTable(props) {
89620
89706
 
89621
89707
  }),
89622
89708
  ref: tableRef
89623
- }, renderTable(isFullScreen), footerSuctionState && footerSuction && !fullscreenState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && renderFooter(), fullscreenState && renderFooter());
89709
+ }, renderTable(isFullScreen), (footerSuctionState && footerSuction && !fullscreenState || fixedTableBody) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && !fullscreenState && !fixedTableBody && renderFooter(), fullscreenState && renderFooter());
89624
89710
  });
89625
89711
  };
89626
89712
 
@@ -92814,37 +92900,39 @@ function doCommonRequest(config, context, history, extraParams) {
92814
92900
  while (1) {
92815
92901
  switch (_context2.prev = _context2.next) {
92816
92902
  case 0:
92903
+ beforeRequestContext = false;
92904
+
92817
92905
  if (!beforeRequest) {
92818
- _context2.next = 13;
92906
+ _context2.next = 14;
92819
92907
  break;
92820
92908
  }
92821
92909
 
92822
- _context2.prev = 1;
92823
- _context2.next = 4;
92910
+ _context2.prev = 2;
92911
+ _context2.next = 5;
92824
92912
  return resolveMaybePromiseMethod(beforeRequest, context);
92825
92913
 
92826
- case 4:
92914
+ case 5:
92827
92915
  beforeRequestContext = _context2.sent;
92828
- _context2.next = 10;
92916
+ _context2.next = 11;
92829
92917
  break;
92830
92918
 
92831
- case 7:
92832
- _context2.prev = 7;
92833
- _context2.t0 = _context2["catch"](1);
92834
- beforeRequestContext = false;
92919
+ case 8:
92920
+ _context2.prev = 8;
92921
+ _context2.t0 = _context2["catch"](2);
92922
+ console.warn(_context2.t0);
92835
92923
 
92836
- case 10:
92924
+ case 11:
92837
92925
  if (!(beforeRequestContext === false)) {
92838
- _context2.next = 13;
92926
+ _context2.next = 14;
92839
92927
  break;
92840
92928
  }
92841
92929
 
92842
92930
  reject(false);
92843
92931
  return _context2.abrupt("return");
92844
92932
 
92845
- case 13:
92933
+ case 14:
92846
92934
  if (!(!url && !customRequest)) {
92847
- _context2.next = 17;
92935
+ _context2.next = 18;
92848
92936
  break;
92849
92937
  }
92850
92938
 
@@ -92855,7 +92943,7 @@ function doCommonRequest(config, context, history, extraParams) {
92855
92943
  resolve(true);
92856
92944
  return _context2.abrupt("return");
92857
92945
 
92858
- case 17:
92946
+ case 18:
92859
92947
  requestContext = Object.assign({}, context, typeof beforeRequestContext === 'object' ? beforeRequestContext : {});
92860
92948
  paramsWithContext = Object.assign({}, extraParams, handleExtendParmas(extendParams, requestContext), params, data);
92861
92949
  reuqestParams = (0,_getTargetValue__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(paramsWithContext, requestContext);
@@ -92894,7 +92982,7 @@ function doCommonRequest(config, context, history, extraParams) {
92894
92982
  }, requestContext));
92895
92983
  };
92896
92984
 
92897
- requestResult = customRequest ? customRequest(context) : (0,_request__WEBPACK_IMPORTED_MODULE_2__/* .request */ .WY)(_extends({}, config, requestConfig));
92985
+ requestResult = customRequest ? customRequest(requestContext) : (0,_request__WEBPACK_IMPORTED_MODULE_2__/* .request */ .WY)(_extends({}, config, requestConfig));
92898
92986
  requestResult.then( /*#__PURE__*/function () {
92899
92987
  var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(response) {
92900
92988
  var res;
@@ -92925,12 +93013,12 @@ function doCommonRequest(config, context, history, extraParams) {
92925
93013
  reject(error);
92926
93014
  });
92927
93015
 
92928
- case 25:
93016
+ case 26:
92929
93017
  case "end":
92930
93018
  return _context2.stop();
92931
93019
  }
92932
93020
  }
92933
- }, _callee2, null, [[1, 7]]);
93021
+ }, _callee2, null, [[2, 8]]);
92934
93022
  }));
92935
93023
 
92936
93024
  return function (_x, _x2) {