antd-management-fast-framework 1.12.81 → 1.12.84

package/es/customComponents/FunctionComponent/index.js

@@ -584,6 +584,8 @@ function buildDropdown(_ref4) {
   var otherProps = tooltipAdjust ? {} : {
     key: key || (0, _tools.getGuid)()
   };
+  var placementAdjust = (0, _tools.lowerFirst)(placementDropdown || 'bottomRight');
+  var overlayClassNameAdjust = placementAdjust.startsWith('bottom') ? _index.default.dropdownExpandOverlayBottom : placementAdjust.startsWith('top') ? _index.default.dropdownExpandOverlayTop : {};
   var hasHandleButtonClick = false;
 
   if ((handleButtonClick || null) != null) {
@@ -680,7 +682,7 @@ function buildDropdown(_ref4) {
           text: text || ''
         }))),
         right: /*#__PURE__*/_react.default.createElement(_popover.default, _extends({}, otherProps, {
-          placement: placementDropdown || 'bottomRight',
+          placement: placementAdjust,
           arrow: arrow,
           content: buildMenu({
             handleData: r,
@@ -688,7 +690,7 @@ function buildDropdown(_ref4) {
             items: items
           }),
           title: itemPanelTitle,
-          overlayClassName: _index.default.dropdownExpandOverlay
+          overlayClassName: overlayClassNameAdjust
         }), /*#__PURE__*/_react.default.createElement(_button.default, {
           style: {
             height: '100%',
@@ -731,7 +733,7 @@ function buildDropdown(_ref4) {
           text: text || ''
         })),
         right: /*#__PURE__*/_react.default.createElement(_popover.default, _extends({}, otherProps, {
-          placement: placementDropdown || 'bottomRight',
+          placement: placementAdjust,
           arrow: arrow,
           content: buildMenu({
             handleData: r,
@@ -739,7 +741,7 @@ function buildDropdown(_ref4) {
             items: items
           }),
           title: itemPanelTitle,
-          overlayClassName: _index.default.dropdownExpandOverlay
+          overlayClassName: overlayClassNameAdjust
         }), /*#__PURE__*/_react.default.createElement(_button.default, {
           style: {
             height: '100%',
@@ -765,7 +767,7 @@ function buildDropdown(_ref4) {
       icon: icon || null,
       text: text || ''
     })) : /*#__PURE__*/_react.default.createElement(_popover.default, _extends({}, otherProps, {
-      placement: placementDropdown || 'bottomRight',
+      placement: placementAdjust,
       arrow: arrow,
       content: buildMenu({
         handleData: r,
@@ -773,7 +775,7 @@ function buildDropdown(_ref4) {
         items: items
       }),
       title: itemPanelTitle,
-      overlayClassName: _index.default.dropdownExpandOverlay
+      overlayClassName: overlayClassNameAdjust
     }), /*#__PURE__*/_react.default.createElement(_button.default, {
       type: typeSource || 'default',
       size: size !== null && size !== void 0 ? size : 'default'
@@ -831,6 +833,7 @@ function buildMenu(_ref5) {
       disabled: false,
       hidden: false,
       type: _constants.dropdownExpandItemType.item,
+      color: null,
       confirm: false
     }), o || {});
 
@@ -927,7 +930,8 @@ function buildMenu(_ref5) {
         text = o.text,
         disabled = o.disabled,
         hidden = o.hidden,
-        confirm = o.confirm;
+        confirm = o.confirm,
+        color = o.color;
 
     if ((0, _tools.stringIsNullOrWhiteSpace)(key)) {
       (0, _tools.showErrorMessage)({
@@ -977,7 +981,10 @@ function buildMenu(_ref5) {
           disabled: disabled
         }, /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
           icon: icon || _constants.iconCollection.edit,
-          text: text
+          text: text,
+          style: (color || null) == null ? null : {
+            color: color
+          }
         })));
       }
 
@@ -1003,16 +1010,21 @@ function buildMenu(_ref5) {
         }
       }, /*#__PURE__*/_react.default.createElement(_IconInfo.default, {
         icon: icon || _constants.iconCollection.edit,
-        text: text
+        text: text,
+        style: (color || null) == null ? null : {
+          color: color
+        }
       }));
     }
 
     if (type === _constants.dropdownExpandItemType.divider) {
       return /*#__PURE__*/_react.default.createElement(_divider.default, {
         key: key,
-        style: {
+        style: _objectSpread({
           margin: 0
-        }
+        }, (color || null) == null ? {} : {
+          borderColor: color
+        })
       });
     }
 
@@ -3178,6 +3190,11 @@ function buildColumnItem(_ref52) {
         }
 
         var operateConfig = d.configBuilder(value, record, index);
+
+        if ((operateConfig || null) == null) {
+          return null;
+        }
+
         return buildDropdown(operateConfig);
       }
 

package/es/customComponents/FunctionComponent/index.less

@@ -16,12 +16,25 @@
   }
 }
 
-.dropdownExpandOverlay {
+.dropdownExpandOverlayBottom {
   padding: 0;
 
   :global {
     .ant-popover-inner-content {
-      margin-top: 12px;
+      margin-top: 10px;
+      padding: 0;
+      background-color: #fff;
+      border-radius: 4px;
+    }
+  }
+}
+
+.dropdownExpandOverlayTop {
+  padding: 0;
+
+  :global {
+    .ant-popover-inner-content {
+      margin-bottom: 10px;
       padding: 0;
       background-color: #fff;
       border-radius: 4px;

package/es/framework/Common/index.js

@@ -1804,7 +1804,11 @@ var Common = /*#__PURE__*/function (_Core) {
             md: lg || md,
             sm: lg || sm,
             xs: lg || xs
-          }, /*#__PURE__*/_react.default.createElement(_divider.default, _objectSpread(_objectSpread({}, {}), contentItem.otherProps || {}), (0, _tools.stringIsNullOrWhiteSpace)(contentItem.text || '') ? null : contentItem.text));
+          }, /*#__PURE__*/_react.default.createElement(_divider.default, _objectSpread(_objectSpread({}, {
+            style: {
+              margin: '4px 0'
+            }
+          }), contentItem.otherProps || {}), (contentItem.text || null) == null ? null : contentItem.text));
         }
 
         if (type === _constants.cardConfig.contentItemType.customGrid) {

package/es/framework/DataListView/Base/index.d.ts

@@ -13,6 +13,9 @@ declare class ListBase extends AuthorizationWrapper {
     affixPaginationBar: boolean;
     formRef: React.RefObject<any>;
     pageSizeAdditional: number;
+    columnOperateVisible: boolean;
+    columnOperateWidth: number;
+    columnOperateFixed: string;
     lastLoadParams: any;
     columnsOtherConfig: any[];
     state: any;
@@ -210,6 +213,7 @@ declare class ListBase extends AuthorizationWrapper {
     renderContentArea: () => JSX.Element;
     establishPageContentLayoutSiderConfig: () => {};
     establishPageContentLayoutConfig: () => {};
+    establishListItemDropdownConfig: (record: any) => null;
     renderPageContent: () => JSX.Element;
     renderPageBody: () => JSX.Element;
     renderFurther(): JSX.Element;

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

@@ -105,6 +105,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 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."); }
@@ -117,12 +123,6 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -173,6 +173,9 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
     _this.affixPaginationBar = true;
     _this.formRef = /*#__PURE__*/_react.default.createRef();
     _this.pageSizeAdditional = 0;
+    _this.columnOperateVisible = true;
+    _this.columnOperateWidth = 106;
+    _this.columnOperateFixed = 'right';
 
     _this.afterDidMount = function () {
       var pageSize = _this.state.pageSize;
@@ -274,7 +277,16 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
 
     _this.buildColumnFromWrapper = function () {
       var list = _this.getColumnWrapper() || [];
-      return _this.buildColumnList(list);
+      return _this.buildColumnList([].concat(_toConsumableArray(list), _toConsumableArray(_this.columnOperateVisible && (0, _tools.isObject)() ? [{
+        dataTarget: _constants.formNameCollection.customOperate,
+        width: _this.columnOperateWidth,
+        fixed: _this.columnOperateFixed,
+        showRichFacade: true,
+        facadeMode: _constants.columnFacadeMode.dropdown,
+        configBuilder: function configBuilder(val, record) {
+          return _this.establishListItemDropdownConfig(record) || null;
+        }
+      }] : [])));
     };
 
     _this.buildColumnList = function (list) {
@@ -1389,6 +1401,10 @@ var ListBase = /*#__PURE__*/function (_AuthorizationWrapper) {
       return {};
     };
 
+    _this.establishListItemDropdownConfig = function (record) {
+      return null;
+    };
+
     _this.renderPageContent = function () {
       var siderArea = _this.renderSiderArea();
 

package/es/framework/FieldExtension/SelectFieldDrawer/SelectFieldBase/index.js

@@ -130,7 +130,7 @@ var SelectFieldBase = /*#__PURE__*/function (_SupplementWrapper) {
           onClick: function onClick(e) {
             return _this.showSelect(e);
           }
-        }, "iconCollection.search"), showClear ? /*#__PURE__*/_react.default.createElement(_divider.default, {
+        }, _constants.iconCollection.search), showClear ? /*#__PURE__*/_react.default.createElement(_divider.default, {
           type: "vertical",
           style: {
             paddingLeft: 2,
@@ -149,7 +149,7 @@ var SelectFieldBase = /*#__PURE__*/function (_SupplementWrapper) {
           onClick: function onClick() {
             return _this.clearSelect();
           }
-        }, "iconCollection.closeCircle") : null)
+        }, _constants.iconCollection.closeCircle) : null)
       }, formItemLayout);
     };
 

package/es/utils/core.d.ts

@@ -1,6 +1,7 @@
 export function replace(source: any, pattern: any, replacement: any): string;
 export function trim(source: any): string;
 export function upperFirst(source: any): string;
+export function lowerFirst(source: any): string;
 export function stringIsNullOrWhiteSpace(value: any): boolean;
 export function isBrowser(): boolean;
 /**

package/es/utils/core.js

@@ -8,6 +8,7 @@ exports.empty = empty;
 exports.encodeBase64 = encodeBase64;
 exports.inCollection = inCollection;
 exports.isBrowser = isBrowser;
+exports.lowerFirst = lowerFirst;
 exports.replace = replace;
 exports.stringIsNullOrWhiteSpace = stringIsNullOrWhiteSpace;
 exports.trim = trim;
@@ -29,6 +30,10 @@ function upperFirst(source) {
   return (0, _lodash.upperFirst)(source);
 }
 
+function lowerFirst(source) {
+  return (0, _lodash.lowerFirst)(source);
+}
+
 function stringIsNullOrWhiteSpace(value) {
   return trim(replace(value || '', ' ', '')) === '';
 }

package/es/utils/tools.d.ts

@@ -602,6 +602,7 @@ export function isDate(value: any): boolean;
  */
 export function isString(value: any): boolean;
 export function upperFirst(value: any): string;
+export function lowerFirst(value: any): string;
 /**
  * 移除数组中predicate（断言）返回为真值的所有元素，并返回移除元素组成的数组。predicate（断言） 会传入3个参数： (value, index, array)。
  * @param {*} array

package/es/utils/tools.js

@@ -67,6 +67,7 @@ exports.isNumber = isNumber;
 exports.isObject = isObject;
 exports.isString = isString;
 exports.isUndefined = isUndefined;
+exports.lowerFirst = lowerFirst;
 exports.notify = notify;
 exports.notifyInfo = notifyInfo;
 exports.notifySuccess = notifySuccess;
@@ -1685,6 +1686,10 @@ function isString(value) {
 function upperFirst(value) {
   return (0, _core.upperFirst)(value);
 }
+
+function lowerFirst(value) {
+  return (0, _core.lowerFirst)(value);
+}
 /**
  * 移除数组中predicate（断言）返回为真值的所有元素，并返回移除元素组成的数组。predicate（断言） 会传入3个参数： (value, index, array)。
  * @param {*} array

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.81",
+  "version": "1.12.84",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -221,7 +221,7 @@
     "src/framework",
     "src/utils"
   ],
-  "gitHead": "5af477427eaee229c00f50a78f72706018681dc8",
+  "gitHead": "5c53d7afb8c36aac0601178abe9003cf9b29f278",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }