@chaoswise/ui 3.0.22 → 3.0.23

package/lib/Alert/index.js

@@ -1,2 +1,48 @@
-import Alert from '../Antd5/alert';
-export default Alert;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["isPageTop", "className"];
+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 _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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+import React, { forwardRef } from "react";
+import Alert from "../Antd5/alert";
+import { ExclamationCircleFilled } from "@ant-design/icons";
+import PropTypes from "prop-types";
+import classnames from "classnames";
+import useConfigContext from "../useConfigContext";
+import { cloneComProps } from "../utils";
+import useStyle from "./index.style";
+var CWAlert = /*#__PURE__*/forwardRef(function (props, ref) {
+  var isPageTop = props.isPageTop,
+    className = props.className,
+    resProps = _objectWithoutProperties(props, _excluded);
+  var _useConfigContext = useConfigContext(),
+    getPrefixCls = _useConfigContext.getPrefixCls;
+  var prefixCls = getPrefixCls("alert");
+  var _useStyle = useStyle(prefixCls),
+    _useStyle2 = _slicedToArray(_useStyle, 3),
+    wrapCSSVar = _useStyle2[0],
+    hashId = _useStyle2[1],
+    cssVarCls = _useStyle2[2];
+  return wrapCSSVar(/*#__PURE__*/React.createElement(Alert, _extends({
+    ref: ref,
+    className: classnames("".concat(prefixCls, "-wrapper"), _defineProperty({}, "".concat(prefixCls, "-page-top"), isPageTop && !resProps.banner), className),
+    icon: resProps.type === "error" && /*#__PURE__*/React.createElement(ExclamationCircleFilled, null)
+  }, resProps)));
+});
+CWAlert.propTypes = {
+  /**
+   * 样式状态和页面内一致，内容padding有变化。与banner的区别是：banner不带边框，isPageTop带边框
+   */
+  isPageTop: PropTypes.bool
+};
+cloneComProps(Alert, CWAlert);
+export default CWAlert;

package/lib/Alert/index.style.js

@@ -0,0 +1,36 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { genStyleHooks } from "../Antd5/theme/internal";
+var genCustomAlertStyle = function genCustomAlertStyle(token) {
+  var prefixCls = token.antCls;
+  var componentCls = "".concat(prefixCls, "-alert");
+  return _defineProperty({}, "".concat(componentCls).concat(componentCls, "-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+    fontSize: '14px',
+    lineHeight: "22px"
+  }, "&".concat(componentCls, "-banner"), {
+    padding: "9px 16px" // 无边框
+  }), "&".concat(componentCls, "-page-top"), {
+    padding: "8px 15px" // 有边框
+  }), "".concat(componentCls, "-content"), _defineProperty({}, "".concat(componentCls, "-message,").concat(componentCls, "-description"), {
+    lineHeight: "22px"
+  })), "".concat(componentCls, "-icon"), {
+    alignSelf: "flex-start",
+    height: "22px",
+    lineHeight: "22px"
+  }), "".concat(componentCls, "-close-icon"), _defineProperty({
+    alignSelf: "flex-start",
+    height: "22px",
+    lineHeight: "22px",
+    fontSize: "16px"
+  }, "".concat(token.iconCls, "-close"), {
+    color: token.colorTextSecondary
+  })));
+};
+// ============================== Export ==============================
+export default genStyleHooks("CWAlert", function (token) {
+  return [
+  //
+  genCustomAlertStyle(token)];
+});

package/lib/Button/index.style.js

@@ -3,7 +3,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { genStyleHooks } from "../Antd5/theme/internal";
-import { prepareToken } from "../Antd5/button/style/token";
 var prepareComponentToken = function prepareComponentToken(token) {
   return {
     btnMainPadding: token.Button.btnMainPadding
@@ -36,6 +35,5 @@ var genCustomButtonStyle = function genCustomButtonStyle(token) {
 };
 // ============================== Export ==============================
 export default genStyleHooks("CWButton", function (token) {
-  var buttonToken = prepareToken(token);
-  return [genCustomButtonStyle(buttonToken)];
+  return [genCustomButtonStyle(token)];
 }, prepareComponentToken);

package/lib/ConfigProvider/customTheme.js

@@ -146,8 +146,9 @@ export default {
     Alert: {
       // 组件内部需要调整符合UI规范的样式
       // 1.自定义样式调整
-      defaultPadding: "4px 12px",
-      lineHeight: 1.5714285,
+      defaultPadding: "4px 15px",
+      withDescriptionIconSize: 14,
+      withDescriptionPadding: "4px 15px",
       fontSize: 14
     },
     Notification: {

package/lib/QuickTransfer/index.js

@@ -231,11 +231,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     // 设置数据源
     setData(dataSource);
-    if (type === "list") {
-      if (targetKeys) {
-        setListCheckedStyle(targetKeys, dataSource);
-      }
-    }
   }, [dataSource]);
   useEffect(function () {
     //传入的当前选中的key
@@ -261,6 +256,21 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
           return !i.disabled;
         }));
         setCheckValue(finalCheckValue);
+        var newData = [];
+        var listCheckedKeys_ = [];
+        dataSource.forEach(function (item, index) {
+          if (isMath(item.title, saveSearchValueLeft)) {
+            newData.push(dataSource[index]);
+          }
+        });
+        listCheckedKeys_ = newData.filter(function (item) {
+          return finalCheckValue.find(function (i) {
+            return i.key == item.key;
+          });
+        }).map(function (item) {
+          return item.key;
+        });
+        setListCheckedStyle(listCheckedKeys_, newData);
       }
       //回显table
       if (type === "table") {
@@ -276,7 +286,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
     }
-  }, [targetKeys, dataSource]);
+  }, [targetKeys, dataSource, saveSearchValueLeft]);
   //触发前端自定义搜索
   useEffect(function () {
     if (searchValueLeft !== undefined) {

package/lib/RangePicker/components/ExtraQuickSelect.js

@@ -6,16 +6,13 @@ export default function ExtraQuickSelect(props) {
     ranges = _props$ranges === void 0 ? {} : _props$ranges,
     quickClick = props.quickClick,
     setDateValue = props.setDateValue,
-    setStartTimeParams = props.setStartTimeParams,
-    setEndTimeParams = props.setEndTimeParams,
     recordBeforeDateRef = props.recordBeforeDateRef,
     setAllDateTimeValue = props.setAllDateTimeValue,
     recordQuickActiveKey = props.recordQuickActiveKey;
   var rangesToArray = Object.entries(ranges);
   var _onMouseEnter = function onMouseEnter(startDate, endDate) {
     setDateValue([startDate, endDate]);
-    setStartTimeParams(startDate);
-    setEndTimeParams(endDate);
+    setAllDateTimeValue([startDate, endDate]);
   };
   var onMouseLeave = function onMouseLeave() {
     setDateValue(recordBeforeDateRef.current);

package/lib/RangePicker/index.js

@@ -49,6 +49,18 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     quickSelect = _props$quickSelect === void 0 ? false : _props$quickSelect,
     dataSource = props.dataSource,
     rest = _objectWithoutProperties(props, _excluded);
+  var _defaultTimeOption$st = defaultTimeOption.startTimeOption,
+    startTimeOption = _defaultTimeOption$st === void 0 ? dayjs().set("hour", 0).set("minute", 0).set("second", 0) : _defaultTimeOption$st,
+    _defaultTimeOption$en = defaultTimeOption.endTimeOption,
+    endTimeOption = _defaultTimeOption$en === void 0 ? dayjs().set("hour", 0).set("minute", 0).set("second", 0) : _defaultTimeOption$en;
+  var timeFormat = useRef("HH:mm:ss"); //timepicker默认的时间格式
+  var preConfirm = useRef(null); //记录上一次点击确定的值，包括初始传进来的值
+  var formatRef = useRef(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
+  var rangePickerRef = useRef(null); // 绑定在RangePicker组件上的Ref
+  var recordBeforeDateRef = useRef(null); // 取消悬停快捷选择需要恢复的日期
+  var recordQuickActiveKey = useRef(null); // 当前快捷选择活跃项
+  var isBtnRef = useRef(false); // 是否相当于点击了确定按钮
+  var wrapperRef = useRef(null);
   var _useState = useState(defaultValue),
     _useState2 = _slicedToArray(_useState, 2),
     dateValue = _useState2[0],
@@ -57,22 +69,14 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1]; //控制日期面板的显示隐藏
-  var _useState5 = useState(null),
+  var _useState5 = useState(startTimeOption),
     _useState6 = _slicedToArray(_useState5, 2),
     startTimeParams = _useState6[0],
     setStartTimeParams = _useState6[1]; //开始时间的参数
-  var _useState7 = useState(null),
+  var _useState7 = useState(endTimeOption),
     _useState8 = _slicedToArray(_useState7, 2),
     endTimeParams = _useState8[0],
     setEndTimeParams = _useState8[1]; //结束时间的参数
-  var timeFormat = useRef("HH:mm:ss"); //timepicker默认的时间格式
-  var preConfirm = useRef(null); //记录上一次点击确定的值，包括初始传进来的值
-  var formatRef = useRef(showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD");
-  var rangePickerRef = useRef(null); // 绑定在RangePicker组件上的Ref
-  var recordBeforeDateRef = useRef(null); // 取消悬停快捷选择需要恢复的日期
-  var recordQuickActiveKey = useRef(null); // 当前快捷选择活跃项
-  var isBtnRef = useRef(false); // 是否相当于点击了确定按钮
-  var wrapperRef = useRef(null);
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -81,10 +85,6 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     wrapCSSVar = _useStyle2[0],
     hashId = _useStyle2[1],
     cssVarCls = _useStyle2[2];
-  var _defaultTimeOption$st = defaultTimeOption.startTimeOption,
-    startTimeOption = _defaultTimeOption$st === void 0 ? formatStringToDate("00:00:00", timeFormat.current) : _defaultTimeOption$st,
-    _defaultTimeOption$en = defaultTimeOption.endTimeOption,
-    endTimeOption = _defaultTimeOption$en === void 0 ? formatStringToDate("00:00:00", timeFormat.current) : _defaultTimeOption$en;
   //监听外部控制面板的显示隐藏状态
   useEffect(function () {
     if ("open" in props) {
@@ -104,12 +104,12 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
       setDateValue(value);
       recordBeforeDateRef.current = value;
       preConfirm.current = value;
-      setAllDateTimeValue(value);
+      setAllDateTimeValue(Array.isArray(value) && !value.length ? null : value);
     } else if ("defaultValue" in props) {
       setDateValue(defaultValue);
       recordBeforeDateRef.current = defaultValue;
       preConfirm.current = defaultValue;
-      setAllDateTimeValue(defaultValue);
+      setAllDateTimeValue(Array.isArray(defaultValue) && !defaultValue.length ? null : defaultValue);
     }
   }, [defaultValue, value]);
   var format = useMemo(function () {
@@ -128,7 +128,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [visible]);
   //点击取消触发的事件
   var handleCancel = function handleCancel() {
-    if (preConfirm.current && preConfirm.current instanceof Array) {
+    if (Array.isArray(preConfirm.current) && preConfirm.current.length) {
       setStartTimeParams(preConfirm.current[0]);
       setEndTimeParams(preConfirm.current[1]);
       setDateValue(preConfirm.current);
@@ -161,8 +161,9 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   var setAllDateTimeValue = function setAllDateTimeValue(value) {
     if (!showTime) return;
     if (value && value.length === 2) {
-      setStartTimeParams(value[0]);
-      setEndTimeParams(value[1]);
+      // 此次转化为修复日期组件的回显问题：0时区
+      setStartTimeParams(value[0].set("hour", value[0].get("hour")).set("minute", value[0].get("minute")).set("second", value[0].get("second")));
+      setEndTimeParams(value[1].set("hour", value[1].get("hour")).set("minute", value[1].get("minute")).set("second", value[1].get("second")));
     } else {
       setStartTimeParams(startTimeOption);
       setEndTimeParams(endTimeOption);
@@ -171,6 +172,8 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   // TimePicker开始时间改变触发的事件
   var changeStartTime = function changeStartTime(newStartTime) {
     if (!newStartTime) return;
+    // 此次转化为修复日期组件的回显问题：0时区
+    newStartTime = newStartTime.set("hour", newStartTime.get("hour")).set("minute", newStartTime.get("minute")).set("second", newStartTime.get("second"));
     setStartTimeParams(newStartTime);
     isBtnRef.current = false;
     if (Array.isArray(dateValue)) {
@@ -189,6 +192,8 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   // TimePicker结束时间改变触发的事件
   var changeEndTime = function changeEndTime(newEndTime) {
     if (!newEndTime) return;
+    // 此次转化为修复日期组件的回显问题：0时区
+    newEndTime = newEndTime.set("hour", newEndTime.get("hour")).set("minute", newEndTime.get("minute")).set("second", newEndTime.get("second"));
     setEndTimeParams(newEndTime);
     isBtnRef.current = false;
     if (Array.isArray(dateValue)) {
@@ -261,7 +266,6 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   //面板值改变触发的回调 主要用于处理时间
   var handleCalendarChange = function handleCalendarChange(calendarDate, dateStrings, info) {
-    // rangePickerRef.current?.focus({index: info.range === "start" ? 1 : 0})
     if (!calendarDate) {
       _onCalendarChange(calendarDate, dateStrings, info);
       setAllDateTimeValue(calendarDate);
@@ -317,9 +321,6 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         if (dayjs(startDateTime).isAfter(endDateTime)) {
           endTimeStr = leftTimeStr;
           endDateTime = startDateTime;
-          if (startTimeParams) {
-            setEndTimeParams(startTimeParams);
-          }
         }
         setAllDateTimeValue([startDateTime, endDateTime]);
         setDateValue([startDateTime, endDateTime]);
@@ -414,6 +415,19 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     _useMemo2 = _slicedToArray(_useMemo, 2),
     hasQuickSelect = _useMemo2[0],
     _ranges = _useMemo2[1];
+  var _dateValue = useMemo(function () {
+    // 此次转化为修复日期组件的回显问题：0时区
+    var _dateValue = dateValue;
+    if (Array.isArray(_dateValue)) {
+      if (_dateValue[0]) {
+        _dateValue[0] = dayjs(_dateValue[0]);
+      }
+      if (_dateValue[1]) {
+        _dateValue[1] = dayjs(_dateValue[1]);
+      }
+    }
+    return _dateValue;
+  }, [dateValue]);
   return wrapCSSVar(/*#__PURE__*/React.createElement("div", {
     className: classnames(hashId, cssVarCls, "cw-new-range-picker-wrapper"),
     ref: wrapperRef
@@ -428,8 +442,6 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
         ranges: _ranges,
         quickClick: quickClick,
         setDateValue: setDateValue,
-        setStartTimeParams: setStartTimeParams,
-        setEndTimeParams: setEndTimeParams,
         recordBeforeDateRef: recordBeforeDateRef,
         setAllDateTimeValue: setAllDateTimeValue,
         recordQuickActiveKey: recordQuickActiveKey
@@ -445,7 +457,7 @@ var _RangePicker = /*#__PURE__*/forwardRef(function (props, ref) {
     format: format,
     onChange: handleDateChange,
     onCalendarChange: handleCalendarChange,
-    value: dateValue,
+    value: _dateValue,
     className: classnames(className),
     ref: rangePickerRef,
     inputReadOnly: true,

package/lib/RangePicker/utils/generate/dayjs.js

@@ -31,7 +31,7 @@ export function range(start, end) {
 
 // 格式化时间为字符串
 export function formatDateToString(dateTime, format) {
-  return dayjs(dateTime).format(format);
+  return originalDayjs.isDayjs(dateTime) ? dateTime.format(format) : dayjs(dateTime).format(format);
 }
 
 // 格式化时间为字符串，并将其切割date time的一个数组

package/package.json

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