@zykj2024/much-library 1.2.3 → 1.2.4-beta.1

package/dist/McDateRangePro/comps/ShortcutItem.js

@@ -29,6 +29,11 @@ var ShortcutItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onActive = _ref.onActive,
     onInactive = _ref.onInactive,
     onSelected = _ref.onSelected;
+  useImperativeHandle(ref, function () {
+    return {
+      resetNs: resetNs
+    };
+  });
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     n1 = _useState2[0],
@@ -97,11 +102,6 @@ var ShortcutItem = /*#__PURE__*/forwardRef(function (_ref, ref) {
       setN2(n);
     }
   };
-  useImperativeHandle(ref, function () {
-    return {
-      resetNs: resetNs
-    };
-  });
   return /*#__PURE__*/_jsxs("div", {
     className: classNames('mc-date-range-pro__presets__item', active && 'mc-date-range-pro__presets__item--active'),
     onMouseEnter: activeHandle,

package/dist/McDateRangePro/index.css

@@ -75,7 +75,7 @@
   height: 100%;
 }
 .mc-date-range-pro__presets__types .ant-tabs-nav {
-  margin-bottom: 0;
+  margin-bottom: 0px;
   padding: 0 8px;
 }
 .mc-date-range-pro__presets__types .ant-tabs-nav .ant-tabs-tab {
@@ -128,7 +128,7 @@
   bottom: 0;
   left: 0;
   width: auto;
-  background: #fff !important;
+  background: #ffffff !important;
   border-color: transparent !important;
   -webkit-box-shadow: none !important;
   box-shadow: none !important;

package/dist/McDateRangePro/index.d.ts

@@ -2,7 +2,7 @@ import { RangePickerProps } from 'antd/es/date-picker';
 import { FC, ReactNode } from 'react';
 import './index.less';
 export declare const getDynamicLabel: (dynamicValue?: string) => any;
-export type McDateRangeProProps = Omit<RangePickerProps, 'value' | 'onChange' | 'open' | 'onOpenChange' | 'presets' | 'renderExtraFooter' | 'needConfirm'> & {
+type PropsType = Omit<RangePickerProps, 'value' | 'onChange' | 'open' | 'onOpenChange' | 'presets' | 'renderExtraFooter' | 'needConfirm'> & {
     /** 查询项的字段名（配合McContainer组件的查询功能使用） */
     name?: string;
     /** 查询项的标签文字（若未设置，样式为表单项形态） */
@@ -19,5 +19,5 @@ export type McDateRangeProProps = Omit<RangePickerProps, 'value' | 'onChange' |
     onChange?: (value?: string | string[], dateStrings?: string[]) => void;
     ref?: any;
 };
-declare const McDateRangePro: FC<McDateRangeProProps>;
+declare const McDateRangePro: FC<PropsType>;
 export default McDateRangePro;

package/dist/McDateRangePro/index.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["style", "className", "label", "valueFormat", "dateType", "dynamic", "showTime", "disabled", "value", "onChange"];
+var _excluded = ["style", "className", "label", "valueFormat", "dateType", "dynamic", "showTime", "disabled", "value", "onChange", "needConfirm"];
 import { useEmotionCss } from '@ant-design/use-emotion-css';
 import { DatePicker, Tabs } from 'antd';
 import classNames from 'classnames';
@@ -72,6 +72,7 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     disabled = props.disabled,
     value = props.value,
     onChange = props.onChange,
+    needConfirm = props.needConfirm,
     rest = _objectWithoutProperties(props, _excluded);
   var _valueFormat = valueFormat || (showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
   var _dynamic = dateType && dynamic;
@@ -133,12 +134,10 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     return getDynamicLabel(dynamicValue);
   }, [dynamicValue]);
 
-  // 异常数据抛出静态日期
-  var changeToStatic = function changeToStatic(v) {
-    return onChange === null || onChange === void 0 ? void 0 : onChange(v.map(function (i) {
-      return i === null || i === void 0 ? void 0 : i.format(_valueFormat);
-    }));
-  };
+  // 监听value值变化，处理回显逻辑
+  useEffect(function () {
+    echo();
+  }, [value]);
 
   // 回显的方法
   var echo = function echo() {
@@ -239,6 +238,13 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     newValue.current = _v;
   };
 
+  // 异常数据抛出静态日期
+  var changeToStatic = function changeToStatic(v) {
+    return onChange === null || onChange === void 0 ? void 0 : onChange(v.map(function (i) {
+      return i === null || i === void 0 ? void 0 : i.format(_valueFormat);
+    }));
+  };
+
   // 日期范围变化事件
   var change = function change(dates) {
     set_value(dates);
@@ -248,25 +254,23 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     dates === null && (onChange === null || onChange === void 0 ? void 0 : onChange(undefined));
   };
 
-  // 快捷项取消激活事件
-  var inActiveHandle = function inActiveHandle() {
-    setInActiveArea(false);
-    setActiveCode(newType.current === 'dynamic' ? oldActiveCode.current : undefined);
-    props.hasOwnProperty('value') && set_value(oldValue.current);
-  };
-
-  // 初始化监听日历选择面板的鼠标移入移出事件
-  var initMouseEnterLeave = function initMouseEnterLeave() {
-    if (isInit.current) return;
-    setTimeout(function () {
-      var panelsEl = document.querySelector('.mc-date-range-pro__popup .ant-picker-panels');
-      panelsEl === null || panelsEl === void 0 || panelsEl.addEventListener('mouseenter', function () {
-        setInActiveArea(true);
-        setActiveCode(undefined);
+  // 日历面板显隐事件
+  var openChange = function openChange(open) {
+    setOpen(open);
+    initMouseEnterLeave();
+    if (open) {
+      // 显示时初始化左侧快捷栏
+      setType(oldType.current);
+      newType.current = oldType.current;
+      setActiveCode(oldActiveCode.current);
+      oldType.current === 'dynamic' && setTimeout(function () {
+        var _shortcutItemRefs$cur;
+        (_shortcutItemRefs$cur = shortcutItemRefs.current[oldActiveCode.current]) === null || _shortcutItemRefs$cur === void 0 || (_shortcutItemRefs$cur = _shortcutItemRefs$cur.current) === null || _shortcutItemRefs$cur === void 0 || _shortcutItemRefs$cur.resetNs(value);
       });
-      panelsEl === null || panelsEl === void 0 || panelsEl.addEventListener('mouseleave', inActiveHandle);
-      isInit.current = true;
-    });
+    } else {
+      // 隐藏时触发改变值的方法
+      changeHandle(newValue.current);
+    }
   };
 
   // 改变值的方法
@@ -293,25 +297,6 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   };
 
-  // 日历面板显隐事件
-  var openChange = function openChange(open) {
-    setOpen(open);
-    initMouseEnterLeave();
-    if (open) {
-      // 显示时初始化左侧快捷栏
-      setType(oldType.current);
-      newType.current = oldType.current;
-      setActiveCode(oldActiveCode.current);
-      oldType.current === 'dynamic' && setTimeout(function () {
-        var _shortcutItemRefs$cur;
-        (_shortcutItemRefs$cur = shortcutItemRefs.current[oldActiveCode.current]) === null || _shortcutItemRefs$cur === void 0 || (_shortcutItemRefs$cur = _shortcutItemRefs$cur.current) === null || _shortcutItemRefs$cur === void 0 || _shortcutItemRefs$cur.resetNs(value);
-      });
-    } else {
-      // 隐藏时触发改变值的方法
-      changeHandle(newValue.current);
-    }
-  };
-
   // 快捷项激活事件
   var activeHandle = function activeHandle(code, dates) {
     setInActiveArea(true);
@@ -321,6 +306,13 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     }));
   };
 
+  // 快捷项取消激活事件
+  var inActiveHandle = function inActiveHandle() {
+    setInActiveArea(false);
+    setActiveCode(newType.current === 'dynamic' ? oldActiveCode.current : undefined);
+    props.hasOwnProperty('value') && set_value(oldValue.current);
+  };
+
   // 快捷项选择事件
   var selectHandle = function selectHandle(dates) {
     var newValue = dates.map(function (v, i) {
@@ -332,10 +324,19 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
     setOpen(false);
   };
 
-  // 监听value值变化，处理回显逻辑
-  useEffect(function () {
-    echo();
-  }, [value]);
+  // 初始化监听日历选择面板的鼠标移入移出事件
+  var initMouseEnterLeave = function initMouseEnterLeave() {
+    if (isInit.current) return;
+    setTimeout(function () {
+      var panelsEl = document.querySelector('.mc-date-range-pro__popup .ant-picker-panels');
+      panelsEl === null || panelsEl === void 0 || panelsEl.addEventListener('mouseenter', function () {
+        setInActiveArea(true);
+        setActiveCode(undefined);
+      });
+      panelsEl === null || panelsEl === void 0 || panelsEl.addEventListener('mouseleave', inActiveHandle);
+      isInit.current = true;
+    });
+  };
   return /*#__PURE__*/_jsxs("div", {
     style: style,
     className: "".concat(classNames('mc-date-range-pro', className)),
@@ -349,11 +350,7 @@ var McDateRangePro = /*#__PURE__*/forwardRef(function (props, ref) {
         paddingLeft: paddingLeft
       },
       className: "mc-date-range-pro__content",
-      classNames: {
-        popup: {
-          root: classNames('mc-date-range-pro__popup', showTime && 'mc-date-range-pro__popup--time', dateType && 'mc-date-range-pro__popup--preset', rootClassName)
-        }
-      },
+      popupClassName: classNames('mc-date-range-pro__popup', showTime && 'mc-date-range-pro__popup--time', dateType && 'mc-date-range-pro__popup--preset', rootClassName),
       showTime: showTime,
       disabled: disabled,
       minDate: dateType === 'future' ? dayjs() : undefined,

package/dist/McListSelect/comps/SelectedItem.js

@@ -51,8 +51,8 @@ var SelectedItem = function SelectedItem(_ref) {
       type: "text",
       icon: /*#__PURE__*/_jsx(MenuOutlined, {})
     })), /*#__PURE__*/_jsx(McEllipsis, {
+      className: "mc-list-select-panel__selected-item__text",
       style: {
-        margin: '0 auto 0 4px',
         color: getColor()
       },
       text: label,

package/dist/McListSelect/index.css

@@ -243,17 +243,23 @@
 .mc-list-select-panel__selected-item__drag {
   -ms-flex-negative: 0;
   flex-shrink: 0;
-  margin-left: -4px;
+  margin: 0 4px 0 -4px;
   color: #8c8c8c;
 }
 .mc-list-select-panel__selected-item__drag:hover {
   background: rgba(38, 38, 38, 0.15) !important;
   cursor: move;
 }
+.mc-list-select-panel__selected-item__text {
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  margin-right: auto;
+}
 .mc-list-select-panel__selected-item__remove {
   -ms-flex-negative: 0;
   flex-shrink: 0;
-  margin-left: 8px;
+  margin-left: 4px;
   color: #8c8c8c;
 }
 .mc-list-select-panel__selected-item__remove:hover {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykj2024/much-library",
-  "version": "1.2.3",
+  "version": "1.2.4-beta.1",
   "description": "react library",
   "license": "MIT",
   "module": "dist/index.js",