@para-ui/core 4.0.24 → 4.0.26

package/AutoTips/index.js

@@ -66,7 +66,7 @@ const AutoTipsMultiline = props => {
           addWidth = offsetWidth; // 重置宽度
           // 最后一个字
           if (i === singleWordRefs.current.length - 1) {
-            if (lineArr.length < constData.current.line - 1) {
+            if (lineArr.length < constData.current.line) {
               // 没超出行数
               lineArr.push(children.slice(linePos, children.length));
             } else {
@@ -226,20 +226,20 @@ const AutoTips = props => {
     if (className) str += " ".concat(className);
     return str;
   };
-  return jsx("div", Object.assign({
-    ref: tipsElm,
-    className: handClass(),
-    onMouseOver: mouseHover,
-    style: style
+  return jsx(Tooltip, Object.assign({
+    arrow: arrow,
+    title: tTips,
+    placement: placement,
+    interactive: interactive,
+    boundariesElement: 'viewport',
+    overlayClassName: "".concat($prefixCls, "-auto-tips-tooltip"),
+    maxWidth: tipMaxWidth
   }, {
-    children: jsx(Tooltip, Object.assign({
-      arrow: arrow,
-      title: tTips,
-      placement: placement,
-      interactive: interactive,
-      boundariesElement: 'viewport',
-      overlayClassName: "".concat($prefixCls, "-auto-tips-tooltip"),
-      maxWidth: tipMaxWidth
+    children: jsx("div", Object.assign({
+      ref: tipsElm,
+      className: handClass(),
+      onMouseOver: mouseHover,
+      style: style
     }, {
       children: jsx("div", Object.assign({
         className: "auto-tips-content",

package/Cascader/index.js

@@ -1,5 +1,5 @@
-import { C as Cascader } from '../_verture/index-2a6adf4d.js';
-export { C as default } from '../_verture/index-2a6adf4d.js';
+import { C as Cascader } from '../_verture/index-5f205d87.js';
+export { C as default } from '../_verture/index-5f205d87.js';
 import '../_verture/tslib.es6-55ed4bd2.js';
 import 'react/jsx-runtime';
 import '../_verture/Portal-5bd49559.js';

package/ComboSelect/index.js

@@ -6,7 +6,7 @@ import SearchIcon from '@para-ui/icons/Search';
 import CloseIcon from '@para-ui/icons/Close';
 import CloseCircleF from '@para-ui/icons/CloseCircleF';
 import Table from '../Table/index.js';
-import { T as Tree } from '../_verture/index-bbe5660a.js';
+import { T as Tree } from '../_verture/index-93662604.js';
 import { Button } from '../Button/index.js';
 import { D as Dropdown } from '../_verture/index-bde7aabe.js';
 import { Popover } from '../Popover/index.js';

package/CycleSelector/index.d.ts

@@ -9,7 +9,7 @@ import { HelperTextDetailProps } from "../HelperText";
 import './index.scss';
 export interface CycleSelectorValueProps {
     /** 开始时间 */
-    startTime?: string;
+    startTime?: string | number;
     /** 周期类型:0：不重复，1：每天重复，2：每周重复，3：每月重复，4：每年重复，5：自定义 */
     cycleType?: number;
     /** 周期频率 */
@@ -25,7 +25,7 @@ export interface CycleSelectorValueProps {
     /** 当结束方式是限定次数，限定的重复执行次数 */
     limitNum?: number;
     /** 当结束方式是限定时间，结束执行的日期 */
-    endTime?: string;
+    endTime?: string | number;
 }
 declare type DisabledTimes = {
     disabledHours?: () => number[];
@@ -33,16 +33,33 @@ declare type DisabledTimes = {
     disabledSeconds?: (hour: number, minute: number) => number[];
 };
 declare type DisabledTime<DateType> = (date: DateType | null) => DisabledTimes;
+export interface CycleSelectorRefProps {
+    getTipText: (val?: CycleSelectorValueProps) => React.ReactNode;
+}
 export interface CycleSelectorProps extends HelperTextDetailProps {
     className?: string;
     style?: React.CSSProperties;
     value: CycleSelectorValueProps;
+    /** 时间格式
+     * undefined：YYYY-MM-DD HH:mm:ss
+     * zone: YYYY-MM-DD[T]HH:mm:ss[Z]
+     * stamp: 时间戳
+     * */
+    timeType?: 'zone' | 'stamp';
+    /** 提示文本自定义渲染 */
+    tipRender?: () => React.ReactNode;
+    /** 获取组件内部方法 */
+    cRef?: React.MutableRefObject<CycleSelectorRefProps>;
     /** 禁用 */
     disabled?: boolean;
     /** 禁用日期 */
     disabledDate?: (date: Dayjs) => boolean;
     /** 禁用时间 */
     disabledTime?: DisabledTime<Dayjs>;
+    /** 显示弹窗
+     * 不传：组件里面控制
+     * */
+    showPopover?: boolean;
     onChange: (val: CycleSelectorValueProps) => void;
 }
 declare const CycleSelector: FunctionComponent<CycleSelectorProps>;

package/CycleSelector/index.js

@@ -1,5 +1,5 @@
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
-import React__default, { useState, useRef, useEffect } from 'react';
+import React__default, { useState, useRef, useEffect, useImperativeHandle } from 'react';
 import clsx from 'clsx';
 import dayjs from 'dayjs';
 import CloseIcon from '@para-ui/icons/Close';
@@ -235,6 +235,10 @@ const CycleSelector = props => {
     helperText,
     disabledDate,
     disabledTime,
+    timeType,
+    tipRender,
+    showPopover,
+    cRef,
     onChange
   } = props;
   const {
@@ -300,10 +304,43 @@ const CycleSelector = props => {
   useEffect(() => {
     const valC = value ? Object.assign({}, value) : {};
     if (!valC.startTime) valC.cycleType = 0;
+    if (valC.startTime) valC.startTime = handleTimeEnter(valC.startTime, 'YYYY-MM-DD HH:mm');
+    if (valC.endTime) valC.endTime = handleTimeEnter(valC.endTime, 'YYYY-MM-DD');
     setValueCom(valC);
     constData.current.valueCom = valC;
     handleSelectData();
   }, [value, language]);
+  useEffect(() => {
+    if (showPopover !== undefined) {
+      if (showPopover) handlePopoverDefaultValue();
+    }
+  }, [showPopover]);
+  useImperativeHandle(cRef, () => {
+    return {
+      getTipText: val => {
+        return handleText(val, true);
+      }
+    };
+  });
+  // 出参
+  const handleTimeOut = val => {
+    if (!val) return '';
+    if (timeType === 'zone') {
+      // 时区
+      return new Date(val).toISOString();
+    }
+    if (timeType === 'stamp') {
+      // 时间戳
+      return new Date(val).getTime();
+    }
+    return val;
+  };
+  // 入参
+  const handleTimeEnter = (val, format) => {
+    if (!val) return '';
+    const timeVal = new Date(val).toLocaleString();
+    return dayjs(timeVal).format(format);
+  };
   // 处理下拉框选择
   const handleSelectData = () => {
     var _a, _b;
@@ -434,7 +471,10 @@ const CycleSelector = props => {
       delete constData.current.valueCom.limitNum;
       delete constData.current.valueCom.executionDay;
     }
-    onChange(cancel ? Object.assign({}, constData.current.value) : Object.assign({}, constData.current.valueCom));
+    const val = cancel ? Object.assign({}, constData.current.value) : Object.assign({}, constData.current.valueCom);
+    if (val.startTime) val.startTime = handleTimeOut(val.startTime);
+    if (val.endTime) val.endTime = handleTimeOut(val.endTime);
+    onChange(val);
   };
   const onVisibleChange = bol => {
     if (!bol) cancelPopover();
@@ -444,16 +484,18 @@ const CycleSelector = props => {
     handlePopoverDefaultValue();
   };
   // 自定义周期文案提示
-  const handleText = () => {
+  const handleText = (val, bol) => {
     var _a, _b, _c, _d, _e;
-    if ((value === null || value === void 0 ? void 0 : value.cycleType) !== 5 || error) return;
+    const handValue = val ? val : value;
+    if ((handValue === null || handValue === void 0 ? void 0 : handValue.cycleType) !== 5 || error) return;
     const text = [];
-    const everyText1 = intl('every') + value.frequency + intl(value.frequencyUnit);
+    const everyText1 = intl('every') + handValue.frequency + intl(handValue.frequencyUnit);
     const timeText = (_a = constData.current.timeDetail) === null || _a === void 0 ? void 0 : _a.hm;
-    if (value.frequencyUnit === 'week') {
+    if (tipRender) return tipRender();
+    if (handValue.frequencyUnit === 'week') {
       const arr = [];
       let str;
-      (_b = value.executionDay) === null || _b === void 0 ? void 0 : _b.split(',').forEach(item => {
+      (_b = handValue.executionDay) === null || _b === void 0 ? void 0 : _b.split(',').forEach(item => {
         let index = Number(item) - 1;
         if (index === 0) {
           index = 7;
@@ -467,12 +509,12 @@ const CycleSelector = props => {
         every: everyText1 + arr.join('、'),
         time: timeText
       }));
-    } else if (value.frequencyUnit === 'month') {
+    } else if (handValue.frequencyUnit === 'month') {
       text.push(intl('text1', {
         every: everyText1,
-        time: ((_c = constData.current.monthCycleTypeListMap) === null || _c === void 0 ? void 0 : _c[value.monthCycleType]) + timeText
+        time: ((_c = constData.current.monthCycleTypeListMap) === null || _c === void 0 ? void 0 : _c[handValue.monthCycleType]) + timeText
       }));
-    } else if (value.frequencyUnit === 'day') {
+    } else if (handValue.frequencyUnit === 'day') {
       text.push(intl('text1', {
         every: everyText1,
         time: timeText
@@ -487,16 +529,17 @@ const CycleSelector = props => {
         time: str.join('') + " " + timeText
       }));
     }
-    if (value.endType === 2) {
+    if (handValue.endType === 2) {
       text.push(intl('text2', {
-        limitNum: value.limitNum
+        limitNum: handValue.limitNum
       }));
     }
-    if (value.endType === 1) {
+    if (handValue.endType === 1) {
       text.push(intl('text3', {
-        date: value.endTime
+        date: handleTimeEnter(handValue.endTime, 'YYYY-MM-DD')
       }));
     }
+    if (bol) return text;
     return jsxs("p", Object.assign({
       className: 'text-tip'
     }, {
@@ -748,13 +791,19 @@ const CycleSelector = props => {
         }
     }*/
   };
+  const handleOpen = () => {
+    if (showPopover !== undefined) {
+      return showPopover;
+    }
+    return open;
+  };
   return jsxs("div", Object.assign({
     className: clsx("".concat($prefixCls, "-cycle-selector"), className),
     style: style
   }, {
     children: [jsx(Popover, Object.assign({
       content: handleContent(),
-      open: open,
+      open: handleOpen(),
       placement: "bottomRight",
       overlayClassName: "".concat($prefixCls, "-cycle-selector-popover"),
       onVisibleChange: onVisibleChange

package/DynamicMultiBox/index.js

@@ -70,7 +70,7 @@ import 'rc-pagination';
 import '@para-ui/icons/Right';
 import '@para-ui/icons/DoubleLeft';
 import '@para-ui/icons/DoubleRight';
-import '../_verture/index-bbe5660a.js';
+import '../_verture/index-93662604.js';
 import 'rc-tree';
 import '../_verture/typeof-adeedc13.js';
 import '@para-ui/icons/Document';

package/Form/index.js

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { DeepClone } from '@paraview/lib';
 import React__default from 'react';
-import { F as FormItem, l as localeJson, v as validate } from '../_verture/index-8cfd01fd.js';
+import { F as FormItem, l as localeJson, v as validate } from '../_verture/index-3d0397db.js';
 import { $ as $prefixCls } from '../_verture/constant-5317fc89.js';
 import { u as useFormatMessage } from '../_verture/useFormatMessage-1fc7c957.js';
 import '../TextField/index.js';
@@ -69,7 +69,7 @@ import 'rc-pagination';
 import '@para-ui/icons/Right';
 import '@para-ui/icons/DoubleLeft';
 import '@para-ui/icons/DoubleRight';
-import '../_verture/index-bbe5660a.js';
+import '../_verture/index-93662604.js';
 import 'rc-tree';
 import '../_verture/typeof-adeedc13.js';
 import '@para-ui/icons/Document';

package/FormItem/index.js

@@ -1,6 +1,6 @@
 import 'react/jsx-runtime';
 import 'react';
-export { F as default } from '../_verture/index-8cfd01fd.js';
+export { F as default } from '../_verture/index-3d0397db.js';
 import 'clsx';
 import '../Label/index.js';
 import '../_verture/constant-5317fc89.js';
@@ -69,7 +69,7 @@ import 'rc-pagination';
 import '@para-ui/icons/Right';
 import '@para-ui/icons/DoubleLeft';
 import '@para-ui/icons/DoubleRight';
-import '../_verture/index-bbe5660a.js';
+import '../_verture/index-93662604.js';
 import 'rc-tree';
 import '../_verture/typeof-adeedc13.js';
 import '@para-ui/icons/Document';

package/FunctionModal/index.js

@@ -1,5 +1,5 @@
-import { u as useModal } from '../_verture/modalContext-0c08a396.js';
-export { F as FunctionModalProvider, u as default, a as useClose } from '../_verture/modalContext-0c08a396.js';
+import { u as useModal } from '../_verture/modalContext-c57b51b7.js';
+export { F as FunctionModalProvider, u as default, a as useClose } from '../_verture/modalContext-c57b51b7.js';
 import '../_verture/tslib.es6-55ed4bd2.js';
 import 'react/jsx-runtime';
 import 'react';

package/README.md

@@ -1,3 +1,13 @@
+## 版本: 4.0.26
+        【周期选择器-CycleSelector】增加cRef参数，用来获取组件内部方法
+
+## 版本: 4.0.25
+        【超出省略-AutoTips】修复未超出，只多出的最后一行一个字符出现浮层
+        【超出省略-AutoTips】更换Tooltip层级
+        【周期选择器-CycleSelector】增加时间类型timeType参数
+        【周期选择器-CycleSelector】增加提示文本自定义渲染tipRender参数
+        【周期选择器-CycleSelector】增加显示弹窗showPopover参数
+
 ## 版本: 4.0.24
         【超出省略-AutoTips】修复多行超出省略，丢失只多出的最后一个字符
         【表单-Form】修复输入框输入丢失焦点问题