command-center-v3-common 0.0.58 → 0.0.60

package/dist/index.d.ts

@@ -73,7 +73,7 @@ fuzzySearch: boolean;
 disableDataList: UserInfo[];
 }, {}>;
 
-declare const __VLS_component_10: DefineComponent<__VLS_WithDefaults_18<__VLS_TypePropsToRuntimeProps_18<TreeCpnsProps & TreeProps & Props_12>, {
+declare const __VLS_component_10: DefineComponent<__VLS_WithDefaults_19<__VLS_TypePropsToRuntimeProps_19<TreeCpnsProps & TreeProps & Props_13>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -95,12 +95,13 @@ disableDataList: () => any[];
 setCheckedKeys: (keys: string[]) => void;
 setSelectedList: (dataList: any[]) => void;
 setChecked: (item: any, type: boolean) => void;
+getData: () => Promise<void>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 onSelectedData: (...args: any[]) => void;
 onCurrent: (...args: any[]) => void;
 onCurrentDelete: (...args: any[]) => void;
 onCurrentDepartment: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_18<__VLS_TypePropsToRuntimeProps_18<TreeCpnsProps & TreeProps & Props_12>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_19<__VLS_TypePropsToRuntimeProps_19<TreeCpnsProps & TreeProps & Props_13>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -189,6 +190,7 @@ setCheckedKeys: (keys: string[]) => void;
 setSelectedList: (dataList: any[]) => void;
 setChecked: (item: any, type: boolean) => void;
 setDeviceStatus: (deviceStatus: DeviceStatus) => void;
+getData: () => Promise<void>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 onSelectedData: (...args: any[]) => void;
 onCurrent: (...args: any[]) => void;
@@ -237,7 +239,7 @@ disableDataList: Device[];
 returnDisableDevice: boolean;
 }, {}>;
 
-declare const __VLS_component_4: DefineComponent<__VLS_WithDefaults_6<__VLS_TypePropsToRuntimeProps_6<Props_5>, {
+declare const __VLS_component_4: DefineComponent<__VLS_WithDefaults_7<__VLS_TypePropsToRuntimeProps_7<Props_6>, {
 initParams: () => void;
 mapDisplayList: () => any[];
 tableColumns: () => ({
@@ -255,7 +257,7 @@ prop?: undefined;
 "on-map-display-fn": (...args: any[]) => void;
 "on-get-data": (...args: any[]) => void;
 "on-delete": (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_6<__VLS_TypePropsToRuntimeProps_6<Props_5>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_7<__VLS_TypePropsToRuntimeProps_7<Props_6>, {
 initParams: () => void;
 mapDisplayList: () => any[];
 tableColumns: () => ({
@@ -279,7 +281,7 @@ mapDisplayList: any[];
 tableColumns: TableColumnsItem[];
 }, {}>;
 
-declare const __VLS_component_5: DefineComponent<__VLS_WithDefaults_9<__VLS_TypePropsToRuntimeProps_9<Props_8>, {
+declare const __VLS_component_5: DefineComponent<__VLS_WithDefaults_10<__VLS_TypePropsToRuntimeProps_10<Props_9>, {
 size: string;
 className: string;
 placeholder: string;
@@ -290,7 +292,7 @@ setDefaultValue: (organizationId: any) => void;
 getData: () => Promise<void>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 change: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_9<__VLS_TypePropsToRuntimeProps_9<Props_8>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_10<__VLS_TypePropsToRuntimeProps_10<Props_9>, {
 size: string;
 className: string;
 placeholder: string;
@@ -306,7 +308,7 @@ className: string;
 contentType: boolean;
 }, {}>;
 
-declare const __VLS_component_6: DefineComponent<__VLS_WithDefaults_10<__VLS_TypePropsToRuntimeProps_10<TreeCpnsProps & TreeProps & GroupTreeProps>, {
+declare const __VLS_component_6: DefineComponent<__VLS_WithDefaults_11<__VLS_TypePropsToRuntimeProps_11<TreeCpnsProps & TreeProps & GroupTreeProps>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -328,6 +330,7 @@ returnDisableDevice: boolean;
 setCheckedKeys: (keys: string[]) => void;
 setSelectedList: (dataList: any[]) => void;
 setChecked: (item: any, type: boolean) => void;
+getData: () => Promise<void>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 onSelectedData: (...args: any[]) => void;
 onCurrent: (...args: any[]) => void;
@@ -335,7 +338,7 @@ onCurrentDelete: (...args: any[]) => void;
 onCurrentDepartment: (...args: any[]) => void;
 onClickDevice: (...args: any[]) => void;
 onClickOrganization: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_10<__VLS_TypePropsToRuntimeProps_10<TreeCpnsProps & TreeProps & GroupTreeProps>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_11<__VLS_TypePropsToRuntimeProps_11<TreeCpnsProps & TreeProps & GroupTreeProps>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -378,7 +381,7 @@ showCheckboxButton: boolean;
 fuzzySearch: boolean;
 }, {}>;
 
-declare const __VLS_component_7: DefineComponent<__VLS_WithDefaults_11<__VLS_TypePropsToRuntimeProps_11<TreeCpnsProps & TreeProps & Props_9>, {
+declare const __VLS_component_7: DefineComponent<__VLS_WithDefaults_12<__VLS_TypePropsToRuntimeProps_12<TreeCpnsProps & TreeProps & Props_10>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -399,12 +402,13 @@ disableDataList: () => any[];
 setCheckedKeys: (keys: string[]) => void;
 setSelectedList: (dataList: any[]) => void;
 setChecked: (item: any, type: boolean) => void;
+getData: () => Promise<void>;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 onSelectedData: (...args: any[]) => void;
 onCurrent: (...args: any[]) => void;
 onCurrentDelete: (...args: any[]) => void;
 onCurrentDepartment: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_11<__VLS_TypePropsToRuntimeProps_11<TreeCpnsProps & TreeProps & Props_9>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_12<__VLS_TypePropsToRuntimeProps_12<TreeCpnsProps & TreeProps & Props_10>, {
 fuzzySearch: boolean;
 highlightSelected: boolean;
 getData: FunctionConstructor;
@@ -443,7 +447,7 @@ fuzzySearch: boolean;
 disableDataList: UserInfo[];
 }, {}>;
 
-declare const __VLS_component_8: DefineComponent<__VLS_WithDefaults_16<__VLS_TypePropsToRuntimeProps_16<TableProps>, {
+declare const __VLS_component_8: DefineComponent<__VLS_WithDefaults_17<__VLS_TypePropsToRuntimeProps_17<TableProps>, {
 height: number;
 columnList: () => any[];
 searchArr: () => any[];
@@ -477,7 +481,7 @@ getTotalElements: typeof getTotalElements;
 getTotal: (...args: any[]) => void;
 selectionChange: (...args: any[]) => void;
 onRowcClick: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_16<__VLS_TypePropsToRuntimeProps_16<TableProps>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_17<__VLS_TypePropsToRuntimeProps_17<TableProps>, {
 height: number;
 columnList: () => any[];
 searchArr: () => any[];
@@ -503,7 +507,7 @@ onSelectionChange?: (...args: any[]) => any;
 onOnRowcClick?: (...args: any[]) => any;
 }, {}, {}>;
 
-declare const __VLS_component_9: DefineComponent<__VLS_WithDefaults_17<__VLS_TypePropsToRuntimeProps_17<RoundButton_2>, {
+declare const __VLS_component_9: DefineComponent<__VLS_WithDefaults_18<__VLS_TypePropsToRuntimeProps_18<RoundButton_2>, {
 gbDevice: number;
 onlineState: number;
 stateShow: boolean;
@@ -511,7 +515,7 @@ url: string;
 name: string;
 className: string;
 contentClass: string;
-}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_17<__VLS_TypePropsToRuntimeProps_17<RoundButton_2>, {
+}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_18<__VLS_TypePropsToRuntimeProps_18<RoundButton_2>, {
 gbDevice: number;
 onlineState: number;
 stateShow: boolean;
@@ -545,6 +549,8 @@ declare type __VLS_NonUndefinedable_19<T> = T extends undefined ? never : T;
 
 declare type __VLS_NonUndefinedable_2<T> = T extends undefined ? never : T;
 
+declare type __VLS_NonUndefinedable_20<T> = T extends undefined ? never : T;
+
 declare type __VLS_NonUndefinedable_3<T> = T extends undefined ? never : T;
 
 declare type __VLS_NonUndefinedable_4<T> = T extends undefined ? never : T;
@@ -607,6 +613,10 @@ declare type __VLS_Prettify_2<T> = {
     [K in keyof T]: T[K];
 } & {};
 
+declare type __VLS_Prettify_20<T> = {
+    [K in keyof T]: T[K];
+} & {};
+
 declare type __VLS_Prettify_3<T> = {
     [K in keyof T]: T[K];
 } & {};
@@ -824,6 +834,15 @@ declare type __VLS_TypePropsToRuntimeProps_2<T> = {
     };
 };
 
+declare type __VLS_TypePropsToRuntimeProps_20<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType_2<__VLS_NonUndefinedable_20<T[K]>>;
+    } : {
+        type: PropType_2<T[K]>;
+        required: true;
+    };
+};
+
 declare type __VLS_TypePropsToRuntimeProps_3<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
         type: PropType_2<__VLS_NonUndefinedable_3<T[K]>>;
@@ -959,6 +978,12 @@ declare type __VLS_WithDefaults_2<P, D> = {
     }> : P[K];
 };
 
+declare type __VLS_WithDefaults_20<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify_20<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+
 declare type __VLS_WithDefaults_3<P, D> = {
     [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify_3<P[K] & {
         default: D[K];
@@ -1664,6 +1689,12 @@ value: number;
 
 export declare const HyDeviceTree: __VLS_WithTemplateSlots_3<typeof __VLS_component_3, ReturnType<typeof __VLS_template_3>>;
 
+export declare const HyDeviceTreeCpns: DefineComponent<__VLS_WithDefaults_6<__VLS_TypePropsToRuntimeProps_6<Props_5>, {}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
+onClickDevice: (...args: any[]) => void;
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_6<__VLS_TypePropsToRuntimeProps_6<Props_5>, {}>>> & {
+onOnClickDevice?: (...args: any[]) => any;
+}, {}, {}>;
+
 export declare const HyEditSpotCheck: DefineComponent<    {}, {
 show: (id?: any, params?: any) => MessageHandler;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -1696,7 +1727,7 @@ imageViewerClose: typeof imageViewerClose;
 
 export declare const HyMapNoPermissions: DefineComponent<    {}, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<{}>>, {}, {}>;
 
-export declare const HyMapSearchPlace: DefineComponent<__VLS_WithDefaults_7<__VLS_TypePropsToRuntimeProps_7<Props_6>, {
+export declare const HyMapSearchPlace: DefineComponent<__VLS_WithDefaults_8<__VLS_TypePropsToRuntimeProps_8<Props_7>, {
 map: () => any;
 h: () => any;
 poi: () => any;
@@ -1704,7 +1735,7 @@ searchTypes: () => {
 label: string;
 value: number;
 }[];
-}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_7<__VLS_TypePropsToRuntimeProps_7<Props_6>, {
+}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_8<__VLS_TypePropsToRuntimeProps_8<Props_7>, {
 map: () => any;
 h: () => any;
 poi: () => any;
@@ -1722,14 +1753,14 @@ value: number;
 }[];
 }, {}>;
 
-export declare const HyMenuComponents: DefineComponent<__VLS_WithDefaults_8<__VLS_TypePropsToRuntimeProps_8<Props_7>, {
+export declare const HyMenuComponents: DefineComponent<__VLS_WithDefaults_9<__VLS_TypePropsToRuntimeProps_9<Props_8>, {
 menuList: () => any[];
 menuTitle: string;
 }>, {
 setRouterPath: typeof setRouterPath;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 onChange: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_8<__VLS_TypePropsToRuntimeProps_8<Props_7>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_9<__VLS_TypePropsToRuntimeProps_9<Props_8>, {
 menuList: () => any[];
 menuTitle: string;
 }>>> & {
@@ -1745,7 +1776,7 @@ export declare const HyOrgGroupTree: __VLS_WithTemplateSlots_6<typeof __VLS_comp
 
 export declare const HyOrgTree: __VLS_WithTemplateSlots_7<typeof __VLS_component_7, ReturnType<typeof __VLS_template_7>>;
 
-export declare const HyRoundButton: DefineComponent<__VLS_WithDefaults_12<__VLS_TypePropsToRuntimeProps_12<RoundButton>, {
+export declare const HyRoundButton: DefineComponent<__VLS_WithDefaults_13<__VLS_TypePropsToRuntimeProps_13<RoundButton>, {
 name: string;
 className: string;
 color: string;
@@ -1754,7 +1785,7 @@ height: string;
 tips: string;
 }>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 click: (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_12<__VLS_TypePropsToRuntimeProps_12<RoundButton>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_13<__VLS_TypePropsToRuntimeProps_13<RoundButton>, {
 name: string;
 className: string;
 color: string;
@@ -1765,7 +1796,7 @@ tips: string;
 onClick?: (...args: any[]) => any;
 }, {}, {}>;
 
-export declare const HySelect: DefineComponent<__VLS_WithDefaults_13<__VLS_TypePropsToRuntimeProps_13<Props_10>, {
+export declare const HySelect: DefineComponent<__VLS_WithDefaults_14<__VLS_TypePropsToRuntimeProps_14<Props_11>, {
 modelValue: string;
 requestParams: {};
 controller: string;
@@ -1788,7 +1819,7 @@ change: (...args: any[]) => void;
 visibleChange: (...args: any[]) => void;
 "update:modelValue": (...args: any[]) => void;
 "on-changeSelectItem": (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_13<__VLS_TypePropsToRuntimeProps_13<Props_10>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_14<__VLS_TypePropsToRuntimeProps_14<Props_11>, {
 modelValue: string;
 requestParams: {};
 controller: string;
@@ -1825,7 +1856,7 @@ requestimmediately: boolean;
 clearable: boolean;
 }, {}>;
 
-export declare const HySelectMapLocation: DefineComponent<__VLS_WithDefaults_14<__VLS_TypePropsToRuntimeProps_14<Props_11>, {
+export declare const HySelectMapLocation: DefineComponent<__VLS_WithDefaults_15<__VLS_TypePropsToRuntimeProps_15<Props_12>, {
 markerItemFn: any;
 latlng: any;
 }>, {
@@ -1842,7 +1873,7 @@ POI: any;
 }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
 "on-geographical-position": (...args: any[]) => void;
 "on-map-ready": (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_14<__VLS_TypePropsToRuntimeProps_14<Props_11>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_15<__VLS_TypePropsToRuntimeProps_15<Props_12>, {
 markerItemFn: any;
 latlng: any;
 }>>> & {
@@ -1860,14 +1891,14 @@ export declare const HySpotCheckDetail: DefineComponent<    {}, {
 show: (id: string | number) => void;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<{}>>, {}, {}>;
 
-export declare const HySvgIcon: DefineComponent<__VLS_WithDefaults_15<__VLS_TypePropsToRuntimeProps_15<IconProps>, {
+export declare const HySvgIcon: DefineComponent<__VLS_WithDefaults_16<__VLS_TypePropsToRuntimeProps_16<IconProps>, {
 prefix: string;
 name: string;
 className: string;
 color: string;
 width: string;
 height: string;
-}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_15<__VLS_TypePropsToRuntimeProps_15<IconProps>, {
+}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_16<__VLS_TypePropsToRuntimeProps_16<IconProps>, {
 prefix: string;
 name: string;
 className: string;
@@ -1937,7 +1968,7 @@ export declare const HyUserHead: __VLS_WithTemplateSlots_9<typeof __VLS_componen
 
 export declare const HyUserTree: __VLS_WithTemplateSlots_10<typeof __VLS_component_10, ReturnType<typeof __VLS_template_10>>;
 
-export declare const HyVideoPlayer: DefineComponent<__VLS_WithDefaults_19<__VLS_TypePropsToRuntimeProps_19<Props_13>, {
+export declare const HyVideoPlayer: DefineComponent<__VLS_WithDefaults_20<__VLS_TypePropsToRuntimeProps_20<Props_14>, {
 downloadFilesType: boolean;
 playRulesType: boolean;
 }>, {
@@ -1950,7 +1981,7 @@ playVideo: (filePath: string, item?: MediaFileSimplevo) => boolean;
 "play-start": (...args: any[]) => void;
 "play-end": (...args: any[]) => void;
 "on-time-update": (...args: any[]) => void;
-}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_19<__VLS_TypePropsToRuntimeProps_19<Props_13>, {
+}, string, PublicProps, Readonly<globalThis.ExtractPropTypes<__VLS_WithDefaults_20<__VLS_TypePropsToRuntimeProps_20<Props_14>, {
 downloadFilesType: boolean;
 playRulesType: boolean;
 }>>> & {
@@ -2194,6 +2225,10 @@ declare interface Props {
 }
 
 declare interface Props_10 {
+    disableDataList?: UserInfo[];
+}
+
+declare interface Props_11 {
     modelValue?: any;
     requestParams?: any;
     controller?: string;
@@ -2209,7 +2244,7 @@ declare interface Props_10 {
     placeholder?: string;
 }
 
-declare interface Props_11 {
+declare interface Props_12 {
     markerItemFn?: () => MarkerOptions;
     latlng: {
         lat: number;
@@ -2217,11 +2252,11 @@ declare interface Props_11 {
     };
 }
 
-declare interface Props_12 {
+declare interface Props_13 {
     disableDataList?: UserInfo[];
 }
 
-declare interface Props_13 {
+declare interface Props_14 {
     downloadFilesType?: boolean;
     playRulesType?: boolean;
     playList?: MediaFileSimplevo[];
@@ -2249,12 +2284,16 @@ declare interface Props_4 {
 }
 
 declare interface Props_5 {
+    device?: Device;
+}
+
+declare interface Props_6 {
     initParams?: any;
     mapDisplayList?: any[];
     tableColumns?: TableColumnsItem[];
 }
 
-declare interface Props_6 {
+declare interface Props_7 {
     map: any;
     h: any;
     poi: any;
@@ -2264,12 +2303,12 @@ declare interface Props_6 {
     }[];
 }
 
-declare interface Props_7 {
+declare interface Props_8 {
     menuList: MenuListItem[];
     menuTitle: string;
 }
 
-declare interface Props_8 {
+declare interface Props_9 {
     size?: string;
     className?: string;
     placeholder?: string;
@@ -2277,10 +2316,6 @@ declare interface Props_8 {
     disabled?: boolean;
 }
 
-declare interface Props_9 {
-    disableDataList?: UserInfo[];
-}
-
 declare function removeTimeData(): void;
 
 declare interface RequestParams {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "command-center-v3-common",
   "type": "module",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "main": "dist/command-center-v3-common.js",
   "module": "dist/command-center-v3-common.umd.cjs",
   "types": "dist/index.d.ts",