@chaoswise/ui 3.1.0 → 3.1.2

package/lib/Antd5/upload/UploadList/index.js

@@ -22,7 +22,6 @@ import PaperClipOutlined from '@ant-design/icons/PaperClipOutlined';
 import PictureTwoTone from '@ant-design/icons/PictureTwoTone';
 import classNames from 'classnames';
 import CSSMotion, { CSSMotionList } from 'rc-motion';
-import omit from 'rc-util/lib/omit';
 import useForceUpdate from '../../_util/hooks/useForceUpdate';
 import initCollapseMotion from '../../_util/motion';
 import { cloneElement } from '../../_util/reactNode';
@@ -54,7 +53,6 @@ var InternalUploadList = function InternalUploadList(props, ref) {
     removeIcon = props.removeIcon,
     previewIcon = props.previewIcon,
     downloadIcon = props.downloadIcon,
-    extra = props.extra,
     _props$progress = props.progress,
     progress = _props$progress === void 0 ? {
       size: [-1, 2],
@@ -70,22 +68,22 @@ var InternalUploadList = function InternalUploadList(props, ref) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     motionAppear = _React$useState2[0],
     setMotionAppear = _React$useState2[1];
-  var isPictureCardOrCirle = ['picture-card', 'picture-circle'].includes(listType);
   // ============================= Effect =============================
   React.useEffect(function () {
-    if (!listType.startsWith('picture')) {
+    if (listType !== 'picture' && listType !== 'picture-card' && listType !== 'picture-circle') {
       return;
     }
     (items || []).forEach(function (file) {
-      if (!(file.originFileObj instanceof File || file.originFileObj instanceof Blob) || file.thumbUrl !== undefined) {
+      if (typeof document === 'undefined' || typeof window === 'undefined' || !window.FileReader || !window.File || !(file.originFileObj instanceof File || file.originFileObj) || file.thumbUrl !== undefined) {
         return;
       }
-      file.thumbUrl = '';
-      previewFile === null || previewFile === void 0 || previewFile(file.originFileObj).then(function (previewDataUrl) {
-        // Need append '' to avoid dead loop
-        file.thumbUrl = previewDataUrl || '';
-        forceUpdate();
-      });
+      if (previewFile) {
+        previewFile(file.originFileObj).then(function (previewDataUrl) {
+          // Need append '' to avoid dead loop
+          file.thumbUrl = previewDataUrl || '';
+          forceUpdate();
+        });
+      }
     });
   }, [listType, items, previewFile]);
   React.useEffect(function () {
@@ -114,12 +112,14 @@ var InternalUploadList = function InternalUploadList(props, ref) {
       return iconRender(file, listType);
     }
     var isLoading = file.status === 'uploading';
-    if (listType.startsWith('picture')) {
-      var loadingIcon = listType === 'picture' ? _jsx(LoadingOutlined, {}) : locale.uploading;
-      var fileIcon = isImgUrl !== null && isImgUrl !== void 0 && isImgUrl(file) ? _jsx(PictureTwoTone, {}) : _jsx(FileTwoTone, {});
-      return isLoading ? loadingIcon : fileIcon;
+    var fileIcon = isImgUrl && isImgUrl(file) ? _jsx(PictureTwoTone, {}) : _jsx(FileTwoTone, {});
+    var icon = isLoading ? _jsx(LoadingOutlined, {}) : _jsx(PaperClipOutlined, {});
+    if (listType === 'picture') {
+      icon = isLoading ? _jsx(LoadingOutlined, {}) : fileIcon;
+    } else if (listType === 'picture-card' || listType === 'picture-circle') {
+      icon = isLoading ? locale.uploading : fileIcon;
     }
-    return isLoading ? _jsx(LoadingOutlined, {}) : _jsx(PaperClipOutlined, {});
+    return icon;
   };
   var actionIconRender = function actionIconRender(customIcon, callback, prefixCls, title, acceptUploadDisabled) {
     var btnProps = {
@@ -138,11 +138,15 @@ var InternalUploadList = function InternalUploadList(props, ref) {
     if (acceptUploadDisabled) {
       btnProps.disabled = disabled;
     }
-    return /*#__PURE__*/React.isValidElement(customIcon) ? _jsx(Button, _objectSpread(_objectSpread({}, btnProps), {}, {
-      icon: cloneElement(customIcon, _objectSpread(_objectSpread({}, customIcon.props), {}, {
+    if (/*#__PURE__*/React.isValidElement(customIcon)) {
+      var btnIcon = cloneElement(customIcon, _objectSpread(_objectSpread({}, customIcon.props), {}, {
         onClick: function onClick() {}
-      }))
-    })) : _jsx(Button, _objectSpread(_objectSpread({}, btnProps), {}, {
+      }));
+      return _jsx(Button, _objectSpread(_objectSpread({}, btnProps), {}, {
+        icon: btnIcon
+      }));
+    }
+    return _jsx(Button, _objectSpread(_objectSpread({}, btnProps), {}, {
       children: _jsx("span", {
         children: customIcon
       })
@@ -162,20 +166,31 @@ var InternalUploadList = function InternalUploadList(props, ref) {
   var prefixCls = getPrefixCls('upload', customizePrefixCls);
   var rootPrefixCls = getPrefixCls();
   var listClassNames = classNames("".concat(prefixCls, "-list"), "".concat(prefixCls, "-list-").concat(listType));
-  var listItemMotion = React.useMemo(function () {
-    return omit(initCollapseMotion(rootPrefixCls), ['onAppearEnd', 'onEnterEnd', 'onLeaveEnd']);
-  }, [rootPrefixCls]);
-  var motionConfig = _objectSpread(_objectSpread({}, isPictureCardOrCirle ? {} : listItemMotion), {}, {
+  // >>> Motion config
+  var motionKeyList = _toConsumableArray(items.map(function (file) {
+    return {
+      key: file.uid,
+      file: file
+    };
+  }));
+  var animationDirection = listType === 'picture-card' || listType === 'picture-circle' ? 'animate-inline' : 'animate';
+  // const transitionName = list.length === 0 ? '' : `${prefixCls}-${animationDirection}`;
+  var motionConfig = {
     motionDeadline: 2000,
-    motionName: "".concat(prefixCls, "-").concat(isPictureCardOrCirle ? 'animate-inline' : 'animate'),
-    keys: _toConsumableArray(items.map(function (file) {
-      return {
-        key: file.uid,
-        file: file
-      };
-    })),
+    motionName: "".concat(prefixCls, "-").concat(animationDirection),
+    keys: motionKeyList,
     motionAppear: motionAppear
-  });
+  };
+  var listItemMotion = React.useMemo(function () {
+    var motion = _objectSpread({}, initCollapseMotion(rootPrefixCls));
+    delete motion.onAppearEnd;
+    delete motion.onEnterEnd;
+    delete motion.onLeaveEnd;
+    return motion;
+  }, [rootPrefixCls]);
+  if (listType !== 'picture-card' && listType !== 'picture-circle') {
+    motionConfig = _objectSpread(_objectSpread({}, listItemMotion), motionConfig);
+  }
   return _jsxs("div", {
     className: listClassNames,
     children: [_jsx(CSSMotionList, _objectSpread(_objectSpread({}, motionConfig), {}, {
@@ -201,7 +216,6 @@ var InternalUploadList = function InternalUploadList(props, ref) {
           removeIcon: removeIcon,
           previewIcon: previewIcon,
           downloadIcon: downloadIcon,
-          extra: extra,
           iconRender: internalIconRender,
           actionIconRender: actionIconRender,
           itemRender: itemRender,

package/lib/Antd5/upload/style/dragger.js

@@ -17,7 +17,7 @@ var genDraggerStyle = function genDraggerStyle(token) {
     cursor: 'pointer',
     transition: "border-color ".concat(token.motionDurationSlow)
   }, componentCls, {
-    padding: token.padding
+    // padding: token.padding, // 删除符合UI规范
   }), "".concat(componentCls, "-btn"), {
     display: 'table',
     width: '100%',
@@ -27,10 +27,23 @@ var genDraggerStyle = function genDraggerStyle(token) {
     '&:focus-visible': {
       outline: "".concat(unit(token.lineWidthFocus), " solid ").concat(token.colorPrimaryBorder)
     }
-  }), "".concat(componentCls, "-drag-container"), {
+  }), "".concat(componentCls, "-drag-container"), _defineProperty({
     display: 'table-cell',
     verticalAlign: 'middle'
-  }), "\n          &:not(".concat(componentCls, "-disabled):hover,\n          &-hover:not(").concat(componentCls, "-disabled)\n        "), {
+  }, "".concat(componentCls, "-drag-wrapper"), _defineProperty(_defineProperty(_defineProperty({
+    padding: "39px 0"
+  }, "".concat(componentCls, "-drag-icon-wrapper"), _defineProperty({
+    marginBottom: "8px"
+  }, iconCls, {
+    color: token.colorPrimaryHover,
+    fontSize: "48px"
+  })), "".concat(componentCls, "-drag-text"), {
+    lineHeight: "20px"
+  }), "".concat(componentCls, "-drag-desc"), {
+    color: token.colorTextTertiary,
+    marginTop: "8px",
+    lineHeight: "20px"
+  }))), "\n          &:not(".concat(componentCls, "-disabled):hover,\n          &-hover:not(").concat(componentCls, "-disabled)\n        "), {
     borderColor: token.colorPrimaryHover
   }), "p".concat(componentCls, "-drag-icon"), _defineProperty({
     marginBottom: token.margin
@@ -44,8 +57,16 @@ var genDraggerStyle = function genDraggerStyle(token) {
   }), "p".concat(componentCls, "-hint"), {
     color: token.colorTextDescription,
     fontSize: token.fontSize
-  }), "&".concat(componentCls, "-disabled"), _defineProperty({}, "p".concat(componentCls, "-drag-icon ").concat(iconCls, ",\n            p").concat(componentCls, "-text,\n            p").concat(componentCls, "-hint\n          "), {
+  }), "&".concat(componentCls, "-disabled"), _defineProperty(_defineProperty({
+    background: token.colorBgContainerDisabled
+  }, "p".concat(componentCls, "-drag-icon ").concat(iconCls, ",\n            p").concat(componentCls, "-text,\n            p").concat(componentCls, "-hint,\n          "), {
+    color: token.colorTextDisabled
+  }), "".concat(componentCls, "-drag-wrapper"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-drag-icon-wrapper"), _defineProperty({}, iconCls, {
+    color: token.colorTextDisabled
+  })), "".concat(componentCls, "-drag-text"), {
+    color: token.colorTextDisabled
+  }), "".concat(componentCls, "-drag-desc"), {
     color: token.colorTextDisabled
-  }))));
+  })))));
 };
 export default genDraggerStyle;

package/lib/Antd5/upload/style/list.js

@@ -8,6 +8,7 @@ import { unit } from '@ant-design/cssinjs';
 import { clearFix, textEllipsis } from '../../style';
 var genListStyle = function genListStyle(token) {
   var componentCls = token.componentCls,
+    antCls = token.antCls,
     iconCls = token.iconCls,
     fontSize = token.fontSize,
     lineHeight = token.lineHeight,
@@ -15,6 +16,7 @@ var genListStyle = function genListStyle(token) {
   var itemCls = "".concat(componentCls, "-list-item");
   var actionsCls = "".concat(itemCls, "-actions");
   var actionCls = "".concat(itemCls, "-action");
+  var listItemHeightSM = token.fontHeightSM;
   return _defineProperty({}, "".concat(componentCls, "-wrapper"), _defineProperty({}, "".concat(componentCls, "-list"), _objectSpread(_objectSpread({}, clearFix()), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
     lineHeight: token.lineHeight
   }, itemCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
@@ -25,7 +27,6 @@ var genListStyle = function genListStyle(token) {
     display: 'flex',
     alignItems: 'center',
     transition: "background-color ".concat(token.motionDurationSlow),
-    borderRadius: token.borderRadiusSM,
     '&:hover': {
       backgroundColor: token.controlItemBgHover
     }
@@ -34,7 +35,7 @@ var genListStyle = function genListStyle(token) {
     lineHeight: lineHeight,
     flex: 'auto',
     transition: "all ".concat(token.motionDurationSlow)
-  })), actionsCls, _defineProperty(_defineProperty(_defineProperty({
+  })), actionsCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
     whiteSpace: 'nowrap'
   }, actionCls, {
     opacity: 0
@@ -43,6 +44,10 @@ var genListStyle = function genListStyle(token) {
     transition: "all ".concat(token.motionDurationSlow)
   }), "\n              ".concat(actionCls, ":focus-visible,\n              &.picture ").concat(actionCls, "\n            "), {
     opacity: 1
+  }), "".concat(actionCls).concat(antCls, "-btn"), {
+    height: listItemHeightSM,
+    border: 0,
+    lineHeight: 1
   })), "".concat(componentCls, "-icon ").concat(iconCls), {
     color: token.colorTextDescription,
     fontSize: fontSize

package/lib/AppHolder/index.js

@@ -1,4 +1,5 @@
 import _App from "@chaoswise/ui/lib/App";
+import { memo } from "react";
 var message;
 var notification;
 var modal;
@@ -9,7 +10,7 @@ var AppHolder = function AppHolder() {
   notification = staticFunction.notification;
   return null;
 };
-export default AppHolder;
+export default /*#__PURE__*/memo(AppHolder);
 // 这里的问题是 AppHolder 组件在首次定义的时候，message、modal 和 notification 还没有被赋值。当你在其他地方尝试访问 AppHolder.message 时，这些属性是 undefined 的。
 // AppHolder.message = message;
 // AppHolder.modal = modal;

package/lib/CWColorPicker/index.js

@@ -4,6 +4,7 @@ import _Button from "@chaoswise/ui/lib/Button";
 import _Space from "@chaoswise/ui/lib/Space";
 import _Tabs from "@chaoswise/ui/lib/Tabs";
 import _Input from "@chaoswise/ui/lib/Input";
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 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(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -30,7 +31,11 @@ var ColorPicker = function ColorPicker(_ref) {
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
     showGradient = _ref.showGradient,
     defaultValue = _ref.defaultValue,
-    colorRender = _ref.colorRender;
+    colorRender = _ref.colorRender,
+    _ref$dropdownProps = _ref.dropdownProps,
+    dropdownProps = _ref$dropdownProps === void 0 ? {
+      trigger: ["click"]
+    } : _ref$dropdownProps;
   var intl = useIntl();
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
@@ -244,10 +249,9 @@ var ColorPicker = function ColorPicker(_ref) {
       e.preventDefault();
       e.stopPropagation();
     }
-  }, /*#__PURE__*/React.createElement(_Dropdown, {
-    trigger: ["click"],
+  }, /*#__PURE__*/React.createElement(_Dropdown, _extends({}, dropdownProps, {
     overlay: menu
-  }, colorRender ? colorRender() : /*#__PURE__*/React.createElement(_Button, null, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement("div", {
+  }), colorRender ? colorRender() : /*#__PURE__*/React.createElement(_Button, null, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-select-value"),
     style: {
       background: colorType === "single" ? colorInfo.color : gradientColorValue

package/lib/CWTree/index.js

@@ -177,7 +177,7 @@ function CWTree(_ref) {
       className: "cw-tree-treenode-title"
     }, useTooltipText ? /*#__PURE__*/React.createElement(_TooltipText, {
       placement: tooltipPlacement ? tooltipPlacement : "bottomLeft"
-    }, title) : title), draggable && _showExtend === key && /*#__PURE__*/React.createElement("span", {
+    }, title) : title), draggable && /*#__PURE__*/React.createElement("span", {
       className: "cw-tree-treenode-drag-icon"
     }, /*#__PURE__*/React.createElement(_Tooltip, {
       title: intl.get("5fe60774-0f08-450f-a9d9-998996485fec").d("拖拽移动")
@@ -264,14 +264,20 @@ function CWTree(_ref) {
     }
     return {};
   }, [searchValue, expandedKeys]);
-  var onMouseEnter = function onMouseEnter(e, a) {
+  var handleMouseEnter = function handleMouseEnter(e) {
+    if (rest.onMouseEnter) {
+      rest.onMouseEnter(e);
+    }
     // 显示扩展部分
     if (e.node.key === _showExtend) {
       return;
     }
     setShowExtend(e.node.key);
   };
-  var onMouseLeave = function onMouseLeave() {
+  var handleMouseLeave = function handleMouseLeave(e) {
+    if (rest.onMouseLeave) {
+      rest.onMouseLeave(e); // 传递参数给外部的 onMouseLeave
+    }
     setShowExtend("");
   };
   return wrapCSSVar(/*#__PURE__*/React.createElement("div", {
@@ -288,8 +294,6 @@ function CWTree(_ref) {
     expandAction: false,
     multiple: multiple,
     className: classnames("cw-tree", className),
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
     draggable: draggable ? {
       icon: false,
       nodeDraggable: function nodeDraggable() {
@@ -297,7 +301,10 @@ function CWTree(_ref) {
       }
     } : false,
     onExpand: _onExpand
-  }, expandedConfig, rest), children ? children : innerTreeNode))), /*#__PURE__*/React.createElement("div", {
+  }, expandedConfig, rest, {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave
+  }), children ? children : innerTreeNode))), /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-footer"
   }, extraFooter)));
 }

package/lib/ConfigProvider/ConfigProvider.js

@@ -25,6 +25,8 @@ import intlContext from "./intlContext";
 import { getDateLocal } from "./generate/dayjs";
 import { legacyLogicalPropertiesTransformer, StyleProvider } from "@ant-design/cssinjs";
 var Provider = intlContext.Provider;
+// 导出intlContext与低版本ui组件同步，@chaoswise/business需要用到
+export { intlContext };
 var CWConfigProvider = function CWConfigProvider(_ref) {
   var defaultLocale = _ref.defaultLocale,
     theme = _ref.theme,

package/lib/ConfigProvider/theme/default.js

@@ -16,7 +16,9 @@ export var defaultComponentToken = {
     headerColor: ["colorWhite"]
   },
   Breadcrumb: {
-    colorBgTextHover: ["colorWhite"] // token变量 fff
+    colorBgTextHover: "transparent",
+    // token变量 fff
+    linkHoverColor: ["colorPrimaryHover"]
   },
   Tooltip: {
     colorBgSpotlight: ["colorWhite"],
@@ -33,7 +35,9 @@ export var defaultComponentToken = {
     trackBgDisabled: "rgb(217, 217, 217)"
   },
   Select: {
-    colorText: ["colorText"] // token变量 colorText
+    optionSelectedBg: ["colorPrimaryBg"],
+    optionActiveBg: ["colorPrimaryBg"],
+    optionSelectedColor: ["colorPrimary"]
   },
   Tag: {
     colorBorder: "rgba(0,0,0,0.09)"
@@ -67,6 +71,9 @@ export var defaultComponentToken = {
     itemSelectedBg: "#F6F7F8",
     subMenuItemBg: "transparent",
     itemBg: ["colorWhite"]
+  },
+  DatePicker: {
+    cellHoverBg: ["colorPrimaryBg"]
   }
 };
 

package/lib/Header/UserSetting/TenantTree.js

@@ -23,7 +23,6 @@ function TenantTree(_ref) {
       padding: "10px"
     }
   }, /*#__PURE__*/React.createElement(_CWTree, _extends({
-    // switcherIcon={<Icon type="down" />}
     defaultSelectedKeys: [defaultKey],
     onSelect: onTreeClick,
     defaultExpandAll: true,

package/lib/Pagination/index.style.js

@@ -108,7 +108,7 @@ var genCustomCWPaginationStyle = function genCustomCWPaginationStyle(token) {
     backgroundColor: token.colorPrimary,
     fontWeight: "500",
     a: {
-      color: token.white
+      color: token.colorWhite
     }
   }), "".concat(paginationPrefix, "-jump-wrapper"), _defineProperty({
     display: "inline-block",

package/lib/SiderMenu/index.style.js

@@ -7,7 +7,7 @@ var genCustomSiderMenuStyle = function genCustomSiderMenuStyle(token) {
   var prefixCls = token.antCls,
     iconCls = token.iconCls;
   var SiderMenuPrefix = "".concat(prefixCls, "-sider-menu");
-  return _defineProperty(_defineProperty({}, "".concat(SiderMenuPrefix, "-goup-label"), {
+  return _defineProperty(_defineProperty(_defineProperty({}, "".concat(SiderMenuPrefix, "-goup-label"), {
     borderBottom: "1px solid rgb(246, 247, 248)",
     width: "calc(100% + 14px)",
     marginLeft: "-7px",
@@ -29,7 +29,9 @@ var genCustomSiderMenuStyle = function genCustomSiderMenuStyle(token) {
     color: token.colorPrimary
   }, iconCls, {
     transform: "rotate(180deg)"
-  })));
+  }))), "".concat(SiderMenuPrefix, "-cw-menu-box-collapsed"), _defineProperty({}, "".concat(SiderMenuPrefix, "-expand-arrow"), {
+    display: "none"
+  }));
 };
 // ============================== Export ==============================
 export default genStyleHooks("SiderMenu", function (token) {

package/lib/Slider/index.style.js

@@ -51,7 +51,8 @@ var genCustomCWSliderStyle = function genCustomCWSliderStyle(token) {
       backgroundSize: "contain",
       boxShadow: "none !important",
       borderRadius: "0",
-      position: "static"
+      position: "static",
+      outline: "none"
     }
   }, "&".concat(prefixCls, "-tooltip-open"), {
     background: token.colorPrimaryHover,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chaoswise/ui",
   "packageName": "chaoswiseUI",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "公共UI库",
   "keywords": [
     "ui",