fix(utils): 更新date, calendar,date-utils, type四个引用

Author: shenjunjian

packages/renderless/src/calendar-bar/index.ts

@@ -1,4 +1,4 @@
-import { lastMonth, nextMonth } from '../common/calendar/calendar'
+import { lastMonth, nextMonth } from '@opentiny/utils'
 import { getDirection } from '../common/deps/touch'
 
 const normalConfig = (config, state) => {

packages/renderless/src/calendar-view/index.ts

@@ -1,6 +1,6 @@
 import { cloneDeep } from '../chart-core/deps/utils'
 import { getDirection } from '../common/deps/touch'
-import { getDays, lastMonth, nextMonth, getCalendar, transformArray } from '../common/calendar/calendar'
+import { getDays, lastMonth, nextMonth, getCalendar, transformArray } from '@opentiny/utils'
 
 const getTime = (date) => new Date(date).getTime()
 

packages/renderless/src/calendar/index.ts

@@ -11,7 +11,7 @@
  */
 
 import { copyArray } from '../common/object'
-import { lastMonth, nextMonth, getCalendar, transformArray, parseDate } from '../common/calendar/calendar'
+import { lastMonth, nextMonth, getCalendar, transformArray, parseDate } from '@opentiny/utils'
 
 export const computedCalendar =
   ({ state }) =>

packages/renderless/src/date-panel/index.ts

@@ -13,22 +13,22 @@
 import { getWeekData } from '../picker'
 import debounce from '../common/deps/debounce'
 import {
-  isDate,
-  parseDate,
+  isDate1,
+  parseDate1,
   modifyDate,
   modifyTime,
   clearTime,
   prevYear,
   nextYear,
   prevMonth,
-  nextMonth,
+  nextMonth1,
   timeWithinRange,
   clearMilliseconds,
   modifyWithTimeString,
   changeYearMonthAndClampDate,
   formatDate,
   extractTimeFormat
-} from '../common/deps/date-util'
+} from '@opentiny/utils'
 import { DATEPICKER } from '../common'
 import { on, off } from '../common/deps/dom'
 import { getDateWithNewTimezone, getLocalTimezone } from '../common/date'
@@ -60,7 +60,7 @@ export const watchValue =
       return
     }
 
-    if (isDate(value)) {
+    if (isDate1(value)) {
       state.date = state.selectionMode === 'week' ? getWeekData(value) : new Date(value)
     } else {
       state.date = api.getDefaultValue()
@@ -70,7 +70,7 @@ export const watchValue =
 export const watchDefaultValue =
   ({ state }) =>
   (value) => {
-    if (!isDate(state.value)) {
+    if (!isDate1(state.value)) {
       state.date = value ? new Date(value) : new Date()
     }
   }
@@ -192,7 +192,7 @@ export const cusPrevMonth =
 export const cusNextMonth =
   ({ state }) =>
   () =>
-    (state.date = nextMonth(state.date))
+    (state.date = nextMonth1(state.date))
 
 export const cusPrevYear =
   ({ state }) =>
@@ -238,7 +238,7 @@ export const doPick = (emit) => (date) => {
 export const handleTimePick =
   ({ api, state, t }) =>
   (value, visible, first) => {
-    if (isDate(value)) {
+    if (isDate1(value)) {
       const newDate = state.value
         ? modifyTime(state.value, value.getHours(), value.getMinutes(), value.getSeconds())
         : modifyWithTimeString(api.getDefaultValue(), state.defaultTime, t)
@@ -487,7 +487,7 @@ export const handleKeyControl =
 export const handleVisibleTimeChange =
   ({ api, vm, state, t }) =>
   (value) => {
-    const time = parseDate(value, state.timeFormat, t)
+    const time = parseDate1(value, state.timeFormat, t)
 
     if (time && api.checkDateWithinRange(time)) {
       state.date = modifyDate(time, state.year, state.month, state.monthDate)
@@ -505,7 +505,7 @@ export const handleVisibleTimeChange =
 export const handleVisibleDateChange =
   ({ api, state, t }) =>
   (value) => {
-    const date = parseDate(value, state.dateFormat, t)
+    const date = parseDate1(value, state.dateFormat, t)
 
     if (date) {
       if (typeof state.disabledDate === 'function' && state.disabledDate(date)) {

packages/renderless/src/date-panel/vue.ts

@@ -58,7 +58,7 @@ import {
   getDisabledConfirm,
   getNowTime
 } from './index'
-import { toDate, getWeekNumber, modifyDate, extractDateFormat } from '../common/deps/date-util'
+import { toDate1, getWeekNumber, modifyDate, extractDateFormat } from '@opentiny/utils'
 import { DATEPICKER, DATE } from '../common'
 
 export const api = [
@@ -146,7 +146,7 @@ const initWatch = ({ watch, state, api, nextTick, props }) => {
   watch(
     () => props.modelValue,
     (value) => {
-      let newVal = toDate(value)
+      let newVal = toDate1(value)
       if (newVal) {
         const newDate = modifyDate(newVal, newVal.getFullYear(), newVal.getMonth(), newVal.getUTCDate())
         state.date = newDate

packages/renderless/src/date-range/index.ts

@@ -11,18 +11,18 @@
  */
 
 import {
-  isDate,
+  toDate1,
   nextDate,
-  parseDate,
+  parseDate1,
   formatDate,
   modifyDate,
   modifyTime,
   nextYear,
   prevYear,
-  nextMonth,
+  nextMonth1,
   prevMonth,
   modifyWithTimeString
-} from '../common/deps/date-util'
+} from '@opentiny/utils'
 
 export const calcDefaultValue = (defaultVal) => {
   if (Array.isArray(defaultVal)) {
@@ -115,7 +115,7 @@ export const watchMinDate =
       const format = 'HH:mm:ss'
 
       minTimePicker.state.selectableRange = [
-        [parseDate(formatDate(state.minDate, format, t), format, t), parseDate('23:59:59', format, t)]
+        [parseDate1(formatDate(state.minDate, format, t), format, t), parseDate1('23:59:59', format, t)]
       ]
     }
 
@@ -164,8 +164,8 @@ export const watchValue =
       state.minDate = null
       state.maxDate = null
     } else if (Array.isArray(value)) {
-      state.minDate = isDate(value[0]) ? new Date(value[0]) : null
-      state.maxDate = isDate(value[1]) ? new Date(value[1]) : null
+      state.minDate = toDate1(value[0]) ? new Date(value[0]) : null
+      state.maxDate = toDate1(value[1]) ? new Date(value[1]) : null
 
       if (state.minDate) {
         state.leftDate = state.minDate
@@ -177,13 +177,13 @@ export const watchValue =
           const maxDateMonth = state.maxDate.getMonth()
 
           state.rightDate =
-            minDateYear === maxDateYear && minDateMonth === maxDateMonth ? nextMonth(state.maxDate) : state.maxDate
+            minDateYear === maxDateYear && minDateMonth === maxDateMonth ? nextMonth1(state.maxDate) : state.maxDate
         } else {
-          state.rightDate = nextMonth(state.leftDate)
+          state.rightDate = nextMonth1(state.leftDate)
         }
       } else {
         state.leftDate = calcDefaultValue(state.defaultValue)[0]
-        state.rightDate = nextMonth(state.leftDate)
+        state.rightDate = nextMonth1(state.leftDate)
       }
     }
   }
@@ -195,7 +195,7 @@ export const watchDefault =
       const [left, right] = calcDefaultValue(value)
 
       state.leftDate = left
-      state.rightDate = value && value[1] && state.unlinkPanels ? right : nextMonth(state.leftDate)
+      state.rightDate = value && value[1] && state.unlinkPanels ? right : nextMonth1(state.leftDate)
     }
   }
 
@@ -205,7 +205,7 @@ export const handleClear =
     state.minDate = null
     state.maxDate = null
     state.leftDate = calcDefaultValue(state.defaultValue)[0]
-    state.rightDate = nextMonth(state.leftDate)
+    state.rightDate = nextMonth1(state.leftDate)
     state.rangeState.selecting = false
     // tiny 新增下面行
     state.rangeState.endDate = null
@@ -228,7 +228,7 @@ export const handleDateInput =
       return
     }
 
-    const parsedValue = parseDate(value, state.dateFormat, t)
+    const parsedValue = parseDate1(value, state.dateFormat, t)
 
     if (parsedValue) {
       if (typeof state.disabledDate === 'function' && state.disabledDate(new Date(parsedValue))) {
@@ -246,7 +246,7 @@ export const handleDateInput =
         state.leftDate = new Date(parsedValue)
 
         if (!state.unlinkPanels) {
-          state.rightDate = nextMonth(state.leftDate)
+          state.rightDate = nextMonth1(state.leftDate)
         }
       } else {
         state.maxDate = modifyDate(
@@ -268,7 +268,7 @@ export const handleDateInput =
 export const handleDateChange =
   ({ state, t }) =>
   (value, type) => {
-    const parsedValue = parseDate(value, state.dateFormat, t)
+    const parsedValue = parseDate1(value, state.dateFormat, t)
 
     if (parsedValue) {
       if (type === 'min') {
@@ -306,7 +306,7 @@ export const handleTimeInput =
       return
     }
 
-    const parsedValue = parseDate(value, state.timeFormat, t)
+    const parsedValue = parseDate1(value, state.timeFormat, t)
 
     if (parsedValue) {
       if (type === 'min') {
@@ -330,7 +330,7 @@ export const handleTimeInput =
 export const handleTimeChange =
   ({ state, t, vm }) =>
   (value, type) => {
-    const parsedValue = parseDate(value, state.timeFormat, t)
+    const parsedValue = parseDate1(value, state.timeFormat, t)
 
     if (parsedValue) {
       if (type === 'min') {
@@ -410,10 +410,10 @@ export const handleShortcutClick = (state, api) => (shortcut) => {
     state.shortcutType = shortcut.type
     state.shortcutText = shortcut.text
 
-    if (shortcut.type === 'startFrom' && shortcut.endDate && isDate(shortcut.endDate)) {
+    if (shortcut.type === 'startFrom' && shortcut.endDate && toDate1(shortcut.endDate)) {
       state.maxRangeDate = shortcut.endDate
     }
-    if (shortcut.type === 'endAt' && shortcut.startDate && isDate(shortcut.startDate)) {
+    if (shortcut.type === 'endAt' && shortcut.startDate && toDate1(shortcut.startDate)) {
       state.minRangeDate = shortcut.startDate
     }
 
@@ -480,7 +480,7 @@ export const leftPrevYear =
     state.leftDate = prevYear(state.leftDate)
 
     if (!state.unlinkPanels) {
-      state.rightDate = nextMonth(state.leftDate)
+      state.rightDate = nextMonth1(state.leftDate)
     }
   }
 
@@ -490,7 +490,7 @@ export const leftPrevMonth =
     state.leftDate = prevMonth(state.leftDate)
 
     if (!state.unlinkPanels) {
-      state.rightDate = nextMonth(state.leftDate)
+      state.rightDate = nextMonth1(state.leftDate)
     }
   }
 
@@ -501,7 +501,7 @@ export const rightNextYear =
 
     if (!unlinkPanels) {
       state.leftDate = nextYear(leftDate)
-      state.rightDate = nextMonth(state.leftDate)
+      state.rightDate = nextMonth1(state.leftDate)
     } else {
       state.rightDate = nextYear(rightDate)
     }
@@ -511,10 +511,10 @@ export const rightNextMonth =
   ({ state }) =>
   () => {
     if (!state.unlinkPanels) {
-      state.leftDate = nextMonth(state.leftDate)
-      state.rightDate = nextMonth(state.leftDate)
+      state.leftDate = nextMonth1(state.leftDate)
+      state.rightDate = nextMonth1(state.leftDate)
     } else {
-      state.rightDate = nextMonth(state.rightDate)
+      state.rightDate = nextMonth1(state.rightDate)
     }
   }
 
@@ -526,7 +526,7 @@ export const leftNextYear =
 export const leftNextMonth =
   ({ state }) =>
   () =>
-    (state.leftDate = nextMonth(state.leftDate))
+    (state.leftDate = nextMonth1(state.leftDate))
 
 export const rightPrevYear =
   ({ state }) =>
@@ -553,16 +553,16 @@ export const isValidValue =
     value &&
     value[0] &&
     value[1] &&
-    isDate(value[0]) &&
-    isDate(value[1]) &&
+    toDate1(value[0]) &&
+    toDate1(value[1]) &&
     value[0].getTime() <= value[1].getTime() &&
     (typeof state.disabledDate === 'function' ? !state.disabledDate(value[0]) && !state.disabledDate(value[1]) : true)
 
 export const resetView =
   ({ state }) =>
   () => {
-    state.minDate = state.value && isDate(state.value[0]) ? new Date(state.value[0]) : null
-    state.maxDate = state.value && isDate(state.value[0]) ? new Date(state.value[1]) : null
+    state.minDate = state.value && toDate1(state.value[0]) ? new Date(state.value[0]) : null
+    state.maxDate = state.value && toDate1(state.value[0]) ? new Date(state.value[1]) : null
   }
 
 export const setTimeFormat =

packages/renderless/src/date-range/vue.ts

@@ -52,7 +52,7 @@ import {
   computerEnableYearArrow,
   watchPickerVisible
 } from './index'
-import { nextMonth, extractDateFormat, extractTimeFormat } from '../common/deps/date-util'
+import { nextMonth1, extractDateFormat, extractTimeFormat } from '@opentiny/utils'
 
 export const api = [
   'state',
@@ -95,7 +95,7 @@ const initState = ({ reactive, computed, api, constants, designConfig }) => {
     minRangeDate: constants.startDate,
     maxRangeDate: constants.endDate,
     leftDate: new Date(),
-    rightDate: nextMonth(new Date()),
+    rightDate: nextMonth1(new Date()),
     rangeState: { endDate: null, selecting: false, row: null, column: null },
     showTime: false,
     format: '',