fan-standard-comp 4.0.1 → 4.0.3

package/es/StandardModal/index.js

@@ -74,20 +74,17 @@ var StandardModal = function StandardModal(props) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     modalForm = _Form$useForm2[0];
-  var _useState = useState(),
+  // const [modalFormRef, setModalFormRef] = useState<any>();  // <---- set the ref when Form Rendered(使用此方法会出现溢出事件）
+  var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
-    modalFormRef = _useState2[0],
-    setModalFormRef = _useState2[1]; // <---- set the ref when Form Rendered
-  var _useState3 = useState(0),
-    _useState4 = _slicedToArray(_useState3, 2),
-    bodyMaxHeight = _useState4[0],
-    setBodyMaxHeight = _useState4[1];
+    bodyMaxHeight = _useState2[0],
+    setBodyMaxHeight = _useState2[1];
 
   // setTabFormChild
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    formChild = _useState6[0],
-    setFormChild = _useState6[1]; // <---- set the ref when Form Rendered
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    formChild = _useState4[0],
+    setFormChild = _useState4[1]; // <---- set the ref when Form Rendered
 
   // 按钮栏是否有显示（默认显示）
   var hasFooterBar = useMemo(function () {
@@ -163,7 +160,7 @@ var StandardModal = function StandardModal(props) {
   };
   // fill Form when modal open 此处可解决获取  Form.useForm  warning
   useEffect(function () {
-    if (visible && modalFormRef) {
+    if (visible && modalForm) {
       // <---- check ref before use the form instance
       if (initialValues && _typeof(initialValues) === 'object') {
         initialValues && modalForm.setFieldsValue(_objectSpread({}, initialValues));
@@ -173,7 +170,7 @@ var StandardModal = function StandardModal(props) {
     // if (!visible && modalFormRef) {
     //   clearAllFieldsValue() // 清空表单传参数
     // }
-  }, [modalFormRef, visible]);
+  }, [modalForm, visible]);
   useEffect(function () {
     if (visible) {
       initBodyMaxHeight();
@@ -419,8 +416,12 @@ var StandardModal = function StandardModal(props) {
   // 内容渲染
   var renderChildrenNodes = function renderChildrenNodes() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/React.createElement(Form, {
-      layout: formLayout,
-      ref: setModalFormRef,
+      layout: formLayout
+      // ref={(formInstance)=> {
+      //   // console.log('formInstance', formInstance)
+      //   // setModalFormRef(formInstance)
+      // }}
+      ,
       form: modalForm,
       onFinish: handleSubmit,
       hideRequiredMark: fieldStatus === 'viewOnly' || hideRequiredMark

package/es/StandardTable/index.d.ts

@@ -17,10 +17,11 @@ interface StandardTableProps {
     rowSelection?: any;
     orderNumber?: object;
     columnsConfig?: object;
-    buttonGroup?: React.ReactNode | any[];
+    buttonGroup?: any[];
     title?: React.ReactNode | string;
     min?: number;
-    buttonGroupConfig?: Object;
+    buttonGroupConfig?: any[];
+    batchButtonGroup?: any[];
     [k: string]: any;
 }
 declare const StandardTable: FC<StandardTableProps>;

package/es/StandardTable/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min"];
+var _excluded = ["data", "rowKey", "rowSelection", "columns", "hideOrderNumber", "orderNumber", "className", "emptyText", "codes", "permissionCodes", "columnsConfig", "title", "buttonGroup", "buttonGroupConfig", "min", "batchButtonGroup"];
 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(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -20,6 +20,7 @@ import { Table, Card } from 'antd';
 import ButtonGroup from "../ButtonGroup/index";
 import "./style/index.less";
 import { FanContext } from "../ConfigContext";
+import _ from 'lodash';
 import useStyle from "./style/index";
 var StandardTable = function StandardTable(props) {
   var InitFanContext = useContext(FanContext);
@@ -50,11 +51,11 @@ var StandardTable = function StandardTable(props) {
     buttonGroup = _providerConfig$props.buttonGroup,
     buttonGroupConfig = _providerConfig$props.buttonGroupConfig,
     min = _providerConfig$props.min,
+    batchButtonGroup = _providerConfig$props.batchButtonGroup,
     rest = _objectWithoutProperties(_providerConfig$props, _excluded);
-
   // 加上类型修复 TS:2322 报警
   var resetColumns = [_objectSpread(_objectSpread({
-    width: 58,
+    width: 76,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -82,7 +83,7 @@ var StandardTable = function StandardTable(props) {
         otherColumn = columnsConfig.otherColumn;
       if (colItem.type === 'action') {
         var _colItem, _colItem2, _colItem3;
-        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 120 : 80);
+        colItem.width = ((_colItem = colItem) === null || _colItem === void 0 ? void 0 : _colItem.width) || (action === null || action === void 0 ? void 0 : action.width) || (colItem.buttonGroup.length > 1 ? 130 : 80);
         colItem.align = ((_colItem2 = colItem) === null || _colItem2 === void 0 ? void 0 : _colItem2.align) || (action === null || action === void 0 ? void 0 : action.align) || 'center';
         colItem.title = ((_colItem3 = colItem) === null || _colItem3 === void 0 ? void 0 : _colItem3.title) || (action === null || action === void 0 ? void 0 : action.title) || '操作';
         colItem.key = 'control';
@@ -139,22 +140,35 @@ var StandardTable = function StandardTable(props) {
     });
     resetColumns = hideOrderNumber ? recombinationColumns : resetColumns.concat(recombinationColumns);
   }
-  return wrapSSR( /*#__PURE__*/React.createElement(Card, {
-    className: classNames(componentName, 'standard-table', className, hashId),
-    bordered: false,
-    title: title,
-    extra: buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/React.createElement(ButtonGroup, {
-      options: buttonGroup,
+  var RenderExtraButtonGroup = function RenderExtraButtonGroup(exProps) {
+    // @ts-ignore
+    var _providerConfig$props5 = _objectSpread(_objectSpread({}, providerConfig), props),
+      rowSelection = _providerConfig$props5.rowSelection;
+    var buttonGroup = exProps.buttonGroup,
+      batchButtonGroup = exProps.batchButtonGroup;
+    // 只有配置rowSelection才显示对应的批量按钮组
+    var list = _.unionBy(rowSelection && (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) !== 'radio' && (batchButtonGroup || []), buttonGroup || []);
+    return /*#__PURE__*/React.createElement(ButtonGroup, {
+      options: list,
       min: min,
       codes: codes,
       permissionCodes: permissionCodes,
       dropdownConfig: buttonGroupConfig
-    }) : null
+    });
+  };
+  return wrapSSR( /*#__PURE__*/React.createElement(Card, {
+    className: classNames(componentName, 'standard-table', className, hashId),
+    bordered: false,
+    title: title,
+    extra: /*#__PURE__*/React.createElement(RenderExtraButtonGroup, {
+      buttonGroup: buttonGroup,
+      batchButtonGroup: batchButtonGroup
+    })
   }, /*#__PURE__*/React.createElement(Table, _extends({
     rowKey: rowKey || 'id',
-    rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
-      columnWidth: 30
-    }) : rowSelection,
+    rowSelection: rowSelection ? _objectSpread({
+      columnWidth: 56
+    }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,
     columns: resetColumns,

package/es/StandardTable/style/index.js

@@ -6,7 +6,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { createStyleHook } from "../../theme/utils/genStyleHook";
 import { scrollBar } from "../../theme/index";
-import { TinyColor } from "@ctrl/tinycolor";
 var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
   var prepareComponentToken = function prepareComponentToken(token) {
     return {
@@ -17,11 +16,10 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
     var prefixCls = ".".concat(prefix);
     var rowTd = {
       '> td': {
-        borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(),
-        // fade(@primary-color, 50%),
-        '&::before': {
-          borderTop: "1px solid ".concat(new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString())
-        }
+        // borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(), // fade(@primary-color, 50%),
+        // '&::before': {
+        //   borderTop: `1px solid ${new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString()}`,
+        // }
       }
     };
     return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
@@ -40,22 +38,22 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
       // 固定右侧列的样式
       '.ant-table-fixed-left table.ant-table-fixed': {
         '.ant-table-thead > tr > th, .ant-table-tbody > tr > td': {
-          paddingRight: token.paddingMD / 2,
+          paddingRight: token.paddingMD,
           '&:first-child': {
             paddingLeft: token.paddingMD,
-            paddingRight: token.paddingMD / 2
+            paddingRight: token.paddingMD
           }
         }
       },
       // 固定右侧列的样式
       '.ant-table-fixed-right': {
         '.ant-table-thead > tr > th, .ant-table-tbody > tr > td': {
-          paddingRight: token.paddingMD / 2,
+          paddingRight: token.paddingMD,
           '&:first-child': {
-            paddingLeft: token.paddingMD / 2
+            paddingLeft: token.paddingMD
           },
           '&:nth-last-child(1)': {
-            paddingLeft: token.paddingMD / 2,
+            paddingLeft: token.paddingMD,
             paddingRight: token.paddingMD
           }
         }
@@ -83,6 +81,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           fontSize: token.fontSizeLG
         },
         '.ant-table-thead > tr > th': {
+          padding: "12px ".concat(token.paddingMD, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },
@@ -91,7 +90,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           }
         },
         '.ant-table-tbody > tr > td ': {
-          padding: "12px ".concat(token.paddingMD / 2, "px"),
+          padding: "12px ".concat(token.paddingMD, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },

package/es/StandardTable/style/index.less

@@ -16,6 +16,8 @@
 
     .ant-pagination-total-text {
       float: left;
+      flex:1;
+      text-align: left;
     }
 
     .ant-pagination-options-size-changer.ant-select {
@@ -79,6 +81,8 @@
 .spec-pagination {
   .ant-pagination-total-text {
     float: left;
+    flex:1;
+    text-align: left;
   }
 }
 
@@ -136,15 +140,15 @@
 
     .ant-table-tbody > tr > td {
       //padding: 12px @padding-md/2;
-      &:first-child {
-        //padding-left: @padding-md;
-        border-left: 1px solid transparent;
-      }
-
-      &:last-child {
-        //padding-right: @padding-md;
-        border-right: 1px solid transparent;
-      }
+      //&:first-child {
+      //  //padding-left: @padding-md;
+      //  border-left: 1px solid transparent;
+      //}
+      //
+      //&:last-child {
+      //  //padding-right: @padding-md;
+      //  border-right: 1px solid transparent;
+      //}
     }
 
     .ant-table-thead > tr.ant-table-row-hover:not(.ant-table-expanded-row),

package/es/utils/filterPermission.d.ts

@@ -1,5 +1,5 @@
 declare const btnClickFunc: (fn: any, params?: {}) => any;
 declare const btnIsDisabled: (isDisabled: any, params?: {}) => any;
 declare const btnIsHide: (isHide: any, params?: {}) => any;
-declare const removeNoPermission: (array: any, permissionCodes: any, codes: any, params: any) => false | any[];
+declare const removeNoPermission: (array: any, permissionCodes: any, codesList: any, params: any) => any[];
 export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };

package/es/utils/filterPermission.js

@@ -6,6 +6,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 // @ts-nocheck
 import _ from "lodash";
+import { funcCode } from "../data/index";
 // 按钮方法
 var btnClickFunc = function btnClickFunc(fn) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -52,7 +53,9 @@ var btnIsHide = function btnIsHide(isHide) {
   return isHide;
 };
 // 重新组合数据(排除不包含在permissionCodes内及isHide数据
-var removeNoPermission = function removeNoPermission(array, permissionCodes, codes, params) {
+var removeNoPermission = function removeNoPermission(array, permissionCodes, codesList, params) {
+  // 合并本地的codes
+  var codes = _.unionBy(codesList || [], funcCode.btnFuncCodes, 'code');
   return Array.isArray(array) && array.filter(function (item) {
     if (item.children) {
       item.children = removeNoPermission(item.children, permissionCodes, codes, params);
@@ -86,6 +89,6 @@ var removeNoPermission = function removeNoPermission(array, permissionCodes, cod
       }
     }
     return resultItem;
-  });
+  }) || [];
 };
 export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };

package/lib/ButtonGroup/index.d.ts

@@ -19,10 +19,16 @@ export interface ButtonGroupOptionsProps {
     confirmConfig?: any;
     dropdownConfig?: any;
 }
+interface CodesProps {
+    code: string;
+    name: string | React.ReactNode;
+    icon?: string | React.ReactNode | Boolean;
+    [key: string]: any;
+}
 interface ButtonGroupProps {
     type?: 'button' | 'text';
     rowParams?: ButtonGroupRowParamsProps;
-    codes?: object[];
+    codes?: CodesProps[];
     permissionCodes?: string[];
     options?: ButtonGroupOptionsProps[] | any[];
     min?: number;

package/lib/ButtonGroup/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,23 +9,19 @@ var _components = require("../components");
 var _SpecIcon = _interopRequireDefault(require("../SpecIcon"));
 var _PopConfirmTitle = _interopRequireDefault(require("./PopConfirmTitle"));
 var _antd = require("antd");
-var _index = require("../data/index");
 var _icons = require("@ant-design/icons");
 var _filterPermission = require("../utils/filterPermission");
 var _styles = _interopRequireDefault(require("./styles"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _ConfigContext = require("../ConfigContext");
 var _excluded = ["code", "fn", "exName", "name", "children", "icon"],
-  _excluded2 = ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"],
+  _excluded2 = ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams", "isHide"],
   _excluded3 = ["code", "fn", "exName", "name", "children", "icon", "confirmText", "confirmConfig"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -39,25 +34,32 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // 参数API
 
 var ButtonGroup = function ButtonGroup(props) {
-  var _props$type = props.type,
-    type = _props$type === void 0 ? 'button' : _props$type,
-    _props$rowParams = props.rowParams,
-    rowParams = _props$rowParams === void 0 ? {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['ButtonGroup'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    _providerConfig$props2 = _providerConfig$props.type,
+    type = _providerConfig$props2 === void 0 ? 'button' : _providerConfig$props2,
+    _providerConfig$props3 = _providerConfig$props.rowParams,
+    rowParams = _providerConfig$props3 === void 0 ? {
       text: undefined,
       record: undefined,
       rowIndex: undefined
-    } : _props$rowParams,
-    _props$codes = props.codes,
-    codes = _props$codes === void 0 ? _index.funcCode.btnFuncCodes : _props$codes,
-    permissionCodes = props.permissionCodes,
-    _props$dropdownConfig = props.dropdownConfig,
-    dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig,
-    _props$moreText = props.moreText,
-    moreText = _props$moreText === void 0 ? '更多' : _props$moreText,
-    moreIcon = props.moreIcon;
+    } : _providerConfig$props3,
+    codes = _providerConfig$props.codes,
+    permissionCodes = _providerConfig$props.permissionCodes,
+    _providerConfig$props4 = _providerConfig$props.dropdownConfig,
+    dropdownConfig = _providerConfig$props4 === void 0 ? {} : _providerConfig$props4,
+    _providerConfig$props5 = _providerConfig$props.moreText,
+    moreText = _providerConfig$props5 === void 0 ? '更多' : _providerConfig$props5,
+    moreIcon = _providerConfig$props.moreIcon;
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     _props$min = props.min,
@@ -71,17 +73,11 @@ var ButtonGroup = function ButtonGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     popRow = _useState4[0],
     setPopRow = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    resetList = _useState6[0],
-    setResetList = _useState6[1];
-  (0, _react.useEffect)(function () {
-    // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    // @ts-ignore
-    setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || []);
-    return function () {
-      setResetList([]);
-    };
+  // const [resetList, setResetList] = useState<any[]>([])
+  var resetList = (0, _react.useMemo)(function () {
+    //   // codes在方法内，再合并默认的权限配置
+    //   // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
+    return _toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || [];
   }, [options, codes, permissionCodes]);
   (0, _react.useEffect)(function () {
     setPopVisibleIndex(-1);
@@ -158,6 +154,7 @@ var ButtonGroup = function ButtonGroup(props) {
       fn = item.fn,
       code = item.code,
       rowParams = item.rowParams,
+      isHide = item.isHide,
       others = _objectWithoutProperties(item, _excluded2);
     if (Array.isArray(item.children) && item.children.length > 0) {
       // overlay={buttonMenu(item.children)}
@@ -385,13 +382,26 @@ var ButtonGroup = function ButtonGroup(props) {
       return rowParams[pItem];
     }))) : item.exName || item.name));
   };
+  var RenderCustomNode = function RenderCustomNode(item) {
+    var render = item.render,
+      rowParams = item.rowParams;
+    if (typeof render === 'function') {
+      return render.apply(void 0, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+        return rowParams[pItem];
+      })));
+    } else {
+      return render;
+    }
+  };
   // 渲染展示的按钮列表
   var renderDisplayButton = function renderDisplayButton(item, index) {
     /*渲染自定义*/
     if (item.render) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-        return rowParams[pItem];
-      }))) : item.render);
+      return /*#__PURE__*/_react.default.createElement(RenderCustomNode, _extends({
+        key: index
+      }, item, {
+        rowParams: rowParams
+      }));
     }
     /*渲染按钮形式*/
     if (type === 'button') {

package/lib/ButtonGroup/styles/index.js

@@ -30,18 +30,18 @@ var SpecButtonGroupTextStyle = function SpecButtonGroupTextStyle(prefixCls, toke
     }
   }, "& + ".concat(prefixCls, "-text"), {
     position: 'relative',
-    marginLeft: token.paddingSM,
-    '&:before': {
-      position: 'absolute',
-      content: '""',
-      top: '50%',
-      left: " calc(-".concat(token.paddingSM, "px / 2)"),
-      transform: 'translate(0, -50%)',
-      display: 'inline-block',
-      height: '.9em',
-      verticalAlign: 'middle',
-      borderLeft: "1px solid ".concat(token.colorBorder)
-    }
+    marginLeft: token.paddingSM
+    // '&:before': {
+    //   position: 'absolute',
+    //   content: '""',
+    //   top: '50%',
+    //   left:` calc(-${token.paddingSM}px / 2)`,
+    //   transform: 'translate(0, -50%)',
+    //   display: 'inline-block',
+    //   height: '.9em',
+    //   verticalAlign: 'middle',
+    //   borderLeft: `1px solid ${token.colorBorder}`
+    // }
   }));
 };
 var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {

package/lib/StandardDragModal/DraggableModal.d.ts

@@ -1,7 +1,7 @@
 import { FunctionComponent } from 'react';
 import { ModalProps } from 'antd/lib/modal';
 export interface DraggableModalProps extends ModalProps {
-    initialWidth?: number;
-    initialHeight?: number;
+    initialWidth?: number | string | any;
+    initialHeight?: number | string | any;
 }
 export declare const DraggableModal: FunctionComponent<DraggableModalProps>;

package/lib/StandardDragModal/Modal.d.ts

@@ -4,7 +4,7 @@ interface StandardDragModalProps {
     visible: boolean;
     title?: string | React.ReactNode;
     initialWidth?: number;
-    initialHeight?: number;
+    initialHeight?: number | string | any;
     [k: string]: any;
 }
 declare const StandardDragModal: (props: StandardDragModalProps) => React.JSX.Element;

package/lib/StandardForm/StepForm.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,38 +10,49 @@ var _index = _interopRequireDefault(require("./index"));
 var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
 var _ActionList = _interopRequireDefault(require("./ActionList"));
 require("./style/index.less");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _ConfigContext = require("../ConfigContext");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // import { BreadcrumbProps as AntdBreadcrumbProps } from 'antd/es/form';
 var Step = _antd.Steps.Step;
 var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  var getFormFields = props.getFormFields,
-    _props$formItemGroup = props.formItemGroup,
-    formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
-    _props$grid = props.grid,
-    grid = _props$grid === void 0 ? 'md' : _props$grid,
-    layout = props.layout,
-    onSubmit = props.onSubmit,
-    _props$actionAlign = props.actionAlign,
-    actionAlign = _props$actionAlign === void 0 ? 'center' : _props$actionAlign,
-    fieldStatus = props.fieldStatus,
-    _props$fieldSize = props.fieldSize,
-    fieldSize = _props$fieldSize === void 0 ? "middle" : _props$fieldSize,
-    initialValues = props.initialValues,
-    actionHide = props.actionHide,
-    _props$stepsConfig = props.stepsConfig,
-    stepsConfig = _props$stepsConfig === void 0 ? {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['StepForm'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    getFormFields = _providerConfig$props.getFormFields,
+    _providerConfig$props2 = _providerConfig$props.formItemGroup,
+    formItemGroup = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
+    _providerConfig$props3 = _providerConfig$props.grid,
+    grid = _providerConfig$props3 === void 0 ? 'md' : _providerConfig$props3,
+    layout = _providerConfig$props.layout,
+    onSubmit = _providerConfig$props.onSubmit,
+    _providerConfig$props4 = _providerConfig$props.actionAlign,
+    actionAlign = _providerConfig$props4 === void 0 ? 'center' : _providerConfig$props4,
+    fieldStatus = _providerConfig$props.fieldStatus,
+    _providerConfig$props5 = _providerConfig$props.fieldSize,
+    fieldSize = _providerConfig$props5 === void 0 ? "middle" : _providerConfig$props5,
+    initialValues = _providerConfig$props.initialValues,
+    actionHide = _providerConfig$props.actionHide,
+    _providerConfig$props6 = _providerConfig$props.stepsConfig,
+    stepsConfig = _providerConfig$props6 === void 0 ? {
       current: 0
-    } : _props$stepsConfig,
-    stepClick = props.stepClick,
-    displayLayout = props.displayLayout;
+    } : _providerConfig$props6,
+    stepClick = _providerConfig$props.stepClick,
+    displayLayout = _providerConfig$props.displayLayout;
   var _useState = (0, _react.useState)(),
     _useState2 = _slicedToArray(_useState, 2),
     formChildFields = _useState2[0],
@@ -232,7 +242,7 @@ var StepForm = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }).map(function (item, index) {
     return /*#__PURE__*/_react.default.createElement("div", {
       key: index,
-      className: "stepForm-content ".concat(layout === 'inline' ? 'stepForm-content-inline' : ''),
+      className: (0, _classnames.default)("stepForm-content", "stepForm-content-".concat(layout || '')),
       style: stepsConfig && stepsConfig.current !== index ? {
         display: 'none'
       } : {}