antd-management-fast-framework 1.11.17 → 1.11.21

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/es/utils/authority.js

@@ -93,7 +93,7 @@ function checkIsSuper() {
   });
 
   if (existCache) {
-    result = (0, _cacheAssist.getCache)({
+    var result = (0, _cacheAssist.getCache)({
       key: superPermissionCacheKey
     });
 

package/es/utils/constants.d.ts

@@ -75,18 +75,40 @@ export namespace formNameCollection {
         export { helper_1 as helper };
     }
 }
+/**
+ * 转换集合
+ */
 export const convertCollection: {
+    /**
+     * 数字
+     */
     number: string;
+    /**
+     * 日期 date
+     */
     datetime: string;
+    /**
+     * 字符串
+     */
     string: string;
+    /**
+     * moment日期
+     */
     moment: string;
+    /**
+     * 金额
+     */
     money: string;
+    /**
+     * 数组
+     */
     array: string;
 };
 export namespace formatCollection {
     export const money: string;
     export const datetime: string;
     export const chineseMoney: string;
+    export const percentage: string;
 }
 export namespace menuType {
     export const divider: string;

package/es/utils/constants.js

@@ -104,20 +104,67 @@ var formNameCollection = {
     helper: ''
   }
 };
+/**
+ * 转换集合
+ */
+
 exports.formNameCollection = formNameCollection;
 var convertCollection = {
+  /**
+   * 数字
+   */
   number: 'number',
+
+  /**
+   * 日期 date
+   */
   datetime: 'datetime',
+
+  /**
+   * 字符串
+   */
   string: 'string',
+
+  /**
+   * moment日期
+   */
   moment: 'moment',
+
+  /**
+   * 金额
+   */
   money: 'money',
+
+  /**
+   * 数组
+   */
   array: 'array'
 };
+/**
+ * 格式化集合
+ */
+
 exports.convertCollection = convertCollection;
 var formatCollection = {
+  /**
+   * 金额 ￥ 0.00
+   */
   money: 'money',
+
+  /**
+   * 格式化日期 YYYY-MM-DD hh:mm:ss
+   */
   datetime: 'datetime',
-  chineseMoney: 'chineseMoney'
+
+  /**
+   * 中文金额
+   */
+  chineseMoney: 'chineseMoney',
+
+  /**
+   * 百分比
+   */
+  percentage: 'percentage'
 };
 exports.formatCollection = formatCollection;
 var menuType = {

package/es/utils/tools.d.ts

@@ -408,6 +408,14 @@ export function getValueByKey({ data, key, defaultValue, convert, convertBuilder
     format?: any;
     formatBuilder?: any;
 }): any;
+export function convertTarget({ target, convert }: {
+    target: any;
+    convert: any;
+}): any;
+export function formatTarget({ target, format }: {
+    target: any;
+    format: any;
+}): any;
 /**
  * 通过 path 获取对应得值
  */

package/es/utils/tools.js

@@ -14,6 +14,7 @@ exports.checkLocalhost = checkLocalhost;
 exports.clearLocalStorage = clearLocalStorage;
 exports.clearSessionStorage = clearSessionStorage;
 exports.cloneWithoutMethod = cloneWithoutMethod;
+exports.convertTarget = convertTarget;
 exports.copyToClipboard = copyToClipboard;
 exports.corsTarget = corsTarget;
 exports.dateToMoment = dateToMoment;
@@ -38,6 +39,7 @@ exports.formatDatetime = formatDatetime;
 exports.formatDecimal = formatDecimal;
 exports.formatMoney = formatMoney;
 exports.formatMoneyToChinese = formatMoneyToChinese;
+exports.formatTarget = formatTarget;
 exports.getAppInitConfigData = getAppInitConfigData;
 exports.getBrowserInfo = getBrowserInfo;
 exports.getDerivedStateFromPropsForUrlParams = getDerivedStateFromPropsForUrlParams;
@@ -963,8 +965,12 @@ function sortedUnique(array) {
 
 
 function roundToTarget(v, len) {
+  if (!isMoney(v)) {
+    return 0;
+  }
+
   var temp = Math.pow(10, len);
-  return Math.round(v * temp) / temp;
+  return Math.round(toMoney(v) * temp) / temp;
 }
 /**
  * 判断是否是数字字符串
@@ -1023,67 +1029,105 @@ function getValueByKey(_ref14) {
   var v = getPathValue(data, key, defaultValue);
   var result = v;
 
-  if (isFunction(convertBuilder)) {
-    result = convertBuilder(v);
-  } else if ((convert || null) != null) {
+  if ((convertBuilder || null) != null || (convert || null) != null) {
+    if (isFunction(convertBuilder)) {
+      result = convertTarget({
+        target: v,
+        convert: convertBuilder
+      });
+    } else {
+      result = convertTarget({
+        target: v,
+        convert: convert
+      });
+    }
+  }
+
+  if ((formatBuilder || null) != null || (format || null) != null) {
+    if (isFunction(formatBuilder)) {
+      result = formatTarget({
+        target: v,
+        format: formatBuilder
+      });
+    } else {
+      result = formatTarget({
+        target: v,
+        format: format
+      });
+    }
+  }
+
+  return result;
+}
+
+function convertTarget(_ref15) {
+  var target = _ref15.target,
+      convert = _ref15.convert;
+
+  if (isFunction(convert)) {
+    return convert(target);
+  }
+
+  if (isString(convert)) {
     switch (convert) {
       case _constants.convertCollection.number:
-        result = toNumber(v);
-        break;
+        return toNumber(target);
 
       case _constants.convertCollection.datetime:
-        result = toDatetime(v);
-        break;
+        return toDatetime(target);
 
       case _constants.convertCollection.string:
-        result = toString(v);
-        break;
+        return toString(target);
 
       case _constants.convertCollection.moment:
-        result = toMoment({
-          data: toString(v)
+        return toMoment({
+          data: toString(target)
         });
-        break;
 
       case _constants.convertCollection.money:
-        result = toMoney(v);
-        break;
+        return toMoney(target);
 
       case _constants.convertCollection.array:
-        result = (v || null) == null ? [] : isArray(v) ? v : [v];
-        break;
+        return (target || null) == null ? [] : isArray(target) ? target : [target];
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  if (isFunction(formatBuilder)) {
-    result = formatBuilder(v);
-  } else if ((format || null) != null) {
+  return target;
+}
+
+function formatTarget(_ref16) {
+  var target = _ref16.target,
+      format = _ref16.format;
+
+  if (isFunction(format)) {
+    return format(target);
+  }
+
+  if (isString(format)) {
     switch (format) {
       case _constants.formatCollection.money:
-        result = formatMoney(v);
-        break;
+        return formatMoney(target);
 
       case _constants.formatCollection.datetime:
-        result = formatDatetime({
-          data: v
+        return formatDatetime({
+          data: target
         });
-        break;
 
       case _constants.formatCollection.chineseMoney:
-        result = formatMoneyToChinese(v);
-        break;
+        return formatMoneyToChinese(target);
+
+      case _constants.formatCollection.percentage:
+        return "".concat(roundToTarget(target * 100, 1), "%");
 
       default:
-        result = v;
-        break;
+        return target;
     }
   }
 
-  return result;
+  return target;
 }
 /**
  * 通过 path 获取对应得值
@@ -1333,10 +1377,10 @@ function formatMoneyToChinese(v) {
   return ChineseString;
 }
 
-function seededRandom(_ref15) {
-  var seed = _ref15.seed,
-      min = _ref15.min,
-      max = _ref15.max;
+function seededRandom(_ref17) {
+  var seed = _ref17.seed,
+      min = _ref17.min,
+      max = _ref17.max;
   var maxValue = max || 1;
   var minValue = min || 0;
   var seedValue = (seed * 9301 + 49297) % 233280;
@@ -1352,18 +1396,18 @@ function seededRandom(_ref15) {
  */
 
 
-function getRandomColor(_ref16) {
-  var seed = _ref16.seed,
-      _ref16$hue = _ref16.hue,
-      hue = _ref16$hue === void 0 ? null : _ref16$hue,
-      _ref16$luminosity = _ref16.luminosity,
-      luminosity = _ref16$luminosity === void 0 ? null : _ref16$luminosity,
-      _ref16$count = _ref16.count,
-      count = _ref16$count === void 0 ? null : _ref16$count,
-      _ref16$format = _ref16.format,
-      format = _ref16$format === void 0 ? null : _ref16$format,
-      _ref16$alpha = _ref16.alpha,
-      alpha = _ref16$alpha === void 0 ? null : _ref16$alpha;
+function getRandomColor(_ref18) {
+  var seed = _ref18.seed,
+      _ref18$hue = _ref18.hue,
+      hue = _ref18$hue === void 0 ? null : _ref18$hue,
+      _ref18$luminosity = _ref18.luminosity,
+      luminosity = _ref18$luminosity === void 0 ? null : _ref18$luminosity,
+      _ref18$count = _ref18.count,
+      count = _ref18$count === void 0 ? null : _ref18$count,
+      _ref18$format = _ref18.format,
+      format = _ref18$format === void 0 ? null : _ref18$format,
+      _ref18$alpha = _ref18.alpha,
+      alpha = _ref18$alpha === void 0 ? null : _ref18$alpha;
   return (0, _randomcolor.default)({
     seed: seed,
     hue: hue,
@@ -2066,8 +2110,8 @@ function removeNearestLocalhostNotifyCache() {
  */
 
 
-function trySendNearestLocalhostNotify(_ref17) {
-  var text = _ref17.text;
+function trySendNearestLocalhostNotify(_ref19) {
+  var text = _ref19.text;
   var needSend = false;
   var nearestTime = 0;
 
@@ -2128,11 +2172,11 @@ function notifySuccess(text) {
  */
 
 
-function notify(_ref18) {
-  var type = _ref18.type,
-      placementValue = _ref18.placement,
-      messageValue = _ref18.message,
-      descriptionValue = _ref18.description;
+function notify(_ref20) {
+  var type = _ref20.type,
+      placementValue = _ref20.placement,
+      messageValue = _ref20.message,
+      descriptionValue = _ref20.description;
 
   var _placement$message$de = _objectSpread(_objectSpread({}, {
     placement: 'bottomRight',
@@ -2206,10 +2250,10 @@ function notify(_ref18) {
   }, 600);
 }
 
-function checkFromConfig(_ref19) {
-  var label = _ref19.label,
-      name = _ref19.name,
-      helper = _ref19.helper;
+function checkFromConfig(_ref21) {
+  var label = _ref21.label,
+      name = _ref21.name,
+      helper = _ref21.helper;
   var labelText = 'object';
   var nameText = 'object';
   var helperText = 'object';
@@ -2268,13 +2312,13 @@ var requestAnimFrame = requestAnimFrameCustom;
 
 exports.requestAnimFrame = requestAnimFrame;
 
-function sortCollectionByKey(_ref20) {
-  var operate = _ref20.operate,
-      item = _ref20.item,
-      list = _ref20.list,
-      sortKey = _ref20.sortKey,
-      _ref20$sortMin = _ref20.sortMin,
-      sortMin = _ref20$sortMin === void 0 ? 0 : _ref20$sortMin;
+function sortCollectionByKey(_ref22) {
+  var operate = _ref22.operate,
+      item = _ref22.item,
+      list = _ref22.list,
+      sortKey = _ref22.sortKey,
+      _ref22$sortMin = _ref22.sortMin,
+      sortMin = _ref22$sortMin === void 0 ? 0 : _ref22$sortMin;
 
   if ((item || null) == null) {
     return list;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.11.17",
+  "version": "1.11.21",
   "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": "70323abf4d38c2c07c61e4e66fd386516f623495"
+  "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.