acud 1.0.2 → 1.0.3

package/lib/pagination/style/index.css

@@ -67,6 +67,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   box-sizing: border-box;
   font-weight: 400;
@@ -250,6 +251,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-pagination-prev.acud-pagination-disabled button,
@@ -635,6 +637,7 @@
 }
 .acud-pagination-options-quick-jumper button-has-icon > .acudicon {
   height: 16px;
+  font-size: 16px;
 }
 .acud-pagination-options-quick-jumper button-lg {
   height: 40px;
@@ -655,6 +658,7 @@
 }
 .acud-pagination-options-quick-jumper button-lg-has-icon > .acudicon {
   height: 16px;
+  font-size: 16px;
 }
 .acud-pagination-options-quick-jumper button-sm {
   height: 24px;
@@ -675,6 +679,7 @@
 }
 .acud-pagination-options-quick-jumper button-sm-has-icon > .acudicon {
   height: 16px;
+  font-size: 16px;
 }
 .acud-pagination-options-quick-jumper button,
 .acud-pagination-options-quick-jumper button:active,

package/lib/popover/style/index.css

@@ -22,6 +22,7 @@
   cursor: auto;
   -webkit-user-select: text;
      -moz-user-select: text;
+      -ms-user-select: text;
           user-select: text;
 }
 .acud-popover::after {

package/lib/rate/style/index.css

@@ -130,6 +130,7 @@
   margin-bottom: 4px;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   transition: all 0.3s;
   cursor: pointer;

package/lib/select/src/OptionList.d.ts

@@ -20,6 +20,7 @@ export interface OptionListProps<OptionsType extends object[]> {
     virtual?: boolean;
     keepExpand?: boolean;
     defaultExpandGroupKey?: string[] | string | number[] | number | boolean;
+    showTitle?: boolean;
     renderEmpty?: (componentName?: string, des?: string | undefined) => React.ReactNode;
     onSelect: (value: RawValueType, option: {
         selected: boolean;

package/lib/select/src/OptionList.js

@@ -91,6 +91,8 @@ var OptionList = function OptionList(_ref, ref) {
       keepExpand = _ref$keepExpand === void 0 ? false : _ref$keepExpand,
       _ref$defaultExpandGro = _ref.defaultExpandGroupKey,
       defaultExpandGroupKey = _ref$defaultExpandGro === void 0 ? false : _ref$defaultExpandGro,
+      _ref$showTitle = _ref.showTitle,
+      showTitle = _ref$showTitle === void 0 ? false : _ref$showTitle,
       renderEmpty = _ref.renderEmpty,
       onSelect = _ref.onSelect,
       onToggleOpen = _ref.onToggleOpen,
@@ -452,10 +454,14 @@ var OptionList = function OptionList(_ref, ref) {
     var mergedLabel = childrenAsData ? children : label; // const iconVisible = !menuItemSelectedIcon || typeof menuItemSelectedIcon === 'function' || selected;
 
     var content = mergedLabel || value;
-    var optionTitle = typeof content === 'string' || typeof content === 'number' ? content.toString() : undefined;
+    var optionTitle;
 
-    if (title !== undefined) {
-      optionTitle = title;
+    if (showTitle) {
+      optionTitle = typeof content === 'string' || typeof content === 'number' ? content.toString() : undefined;
+
+      if (title !== undefined) {
+        optionTitle = title;
+      }
     }
 
     var fContent = (typeof content === 'string' || typeof content === 'number') && searchValue ? formatContent(content, searchValue, prefixCls) : content;
@@ -499,6 +505,11 @@ var OptionList = function OptionList(_ref, ref) {
     }, mergedNotFound);
   }
 
+  var disabledVirtual = React.useMemo(function () {
+    return !virtual || (mode === 'multiple' || mode !== 'multiple' && !keepExpand) && memoFlattenOptions.some(function (option) {
+      return option.group;
+    });
+  }, [virtual, mode, keepExpand, memoFlattenOptions]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     role: "listbox",
     id: "".concat(id, "_list"),
@@ -508,7 +519,7 @@ var OptionList = function OptionList(_ref, ref) {
       overflow: 'hidden'
     }
   }, renderItem(activeIndex - 1), renderItem(activeIndex), renderItem(activeIndex + 1)), multiple && /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames["default"])("".concat(itemPrefixCls, "-checkall"), (0, _defineProperty2["default"])({}, "".concat(itemPrefixCls, "-checkall-can-active"), !selectAllChecked)),
+    className: (0, _classnames["default"])("".concat(itemPrefixCls, "-checkall")),
     onClick: handleCheckAll
   }, /*#__PURE__*/React.createElement(_checkbox["default"], {
     indeterminate: indeterminate,
@@ -524,7 +535,7 @@ var OptionList = function OptionList(_ref, ref) {
     fullHeight: false,
     onMouseDown: onListMouseDown,
     onScroll: onScroll,
-    virtual: virtual,
+    virtual: !disabledVirtual,
     onMouseEnter: onMouseEnter
   }, function (_ref3, itemIndex) {
     var group = _ref3.group,
@@ -535,10 +546,8 @@ var OptionList = function OptionList(_ref, ref) {
         key = data.key; // Group
 
     if (group) {
-      var _classNames3;
-
       return /*#__PURE__*/React.createElement("div", {
-        className: (0, _classnames["default"])(itemPrefixCls, "".concat(itemPrefixCls, "-group"), (_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(itemPrefixCls, "-group-keep-expand"), isKeepExpand), (0, _defineProperty2["default"])(_classNames3, "".concat(itemPrefixCls, "-group-can-active"), getCheckStatus(key, 'all') === false), _classNames3)),
+        className: (0, _classnames["default"])(itemPrefixCls, "".concat(itemPrefixCls, "-group"), (0, _defineProperty2["default"])({}, "".concat(itemPrefixCls, "-group-keep-expand"), isKeepExpand)),
         onClick: function onClick() {
           return handleCheckGroup(key);
         }

package/lib/select/src/generate.d.ts

@@ -47,6 +47,7 @@ export interface SelectProps<OptionsType extends object[], ValueType> extends Re
     allowClear?: boolean;
     clearIcon?: React.ReactNode;
     showArrow?: boolean;
+    showTitle?: boolean;
     inputIcon?: RenderNode;
     removeIcon?: React.ReactNode;
     menuItemSelectedIcon?: RenderNode;

package/lib/select/src/generate.js

@@ -149,6 +149,7 @@ function generateSelector(config) {
         dropdownAlign = props.dropdownAlign,
         _props$showAction = props.showAction,
         showAction = _props$showAction === void 0 ? [] : _props$showAction,
+        showTitle = props.showTitle,
         direction = props.direction,
         tokenSeparators = props.tokenSeparators,
         groupSelectorRender = props.groupSelectorRender,
@@ -169,7 +170,7 @@ function generateSelector(config) {
         onClear = props.onClear,
         _props$internalProps = props.internalProps,
         internalProps = _props$internalProps === void 0 ? {} : _props$internalProps,
-        restProps = __rest(props, ["prefixCls", "className", "id", "open", "defaultOpen", "options", "children", "mode", "value", "defaultValue", "labelInValue", "showSearch", "inputValue", "searchValue", "filterOption", "filterSort", "optionFilterProp", "autoClearSearchValue", "onSearch", "suffixIconPre", "removeIcon", "allowClear", "clearIcon", "showArrow", "menuItemSelectedIcon", "disabled", "loading", "defaultActiveFirstOption", "notFoundContent", "optionLabelProp", "backfill", "tabIndex", "getInputElement", "getPopupContainer", "listHeight", "listItemHeight", "animation", "transitionName", "virtual", "dropdownStyle", "dropdownClassName", "dropdownMatchSelectWidth", "dropdownRender", "dropdownAlign", "showAction", "direction", "tokenSeparators", "groupSelectorRender", "tagRender", "renderEmpty", "keepExpand", "defaultExpandGroupKey", "onPopupScroll", "onDropdownVisibleChange", "onFocus", "onBlur", "onKeyUp", "onKeyDown", "onMouseDown", "onChange", "onSelect", "onDeselect", "onClear", "internalProps"]);
+        restProps = __rest(props, ["prefixCls", "className", "id", "open", "defaultOpen", "options", "children", "mode", "value", "defaultValue", "labelInValue", "showSearch", "inputValue", "searchValue", "filterOption", "filterSort", "optionFilterProp", "autoClearSearchValue", "onSearch", "suffixIconPre", "removeIcon", "allowClear", "clearIcon", "showArrow", "menuItemSelectedIcon", "disabled", "loading", "defaultActiveFirstOption", "notFoundContent", "optionLabelProp", "backfill", "tabIndex", "getInputElement", "getPopupContainer", "listHeight", "listItemHeight", "animation", "transitionName", "virtual", "dropdownStyle", "dropdownClassName", "dropdownMatchSelectWidth", "dropdownRender", "dropdownAlign", "showAction", "showTitle", "direction", "tokenSeparators", "groupSelectorRender", "tagRender", "renderEmpty", "keepExpand", "defaultExpandGroupKey", "onPopupScroll", "onDropdownVisibleChange", "onFocus", "onBlur", "onKeyUp", "onKeyDown", "onMouseDown", "onChange", "onSelect", "onDeselect", "onClear", "internalProps"]);
 
     var useInternalProps = internalProps.mark === _generator.INTERNAL_PROPS_MARK;
     var domProps = omitDOMProps ? omitDOMProps(restProps) : restProps;
@@ -826,7 +827,8 @@ function generateSelector(config) {
       virtual: virtual !== false && dropdownMatchSelectWidth !== false,
       onMouseEnter: onPopupMouseEnter,
       triggerChange: triggerChange,
-      setInnerOpen: setInnerOpen
+      setInnerOpen: setInnerOpen,
+      showTitle: showTitle
     }); // ============================= Clear ==============================
 
     var clearNode;

package/lib/select/style/index.css

@@ -38,6 +38,7 @@
   position: relative;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   color: #151B26;
 }
@@ -190,6 +191,7 @@
   transition: font-size 0.3s, line-height 0.3s, height 0.3s;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   -webkit-margin-end: 5px;
           margin-inline-end: 5px;
@@ -346,7 +348,7 @@
   line-height: 22px;
   cursor: pointer;
 }
-.acud-select-dropdown-multiple .acud-select-item-checkall-can-active:hover {
+.acud-select-dropdown-multiple .acud-select-item-checkall:hover {
   background-color: #E6F0FF;
 }
 .acud-select-dropdown-multiple .acud-select-item-option-content {
@@ -355,6 +357,9 @@
 .acud-select-dropdown-multiple .acud-select-item-option-grouped {
   padding-left: 48px;
 }
+.acud-select-dropdown-multiple .acud-select-item-group {
+  cursor: pointer;
+}
 /* Reset search input style */
 .acud-select {
   margin: 0;
@@ -649,7 +654,7 @@
 .acud-select-item-group {
   color: #151B26;
   font-size: 12px;
-  cursor: pointer;
+  cursor: default;
 }
 .acud-select-item-group:hover {
   color: #151B26;
@@ -667,6 +672,7 @@
 .acud-select-item-group-arrow {
   margin-right: 8px;
   display: flex;
+  cursor: pointer;
 }
 .acud-select-item-group-arrow .acudicon {
   display: flex;
@@ -676,9 +682,14 @@
   margin-right: 8px;
 }
 .acud-select-item-group-keep-expand {
+  cursor: default;
   color: #B8BABF;
 }
-.acud-select-item-group-can-active:hover {
+.acud-select-item-group-keep-expand:hover {
+  color: #B8BABF;
+  background-color: #E6F0FF;
+}
+.acud-select-item-group:hover {
   background-color: #E6F0FF;
 }
 .acud-select-item-option {
@@ -693,9 +704,6 @@
 .acud-select-item-option-state {
   flex: none;
 }
-.acud-select-item-option-active:not(.acud-select-item-option-disabled) {
-  background-color: #E6F0FF;
-}
 .acud-select-item-option-selected:not(.acud-select-item-option-disabled) {
   color: #2468F2;
   background-color: #FFFFFF;
@@ -704,6 +712,9 @@
 .acud-select-item-option-selected:not(.acud-select-item-option-disabled) .acud-select-item-option-state {
   color: #151B26;
 }
+.acud-select-item-option-active:not(.acud-select-item-option-disabled) {
+  background-color: #E6F0FF;
+}
 .acud-select-item-option-disabled {
   color: #B8BABF;
   cursor: not-allowed;
@@ -725,3 +736,6 @@
 .acud-select-search-highlight {
   color: #2468F2;
 }
+.acud-select-dropdown-multiple .acud-select-item-option-selected:not(.acud-select-item-option-disabled) {
+  color: inherit;
+}

package/lib/select/style/index.less

@@ -275,10 +275,11 @@
         &-group {
             .basic-tp-config(@select-item-group-tp);
             font-size: @T2;
-            cursor: pointer;
+            cursor: default;
             &-arrow {
                 margin-right: 2 * @P;
                 display: flex;
+                cursor: pointer;
                 .@{acud-prefix}icon {
                     display: flex;
                     color: @G5;
@@ -288,9 +289,14 @@
                 margin-right: 2 * @P;
             }
             &-keep-expand {
+                cursor: default;
                 color: @G6;
+                &:hover {
+                    color: @G6;
+                    background-color: @B1;
+                }
             }
-            &-can-active:hover {
+            &:hover {
                 background-color: ~'@{@{select-dropdown-default-p}-hover-background-color}';
             }
         }
@@ -310,14 +316,7 @@
                 flex: none;
             }
 
-            &-active:not(&-disabled) {
-                background-color: ~'@{@{select-dropdown-default-p}-hover-background-color}';
-            }
-
             &-selected:not(&-disabled) {
-                // color: @select-item-selected-color;
-                // font-weight: @select-item-selected-font-weight;
-                // background-color: @select-item-selected-bg;
                 color: ~'@{@{select-dropdown-default-tp}-click-color}';
                 background-color: ~'@{@{select-dropdown-default-p}-default-background-color}';
                 border-color: ~'@{@{select-dropdown-default-p}-click-border-color}';
@@ -327,6 +326,10 @@
                 }
             }
 
+            &-active:not(&-disabled) {
+                background-color: ~'@{@{select-dropdown-default-p}-hover-background-color}';
+            }
+
             &-disabled {
                 color: ~'@{@{select-dropdown-default-tp}-disabled-color}';
                 cursor: not-allowed;
@@ -359,3 +362,7 @@
         color: ~'@{@{select-dropdown-default-tp}-click-color}';;
     }
 }
+
+.@{select-prefix-cls}-dropdown-multiple .@{select-prefix-cls}-item-option-selected:not(.acud-select-item-option-disabled) {
+    color: inherit;
+}

package/lib/select/style/multiple.less

@@ -251,7 +251,7 @@
             display: flex;
             line-height: 5.5 * @P;
             cursor: pointer;
-            &-can-active:hover {
+            &:hover {
                 background-color: ~'@{@{select-dropdown-default-p}-hover-background-color}';
             }
         }
@@ -262,4 +262,7 @@
     .@{select-prefix-cls}-item-option-grouped {
         padding-left: 12 * @P;
     }
+    .@{select-prefix-cls}-item-group {
+        cursor: pointer;
+    }
 }

package/lib/slider/style/index.css

@@ -253,6 +253,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-slider-mark-text:first-child {

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

@@ -33,7 +33,7 @@
 @menu-item-active-color: @B6;
 
 // horizontal
-@menu-horizontal-line-height:  12 * @P;
+@menu-horizontal-line-height:  14 * @P;
 @menu-horizontal-item-margin: 0 4 * @P;
 
 // horizontal - with icon
@@ -42,10 +42,10 @@
 @menu-horizontal-withicon-margin-right: 6 * @P;
 
 // horizontal - global
-@headermenu-height: 12 * @P;
+@headermenu-height: 14 * @P;
 @headermenu-background: @G11;
 @headermenu-zindex: @zindex-range-3;
-@headermenu-logo-height: 12 * @P;
+@headermenu-logo-height: 14 * @P;
 @headermenu-logo-margin-right: 4 * @P;
 @headermenu-iconlist-height: 4 * @P;
 @headermenu-iconlist-margin-right: 6 * @P;
@@ -53,7 +53,7 @@
 @headermenu-iconlist-tp: tp29;
 @headermenu-title-margin-left: 2 * @P;
 @headermenu-title-color: @G5;
-@headermenu-title-line-height: 12 * @P;
+@headermenu-title-line-height: 14 * @P;
 @headermenu-item-margin: 0 3 * @P;
 
 // inline

package/lib/switch/style/index.css

@@ -202,6 +202,7 @@
   vertical-align: middle;
   -webkit-user-select: text;
      -moz-user-select: text;
+      -ms-user-select: text;
           user-select: text;
   pointer-events: none;
 }

package/lib/table/hooks/useFilter/FilterDropdown.js

@@ -53,9 +53,8 @@ function searchValueMatched(searchValue, text) {
   }
 
   return false;
-}
+} // let preKeys: React.Key[];
 
-var preKeys;
 
 function FilterDropdown(props) {
   var _a;
@@ -92,8 +91,7 @@ function FilterDropdown(props) {
 
   var mergedVisible = typeof filterDropdownVisible === 'boolean' ? filterDropdownVisible : visible; // ===================== Select Keys =====================
 
-  var propFilteredKeys = filterState === null || filterState === void 0 ? void 0 : filterState.filteredKeys;
-  preKeys = propFilteredKeys;
+  var propFilteredKeys = filterState === null || filterState === void 0 ? void 0 : filterState.filteredKeys; // preKeys = propFilteredKeys;
 
   var _useSyncState = (0, _useSyncState3["default"])(propFilteredKeys || []),
       _useSyncState2 = (0, _slicedToArray2["default"])(_useSyncState, 2),
@@ -182,8 +180,8 @@ function FilterDropdown(props) {
 
   var onReset = function onReset() {
     setSearchValue('');
-    setFilteredKeysSync(preKeys);
-    internalTriggerFilter(preKeys); // triggerVisible(false);
+    setFilteredKeysSync([]); // internalTriggerFilter([]);
+    // triggerVisible(false);
   };
 
   var doFilter = function doFilter() {

package/lib/tabs/style/index.css

@@ -537,6 +537,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   color: #151B26;
 }

package/lib/tag/style/index.css

@@ -312,6 +312,7 @@
 .acud-tag-type-edit {
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
   padding-right: 4px;
   line-height: 24px;

package/lib/timeline/style/index.css

@@ -166,6 +166,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .common-content-link {
@@ -582,6 +583,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-timeline-item-content-link {

package/lib/tree/style/index.css

@@ -277,6 +277,7 @@
   white-space: nowrap;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-tree-indent-unit {
@@ -294,6 +295,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-tree-switcher .acud-tree-switcher-icon,
@@ -435,6 +437,7 @@
   line-height: 24px;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-tree-node-content-wrapper .acud-tree-drop-indicator {

package/lib/tree/tree.d.ts

@@ -4,10 +4,7 @@ import type { EventDataNode as RcEventDataNode, DataNode as RcDataNode, Key } fr
 export interface DataNode extends RcDataNode {
     isEditable?: boolean;
 }
-declare type EventDataNode = RcEventDataNode<{
-    children?: any;
-}>;
-export { EventDataNode };
+export declare type EventDataNode = RcEventDataNode<DataNode>;
 export interface TreeProps extends Partial<RcTreeProps> {
     treeData?: DataNode[];
     className?: string;

package/lib/tree-select/style/index.css

@@ -292,6 +292,7 @@
   white-space: nowrap;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-select-tree-indent-unit {
@@ -309,6 +310,7 @@
   cursor: pointer;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-select-tree-switcher .acud-tree-switcher-icon,
@@ -450,6 +452,7 @@
   line-height: 24px;
   -webkit-user-select: none;
      -moz-user-select: none;
+      -ms-user-select: none;
           user-select: none;
 }
 .acud-select-tree-node-content-wrapper .acud-tree-drop-indicator {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "acg react 组件库",
     "main": "lib/index.js",
     "module": "es/index.js",
@@ -21,7 +21,6 @@
         "lint:style": "stylelint 'components/**/*.less' --syntax less",
         "lint-fix:script": "npm run lint:script -- --fix",
         "lint-fix:style": "npm run lint:style -- --fix",
-        "prepare": "curl -s http://icode.baidu.com/tools/hooks/commit-msg > .husky/commit-msg && echo '\nsh \".husky/commit-msg.sh\"' >> .husky/commit-msg && chmod u+x .husky/commit-msg && husky install",
         "prepublishOnly": "npm run build",
         "pub": "node ./scripts/publish.js"
     },
@@ -47,7 +46,7 @@
         "rc-tabs": "^11.9.1",
         "rc-textarea": "^0.3.4",
         "rc-tooltip": "^5.1.1",
-        "rc-tree": "^5.4.4",
+        "rc-tree": "^5.6.5",
         "rc-tree-select": "^5.4.0",
         "rc-trigger": "^5.2.10",
         "rc-util": "5.19.2",