@teamix/pro 1.4.13 → 1.4.16

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 (45) hide show
  1. package/dist/pro.css +1 -1
  2. package/dist/pro.js +334 -92
  3. package/dist/pro.min.css +1 -1
  4. package/dist/pro.min.js +1 -1
  5. package/es/actions/base.d.ts +2 -1
  6. package/es/actions/base.js +11 -1
  7. package/es/actions/dialog.d.ts +2 -0
  8. package/es/actions/dialog.js +26 -1
  9. package/es/actions/drawer.js +7 -0
  10. package/es/form/ProForm/index.js +16 -32
  11. package/es/form/ProForm/index.scss +9 -2
  12. package/es/form/ProForm/useAutoLayout.d.ts +9 -0
  13. package/es/form/ProForm/useAutoLayout.js +114 -0
  14. package/es/form/SchemaForm/initializeArrayTable.js +42 -7
  15. package/es/form/typing.d.ts +4 -0
  16. package/es/index.d.ts +1 -1
  17. package/es/index.js +1 -1
  18. package/es/nocode/index.scss +2 -2
  19. package/es/nocode/pages/playground.js +1 -1
  20. package/es/nocode/pages/renderer.js +1 -1
  21. package/es/nocode/playground.js +1 -1
  22. package/es/table/components/Layout/index.js +12 -6
  23. package/es/table/components/QuickAction/index.js +1 -1
  24. package/es/table/index.js +31 -9
  25. package/lib/actions/base.d.ts +2 -1
  26. package/lib/actions/base.js +11 -1
  27. package/lib/actions/dialog.d.ts +2 -0
  28. package/lib/actions/dialog.js +27 -1
  29. package/lib/actions/drawer.js +8 -0
  30. package/lib/form/ProForm/index.js +15 -31
  31. package/lib/form/ProForm/index.scss +9 -2
  32. package/lib/form/ProForm/useAutoLayout.d.ts +9 -0
  33. package/lib/form/ProForm/useAutoLayout.js +124 -0
  34. package/lib/form/SchemaForm/initializeArrayTable.js +42 -7
  35. package/lib/form/typing.d.ts +4 -0
  36. package/lib/index.d.ts +1 -1
  37. package/lib/index.js +1 -1
  38. package/lib/nocode/index.scss +2 -2
  39. package/lib/nocode/pages/playground.js +1 -1
  40. package/lib/nocode/pages/renderer.js +1 -1
  41. package/lib/nocode/playground.js +1 -1
  42. package/lib/table/components/Layout/index.js +12 -6
  43. package/lib/table/components/QuickAction/index.js +1 -1
  44. package/lib/table/index.js +30 -8
  45. package/package.json +1 -1
package/dist/pro.js CHANGED
@@ -70772,7 +70772,7 @@ var renderEventLevelTag = function renderEventLevelTag(item, render) {
70772
70772
  type: 'normal',
70773
70773
  children: item,
70774
70774
  className: "custom-field-tag-event-level custom-field-tag-event-level-".concat(item),
70775
- size: (_sizeMap = sizeMap === null || sizeMap === void 0 ? void 0 : sizeMap[(_render$size = render === null || render === void 0 ? void 0 : render.size) !== null && _render$size !== void 0 ? _render$size : '']) !== null && _sizeMap !== void 0 ? _sizeMap : sizeMap
70775
+ size: (_sizeMap = sizeMap === null || sizeMap === void 0 ? void 0 : sizeMap[(_render$size = render === null || render === void 0 ? void 0 : render.size) !== null && _render$size !== void 0 ? _render$size : '']) !== null && _sizeMap !== void 0 ? _sizeMap : 'large'
70776
70776
  });
70777
70777
  };
70778
70778
  /**
@@ -72911,7 +72911,7 @@ var TagSelect = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.forwardRef)(f
72911
72911
  /* harmony import */ var _components_FieldMenuSelect__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(26229);
72912
72912
  /* harmony import */ var _components_FieldSelectGroup__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(98203);
72913
72913
  /* harmony import */ var _commonComponents__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(76457);
72914
- var _excluded = ["dataSource", "state", "tooltip", "tooltipLabel", "tooltipIcon", "tooltipIconSize"];
72914
+ var _excluded = ["dataSource", "state", "tooltip", "tooltipLabel", "tooltipIcon", "tooltipIconSize", "className", "style"];
72915
72915
 
72916
72916
  function ownKeys(object, enumerableOnly) {
72917
72917
  var keys = Object.keys(object);
@@ -73145,10 +73145,10 @@ function isDataSourceRemote(dataSource) {
73145
73145
  }
73146
73146
 
73147
73147
  var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwardRef(function (props, ref) {
73148
- var _getGlobalConfig, _transparentBase$clas, _cls;
73148
+ var _getGlobalConfig, _cls;
73149
73149
 
73150
73150
  var type = props.type,
73151
- layout = props.layout;
73151
+ layout = props.layout; // TODO 此处暂时移出className、style、data-。日后只透传需要的参数
73152
73152
 
73153
73153
  var dataSource = props.dataSource,
73154
73154
  state = props.state,
@@ -73156,6 +73156,8 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
73156
73156
  tooltipLabel = props.tooltipLabel,
73157
73157
  tooltipIcon = props.tooltipIcon,
73158
73158
  tooltipIconSize = props.tooltipIconSize,
73159
+ className = props.className,
73160
+ style = props.style,
73159
73161
  others = _objectWithoutProperties(props, _excluded);
73160
73162
 
73161
73163
  var proFieldRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 注册全局自定义组件
@@ -73184,23 +73186,35 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
73184
73186
  setLoadingRemote(false);
73185
73187
  });
73186
73188
  }
73187
- }, []);
73189
+ }, []); // TODO 目前先取出,后续直接透传最外层
73190
+
73191
+ var dataProps = Object.fromEntries(Object.entries(others).filter(function (_ref) {
73192
+ var _ref2 = _slicedToArray(_ref, 1),
73193
+ k = _ref2[0];
73194
+
73195
+ return /data-.+/.test(k);
73196
+ }));
73188
73197
 
73189
73198
  var newProps = _objectSpread({
73190
73199
  state: loadingRemote ? 'loading' : state,
73191
73200
  dataSource: loadingRemote ? [] : remoteDataSource || dataSource
73192
- }, others); // 此处暂时作为透传。日后会重构透传逻辑
73201
+ }, Object.fromEntries(Object.entries(others).filter(function (_ref3) {
73202
+ var _ref4 = _slicedToArray(_ref3, 1),
73203
+ k = _ref4[0];
73204
+
73205
+ return !/data-.+/.test(k);
73206
+ }))); // 此处暂时作为透传。日后会重构透传逻辑
73193
73207
 
73194
73208
 
73195
73209
  var transparentBase = newProps;
73196
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", _objectSpread(_objectSpread({
73210
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", _objectSpread(_objectSpread(_objectSpread({
73197
73211
  className: classnames__WEBPACK_IMPORTED_MODULE_1___default()((_cls = {
73198
73212
  'teamix-pro-field': true
73199
- }, _defineProperty(_cls, "teamix-pro-field-".concat(type === null || type === void 0 ? void 0 : type.toLowerCase()), true), _defineProperty(_cls, 'teamix-pro-field-compact', layout === 'compact'), _defineProperty(_cls, (_transparentBase$clas = transparentBase.className) !== null && _transparentBase$clas !== void 0 ? _transparentBase$clas : '', true), _defineProperty(_cls, 'teamix-pro-field-tooltip', tooltip), _defineProperty(_cls, 'teamix-test-request', isDataSourceRemote(dataSource)), _cls)),
73213
+ }, _defineProperty(_cls, "teamix-pro-field-".concat(type === null || type === void 0 ? void 0 : type.toLowerCase()), true), _defineProperty(_cls, 'teamix-pro-field-compact', layout === 'compact'), _defineProperty(_cls, 'teamix-pro-field-tooltip', tooltip), _defineProperty(_cls, 'teamix-test-request', isDataSourceRemote(dataSource)), _defineProperty(_cls, className, className), _cls)),
73200
73214
  ref: proFieldRef
73201
73215
  }, (0,_utils__WEBPACK_IMPORTED_MODULE_23__/* .hasProps */ .s_)({
73202
- style: transparentBase === null || transparentBase === void 0 ? void 0 : transparentBase.style
73203
- })), isDataSourceRemote(dataSource) ? {
73216
+ style: style
73217
+ })), dataProps), isDataSourceRemote(dataSource) ? {
73204
73218
  'data-teamix-test-request': "url=".concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.url, "&formatResult=").concat(!!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.formatResult)),
73205
73219
  'data-teamix-test-params': (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getTestRequestParams)(dataSource === null || dataSource === void 0 ? void 0 : dataSource.params),
73206
73220
  'data-teamix-test-data': (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getTestRequestData)('dataSource')
@@ -75916,14 +75930,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
75916
75930
 
75917
75931
 
75918
75932
  function eventHandler(action, actionContext, onTrigger) {
75919
- var _ref;
75933
+ var _baseProps;
75920
75934
 
75921
75935
  var _action$trigger = action.trigger,
75922
75936
  trigger = _action$trigger === void 0 ? 'onClick' : _action$trigger,
75923
75937
  preventDefault = action.preventDefault,
75924
75938
  stopPropagation = action.stopPropagation,
75925
75939
  beforeAction = action.beforeAction;
75926
- return _ref = {}, _ref["" + trigger] = function () {
75940
+ var openIdentifier = action.openIdentifier;
75941
+ var baseProps = (_baseProps = {}, _baseProps["" + trigger] = function () {
75927
75942
  var _2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(e) {
75928
75943
  var beforeActionContext;
75929
75944
  return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -75982,7 +75997,15 @@ function eventHandler(action, actionContext, onTrigger) {
75982
75997
  }
75983
75998
 
75984
75999
  return _;
75985
- }(), _ref;
76000
+ }(), _baseProps);
76001
+
76002
+ if (openIdentifier) {
76003
+ baseProps = Object.assign({}, baseProps, {
76004
+ id: openIdentifier
76005
+ });
76006
+ }
76007
+
76008
+ return baseProps;
75986
76009
  }
75987
76010
  /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = ((/* unused pure expression or super */ null && (eventHandler)));
75988
76011
 
@@ -76385,9 +76408,10 @@ function useDialogTableAction(action, context) {
76385
76408
  /* harmony import */ var _utils_message__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(94891);
76386
76409
  /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
76387
76410
  /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
76388
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
76411
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(95983);
76412
+ /* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(42341);
76389
76413
  var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
76390
- _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
76414
+ _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className", "openIdentifier"];
76391
76415
 
76392
76416
  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); }
76393
76417
 
@@ -76409,6 +76433,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
76409
76433
 
76410
76434
 
76411
76435
 
76436
+
76412
76437
  function addContextForReactNode(content, context) {
76413
76438
  if (typeof content === 'function' && context) {
76414
76439
  return content(context);
@@ -76450,6 +76475,10 @@ function useDialogAction(action, actionContext, hasForm) {
76450
76475
  var footerDescriptionRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
76451
76476
  var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_2__.useHistory)();
76452
76477
 
76478
+ var _useUrlState = (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_10__.useUrlState)(),
76479
+ urlState = _useUrlState[0],
76480
+ setUrlState = _useUrlState[1];
76481
+
76453
76482
  var onActionStart = function onActionStart(context, e) {
76454
76483
  var _extends2;
76455
76484
 
@@ -76490,7 +76519,18 @@ function useDialogAction(action, actionContext, hasForm) {
76490
76519
  footerDescription = _getTargetValue.footerDescription,
76491
76520
  footerAlign = _getTargetValue.footerAlign,
76492
76521
  className = _getTargetValue.className,
76522
+ openIdentifier = _getTargetValue.openIdentifier,
76493
76523
  containerOtherProps = _objectWithoutPropertiesLoose(_getTargetValue, _excluded2);
76524
+ /**
76525
+ * 判断是否含有 openIdentifierIdentifiy参数 ,更改对应 url
76526
+ */
76527
+
76528
+
76529
+ if (openIdentifier) {
76530
+ setUrlState({
76531
+ openIdentifier: openIdentifier
76532
+ });
76533
+ }
76494
76534
 
76495
76535
  var isDrawer = dialogType === 'drawer';
76496
76536
  var isPop = dialogType === 'pop';
@@ -76596,10 +76636,18 @@ function useDialogAction(action, actionContext, hasForm) {
76596
76636
  var dialogContext = Object.assign({}, context, {
76597
76637
  hide: hide
76598
76638
  });
76599
- 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);
76639
+ var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_11__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
76600
76640
 
76601
76641
  var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
76642
+ setUrlState({
76643
+ openIdentifier: undefined
76644
+ });
76602
76645
  propsOnCancel && propsOnCancel(context);
76646
+ }, _extends2.onClose = function onClose() {
76647
+ setUrlState({
76648
+ openIdentifier: undefined
76649
+ });
76650
+ hide == null ? void 0 : hide();
76603
76651
  }, _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", {
76604
76652
  className: "teamix-pro-dialog-before-content"
76605
76653
  }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -76685,10 +76733,19 @@ function useDrawerTableAction(action, context) {
76685
76733
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
76686
76734
  /* harmony export */ "T": () => (/* binding */ useDrawerAction)
76687
76735
  /* harmony export */ });
76688
- /* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28653);
76736
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
76737
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
76738
+ /* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(28653);
76739
+
76689
76740
 
76690
76741
  function useDrawerAction(action, context) {
76691
- return (0,_dialog__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(Object.assign({
76742
+ (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
76743
+ var _action$openIdentifie, _action$openIdentifie2;
76744
+
76745
+ var dom = document.getElementById((_action$openIdentifie = (_action$openIdentifie2 = action.openIdentifier) == null ? void 0 : _action$openIdentifie2.toString()) != null ? _action$openIdentifie : '');
76746
+ dom == null ? void 0 : dom.click();
76747
+ }, []);
76748
+ return (0,_dialog__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(Object.assign({
76692
76749
  dialogType: 'drawer'
76693
76750
  }, action), context);
76694
76751
  }
@@ -79926,11 +79983,11 @@ var customComponent = function customComponent(component) {
79926
79983
  /* harmony import */ var _Components_LightFilter__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(58295);
79927
79984
  /* harmony import */ var _Components_Text_index__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(70041);
79928
79985
  /* harmony import */ var _SchemaForm__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(12051);
79929
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(51344);
79930
- /* harmony import */ var _useAutoSubmit__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(86924);
79986
+ /* harmony import */ var _useAutoSubmit__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(86924);
79987
+ /* harmony import */ var _useAutoLayout__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(67995);
79931
79988
  /* harmony import */ var _useInitialRequest__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(8550);
79932
79989
  /* harmony import */ var _locales_validate__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(67315);
79933
- var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
79990
+ var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
79934
79991
 
79935
79992
  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); }
79936
79993
 
@@ -79989,12 +80046,6 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
79989
80046
  scope = _ref.scope,
79990
80047
  context = _ref.context,
79991
80048
  components = _ref.components,
79992
- layout = _ref.layout,
79993
- labelAlign = _ref.labelAlign,
79994
- wrapperAlign = _ref.wrapperAlign,
79995
- labelCol = _ref.labelCol,
79996
- wrapperCol = _ref.wrapperCol,
79997
- breakpoints = _ref.breakpoints,
79998
80049
  onChange = _ref.onChange,
79999
80050
  onChangeType = _ref.onChangeType,
80000
80051
  onSubmit = _ref.onSubmit,
@@ -80006,7 +80057,8 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
80006
80057
  children = _ref.children,
80007
80058
  otherProps = _objectWithoutPropertiesLoose(_ref, _excluded);
80008
80059
 
80009
- // 获取全局配置
80060
+ var formRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 获取全局配置
80061
+
80010
80062
  var _ref2 = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getGlobalConfig)('ProForm') || {},
80011
80063
  globalComponents = _ref2.components,
80012
80064
  globalScope = _ref2.scope;
@@ -80024,25 +80076,12 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
80024
80076
 
80025
80077
  var mergedComponents = _extends({}, globalComponents, components, formilyComponents, _Components_ProField__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z);
80026
80078
 
80027
- var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(onSubmit, context); // todo 需要formily支持断点下的属性更新
80028
-
80029
- var getTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
80030
- return breakpoints === true ? {
80031
- breakpoints: [480],
80032
- layout: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['vertical'], layout),
80033
- labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
80034
- wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
80035
- labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], labelCol),
80036
- wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_12__/* .mergeArrayValue */ .UT)([24], wrapperCol)
80037
- } : {
80038
- breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isBool)(breakpoints) ? undefined : breakpoints,
80039
- layout: layout,
80040
- labelAlign: labelAlign,
80041
- wrapperAlign: wrapperAlign,
80042
- labelCol: labelCol,
80043
- wrapperCol: wrapperCol
80044
- };
80045
- }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
80079
+ var onAutoSubmit = (0,_useAutoSubmit__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z)(onSubmit, context);
80080
+ console.log(otherProps);
80081
+ var autoTeamixLayout = (0,_useAutoLayout__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .Z)(_extends({}, otherProps, {
80082
+ schema: schema
80083
+ }), formRef);
80084
+ console.log(autoTeamixLayout);
80046
80085
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
80047
80086
  // 配置表单默认值
80048
80087
  if (initialValues) {
@@ -80083,7 +80122,7 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
80083
80122
  }, []);
80084
80123
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_formily__WEBPACK_IMPORTED_MODULE_4__.Form, _extends({
80085
80124
  className: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.cls)(prefixCls(), className)
80086
- }, otherProps, getTeamixLayout, {
80125
+ }, otherProps, autoTeamixLayout, {
80087
80126
  form: form,
80088
80127
  onAutoSubmit: onAutoSubmit,
80089
80128
  onAutoSubmitFailed: onSubmitFailed
@@ -80091,7 +80130,9 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
80091
80130
  schema: schema,
80092
80131
  scope: mergedScope,
80093
80132
  components: mergedComponents
80094
- }) : null, children);
80133
+ }) : null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
80134
+ ref: formRef
80135
+ }), children);
80095
80136
  });
80096
80137
  ProForm.defaultProps = {
80097
80138
  colon: false,
@@ -80103,6 +80144,121 @@ ProForm.defaultProps = {
80103
80144
 
80104
80145
  /***/ }),
80105
80146
 
80147
+ /***/ 67995:
80148
+ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
80149
+
80150
+ "use strict";
80151
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
80152
+ /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
80153
+ /* harmony export */ });
80154
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
80155
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
80156
+ /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
80157
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51344);
80158
+
80159
+
80160
+
80161
+
80162
+ var useAutoLayout = function useAutoLayout(_ref, formRef) {
80163
+ var outBreakpoints = _ref.breakpoints,
80164
+ layout = _ref.layout,
80165
+ labelAlign = _ref.labelAlign,
80166
+ wrapperAlign = _ref.wrapperAlign,
80167
+ outLabelCol = _ref.labelCol,
80168
+ outWrapperCol = _ref.wrapperCol,
80169
+ autoLayout = _ref.autoLayout,
80170
+ schema = _ref.schema;
80171
+
80172
+ var _ref2 = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isPlainObj)(autoLayout) ? autoLayout : {
80173
+ autoLabel: autoLayout
80174
+ },
80175
+ autoLabel = _ref2.autoLabel;
80176
+
80177
+ var breakpoints = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
80178
+ return autoLabel ? false : outBreakpoints;
80179
+ }, []); // 当前断点不支持Col更新
80180
+
80181
+ var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
80182
+ labelCol: outLabelCol,
80183
+ wrapperCol: outWrapperCol
80184
+ }),
80185
+ autoCol = _useState[0],
80186
+ setAutoCol = _useState[1];
80187
+
80188
+ var labelCol = autoCol.labelCol,
80189
+ wrapperCol = autoCol.wrapperCol;
80190
+ (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
80191
+ /**
80192
+ * autolayout
80193
+ */
80194
+ if (autoLabel) {
80195
+ var formWidth = formRef.current.getBoundingClientRect().width; // 表单宽度
80196
+
80197
+ var labelArray = schema.map(function (item) {
80198
+ var text = item.title;
80199
+
80200
+ if ((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isStr)(text)) {
80201
+ var _item$decoratorProps;
80202
+
80203
+ if (item.required) {
80204
+ text += '一'; // 必填 + 12
80205
+ }
80206
+
80207
+ if ((_item$decoratorProps = item.decoratorProps) != null && _item$decoratorProps.tooltip) {
80208
+ text += '一'; // 提示 + 18
80209
+ }
80210
+
80211
+ return text;
80212
+ }
80213
+
80214
+ return '';
80215
+ }); // 标题内容集合
80216
+
80217
+ var labelWidthArray = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getWidthByCharacterMap)(labelArray); // 标题宽度集合
80218
+
80219
+ var _autoWidthBySpace = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.autoWidthBySpace)(labelWidthArray),
80220
+ expectedWidth = _autoWidthBySpace.expectedWidth,
80221
+ consoleArray = _autoWidthBySpace.consoleArray; // 智能计算预期宽度
80222
+
80223
+
80224
+ var expectedCol = Math.ceil(expectedWidth / formWidth * 24); // 预期宽度转换为 Col 值
80225
+
80226
+ setAutoCol({
80227
+ labelCol: expectedCol,
80228
+ wrapperCol: wrapperCol
80229
+ });
80230
+ } else {
80231
+ setAutoCol({
80232
+ labelCol: outLabelCol,
80233
+ wrapperCol: outWrapperCol
80234
+ });
80235
+ }
80236
+ }, [outLabelCol, outWrapperCol]); // Layout配置By断点(配置断点后,目前不支持 Col 更新)
80237
+
80238
+ var autoTeamixLayout = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
80239
+ return breakpoints === true ? {
80240
+ breakpoints: [480],
80241
+ layout: (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .mergeArrayValue */ .UT)(['vertical'], layout),
80242
+ labelAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .mergeArrayValue */ .UT)(['left'], labelAlign),
80243
+ wrapperAlign: (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .mergeArrayValue */ .UT)(['left'], wrapperAlign),
80244
+ labelCol: (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .mergeArrayValue */ .UT)([24], labelCol),
80245
+ wrapperCol: (0,_utils__WEBPACK_IMPORTED_MODULE_2__/* .mergeArrayValue */ .UT)([24], wrapperCol)
80246
+ } : {
80247
+ breakpoints: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isBool)(breakpoints) ? undefined : breakpoints,
80248
+ layout: layout,
80249
+ labelAlign: labelAlign,
80250
+ wrapperAlign: wrapperAlign,
80251
+ labelCol: labelCol,
80252
+ wrapperCol: wrapperCol
80253
+ };
80254
+ }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
80255
+ return autoTeamixLayout;
80256
+ };
80257
+
80258
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (useAutoLayout);
80259
+
80260
+ /***/ }),
80261
+
80106
80262
  /***/ 86924:
80107
80263
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
80108
80264
 
@@ -80790,7 +80946,8 @@ var initialize = function initialize(item) {
80790
80946
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
80791
80947
  /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
80792
80948
  /* harmony export */ });
80793
- var _excluded = ["title", "decoratorProps"];
80949
+ var _excluded = ["title", "decoratorProps"],
80950
+ _excluded2 = ["title", "dataIndex", "cell", "htmlTitle", "sortable", "width", "align", "alignHeader", "filters", "filterMode", "filterMenuProps", "lock", "resizable", "colSpan"];
80794
80951
 
80795
80952
  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); }
80796
80953
 
@@ -80798,16 +80955,49 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
80798
80955
 
80799
80956
  var initializeColumn = function initializeColumn(item) {
80800
80957
  var title = item.title,
80801
- decoratorProps = item.decoratorProps,
80802
- children = _objectWithoutPropertiesLoose(item, _excluded);
80803
-
80958
+ _item$decoratorProps = item.decoratorProps,
80959
+ decoratorProps = _item$decoratorProps === void 0 ? {} : _item$decoratorProps,
80960
+ children = _objectWithoutPropertiesLoose(item, _excluded); // 将Table.Column属性和组件FormItem属性通过decoratorProps统一传入,再分别赋值
80961
+
80962
+
80963
+ var columnTitle = decoratorProps.title,
80964
+ dataIndex = decoratorProps.dataIndex,
80965
+ cell = decoratorProps.cell,
80966
+ htmlTitle = decoratorProps.htmlTitle,
80967
+ sortable = decoratorProps.sortable,
80968
+ width = decoratorProps.width,
80969
+ align = decoratorProps.align,
80970
+ alignHeader = decoratorProps.alignHeader,
80971
+ filters = decoratorProps.filters,
80972
+ filterMode = decoratorProps.filterMode,
80973
+ filterMenuProps = decoratorProps.filterMenuProps,
80974
+ lock = decoratorProps.lock,
80975
+ resizable = decoratorProps.resizable,
80976
+ colSpan = decoratorProps.colSpan,
80977
+ formItemDecoratorProps = _objectWithoutPropertiesLoose(decoratorProps, _excluded2);
80978
+
80979
+ var columnProperties = {
80980
+ title: title != null ? title : columnTitle,
80981
+ dataIndex: dataIndex,
80982
+ cell: cell,
80983
+ htmlTitle: htmlTitle,
80984
+ sortable: sortable,
80985
+ width: width,
80986
+ align: align,
80987
+ alignHeader: alignHeader,
80988
+ filters: filters,
80989
+ filterMode: filterMode,
80990
+ filterMenuProps: filterMenuProps,
80991
+ lock: lock,
80992
+ resizable: resizable,
80993
+ colSpan: colSpan
80994
+ };
80804
80995
  return {
80805
80996
  component: 'ArrayTable.Column',
80806
- props: _extends({}, decoratorProps, {
80807
- // 将ArrayTable.Column理解为decorator,传入decoratorProps作为component的props
80808
- title: title
80809
- }),
80810
- children: [_extends({}, children)]
80997
+ props: columnProperties,
80998
+ children: [_extends({}, children, {
80999
+ decoratorProps: formItemDecoratorProps
81000
+ })]
80811
81001
  };
80812
81002
  };
80813
81003
 
@@ -82317,7 +82507,7 @@ __webpack_require__.r(__webpack_exports__);
82317
82507
  /* harmony export */ "Section": () => (/* reexport safe */ _page_container__WEBPACK_IMPORTED_MODULE_6__.$0),
82318
82508
  /* harmony export */ "SimpleFilter": () => (/* reexport safe */ _form__WEBPACK_IMPORTED_MODULE_3__.aT),
82319
82509
  /* harmony export */ "TeamixIcon": () => (/* reexport safe */ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__.Z),
82320
- /* harmony export */ "autoWidth": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.Md),
82510
+ /* harmony export */ "autoWidthBySpace": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.wz),
82321
82511
  /* harmony export */ "brandColorInfo": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.Oz),
82322
82512
  /* harmony export */ "cls": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.yI),
82323
82513
  /* harmony export */ "createForm": () => (/* reexport safe */ _form__WEBPACK_IMPORTED_MODULE_3__.Np),
@@ -82474,7 +82664,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
82474
82664
 
82475
82665
 
82476
82666
 
82477
- var version = '1.4.13';
82667
+ var version = '1.4.16';
82478
82668
 
82479
82669
 
82480
82670
  /***/ }),
@@ -85046,7 +85236,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
85046
85236
 
85047
85237
 
85048
85238
 
85049
- var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.usePrefixCls)('teamix-nocode');
85239
+ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.usePrefixCls)('teamix-pro-nocode');
85050
85240
  var PagePlayground = function PagePlayground(props) {
85051
85241
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(undefined),
85052
85242
  selectedComponent = _useState[0],
@@ -85183,7 +85373,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
85183
85373
 
85184
85374
 
85185
85375
 
85186
- var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.usePrefixCls)('teamix-nocode');
85376
+ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_6__.usePrefixCls)('teamix-pro-nocode');
85187
85377
 
85188
85378
  var Loading = function Loading(props) {
85189
85379
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP, _extends({
@@ -85301,7 +85491,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
85301
85491
 
85302
85492
 
85303
85493
 
85304
- var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.usePrefixCls)('teamix-nocode-playground');
85494
+ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.usePrefixCls)('teamix-pro-nocode-playground');
85305
85495
  var PlayGroundLayout = function PlayGroundLayout(props) {
85306
85496
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
85307
85497
  className: cls()
@@ -87531,14 +87721,20 @@ var Layout = function Layout(props) {
87531
87721
  }
87532
87722
  } else if (mainAction) {
87533
87723
  // 没传 dataFilter 但是传了 mainAction
87534
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
87724
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
87535
87725
  addonBefore: renderMainAction(),
87536
- addonAfter: renderAddonAfter()
87537
- });
87726
+ addonAfter: renderAddonAfter(),
87727
+ children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
87728
+ className: "mb8 " + cls('after-data-filter-wrapper')
87729
+ }, afterDataFilter) : null
87730
+ }));
87538
87731
  } else {
87539
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
87540
- addonAfter: renderAddonAfter()
87541
- });
87732
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilterLayout */ .rx, {
87733
+ addonAfter: renderAddonAfter(),
87734
+ children: afterDataFilter ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
87735
+ className: "mb8 " + cls('after-data-filter-wrapper')
87736
+ }, afterDataFilter) : null
87737
+ }));
87542
87738
  }
87543
87739
  }; // 区域组合渲染
87544
87740
 
@@ -87872,7 +88068,7 @@ var QuickAction = function QuickAction(props) {
87872
88068
  actionRef = props.actionRef,
87873
88069
  rowSelection = props.rowSelection; // 如果传对象的话,默认为主要文字类型的 ProActionButton
87874
88070
 
87875
- if (typeof quickAction === 'object') {
88071
+ if (typeof quickAction === 'object' && quickAction != null && quickAction.config) {
87876
88072
  // 默认 context
87877
88073
  var defaultContext = {
87878
88074
  action: actionRef.current,
@@ -89106,7 +89302,11 @@ var ProTable = function ProTable(props) {
89106
89302
  }, []); // 获取header高度,用作全屏吸底吸底高度计算以及固定body高度计算(滚动条在底部)
89107
89303
 
89108
89304
  var getHeaderHeight = function getHeaderHeight(isFullscreen, offset) {
89109
- var _tableDom$getElements, _tableDom$getElements2;
89305
+ var _tableDom$getElements, _tableDom$getElements2, _document$querySelect, _document$querySelect2, _document$querySelect3;
89306
+
89307
+ if (!fixedTableBody) {
89308
+ return;
89309
+ }
89110
89310
 
89111
89311
  var tableDom = tableRef.current;
89112
89312
  var headerDom = tableDom == null ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) == null ? void 0 : _tableDom$getElements[0];
@@ -89116,8 +89316,9 @@ var ProTable = function ProTable(props) {
89116
89316
  var tableHeaderDom = tableDom == null ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) == null ? void 0 : _tableDom$getElements2[0];
89117
89317
  var pageContainerDom = document.querySelector('.teamix-pro-page-container-header');
89118
89318
  var teamixNavDom = document.querySelector('.teamix-nav-console');
89119
- var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer');
89120
- var tableBodyDom = document.querySelector('.next-table-body');
89319
+ var footerRowSelectionDom = document.querySelector('.teamix-pro-page-container-footer'); // 这边不能直接取 next-table-body
89320
+
89321
+ var tableBodyDom = (_document$querySelect = document.querySelector('.teamix-pro-table')) == null ? void 0 : (_document$querySelect2 = _document$querySelect.getElementsByTagName('table')) == null ? void 0 : (_document$querySelect3 = _document$querySelect2[1]) == null ? void 0 : _document$querySelect3.parentNode;
89121
89322
  var headerFixedTopSectionDom = document.querySelector('.teamix-pro-page-container-fixed-top');
89122
89323
  setTimeout(function () {
89123
89324
  var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -89135,9 +89336,8 @@ var ProTable = function ProTable(props) {
89135
89336
  var teamixNavHeight = (_teamixNavDom$offsetH = teamixNavDom == null ? void 0 : teamixNavDom.offsetHeight) != null ? _teamixNavDom$offsetH : 0; // 1 为预留值,js无法取出精确高度,会被四舍五入
89136
89337
 
89137
89338
  var offsetHeaderHeight = headerHeight + tableHeaderHeight + pageHeaderHeight + teamixNavHeight + footerRowSelectionHeight + 16 + (offset != null ? offset : 0) + 1;
89138
- var clientTableBodyHeight = document.body.clientHeight - offsetHeaderHeight;
89139
89339
 
89140
- if (tableBodyDom.clientHeight < clientTableBodyHeight) {
89340
+ if (tableBodyDom.clientHeight < tableBodyDom.scrollHeight) {
89141
89341
  setFooterSuctionState(true);
89142
89342
  } else {
89143
89343
  setFooterSuctionState(false);
@@ -89192,6 +89392,10 @@ var ProTable = function ProTable(props) {
89192
89392
 
89193
89393
 
89194
89394
  var getFooterSuctionState = function getFooterSuctionState() {
89395
+ if (!footerSuction) {
89396
+ return;
89397
+ }
89398
+
89195
89399
  var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
89196
89400
 
89197
89401
  if (containerDom) {
@@ -89592,7 +89796,7 @@ var ProTable = function ProTable(props) {
89592
89796
  if (Number.isInteger(time) && time >= 1000) {
89593
89797
  autoRefreshTimerRef.current = setTimeout(function () {
89594
89798
  // 自动刷新不显示 loading
89595
- _request({}, true);
89799
+ _request(requestData, true);
89596
89800
  }, Number(time));
89597
89801
  }
89598
89802
  });
@@ -89832,8 +90036,22 @@ var ProTable = function ProTable(props) {
89832
90036
  className: cls('footer-right-wrapper')
89833
90037
  }, showSkeleton ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Pagination */ .vR.Footer.Pagination, null) : footer));
89834
90038
  }
89835
- };
90039
+ }; // 判断是否需要吸底
90040
+
90041
+
90042
+ var fixFooterState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
90043
+ if (fullscreenState) {
90044
+ return true;
90045
+ }
90046
+
90047
+ if (fixedTableBody || footerSuction) {
90048
+ if (footerSuctionState) {
90049
+ return true;
90050
+ }
90051
+ }
89836
90052
 
90053
+ return false;
90054
+ }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
89837
90055
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, {
89838
90056
  visible: fullscreenState,
89839
90057
  actionRef: actionRef
@@ -89845,7 +90063,7 @@ var ProTable = function ProTable(props) {
89845
90063
 
89846
90064
  }),
89847
90065
  ref: tableRef
89848
- }, renderTable(isFullScreen), footerSuctionState && !fullscreenState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !(footerSuctionState && !fullscreenState) && renderFooter(), fullscreenState && renderFooter());
90066
+ }, renderTable(isFullScreen), fixFooterState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
89849
90067
  });
89850
90068
  };
89851
90069
 
@@ -91270,7 +91488,6 @@ ProTimeline.Item = _ProTimeLineItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] *
91270
91488
  /* harmony export */ "LF": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.setRequestConfig),
91271
91489
  /* harmony export */ "LQ": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isFn),
91272
91490
  /* harmony export */ "Lq": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getColor),
91273
- /* harmony export */ "Md": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.autoWidth),
91274
91491
  /* harmony export */ "Nx": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.mapKeyValue),
91275
91492
  /* harmony export */ "OH": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.listToTree),
91276
91493
  /* harmony export */ "Oz": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.brandColorInfo),
@@ -91315,6 +91532,7 @@ ProTimeline.Item = _ProTimeLineItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] *
91315
91532
  /* harmony export */ "vm": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getTagColor),
91316
91533
  /* harmony export */ "wd": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.lightBrandColor),
91317
91534
  /* harmony export */ "wk": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getTeamixIconConfig),
91535
+ /* harmony export */ "wz": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.autoWidthBySpace),
91318
91536
  /* harmony export */ "xL": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getSourceLocale),
91319
91537
  /* harmony export */ "yI": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.cls),
91320
91538
  /* harmony export */ "yn": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isWeakMap),
@@ -92628,7 +92846,7 @@ var chartLightTheme = {
92628
92846
  "use strict";
92629
92847
  __webpack_require__.r(__webpack_exports__);
92630
92848
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
92631
- /* harmony export */ "autoWidth": () => (/* reexport safe */ _inner__WEBPACK_IMPORTED_MODULE_0__.Md),
92849
+ /* harmony export */ "autoWidthBySpace": () => (/* reexport safe */ _inner__WEBPACK_IMPORTED_MODULE_0__.wz),
92632
92850
  /* harmony export */ "brandColorInfo": () => (/* reexport safe */ _global__WEBPACK_IMPORTED_MODULE_4__.Oz),
92633
92851
  /* harmony export */ "cls": () => (/* reexport safe */ _inner__WEBPACK_IMPORTED_MODULE_0__.yI),
92634
92852
  /* harmony export */ "customDateFormat": () => (/* reexport safe */ _date_time__WEBPACK_IMPORTED_MODULE_2__.Cb),
@@ -92737,13 +92955,25 @@ __webpack_require__.r(__webpack_exports__);
92737
92955
 
92738
92956
  /***/ }),
92739
92957
 
92740
- /***/ 54661:
92958
+ /***/ 73523:
92741
92959
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
92742
92960
 
92743
92961
  "use strict";
92744
92962
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
92745
- /* harmony export */ "M": () => (/* binding */ autoWidth)
92963
+ /* harmony export */ "w": () => (/* binding */ autoWidthBySpace)
92746
92964
  /* harmony export */ });
92965
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
92966
+
92967
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
92968
+
92969
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
92970
+
92971
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
92972
+
92973
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
92974
+
92975
+ 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; }
92976
+
92747
92977
  /**
92748
92978
  * 获取某个宽度在宽度集中的无效空间
92749
92979
  * @param array 宽度集
@@ -92752,12 +92982,14 @@ __webpack_require__.r(__webpack_exports__);
92752
92982
  */
92753
92983
  var getInvalidSpace = function getInvalidSpace(array, used) {
92754
92984
  return array.reduce(function (prev, current) {
92985
+ var coefficient = 5; // (可调节参数)
92986
+
92755
92987
  if (used > current) {
92756
92988
  prev[0] += used - current; // 闲置值
92757
92989
  }
92758
92990
 
92759
92991
  if (used < current) {
92760
- prev[1] += current - used; // 溢出值
92992
+ prev[1] += (current - used) * coefficient; // 溢出值
92761
92993
  }
92762
92994
 
92763
92995
  return prev;
@@ -92769,17 +93001,20 @@ var getInvalidSpace = function getInvalidSpace(array, used) {
92769
93001
  * @param array
92770
93002
  * @returns
92771
93003
  */
92772
- var autoWidth = function autoWidth(array) {
93004
+ var autoWidthBySpace = function autoWidthBySpace(array) {
92773
93005
  var consoleArray = []; // 日志记录
92774
93006
 
92775
93007
  var minInvalidSpace = 0; // 最小无效空间
92776
93008
 
92777
93009
  var expectedWidth = 0; // 期望宽度
92778
93010
 
93011
+ var maxWidth = Math.max.apply(Math, _toConsumableArray(array)); // 最大值
93012
+
92779
93013
  array == null ? void 0 : array.forEach(function (width, index) {
92780
93014
  var _getInvalidSpace = getInvalidSpace(array, width),
92781
93015
  idleSpace = _getInvalidSpace[0],
92782
- overflowSpace = _getInvalidSpace[1];
93016
+ overflowSpace = _getInvalidSpace[1]; // 获取闲置空间、溢出空间
93017
+
92783
93018
 
92784
93019
  var invalidSpace = idleSpace + overflowSpace; // 使用第一个作为比对基准
92785
93020
 
@@ -92803,6 +93038,7 @@ var autoWidth = function autoWidth(array) {
92803
93038
  });
92804
93039
  return {
92805
93040
  expectedWidth: Math.ceil(expectedWidth),
93041
+ maxWidth: maxWidth,
92806
93042
  consoleArray: consoleArray
92807
93043
  };
92808
93044
  };
@@ -92818,6 +93054,7 @@ var autoWidth = function autoWidth(array) {
92818
93054
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
92819
93055
  /* harmony export */ "h": () => (/* binding */ getWidthByCharacterMap)
92820
93056
  /* harmony export */ });
93057
+ /* harmony import */ var _checkers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(68755);
92821
93058
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
92822
93059
 
92823
93060
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -92830,7 +93067,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
92830
93067
 
92831
93068
  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; }
92832
93069
 
92833
- // 中文汉字 [\u4e00-\u9fa5]
93070
+ // 中文汉字 [\u4e00-\u9fa5]
93071
+
92834
93072
  var chineseCharacters = ['一']; // 中文常用标点 ·–—‘’“”…、。〈〉《》「」『』【】〔〕!(),.:;?¥
92835
93073
 
92836
93074
  var chineseSymbol = [183, 8211, 8212, 8216, 8217, 8220, 8221, 8230, 12289, 12290, 12296, 12297, 12298, 12299, 12300, 12301, 12302, 12303, 12304, 12305, 12308, 12309, 65281, 65288, 65289, 65292, 65294, 65306, 65307, 65311, 65509].map(function (v) {
@@ -92899,13 +93137,17 @@ var calculateWidth = function calculateWidth(text, map) {
92899
93137
  };
92900
93138
 
92901
93139
  var getWidthByCharacterMap = function getWidthByCharacterMap(data, style) {
92902
- console.time('字符宽度集耗时');
92903
- var characterMap = characterMapLibrary.get(style || 'default') || getCharacterMap(style);
92904
- console.timeEnd('字符宽度集耗时');
93140
+ // console.time('字符宽度集耗时');
93141
+ var characterMap = characterMapLibrary.get(style || 'default') || getCharacterMap(style); // console.timeEnd('字符宽度集耗时');
92905
93142
 
92906
93143
  if (Array.isArray(data)) {
92907
93144
  return data.map(function (item) {
92908
- return calculateWidth(item, characterMap);
93145
+ if ((0,_checkers__WEBPACK_IMPORTED_MODULE_0__/* .isStr */ .d8)(item)) {
93146
+ return calculateWidth(item, characterMap);
93147
+ } else {
93148
+ console.warn('警告:遭遇非法内容,请使用字符串。', item);
93149
+ return 0;
93150
+ }
92909
93151
  });
92910
93152
  } else {
92911
93153
  return calculateWidth(data, characterMap);
@@ -93344,7 +93586,6 @@ function getTargetValue(target, context) {
93344
93586
  /* harmony export */ "F8": () => (/* reexport safe */ _usePrefixCls__WEBPACK_IMPORTED_MODULE_1__.F),
93345
93587
  /* harmony export */ "H6": () => (/* reexport safe */ _pickProps__WEBPACK_IMPORTED_MODULE_7__.Z),
93346
93588
  /* harmony export */ "HE": () => (/* reexport safe */ _common_request__WEBPACK_IMPORTED_MODULE_2__.H),
93347
- /* harmony export */ "Md": () => (/* reexport safe */ _autoWidth__WEBPACK_IMPORTED_MODULE_8__.M),
93348
93589
  /* harmony export */ "Tn": () => (/* reexport safe */ _test_request__WEBPACK_IMPORTED_MODULE_5__.T),
93349
93590
  /* harmony export */ "Vn": () => (/* reexport safe */ _getTargetValue__WEBPACK_IMPORTED_MODULE_0__.Vn),
93350
93591
  /* harmony export */ "cd": () => (/* reexport safe */ _getTargetValue__WEBPACK_IMPORTED_MODULE_0__.ZP),
@@ -93352,6 +93593,7 @@ function getTargetValue(target, context) {
93352
93593
  /* harmony export */ "hS": () => (/* reexport safe */ _getDeepValue__WEBPACK_IMPORTED_MODULE_6__.Z),
93353
93594
  /* harmony export */ "iF": () => (/* reexport safe */ _link__WEBPACK_IMPORTED_MODULE_3__.i),
93354
93595
  /* harmony export */ "tV": () => (/* reexport safe */ _test_request__WEBPACK_IMPORTED_MODULE_5__.t),
93596
+ /* harmony export */ "wz": () => (/* reexport safe */ _autoWidthBySpace__WEBPACK_IMPORTED_MODULE_8__.w),
93355
93597
  /* harmony export */ "yI": () => (/* reexport safe */ _usePrefixCls__WEBPACK_IMPORTED_MODULE_1__.y)
93356
93598
  /* harmony export */ });
93357
93599
  /* harmony import */ var _getDeepValue__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(6010);
@@ -93361,7 +93603,7 @@ function getTargetValue(target, context) {
93361
93603
  /* harmony import */ var _common_request__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35881);
93362
93604
  /* harmony import */ var _link__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(96830);
93363
93605
  /* harmony import */ var _characterMap__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(92073);
93364
- /* harmony import */ var _autoWidth__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54661);
93606
+ /* harmony import */ var _autoWidthBySpace__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(73523);
93365
93607
  /* harmony import */ var _test_request__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(19460);
93366
93608
 
93367
93609