ebaoferc 1.0.8 → 2.0.1

package/dist/components/QueryProCard/index.less

@@ -1,9 +1,9 @@
 .custom-filter-card-container-wrapper {
   .ant-pro-card-body {
-    padding-bottom: 0 !important;
+    padding: 24px 16px 0 !important;
   }
 
   .ant-form-item {
-    margin-bottom: 16px;
+    margin-bottom: 24px;
   }
 }

package/dist/components/StyledQueryFilter/index.d.ts

@@ -1,10 +1,19 @@
-import type { ProFormProps } from '@ant-design/pro-components';
+import { QueryFilterProps } from '@ant-design/pro-components';
 import React from 'react';
 import './index.less';
-export default function StyledQueryFilter(props: ProFormProps & {
-    children?: React.ReactNode;
-    labelWidth?: number;
-    itemWith?: number;
-    collapsedLineCount?: number;
-    maxColCount?: number;
-}): import("react/jsx-runtime").JSX.Element;
+export interface StyledQueryFilterProps extends Omit<QueryFilterProps, 'colon' | 'labelWidth' | 'defaultFormItemsNumber'> {
+    colon?: boolean;
+    labelWidth?: number | 'auto';
+    defaultFormItemsNumber?: number;
+}
+/**
+ * 增强的 QueryFilter 组件
+ *
+ * 默认参数:
+ * - colon: false (不显示冒号)
+ * - labelWidth: 80 (标签宽度为80px)
+ * - defaultFormItemsNumber: 7 (默认展示7个表单项)
+ * ```
+ */
+declare const StyledQueryFilter: React.FC<StyledQueryFilterProps>;
+export default StyledQueryFilter;

package/dist/components/StyledQueryFilter/index.js

@@ -1,110 +1,42 @@
 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 = ["children", "labelWidth", "form", "className", "itemWith", "onReset", "collapsedLineCount", "maxColCount"];
+var _excluded = ["colon", "labelWidth", "defaultFormItemsNumber"];
 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 _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 _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; }
-import { DownOutlined } from '@ant-design/icons';
-import { ProForm } from '@ant-design/pro-components';
-import { Button, Form } from 'antd';
-import classNames from 'classnames';
-import React, { useCallback, useState } from 'react';
-import FlexRowCol from "../FlexRowCol";
+import { QueryFilter } from '@ant-design/pro-components';
+import React from 'react';
 import "./index.less";
+
+// 继承 QueryFilterProps 并重写我们想要设置默认值的属性为可选
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-export default function StyledQueryFilter(props) {
-  var children = props.children,
-    labelWidth = props.labelWidth,
-    form = props.form,
-    className = props.className,
-    itemWith = props.itemWith,
-    onReset = props.onReset,
-    _props$collapsedLineC = props.collapsedLineCount,
-    collapsedLineCount = _props$collapsedLineC === void 0 ? 2 : _props$collapsedLineC,
-    maxColCount = props.maxColCount,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _Form$useForm = Form.useForm(form),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    _form = _Form$useForm2[0];
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    collapsed = _useState2[0],
-    setCollapsed = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    showExpandButton = _useState4[0],
-    setShowExpandButton = _useState4[1];
-  if (labelWidth) {
-    rest.labelCol = {
-      flex: "0 0 ".concat(labelWidth, "px")
-    };
-  }
-  var reset = function reset(e) {
-    _form.resetFields();
-    if (onReset) {
-      onReset(e); // 类型断言，因为 onReset 可能期望 FormEvent
-    }
-  };
-  var handleLineCountChange = useCallback(function (count) {
-    setShowExpandButton(count > collapsedLineCount);
-  }, [collapsedLineCount]);
-  return /*#__PURE__*/_jsxs("div", {
+/**
+ * 增强的 QueryFilter 组件
+ *
+ * 默认参数:
+ * - colon: false (不显示冒号)
+ * - labelWidth: 80 (标签宽度为80px)
+ * - defaultFormItemsNumber: 7 (默认展示7个表单项)
+ * ```
+ */
+var StyledQueryFilter = function StyledQueryFilter(props) {
+  var _props$colon = props.colon,
+    colon = _props$colon === void 0 ? false : _props$colon,
+    _props$labelWidth = props.labelWidth,
+    labelWidth = _props$labelWidth === void 0 ? 80 : _props$labelWidth,
+    _props$defaultFormIte = props.defaultFormItemsNumber,
+    defaultFormItemsNumber = _props$defaultFormIte === void 0 ? 7 : _props$defaultFormIte,
+    restProps = _objectWithoutProperties(props, _excluded);
+  return /*#__PURE__*/_jsx("div", {
     className: "custom-styled-query-filter",
-    children: [/*#__PURE__*/_jsx(ProForm, _objectSpread(_objectSpread({
-      layout: "horizontal",
-      className: classNames('custom-styled-query-filter__form', className),
-      form: _form,
-      colon: false
-    }, rest), {}, {
-      submitter: false,
-      children: /*#__PURE__*/_jsx(FlexRowCol, {
-        collapsed: collapsed,
-        collapsedLineCount: collapsedLineCount,
-        lineCountChange: handleLineCountChange,
-        width: itemWith,
-        showAfterSize: true,
-        maxColCount: maxColCount,
-        children: children
-      })
-    })), /*#__PURE__*/_jsxs("div", {
-      className: "custom-styled-query-filter__right",
-      children: [/*#__PURE__*/_jsxs("div", {
-        className: "custom-styled-query-filter__submitter",
-        children: [/*#__PURE__*/_jsx(Button, {
-          onClick: reset,
-          children: "\u91CD\u7F6E"
-        }), /*#__PURE__*/_jsx(Button, {
-          type: "primary",
-          onClick: function onClick() {
-            return _form.submit();
-          },
-          children: "\u67E5\u8BE2"
-        })]
-      }), showExpandButton && /*#__PURE__*/_jsx("div", {
-        children: /*#__PURE__*/_jsxs(Button, {
-          type: "link",
-          onClick: function onClick() {
-            return setCollapsed(!collapsed);
-          },
-          children: [collapsed ? '展开' : '收起', /*#__PURE__*/_jsx(DownOutlined, {
-            style: {
-              marginInlineStart: '0.5em',
-              transition: '0.3s all',
-              transform: "rotate(".concat(collapsed ? 0 : 0.5, "turn)")
-            }
-          })]
-        })
-      })]
-    })]
+    children: /*#__PURE__*/_jsx(QueryFilter, _objectSpread({
+      colon: colon,
+      labelWidth: labelWidth,
+      defaultFormItemsNumber: defaultFormItemsNumber
+    }, restProps))
   });
-}
+};
+export default StyledQueryFilter;

package/dist/components/StyledQueryFilter/index.less

@@ -1,29 +1,21 @@
 .custom-styled-query-filter {
-  display: flex;
-  justify-content: space-between;
-  column-gap: 16px;
+  /** QueryFilter 查询表单样式复写 **/
+  .ant-pro-query-filter {
+    padding: 0;
 
-  &__form {
-    flex: 1;
-  }
+    .ant-pro-query-filter-row {
+      row-gap: 0;
 
-  &__right {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: flex-end;
+      .ant-form-item {
+        margin-bottom: 24px;
+      }
 
-    .ant-btn-link {
-      padding-right: 0;
-      margin-bottom: 28px;
+      .ant-form-item-control .ant-space-align-center {
+        flex-direction: row-reverse;
+      }
     }
   }
 
-  &__submitter {
-    display: flex;
-    column-gap: 8px;
-  }
-
   .ant-form-item-no-colon {
     margin-right: 10px;
 

package/dist/components/StyledTable/index.d.ts

@@ -2,7 +2,6 @@ import type { TableProps } from 'antd';
 import { SetStateAction } from 'react';
 import './index.less';
 type StyledTableProps = TableProps<any> & {
-    maxCellWidth?: number;
     maxTooltipWidth?: number;
     maxTooltipHeight?: number;
 };
@@ -11,7 +10,7 @@ export declare const PaginationCommonProps: {
     showQuickJumper: boolean;
     showTotal: (total: number) => string;
 };
-export declare const TableCellText: (text: string | number, cellWidth: any, maxTooltipWidth: any, maxTooltipHeight: any) => "-" | import("react/jsx-runtime").JSX.Element;
+export declare const TableCellText: (text: string | number, maxTooltipWidth: any, maxTooltipHeight: any) => "-" | import("react/jsx-runtime").JSX.Element;
 export default function (props: StyledTableProps): import("react/jsx-runtime").JSX.Element;
 export declare const useRowSelection: () => {
     selectedRowKeys: any[];

package/dist/components/StyledTable/index.js

@@ -1,6 +1,6 @@
 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 = ["columns", "pagination", "maxCellWidth", "maxTooltipWidth", "maxTooltipHeight"],
-  _excluded2 = ["longTextWidth", "maxTooltipWidth", "maxTooltipHeight"];
+var _excluded = ["columns", "pagination", "maxTooltipWidth", "maxTooltipHeight", "scroll"],
+  _excluded2 = ["width", "maxTooltipWidth", "maxTooltipHeight"];
 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."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -31,10 +31,9 @@ export var PaginationCommonProps = {
   showQuickJumper: true,
   showTotal: showTotal
 };
-export var TableCellText = function TableCellText(text, cellWidth, maxTooltipWidth, maxTooltipHeight) {
+export var TableCellText = function TableCellText(text, maxTooltipWidth, maxTooltipHeight) {
   var val = text || text === 0 ? text : '-';
   if (val === '-') return '-';
-  var _maxWidth = maxTooltipWidth || cellWidth + 100;
   return /*#__PURE__*/_jsx(Typography.Text, {
     ellipsis: {
       tooltip: {
@@ -44,7 +43,7 @@ export var TableCellText = function TableCellText(text, cellWidth, maxTooltipWid
         styles: {
           body: {
             color: '#000',
-            width: _maxWidth,
+            width: maxTooltipWidth,
             lineHeight: '22px',
             maxHeight: maxTooltipHeight,
             overflow: 'auto',
@@ -53,42 +52,42 @@ export var TableCellText = function TableCellText(text, cellWidth, maxTooltipWid
         }
       }
     },
-    style: {
-      maxWidth: cellWidth
-    },
     children: val
   });
 };
 export default function (props) {
   var columns = props.columns,
     pagination = props.pagination,
-    _props$maxCellWidth = props.maxCellWidth,
-    maxCellWidth = _props$maxCellWidth === void 0 ? 230 : _props$maxCellWidth,
     maxTooltipWidth = props.maxTooltipWidth,
     _props$maxTooltipHeig = props.maxTooltipHeight,
     maxTooltipHeight = _props$maxTooltipHeig === void 0 ? 300 : _props$maxTooltipHeig,
+    scroll = props.scroll,
     rest = _objectWithoutProperties(props, _excluded);
   var _columns = columns === null || columns === void 0 ? void 0 : columns.map(function (item) {
-    var longTextWidth = item.longTextWidth,
-      _maxTooltipWidth = item.maxTooltipWidth,
-      _maxTooltipHeight = item.maxTooltipHeight,
+    var width = item.width,
+      col_maxTooltipWidth = item.maxTooltipWidth,
+      col_maxTooltipHeight = item.maxTooltipHeight,
       rest = _objectWithoutProperties(item, _excluded2);
     return _objectSpread(_objectSpread({}, rest), {}, {
+      width: width,
       ellipsis: false,
       render: function render(val, record, index) {
         var renderVal = item.render ? item.render(val, record, index) : val;
-        return /*#__PURE__*/isValidElement(renderVal) ? renderVal : TableCellText(renderVal, longTextWidth || maxCellWidth, _maxTooltipWidth || maxTooltipWidth, _maxTooltipHeight || maxTooltipHeight);
+        return /*#__PURE__*/isValidElement(renderVal) ? renderVal : TableCellText(renderVal, col_maxTooltipWidth || maxTooltipWidth || width + 100, col_maxTooltipHeight || maxTooltipHeight);
       }
     });
   });
+  var _scroll = _objectSpread(_objectSpread({}, scroll || {}), {}, {
+    x: scroll !== null && scroll !== void 0 && scroll.x ? scroll === null || scroll === void 0 ? void 0 : scroll.x : _columns === null || _columns === void 0 ? void 0 : _columns.reduce(function (sum, cur) {
+      return sum + (cur.width || 230);
+    }, 0)
+  });
   return /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
     rowKey: "id",
-    scroll: {
-      x: 'max-content'
-    },
     columns: _columns,
     pagination: pagination ? _objectSpread(_objectSpread({}, PaginationCommonProps), pagination) : pagination
   }, rest), {}, {
+    scroll: _scroll,
     rowClassName: function rowClassName(record, index, indent) {
       var _props$rowClassName;
       var origin = typeof (props === null || props === void 0 ? void 0 : props.rowClassName) === 'string' ? props === null || props === void 0 ? void 0 : props.rowClassName : props === null || props === void 0 || (_props$rowClassName = props.rowClassName) === null || _props$rowClassName === void 0 ? void 0 : _props$rowClassName.call(props, record, index, indent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ebaoferc",
-  "version": "1.0.8",
+  "version": "2.0.1",
   "description": "A react library developed with dumi",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -61,6 +61,7 @@
     "@vitest/coverage-v8": "^0.34.6",
     "ahooks": "^3.7.10",
     "antd": "^5.24.7",
+    "child_process": "^1.0.2",
     "classnames": "^2.5.1",
     "connect-history-api-fallback": "^2.0.0",
     "cross-env": "^7.0.3",
@@ -69,9 +70,11 @@
     "eslint": "^8.23.0",
     "express": "^4.19.2",
     "father": "^4.1.0",
+    "fs-extra": "^11.3.2",
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3",
     "lodash": "^4.17.21",
+    "path": "^0.12.7",
     "prettier": "^2.7.1",
     "prettier-plugin-organize-imports": "^3.0.0",
     "prettier-plugin-packagejson": "^2.2.18",