doui-react 2.0.7 → 2.0.8

package/lib/table/component/utils.js

@@ -9,6 +9,7 @@ exports.generateColumns = generateColumns;
 exports.getRowSelection = getRowSelection;
 exports.getTableAndFormProps = getTableAndFormProps;
 exports.getTableFormInitialValues = getTableFormInitialValues;
+exports.isActionsColumn = isActionsColumn;
 exports.isUseFormWrapper = isUseFormWrapper;
 exports.updateDataSourceByFormValues = updateDataSourceByFormValues;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -40,9 +41,22 @@ var componentMap = exports.componentMap = {
     return props.children;
   }
 };
-function generateColumns(_ref) {
-  var columns = _ref.columns,
-    getSearchColumn = _ref.getSearchColumn;
+function isHiddenColumn(_ref) {
+  var context = _ref.context,
+    column = _ref.column;
+  var displayColumnKeys = _lodash.default.get(context, 'displayColumnKeys');
+  if (!displayColumnKeys || isActionsColumn(column)) {
+    return;
+  }
+  return !_lodash.default.includes(displayColumnKeys, column.dataIndex);
+}
+function isActionsColumn(column) {
+  return column.type === 'actions';
+}
+function generateColumns(_ref2) {
+  var columns = _ref2.columns,
+    getSearchColumn = _ref2.getSearchColumn,
+    context = _ref2.context;
   return _lodash.default.map(columns, function (column) {
     var newColumn = _lodash.default.clone(column);
     var dataIndex = newColumn.dataIndex,
@@ -68,7 +82,7 @@ function generateColumns(_ref) {
     if (!_lodash.default.isEmpty(filters)) {
       _lodash.default.assign(newColumn, (0, _filter.getFilterColumn)(newColumn));
     }
-    if (newColumn.type === 'actions') {
+    if (isActionsColumn(newColumn)) {
       var _newColumn$fixed;
       (_newColumn$fixed = newColumn.fixed) !== null && _newColumn$fixed !== void 0 ? _newColumn$fixed : newColumn.fixed = 'right';
     }
@@ -97,6 +111,10 @@ function generateColumns(_ref) {
     };
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newColumn), {}, {
       dataIndex: (0, _utils.transformNameToPath)(dataIndex),
+      hidden: isHiddenColumn({
+        context: context,
+        column: newColumn
+      }),
       align: align,
       render: render
     });
@@ -123,10 +141,10 @@ function renderComponent(props) {
     children: (0, _jsxRuntime.jsx)(Component, (0, _objectSpread2.default)({}, props))
   }));
 }
-function getColumnWidth(_ref2) {
-  var width = _ref2.width,
-    minWidth = _ref2.minWidth,
-    maxWidth = _ref2.maxWidth;
+function getColumnWidth(_ref3) {
+  var width = _ref3.width,
+    minWidth = _ref3.minWidth,
+    maxWidth = _ref3.maxWidth;
   var style;
   if (_lodash.default.isNil(width)) {
     style = {
@@ -145,10 +163,10 @@ function getColumnWidth(_ref2) {
     }
   };
 }
-function getRowSelection(_ref3) {
-  var rowKey = _ref3.rowKey,
-    columns = _ref3.columns,
-    context = _ref3.context;
+function getRowSelection(_ref4) {
+  var rowKey = _ref4.rowKey,
+    columns = _ref4.columns,
+    context = _ref4.context;
   var column = _lodash.default.find(columns, {
     type: 'selection'
   });
@@ -209,10 +227,10 @@ function getTableAndFormProps(props) {
     tableProps: tableProps
   };
 }
-function isUseFormWrapper(_ref4) {
-  var columns = _ref4.columns,
-    context = _ref4.context,
-    form = _ref4.form;
+function isUseFormWrapper(_ref5) {
+  var columns = _ref5.columns,
+    context = _ref5.context,
+    form = _ref5.form;
   // 在 Form 中时，将 context 挂载给 formContext
   if (form) {
     _lodash.default.assign(form.getContext(), context);
@@ -222,10 +240,10 @@ function isUseFormWrapper(_ref4) {
     type: 'editor'
   });
 }
-function getTableFormInitialValues(_ref5) {
-  var rowKey = _ref5.rowKey,
-    columns = _ref5.columns,
-    dataSource = _ref5.dataSource;
+function getTableFormInitialValues(_ref6) {
+  var rowKey = _ref6.rowKey,
+    columns = _ref6.columns,
+    dataSource = _ref6.dataSource;
   var dataIndex = _lodash.default.map(columns, function (col) {
     return col.type === 'editor' && col.dataIndex;
   });

package/lib/table/style/index.d.ts

@@ -5,5 +5,6 @@ declare const style: {
     ellipsisText: (rows: number) => import("@emotion/react").SerializedStyles;
     editor: import("@emotion/react").SerializedStyles;
     divider: import("@emotion/react").SerializedStyles;
+    displayColumn: import("@emotion/react").SerializedStyles;
 };
 export default style;

package/lib/table/style/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _api = require("../../api");
 var _react = require("@emotion/react");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 var style = {
   wrapper: function wrapper(maxHeight) {
     return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n    width: 100%;\n    height: 100%;\n    display: flex;\n    flex-direction: column;\n\n    .ant-table-wrapper,\n    .ant-spin-nested-loading,\n    .ant-spin-container,\n    .ant-table,\n    .ant-table-container {\n      width: 100%;\n      max-height: 100%;\n      display: flex;\n      flex-direction: column;\n      min-height: 0;\n    }\n\n    .ant-table-content {\n      overflow: auto !important;\n      width: calc(100% + 1px); // \u4FEE\u590D\u7A7A\u6570\u636E\u65F6\uFF0C\u51FA\u73B0\u6EDA\u52A8\u6761\u7684 bug\n      max-height: ", ";\n    }\n\n    .ant-table-thead {\n      position: sticky;\n      top: 0;\n      z-index: 10;\n    }\n\n    .ant-table-pagination.ant-pagination {\n      margin-bottom: 0;\n    }\n  "])), (0, _api.transformValueWithStyleUnit)(maxHeight));
@@ -18,6 +18,7 @@ var style = {
     return (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n    -webkit-line-clamp: ", " !important;\n  "])), rows);
   },
   editor: (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n    margin-bottom: 0;\n\n    .ant-form-item-label {\n      display: none !important;\n    }\n  "]))),
-  divider: (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n    margin: 0;\n  "])))
+  divider: (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n    margin: 0;\n  "]))),
+  displayColumn: (0, _react.css)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteral2.default)(["\n    & {\n      flex-direction: column;\n      max-width: 200px;\n    }\n\n    .do-checkbox-all {\n      padding-bottom: 10px;\n      border-bottom: 1px solid #f0f0f0;\n    }\n\n    .ant-checkbox-group {\n      flex-direction: column;\n      width: 100%;\n    }\n\n    .do-checkbox,\n    .do-box-label {\n      width: 100%;\n    }\n  "])))
 };
 var _default = exports.default = style;

package/lib/table/type/display-column.d.ts

@@ -0,0 +1,9 @@
+import { ButtonProps } from "../../button";
+export interface DisplayColumnProps extends Omit<ButtonProps, 'onChange'> {
+    /**
+     * @description 缓存列时, 需要保证key唯一
+     */
+    storageKey?: string;
+    value?: string[];
+    onChange?: (keys: string[]) => void;
+}

package/lib/table/type/display-column.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/table/type/index.d.ts

@@ -6,6 +6,7 @@ import { TableProps as AntdTableProps } from 'antd';
 import { ReactNode } from 'react';
 export * from './action';
 export * from './column';
+export * from './display-column';
 export type DataSource = any[];
 export interface TableContext {
     /**
@@ -37,8 +38,13 @@ export interface TableContext {
      * @description 设置表格上下文
      */
     setContext(state: any): void;
+    /**
+     * @description 列配置
+     */
+    columns: Column[];
     rowKey: string;
     editorValueKey: string;
+    displayColumnKeys?: string[];
     [key: string]: any;
 }
 export interface RefreshProps {

package/lib/table/type/index.js

@@ -24,4 +24,15 @@ Object.keys(_column).forEach(function (key) {
       return _column[key];
     }
   });
+});
+var _displayColumn = require("./display-column");
+Object.keys(_displayColumn).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _displayColumn[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _displayColumn[key];
+    }
+  });
 });

package/lib/tabs/component/utils.d.ts

@@ -6,19 +6,19 @@ export declare function getRenderTabBar({ type, items, size, tabBarGutter, tabBa
 export declare function generateTabItems({ items }: TabsProps): {
     label: import("@emotion/react/jsx-runtime").JSX.Element;
     key: string;
-    children?: import("react").ReactNode;
+    prefixCls?: string | undefined;
+    disabled?: boolean | undefined;
     className?: string | undefined;
     style?: import("react").CSSProperties | undefined;
-    closable?: boolean | undefined;
-    prefixCls?: string | undefined;
-    closeIcon?: import("react").ReactNode;
+    children?: import("react").ReactNode;
     forceRender?: boolean | undefined;
     id?: string | undefined;
-    disabled?: boolean | undefined;
-    icon?: import("react").ReactNode;
-    active?: boolean | undefined;
     destroyInactiveTabPane?: boolean | undefined;
     animated?: boolean | undefined;
+    closable?: boolean | undefined;
+    closeIcon?: import("react").ReactNode;
+    icon?: import("react").ReactNode;
     tabKey?: string | undefined;
+    active?: boolean | undefined;
 }[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doui-react",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A React UI library based on Ant Design",
   "license": "MIT",
   "main": "lib/index.js",