@wyfex/ivue 0.19.4 → 0.20.0

package/dist/types/UseCrud/defaultExtConfig.d.ts

@@ -1,4 +1,8 @@
 declare const _default: {
+    crudFetch: {
+        queryImmediate: true;
+        autoCancelQueryStrategy: "unmount";
+    };
     mode: {
         type: "PAGE";
     };

package/dist/types/UseCrud/hook.d.ts

@@ -1,5 +1,5 @@
 import { ComputedRef, Slots } from 'vue';
-import { Emits, Props } from './types';
+import { Emits, Props, UseCrudReturn } from './types';
 import { GlobalConfig } from '../../types';
 export declare const useCrud: ({ mergedProps, globalConfig, slots, uefRef, modalRef, emits }: {
     mergedProps: ComputedRef<Props>;
@@ -8,24 +8,4 @@ export declare const useCrud: ({ mergedProps, globalConfig, slots, uefRef, modal
     uefRef: any;
     modalRef: any;
     emits: Emits;
-}) => {
-    state: any;
-    heightComputed: ComputedRef<string>;
-    margin: ComputedRef<string | undefined>;
-    actionBar: import('./types').ActionBar | undefined;
-    handleDisplayQueryForm: () => void;
-    showModal: import('vue').Ref<boolean, boolean>;
-    modalComponent: import('vue').ShallowRef<null, null> | import('vue').ShallowRef<import('vue').ComponentOptions<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, any, any, any, string, {}, {}, string, {}, {}, {}, string, import('vue').ComponentProvideOptions>, import('vue').ComponentOptions<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, any, any, any, string, {}, {}, string, {}, {}, {}, string, import('vue').ComponentProvideOptions>> | import('vue').ShallowRef<import('vue').FunctionalComponent<any, {}, any, {}>, import('vue').FunctionalComponent<any, {}, any, {}>> | import('vue').ShallowRef<{
-        new (...args: any[]): any;
-        __isFragment?: never;
-        __isTeleport?: never;
-        __isSuspense?: never;
-    }, {
-        new (...args: any[]): any;
-        __isFragment?: never;
-        __isTeleport?: never;
-        __isSuspense?: never;
-    }>;
-    handleShowModal: () => Promise<void>;
-    handleCloseModal: ComputedRef<any>;
-};
+}) => UseCrudReturn;

package/dist/types/UseCrud/index.vue.d.ts

@@ -8,10 +8,19 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         default: () => {};
     };
 }>, {
-    uefRef: import('vue').Ref<any, any>;
+    state: import('vue').Ref<import('./types').UseCrudState, import('./types').UseCrudState>;
+    onQuery: (e: Record<string, unknown>, done?: () => void) => void;
+    onCancelQueryRequest: () => void;
+    handleDelete: (payload: {
+        id?: string | number;
+        ids?: string | Array<string | number>;
+    }, loadingConfig: {
+        source?: Record<string, unknown>;
+        key?: string;
+    }, successCb?: () => void, errorCb?: (err: unknown) => void, successMsg?: string) => Promise<void>;
     modalRef: import('vue').Ref<any, any>;
     handleShowModal: () => Promise<void>;
-    handleCloseModal: import('vue').ComputedRef<any>;
+    handleCloseModal: import('vue').ComputedRef<() => void>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
     onDictKeys: (value?: string[] | undefined) => any;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{

package/dist/types/UseCrud/types.d.ts

@@ -1,4 +1,4 @@
-import { Component, ExtractPropTypes } from 'vue';
+import { Component, ComputedRef, ExtractPropTypes, Ref, ShallowRef } from 'vue';
 import { default as componentProps } from './props';
 import { FormColumn } from '../UseElForm/types';
 import { TableColumn, ExtConfig as TableExtConfig } from '../UseElTable/types';
@@ -6,9 +6,10 @@ export type Props = ExtractPropTypes<typeof componentProps>;
 export type Emits = {
     (e: 'onDictKeys', value?: string[]): void;
 };
-export type BaseConfigs = Omit<FormColumn, 'prop'> & Omit<TableColumn, 'prop'>;
+export type BaseConfigs = FormColumn & TableColumn;
 export interface Configs extends BaseConfigs {
-    prop: string;
+    queryLabel?: string;
+    queryProp?: string;
     onlySearch?: boolean;
     tableOrder?: number;
 }
@@ -25,9 +26,53 @@ export interface ActionBar {
     divider?: Divider;
 }
 export interface ExtConfig {
+    crudFetch?: {
+        queryApi?: Function;
+        queryImmediate?: boolean;
+        autoCancelQueryStrategy?: 'none' | 'unmount' | 'deactivate' | 'both';
+        onQueryBefore?: (done: () => void) => void;
+        onQueryError?: (err: any) => void;
+        deleteApi?: Function;
+    };
     actionBar?: ActionBar;
     modal?: {
         type?: 'Drawer' | 'Dialog';
     };
 }
 export type MergedExtConfig = ExtConfig & TableExtConfig;
+export interface UseCrudState {
+    formColumns: FormColumn[];
+    tableColumns: TableColumn[];
+    formModel: Record<string, any>;
+    formParams: Record<string, any>;
+    tableLoading: boolean;
+    tableData: any[];
+    currentPage: number;
+    pageSize: number;
+    total: number;
+    dictMap: Record<string, any>;
+}
+export interface UseCrudReturn {
+    state: Ref<UseCrudState>;
+    heightComputed: ComputedRef<string>;
+    fetchTableData: (options?: {
+        params?: Record<string, any>;
+        isPageApi?: boolean;
+    }, cb?: () => void) => Promise<any>;
+    onQuery: (e: Record<string, unknown>, done?: () => void) => void;
+    onCancelQueryRequest: () => void;
+    handleDelete: (payload: {
+        id?: string | number;
+        ids?: string | Array<string | number>;
+    }, loadingConfig: {
+        source?: Record<string, unknown>;
+        key?: string;
+    }, successCb?: () => void, errorCb?: (err: unknown) => void, successMsg?: string) => Promise<void>;
+    margin: ComputedRef<string | undefined>;
+    actionBar: any;
+    handleDisplayQueryForm: () => void;
+    showModal: Ref<boolean>;
+    modalComponent: ShallowRef<Component | null>;
+    handleShowModal: () => Promise<void>;
+    handleCloseModal: ComputedRef<() => void>;
+}

package/dist/types/UseCrud/utils.d.ts

@@ -1,2 +1,48 @@
-export declare const getFilteredFormColumns: (list: any) => any;
-export declare const getFilteredAndSortedTableColumns: (list: any) => any[];
+import { Configs } from './types';
+export declare const getFilteredFormColumns: (list: Configs[]) => {
+    label: string | undefined;
+    prop: string | undefined;
+    queryLabel?: string;
+    queryProp?: string;
+    onlySearch?: boolean;
+    tableOrder?: number;
+    required?: boolean | import('../UseElForm/types').IRequired;
+    errorMessage?: string;
+    disabled?: boolean;
+    useDict?: boolean | string | import('../../types').UseDict;
+    span?: number;
+    labelWidth?: string;
+    labelPosition?: "left" | "right" | "top";
+    show?: boolean;
+    filter?: boolean;
+    formItemClass?: string;
+    slot?: string | boolean;
+    renderConfig?: import('../../types').RenderConfig;
+    inputConfig?: import('../UseElForm/types').InputConfig;
+    inputNumberConfig?: import('../UseElForm/types').InputNumberConfig;
+    selectConfig?: import('../UseElForm/types').SelectConfig;
+    treeSelectConfig?: import('../UseElForm/types').TreeSelectConfig;
+    cascaderConfig?: import('../UseElForm/types').CascaderConfig;
+    datePickerConfig?: import('../UseElForm/types').DatePickerConfig;
+    timePickerConfig?: import('../UseElForm/types').TimePickerConfig;
+    timeSelectConfig?: import('../UseElForm/types').TimeSelectConfig;
+    radioConfig?: import('../UseElForm/types').RadioConfig;
+    switchConfig?: import('../UseElForm/types').SwitchConfig;
+    inputRangeConfig?: import('../UseElForm/types').InputRangeConfig;
+    width?: string | number;
+    minWidth?: string | number;
+    align?: string;
+    fixed?: boolean | string;
+    sortable?: boolean;
+    showOverflowTooltip?: boolean;
+    extConfig?: {
+        header?: import('../UseElTable/types').Header;
+        edit?: import('../UseElTable/types').Edit;
+        formatter?: Function;
+        class?: string | string[];
+        style?: string | Record<string, unknown>;
+        slot?: boolean | string;
+    };
+    children?: import('../UseElTable/types').TableColumn[];
+}[];
+export declare const getFilteredAndSortedTableColumns: (list: Configs[]) => Configs[];

package/dist/types/UseElCheckbox/index.vue.d.ts

@@ -54,8 +54,8 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     "onUpdate:modelValue"?: ((value: string | number | (string | number)[]) => any) | undefined;
 }>, {
     data: any;
-    modelValue: string | unknown[];
     toJoin: boolean;
+    modelValue: string | unknown[];
     defaultProps: Record<string, any>;
     showCheckAll: boolean;
     vertical: boolean;

package/dist/types/UseElDatePicker/index.vue.d.ts

@@ -81,13 +81,13 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
 }>, {
     useRender: boolean | import('../../types').RenderConfig;
     type: string;
-    modelValue: string | number | unknown[];
+    placeholder: string;
+    format: string;
+    valueFormat: string;
     startPlaceholder: string;
     endPlaceholder: string;
     rangeSeparator: string;
-    format: string;
-    valueFormat: string;
-    placeholder: string;
+    modelValue: string | number | unknown[];
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/types/UseElDatePicker/types.d.ts

@@ -1,6 +1,6 @@
 import { ExtractPropTypes } from 'vue';
 import { default as componentProps } from './props';
 export type Props = ExtractPropTypes<typeof componentProps>;
-export interface Emits {
+export type Emits = {
     (e: 'update:modelValue', value: string | number | any[]): void;
-}
+};

package/dist/types/UseElDialog/hook.d.ts

@@ -8,6 +8,7 @@ export declare const useElDialog: ({ props, edRef }: {
     edRef: Ref<DialogInstance | null, DialogInstance | null>;
     handleClose: import('vue').ComputedRef<(() => void) | undefined>;
     isFullScreen: Ref<boolean, boolean>;
+    maxHeight: import('vue').ComputedRef<string | number>;
     iconComponent: import('vue').ComputedRef<string>;
     handleFullScreen: () => void;
     handleClosed: () => void;

package/dist/types/UseElDialog/index.vue.d.ts

@@ -7,6 +7,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: BooleanConstructor;
         default: boolean;
     };
+    top: {
+        type: StringConstructor;
+        default: string;
+    };
     maxHeight: {
         type: (StringConstructor | NumberConstructor)[];
         default: string;
@@ -60,6 +64,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;
@@ -85,6 +93,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: BooleanConstructor;
         default: boolean;
     };
+    top: {
+        type: StringConstructor;
+        default: string;
+    };
     maxHeight: {
         type: (StringConstructor | NumberConstructor)[];
         default: string;
@@ -138,6 +150,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;
@@ -152,6 +168,8 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         default: () => void;
     };
 }>> & Readonly<{}>, {
+    top: string;
+    onClose: Function;
     title: string;
     appendToBody: boolean;
     maxHeight: string | number;
@@ -164,9 +182,9 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     showFooterTopBorder: boolean;
     footerPosition: string;
     strictCloseEvent: boolean;
-    onClose: Function;
     confirmBtnText: string;
     cancelBtnText: string;
+    confirmLoading: boolean;
     cancelBtnType: string;
     onConfirm: Function;
     onCancel: Function;

package/dist/types/UseElDialog/props.d.ts

@@ -7,6 +7,10 @@ declare const _default: {
         type: BooleanConstructor;
         default: boolean;
     };
+    top: {
+        type: StringConstructor;
+        default: string;
+    };
     maxHeight: {
         type: (StringConstructor | NumberConstructor)[];
         default: string;
@@ -60,6 +64,10 @@ declare const _default: {
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;

package/dist/types/UseElDrawer/index.vue.d.ts

@@ -48,6 +48,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;
@@ -114,6 +118,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;
@@ -129,6 +137,7 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     };
 }>> & Readonly<{}>, {
     size: string | number;
+    onClose: Function;
     title: string;
     appendToBody: boolean;
     closeOnClickModal: boolean;
@@ -137,9 +146,9 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     showFooter: boolean;
     footerPosition: string;
     strictCloseEvent: boolean;
-    onClose: Function;
     confirmBtnText: string;
     cancelBtnText: string;
+    confirmLoading: boolean;
     cancelBtnType: string;
     onConfirm: Function;
     onCancel: Function;

package/dist/types/UseElDrawer/props.d.ts

@@ -48,6 +48,10 @@ declare const _default: {
         type: StringConstructor;
         default: string;
     };
+    confirmLoading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     cancelBtnType: {
         type: StringConstructor;
         default: string;

package/dist/types/UseElForm/types.d.ts

@@ -166,8 +166,7 @@ export interface IRequired {
 }
 export interface FormColumn {
     label?: string;
-    prop: string;
-    queryProp?: string | string[];
+    prop?: string;
     required?: boolean | IRequired;
     errorMessage?: string;
     disabled?: boolean;

package/dist/types/UseElInput/index.vue.d.ts

@@ -102,17 +102,17 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     "onUpdate:modelValue"?: ((value: string) => any) | undefined;
 }>, {
     useRender: boolean | import('../../types').RenderConfig;
-    width: string;
     unit: string | Record<string, any>;
-    modelValue: string | number;
+    clearable: boolean;
+    rows: number;
     resize: string;
     placeholder: string;
-    clearable: boolean;
+    width: string;
     prefixContent: string | Record<string, any>;
     suffixContent: string | Record<string, any>;
     prependContent: string | Record<string, any>;
     appendContent: string | Record<string, any>;
-    rows: number;
+    modelValue: string | number;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/types/UseElSelect/index.vue.d.ts

@@ -81,13 +81,13 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
 }>, {
     useRender: boolean | import('../../types').RenderConfig;
     dictProps: import('../../types').DictProps;
-    width: string;
-    modelValue: string | number | boolean | unknown[];
-    toJoin: boolean;
-    placeholder: string;
     clearable: boolean;
+    placeholder: string;
+    width: string;
     options: Record<string, any>[];
     useV2: boolean;
+    toJoin: boolean;
+    modelValue: string | number | boolean | unknown[];
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;
 export default _default;

package/dist/types/UseElTable/defaultExtConfig.d.ts

@@ -30,7 +30,7 @@ declare const _default: {
     pagination: {
         total: number;
         marginTop: number;
-        position: string;
+        position: "right";
         pageSizes: number[];
         background: true;
         layout: string;

package/dist/types/UseElTable/types.d.ts

@@ -24,14 +24,6 @@ export interface Edit {
     component: Component;
     attrs?: EditAttrs;
 }
-export interface TableColumnExtConfig {
-    header?: Header;
-    edit?: Edit;
-    formatter?: Function;
-    class?: string | string[];
-    style?: string | Record<string, unknown>;
-    slot?: boolean | string;
-}
 export interface TableColumn {
     label?: string;
     prop?: string;
@@ -43,7 +35,14 @@ export interface TableColumn {
     fixed?: boolean | string;
     sortable?: boolean;
     showOverflowTooltip?: boolean;
-    extConfig?: TableColumnExtConfig;
+    extConfig?: {
+        header?: Header;
+        edit?: Edit;
+        formatter?: Function;
+        class?: string | string[];
+        style?: string | Record<string, unknown>;
+        slot?: boolean | string;
+    };
     children?: TableColumn[];
 }
 export interface Selection {
@@ -94,7 +93,7 @@ export interface ExtConfig {
     pagination?: {
         total?: number;
         marginTop?: number;
-        position?: string;
+        position?: 'left' | 'center' | 'right';
         pageSizes?: number[];
         background?: boolean;
         layout?: string;

package/dist/types/UseElTimeSelect/index.vue.d.ts

@@ -0,0 +1,28 @@
+declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+    useRender: {
+        type: import('vue').PropType<boolean | import('../../types').RenderConfig>;
+        default: boolean;
+    };
+}>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {} & {
+    "update:modelValue": (value: string | number | any[]) => any;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+    useRender: {
+        type: import('vue').PropType<boolean | import('../../types').RenderConfig>;
+        default: boolean;
+    };
+}>> & Readonly<{
+    "onUpdate:modelValue"?: ((value: string | number | any[]) => any) | undefined;
+}>, {
+    useRender: boolean | import('../../types').RenderConfig;
+    modelValue: string;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;

package/dist/types/UseElTimeSelect/props.d.ts

@@ -0,0 +1,13 @@
+import { PropType } from 'vue';
+import { RenderConfig } from '../../types';
+declare const _default: {
+    modelValue: {
+        type: StringConstructor;
+        default: string;
+    };
+    useRender: {
+        type: PropType<boolean | RenderConfig>;
+        default: boolean;
+    };
+};
+export default _default;

package/dist/types/UseElTimeSelect/types.d.ts

@@ -0,0 +1,6 @@
+import { ExtractPropTypes } from 'vue';
+import { default as componentProps } from './props';
+export type Props = ExtractPropTypes<typeof componentProps>;
+export type Emits = {
+    (e: 'update:modelValue', value: string | number | any[]): void;
+};

package/dist/types/UseRender/index.vue.d.ts

@@ -50,9 +50,9 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     };
 }>> & Readonly<{}>, {
     class: string;
+    separator: string;
     style: string | Record<string, any>;
     emptyText: string;
-    separator: string;
     parseKey: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: typeof __VLS_export;

package/dist/types/index.d.ts

@@ -11,10 +11,10 @@ export { default as UseElInput } from './UseElInput/index.vue';
 export { default as UseElSelect } from './UseElSelect/index.vue';
 export { default as UseElSwitch } from './UseElSwitch/index.vue';
 export { default as UseElTable } from './UseElTable/index.vue';
+export { default as UseElTimeSelect } from './UseElTimeSelect/index.vue';
 export { default as UseElTooltip } from './UseElTooltip/index.vue';
 export { default as UseElUpload } from './UseElUpload/index.vue';
 export { default as UseIconfont } from './UseIconfont/index.vue';
 export { default as UseLineTitle } from './UseLineTitle/index.vue';
 export { default as UseRender } from './UseRender/index.vue';
 export { default as UseSvgIcon } from './UseSvgIcon/index.vue';
-export { useCrud } from './UseCrud/useCrudWithBusiness';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wyfex/ivue",
-  "version": "0.19.4",
-  "description": "万有前端 X 体系下基于 Vite8 + Vue3 + Typescript6 + ElementPlus2 构建的 iVue 组件库",
+  "version": "0.20.0",
+  "description": "万有前端 X 体系下基于 Vite8 + Vue3 + Typescript6 + ElementPlus2 构建的高性能组件库",
   "homepage": "https://wyfex.top/idocs/ivue",
   "type": "module",
   "main": "dist/index.umd.cjs",
@@ -37,7 +37,7 @@
     "wyfex",
     "ivue",
     "wyfex-ivue",
-    "万有前端",
+    "万有前端 X",
     "万有前端 X ·iVue"
   ],
   "author": "Symbol(王独秀) <963569210@qq.com>",
@@ -58,12 +58,12 @@
     "element-plus": "^2.14.3",
     "sass-embedded": "^1.100.0",
     "typescript": "~6.0.3",
-    "unplugin-auto-import": "^21.0.0",
+    "unplugin-auto-import": "^21.1.0",
     "unplugin-dts": "^1.0.3",
     "unplugin-vue-components": "^32.1.0",
-    "vite": "^8.1.5",
+    "vite": "^8.2.1",
     "vite-svg-loader": "^5.1.1",
-    "vue": "^3.5.40",
-    "vue-tsc": "^3.3.8"
+    "vue": "^3.5.41",
+    "vue-tsc": "^3.3.9"
   }
 }

package/src/components/UseCrud/defaultExtConfig.ts

@@ -4,6 +4,7 @@ import type { MergedExtConfig } from './types'
  * 默认扩展配置
  */
 export default {
+  crudFetch: { queryImmediate: true, autoCancelQueryStrategy: 'unmount' },
   mode: { type: 'PAGE' },
   actionBar: {
     margin: '20px 0',

package/src/components/UseCrud/props.ts

@@ -8,7 +8,7 @@ export default {
   /**
    * 配置 必传
    * 1、该configs是【formColumns】和【tableColumns】的统一配置入口
-   * 2、该configs在【formColumns】和【tableColumns】的配置基础上新增了【onlySearch】和【tableOrder】配置项用于兼容特殊应用场景
+   * 2、该configs在【formColumns】和【tableColumns】的配置基础上新增了【queryLabel】、【onlySearch】和【tableOrder】配置项用于兼容特殊应用场景
    */
   configs: {
     type: Array as PropType<Configs[]>,