antd-management-fast-framework 1.12.92 → 1.12.96

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 (27) hide show
  1. package/es/customComponents/Charts/TagCloud/index.js +2 -2
  2. package/es/customComponents/Charts/TimelineChart/index.js +2 -2
  3. package/es/customComponents/Charts/index.d.ts +8 -8
  4. package/es/customComponents/Editor/TinymceWrapper/index.js +3 -2
  5. package/es/customComponents/Exception/index.js +2 -2
  6. package/es/customComponents/FlexBox/index.d.ts +2 -1
  7. package/es/customComponents/FlexBox/index.js +36 -8
  8. package/es/customComponents/FunctionComponent/index.js +4 -2
  9. package/es/customComponents/ImageBox/index.js +2 -2
  10. package/es/customComponents/ImageUpload/index.js +1 -0
  11. package/es/customComponents/MobileContainor/MobilePreviewArea/index.d.ts +3 -0
  12. package/es/customComponents/MobileContainor/MobilePreviewArea/index.js +23 -1
  13. package/es/customComponents/NoticeIconCustom/index.js +2 -2
  14. package/es/customComponents/Result/index.js +2 -2
  15. package/es/framework/Base/index.js +3 -30
  16. package/es/framework/Common/index.js +1 -1
  17. package/es/framework/DataForm/BaseAddForm/index.js +3 -4
  18. package/es/framework/DataListView/Base/index.js +3 -2
  19. package/es/framework/DataListView/ColumnSetting/index.js +2 -2
  20. package/es/framework/DataMultiPageView/MultiPageDrawer/index.js +2 -2
  21. package/es/framework/DataOperation/BaseWindow/index.d.ts +2 -2
  22. package/es/framework/DataOperation/BaseWindow/index.js +11 -5
  23. package/es/framework/DataSinglePageView/SinglePageDrawer/index.js +2 -2
  24. package/es/framework/DataSingleView/DataCore/index.d.ts +2 -0
  25. package/es/framework/DataSingleView/DataCore/index.js +29 -5
  26. package/es/utils/constants.js +2 -2
  27. package/package.json +45 -48
@@ -9,14 +9,14 @@ exports.default = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _dataSet = _interopRequireDefault(require("@antv/data-set"));
13
-
14
12
  var _bizcharts = require("bizcharts");
15
13
 
16
14
  var _classnames = _interopRequireDefault(require("classnames"));
17
15
 
18
16
  var _lodash = _interopRequireDefault(require("lodash.debounce"));
19
17
 
18
+ var _dataSet = _interopRequireDefault(require("@antv/data-set"));
19
+
20
20
  var _autoHeight = _interopRequireDefault(require("../autoHeight"));
21
21
 
22
22
  var _index = _interopRequireDefault(require("./index.less"));
@@ -7,10 +7,10 @@ exports.default = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _dataSet = _interopRequireDefault(require("@antv/data-set"));
11
-
12
10
  var _bizcharts = require("bizcharts");
13
11
 
12
+ var _dataSet = _interopRequireDefault(require("@antv/data-set"));
13
+
14
14
  var _autoHeight = _interopRequireDefault(require("../autoHeight"));
15
15
 
16
16
  var _index = _interopRequireDefault(require("./index.less"));
@@ -1,3 +1,5 @@
1
+ import Bar from "./Bar";
2
+ import ChartCard from "./ChartCard";
1
3
  declare namespace Charts {
2
4
  export { yuan };
3
5
  export { Bar };
@@ -12,16 +14,14 @@ declare namespace Charts {
12
14
  export { TagCloud };
13
15
  export { TimelineChart };
14
16
  }
15
- export function yuan(val: any): string;
16
- import Bar from "./Bar";
17
- import Pie from "./Pie";
17
+ import Field from "./Field";
18
18
  import Gauge from "./Gauge";
19
- import MiniBar from "./MiniBar";
20
19
  import MiniArea from "./MiniArea";
20
+ import MiniBar from "./MiniBar";
21
21
  import MiniProgress from "./MiniProgress";
22
- import ChartCard from "./ChartCard";
23
- import Field from "./Field";
24
- import WaterWave from "./WaterWave";
22
+ import Pie from "./Pie";
25
23
  import TagCloud from "./TagCloud";
26
24
  import TimelineChart from "./TimelineChart";
27
- export { Charts as default, Bar, Pie, Gauge, MiniBar, MiniArea, MiniProgress, ChartCard, Field, WaterWave, TagCloud, TimelineChart };
25
+ import WaterWave from "./WaterWave";
26
+ export function yuan(val: any): string;
27
+ export { Bar, ChartCard, Charts as default, Field, Gauge, MiniArea, MiniBar, MiniProgress, Pie, TagCloud, TimelineChart, WaterWave };
@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
- var _tinymceReact = require("@tinymce/tinymce-react");
11
-
12
10
  var _react = _interopRequireWildcard(require("react"));
13
11
 
12
+ var _tinymceReact = require("@tinymce/tinymce-react");
13
+
14
14
  var _defaultSettingsSpecial = require("../../../utils/defaultSettingsSpecial");
15
15
 
16
16
  var _globalStorageAssist = require("../../../utils/globalStorageAssist");
@@ -129,6 +129,7 @@ var TinymceWrapper = /*#__PURE__*/function (_PureComponent) {
129
129
  automatic_uploads: true,
130
130
  images_upload_url: '',
131
131
  min_height: 700,
132
+ toolbar_sticky: true,
132
133
  images_upload_handler: _this.imageUploadHandler
133
134
  }), initConfig || {});
134
135
 
@@ -15,10 +15,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
15
15
 
16
16
  var _react = _interopRequireWildcard(require("react"));
17
17
 
18
- var _index = _interopRequireDefault(require("./index.less"));
19
-
20
18
  var _typeConfig = _interopRequireDefault(require("./typeConfig"));
21
19
 
20
+ var _index = _interopRequireDefault(require("./index.less"));
21
+
22
22
  var _excluded = ["className", "backText", "linkElement", "type", "title", "desc", "img", "actions", "redirect"];
23
23
 
24
24
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -2,11 +2,12 @@ export default FlexBox;
2
2
  declare class FlexBox extends PureComponent<any, any, any> {
3
3
  constructor(props: any);
4
4
  constructor(props: any, context: any);
5
+ getDirection: () => "vertical" | "horizontal";
6
+ triggerClick: () => void;
5
7
  render(): JSX.Element;
6
8
  }
7
9
  declare namespace FlexBox {
8
10
  namespace defaultProps {
9
- const direction: string;
10
11
  const flexAuto: string;
11
12
  const allowWrap: boolean;
12
13
  namespace vertical {
@@ -17,6 +17,8 @@ var _col = _interopRequireDefault(require("antd/es/col"));
17
17
 
18
18
  var _react = _interopRequireWildcard(require("react"));
19
19
 
20
+ var _core = require("../../utils/core");
21
+
20
22
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
21
23
 
22
24
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -49,15 +51,47 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
49
51
 
50
52
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
51
53
 
54
+ var flexAutoCollection = ['left', 'right', 'top', 'bottom'];
55
+
52
56
  var FlexBox = /*#__PURE__*/function (_PureComponent) {
53
57
  _inherits(FlexBox, _PureComponent);
54
58
 
55
59
  var _super = _createSuper(FlexBox);
56
60
 
57
61
  function FlexBox() {
62
+ var _this;
63
+
58
64
  _classCallCheck(this, FlexBox);
59
65
 
60
- return _super.apply(this, arguments);
66
+ for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
67
+ args[_key] = arguments[_key];
68
+ }
69
+
70
+ _this = _super.call.apply(_super, [this].concat(args));
71
+
72
+ _this.getDirection = function () {
73
+ var flexAuto = _this.props.flexAuto;
74
+
75
+ if (!(0, _core.inCollection)(flexAutoCollection, flexAuto)) {
76
+ var text = 'flexAuto 只能配置为 left/right/top/bottom';
77
+ showErrorMessage({
78
+ message: text
79
+ });
80
+ return 'horizontal';
81
+ }
82
+
83
+ return (0, _core.inCollection)(['left', 'right'], flexAuto) ? 'horizontal' : (0, _core.inCollection)(['top', 'bottom'], flexAuto) ? 'vertical' : 'horizontal';
84
+ };
85
+
86
+ _this.triggerClick = function () {
87
+ var onClick = _this.props.onClick;
88
+
89
+ if (isFunction(onClick)) {
90
+ onClick();
91
+ }
92
+ };
93
+
94
+ return _this;
61
95
  }
62
96
 
63
97
  _createClass(FlexBox, [{
@@ -73,13 +107,8 @@ var FlexBox = /*#__PURE__*/function (_PureComponent) {
73
107
  rightStyle = _this$props.rightStyle,
74
108
  top = _this$props.top,
75
109
  bottom = _this$props.bottom,
76
- directionSource = _this$props.direction,
77
110
  vertical = _this$props.vertical;
78
- var direction = directionSource;
79
-
80
- if (directionSource !== 'horizontal' && directionSource !== 'vertical') {
81
- direction = 'horizontal';
82
- }
111
+ var direction = this.getDirection();
83
112
 
84
113
  if (direction === 'horizontal') {
85
114
  var flexAuto = flexAutoSource === 'left' ? 'left' : 'right';
@@ -141,7 +170,6 @@ var FlexBox = /*#__PURE__*/function (_PureComponent) {
141
170
  }(_react.PureComponent);
142
171
 
143
172
  FlexBox.defaultProps = {
144
- direction: 'horizontal',
145
173
  flexAuto: 'left',
146
174
  allowWrap: false,
147
175
  vertical: {
@@ -157,8 +157,6 @@ var _form = _interopRequireDefault(require("antd/es/form"));
157
157
 
158
158
  var _react = _interopRequireDefault(require("react"));
159
159
 
160
- var _icons = require("@ant-design/icons");
161
-
162
160
  var _rcTexty = _interopRequireDefault(require("rc-texty"));
163
161
 
164
162
  var _reactJsonView = _interopRequireDefault(require("react-json-view"));
@@ -169,6 +167,8 @@ var _reactSyntaxHighlighter = require("react-syntax-highlighter");
169
167
 
170
168
  var _prism = require("react-syntax-highlighter/dist/esm/styles/prism");
171
169
 
170
+ var _icons = require("@ant-design/icons");
171
+
172
172
  var _constants = require("../../utils/constants");
173
173
 
174
174
  var _tools = require("../../utils/tools");
@@ -2373,6 +2373,7 @@ function buildFormSwitch(_ref35) {
2373
2373
  message: (0, _tools.buildFieldDescription)(resultCheck.label)
2374
2374
  }]
2375
2375
  }), /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
2376
+ flexAuto: "left",
2376
2377
  left: "\u662F\u5426\u5F00\u542F".concat(label, ":"),
2377
2378
  right: /*#__PURE__*/_react.default.createElement(_switch.default, otherSwitchProps)
2378
2379
  })),
@@ -2389,6 +2390,7 @@ function buildFormSwitch(_ref35) {
2389
2390
  message: (0, _tools.buildFieldDescription)(resultCheck.label)
2390
2391
  }]
2391
2392
  }), /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
2393
+ flexAuto: "left",
2392
2394
  left: "\u662F\u5426\u5F00\u542F".concat(label, "\uFF1A"),
2393
2395
  right: /*#__PURE__*/_react.default.createElement(_switch.default, otherSwitchProps)
2394
2396
  })),
@@ -23,12 +23,12 @@ require("antd/es/col/style");
23
23
 
24
24
  var _col = _interopRequireDefault(require("antd/es/col"));
25
25
 
26
- var _icons = require("@ant-design/icons");
27
-
28
26
  var _classnames = _interopRequireDefault(require("classnames"));
29
27
 
30
28
  var _react = _interopRequireDefault(require("react"));
31
29
 
30
+ var _icons = require("@ant-design/icons");
31
+
32
32
  var _CustomBase2 = _interopRequireDefault(require("../../framework/CustomBase"));
33
33
 
34
34
  var _constants = require("../../utils/constants");
@@ -333,6 +333,7 @@ var ImageUpload = /*#__PURE__*/function (_PureComponent) {
333
333
  })))), /*#__PURE__*/_react.default.createElement("div", {
334
334
  className: _index.default.toolBar
335
335
  }, /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
336
+ flexAuto: "left",
336
337
  left: /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
337
338
  icon: icon,
338
339
  text: (0, _tools.stringIsNullOrWhiteSpace)(title) ? '' : title
@@ -32,6 +32,9 @@ declare class MobilePreviewArea extends Base {
32
32
  }
33
33
  declare namespace MobilePreviewArea {
34
34
  namespace defaultProps {
35
+ const affix: boolean;
36
+ const affixOffsetBottom: number;
37
+ const affixOffsetTop: number;
35
38
  const alertVisible: boolean;
36
39
  const alertAnimationType: string;
37
40
  const alertMessage: string;
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ require("antd/es/affix/style");
11
+
12
+ var _affix = _interopRequireDefault(require("antd/es/affix"));
13
+
10
14
  var _react = _interopRequireDefault(require("react"));
11
15
 
12
16
  var _Base2 = _interopRequireDefault(require("../../../framework/DataOperation/Base"));
@@ -176,7 +180,22 @@ var MobilePreviewArea = /*#__PURE__*/function (_Base) {
176
180
  _createClass(MobilePreviewArea, [{
177
181
  key: "renderFurther",
178
182
  value: function renderFurther() {
179
- return this.buildCardCollection(this.establishCardCollectionConfig());
183
+ var _this$props2 = this.props,
184
+ affix = _this$props2.affix,
185
+ affixOffsetTop = _this$props2.affixOffsetTop,
186
+ affixOffsetBottom = _this$props2.affixOffsetBottom;
187
+
188
+ if (!affix) {
189
+ return this.buildCardCollection(this.establishCardCollectionConfig());
190
+ }
191
+
192
+ var affixProps = _objectSpread(_objectSpread({}, affixOffsetBottom > 0 ? {
193
+ offsetBottom: affixOffsetBottom
194
+ } : {}), affixOffsetTop > 0 ? {
195
+ offsetTop: affixOffsetTop
196
+ } : {});
197
+
198
+ return /*#__PURE__*/_react.default.createElement(_affix.default, affixProps, this.buildCardCollection(this.establishCardCollectionConfig()));
180
199
  }
181
200
  }]);
182
201
 
@@ -184,6 +203,9 @@ var MobilePreviewArea = /*#__PURE__*/function (_Base) {
184
203
  }(_Base2.default);
185
204
 
186
205
  MobilePreviewArea.defaultProps = {
206
+ affix: false,
207
+ affixOffsetBottom: 0,
208
+ affixOffsetTop: 0,
187
209
  alertVisible: false,
188
210
  alertAnimationType: _constants.animalType.fade,
189
211
  alertMessage: '',
@@ -23,12 +23,12 @@ require("antd/es/tabs/style");
23
23
 
24
24
  var _tabs = _interopRequireDefault(require("antd/es/tabs"));
25
25
 
26
- var _icons = require("@ant-design/icons");
27
-
28
26
  var _classnames = _interopRequireDefault(require("classnames"));
29
27
 
30
28
  var _react = _interopRequireWildcard(require("react"));
31
29
 
30
+ var _icons = require("@ant-design/icons");
31
+
32
32
  var _NoticeList = _interopRequireDefault(require("./NoticeList"));
33
33
 
34
34
  var _index = _interopRequireDefault(require("./index.less"));
@@ -7,10 +7,10 @@ exports.default = Result;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _icons = require("@ant-design/icons");
11
-
12
10
  var _classnames = _interopRequireDefault(require("classnames"));
13
11
 
12
+ var _icons = require("@ant-design/icons");
13
+
14
14
  var _index = _interopRequireDefault(require("./index.less"));
15
15
 
16
16
  var _excluded = ["className", "type", "title", "description", "extra", "actions"];
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -35,8 +37,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
35
37
 
36
38
  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
37
39
 
38
- function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
39
-
40
40
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
41
41
 
42
42
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -55,8 +55,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
55
55
 
56
56
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
57
57
 
58
- var hasOwnProperty = Object.prototype.hasOwnProperty;
59
-
60
58
  function filterModel(props) {
61
59
  var result = _objectSpread({}, props);
62
60
 
@@ -82,32 +80,7 @@ function filterModel(props) {
82
80
 
83
81
 
84
82
  function shallowEqual(a, b) {
85
- // 调用Object.is判断是否相等,相同返回true,不同返回false
86
- if (Object.is(a, b)) {
87
- return true;
88
- } // object.is比较发现不等,但并不代表真的不等,object对象还需要比较
89
- // 这里判断是否是object,如果不是,那直接返回false
90
-
91
-
92
- if (_typeof(a) !== 'object' || a === null || _typeof(b) !== 'object' || b === null) {
93
- return false;
94
- }
95
-
96
- var keysA = Object.keys(a);
97
- var keysB = Object.keys(b); // 比较对象中的keys长度,不等返回false
98
-
99
- if (keysA.length !== keysB.length) {
100
- return false;
101
- } // 比较对象中相同的key的val是否相等
102
-
103
-
104
- for (var i = 0; i < keysA.length; i++) {
105
- if (!hasOwnProperty.call(b, keysA[i]) || !Object.is(a[keysA[i]], b[keysA[i]])) {
106
- return false;
107
- }
108
- }
109
-
110
- return true;
83
+ return (0, _tools.isEqual)(a, b);
111
84
  }
112
85
 
113
86
  var Base = /*#__PURE__*/function (_Component) {
@@ -1473,7 +1473,7 @@ var Common = /*#__PURE__*/function (_Core) {
1473
1473
  }
1474
1474
 
1475
1475
  return /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
1476
- direction: "vertical",
1476
+ flexAuto: "top",
1477
1477
  top: topArea,
1478
1478
  bottom: bottomArea
1479
1479
  });
@@ -23,10 +23,10 @@ require("antd/es/message/style");
23
23
 
24
24
  var _message2 = _interopRequireDefault(require("antd/es/message"));
25
25
 
26
- var _proLayout = require("@ant-design/pro-layout");
27
-
28
26
  var _react = _interopRequireDefault(require("react"));
29
27
 
28
+ var _proLayout = require("@ant-design/pro-layout");
29
+
30
30
  var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
31
31
 
32
32
  var _FunctionComponent = require("../../../customComponents/FunctionComponent");
@@ -295,7 +295,6 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
295
295
  var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
296
296
  _this2.onPageHeaderAvatarLoadErrorCallback();
297
297
  }) : null;
298
- var pageHeaderContentConfig = this.establishPageHeaderContentConfig();
299
298
  return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
300
299
  className: _index.default.customContainor,
301
300
  avatar: avatarProps,
@@ -303,7 +302,7 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
303
302
  subTitle: this.buildPageHeaderSubTitle(),
304
303
  tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
305
304
  extra: this.buildExtraAction(),
306
- content: (0, _FunctionComponent.buildPageHeaderContent)(pageHeaderContentConfig),
305
+ content: this.renderPageHeaderContent(),
307
306
  extraContent: (0, _FunctionComponent.pageHeaderExtraContent)(this.establishPageHeaderExtraContentConfig()) // onBack={() => {
308
307
  // this.backToList();
309
308
  // }}
@@ -75,10 +75,10 @@ require("antd/es/layout/style");
75
75
 
76
76
  var _layout = _interopRequireDefault(require("antd/es/layout"));
77
77
 
78
- var _proLayout = require("@ant-design/pro-layout");
79
-
80
78
  var _react = _interopRequireDefault(require("react"));
81
79
 
80
+ var _proLayout = require("@ant-design/pro-layout");
81
+
82
82
  var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
83
83
 
84
84
  var _FlexBox = _interopRequireDefault(require("../../../customComponents/FlexBox"));
@@ -1027,6 +1027,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
1027
1027
 
1028
1028
  var bar = /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
1029
1029
  style: style,
1030
+ flexAuto: "left",
1030
1031
  right: /*#__PURE__*/_react.default.createElement(_pagination.default, _extends({}, paginationConfig, {
1031
1032
  onChange: function onChange(page, size) {
1032
1033
  _this.handlePaginationChange(page, size);
@@ -23,12 +23,12 @@ var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
23
23
 
24
24
  var _react = _interopRequireDefault(require("react"));
25
25
 
26
- var _icons = require("@ant-design/icons");
27
-
28
26
  var _reactDnd = require("react-dnd");
29
27
 
30
28
  var _reactDndHtml5Backend = require("react-dnd-html5-backend");
31
29
 
30
+ var _icons = require("@ant-design/icons");
31
+
32
32
  var _constants = require("../../../utils/constants");
33
33
 
34
34
  var _DndItem = _interopRequireDefault(require("./DndItem"));
@@ -49,10 +49,10 @@ var _card = _interopRequireDefault(require("antd/es/card"));
49
49
 
50
50
  var _react = _interopRequireDefault(require("react"));
51
51
 
52
- var _icons = require("@ant-design/icons");
53
-
54
52
  var _rcQueueAnim = _interopRequireDefault(require("rc-queue-anim"));
55
53
 
54
+ var _icons = require("@ant-design/icons");
55
+
56
56
  var _FunctionComponent = require("../../../customComponents/FunctionComponent");
57
57
 
58
58
  var _constants = require("../../../utils/constants");
@@ -73,8 +73,8 @@ declare class BaseWindow extends Base {
73
73
  afterSetFieldsValue: (v: any) => void;
74
74
  afterCheckSubmitRequestParams: (o: any) => any;
75
75
  execSubmitApi: (values: {} | undefined, afterSubmitCallback: any) => void;
76
- handleOkWithForm: () => void;
77
- handleOk: (e: any) => void;
76
+ handleOkWithForm: (successCallback: any) => void;
77
+ handleOk: (e: any, successCallback?: null) => void;
78
78
  afterSubmitSuccess: ({ singleData, listData, extraData, responseOriginalData, submitData, }: {
79
79
  singleData?: null | undefined;
80
80
  listData?: any[] | undefined;
@@ -233,7 +233,7 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
233
233
  }
234
234
 
235
235
  if ((0, _tools.isFunction)(afterSubmitCallback)) {
236
- afterSubmitCallback();
236
+ afterSubmitCallback(remoteData);
237
237
  }
238
238
  }
239
239
 
@@ -253,7 +253,7 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
253
253
  }
254
254
  };
255
255
 
256
- _this.handleOkWithForm = function () {
256
+ _this.handleOkWithForm = function (successCallback) {
257
257
  var form = _this.getTargetForm();
258
258
 
259
259
  if (form == null) {
@@ -262,7 +262,11 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
262
262
 
263
263
  var validateFields = form.validateFields;
264
264
  validateFields().then(function (values) {
265
- _this.execSubmitApi(values, function () {
265
+ _this.execSubmitApi(values, function (remoteData) {
266
+ if ((0, _tools.isFunction)(successCallback)) {
267
+ successCallback(remoteData);
268
+ }
269
+
266
270
  if (_this.goToUpdateWhenProcessed) {
267
271
  _this.reloadByUrl();
268
272
  }
@@ -299,10 +303,12 @@ var BaseWindow = /*#__PURE__*/function (_Base) {
299
303
  };
300
304
 
301
305
  _this.handleOk = function (e) {
306
+ var successCallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
307
+
302
308
  if (_this.submitWithForm) {
303
- _this.handleOkWithForm(e);
309
+ _this.handleOkWithForm(e, successCallback);
304
310
  } else {
305
- _this.execSubmitApi();
311
+ _this.execSubmitApi({}, successCallback);
306
312
  }
307
313
  };
308
314
 
@@ -45,10 +45,10 @@ var _card = _interopRequireDefault(require("antd/es/card"));
45
45
 
46
46
  var _react = _interopRequireDefault(require("react"));
47
47
 
48
- var _icons = require("@ant-design/icons");
49
-
50
48
  var _rcQueueAnim = _interopRequireDefault(require("rc-queue-anim"));
51
49
 
50
+ var _icons = require("@ant-design/icons");
51
+
52
52
  var _FunctionComponent = require("../../../customComponents/FunctionComponent");
53
53
 
54
54
  var _constants = require("../../../utils/constants");
@@ -48,6 +48,8 @@ declare class DataCore extends BaseView {
48
48
  renderFormWrapper: () => JSX.Element;
49
49
  renderForm: () => JSX.Element;
50
50
  establishCardCollectionConfig: () => null;
51
+ renderPageHeaderContent: () => JSX.Element | null;
52
+ renderPageHeaderExtraContent: () => JSX.Element | null;
51
53
  formContent: () => any;
52
54
  renderFurther(): JSX.Element;
53
55
  }
@@ -27,10 +27,10 @@ require("antd/es/avatar/style");
27
27
 
28
28
  var _avatar = _interopRequireDefault(require("antd/es/avatar"));
29
29
 
30
- var _proLayout = require("@ant-design/pro-layout");
31
-
32
30
  var _react = _interopRequireDefault(require("react"));
33
31
 
32
+ var _proLayout = require("@ant-design/pro-layout");
33
+
34
34
  var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
35
35
 
36
36
  var _FunctionComponent = require("../../../customComponents/FunctionComponent");
@@ -268,6 +268,14 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
268
268
  return null;
269
269
  };
270
270
 
271
+ _this.renderPageHeaderContent = function () {
272
+ return (0, _FunctionComponent.buildPageHeaderContent)(_this.establishPageHeaderContentConfig() || {});
273
+ };
274
+
275
+ _this.renderPageHeaderExtraContent = function () {
276
+ return (0, _FunctionComponent.pageHeaderExtraContent)(_this.establishPageHeaderExtraContentConfig());
277
+ };
278
+
271
279
  _this.formContent = function () {
272
280
  return _this.buildCardCollection(_this.establishCardCollectionConfig());
273
281
  };
@@ -281,10 +289,26 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
281
289
  _createClass(DataCore, [{
282
290
  key: "renderFurther",
283
291
  value: function renderFurther() {
284
- var pageName = this.state.pageName;
292
+ var _this2 = this;
293
+
294
+ var _this$state2 = this.state,
295
+ defaultAvatarIcon = _this$state2.defaultAvatarIcon,
296
+ showPageHeaderAvatar = _this$state2.showPageHeaderAvatar,
297
+ dataLoading = _this$state2.dataLoading,
298
+ reloading = _this$state2.reloading,
299
+ avatarImageLoadResult = _this$state2.avatarImageLoadResult;
300
+ var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
301
+ _this2.onPageHeaderAvatarLoadErrorCallback();
302
+ }) : null;
285
303
  return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
286
- title: pageName,
287
- logo: this.pageHeaderLogo()
304
+ logo: this.pageHeaderLogo(),
305
+ avatar: avatarProps,
306
+ title: (0, _FunctionComponent.buildPageHeaderTitle)(this.getPageName(), this.establishPageHeaderTitlePrefix()),
307
+ subTitle: this.buildPageHeaderSubTitle(),
308
+ tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
309
+ extra: this.buildExtraAction(),
310
+ content: this.renderPageHeaderContent(),
311
+ extraContent: this.renderPageHeaderExtraContent()
288
312
  }, /*#__PURE__*/_react.default.createElement("div", {
289
313
  className: _index.default.containorBox,
290
314
  style: {
@@ -7,10 +7,10 @@ exports.dropdownExpandItemType = exports.drawerConfig = exports.defaultUserAvata
7
7
  exports.empty = empty;
8
8
  exports.zeroString = exports.zeroInt = exports.whetherString = exports.whetherNumber = exports.unlimitedWithStringFlag = exports.unlimitedWithNumberFlag = exports.tabBarCollection = exports.sortOperate = exports.selectModeCollection = exports.searchCardConfig = exports.pageHeaderRenderType = exports.notificationTypeCollection = exports.mobileTypeCollection = exports.messageTypeCollection = exports.logShowMode = exports.logLevel = exports.listViewConfig = exports.imageContentPreviewMode = exports.iconCollection = exports.iconBuilder = exports.formatCollection = exports.formNameCollection = exports.extraBuildType = exports.emptyLogo = exports.emptyDatetime = void 0;
9
9
 
10
- var _icons = require("@ant-design/icons");
11
-
12
10
  var _react = _interopRequireDefault(require("react"));
13
11
 
12
+ var _icons = require("@ant-design/icons");
13
+
14
14
  var _mediaDefault = require("./mediaDefault");
15
15
 
16
16
  var _iconCollection, _iconBuilder;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "antd-management-fast-framework",
3
- "version": "1.12.92",
3
+ "version": "1.12.96",
4
4
  "description": "antd-management-fast-framework",
5
5
  "keywords": [
6
6
  "antd-management-fast-framework"
@@ -45,20 +45,20 @@
45
45
  },
46
46
  "dependencies": {
47
47
  "@ant-design/icons": "^4.7.0",
48
- "@ant-design/pro-components": "1.1.6",
49
- "@ant-design/pro-layout": "^6.38.9",
48
+ "@ant-design/pro-components": "1.1.9",
49
+ "@ant-design/pro-layout": "^6.38.12",
50
50
  "@antv/data-set": "^0.11.8",
51
- "@antv/l7": "^2.8.46",
52
- "@antv/l7-maps": "^2.8.46",
53
- "@babel/preset-typescript": "^7.17.12",
51
+ "@antv/l7": "^2.9.13",
52
+ "@antv/l7-maps": "^2.9.13",
53
+ "@babel/preset-typescript": "^7.18.6",
54
54
  "@tinymce/tinymce-react": "^4.1.0",
55
- "antd": "^4.21.3",
55
+ "antd": "^4.21.6",
56
56
  "array-move": "^4.0.0",
57
57
  "bizcharts": "^4.1.19",
58
- "browserslist": "^4.21.0",
59
- "butterfly-dag": "^4.3.4",
58
+ "browserslist": "^4.21.2",
59
+ "butterfly-dag": "^4.3.6",
60
60
  "butterfly-react": "^1.0.0",
61
- "caniuse-lite": "^1.0.30001358",
61
+ "caniuse-lite": "^1.0.30001366",
62
62
  "classnames": "^2.3.1",
63
63
  "copy-to-clipboard": "^3.3.1",
64
64
  "enquire-js": "^0.2.1",
@@ -70,7 +70,7 @@
70
70
  "lodash.debounce": "^4.0.8",
71
71
  "lodash.isequal": "^4.5.0",
72
72
  "memoize-one": "^6.0.0",
73
- "moment": "^2.29.3",
73
+ "moment": "^2.29.4",
74
74
  "node-cache": "^5.1.2",
75
75
  "nprogress": "^0.2.0",
76
76
  "numeral": "^2.0.6",
@@ -79,7 +79,7 @@
79
79
  "path-to-regexp": "^6.2.1",
80
80
  "postcss-less": "^6.0.0",
81
81
  "prop-types": "^15.8.1",
82
- "qs": "^6.10.5",
82
+ "qs": "^6.11.0",
83
83
  "queue": "^6.0.2",
84
84
  "randomcolor": "^0.6.2",
85
85
  "rc-animate": "^3.1.1",
@@ -88,7 +88,7 @@
88
88
  "rc-scroll-anim": "^2.7.6",
89
89
  "rc-texty": "^0.2.0",
90
90
  "rc-tween-one": "^3.0.6",
91
- "rc-util": "^5.22.3",
91
+ "rc-util": "^5.22.5",
92
92
  "react": "^17.0.2",
93
93
  "react-amap": "^1.2.8",
94
94
  "react-bmap": "^1.0.130",
@@ -115,44 +115,44 @@
115
115
  },
116
116
  "devDependencies": {
117
117
  "@ant-design/colors": "^6.0.0",
118
- "@ant-design/pro-cli": "^2.1.5",
119
- "@babel/core": "^7.18.5",
120
- "@babel/plugin-proposal-class-properties": "^7.17.12",
121
- "@babel/plugin-proposal-decorators": "^7.18.2",
122
- "@babel/plugin-syntax-jsx": "^7.17.12",
123
- "@babel/preset-env": "^7.18.2",
124
- "@babel/preset-react": "^7.17.12",
125
- "@babel/runtime": "^7.18.3",
126
- "@commitlint/cli": "^17.0.2",
127
- "@commitlint/config-conventional": "^17.0.2",
118
+ "@ant-design/pro-cli": "^3.0.0",
119
+ "@babel/core": "^7.18.6",
120
+ "@babel/plugin-proposal-class-properties": "^7.18.6",
121
+ "@babel/plugin-proposal-decorators": "^7.18.6",
122
+ "@babel/plugin-syntax-jsx": "^7.18.6",
123
+ "@babel/preset-env": "^7.18.6",
124
+ "@babel/preset-react": "^7.18.6",
125
+ "@babel/runtime": "^7.18.6",
126
+ "@commitlint/cli": "^17.0.3",
127
+ "@commitlint/config-conventional": "^17.0.3",
128
128
  "@commitlint/config-lerna-scopes": "^17.0.2",
129
- "@commitlint/cz-commitlint": "^17.0.0",
129
+ "@commitlint/cz-commitlint": "^17.0.3",
130
130
  "@testing-library/react": "^13.3.0",
131
131
  "@testing-library/react-hooks": "^8.0.1",
132
132
  "@types/express": "^4.17.13",
133
133
  "@types/history": "^4.7.11",
134
- "@types/jest": "^28.1.3",
134
+ "@types/jest": "^28.1.5",
135
135
  "@types/lodash": "^4.14.182",
136
136
  "@types/lodash.debounce": "^4.0.7",
137
137
  "@types/lodash.isequal": "^4.5.6",
138
- "@types/node": "^18.0.0",
138
+ "@types/node": "^18.0.4",
139
139
  "@types/nprogress": "^0.2.0",
140
140
  "@types/numeral": "^2.0.2",
141
141
  "@types/randomcolor": "^0.5.6",
142
- "@types/react": "^18.0.14",
142
+ "@types/react": "^18.0.15",
143
143
  "@types/react-document-title": "^2.0.5",
144
144
  "@types/react-helmet": "^6.1.5",
145
- "@types/react-syntax-highlighter": "^15.5.2",
145
+ "@types/react-syntax-highlighter": "^15.5.3",
146
146
  "@types/uuid": "^8.3.4",
147
- "@typescript-eslint/eslint-plugin": "^5.29.0",
148
- "@umijs/fabric": "^2.12.0",
147
+ "@typescript-eslint/eslint-plugin": "^5.30.6",
148
+ "@umijs/fabric": "^2.12.2",
149
149
  "@umijs/plugin-blocks": "^2.2.2",
150
150
  "@umijs/plugin-esbuild": "^1.4.1",
151
151
  "@umijs/preset-ant-design-pro": "^1.3.3",
152
152
  "@umijs/preset-react": "^2.1.4",
153
153
  "@umijs/preset-ui": "^2.2.9",
154
154
  "@umijs/test": "^3.5.26",
155
- "@umijs/test-utils": "^3.5.26",
155
+ "@umijs/test-utils": "^3.5.28",
156
156
  "babel-cli": "^6.26.0",
157
157
  "babel-plugin-import": "^1.13.5",
158
158
  "babel-preset-env": "^1.7.0",
@@ -166,40 +166,37 @@
166
166
  "cross-port-killer": "^1.4.0",
167
167
  "detect-installer": "^1.0.2",
168
168
  "enzyme": "^3.11.0",
169
- "eslint": "^8.18.0",
169
+ "eslint": "^8.19.0",
170
170
  "eslint-config-airbnb": "^19.0.4",
171
171
  "eslint-config-airbnb-typescript": "^17.0.0",
172
172
  "eslint-config-prettier": "^8.5.0",
173
173
  "eslint-plugin-eslint-comments": "^3.2.0",
174
174
  "eslint-plugin-import": "^2.26.0",
175
175
  "eslint-plugin-jest": "^26.5.3",
176
- "eslint-plugin-jsx-a11y": "^6.5.1",
177
- "eslint-plugin-prettier": "^4.0.0",
178
- "eslint-plugin-react": "^7.30.0",
176
+ "eslint-plugin-jsx-a11y": "^6.6.0",
177
+ "eslint-plugin-prettier": "^4.2.1",
178
+ "eslint-plugin-react": "^7.30.1",
179
179
  "eslint-plugin-react-hooks": "^4.6.0",
180
- "eslint-plugin-unicorn": "^42.0.0",
180
+ "eslint-plugin-simple-import-sort": "^7.0.0",
181
+ "eslint-plugin-unicorn": "^43.0.1",
181
182
  "express": "^4.18.1",
182
183
  "father-build": "^1.22.3",
183
184
  "gh-pages": "^4.0.0",
184
185
  "husky": "^8.0.1",
185
- "import-sort-cli": "^6.0.0",
186
- "import-sort-parser-babylon": "^6.0.0",
187
- "import-sort-parser-typescript": "^6.0.0",
188
- "import-sort-style-module": "^6.0.0",
189
186
  "inquirer": "^8.2.4",
190
- "jest-puppeteer": "^6.1.0",
187
+ "jest-puppeteer": "^6.1.1",
191
188
  "jsdom": "^20.0.0",
192
189
  "jsdom-global": "^3.0.2",
193
- "lint-staged": "^13.0.2",
190
+ "lint-staged": "^13.0.3",
194
191
  "mockjs": "^1.1.0",
195
- "node-fetch": "^3.2.6",
196
- "npm-check-updates": "^14.0.1",
192
+ "node-fetch": "^3.2.8",
193
+ "npm-check-updates": "^15.3.0",
197
194
  "postcss": "^8.4.14",
198
195
  "postcss-less": "^6.0.0",
199
196
  "prettier": "^2.7.1",
200
197
  "pro-download": "1.0.1",
201
- "puppeteer": "^14.4.1",
202
- "puppeteer-core": "^14.4.1",
198
+ "puppeteer": "^15.4.0",
199
+ "puppeteer-core": "^15.4.0",
203
200
  "react-test-renderer": "^17.0.2",
204
201
  "redbox-react": "^1.6.0",
205
202
  "rimraf": "^3.0.2",
@@ -212,7 +209,7 @@
212
209
  "test-umi-plugin": "^0.1.0",
213
210
  "typescript": "^4.7.4",
214
211
  "umi": "^3.5.26",
215
- "umi-plugin-custom-extra": "^1.0.12"
212
+ "umi-plugin-custom-extra": "^1.0.13"
216
213
  },
217
214
  "filesOther": [
218
215
  "es",
@@ -222,7 +219,7 @@
222
219
  "src/framework",
223
220
  "src/utils"
224
221
  ],
225
- "gitHead": "4663d4b6103ca728449f3d0a3100225160b295c0",
222
+ "gitHead": "b9f791496e4b23ecc1565725f443e87253247f8c",
226
223
  "gitHooks": {
227
224
  "pre-commit": "lint-staged"
228
225
  }