@chaoswise/ui 2.3.0 → 2.3.1

package/lib/CWCascader/rc-cascader/OptionList/useKeyboard.js

@@ -102,74 +102,70 @@ export default (function (ref, options, fieldNames, activeValueCells, setActiveV
     return {
       // scrollTo: treeRef.current?.scrollTo,
       onKeyDown: function onKeyDown(event) {
-        var which = event.which;
-        switch (which) {
-          // >>> Arrow keys
-          case KeyCode.UP:
-          case KeyCode.DOWN:
-            {
-              var offset = 0;
-              if (which === KeyCode.UP) {
-                offset = -1;
-              } else if (which === KeyCode.DOWN) {
-                offset = 1;
-              }
-              if (offset !== 0) {
-                offsetActiveOption(offset);
-              }
-              break;
-            }
-          case KeyCode.LEFT:
-            {
-              if (rtl) {
-                nextColumn();
-              } else {
-                prevColumn();
-              }
-              break;
-            }
-          case KeyCode.RIGHT:
-            {
-              if (rtl) {
-                prevColumn();
-              } else {
-                nextColumn();
-              }
-              break;
-            }
-          case KeyCode.BACKSPACE:
-            {
-              if (!searchValue) {
-                prevColumn();
-              }
-              break;
-            }
-          // >>> Select
-          case KeyCode.ENTER:
-            {
-              if (validActiveValueCells.length) {
-                var option = lastActiveOptions[lastActiveIndex];
-                // Search option should revert back of origin options
-                var originOptions = (option === null || option === void 0 ? void 0 : option[SEARCH_MARK]) || [];
-                if (originOptions.length) {
-                  onKeyBoardSelect(originOptions.map(function (opt) {
-                    return opt[fieldNames.value];
-                  }), originOptions[originOptions.length - 1]);
-                } else {
-                  onKeyBoardSelect(validActiveValueCells, lastActiveOptions[lastActiveIndex]);
-                }
-              }
-              break;
-            }
-          // >>> Close
-          case KeyCode.ESC:
-            {
-              toggleOpen(false);
-              if (open) {
-                event.stopPropagation();
-              }
-            }
-        }
+        //   const { which } = event;
+        //   switch (which) {
+        //       // >>> Arrow keys
+        //       case KeyCode.UP:
+        //       case KeyCode.DOWN: {
+        //           let offset = 0;
+        //           if (which === KeyCode.UP) {
+        //               offset = -1;
+        //           }
+        //           else if (which === KeyCode.DOWN) {
+        //               offset = 1;
+        //           }
+        //           if (offset !== 0) {
+        //               offsetActiveOption(offset);
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.LEFT: {
+        //           if (rtl) {
+        //               nextColumn();
+        //           }
+        //           else {
+        //               prevColumn();
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.RIGHT: {
+        //           if (rtl) {
+        //               prevColumn();
+        //           }
+        //           else {
+        //               nextColumn();
+        //           }
+        //           break;
+        //       }
+        //       case KeyCode.BACKSPACE: {
+        //           if (!searchValue) {
+        //               prevColumn();
+        //           }
+        //           break;
+        //       }
+        //       // >>> Select
+        //       case KeyCode.ENTER: {
+        //           if (validActiveValueCells.length) {
+        //               const option = lastActiveOptions[lastActiveIndex];
+        //               // Search option should revert back of origin options
+        //               const originOptions = option?.[SEARCH_MARK] || [];
+        //               if (originOptions.length) {
+        //                   onKeyBoardSelect(originOptions.map(opt => opt[fieldNames.value]), originOptions[originOptions.length - 1]);
+        //               }
+        //               else {
+        //                   onKeyBoardSelect(validActiveValueCells, lastActiveOptions[lastActiveIndex]);
+        //               }
+        //           }
+        //           break;
+        //       }
+        //       // >>> Close
+        //       case KeyCode.ESC: {
+        //           toggleOpen(false);
+        //           if (open) {
+        //               event.stopPropagation();
+        //           }
+        //       }
+        //   }
       },
       onKeyUp: function onKeyUp() {}
     };

package/lib/CWCascader/rc-cascader/hooks/useDisplayValues.js

@@ -5,18 +5,18 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-import { toPathOptions } from '../utils/treeUtil';
-import * as React from 'react';
-import { toPathKey } from '../utils/commonUtil';
-export default (function (rawValues, options, fieldNames, multiple, displayRender) {
+import { toPathOptions } from "../utils/treeUtil";
+import * as React from "react";
+import { toPathKey } from "../utils/commonUtil";
+export default (function (rawValues, options, fieldNames, multiple, displayRender, labelInValueOption) {
   return React.useMemo(function () {
     var mergedDisplayRender = displayRender ||
     // Default displayRender
     function (labels) {
       var mergedLabels = multiple ? labels.slice(-1) : labels;
-      var SPLIT = ' / ';
+      var SPLIT = " / ";
       if (mergedLabels.every(function (label) {
-        return ['string', 'number'].includes(_typeof(label));
+        return ["string", "number"].includes(_typeof(label));
       })) {
         return mergedLabels.join(SPLIT);
       }
@@ -34,15 +34,44 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
     return rawValues.map(function (valueCells) {
       var _valueOptions, _valueOptions$option;
       var valueOptions = toPathOptions(valueCells, options, fieldNames);
-      var label = mergedDisplayRender(valueOptions.map(function (_ref) {
-        var _option$fieldNames$la;
-        var option = _ref.option,
-          value = _ref.value;
-        return (_option$fieldNames$la = option === null || option === void 0 ? void 0 : option[fieldNames.label]) !== null && _option$fieldNames$la !== void 0 ? _option$fieldNames$la : value;
-      }), valueOptions.map(function (_ref2) {
-        var option = _ref2.option;
-        return option;
-      }));
+      var isBackEndQuery = false;
+      if (valueOptions.length && (valueOptions[valueOptions.length - 1].index === -1 || valueOptions[valueOptions.length - 1].index === undefined)) {
+        var findItem = labelInValueOption.find(function (item) {
+          return item.value == valueCells;
+        });
+        if (findItem) {
+          isBackEndQuery = true;
+          valueOptions[valueOptions.length - 1].option = {
+            value: valueOptions[valueOptions.length - 1].value,
+            label: findItem.label
+          };
+        }
+      }
+      var label;
+      if (isBackEndQuery) {
+        label = mergedDisplayRender(valueOptions.map(function (_ref) {
+          var option = _ref.option,
+            value = _ref.value;
+          return option === null || option === void 0 ? void 0 : option[fieldNames.label];
+        }).filter(Boolean), valueOptions.map(function (_ref2) {
+          var option = _ref2.option,
+            value = _ref2.value;
+          return option !== null && option !== void 0 ? option : {
+            label: undefined,
+            value: value
+          };
+        }));
+      } else {
+        label = mergedDisplayRender(valueOptions.map(function (_ref3) {
+          var _option$fieldNames$la;
+          var option = _ref3.option,
+            value = _ref3.value;
+          return (_option$fieldNames$la = option === null || option === void 0 ? void 0 : option[fieldNames.label]) !== null && _option$fieldNames$la !== void 0 ? _option$fieldNames$la : value;
+        }), valueOptions.map(function (_ref4) {
+          var option = _ref4.option;
+          return option;
+        }));
+      }
       var value = toPathKey(valueCells);
       return {
         label: label,
@@ -52,5 +81,5 @@ export default (function (rawValues, options, fieldNames, multiple, displayRende
         disabled: (_valueOptions = valueOptions[valueOptions.length - 1]) === null || _valueOptions === void 0 ? void 0 : (_valueOptions$option = _valueOptions.option) === null || _valueOptions$option === void 0 ? void 0 : _valueOptions$option.disabled
       };
     });
-  }, [rawValues, options, fieldNames, displayRender, multiple]);
+  }, [rawValues, options, fieldNames, displayRender, multiple, labelInValueOption]);
 });

package/lib/CWCascader/rc-cascader/hooks/useEntities.js

@@ -4,14 +4,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-/*
- * @Author: andrew.qiao andrew.qiao@cloudwise.com
- * @Date: 2023-05-30 06:35:28
- * @LastEditors: andrew.qiao andrew.qiao@cloudwise.com
- * @LastEditTime: 2023-05-30 06:48:47
- * @FilePath: /change_01/aops_web_commons/packages/ui/components/Cascaders copy/rc-cascader/hooks/useEntities.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import * as React from 'react';
 import { convertDataToEntities } from 'rc-cascader/node_modules/rc-tree/lib/utils/treeUtil';
 import { VALUE_SPLIT } from '../utils/commonUtil';

package/lib/CWCascader/rc-cascader/utils/treeUtil.js

@@ -1,4 +1,4 @@
-import { SHOW_CHILD } from './commonUtil';
+import { SHOW_CHILD } from "./commonUtil";
 export function formatStrategyValues(pathKeys, getKeyPathEntities, showCheckedStrategy) {
   var valueSet = new Set(pathKeys);
   var keyPathEntities = getKeyPathEntities();
@@ -13,8 +13,11 @@ export function formatStrategyValues(pathKeys, getKeyPathEntities, showCheckedSt
 }
 export function toPathOptions(valueCells, options, fieldNames) {
   var stringMode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var labelInValue = arguments.length > 4 ? arguments[4] : undefined;
+  var labelInValueOption = arguments.length > 5 ? arguments[5] : undefined;
   var currentList = options;
   var valueOptions = [];
+  var isHit = true;
   var _loop = function _loop() {
     var _currentList, _currentList2, _foundOption$fieldNam;
     var valueCell = valueCells[i];
@@ -23,6 +26,9 @@ export function toPathOptions(valueCells, options, fieldNames) {
       return stringMode ? String(val) === String(valueCell) : val === valueCell;
     });
     var foundOption = foundIndex !== -1 ? (_currentList2 = currentList) === null || _currentList2 === void 0 ? void 0 : _currentList2[foundIndex] : null;
+    if (foundIndex === -1) {
+      isHit = false;
+    }
     valueOptions.push({
       value: (_foundOption$fieldNam = foundOption === null || foundOption === void 0 ? void 0 : foundOption[fieldNames.value]) !== null && _foundOption$fieldNam !== void 0 ? _foundOption$fieldNam : valueCell,
       index: foundIndex,
@@ -33,5 +39,43 @@ export function toPathOptions(valueCells, options, fieldNames) {
   for (var i = 0; i < valueCells.length; i += 1) {
     _loop();
   }
+  if (!isHit && labelInValue) {
+    var findOption = labelInValueOption.find(function (item) {
+      return item.value === valueCells;
+    });
+    if (findOption) {
+      valueOptions = [{
+        option: {
+          value: findOption.value,
+          label: findOption.label,
+          backEndQuery: true
+        }
+      }];
+    }
+  }
   return valueOptions;
+}
+export function toValueAndLabel(valueOptions) {
+  var triggerValues = [];
+  valueOptions.forEach(function (item) {
+    var isBackEndQuery = item.some(function (i) {
+      return i.backEndQuery;
+    });
+    if (isBackEndQuery) {
+      triggerValues.push({
+        label: item[0].label,
+        value: item[0].value
+      });
+    } else {
+      var value = [];
+      item.forEach(function (i) {
+        value.push(i.value);
+      });
+      triggerValues.push({
+        label: item[item.length - 1].label,
+        value: value
+      });
+    }
+  });
+  return triggerValues;
 }

package/lib/CWRangePicker/DropdownMenu/index.js

@@ -190,7 +190,7 @@ var DropdownMenu = function DropdownMenu(props) {
       "cw-dropdown-menu-more-wrapper-left": moreItemDropdownPosition === "left"
     }),
     getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentNode;
+      return triggerNode;
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classnames("cw-dropdown-menu-_item", "cw-dropdown-menu-item-more")

package/lib/CWRangePicker/DropdownMenu/index.less

@@ -26,7 +26,7 @@
         color: @text-color;
         font-weight: normal;
         font-size: @dropdown-font-size;
-        line-height: @dropdown-line-height;
+        line-height: 22px; // 整体32px的高度
 
         .cw-range-picker-menu-item-calendar {
             width: 14px;
@@ -46,19 +46,22 @@
     }
 
     .cw-dropdown-menu-item-more {
+        position: relative;
         justify-content: space-between;
-
+        overflow: visible;
     }
 
 
     .cw-dropdown-menu-more-wrapper {
         width: 384px;
-        top: 0 !important;
-        left: 362px !important;
+        top: auto !important;
+        bottom: -32px !important;
+        left: calc(100% + 2px) !important;
         box-shadow: @box-shadow-base;
 
         &.cw-dropdown-menu-more-wrapper-left {
-            left: -386px !important;
+            right: calc(100% + 2px) !important;
+            left: auto !important;
         }
     }
     .cw-dropdown-menu-history-outer-wrapper{
@@ -102,10 +105,11 @@
     .cw-dropdown-menu-history-more-wrapper {
         width: 384px;
         top: 0 !important;
-        left: 362px !important;
+        left: calc(100% + 2px) !important;
         box-shadow: @box-shadow-base;
         &.cw-dropdown-menu-history-more-wrapper-left {
-            left: -386px !important;
+            right: calc(100% + 2px) !important;
+            left: auto !important;
         }
       }
 }

package/lib/CWRangePicker/index.js

@@ -252,16 +252,23 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }, []);
   // 日期是否存在
-  var isHasDate = useMemo(function () {
-    // 不符合最近时间格式和没有日期数据返回false
-    var values = recordDateValue.value;
-    var _judgeType7 = judgeType(recordDateValue),
-      _judgeType8 = _slicedToArray(_judgeType7, 1),
-      isRule = _judgeType8[0];
-    values = funcValueChangeArrayValue(values);
-    if (!isRule && !values) return false;
-    return true;
-  }, [recordDateValue]);
+  var _useMemo = useMemo(function () {
+      // 不符合最近时间格式和没有日期数据返回false
+      var values = recordDateValue.value;
+      var _judgeType7 = judgeType(recordDateValue),
+        _judgeType8 = _slicedToArray(_judgeType7, 2),
+        isRule = _judgeType8[0],
+        captureUnit = _judgeType8[1];
+      values = funcValueChangeArrayValue(values);
+      if (isRule) {
+        values = getChangeUnitDate(captureUnit[0], captureUnit[1]);
+      }
+      if (!isRule && !values) return [false, undefined];
+      return [true, values];
+    }, [recordDateValue]),
+    _useMemo2 = _slicedToArray(_useMemo, 2),
+    isHasDate = _useMemo2[0],
+    _defaultValue = _useMemo2[1];
   // 重组数据源
   var regroupDataSource = useMemo(function () {
     if (exceedShowInMore) {
@@ -353,9 +360,9 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       e.target.select();
     }, 100);
   };
-  // 输入框失去焦点
-  var onInputBlur = function onInputBlur(e) {
-    isInputRef.current = false;
+  // 输入框按下Enter
+  var onPressEnter = function onPressEnter(e) {
+    onInputBlur();
   };
   // 外部获取ref停止自动刷新
   var onStop = function onStop() {
@@ -368,8 +375,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     var _refreshRef$current4, _refreshRef$current5;
     ((_refreshRef$current4 = refreshRef.current) === null || _refreshRef$current4 === void 0 ? void 0 : _refreshRef$current4.onAutoRefresh) && ((_refreshRef$current5 = refreshRef.current) === null || _refreshRef$current5 === void 0 ? void 0 : _refreshRef$current5.onAutoRefresh());
   };
-  // 输入框回车按下
-  var onPressEnter = function onPressEnter(e) {
+  // 输入框失去焦点
+  var onInputBlur = function onInputBlur(e) {
     if (!isInputRef.current) return;
     var _getUnit = getUnit(inputValue),
       isRule = _getUnit.isRule,
@@ -381,9 +388,7 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       }, inputValue);
       var isInvalidDate_ = isInvalidDate(returnValue.value);
       if (!isInvalidDate_) {
-        var _inputRef$current;
         // message.success(localeObj["fit-the-input-format"]);
-        (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.blur();
         _onChange(returnValue);
         setIsFocus(false);
         var _getHistoryInfo = getHistoryInfo(returnValue, historyList, locale, format),
@@ -406,11 +411,9 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       var _dateValue2 = finalDateOption.dateValue;
       var dateCount = getTruthDateCount(_dateValue2);
       if (dateCount === 2) {
-        var _inputRef$current2;
         var _returnValue = getCorrectValue({
           value: _dateValue2
         });
-        (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.blur();
         _onChange(_returnValue);
         setIsFocus(false);
         var _getHistoryInfo3 = getHistoryInfo(_returnValue, historyList, locale, format),
@@ -550,15 +553,8 @@ var CWRangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     },
-    defaultTimeOption: {
-      startTimeOption: moment("00:00:00", "HH:mm:ss"),
-      endTimeOption: moment("23:59:59", "HH:mm:ss")
-    },
-    defaultValue: [moment().subtract(1, "months").startOf("month"), moment().subtract(1, "months").startOf("month").add(1, "d").set({
-      "hour": 23,
-      "minute": 59,
-      "second": 59
-    })],
+    defaultValue: _defaultValue // 默认为当前已经选择的时间
+    ,
     showTime: {
       hideDisabledOptions: true
     }

package/lib/CWSelect/index.less

@@ -661,7 +661,7 @@
         font-weight: @select-item-selected-font-weight; // UI规范
         background-color: @select-selected-enable-bg; // UI规范
     }
-    &.cw-select-dropdown-multiple{
+    &.cw-select-dropdown-multiple.cw-select-dropdown-has-checkbox{
         .@{select-prefix-cls}-item-option.@{select-prefix-cls}-item-option-selected:not(.@{select-prefix-cls}-item-option-disabled){
             color: @text-color; // UI规范
             font-weight: 400; // UI规范

package/lib/Cascader/index.less

@@ -2,9 +2,27 @@
 
 .@{cascader-prefix-cls}-menus {
     position: static !important;
+
+    .@{cascader-prefix-cls}-menu {
+        .@{cascader-prefix-cls}-menu-item {
+
+            .@{cascader-prefix-cls}-menu-item-expand-icon,
+            .@{cascader-prefix-cls}-menu-item-loading-icon {
+                position: static;
+            }
+        }
+    }
 }
-.@{cascader-prefix-cls}.@{ant-prefix}-select{
-    .@{ant-prefix}-select-selection-overflow{
+
+.@{cascader-prefix-cls}.@{ant-prefix}-select {
+    .@{ant-prefix}-select-selection-overflow {
         flex: 0 1 auto;
+
+        .@{ant-prefix}-select-selection-overflow-item {
+
+            .@{ant-prefix}-select-selection-search {
+                margin: 0;
+            }
+        }
     }
 }

package/lib/DropdownDatePicker/DropdownMenu/MoreTimeList/index.js

@@ -0,0 +1,46 @@
+import _Row from "@chaoswise/ui/lib/Antd/Row";
+import _Col from "@chaoswise/ui/lib/Antd/Col";
+import "@chaoswise/ui/lib/TooltipText/index.less";
+import _TooltipText from "@chaoswise/ui/lib/TooltipText";
+import _ConfigProvider from "@chaoswise/ui/lib/ConfigProvider";
+import React from "react";
+import classnames from "classnames";
+import { getLocale } from "../../locale";
+import _ from "lodash";
+import "./index.less";
+var MoreTimeList = function MoreTimeList(props) {
+  var regroupDataSource = props.regroupDataSource,
+    recordDateValue = props.recordDateValue,
+    onClickItem = props.onClickItem;
+  var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
+    _ConfigProvider$useLo2 = _ConfigProvider$useLo.locale,
+    locale = _ConfigProvider$useLo2 === void 0 ? "zh" : _ConfigProvider$useLo2;
+  var localeObj = getLocale(locale);
+  // 点击Menu.Item中切换常规模式
+  var onClickMoreItem = function onClickMoreItem(item) {
+    onClickItem(item);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: classnames("cw-dropdown-date-picker-popup-more-content")
+  }, regroupDataSource.map(function (timeTypeItem, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: "8px 0",
+        borderBottom: regroupDataSource.length - 1 !== index ? "1px solid rgba(0,0,0,0.06)" : ""
+      },
+      key: timeTypeItem.type
+    }, /*#__PURE__*/React.createElement("h3", null, localeObj[timeTypeItem.type]), /*#__PURE__*/React.createElement(_Row, null, timeTypeItem.timeList.map(function (item) {
+      return /*#__PURE__*/React.createElement(_Col, {
+        key: item.key,
+        span: timeTypeItem.type === "absolute" || timeTypeItem.type == "unixTimestamp" ? 12 : 8,
+        className: classnames("more-col-item", {
+          "cw-dropdown-date-picker-dropdown-menu-item-selected": (recordDateValue === null || recordDateValue === void 0 ? void 0 : recordDateValue.key) === item.key
+        }),
+        onClick: function onClick() {
+          return onClickMoreItem(item);
+        }
+      }, /*#__PURE__*/React.createElement(_TooltipText, null, item.render ? item.render(item) : item.title));
+    })));
+  }));
+};
+export default MoreTimeList;

package/lib/DropdownDatePicker/DropdownMenu/MoreTimeList/index.less

@@ -0,0 +1,14 @@
+.cw-dropdown-date-picker-popup-more-content {
+    padding: 12px 16px 8px;
+    background-color: @component-background;
+    .more-col-item{
+        cursor: pointer;
+        color:@text-color-show;
+        &.cw-dropdown-date-picker-dropdown-menu-item-selected{
+            background: @select-selected-enable-bg;
+        }
+    }
+    .more-col-item:hover {
+        color: @primary-5;
+    }
+}