acud 1.0.13 → 1.0.16

package/lib/style/themes/default/components/modal.less

@@ -32,7 +32,7 @@
 @modal-heading-height: 22px;
 @modal-heading-bg-color: @G10;
 @modal-heading-padding: 6*@P 6*@P 0;
-@modal-heading-font-size: @T3;
+@modal-heading-font-size: @T4;
 @modal-heading-font-weight: 500;
 @modal-heading-color: @G2;
 
@@ -51,5 +51,5 @@
 
 // Footer
 @modal-footer-padding: 0 6*@P 6*@P;
-@modal-footer-btn-space: 4*@P;
+@modal-footer-btn-space: 3*@P;
 @modal-footer-bg-color: @G11;

package/lib/table/Space.js

@@ -11,6 +11,8 @@ exports["default"] = void 0;
 
 var React = _interopRequireWildcard(require("react"));
 
+var _toArray = _interopRequireDefault(require("rc-util/lib/Children/toArray"));
+
 var _useFlexGapSupport = _interopRequireDefault(require("../_util/hooks/useFlexGapSupport"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -25,9 +27,19 @@ var Space = function Space(props) {
       children = props.children;
   var supportFlexGap = (0, _useFlexGapSupport["default"])();
   var spaceStyle = {};
+  var childrenMap = children;
 
   if (!supportFlexGap) {
-    spaceStyle.marginRight = space;
+    var childNodes = (0, _toArray["default"])(children, {
+      keepEmpty: true
+    });
+    childrenMap = childNodes.map(function (child, index) {
+      return /*#__PURE__*/React.createElement("span", {
+        style: {
+          marginRight: index === childNodes.length - 1 ? 0 : space
+        }
+      }, child);
+    });
   }
 
   if (supportFlexGap) {
@@ -37,7 +49,7 @@ var Space = function Space(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: prefixCls,
     style: spaceStyle
-  }, children);
+  }, childrenMap);
 };
 
 var _default = Space;

package/lib/table/style/base.less

@@ -24,7 +24,7 @@
             // display: flex;
             // justify-content: left;
             .@{table-prefix-cls}-row-expand-icon {
-                margin: auto 12px auto 0;
+                margin: 2px 12px 2px 0;
             }
         }
         &.@{table-prefix-cls}-row-expand-icon-cell {

package/lib/table/style/index.css

@@ -280,9 +280,6 @@ div.acud-table-summary {
   cursor: pointer;
   transition: all 0.3s;
 }
-.acud-table-thead th.acud-table-column-has-sorters:hover {
-  background: rgba(0, 0, 0, 0.04);
-}
 .acud-table-thead th.acud-table-column-has-sorters:hover::before {
   background-color: transparent !important;
 }
@@ -473,12 +470,12 @@ table tr th.acud-table-selection-column::after {
   display: flex;
 }
 .acud-table-selection-extra .acudicon {
-  color: #bfbfbf;
-  font-size: 10px;
+  color: #84868C;
+  font-size: 16px;
   display: flex;
 }
 .acud-table-selection-extra .acudicon:hover {
-  color: #a6a6a6;
+  color: #84868C;
 }
 .acud-table-expand-icon-col {
   width: 28px;
@@ -494,7 +491,7 @@ table tr th.acud-table-selection-column::after {
   color: #84868C;
   cursor: pointer;
   font-size: 16px;
-  line-height: 16px;
+  line-height: 0;
   float: left;
   margin: auto;
 }
@@ -785,7 +782,7 @@ tr.acud-table-expanded-row .acud-descriptions-view table {
   cursor: not-allowed;
 }
 .acud-table-cell-with-append .acud-table-row-expand-icon {
-  margin: auto 12px auto 0;
+  margin: 2px 12px 2px 0;
 }
 .acud-table-cell.acud-table-row-expand-icon-cell {
   width: 16px;

package/lib/table/style/index.less

@@ -303,7 +303,7 @@
     transition: all 0.3s;
 
     &:hover {
-      background: @table-header-sort-active-bg;
+      // background: @table-header-sort-active-bg;
 
       &::before {
         background-color: transparent !important;
@@ -565,12 +565,12 @@
       }
 
       .@{iconfont-css-prefix} {
-        color: @table-header-icon-color;
-        font-size: 10px;
+        color: @G5;
+        font-size: @P * 4;
         display: flex;
 
         &:hover {
-          color: @table-header-icon-color-hover;
+          color: @G5;
         }
       }
     }
@@ -594,7 +594,7 @@
     .basic-tp-config(@table-row-expand-icon-tp);
     cursor: pointer;
     font-size: @P * 4;
-    line-height: @P * 4;;
+    line-height: 0;
     float: left;
     margin: auto;
 

package/lib/tabs/src/TabNavList/TabNode.js

@@ -100,7 +100,7 @@ function TabNode(_ref, ref) {
   }
 
   function onDoubleClick() {
-    if ((0, _typeof2["default"])(tab) !== 'object') {
+    if (editable && (0, _typeof2["default"])(tab) !== 'object') {
       setEditNav(true);
     }
   }

package/lib/tabs/src/TabPanelList/index.js

@@ -49,7 +49,7 @@ function TabPanelList(_ref) {
       tabKey: tab.key,
       id: id,
       animated: tabPaneAnimated,
-      active: tab.key === activeKey && tabs.length > 1,
+      active: tab.key === activeKey && tabs.length > 0,
       destroyInactiveTabPane: destroyInactiveTabPane
     });
   })));

package/lib/toast/base.js

@@ -279,11 +279,18 @@ function getRCNoticeProps(args, prefixCls) {
 }
 
 function notice(args) {
+  var key = args.key;
   getNotificationInstance(args, function (_ref) {
     var prefixCls = _ref.prefixCls,
         instance = _ref.instance;
     instance.notice(getRCNoticeProps(args, prefixCls));
-  });
+  }); // 增加返回的清除函数
+
+  var result = function result() {
+    api.close(key);
+  };
+
+  return result;
 }
 
 var api = {

package/lib/toast/index.js

@@ -35,7 +35,7 @@ var _globalConfig = (0, _configProvider.globalConfig)(),
     getPrefixCls = _globalConfig.getPrefixCls;
 
 var PREFIX = 'notification-hastime';
-var MAXTOASTARRLENGTN = 4; // 最多显示多少个toast
+var maxToastArrLength = 4; // 最多显示多少个toast
 
 /**
  * 代理对象
@@ -43,7 +43,8 @@ var MAXTOASTARRLENGTN = 4; // 最多显示多少个toast
  */
 
 var target = {};
-var toastArr = []; // 向数组尾部添加一个元素
+var toastArr = []; // const paramIgnoreFun = ['close', 'destroy'];
+// 向数组尾部添加一个元素
 
 function addToastKey(key) {
   toastArr.push(key);
@@ -85,6 +86,7 @@ function ToastDom(props) {
   (0, _react.useEffect)(function () {
     if (counter !== undefined) {
       if (counter > 0) {
+        // clearTimeout(timerID);
         var timer = setTimeout(function () {
           setCounter(counter - 1);
         }, 1000);
@@ -104,7 +106,12 @@ function ToastDom(props) {
       // if (timerID) {
       setTimerID(null); // }
     };
-  }, [counter]);
+  }, [counter]); // useEffect(() => {
+  //     return () => {
+  //         clearTimeout(timerID);
+  //     }
+  // }, []);
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefixCls
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -123,16 +130,12 @@ function DescriptionDom(props) {
 
 var handler = {
   get: function get() {
-    var name = arguments.length <= 1 ? undefined : arguments[1];
-    var key = new Date().getTime() + ''; // 通过key来强制关闭notification
-
-    if (toastArr.length < MAXTOASTARRLENGTN) {
-      addToastKey(key);
-    } else {
-      _base["default"].close(unshiftToast());
+    var name = arguments.length <= 1 ? undefined : arguments[1]; // 关闭、删除提示可以根据用户传参直接调用，避免key错赋值
+    // if (paramIgnoreFun.includes(name)) {
+    //     return props => Reflect.get(NotificationApi, name)(props);
+    // }
 
-      addToastKey(key);
-    }
+    var key = new Date().getTime() + ''; // 通过key来强制关闭notification
 
     return function (props) {
       // 定义默认图标
@@ -142,7 +145,22 @@ var handler = {
       var args = (0, _extends2["default"])((0, _extends2["default"])({
         key: key,
         type: 'info'
-      }, iconProps), props); // 初始化倒计时
+      }, iconProps), props); // 设置最大显示数
+
+      if (name === 'config' && props.maxCount) {
+        maxToastArrLength = props.maxCount;
+      } // key相同时不重新渲染
+
+
+      if (!~toastArr.indexOf(args.key)) {
+        if (toastArr.length < maxToastArrLength) {
+          addToastKey(args.key);
+        } else {
+          _base["default"].close(unshiftToast());
+
+          addToastKey(args.key);
+        }
+      } // 初始化倒计时
       // let tempDuration;
       // if (!args.duration) {
       //     tempDuration = 0;
@@ -151,6 +169,7 @@ var handler = {
       //     tempDuration = args.duration;
       // }
 
+
       var tempDuration = args.duration;
       args.duration = 0; // 设置样式 有描述和没描述间距不一样
 
@@ -171,7 +190,7 @@ var handler = {
         message: args.message,
         description: args.description,
         countdown: tempDuration,
-        notificationKey: key,
+        notificationKey: args.key,
         onClose: props === null || props === void 0 ? void 0 : props.onClose
       });
       args.description = /*#__PURE__*/_react["default"].createElement(DescriptionDom, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "1.0.13",
+    "version": "1.0.16",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",