antd-management-fast-framework 1.12.92 → 1.12.94

package/es/customComponents/FlexBox/index.d.ts

@@ -2,11 +2,12 @@ export default FlexBox;
 declare class FlexBox extends PureComponent<any, any, any> {
     constructor(props: any);
     constructor(props: any, context: any);
+    getDirection: () => "vertical" | "horizontal";
+    triggerClick: () => void;
     render(): JSX.Element;
 }
 declare namespace FlexBox {
     namespace defaultProps {
-        const direction: string;
         const flexAuto: string;
         const allowWrap: boolean;
         namespace vertical {

package/es/customComponents/FlexBox/index.js

@@ -17,6 +17,8 @@ var _col = _interopRequireDefault(require("antd/es/col"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _core = require("../../utils/core");
+
 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); }
 
 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
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+var flexAutoCollection = ['left', 'right', 'top', 'bottom'];
+
 var FlexBox = /*#__PURE__*/function (_PureComponent) {
   _inherits(FlexBox, _PureComponent);
 
   var _super = _createSuper(FlexBox);
 
   function FlexBox() {
+    var _this;
+
     _classCallCheck(this, FlexBox);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _this.getDirection = function () {
+      var flexAuto = _this.props.flexAuto;
+
+      if (!(0, _core.inCollection)(flexAutoCollection, flexAuto)) {
+        var text = 'flexAuto 只能配置为 left/right/top/bottom';
+        showErrorMessage({
+          message: text
+        });
+        return 'horizontal';
+      }
+
+      return (0, _core.inCollection)(['left', 'right'], flexAuto) ? 'horizontal' : (0, _core.inCollection)(['top', 'bottom'], flexAuto) ? 'vertical' : 'horizontal';
+    };
+
+    _this.triggerClick = function () {
+      var onClick = _this.props.onClick;
+
+      if (isFunction(onClick)) {
+        onClick();
+      }
+    };
+
+    return _this;
   }
 
   _createClass(FlexBox, [{
@@ -73,13 +107,8 @@ var FlexBox = /*#__PURE__*/function (_PureComponent) {
           rightStyle = _this$props.rightStyle,
           top = _this$props.top,
           bottom = _this$props.bottom,
-          directionSource = _this$props.direction,
           vertical = _this$props.vertical;
-      var direction = directionSource;
-
-      if (directionSource !== 'horizontal' && directionSource !== 'vertical') {
-        direction = 'horizontal';
-      }
+      var direction = this.getDirection();
 
       if (direction === 'horizontal') {
         var flexAuto = flexAutoSource === 'left' ? 'left' : 'right';
@@ -141,7 +170,6 @@ var FlexBox = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 
 FlexBox.defaultProps = {
-  direction: 'horizontal',
   flexAuto: 'left',
   allowWrap: false,
   vertical: {

package/es/customComponents/FunctionComponent/index.js

@@ -157,8 +157,6 @@ var _form = _interopRequireDefault(require("antd/es/form"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _icons = require("@ant-design/icons");
-
 var _rcTexty = _interopRequireDefault(require("rc-texty"));
 
 var _reactJsonView = _interopRequireDefault(require("react-json-view"));
@@ -169,6 +167,8 @@ var _reactSyntaxHighlighter = require("react-syntax-highlighter");
 
 var _prism = require("react-syntax-highlighter/dist/esm/styles/prism");
 
+var _icons = require("@ant-design/icons");
+
 var _constants = require("../../utils/constants");
 
 var _tools = require("../../utils/tools");
@@ -2373,6 +2373,7 @@ function buildFormSwitch(_ref35) {
           message: (0, _tools.buildFieldDescription)(resultCheck.label)
         }]
       }), /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+        flexAuto: "left",
         left: "\u662F\u5426\u5F00\u542F".concat(label, ":"),
         right: /*#__PURE__*/_react.default.createElement(_switch.default, otherSwitchProps)
       })),
@@ -2389,6 +2390,7 @@ function buildFormSwitch(_ref35) {
         message: (0, _tools.buildFieldDescription)(resultCheck.label)
       }]
     }), /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+      flexAuto: "left",
       left: "\u662F\u5426\u5F00\u542F".concat(label, "\uFF1A"),
       right: /*#__PURE__*/_react.default.createElement(_switch.default, otherSwitchProps)
     })),

package/es/customComponents/ImageBox/index.js

@@ -23,12 +23,12 @@ require("antd/es/col/style");
 
 var _col = _interopRequireDefault(require("antd/es/col"));
 
-var _icons = require("@ant-design/icons");
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _icons = require("@ant-design/icons");
+
 var _CustomBase2 = _interopRequireDefault(require("../../framework/CustomBase"));
 
 var _constants = require("../../utils/constants");

package/es/customComponents/ImageUpload/index.js

@@ -333,6 +333,7 @@ var ImageUpload = /*#__PURE__*/function (_PureComponent) {
       })))), /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.toolBar
       }, /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
+        flexAuto: "left",
         left: /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
           icon: icon,
           text: (0, _tools.stringIsNullOrWhiteSpace)(title) ? '' : title

package/es/framework/Base/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -35,8 +37,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-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); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 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
 
 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; }
 
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
 function filterModel(props) {
   var result = _objectSpread({}, props);
 
@@ -82,32 +80,7 @@ function filterModel(props) {
 
 
 function shallowEqual(a, b) {
-  // 调用Object.is判断是否相等，相同返回true，不同返回false
-  if (Object.is(a, b)) {
-    return true;
-  } // object.is比较发现不等，但并不代表真的不等，object对象还需要比较
-  // 这里判断是否是object，如果不是，那直接返回false
-
-
-  if (_typeof(a) !== 'object' || a === null || _typeof(b) !== 'object' || b === null) {
-    return false;
-  }
-
-  var keysA = Object.keys(a);
-  var keysB = Object.keys(b); // 比较对象中的keys长度，不等返回false
-
-  if (keysA.length !== keysB.length) {
-    return false;
-  } // 比较对象中相同的key的val是否相等
-
-
-  for (var i = 0; i < keysA.length; i++) {
-    if (!hasOwnProperty.call(b, keysA[i]) || !Object.is(a[keysA[i]], b[keysA[i]])) {
-      return false;
-    }
-  }
-
-  return true;
+  return (0, _tools.isEqual)(a, b);
 }
 
 var Base = /*#__PURE__*/function (_Component) {

package/es/framework/Common/index.js

@@ -1473,7 +1473,7 @@ var Common = /*#__PURE__*/function (_Core) {
       }
 
       return /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
-        direction: "vertical",
+        flexAuto: "top",
         top: topArea,
         bottom: bottomArea
       });

package/es/framework/DataForm/BaseAddForm/index.js

@@ -23,10 +23,10 @@ require("antd/es/message/style");
 
 var _message2 = _interopRequireDefault(require("antd/es/message"));
 
-var _proLayout = require("@ant-design/pro-layout");
-
 var _react = _interopRequireDefault(require("react"));
 
+var _proLayout = require("@ant-design/pro-layout");
+
 var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
 
 var _FunctionComponent = require("../../../customComponents/FunctionComponent");
@@ -295,7 +295,6 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
       var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
         _this2.onPageHeaderAvatarLoadErrorCallback();
       }) : null;
-      var pageHeaderContentConfig = this.establishPageHeaderContentConfig();
       return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
         className: _index.default.customContainor,
         avatar: avatarProps,
@@ -303,7 +302,7 @@ var BaseAddForm = /*#__PURE__*/function (_DataCore) {
         subTitle: this.buildPageHeaderSubTitle(),
         tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
         extra: this.buildExtraAction(),
-        content: (0, _FunctionComponent.buildPageHeaderContent)(pageHeaderContentConfig),
+        content: this.renderPageHeaderContent(),
         extraContent: (0, _FunctionComponent.pageHeaderExtraContent)(this.establishPageHeaderExtraContentConfig()) // onBack={() => {
         //   this.backToList();
         // }}

package/es/framework/DataListView/Base/index.js

@@ -75,10 +75,10 @@ require("antd/es/layout/style");
 
 var _layout = _interopRequireDefault(require("antd/es/layout"));
 
-var _proLayout = require("@ant-design/pro-layout");
-
 var _react = _interopRequireDefault(require("react"));
 
+var _proLayout = require("@ant-design/pro-layout");
+
 var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
 
 var _FlexBox = _interopRequireDefault(require("../../../customComponents/FlexBox"));
@@ -1027,6 +1027,7 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
 
       var bar = /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
         style: style,
+        flexAuto: "left",
         right: /*#__PURE__*/_react.default.createElement(_pagination.default, _extends({}, paginationConfig, {
           onChange: function onChange(page, size) {
             _this.handlePaginationChange(page, size);

package/es/framework/DataSingleView/DataCore/index.d.ts

@@ -48,6 +48,8 @@ declare class DataCore extends BaseView {
     renderFormWrapper: () => JSX.Element;
     renderForm: () => JSX.Element;
     establishCardCollectionConfig: () => null;
+    renderPageHeaderContent: () => JSX.Element | null;
+    renderPageHeaderExtraContent: () => JSX.Element | null;
     formContent: () => any;
     renderFurther(): JSX.Element;
 }

package/es/framework/DataSingleView/DataCore/index.js

@@ -27,10 +27,10 @@ require("antd/es/avatar/style");
 
 var _avatar = _interopRequireDefault(require("antd/es/avatar"));
 
-var _proLayout = require("@ant-design/pro-layout");
-
 var _react = _interopRequireDefault(require("react"));
 
+var _proLayout = require("@ant-design/pro-layout");
+
 var _DecorateAvatar = require("../../../customComponents/DecorateAvatar");
 
 var _FunctionComponent = require("../../../customComponents/FunctionComponent");
@@ -268,6 +268,14 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
       return null;
     };
 
+    _this.renderPageHeaderContent = function () {
+      return (0, _FunctionComponent.buildPageHeaderContent)(_this.establishPageHeaderContentConfig() || {});
+    };
+
+    _this.renderPageHeaderExtraContent = function () {
+      return (0, _FunctionComponent.pageHeaderExtraContent)(_this.establishPageHeaderExtraContentConfig());
+    };
+
     _this.formContent = function () {
       return _this.buildCardCollection(_this.establishCardCollectionConfig());
     };
@@ -281,10 +289,26 @@ var DataCore = /*#__PURE__*/function (_BaseView) {
   _createClass(DataCore, [{
     key: "renderFurther",
     value: function renderFurther() {
-      var pageName = this.state.pageName;
+      var _this2 = this;
+
+      var _this$state2 = this.state,
+          defaultAvatarIcon = _this$state2.defaultAvatarIcon,
+          showPageHeaderAvatar = _this$state2.showPageHeaderAvatar,
+          dataLoading = _this$state2.dataLoading,
+          reloading = _this$state2.reloading,
+          avatarImageLoadResult = _this$state2.avatarImageLoadResult;
+      var avatarProps = showPageHeaderAvatar ? (0, _DecorateAvatar.decorateAvatar)(this.establishPageHeaderAvatarConfig(), defaultAvatarIcon, showPageHeaderAvatar, dataLoading, reloading, avatarImageLoadResult, function () {
+        _this2.onPageHeaderAvatarLoadErrorCallback();
+      }) : null;
       return /*#__PURE__*/_react.default.createElement(_proLayout.PageHeaderWrapper, {
-        title: pageName,
-        logo: this.pageHeaderLogo()
+        logo: this.pageHeaderLogo(),
+        avatar: avatarProps,
+        title: (0, _FunctionComponent.buildPageHeaderTitle)(this.getPageName(), this.establishPageHeaderTitlePrefix()),
+        subTitle: this.buildPageHeaderSubTitle(),
+        tags: (0, _FunctionComponent.buildPageHeaderTagWrapper)(this.establishPageHeaderTagConfig()),
+        extra: this.buildExtraAction(),
+        content: this.renderPageHeaderContent(),
+        extraContent: this.renderPageHeaderExtraContent()
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: _index.default.containorBox,
         style: {

package/es/utils/constants.js

@@ -7,10 +7,10 @@ exports.dropdownExpandItemType = exports.drawerConfig = exports.defaultUserAvata
 exports.empty = empty;
 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;
 
-var _icons = require("@ant-design/icons");
-
 var _react = _interopRequireDefault(require("react"));
 
+var _icons = require("@ant-design/icons");
+
 var _mediaDefault = require("./mediaDefault");
 
 var _iconCollection, _iconBuilder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.92",
+  "version": "1.12.94",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -177,15 +177,12 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-unicorn": "^42.0.0",
     "express": "^4.18.1",
     "father-build": "^1.22.3",
     "gh-pages": "^4.0.0",
     "husky": "^8.0.1",
-    "import-sort-cli": "^6.0.0",
-    "import-sort-parser-babylon": "^6.0.0",
-    "import-sort-parser-typescript": "^6.0.0",
-    "import-sort-style-module": "^6.0.0",
     "inquirer": "^8.2.4",
     "jest-puppeteer": "^6.1.0",
     "jsdom": "^20.0.0",
@@ -222,7 +219,7 @@
     "src/framework",
     "src/utils"
   ],
-  "gitHead": "4663d4b6103ca728449f3d0a3100225160b295c0",
+  "gitHead": "866fcc0f7f7ac540714d8623a38d20716d89fb6a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }