fan-standard-comp 4.0.1 → 4.0.2

package/lib/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/lib/StandardTable/index.js

@@ -11,8 +11,9 @@ var _antd = require("antd");
 var _index = _interopRequireDefault(require("../ButtonGroup/index"));
 require("./style/index.less");
 var _ConfigContext = require("../ConfigContext");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _index3 = _interopRequireDefault(require("./style/index"));
-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 _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; }
@@ -59,11 +60,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: 62,
     align: 'center',
     title: '序号',
     key: 'orderNum',
@@ -148,22 +149,35 @@ var StandardTable = function StandardTable(props) {
     });
     resetColumns = hideOrderNumber ? recombinationColumns : resetColumns.concat(recombinationColumns);
   }
-  return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Card, {
-    className: (0, _classnames.default)(componentName, 'standard-table', className, hashId),
-    bordered: false,
-    title: title,
-    extra: buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/_react.default.createElement(_index.default, {
-      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 = _lodash.default.unionBy(rowSelection && (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) !== 'radio' && (batchButtonGroup || []), buttonGroup || []);
+    return /*#__PURE__*/_react.default.createElement(_index.default, {
+      options: list,
       min: min,
       codes: codes,
       permissionCodes: permissionCodes,
       dropdownConfig: buttonGroupConfig
-    }) : null
+    });
+  };
+  return wrapSSR( /*#__PURE__*/_react.default.createElement(_antd.Card, {
+    className: (0, _classnames.default)(componentName, 'standard-table', className, hashId),
+    bordered: false,
+    title: title,
+    extra: /*#__PURE__*/_react.default.createElement(RenderExtraButtonGroup, {
+      buttonGroup: buttonGroup,
+      batchButtonGroup: batchButtonGroup
+    })
   }, /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
     rowKey: rowKey || 'id',
-    rowSelection: rowSelection ? _objectSpread(_objectSpread({}, rowSelection), {}, {
-      columnWidth: 30
-    }) : rowSelection,
+    rowSelection: rowSelection ? _objectSpread({
+      columnWidth: 46
+    }, rowSelection) : rowSelection,
     dataSource: list,
     pagination: !pagination ? false : paginationProps,
     columns: resetColumns,

package/lib/StandardTable/style/index.js

@@ -89,6 +89,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
           fontSize: token.fontSizeLG
         },
         '.ant-table-thead > tr > th': {
+          padding: "12px ".concat(token.paddingMD / 2, "px"),
           '&:first-child': {
             paddingLeft: token.paddingMD
           },

package/lib/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/lib/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, codes: any, params: any) => any[];
 export { removeNoPermission, btnIsHide, btnIsDisabled, btnClickFunc };

package/lib/utils/filterPermission.js

@@ -92,5 +92,5 @@ var removeNoPermission = exports.removeNoPermission = function removeNoPermissio
       }
     }
     return resultItem;
-  });
+  }) || [];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -85,7 +85,7 @@
     "@babel/preset-react": "^7.24.1",
     "@types/lodash": "^4.17.0",
     "ant-design-draggable-modal": "^1.0.0",
-    "antd": "^5.15.1",
+    "antd": "5.18.1",
     "antd-style": "^3.6.1",
     "babel": "^6.23.0",
     "dayjs": "^1.11.10",