@para-ui/core 4.0.4 → 4.0.5

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-e3011376.js';
+import { T as Tree } from '../_verture/index-767e63dd.js';
 import { Button } from '../Button/index.js';
 import { D as Dropdown } from '../_verture/index-389675ab.js';
 import { Popover } from '../Popover/index.js';

package/CycleSelector/index.d.ts

@@ -4,6 +4,8 @@
  * @description 周期选择器
  */
 import React, { FunctionComponent } from 'react';
+import { Dayjs } from 'dayjs';
+import { HelperTextDetailProps } from "../HelperText";
 import './index.scss';
 export interface CycleSelectorValueProps {
     /** 开始时间 */
@@ -25,10 +27,22 @@ export interface CycleSelectorValueProps {
     /** 当结束方式是限定时间，结束执行的日期 */
     endTime?: string;
 }
-export interface CycleSelectorProps {
+declare type DisabledTimes = {
+    disabledHours?: () => number[];
+    disabledMinutes?: (hour: number) => number[];
+    disabledSeconds?: (hour: number, minute: number) => number[];
+};
+declare type DisabledTime<DateType> = (date: DateType | null) => DisabledTimes;
+export interface CycleSelectorProps extends HelperTextDetailProps {
     className?: string;
     style?: React.CSSProperties;
     value: CycleSelectorValueProps;
+    /** 禁用 */
+    disabled?: boolean;
+    /** 禁用日期 */
+    disabledDate?: (date: Dayjs) => boolean;
+    /** 禁用时间 */
+    disabledTime?: DisabledTime<Dayjs>;
     onChange: (val: CycleSelectorValueProps) => void;
 }
 declare const CycleSelector: FunctionComponent<CycleSelectorProps>;

package/CycleSelector/index.js

@@ -12,6 +12,8 @@ import { Popover } from '../Popover/index.js';
 import { Button } from '../Button/index.js';
 import GlobalContext from '@para-ui/core/GlobalContext';
 import { u as useFormatMessage } from '../_verture/useFormatMessage-eb13cf56.js';
+import HelperText from '../HelperText/index.js';
+import { getDateYYYYMMddHHMM } from '../Utils/index.js';
 import { s as styleInject } from '../_verture/style-inject.es-300983ab.js';
 import 'rc-picker/es/generate/dayjs';
 import '../Tag/index.js';
@@ -39,7 +41,6 @@ import 'rc-picker/lib/locale/zh_CN';
 import '../Label/index.js';
 import '../Help/index.js';
 import '@para-ui/icons/Help';
-import '../HelperText/index.js';
 import '@para-ui/icons/SortRight';
 import '../Empty/index.js';
 import '../_verture/useGlobalProps-1e416658.js';
@@ -60,7 +61,7 @@ var en = {
   week4: 'Thursday',
   week5: 'Friday',
   week6: 'Saturday',
-  week0: 'Sunday',
+  week7: 'Sunday',
   every: 'Every ',
   day: 'Day',
   week: 'Week',
@@ -128,7 +129,8 @@ var en = {
   endRepetition: 'End repetition',
   customCycle: 'Custom cycle',
   cancel: 'Cancel',
-  confirm: 'Confirm'
+  confirm: 'Confirm',
+  next: 'Next'
 };
 
 var zh = {
@@ -140,7 +142,7 @@ var zh = {
   week4: '星期四',
   week5: '星期五',
   week6: '星期六',
-  week0: '星期日',
+  week7: '星期日',
   every: '每',
   day: '天',
   week: '周',
@@ -208,7 +210,8 @@ var zh = {
   endRepetition: '结束重复',
   customCycle: '自定义周期',
   cancel: '取 消',
-  confirm: '确 定'
+  confirm: '确 定',
+  next: '次后'
 };
 
 var localeJson = {
@@ -216,7 +219,7 @@ var localeJson = {
   en
 };
 
-var css_248z = "@charset \"UTF-8\";\n/**\n* @author linhd\n* @date 2023/4/11 14:16\n* @description 最新色卡\n*/\n.paraui-v4-cycle-selector .cycle-selector-content {\n  display: flex;\n}\n.paraui-v4-cycle-selector .cycle-selector-content .time-select {\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector .cycle-selector-content .select-type {\n  flex: 1;\n  overflow: hidden;\n  margin-left: 10px;\n}\n.paraui-v4-cycle-selector .text-tip {\n  font-size: 12px;\n  color: rgb(29, 33, 38);\n  margin-top: 10px;\n}\n.paraui-v4-cycle-selector .text-tip button {\n  height: inherit;\n  font-size: 12px;\n  margin-left: 8px;\n}\n\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content {\n  width: 480px;\n  padding: 15px 20px 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title {\n  display: flex;\n  line-height: 20px;\n  align-items: center;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title .label {\n  flex: 1;\n  font-size: 14px;\n  color: rgb(29, 33, 38);\n  font-weight: 600;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title svg {\n  color: rgb(92, 101, 115);\n  cursor: pointer;\n  font-size: 18px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title svg:hover {\n  color: rgb(87, 131, 235);\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content {\n  margin-top: 16px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item {\n  display: flex;\n  margin-bottom: 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item .label {\n  line-height: 32px;\n  width: 150px;\n  color: rgb(92, 101, 115);\n  font-size: 14px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item .form-content {\n  display: flex;\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .frequency .form-content .frequency-select {\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .end-type .form-content .end-type-select {\n  flex: 1;\n  overflow: hidden;\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .end-type .form-content .right-box {\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day {\n  margin-bottom: 0;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content {\n  display: flex;\n  flex-direction: column;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select {\n  display: flex;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div {\n  flex: 1;\n  overflow: hidden;\n  height: 28px;\n  margin-right: 6px;\n  border: 1px solid rgb(212, 218, 227);\n  border-radius: 4px;\n  line-height: 26px;\n  text-align: center;\n  cursor: pointer;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div.select-item {\n  background-color: rgb(46, 101, 230);\n  color: rgb(255, 255, 255);\n  border-color: rgb(46, 101, 230);\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div:last-child {\n  margin-right: 0;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip {\n  min-height: 20px;\n  display: flex;\n  opacity: 0;\n  transition: all 0.3s;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip.show-tip {\n  opacity: 1;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip svg {\n  color: rgb(255, 147, 38);\n  font-size: 16px;\n  vertical-align: middle;\n  margin-right: 4px;\n  margin-top: 2px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip span {\n  font-size: 12px;\n  color: rgb(255, 147, 38);\n  flex: 1;\n  overflow: hidden;\n  line-height: 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .month-cycle-type-list .form-content > div {\n  flex: 1;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .month-cycle-type-list .form-content > div:first-child {\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .footer {\n  text-align: right;\n  margin-top: 30px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .footer button:last-child {\n  margin-left: 16px;\n}";
+var css_248z = "@charset \"UTF-8\";\n/**\n* @author linhd\n* @date 2023/4/11 14:16\n* @description 最新色卡\n*/\n.paraui-v4-cycle-selector .cycle-selector-content {\n  display: flex;\n}\n.paraui-v4-cycle-selector .cycle-selector-content .time-select {\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector .cycle-selector-content .select-type {\n  flex: 1;\n  overflow: hidden;\n  margin-left: 10px;\n}\n.paraui-v4-cycle-selector .cycle-selector-content .paraui-v4-helper-text {\n  display: none;\n}\n.paraui-v4-cycle-selector .text-tip {\n  font-size: 12px;\n  color: rgb(29, 33, 38);\n  margin-top: 10px;\n}\n.paraui-v4-cycle-selector .text-tip button {\n  height: inherit;\n  font-size: 12px;\n  margin-left: 8px;\n}\n\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content {\n  width: 480px;\n  padding: 15px 20px 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title {\n  display: flex;\n  line-height: 20px;\n  align-items: center;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title .label {\n  flex: 1;\n  font-size: 14px;\n  color: rgb(29, 33, 38);\n  font-weight: 600;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title svg {\n  color: rgb(92, 101, 115);\n  cursor: pointer;\n  font-size: 18px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .title svg:hover {\n  color: rgb(87, 131, 235);\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content {\n  margin-top: 16px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item {\n  display: flex;\n  margin-bottom: 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item .label {\n  line-height: 32px;\n  width: 150px;\n  color: rgb(92, 101, 115);\n  font-size: 14px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .item .form-content {\n  display: flex;\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .frequency .form-content .frequency-select {\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .end-type .form-content .end-type-select {\n  flex: 1;\n  overflow: hidden;\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .end-type .form-content .right-box {\n  flex: 1;\n  overflow: hidden;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day {\n  margin-bottom: 0;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content {\n  display: flex;\n  flex-direction: column;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select {\n  display: flex;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div {\n  flex: 1;\n  overflow: hidden;\n  height: 28px;\n  margin-right: 6px;\n  border: 1px solid rgb(212, 218, 227);\n  border-radius: 4px;\n  line-height: 26px;\n  text-align: center;\n  cursor: pointer;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div.select-item {\n  background-color: rgb(46, 101, 230);\n  color: rgb(255, 255, 255);\n  border-color: rgb(46, 101, 230);\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content .execution-day-select > div:last-child {\n  margin-right: 0;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip {\n  min-height: 20px;\n  display: flex;\n  opacity: 0;\n  transition: all 0.3s;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip.show-tip {\n  opacity: 1;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip svg {\n  color: rgb(255, 147, 38);\n  font-size: 16px;\n  vertical-align: middle;\n  margin-right: 4px;\n  margin-top: 2px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .execution-day .form-content > .tip span {\n  font-size: 12px;\n  color: rgb(255, 147, 38);\n  flex: 1;\n  overflow: hidden;\n  line-height: 20px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .month-cycle-type-list .form-content > div {\n  flex: 1;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .content .month-cycle-type-list .form-content > div:first-child {\n  margin-right: 10px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .footer {\n  text-align: right;\n  margin-top: 30px;\n}\n.paraui-v4-cycle-selector-popover .cycle-selector-popover-content .footer button:last-child {\n  margin-left: 16px;\n}";
 styleInject(css_248z);
 
 const CycleSelector = props => {
@@ -224,6 +227,12 @@ const CycleSelector = props => {
     className,
     style,
     value,
+    disabled = false,
+    error,
+    hideErrorDom,
+    helperText,
+    disabledDate,
+    disabledTime,
     onChange
   } = props;
   const {
@@ -247,7 +256,7 @@ const CycleSelector = props => {
   constData.current.value = value;
   useEffect(() => {
     const arr = [];
-    for (let i = 1; i < 30; i++) {
+    for (let i = 1; i < 31; i++) {
       arr.push({
         label: intl('every') + i,
         value: i
@@ -295,7 +304,7 @@ const CycleSelector = props => {
   }, [value, language]);
   // 处理下拉框选择
   const handleSelectData = () => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (!((_a = constData.current.valueCom) === null || _a === void 0 ? void 0 : _a.startTime)) {
       setList([{
         label: intl('noRepetition'),
@@ -303,21 +312,15 @@ const CycleSelector = props => {
       }]);
       return;
     }
-    const time = new Date((_b = constData.current.valueCom) === null || _b === void 0 ? void 0 : _b.startTime);
-    const month = time.getMonth() + 1;
-    const day = time.getDate();
-    const weekDay = time.getDay();
-    const hm = (_c = constData.current.valueCom) === null || _c === void 0 ? void 0 : _c.startTime.split(' ')[1];
-    const date = (_d = constData.current.valueCom) === null || _d === void 0 ? void 0 : _d.startTime.split(' ')[0];
-    const week = Math.ceil((day + 6 - (weekDay === 0 ? 7 : weekDay)) / 7);
-    constData.current.timeDetail = {
+    constData.current.timeDetail = getDateYYYYMMddHHMM((_b = constData.current.valueCom) === null || _b === void 0 ? void 0 : _b.startTime);
+    const {
       month,
       day,
       weekDay,
       hm,
       week,
       date
-    };
+    } = constData.current.timeDetail;
     const selectList = [{
       label: intl('noRepetition'),
       value: 0
@@ -369,8 +372,11 @@ const CycleSelector = props => {
     if (isNotExist('endType')) constData.current.valueCom.endType = 0;
     if (isNotExist('monthCycleType')) constData.current.valueCom.monthCycleType = 'day';
     if (isNotExist('endTime')) constData.current.valueCom.endTime = (_a = constData.current.timeDetail) === null || _a === void 0 ? void 0 : _a.date;
-    if (isNotExist('limitNum')) constData.current.valueCom.limitNum = 0;
-    if (isNotExist('executionDay')) constData.current.valueCom.executionDay = ((_b = constData.current.timeDetail) === null || _b === void 0 ? void 0 : _b.weekDay) + '';
+    if (isNotExist('limitNum')) constData.current.valueCom.limitNum = 1;
+    if (isNotExist('executionDay')) {
+      const index = handleWeekNum(Number((_b = constData.current.timeDetail) === null || _b === void 0 ? void 0 : _b.weekDay));
+      constData.current.valueCom.executionDay = index + '';
+    }
     setValueCom(Object.assign({}, constData.current.valueCom));
   };
   // 清空弹窗里面的默认值
@@ -394,20 +400,27 @@ const CycleSelector = props => {
   // 向外抛值
   const changeCom = cancel => {
     if (constData.current.valueCom.cycleType === 5) {
+      // 自定义重复
       if (constData.current.valueCom.frequencyUnit === 'week') {
+        // 周
         delete constData.current.valueCom.monthCycleType;
       } else if (constData.current.valueCom.frequencyUnit === 'month') {
+        // 月
         delete constData.current.valueCom.executionDay;
       } else {
+        // 天 年
         delete constData.current.valueCom.monthCycleType;
         delete constData.current.valueCom.executionDay;
       }
       if (constData.current.valueCom.endType === 0) {
+        // 结束方式 无限重复
         delete constData.current.valueCom.endTime;
         delete constData.current.valueCom.limitNum;
       } else if (constData.current.valueCom.endType === 1) {
+        // 结束方式 截止时间
         delete constData.current.valueCom.limitNum;
       } else {
+        // 结束方式 限定次数
         delete constData.current.valueCom.endTime;
       }
     } else {
@@ -430,16 +443,24 @@ const CycleSelector = props => {
   };
   // 自定义周期文案提示
   const handleText = () => {
-    var _a, _b;
-    if ((value === null || value === void 0 ? void 0 : value.cycleType) !== 5) return;
+    var _a, _b, _c, _d;
+    if ((value === null || value === void 0 ? void 0 : value.cycleType) !== 5 || error) return;
     const text = [];
     const everyText1 = intl('every') + value.frequency + intl(value.frequencyUnit);
     const timeText = (_a = constData.current.timeDetail) === null || _a === void 0 ? void 0 : _a.hm;
     if (value.frequencyUnit === 'week') {
       const arr = [];
+      let str;
       (_b = value.executionDay) === null || _b === void 0 ? void 0 : _b.split(',').forEach(item => {
-        arr.push(intl('week' + (item === '7' ? 0 : item)));
+        let index = Number(item) - 1;
+        if (index === 0) {
+          index = 7;
+          str = intl('week' + index);
+        } else {
+          arr.push(intl('week' + index));
+        }
       });
+      if (str) arr.push(str);
       text.push(intl('text1', {
         every: everyText1 + arr.join('、'),
         time: timeText
@@ -447,13 +468,18 @@ const CycleSelector = props => {
     } else if (value.frequencyUnit === 'month') {
       text.push(intl('text1', {
         every: everyText1,
-        time: constData.current.monthCycleTypeListMap[value.monthCycleType] + timeText
+        time: ((_c = constData.current.monthCycleTypeListMap) === null || _c === void 0 ? void 0 : _c[value.monthCycleType]) + timeText
       }));
-    } else {
+    } else if (value.frequencyUnit === 'day') {
       text.push(intl('text1', {
         every: everyText1,
         time: timeText
       }));
+    } else {
+      text.push(intl('text1', {
+        every: everyText1,
+        time: ((_d = constData.current.timeDetail) === null || _d === void 0 ? void 0 : _d.date) + " " + timeText
+      }));
     }
     if (value.endType === 2) {
       text.push(intl('text2', {
@@ -483,16 +509,21 @@ const CycleSelector = props => {
   };
   // 改变结束次数
   const changeLimitNum = event => {
-    valueCom.limitNum = Number(event.target.value);
+    valueCom.limitNum = Number(event.target.value) < 1 ? 1 : Number(event.target.value);
     setValueCom(Object.assign({}, valueCom));
   };
   const changeSelectVal = name => val => {
     valueCom[name] = val;
     setValueCom(Object.assign({}, valueCom));
   };
+  const handleWeekNum = index => {
+    index += 1;
+    if (index === 8) index = 1;
+    return index;
+  };
   // 点击周 按钮
   const clickWeekBtn = index => () => {
-    var _a, _b;
+    var _a;
     if (((_a = constData.current.timeDetail) === null || _a === void 0 ? void 0 : _a.weekDay) === index) {
       setTipWeek(true);
       clearTimeout(constData.current.timerTip);
@@ -501,7 +532,12 @@ const CycleSelector = props => {
       }, 1300);
       return;
     }
-    const arr = ((_b = valueCom.executionDay) === null || _b === void 0 ? void 0 : _b.split(',')) || [];
+    handleWeekValue(index);
+  };
+  const handleWeekValue = index => {
+    var _a;
+    index = handleWeekNum(index);
+    const arr = ((_a = valueCom.executionDay) === null || _a === void 0 ? void 0 : _a.split(',')) || [];
     const json = {};
     arr.forEach(item => {
       json[item] = true;
@@ -512,6 +548,7 @@ const CycleSelector = props => {
       json[index.toString()] = true;
     }
     valueCom.executionDay = Object.keys(json).join(',');
+    constData.current.valueCom = Object.assign({}, valueCom);
     setValueCom(Object.assign({}, valueCom));
   };
   // 处理 天 周 月 年 展示不一样的周期
@@ -561,17 +598,17 @@ const CycleSelector = props => {
                 6: 'six',
                 7: 'seven'
               };
-              const oreder = index + 1;
+              const oreder = handleWeekNum(index + 1);
               const indexOfVal = (_a = valueCom.executionDay) === null || _a === void 0 ? void 0 : _a.indexOf(oreder.toString());
               let selectBol = indexOfVal !== undefined && indexOfVal !== -1;
-              if (((_b = constData.current.timeDetail) === null || _b === void 0 ? void 0 : _b.weekDay) === oreder) {
+              if (((_b = constData.current.timeDetail) === null || _b === void 0 ? void 0 : _b.weekDay) === index + 1) {
                 selectBol = true;
               }
               return jsx("div", Object.assign({
                 className: selectBol ? 'select-item' : '',
-                onClick: clickWeekBtn(oreder)
+                onClick: clickWeekBtn(index + 1)
               }, {
-                children: intl(numMap[oreder])
+                children: intl(numMap[index + 1])
               }), index);
             })
           })), jsxs("p", Object.assign({
@@ -618,18 +655,18 @@ const CycleSelector = props => {
           }, {
             children: [valueCom.endType === 1 && jsx(DatePicker, {
               disabledDate: current => {
-                return current && current < dayjs(valueCom.startTime);
+                return current && current < dayjs(new Date(valueCom.startTime).getTime() - 24 * 60 * 60 * 1000);
               },
               value: valueCom.endTime,
               format: 'YYYY-MM-DD',
               onChange: changeEndTypeTime
             }), valueCom.endType === 2 && jsx(TextField, {
-              min: 0,
+              min: 1,
               type: "number",
               placeholder: intl('placeholder'),
               value: valueCom.limitNum,
               onChange: changeLimitNum,
-              rightIcon: '次后'
+              rightIcon: intl('next')
             })]
           }))]
         }))]
@@ -679,6 +716,28 @@ const CycleSelector = props => {
       }))]
     }));
   };
+  const disabledDateHand = () => {
+    if (disabledDate) return disabledDate;
+    return current => {
+      return current && current < dayjs(new Date().getTime() - 24 * 60 * 60 * 1000);
+    };
+  };
+  const range = (start, end) => {
+    const result = [];
+    for (let i = start; i < end; i++) {
+      result.push(i);
+    }
+    return result;
+  };
+  const disabledTimeHand = () => {
+    if (disabledTime) return disabledTime;
+    return () => {
+      return {
+        disabledHours: () => range(0, 24).splice(0, new Date().getHours()),
+        disabledMinutes: () => range(0, new Date().getMinutes())
+      };
+    };
+  };
   return jsxs("div", Object.assign({
     className: clsx("".concat($prefixCls, "-cycle-selector"), className),
     style: style
@@ -694,14 +753,18 @@ const CycleSelector = props => {
         className: 'cycle-selector-content'
       }, {
         children: [jsx(DatePicker, {
+          disabled: disabled,
           value: valueCom.startTime,
           className: 'time-select',
           showTime: true,
           format: 'YYYY-MM-DD HH:mm',
+          disabledDate: disabledDateHand(),
+          disabledTime: disabledTimeHand(),
           placeholder: intl('pleaseSelect'),
-          onChange: changeStartTime
+          onChange: changeStartTime,
+          error: error
         }), jsx(Select, {
-          disabled: !valueCom.startTime,
+          disabled: !valueCom.startTime || disabled,
           list: list,
           className: 'select-type',
           placeholder: intl('pleaseSelect'),
@@ -709,7 +772,11 @@ const CycleSelector = props => {
           onChange: changeSelect
         })]
       }))
-    })), handleText()]
+    })), handleText(), jsx(HelperText, {
+      error: error,
+      hideErrorDom: hideErrorDom,
+      helperText: helperText
+    })]
   }));
 };
 

package/CycleSelector/lang/en_US.d.ts

@@ -7,7 +7,7 @@ declare const _default: {
     week4: string;
     week5: string;
     week6: string;
-    week0: string;
+    week7: string;
     every: string;
     day: string;
     week: string;
@@ -76,5 +76,6 @@ declare const _default: {
     customCycle: string;
     cancel: string;
     confirm: string;
+    next: string;
 };
 export default _default;

package/CycleSelector/lang/index.d.ts

@@ -8,7 +8,7 @@ declare const _default: {
         week4: string;
         week5: string;
         week6: string;
-        week0: string;
+        week7: string;
         every: string;
         day: string;
         week: string;
@@ -77,6 +77,7 @@ declare const _default: {
         customCycle: string;
         cancel: string;
         confirm: string;
+        next: string;
     };
     en: {
         placeholder: string;
@@ -87,7 +88,7 @@ declare const _default: {
         week4: string;
         week5: string;
         week6: string;
-        week0: string;
+        week7: string;
         every: string;
         day: string;
         week: string;
@@ -156,6 +157,7 @@ declare const _default: {
         customCycle: string;
         cancel: string;
         confirm: string;
+        next: string;
     };
 };
 export default _default;

package/CycleSelector/lang/zh_CN.d.ts

@@ -7,7 +7,7 @@ declare const _default: {
     week4: string;
     week5: string;
     week6: string;
-    week0: string;
+    week7: string;
     every: string;
     day: string;
     week: string;
@@ -76,5 +76,6 @@ declare const _default: {
     customCycle: string;
     cancel: string;
     confirm: string;
+    next: string;
 };
 export default _default;

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-e3011376.js';
+import '../_verture/index-767e63dd.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-80e8eb3f.js';
+import { F as FormItem, l as localeJson, v as validate } from '../_verture/index-d795d1f0.js';
 import { $ as $prefixCls } from '../_verture/constant-5317fc89.js';
 import { u as useFormatMessage } from '../_verture/useFormatMessage-eb13cf56.js';
 import '../TextField/index.js';
@@ -68,7 +68,7 @@ import 'rc-pagination';
 import '@para-ui/icons/Right';
 import '@para-ui/icons/DoubleLeft';
 import '@para-ui/icons/DoubleRight';
-import '../_verture/index-e3011376.js';
+import '../_verture/index-767e63dd.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-80e8eb3f.js';
+export { F as default } from '../_verture/index-d795d1f0.js';
 import 'clsx';
 import '../Label/index.js';
 import '../_verture/constant-5317fc89.js';
@@ -68,7 +68,7 @@ import 'rc-pagination';
 import '@para-ui/icons/Right';
 import '@para-ui/icons/DoubleLeft';
 import '@para-ui/icons/DoubleRight';
-import '../_verture/index-e3011376.js';
+import '../_verture/index-767e63dd.js';
 import 'rc-tree';
 import '../_verture/typeof-adeedc13.js';
 import '@para-ui/icons/Document';

package/README.md

@@ -1,7 +1,14 @@
+
+## 版本: 4.0.5
+    para-ui/core@4.0.5 发布
+        【周期选择器-CycleSelector】修改初始化报错
+        【树-tree】修改树样式问题
+
 ## 版本: 4.0.4
     para-ui/core@4.0.4 发布
         【国际化输入框-InputLang】支持输出输入为string | object, 是否带有i18n标识
         【DynamicMultibox】动态多值框中输入框支持联想下拉列表
+        【周期选择器-CycleSelector】新增disabled，disabledDate，disabledTime，以及错误信息参数
 
 ## 版本: 4.0.3
     para-ui/core@4.0.3 发布

package/Tree/index.js

@@ -1,5 +1,5 @@
-import { T as Tree } from '../_verture/index-e3011376.js';
-export { T as default } from '../_verture/index-e3011376.js';
+import { T as Tree } from '../_verture/index-767e63dd.js';
+export { T as default } from '../_verture/index-767e63dd.js';
 import '../_verture/tslib.es6-55ed4bd2.js';
 import 'react/jsx-runtime';
 import 'react';

package/Utils/index.d.ts

@@ -0,0 +1,13 @@
+interface DateYYYYMMddHHMM {
+    month?: number;
+    day?: number;
+    week?: number;
+    weekDay?: number;
+    hm?: string;
+    date?: string;
+}
+export declare const getDateYYYYMMddHHMM: (str: string) => DateYYYYMMddHHMM;
+declare const _default: {
+    getDateYYYYMMddHHMM: (str: string) => DateYYYYMMddHHMM;
+};
+export default _default;

package/Utils/index.js

@@ -0,0 +1,22 @@
+const getDateYYYYMMddHHMM = str => {
+  const time = new Date(str);
+  const month = time.getMonth() + 1;
+  const day = time.getDate();
+  const weekDay = time.getDay() === 0 ? 7 : time.getDay();
+  const hm = str.split(' ')[1];
+  const date = str.split(' ')[0];
+  const week = Math.ceil((day + 6 - weekDay) / 7);
+  return {
+    month,
+    day,
+    weekDay,
+    hm,
+    week,
+    date
+  };
+};
+var index = {
+  getDateYYYYMMddHHMM
+};
+
+export { index as default, getDateYYYYMMddHHMM };