@teamias/rex-pro 0.0.10 → 0.0.12

package/dist/components/card-basic-info/v1/card-basic-info.d.ts

@@ -1,11 +1,11 @@
-import { DataCell, type IBaseTableProps } from '@teamias/rex-design';
+import { BaseDescriptions, DataCell, type IBaseTableProps } from '@teamias/rex-design';
 import { CardProps, GetProps } from 'antd';
 export interface CardBasicInfoProps<T extends object = object> extends Omit<CardProps, 'type'> {
     /**
      * 卡片类型
      * @default info
      */
-    type?: 'info' | 'table';
+    type?: 'info' | 'table' | 'descriptions';
     /**
      * 数据源
      */
@@ -19,6 +19,10 @@ export interface CardBasicInfoProps<T extends object = object> extends Omit<Card
      * type=table时生效
      */
     tableProps?: IBaseTableProps<T>;
+    /** type=descriptions时生效 */
+    descriptionsProps?: GetProps<typeof BaseDescriptions>;
+    /** 隐藏卡片样式 */
+    hideCardStyle?: boolean;
     onDataCellClick?: GetProps<typeof DataCell>['onClick'];
 }
-export declare function CardBasicInfo<T extends object = object>({ dataSource, col, type, tableProps, rootClassName, onDataCellClick, ...cardProps }: CardBasicInfoProps<T>): import("react/jsx-runtime").JSX.Element;
+export declare function CardBasicInfo<T extends object = object>({ dataSource, col, type, tableProps, rootClassName, hideCardStyle, descriptionsProps, onDataCellClick, ...cardProps }: CardBasicInfoProps<T>): import("react/jsx-runtime").JSX.Element;

package/dist/components/card-basic-info/v1/card-basic-info.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 = ["dataSource", "col", "type", "tableProps", "rootClassName", "onDataCellClick"];
+var _excluded = ["dataSource", "col", "type", "tableProps", "rootClassName", "hideCardStyle", "descriptionsProps", "onDataCellClick"];
 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; }
@@ -7,11 +7,12 @@ 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); }
 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 { BaseTable, DataCell } from '@teamias/rex-design';
+import { BaseDescriptions, BaseTable, DataCell } from '@teamias/rex-design';
 import { Col, Row } from 'antd';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 import { Card } from "./style";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 平分列数
@@ -35,28 +36,48 @@ export function CardBasicInfo(_ref) {
     type = _ref$type === void 0 ? 'info' : _ref$type,
     tableProps = _ref.tableProps,
     rootClassName = _ref.rootClassName,
+    hideCardStyle = _ref.hideCardStyle,
+    descriptionsProps = _ref.descriptionsProps,
     onDataCellClick = _ref.onDataCellClick,
     cardProps = _objectWithoutProperties(_ref, _excluded);
   var span = useSpan(dataSource.length, col);
-  return /*#__PURE__*/_jsx(Card, _objectSpread(_objectSpread({}, cardProps), {}, {
-    rootClassName: classNames('card-basic-info', rootClassName),
-    children: type === 'info' ? /*#__PURE__*/_jsx(Row, {
-      gutter: [20, 20],
-      children: dataSource.map(function (item, index) {
-        return /*#__PURE__*/_jsx(Col, {
-          span: span,
-          children: /*#__PURE__*/_jsx(Row, {
-            align: "middle",
-            style: {
-              gap: 10
-            },
-            children: /*#__PURE__*/_jsx(DataCell, {
-              items: item,
-              onClick: onDataCellClick
+  var renderNode = function renderNode(node) {
+    if (hideCardStyle) return /*#__PURE__*/_jsx(_Fragment, {
+      children: node
+    });
+    return /*#__PURE__*/_jsx(Card, _objectSpread(_objectSpread({}, cardProps), {}, {
+      rootClassName: classNames('card-basic-info', rootClassName),
+      children: node
+    }));
+  };
+  return renderNode( /*#__PURE__*/_jsx(_Fragment, {
+    children: function () {
+      if (type === 'table') {
+        return /*#__PURE__*/_jsx(BaseTable, _objectSpread({}, tableProps));
+      }
+      if (type === 'descriptions') {
+        return /*#__PURE__*/_jsx(BaseDescriptions, _objectSpread({
+          column: col
+        }, descriptionsProps));
+      }
+      return /*#__PURE__*/_jsx(Row, {
+        gutter: [20, 20],
+        children: dataSource.map(function (item, index) {
+          return /*#__PURE__*/_jsx(Col, {
+            span: span,
+            children: /*#__PURE__*/_jsx(Row, {
+              align: "middle",
+              style: {
+                gap: 10
+              },
+              children: /*#__PURE__*/_jsx(DataCell, {
+                items: item,
+                onClick: onDataCellClick
+              })
             })
-          })
-        }, index);
-      })
-    }) : /*#__PURE__*/_jsx(BaseTable, _objectSpread({}, tableProps))
+          }, index);
+        })
+      });
+    }()
   }));
 }

package/dist/components/card-basic-info/v1/demo/BaseDescriptions.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/components/card-basic-info/v1/demo/BaseDescriptions.js

@@ -0,0 +1,126 @@
+import { CardBasicInfo } from "../card-basic-info";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsx(CardBasicInfo, {
+    type: "descriptions",
+    title: "\u6D4B\u8BD5\u63CF\u8FF0\u7C7B\u578B",
+    hideCardStyle: false,
+    descriptionsProps: {
+      items: [{
+        label: 'Address',
+        span: 2,
+        children: [[{
+          type: 'group-v2',
+          props: {
+            label: 'label',
+            // labelStyle: {},
+            // itemsGap: 2,
+            // itemsStyle: {},
+            // itemsSeparator: '/',
+            // itemsDirection: 'row',
+            items: [{
+              type: 'text',
+              value: 'qweqweqweqwe',
+              action: 'url',
+              url: 'http://baidu.com'
+            }, {
+              type: 'icon',
+              iconsType: 'iconify',
+              name: 'svg-spinners:ring-resize',
+              size: 12,
+              action: 'url',
+              url: 'http://baidu.com'
+            }, {
+              type: 'text',
+              value: 'qweqweqweqwe',
+              copyable: true,
+              tooltip: true,
+              style: {
+                color: 'red'
+              }
+            }, {
+              type: 'tag',
+              value: '33123',
+              color: 'red'
+            }, {
+              type: 'img',
+              src: 'http://qweqe'
+            }]
+          }
+        }, {
+          type: 'group-v2',
+          props: {
+            items: [{
+              type: 'img',
+              src: 'http://qweqe'
+            }, {
+              type: 'group-v2',
+              props: {
+                itemsDirection: 'column',
+                items: [{
+                  type: 'text',
+                  value: 'qweqweqweqwe',
+                  action: 'url',
+                  url: 'http://baidu.com',
+                  ellipsis: 1,
+                  copyable: true
+                }, {
+                  type: 'text',
+                  value: 'qweqweqweqwe2',
+                  ellipsis: 1,
+                  copyable: '自定义复制'
+                }, {
+                  type: 'text',
+                  value: 'qweqweqweqwe3',
+                  tooltip: '自定义提示'
+                }]
+              }
+            }]
+          }
+        }, {
+          type: 'group-v2',
+          props: {
+            items: [{
+              type: 'img',
+              src: 'http://qweqe'
+            }, {
+              type: 'group-v2',
+              props: {
+                itemsDirection: 'column',
+                items: [{
+                  type: 'group-v2',
+                  props: {
+                    itemsDirection: 'column',
+                    label: 'label',
+                    items: [{
+                      type: 'text',
+                      value: 'qweqweqweqwe'
+                    }]
+                  }
+                }, {
+                  type: 'group-v2',
+                  props: {
+                    itemsDirection: 'column',
+                    label: 'label',
+                    items: [{
+                      type: 'text',
+                      value: 'qweqweqweqwe2',
+                      action: 'custom'
+                    }]
+                  }
+                }]
+              }
+            }]
+          }
+        }]]
+      }, {
+        label: 'Remark',
+        children: 'empty'
+      }],
+      bordered: true,
+      onDataCellClick: function onDataCellClick(data) {
+        console.log(data);
+      }
+    }
+  });
+});

package/dist/components/filter-form/v1/filter-form.js

@@ -20,7 +20,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 /* eslint-disable no-param-reassign */
 import { ProForm } from '@ant-design/pro-components';
 import { BaseForm, getFieldsDefaultValues, useRequestFields, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from '@teamias/rex-design';
-import { Button, Dropdown, Skeleton, Space, Checkbox } from 'antd';
+import { Button, Checkbox, Dropdown, Skeleton, Space } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useImperativeHandle, useRef } from 'react';
 import { FilterFormAutoWidthStyle, FilterFormStyle } from "./style";
@@ -71,8 +71,9 @@ export var FilterForm = function FilterForm(_ref) {
         fetchLoading: false,
         fields: [],
         currentInit: true,
-        customFields: [],
-        selectedCustomFields: []
+        allFields: [],
+        // 单一数据源
+        selectedCustomFieldKeys: new Set() // 使用 Set 存储选中的自定义字段 key
       };
     }),
     state = _useStateData.state,
@@ -131,43 +132,31 @@ export var FilterForm = function FilterForm(_ref) {
     });
     return arr;
   };
-  useEffect(function () {
-    if (loading) return;
-    var allFields = cloneDeep(fields);
 
-    // 分离自定义字段和普通字段
-    var customFields = allFields.filter(function (field) {
-      return field.isCustom;
-    });
-    var normalFields = allFields.filter(function (field) {
-      return !field.isCustom;
-    });
-
-    // 合并普通字段和已选择的自定义字段
-    var combinedFields = [].concat(_toConsumableArray(normalFields), _toConsumableArray(state.selectedCustomFields));
-    if (displayType === 'average') {
-      state.fields = combinedFields;
-      state.customFields = customFields;
-      state.currentInit = false;
-      update();
+  // 切换自定义字段的显示状态
+  var handleToggleCustomField = function handleToggleCustomField(fieldKey) {
+    var isSelected = state.selectedCustomFieldKeys.has(fieldKey);
+    if (isSelected) {
+      // 移除字段
+      state.selectedCustomFieldKeys.delete(fieldKey);
     } else {
-      handlerSelectStyle(combinedFields);
-      state.fields = combinedFields;
-      state.customFields = customFields;
-      state.currentInit = false;
-      update();
+      // 添加字段
+      state.selectedCustomFieldKeys.add(fieldKey);
     }
-  }, [fields, state.selectedCustomFields]);
+
+    // 创建新的 Set 以触发状态更新
+    state.selectedCustomFieldKeys = new Set(state.selectedCustomFieldKeys);
+    update();
+  };
 
   // 创建下拉菜单内容
   var getDropdownMenu = function getDropdownMenu() {
-    var _state$customFields;
-    // 使用 Map 来快速查找已选择的字段
-    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
-      return [field.field, field];
-    }));
-    var items = (_state$customFields = state.customFields) === null || _state$customFields === void 0 ? void 0 : _state$customFields.map(function (field) {
-      var isSelected = selectedFieldsMap.has(field.field);
+    // 筛选出所有自定义字段
+    var customFields = state.allFields.filter(function (field) {
+      return field.isCustom;
+    });
+    var items = customFields.map(function (field) {
+      var isSelected = state.selectedCustomFieldKeys.has(field.field);
       return {
         key: field.field,
         label: /*#__PURE__*/_jsx("div", {
@@ -191,31 +180,51 @@ export var FilterForm = function FilterForm(_ref) {
       items: items
     };
   };
+  useEffect(function () {
+    if (loading) return;
+    var allFields = cloneDeep(fields);
+    state.allFields = allFields;
 
-  // 切换自定义字段的显示状态
-  var handleToggleCustomField = function handleToggleCustomField(fieldKey) {
-    // 使用 Map 来快速查找已选择的字段
-    var selectedFieldsMap = new Map(state.selectedCustomFields.map(function (field) {
-      return [field.field, field];
+    // 清理已选择的自定义字段keys，移除那些不再是自定义字段的项
+    var currentCustomFieldKeys = new Set(allFields.filter(function (field) {
+      return field.isCustom;
+    }).map(function (field) {
+      return field.field;
     }));
-    var customFieldsMap = new Map(state.customFields.map(function (field) {
-      return [field.field, field];
+
+    // 只保留仍然是自定义字段的选中项
+    var validSelectedKeys = new Set(_toConsumableArray(state.selectedCustomFieldKeys).filter(function (key) {
+      return currentCustomFieldKeys.has(key);
     }));
-    var isSelected = selectedFieldsMap.has(fieldKey);
-    if (isSelected) {
-      // 移除字段
-      state.selectedCustomFields = state.selectedCustomFields.filter(function (field) {
-        return field.field !== fieldKey;
-      });
+
+    // 如果选中的keys发生了变化，更新状态
+    if (validSelectedKeys.size !== state.selectedCustomFieldKeys.size) {
+      state.selectedCustomFieldKeys = validSelectedKeys;
+    }
+
+    // 筛选出普通字段（非自定义字段）
+    var normalFields = allFields.filter(function (field) {
+      return !field.isCustom;
+    });
+
+    // 筛选出已选择的自定义字段
+    var selectedCustomFields = allFields.filter(function (field) {
+      return field.isCustom && state.selectedCustomFieldKeys.has(field.field);
+    });
+
+    // 合并普通字段和已选择的自定义字段
+    var combinedFields = [].concat(_toConsumableArray(normalFields), _toConsumableArray(selectedCustomFields));
+    if (displayType === 'average') {
+      state.fields = combinedFields;
+      state.currentInit = false;
+      update();
     } else {
-      // 添加字段
-      var fieldToAdd = customFieldsMap.get(fieldKey);
-      if (fieldToAdd) {
-        state.selectedCustomFields = [].concat(_toConsumableArray(state.selectedCustomFields), [fieldToAdd]);
-      }
+      handlerSelectStyle(combinedFields);
+      state.fields = combinedFields;
+      state.currentInit = false;
+      update();
     }
-    update();
-  };
+  }, [fields, state.selectedCustomFieldKeys]);
   useImperativeHandle(actionRef, function () {
     return {
       getAllValues: function getAllValues() {
@@ -300,7 +309,9 @@ export var FilterForm = function FilterForm(_ref) {
                   id: 'pro.components.filter-form.search',
                   defaultMessage: '查询'
                 })
-              }), state.customFields.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
+              }), state.allFields.filter(function (field) {
+                return field.isCustom;
+              }).length > 0 && /*#__PURE__*/_jsx(Dropdown, {
                 menu: getDropdownMenu(),
                 trigger: ['click'],
                 placement: "bottomLeft",

package/dist/index.d.ts

@@ -49,6 +49,7 @@ export declare const proLocales: {
                 "filter-form": {
                     reset: string;
                     search: string;
+                    "custom-filters": string;
                 };
             };
         };

package/dist/locales/en-US.json

@@ -19,7 +19,8 @@
       },
       "filter-form": {
         "reset": "Reset",
-        "search": "Search"
+        "search": "Search",
+        "custom-filters": "Custom filters"
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-pro",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -23,7 +23,8 @@
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
     "prepare": "husky install && dumi setup",
     "prepublishOnly": "father doctor && npm run build",
-    "start": "npm run dev"
+    "start": "npm run dev",
+    "update:lib": "pnpm add @teamias/rex-design@latest"
   },
   "commitlint": {
     "extends": [
@@ -50,7 +51,7 @@
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
     "@ant-design/pro-components": "^2.8.10",
-    "@teamias/rex-design": "^0.0.10",
+    "@teamias/rex-design": "^0.0.20",
     "ahooks": "^3.9.0",
     "antd": "^5.26.7",
     "classnames": "^2.5.1",