doui-react 2.0.2 → 2.0.7

package/lib/table/component/utils.js

@@ -15,20 +15,22 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _api = require("../../api");
+var _utils = require("../../form/component/utils");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _actions = require("./actions");
 var _constant = require("./constant");
+var _dateTime = require("./date-time");
 var _editor = require("./editor");
 var _filter = require("./filter");
 var _link = require("./link");
 var _sort = require("./sort");
 var _switch = require("./switch");
-var _time = require("./time");
 var _wrapper = require("./wrapper");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var _excluded = ["type", "disabled", "onClick"];
+var _excluded = ["type", "disabled", "onClick", "fixed", "width"];
 var componentMap = exports.componentMap = {
-  time: _time.Time,
+  date: _dateTime.Date,
+  dateTime: _dateTime.DateTime,
   link: _link.Link,
   switch: _switch.Switch,
   actions: _actions.Actions,
@@ -43,10 +45,13 @@ function generateColumns(_ref) {
     getSearchColumn = _ref.getSearchColumn;
   return _lodash.default.map(columns, function (column) {
     var newColumn = _lodash.default.clone(column);
-    var search = newColumn.search,
+    var dataIndex = newColumn.dataIndex,
+      search = newColumn.search,
       sort = newColumn.sort,
       filters = newColumn.filters,
-      originRender = newColumn.render;
+      originRender = newColumn.render,
+      _newColumn$align = newColumn.align,
+      align = _newColumn$align === void 0 ? 'center' : _newColumn$align;
     _lodash.default.assign(newColumn, getColumnWidth(newColumn));
     if (search) {
       _lodash.default.assign(newColumn, getSearchColumn(column));
@@ -91,6 +96,8 @@ function generateColumns(_ref) {
       return component;
     };
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newColumn), {}, {
+      dataIndex: (0, _utils.transformNameToPath)(dataIndex),
+      align: align,
       render: render
     });
   });
@@ -153,8 +160,13 @@ function getRowSelection(_ref3) {
   var type = column.type,
     disabled = column.disabled,
     onClick = column.onClick,
+    _column$fixed = column.fixed,
+    fixed = _column$fixed === void 0 ? 'left' : _column$fixed,
+    width = column.width,
     rest = (0, _objectWithoutProperties2.default)(column, _excluded);
   return (0, _objectSpread2.default)({
+    fixed: fixed,
+    columnWidth: width,
     selectedRowKeys: selectedRowKeys,
     getCheckboxProps: function getCheckboxProps(record) {
       return {
@@ -222,7 +234,7 @@ function getTableFormInitialValues(_ref5) {
     return;
   }
   return _lodash.default.map(dataSource, function (item) {
-    return _lodash.default.pick(item, [rowKey].concat((0, _toConsumableArray2.default)(keys)));
+    return _lodash.default.pick(item, [rowKey, '__selected__'].concat((0, _toConsumableArray2.default)(keys)));
   });
 }
 function updateDataSourceByFormValues(formValues, dataSource) {

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

@@ -6,17 +6,17 @@ 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;
     className?: string | undefined;
     style?: import("react").CSSProperties | undefined;
-    children?: import("react").ReactNode;
     closable?: boolean | undefined;
     prefixCls?: string | undefined;
     closeIcon?: import("react").ReactNode;
     forceRender?: boolean | undefined;
-    disabled?: boolean | undefined;
     id?: string | undefined;
-    active?: boolean | undefined;
+    disabled?: boolean | undefined;
     icon?: import("react").ReactNode;
+    active?: boolean | undefined;
     destroyInactiveTabPane?: boolean | undefined;
     animated?: boolean | undefined;
     tabKey?: string | undefined;

package/lib/tooltip/component/index.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="react" />
-import { getPopupContainer } from "../../api";
 import { TooltipProps } from "..";
 export declare const tooltipOverlayClassName: string;
 export declare function getTooltipProps(props: TooltipProps): {
     color?: string | undefined;
     title?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
     overlay?: import("react").ReactNode | import("antd/es/_util/getRenderPropValue").RenderFunction;
-    styles?: Partial<Record<"body" | "root", import("react").CSSProperties>> | undefined;
-    classNames: Partial<Record<"body" | "root", string>>;
+    styles?: Partial<Record<"root" | "body", import("react").CSSProperties>> | undefined;
+    classNames: Partial<Record<"root" | "body", string>>;
     style?: import("react").CSSProperties | undefined;
     className?: string | undefined;
     rootClassName?: string | undefined;
@@ -20,7 +19,7 @@ export declare function getTooltipProps(props: TooltipProps): {
         pointAtCenter?: boolean | undefined;
     };
     autoAdjustOverflow?: boolean | import("antd/es/tooltip").AdjustOverflow | undefined;
-    getPopupContainer: typeof getPopupContainer;
+    getPopupContainer: (triggerNode: HTMLElement) => HTMLElement;
     children?: import("react").ReactNode;
     destroyTooltipOnHide?: boolean | {
         keepParent?: boolean | undefined;
@@ -34,22 +33,22 @@ export declare function getTooltipProps(props: TooltipProps): {
     defaultVisible?: boolean | undefined;
     onVisibleChange?: ((visible: boolean) => void) | undefined;
     afterVisibleChange?: ((visible: boolean) => void) | undefined;
+    zIndex?: number | undefined;
     animation?: string | undefined;
+    motion?: import("rc-motion").CSSMotionProps | undefined;
     transitionName?: string | undefined;
     prefixCls?: string | undefined;
-    zIndex?: number | undefined;
     forceRender?: boolean | undefined;
     id?: string | undefined;
     align?: import("@rc-component/trigger").AlignType | undefined;
-    motion?: import("rc-motion").CSSMotionProps | undefined;
-    mouseEnterDelay?: number | undefined;
-    mouseLeaveDelay?: number | undefined;
     onPopupAlign?: ((element: HTMLElement, align: import("@rc-component/trigger").AlignType) => void) | undefined;
-    overlayClassName?: string | undefined;
-    overlayStyle?: import("react").CSSProperties | undefined;
-    trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
-    popupVisible?: boolean | undefined;
     fresh?: boolean | undefined;
+    mouseLeaveDelay?: number | undefined;
+    mouseEnterDelay?: number | undefined;
+    popupVisible?: boolean | undefined;
+    trigger?: import("@rc-component/trigger").ActionType | import("@rc-component/trigger").ActionType[] | undefined;
+    overlayStyle?: import("react").CSSProperties | undefined;
+    overlayClassName?: string | undefined;
     getTooltipContainer?: ((node: HTMLElement) => HTMLElement) | undefined;
     showArrow?: boolean | import("@rc-component/trigger").ArrowType | undefined;
     arrowContent?: import("react").ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doui-react",
-  "version": "2.0.2",
+  "version": "2.0.7",
   "description": "A React UI library based on Ant Design",
   "license": "MIT",
   "main": "lib/index.js",
@@ -21,7 +21,7 @@
     "prepare": "if [ -z \"$SKIP_PREPARE\" ]; then yarn setup; fi",
     "prepublishOnly": "yarn lint && yarn build",
     "preview:docs": "dumi preview --port 3060",
-    "pub": "npm version patch && npm publish",
+    "release": "npm version patch && npm publish",
     "setup": "husky && dumi setup && patch-package",
     "test": "jest --coverage"
   },

package/es/table/component/time.d.ts

@@ -1,2 +0,0 @@
-import { ComponentProps } from './wrapper';
-export declare function Time({ column, children }: ComponentProps): import("@emotion/react/jsx-runtime").JSX.Element;

package/es/table/component/time.js

@@ -1,12 +0,0 @@
-import dayjs from 'dayjs';
-import { Fragment as _Fragment, jsx as _jsx } from "@emotion/react/jsx-runtime";
-var defaultFormat = 'YYYY-MM-DD hh:mm:ss A';
-export function Time(_ref) {
-  var column = _ref.column,
-    children = _ref.children;
-  var timeFormat = column.timeFormat;
-  var format = timeFormat || defaultFormat;
-  return _jsx(_Fragment, {
-    children: dayjs(+children).format(format)
-  });
-}

package/lib/table/component/time.d.ts

@@ -1,2 +0,0 @@
-import { ComponentProps } from './wrapper';
-export declare function Time({ column, children }: ComponentProps): import("@emotion/react/jsx-runtime").JSX.Element;

package/lib/table/component/time.js

@@ -1,19 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Time = Time;
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _jsxRuntime = require("@emotion/react/jsx-runtime");
-var defaultFormat = 'YYYY-MM-DD hh:mm:ss A';
-function Time(_ref) {
-  var column = _ref.column,
-    children = _ref.children;
-  var timeFormat = column.timeFormat;
-  var format = timeFormat || defaultFormat;
-  return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: (0, _dayjs.default)(+children).format(format)
-  });
-}