antd-management-fast-framework 1.11.18 → 1.11.19

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

@@ -5,9 +5,11 @@ declare class FlexText extends React.PureComponent<any, any, any> {
 }
 declare namespace FlexText {
     export namespace defaultProps {
+        export const flexAuto: string;
         export const icon: null;
         export const textPrefix: null;
         export const text: string;
+        export const ellipsis: boolean;
         export const textEllipsisMaxWidth: number;
         export const subText: string;
         export const subTextStyle: null;

package/es/customComponents/FlexText/index.js

@@ -60,9 +60,11 @@ var FlexText = /*#__PURE__*/function (_PureComponent) {
     key: "render",
     value: function render() {
       var _this$props = this.props,
+          flexAutoSource = _this$props.flexAuto,
           icon = _this$props.icon,
           textPrefix = _this$props.textPrefix,
           text = _this$props.text,
+          ellipsis = _this$props.ellipsis,
           textEllipsisMaxWidth = _this$props.textEllipsisMaxWidth,
           subText = _this$props.subText,
           subTextStyle = _this$props.subTextStyle,
@@ -72,11 +74,12 @@ var FlexText = /*#__PURE__*/function (_PureComponent) {
           style = _this$props.style;
       return /*#__PURE__*/_react.default.createElement(_FlexBox.default, {
         style: style,
+        flexAuto: flexAutoSource,
         left: /*#__PURE__*/_react.default.createElement(_space.default, null, (addonBefore || null) == null ? null : addonBefore, /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
           icon: icon,
           textPrefix: textPrefix,
           text: text,
-          ellipsis: true,
+          ellipsis: ellipsis,
           ellipsisMaxWidth: textEllipsisMaxWidth
         }), (subText || null) == null ? null : /*#__PURE__*/_react.default.createElement("span", {
           className: _index.default.subText,
@@ -91,9 +94,11 @@ var FlexText = /*#__PURE__*/function (_PureComponent) {
 }(_react.PureComponent);
 
 FlexText.defaultProps = {
+  flexAuto: 'left',
   icon: null,
   textPrefix: null,
   text: '',
+  ellipsis: true,
   textEllipsisMaxWidth: 0,
   subText: '',
   subTextStyle: null,

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

@@ -19,14 +19,6 @@ require("antd/es/form/style");
 
 var _form = _interopRequireDefault(require("antd/es/form"));
 
-require("antd/es/row/style");
-
-var _row = _interopRequireDefault(require("antd/es/row"));
-
-require("antd/es/col/style");
-
-var _col = _interopRequireDefault(require("antd/es/col"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _icons = require("@ant-design/icons");
@@ -35,6 +27,10 @@ var _tools = require("../../../utils/tools");
 
 var _constants = require("../../../utils/constants");
 
+var _IconInfo = _interopRequireDefault(require("../../../customComponents/IconInfo"));
+
+var _FlexText = _interopRequireDefault(require("../../../customComponents/FlexText"));
+
 var _BaseWindow2 = _interopRequireDefault(require("../../DataOperation/BaseWindow"));
 
 var _index = _interopRequireDefault(require("./index.less"));
@@ -192,16 +188,21 @@ var Base = /*#__PURE__*/function (_BaseWindow) {
     };
 
     _this.buildTitle = function () {
-      var prevText = _this.buildTitlePrevText();
-
       var subText = _this.buildTitleSubText();
 
-      subText = (0, _tools.stringIsNullOrWhiteSpace)(subText) ? '' : "\uFF1A\u3010".concat(subText, "\u3011");
-      return /*#__PURE__*/_react.default.createElement(_row.default, {
-        gutter: 6
-      }, /*#__PURE__*/_react.default.createElement(_col.default, null, _this.buildTitleIcon()), /*#__PURE__*/_react.default.createElement(_col.default, {
-        flex: "auto"
-      }, prevText, _this.buildTitleText(), subText));
+      var subInfo = (0, _tools.stringIsNullOrWhiteSpace)(subText) ? null : /*#__PURE__*/_react.default.createElement(_FlexText.default, {
+        flexAuto: "right",
+        addonBefore: '【',
+        text: subText,
+        addonAfter: '】'
+      });
+      return /*#__PURE__*/_react.default.createElement(_FlexText.default, {
+        flexAuto: "right",
+        icon: _this.buildTitleIcon(),
+        textPrefix: _this.buildTitlePrevText(),
+        text: _this.buildTitleText(),
+        extra: subInfo
+      });
     };
 
     _this.formContent = function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.18",
+  "version": "1.11.19",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -167,5 +167,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "427ae87677da43f56ebe901242fb414facd1dd1f"
+  "gitHead": "48e23cd378dbe7cda1566614180397fdc06e066d"
 }

package/License.txt

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 luzhitao
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.