vue-layout-gitcode 1.10.47 → 1.10.49

package/{index-CYkBP9_X.js → index-BCxH3cNa.js}

@@ -1,5 +1,5 @@
 import { defineComponent, onMounted, nextTick, onUnmounted, createBlock, openBlock, unref, withCtx, createElementVNode } from "vue";
-import { x as slidCaptchaManager, y as useLayoutConfig, z as isZh, _ as _export_sfc } from "./index-BsAdNTFu.js";
+import { x as slidCaptchaManager, y as useLayoutConfig, z as isZh, _ as _export_sfc } from "./index-0Mneepjj.js";
 import { FixedOverlay } from "vue-devui-lal/overlay";
 import "vue-devui-lal/overlay/style.css";
 const TARGET_TEXT = "Click in order:";
@@ -108,8 +108,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => _cache[0] || (_cache[0] = [
           createElementVNode("div", { id: "captcha-box" }, null, -1)
         ])),
-        _: 1,
-        __: [0]
+        _: 1
       });
     };
   }

package/{index-Cp24Y9A7.js → index-BW-OwqXX.js}

@@ -8,7 +8,7 @@ import { Message } from "vue-devui-lal/message";
 import "vue-devui-lal/message/style.css";
 import { FixedOverlay } from "vue-devui-lal/overlay";
 import "vue-devui-lal/overlay/style.css";
-import { a as i18n, k as usePageResize, z as isZh, _ as _export_sfc } from "./index-BsAdNTFu.js";
+import { a as i18n, k as usePageResize, z as isZh, _ as _export_sfc } from "./index-0Mneepjj.js";
 const _YunpianCaptchaManager = class _YunpianCaptchaManager {
   // eslint-disable-next-line no-useless-constructor
   constructor() {

package/{index-Bf468b3i.js → index-DSy5kAHy.js}

@@ -1,7 +1,7 @@
 import { ref, watchEffect, defineComponent, toDisplayString, unref, mergeModels, useModel, watch, createElementBlock, openBlock, createVNode, withDirectives, normalizeClass, createElementVNode, vShow, inject, withModifiers, createBlock, Fragment, computed, createCommentVNode, normalizeStyle, createTextVNode, onMounted, onUnmounted, renderList, withCtx, reactive } from "vue";
 import debounce from "lodash/debounce";
-import { d as transferNumber, G as GIcon, _ as _export_sfc, s as setLoginTriggerSource, f as useRequestReport, r as reqCatch, h as headRequest, a as i18n, T as TOPIC_TYPE, g as useTimeFormat, j as useCookie, k as usePageResize, L as LANG_ZH, m as isGstarRepo, n as _sfc_main$b, o as isIncubationRepo, p as highlightWords, t as transformUrl, q as _frEventTrack, E as EVENT_NAME, c as REPO_TYPE, e as extractRepoInfoWithURL, w as LANG_KEY } from "./index-BsAdNTFu.js";
-import { t as transWebUrl } from "./transWebUrl-BCCt-IBJ.js";
+import { d as transferNumber, G as GIcon, _ as _export_sfc, s as setLoginTriggerSource, f as useRequestReport, r as reqCatch, h as headRequest, a as i18n, T as TOPIC_TYPE, g as useTimeFormat, j as useCookie, k as usePageResize, L as LANG_ZH, m as isGstarRepo, n as _sfc_main$b, o as isIncubationRepo, p as highlightWords, t as transformUrl, q as _frEventTrack, E as EVENT_NAME, c as REPO_TYPE, e as extractRepoInfoWithURL, w as LANG_KEY } from "./index-0Mneepjj.js";
+import { t as transWebUrl } from "./transWebUrl-BbJeiLE-.js";
 import { useRouter } from "vue-router";
 import { Row, Col } from "vue-devui-lal/grid";
 import { Skeleton, SkeletonItem } from "vue-devui-lal/skeleton";
@@ -535,8 +535,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           _cache[0] || (_cache[0] = createElementVNode("div", { class: "new-tag w-[32px] h-[15px] text-[9px] text-[#ffffff] flex items-center justify-center leading-[1]" }, "New", -1))
         ]),
-        _: 1,
-        __: [0]
+        _: 1
       })) : createCommentVNode("", true);
     };
   }
@@ -751,8 +750,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => _cache[0] || (_cache[0] = [
                         createTextVNode("G-Star ")
                       ])),
-                      _: 1,
-                      __: [0]
+                      _: 1
                     }, 8, ["message"])
                   ])) : createCommentVNode("", true),
                   unref(isIncubationRepo)(_ctx.info.topic_names) ? (openBlock(), createElementBlock("div", _hoisted_4, [
@@ -765,8 +763,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => _cache[1] || (_cache[1] = [
                         createTextVNode(" G-Star ")
                       ])),
-                      _: 1,
-                      __: [1]
+                      _: 1
                     }, 8, ["message"])
                   ])) : createCommentVNode("", true),
                   createVNode(NewTag, {

package/index.d.ts

@@ -1,12 +1,19 @@
-import { App } from '../vue/dist/vue.esm-bundler.js';
+import { AccountInfo } from '../../types/types';
+import { App } from './vue/dist/vue.esm-bundler.js';
+import type { AxiosResponse } from 'axios';
+import type { ComponentOptionsMixin } from './vue/dist/vue.esm-bundler.js';
+import type { ComponentProvideOptions } from './vue/dist/vue.esm-bundler.js';
 import { currentTheme } from './themes/index';
-import { Emitter } from 'mitt';
-import { default as GitCodeAside } from './components/Aside/index.vue';
-import { default as GitCodeHeader } from './components/Header/index.vue';
-import { default as Login } from './components//Login/Login.vue';
+import type { DefineComponent } from './vue/dist/vue.esm-bundler.js';
+import type { Emitter } from 'mitt';
+import type { ExtractPropTypes } from './vue/dist/vue.esm-bundler.js';
+import { HeaderPropsForCustom } from '../../types/types';
+import { OrgInfo } from '../../types/types';
+import type { PropType } from './vue/dist/vue.esm-bundler.js';
+import type { PublicProps } from './vue/dist/vue.esm-bundler.js';
+import { repoInfoType } from '../../types/types';
 import { setTheme } from './themes/index';
-import { default as SiteAnnouncement } from './components/Header/components/SiteAnnouncement.vue';
-import { default as ToolsFloat } from './components/ToolsFloat/index.vue';
+import { UserInfo } from '../../types/types';
 
 declare interface BaseLayoutConfig {
     VITE_HOST: string;
@@ -62,13 +69,508 @@ declare type EventBus = {
     resetPwdDirectlySuccess: void;
 };
 
-export { GitCodeAside }
+export declare const GitCodeAside: DefineComponent<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: SceneValue;
+    };
+    disableFlatMode: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    userInfo: {
+        type: PropType<AccountInfo>;
+        required: true;
+        default: () => {};
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    independence: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    showPreferencesSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    showThemeSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    showLangSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    collapseMode: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    slotKeys: {
+        type: PropType<string[] | undefined>;
+        required: false;
+        default: () => never[];
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: SceneValue;
+    };
+    disableFlatMode: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    userInfo: {
+        type: PropType<AccountInfo>;
+        required: true;
+        default: () => {};
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    independence: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    showPreferencesSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    showThemeSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    showLangSetting: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        skipCheck: boolean;
+        default: undefined;
+    };
+    collapseMode: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    slotKeys: {
+        type: PropType<string[] | undefined>;
+        required: false;
+        default: () => never[];
+    };
+}>> & Readonly<{}>, {
+    sceneValue: SceneValue;
+    request: Function;
+    globalStore: Object;
+    disableFlatMode: boolean | undefined;
+    userInfo: AccountInfo;
+    independence: boolean | undefined;
+    showPreferencesSetting: boolean | undefined;
+    showThemeSetting: boolean | undefined;
+    showLangSetting: boolean | undefined;
+    collapseMode: boolean | undefined;
+    slotKeys: string[] | undefined;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
-export { GitCodeHeader }
+export declare const GitCodeHeader: DefineComponent<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: any;
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    loginOutFinish: {
+        type: PropType<Function | undefined>;
+        required: false;
+    };
+    loginSuccess: {
+        type: PropType<Function>;
+        required: true;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    repoInfo: {
+        type: PropType<repoInfoType | undefined>;
+        required: false;
+        default: () => {};
+    };
+    orgInfo: {
+        type: PropType<OrgInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    otherUserInfo: {
+        type: PropType<UserInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    userInfo: {
+        type: PropType<UserInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    headerFunctions: {
+        type: PropType<HeaderDisplayItem[] | undefined>;
+        required: false;
+    };
+    headerCustomProps: {
+        type: PropType<HeaderPropsForCustom | undefined>;
+        required: false;
+    };
+    openHarmonyGuide: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    headerBorder: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    independence: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    userMenus: {
+        type: PropType<any[] | undefined>;
+        required: false;
+    };
+    loginChildComponents: {
+        type: PropType<any>;
+        required: true;
+    };
+    bgConfig: {
+        type: PropType<{
+            index_head: string;
+            detail_top: string;
+            detail_top_black: string;
+            detail_toolbar: string;
+            detail_toolbar_black: string;
+            detail_top_url: string;
+            index_head_url: string;
+            detail_toolbar_url: string;
+        } | undefined>;
+        required: false;
+        default: () => {
+            index_head: string;
+            detail_top: string;
+            detail_top_black: string;
+            detail_toolbar: string;
+            detail_toolbar_black: string;
+            detail_top_url: string;
+            index_head_url: string;
+            detail_toolbar_url: string;
+        };
+    };
+    openCreateDropdown: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, ("resetPwdDirectlySuccess" | "followDevCommunity" | "followUser" | "update:openCreateDropdown")[], "resetPwdDirectlySuccess" | "followDevCommunity" | "followUser" | "update:openCreateDropdown", PublicProps, Readonly<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: any;
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    loginOutFinish: {
+        type: PropType<Function | undefined>;
+        required: false;
+    };
+    loginSuccess: {
+        type: PropType<Function>;
+        required: true;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    repoInfo: {
+        type: PropType<repoInfoType | undefined>;
+        required: false;
+        default: () => {};
+    };
+    orgInfo: {
+        type: PropType<OrgInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    otherUserInfo: {
+        type: PropType<UserInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    userInfo: {
+        type: PropType<UserInfo | undefined>;
+        required: false;
+        default: () => {};
+    };
+    headerFunctions: {
+        type: PropType<HeaderDisplayItem[] | undefined>;
+        required: false;
+    };
+    headerCustomProps: {
+        type: PropType<HeaderPropsForCustom | undefined>;
+        required: false;
+    };
+    openHarmonyGuide: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    headerBorder: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    independence: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    userMenus: {
+        type: PropType<any[] | undefined>;
+        required: false;
+    };
+    loginChildComponents: {
+        type: PropType<any>;
+        required: true;
+    };
+    bgConfig: {
+        type: PropType<{
+            index_head: string;
+            detail_top: string;
+            detail_top_black: string;
+            detail_toolbar: string;
+            detail_toolbar_black: string;
+            detail_top_url: string;
+            index_head_url: string;
+            detail_toolbar_url: string;
+        } | undefined>;
+        required: false;
+        default: () => {
+            index_head: string;
+            detail_top: string;
+            detail_top_black: string;
+            detail_toolbar: string;
+            detail_toolbar_black: string;
+            detail_top_url: string;
+            index_head_url: string;
+            detail_toolbar_url: string;
+        };
+    };
+    openCreateDropdown: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+}>> & Readonly<{
+    onResetPwdDirectlySuccess?: ((...args: any[]) => any) | undefined;
+    onFollowDevCommunity?: ((...args: any[]) => any) | undefined;
+    onFollowUser?: ((...args: any[]) => any) | undefined;
+    "onUpdate:openCreateDropdown"?: ((...args: any[]) => any) | undefined;
+}>, {
+    sceneValue: SceneValue;
+    isLogin: boolean;
+    request: Function;
+    globalStore: Object;
+    userInfo: UserInfo | undefined;
+    independence: boolean | undefined;
+    repoInfo: repoInfoType | undefined;
+    orgInfo: OrgInfo | undefined;
+    otherUserInfo: UserInfo | undefined;
+    headerBorder: boolean | undefined;
+    bgConfig: {
+        index_head: string;
+        detail_top: string;
+        detail_top_black: string;
+        detail_toolbar: string;
+        detail_toolbar_black: string;
+        detail_top_url: string;
+        index_head_url: string;
+        detail_toolbar_url: string;
+    } | undefined;
+    openCreateDropdown: boolean | undefined;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const GitCodeLayoutEmitter: Emitter<EventBus>;
 
-export { Login }
+declare enum HeaderDisplayItem {
+    LOGIN_AND_AVATAR = "0101",
+    MESSAGE_CENTER = "0102",
+    NEW_BUTTON = "0103",
+    DOCUMENT_CENTER = "0104",
+    DEEPSEEK_BUTTON = "0105",
+    SEARCH_BUTTON = "0106",
+    NAME_AND_ICON = "0107",
+    CUSTOM_CONTENT = "0108",
+    ASIDE_BUTTON = "0109",
+    NEWS_MULTI_LANGUAGE = "0110",
+    OPERATION_ENTRY = "0111"
+}
+
+export declare const Login: DefineComponent<ExtractPropTypes<{
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    loginOutFinish: {
+        type: PropType<Function | undefined>;
+        required: false;
+    };
+    loginSuccess: {
+        type: PropType<Function>;
+        required: true;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    openHarmonyGuide: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ExtractPropTypes<{
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    loginOutFinish: {
+        type: PropType<Function | undefined>;
+        required: false;
+    };
+    loginSuccess: {
+        type: PropType<Function>;
+        required: true;
+    };
+    globalStore: {
+        type: PropType<Object>;
+        required: true;
+        default: () => {
+            httpStatus: number;
+        };
+    };
+    openHarmonyGuide: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+}>> & Readonly<{}>, {
+    request: Function;
+    globalStore: Object;
+    openHarmonyGuide: boolean;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 declare interface LoginOptions {
     Authorization?: boolean;
@@ -96,9 +598,99 @@ export declare function setLayoutConfig(customConfig: BaseLayoutConfig): void;
 
 export { setTheme }
 
-export { SiteAnnouncement }
+export declare const SiteAnnouncement: DefineComponent<{}, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
-export { ToolsFloat }
+export declare const ToolsFloat: DefineComponent<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: SceneValue;
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    globalStore: {
+        type: PropType<{
+            [key: string]: any;
+            isSignIn?: boolean | undefined;
+        }>;
+        required: true;
+        default: () => {};
+    };
+    isRepoPage: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    isWhiteListRepo: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+}>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, "toggle-growth-center"[], "toggle-growth-center", PublicProps, Readonly<ExtractPropTypes<{
+    sceneValue: {
+        type: PropType<SceneValue>;
+        required: true;
+        default: SceneValue;
+    };
+    isLogin: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+    request: {
+        type: PropType<Function>;
+        required: true;
+        default: (params: any, customConfigs?: {
+            customError?: boolean | undefined;
+            customTimeout?: number | undefined;
+            ignoreError?: boolean | undefined;
+            customErrorCodes?: number[] | undefined;
+        } | undefined) => Promise<AxiosResponse<any, any, {}>>;
+    };
+    globalStore: {
+        type: PropType<{
+            [key: string]: any;
+            isSignIn?: boolean | undefined;
+        }>;
+        required: true;
+        default: () => {};
+    };
+    isRepoPage: {
+        type: PropType<boolean | undefined>;
+        required: false;
+        default: boolean;
+    };
+    isWhiteListRepo: {
+        type: PropType<boolean>;
+        required: true;
+        default: boolean;
+    };
+}>> & Readonly<{
+    "onToggle-growth-center"?: ((...args: any[]) => any) | undefined;
+}>, {
+    sceneValue: SceneValue;
+    isLogin: boolean;
+    request: Function;
+    globalStore: {
+        [key: string]: any;
+        isSignIn?: boolean | undefined;
+    };
+    isRepoPage: boolean | undefined;
+    isWhiteListRepo: boolean;
+}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare function useLogin(request: any, globalStore?: any): {
     login: (options?: LoginOptions, loginSuccess?: Function, openHarmonyGuide?: boolean) => void;