@94ai/nf-double-half-year 3.2.48 → 3.2.49

package/lib/nf-double-half-year.vue.d.ts

@@ -1,5 +1,13 @@
 import { HalfYearItem } from './types';
 declare const _default: import("vue-demi").DefineComponent<{
+    offset: {
+        type: import("vue-demi").PropType<number>;
+        default: number;
+    };
+    transition: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
     value: {
         type: import("vue-demi").PropType<string[]>;
         default: undefined;
@@ -47,10 +55,6 @@ declare const _default: import("vue-demi").DefineComponent<{
         type: import("vue-demi").PropType<string>;
         default: string;
     };
-    transition: {
-        type: import("vue-demi").PropType<string>;
-        default: string;
-    };
     placement: {
         type: import("vue-demi").PropType<string>;
         default: string;
@@ -63,10 +67,6 @@ declare const _default: import("vue-demi").DefineComponent<{
         type: import("vue-demi").PropType<string>;
         default: string;
     };
-    offset: {
-        type: import("vue-demi").PropType<number>;
-        default: number;
-    };
     visibleArrow: {
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
@@ -104,6 +104,14 @@ declare const _default: import("vue-demi").DefineComponent<{
     blur: (value: any) => void;
     focus: (value: any) => void;
 }, string, Readonly<import("vue-demi").ExtractPropTypes<{
+    offset: {
+        type: import("vue-demi").PropType<number>;
+        default: number;
+    };
+    transition: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
     value: {
         type: import("vue-demi").PropType<string[]>;
         default: undefined;
@@ -151,10 +159,6 @@ declare const _default: import("vue-demi").DefineComponent<{
         type: import("vue-demi").PropType<string>;
         default: string;
     };
-    transition: {
-        type: import("vue-demi").PropType<string>;
-        default: string;
-    };
     placement: {
         type: import("vue-demi").PropType<string>;
         default: string;
@@ -167,10 +171,6 @@ declare const _default: import("vue-demi").DefineComponent<{
         type: import("vue-demi").PropType<string>;
         default: string;
     };
-    offset: {
-        type: import("vue-demi").PropType<number>;
-        default: number;
-    };
     visibleArrow: {
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
@@ -195,6 +195,8 @@ declare const _default: import("vue-demi").DefineComponent<{
         default: boolean;
     };
 }>>, {
+    offset: number;
+    transition: string;
     value: string[];
     tabindex: number;
     rangeSeparator: string;
@@ -206,11 +208,9 @@ declare const _default: import("vue-demi").DefineComponent<{
     disabled: boolean;
     prefixIcon: string;
     clearIcon: string;
-    transition: string;
     placement: string;
     popperClass: string;
     trigger: string;
-    offset: number;
     visibleArrow: boolean;
     popperOptions: Object;
     openDelay: number;

package/package/nf-double-half-year.vue

@@ -78,7 +78,7 @@ import {
   getNextYear,
   getHalfYear,
   startOf
-} from './util'
+} from '@94ai/common-utils'
 import { getHarfYearOptionMonths } from './config'
 import { HalfYearItem } from './types'
 

package/package/nf-half-year-picker-item.vue

@@ -46,7 +46,7 @@ import {
 } from 'vue-demi'
 import { halfYearOptions } from './config'
 import { HalfYearItem } from './types'
-import { getHalfYear } from './util'
+import { getHalfYear } from '@94ai/common-utils'
 
 const props = withDefaults(defineProps<{
   // 当前年

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@94ai/nf-double-half-year",
-  "version": "3.2.48",
+  "version": "3.2.49",
   "description": "> TODO: description",
   "keywords": [],
   "author": "zoujiahe <zoujiahe@94ai.com>",
@@ -14,7 +14,8 @@
     "url": "http://94ai.gitlab.com/zoujiahe/common-ui.git"
   },
   "dependencies": {
-    "@94ai/nf-theme-chalk": "^3.2.48",
+    "@94ai/common-utils": "^3.2.49",
+    "@94ai/nf-theme-chalk": "^3.2.49",
     "vue-demi": "^0.14.5"
   },
   "peerDependenciesMeta": {
@@ -30,5 +31,5 @@
   "types": "lib/index.d.ts",
   "main": "lib/nf-double-half-year.cjs.js",
   "module": "lib/nf-double-half-year.esm-bundler.js",
-  "gitHead": "91145bb7df8dad2c0cb3eefb101c6158ec854269"
+  "gitHead": "8cbd9254da4ec43f46b29198c0839bf2ba19132d"
 }

package/lib/util.d.ts

@@ -1,5 +0,0 @@
-export declare function getHalfYear(date?: Date): number;
-export declare function getNextYear(date?: Date): Date;
-export declare function endOf(now: Date | undefined, unit: any): Date;
-export declare function startOf(date: any, unit: any): Date;
-export declare function formatDate(date: any, format: any): any;

package/package/util.ts

@@ -1,58 +0,0 @@
-export function getHalfYear(date = new Date()) {
-  const currMonth = date.getMonth() + 1
-  return Math.floor((currMonth % 6 == 0 ? (currMonth / 6) : (currMonth / 6 + 1)))
-}
-
-export function getNextYear(date = new Date()) {
-  return new Date(date.setFullYear(date.getFullYear() + 1))
-}
-
-export function endOf(now = new Date(), unit) {
-  if (unit === 'year') {
-    return new Date(now.getFullYear(), 11, 31, 23, 59, 59, 999);
-  }
-  if (unit === 'month') {
-    return new Date(new Date(now.getFullYear(), now.getMonth() + 1, 1).getTime() - 1);
-  }
-  if (unit === 'week') {
-    return new Date(now.getFullYear(), now.getMonth(), now.getDate() + (6 - now.getDay()), 23, 59, 59, 999);
-  }
-  return new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
-}
-
-export function startOf(date, unit) {
-  const newDate = new Date(date)
-  if (unit === 'year') {
-    newDate.setMonth(0)
-    newDate.setDate(1)
-    newDate.setHours(0, 0, 0, 0)
-  } else if (unit === 'month') {
-    newDate.setDate(1)
-    newDate.setHours(0, 0, 0, 0)
-  } else if (unit === '') {
-    newDate.setHours(0, 0, 0, 0)
-  } else if (unit === 'hour') {
-    newDate.setMinutes(0, 0, 0)
-  } else if (unit === 'minute') {
-    newDate.setSeconds(0, 0)
-  } else if (unit === 'second') {
-    newDate.setMilliseconds(0)
-  }
-  return newDate
-}
-
-export function formatDate(date, format) {
-  const year = date.getFullYear()
-  const month = date.getMonth() + 1
-  const day = date.getDate()
-  const hours = date.getHours()
-  const minutes = date.getMinutes()
-  const seconds = date.getSeconds()
-  format = format.replace('YYYY', year)
-  format = format.replace('MM', String(month).padStart(2, '0'))
-  format = format.replace('DD', String(day).padStart(2, '0'))
-  format = format.replace('HH', String(hours).padStart(2, '0'))
-  format = format.replace('mm', String(minutes).padStart(2, '0'))
-  format = format.replace('ss', String(seconds).padStart(2, '0'))
-  return format
-}