ソースを参照

fix: update import type

suzigang 3 年 前
コミット
e7cb49f5fa

+ 3 - 2
src/packages/__VUE/animate/index.taro.vue

@@ -8,15 +8,16 @@
 <script lang="ts">
 import { reactive, toRefs, computed, PropType } from 'vue';
 import { createComponent } from '@/packages/utils/create';
+import { AnimateType, AnimateAction } from './type';
 const { componentName, create } = createComponent('animate');
 export default create({
   props: {
     type: {
-      type: String as PropType<import('./type').AnimateType>,
+      type: String as PropType<AnimateType>,
       default: ''
     },
     action: {
-      type: String as PropType<import('./type').AnimateAction>,
+      type: String as PropType<AnimateAction>,
       default: 'initial'
     },
     loop: {

+ 3 - 2
src/packages/__VUE/animate/index.vue

@@ -8,15 +8,16 @@
 <script lang="ts">
 import { reactive, toRefs, computed, PropType } from 'vue';
 import { createComponent } from '@/packages/utils/create';
+import { AnimateType, AnimateAction } from './type';
 const { componentName, create } = createComponent('animate');
 export default create({
   props: {
     type: {
-      type: String as PropType<import('./type').AnimateType>,
+      type: String as PropType<AnimateType>,
       default: ''
     },
     action: {
-      type: String as PropType<import('./type').AnimateAction>,
+      type: String as PropType<AnimateAction>,
       default: 'initial'
     },
     loop: {

+ 4 - 4
src/packages/__VUE/button/index.taro.vue

@@ -14,14 +14,14 @@
 import { PropType, CSSProperties, toRefs, computed } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { Loading } from '@nutui/icons-vue-taro';
-// import { ButtonShape, ButtonType, ButtonSize } from './type';
+import { ButtonShape, ButtonType, ButtonSize } from './type';
 const { componentName, create } = createComponent('button');
 export default create({
   components: { Loading },
   props: {
     color: String,
     shape: {
-      type: String as PropType<import('./type').ButtonShape>,
+      type: String as PropType<ButtonShape>,
       default: 'round'
     },
     plain: {
@@ -37,11 +37,11 @@ export default create({
       default: false
     },
     type: {
-      type: String as PropType<import('./type').ButtonType>,
+      type: String as PropType<ButtonType>,
       default: 'default'
     },
     size: {
-      type: String as PropType<import('./type').ButtonSize>,
+      type: String as PropType<ButtonSize>,
       default: 'normal'
     },
     block: {

+ 2 - 2
src/packages/__VUE/calendaritem/index.taro.vue

@@ -77,7 +77,7 @@ import Taro from '@tarojs/taro';
 import Utils from '@/packages/utils/date';
 import { useExpose } from '@/packages/utils/useExpose/index';
 import requestAniFrame from '@/packages/utils/raf';
-import { MonthInfo, Day } from './type';
+import { MonthInfo, Day, CalendarTaroState } from './type';
 import NutScrollView from '../scrollView/index.taro.vue';
 import { isArray } from '@/packages/utils/util';
 const TARO_ENV = Taro.getEnv();
@@ -170,7 +170,7 @@ export default create({
       return slots.bottomInfo;
     });
     // state
-    const state: import('./type').CalendarTaroState = reactive({
+    const state: CalendarTaroState = reactive({
       yearMonthTitle: '',
       defaultRange: [0, 1],
       compConthsDatas: [],

+ 2 - 2
src/packages/__VUE/calendaritem/index.vue

@@ -72,7 +72,7 @@ import { createComponent } from '@/packages/utils/create';
 const { create, translate } = createComponent('calendar-item');
 import Utils from '@/packages/utils/date';
 import requestAniFrame from '@/packages/utils/raf';
-import { MonthInfo, Day } from './type';
+import { MonthInfo, Day, CalendarState } from './type';
 import { useExpose } from '@/packages/utils/useExpose/index';
 
 type StringArr = string[];
@@ -170,7 +170,7 @@ export default create({
       return slots.bottomInfo;
     });
 
-    const state: import('./type').CalendarState = reactive({
+    const state: CalendarState = reactive({
       yearMonthTitle: '',
       defaultRange: [],
       currDate: '',

+ 1 - 1
src/packages/__VUE/calendaritem/type.ts

@@ -17,7 +17,7 @@ export interface CalendarState {
   propEndDate: string;
   currentIndex: number;
   unLoadPrev: boolean;
-  touchParams: import('./type').TouchParam;
+  touchParams: TouchParam;
   transformY: number;
   translateY: number;
   scrollDistance: number;

+ 3 - 2
src/packages/__VUE/datepicker/index.taro.vue

@@ -25,6 +25,7 @@ import { toRefs, watch, computed, reactive, onBeforeMount } from 'vue';
 import type { PropType } from 'vue';
 import Picker from '../picker/index.taro.vue';
 import { createComponent } from '@/packages/utils/create';
+import { Formatter, Filter } from './type';
 import { padZero, isDate as isDateU } from '@/packages/utils/util';
 const { componentName, create } = createComponent('date-picker');
 
@@ -84,7 +85,7 @@ export default create({
       validator: isDate
     },
     formatter: {
-      type: Function as PropType<import('./type').Formatter>,
+      type: Function as PropType<Formatter>,
       default: null
     },
     // 是否开启3D效果
@@ -97,7 +98,7 @@ export default create({
       type: [Number, String],
       default: 1000
     },
-    filter: Function as PropType<import('./type').Filter>,
+    filter: Function as PropType<Filter>,
     showToolbar: {
       type: Boolean,
       default: true

+ 3 - 2
src/packages/__VUE/datepicker/index.vue

@@ -26,6 +26,7 @@ import type { PropType } from 'vue';
 import Picker from '../picker/index.vue';
 import { PickerOption } from '../picker/types';
 import { createComponent } from '@/packages/utils/create';
+import { Formatter, Filter } from './type';
 import { padZero, isDate as isDateU } from '@/packages/utils/util';
 const { componentName, create, translate } = createComponent('date-picker');
 
@@ -85,7 +86,7 @@ export default create({
       validator: isDate
     },
     formatter: {
-      type: Function as PropType<import('./type').Formatter>,
+      type: Function as PropType<Formatter>,
       default: null
     },
     // 是否开启3D效果
@@ -98,7 +99,7 @@ export default create({
       type: [Number, String],
       default: 1000
     },
-    filter: Function as PropType<import('./type').Filter>,
+    filter: Function as PropType<Filter>,
     showToolbar: {
       type: Boolean,
       default: true

+ 3 - 2
src/packages/__VUE/image/index.vue

@@ -16,17 +16,18 @@
 import { reactive, toRefs, computed, PropType, useSlots, watch, CSSProperties } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { pxCheck } from '../../utils/pxCheck';
+import { ImageFit, ImagePosition } from './type';
 import { Image, ImageError } from '@nutui/icons-vue';
 const { componentName, create } = createComponent('image');
 export default create({
   props: {
     src: String,
     fit: {
-      type: String as PropType<import('./type').ImageFit>,
+      type: String as PropType<ImageFit>,
       default: 'fill'
     },
     position: {
-      type: String as PropType<import('./type').ImagePosition>,
+      type: String as PropType<ImagePosition>,
       default: 'center'
     },
     alt: {

+ 1 - 1
src/packages/__VUE/input/index.vue

@@ -230,7 +230,7 @@ export default create({
       default: false
     },
     confirmType: {
-      type: String as PropType<import('./type').ConfirmTextType>,
+      type: String as PropType<ConfirmTextType>,
       default: 'done'
     }
   },

+ 3 - 2
src/packages/__VUE/menuitem/index.taro.vue

@@ -72,6 +72,7 @@ import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('menu-item');
 import Popup from '../popup/index.taro.vue';
 import NutScrollView from '../scrollView/index.taro.vue';
+import { MenuItemOption } from './type';
 import { Check } from '@nutui/icons-vue-taro';
 
 let _zIndex = 2000;
@@ -80,7 +81,7 @@ export default create({
   props: {
     title: String,
     options: {
-      type: Array as PropType<import('./type').MenuItemOption[]>,
+      type: Array as PropType<MenuItemOption[]>,
       default: []
     },
     disabled: {
@@ -181,7 +182,7 @@ export default create({
       return match ? match.text : '';
     };
 
-    const onClick = (option: import('./type').MenuItemOption) => {
+    const onClick = (option: MenuItemOption) => {
       state.showPopup = false;
       state.isShowPlaceholderElement = false;
 

+ 3 - 2
src/packages/__VUE/menuitem/index.vue

@@ -63,12 +63,13 @@ import { reactive, PropType, inject, getCurrentInstance, computed, onUnmounted }
 import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('menu-item');
 import Popup from '../popup/index.vue';
+import { MenuItemOption } from './type';
 import { Check } from '@nutui/icons-vue';
 export default create({
   props: {
     title: String,
     options: {
-      type: Array as PropType<import('./type').MenuItemOption[]>,
+      type: Array as PropType<MenuItemOption[]>,
       default: []
     },
     disabled: {
@@ -167,7 +168,7 @@ export default create({
       return match ? match.text : '';
     };
 
-    const onClick = (option: import('./type').MenuItemOption) => {
+    const onClick = (option: MenuItemOption) => {
       state.showPopup = false;
       state.isShowPlaceholderElement = false;
 

+ 4 - 3
src/packages/__VUE/popover/index.taro.vue

@@ -70,6 +70,7 @@ const { componentName, create } = createComponent('popover');
 import { useTaroRect } from '@/packages/utils/useTaroRect';
 import { rect } from '@/packages/utils/useRect';
 import { isArray } from '@/packages/utils/util';
+import { PopoverList, PopoverTheme, PopoverLocation } from './type';
 import Taro from '@tarojs/taro';
 import Popup from '../popup/index.taro.vue';
 
@@ -80,9 +81,9 @@ export default create({
   },
   props: {
     visible: { type: Boolean, default: false },
-    list: { type: Array as PropType<import('./type').PopoverList[]>, default: [] },
-    theme: { type: String as PropType<import('./type').PopoverTheme>, default: 'light' },
-    location: { type: String as PropType<import('./type').PopoverLocation>, default: 'bottom' },
+    list: { type: Array as PropType<PopoverList[]>, default: [] },
+    theme: { type: String as PropType<PopoverTheme>, default: 'light' },
+    location: { type: String as PropType<PopoverLocation>, default: 'bottom' },
     offset: { type: Array, default: [0, 12] },
     arrowOffset: { type: Number, default: 0 },
     customClass: { type: String, default: '' },

+ 4 - 3
src/packages/__VUE/popover/index.vue

@@ -38,6 +38,7 @@ import { createComponent, renderIcon } from '@/packages/utils/create';
 import { isArray } from '@/packages/utils/util';
 import { useRect, rect } from '@/packages/utils/useRect';
 import Popup from '../popup/index.vue';
+import { PopoverList, PopoverTheme, PopoverLocation } from './type';
 const { create } = createComponent('popover');
 export default create({
   components: {
@@ -45,9 +46,9 @@ export default create({
   },
   props: {
     visible: { type: Boolean, default: false },
-    list: { type: Array as PropType<import('./type').PopoverList[]>, default: [] },
-    theme: { type: String as PropType<import('./type').PopoverTheme>, default: 'light' },
-    location: { type: String as PropType<import('./type').PopoverLocation>, default: 'bottom' },
+    list: { type: Array as PropType<PopoverList[]>, default: [] },
+    theme: { type: String as PropType<PopoverTheme>, default: 'light' },
+    location: { type: String as PropType<PopoverLocation>, default: 'bottom' },
     offset: { type: Array, default: [0, 12] },
     arrowOffset: { type: Number, default: 0 },
     customClass: { type: String, default: '' },

+ 6 - 5
src/packages/__VUE/range/index.taro.vue

@@ -81,6 +81,7 @@ import { ref, toRefs, computed, PropType, CSSProperties } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { useTouch } from '@/packages/utils/useTouch';
 import { useTaroRect } from '@/packages/utils/useTaroRect';
+import { SliderValue } from './type';
 const { componentName, create } = createComponent('range');
 
 export default create({
@@ -122,7 +123,7 @@ export default create({
       default: 1
     },
     modelValue: {
-      type: [Number, Array] as PropType<import('./type').SliderValue>,
+      type: [Number, Array] as PropType<SliderValue>,
       default: 0
     }
   },
@@ -131,8 +132,8 @@ export default create({
 
   setup(props, { emit }) {
     const buttonIndex = ref(0);
-    let startValue: import('./type').SliderValue;
-    let currentValue: import('./type').SliderValue;
+    let startValue: SliderValue;
+    let currentValue: SliderValue;
 
     const root = ref<HTMLElement>();
     const dragStatus = ref<'start' | 'draging' | ''>();
@@ -264,7 +265,7 @@ export default create({
       return Math.round(value / +step) * +step;
     };
 
-    const isSameValue = (newValue: import('./type').SliderValue, oldValue: import('./type').SliderValue) =>
+    const isSameValue = (newValue: SliderValue, oldValue: SliderValue) =>
       JSON.stringify(newValue) === JSON.stringify(oldValue);
 
     const handleOverlap = (value: number[]) => {
@@ -274,7 +275,7 @@ export default create({
       return value;
     };
 
-    const updateValue = (value: import('./type').SliderValue, end?: boolean) => {
+    const updateValue = (value: SliderValue, end?: boolean) => {
       if (isRange(value)) {
         value = handleOverlap(value).map(format);
       } else {

+ 6 - 5
src/packages/__VUE/range/index.vue

@@ -79,6 +79,7 @@ import { createComponent } from '@/packages/utils/create';
 import { useTouch } from '@/packages/utils/useTouch';
 import { useRect } from '@/packages/utils/useRect';
 import { isArray } from '@/packages/utils/util';
+import { SliderValue } from './type';
 const { componentName, create } = createComponent('range');
 
 export default create({
@@ -121,7 +122,7 @@ export default create({
       default: 1
     },
     modelValue: {
-      type: [Number, Array] as PropType<import('./type').SliderValue>,
+      type: [Number, Array] as PropType<SliderValue>,
       default: 0
     }
   },
@@ -130,8 +131,8 @@ export default create({
 
   setup(props, { emit }) {
     const buttonIndex = ref(0);
-    let startValue: import('./type').SliderValue;
-    let currentValue: import('./type').SliderValue;
+    let startValue: SliderValue;
+    let currentValue: SliderValue;
 
     const root = ref<HTMLElement>();
     const dragStatus = ref<'start' | 'draging' | ''>();
@@ -263,7 +264,7 @@ export default create({
       return Math.round(value / +step) * +step;
     };
 
-    const isSameValue = (newValue: import('./type').SliderValue, oldValue: import('./type').SliderValue) =>
+    const isSameValue = (newValue: SliderValue, oldValue: SliderValue) =>
       JSON.stringify(newValue) === JSON.stringify(oldValue);
 
     const handleOverlap = (value: number[]) => {
@@ -273,7 +274,7 @@ export default create({
       return value;
     };
 
-    const updateValue = (value: import('./type').SliderValue, end?: boolean) => {
+    const updateValue = (value: SliderValue, end?: boolean) => {
       if (isRange(value)) {
         value = handleOverlap(value).map(format);
       } else {

+ 2 - 1
src/packages/__VUE/searchbar/index.taro.vue

@@ -53,6 +53,7 @@
 import { toRefs, reactive, computed, ref, onMounted, PropType, Ref, CSSProperties } from 'vue';
 import { createComponent, renderIcon } from '@/packages/utils/create';
 import { CircleClose } from '@nutui/icons-vue-taro';
+import { TextAlign } from './type';
 const { create, translate } = createComponent('searchbar');
 export type confirmTextType = 'send' | 'search' | 'next' | 'go' | 'done';
 
@@ -203,7 +204,7 @@ export default create({
 
     const styleSearchbar = computed(() => {
       const style: CSSProperties = {
-        textAlign: props.inputAlign as import('./type').TextAlign
+        textAlign: props.inputAlign as TextAlign
       };
       return style;
     });

+ 2 - 1
src/packages/__VUE/searchbar/index.vue

@@ -60,6 +60,7 @@
 import { toRefs, reactive, computed, onMounted, ref, Ref, CSSProperties } from 'vue';
 import { createComponent, renderIcon } from '@/packages/utils/create';
 import { CircleClose } from '@nutui/icons-vue';
+import { TextAlign } from './type';
 const { create, translate } = createComponent('searchbar');
 // interface Events {
 //   eventName: 'change' | 'focus' | 'blur' | 'clear' | 'update:modelValue';
@@ -213,7 +214,7 @@ export default create({
 
     const styleSearchbar = computed(() => {
       const style: CSSProperties = {
-        textAlign: props.inputAlign as import('./type').TextAlign
+        textAlign: props.inputAlign as TextAlign
       };
       return style;
     });

+ 2 - 1
src/packages/__VUE/tag/index.vue

@@ -9,6 +9,7 @@
 import { PropType, CSSProperties, computed, toRefs } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { Close } from '@nutui/icons-vue';
+import { TagType } from './type';
 const { componentName, create } = createComponent('tag');
 
 export default create({
@@ -16,7 +17,7 @@ export default create({
     color: { type: String, default: '' },
     textColor: { type: String, default: '' },
     type: {
-      type: String as PropType<import('./type').TagType>,
+      type: String as PropType<TagType>,
       default: 'default'
     },
     plain: {

+ 9 - 10
src/packages/__VUE/uploader/index.taro.vue

@@ -67,13 +67,12 @@
 import { computed, PropType, reactive } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { UploaderTaro, UploadOptions } from './uploader';
-import { FileItem } from './type';
+import { FileItem, SizeType, SourceType } from './type';
 import { funInterceptor, Interceptor } from '@/packages/utils/util';
 import Progress from '../progress/index.taro.vue';
 import Button from '../button/index.taro.vue';
 const { componentName, create, translate } = createComponent('uploader');
 import Taro from '@tarojs/taro';
-import { isPromise } from '@/packages/utils/util';
 import { Photograph, Failure, Loading, Del, Link } from '@nutui/icons-vue-taro';
 export default create({
   components: {
@@ -89,11 +88,11 @@ export default create({
     name: { type: String, default: 'file' },
     url: { type: String, default: '' },
     sizeType: {
-      type: Array as PropType<import('./type').SizeType[]>,
+      type: Array as PropType<SizeType[]>,
       default: () => ['original', 'compressed']
     },
     sourceType: {
-      type: Array as PropType<import('./type').SourceType[]>,
+      type: Array as PropType<SourceType[]>,
       default: () => ['album', 'camera']
     },
     timeout: { type: [Number, String], default: 1000 * 30 },
@@ -125,7 +124,7 @@ export default create({
     },
     beforeDelete: {
       type: Function as PropType<Interceptor>,
-      default: (file: import('./type').FileItem, files: import('./type').FileItem[]) => {
+      default: (file: FileItem, files: FileItem[]) => {
         return true;
       }
     },
@@ -143,7 +142,7 @@ export default create({
     'file-item-click'
   ],
   setup(props, { emit }) {
-    const fileList = reactive(props.fileList) as Array<import('./type').FileItem>;
+    const fileList = reactive(props.fileList) as Array<FileItem>;
     let uploadQueue: Promise<UploaderTaro>[] = [];
 
     const classes = computed(() => {
@@ -182,11 +181,11 @@ export default create({
       });
     };
 
-    const fileItemClick = (fileItem: import('./type').FileItem) => {
+    const fileItemClick = (fileItem: FileItem) => {
       emit('file-item-click', { fileItem });
     };
 
-    const executeUpload = (fileItem: import('./type').FileItem, index: number) => {
+    const executeUpload = (fileItem: FileItem, index: number) => {
       const uploadOption = new UploadOptions();
       uploadOption.name = props.name;
       uploadOption.url = props.url;
@@ -314,7 +313,7 @@ export default create({
       return files;
     };
 
-    const deleted = (file: import('./type').FileItem, index: number) => {
+    const deleted = (file: FileItem, index: number) => {
       fileList.splice(index, 1);
       emit('delete', {
         file,
@@ -323,7 +322,7 @@ export default create({
       });
     };
 
-    const onDelete = (file: import('./type').FileItem, index: number) => {
+    const onDelete = (file: FileItem, index: number) => {
       clearUploadQueue(index);
       funInterceptor(props.beforeDelete, {
         args: [file, fileList],

+ 6 - 6
src/packages/__VUE/uploader/index.vue

@@ -115,7 +115,7 @@ export default create({
     },
     beforeDelete: {
       type: Function as PropType<Interceptor>,
-      default: (file: import('./type').FileItem, files: import('./type').FileItem[]) => {
+      default: (file: FileItem, files: FileItem[]) => {
         return true;
       }
     },
@@ -133,7 +133,7 @@ export default create({
     'file-item-click'
   ],
   setup(props, { emit }) {
-    const fileList: import('./type').FileItem[] = reactive(props.fileList) as Array<import('./type').FileItem>;
+    const fileList: FileItem[] = reactive(props.fileList) as Array<FileItem>;
     let uploadQueue: Promise<Uploader>[] = [];
 
     const classes = computed(() => {
@@ -162,11 +162,11 @@ export default create({
       el.value = '';
     };
 
-    const fileItemClick = (fileItem: import('./type').FileItem) => {
+    const fileItemClick = (fileItem: FileItem) => {
       emit('file-item-click', { fileItem });
     };
 
-    const executeUpload = (fileItem: import('./type').FileItem, index: number) => {
+    const executeUpload = (fileItem: FileItem, index: number) => {
       const uploadOption = new UploadOptions();
       uploadOption.url = props.url;
       uploadOption.formData = fileItem.formData;
@@ -288,7 +288,7 @@ export default create({
       return files;
     };
 
-    const deleted = (file: import('./type').FileItem, index: number) => {
+    const deleted = (file: FileItem, index: number) => {
       fileList.splice(index, 1);
       emit('delete', {
         file,
@@ -297,7 +297,7 @@ export default create({
       });
     };
 
-    const onDelete = (file: import('./type').FileItem, index: number) => {
+    const onDelete = (file: FileItem, index: number) => {
       clearUploadQueue(index);
       funInterceptor(props.beforeDelete, {
         args: [file, fileList],