diff --git a/lanius-orchestrate-client/package.json b/lanius-orchestrate-client/package.json index cf565267c1e5ec4680e992dc04531c4fa0939cec..abe16dc0fb4b125317d5923fe4b0aa7e4a71cae2 100644 --- a/lanius-orchestrate-client/package.json +++ b/lanius-orchestrate-client/package.json @@ -26,6 +26,6 @@ "unplugin-auto-import": "^0.6.6", "unplugin-vue-components": "^0.18.5", "vite": "^2.8.0", - "vue-tsc": "^0.40.9" + "vue-tsc": "^1.0.1" } } diff --git a/lanius-orchestrate-client/src/common/enum/tree-menu.ts b/lanius-orchestrate-client/src/common/enum/tree-menu.ts index 0adb1623a7d0adecf812cdf85a5dfacf8d93a997..e89f1eadb10af512c7eeee9c782367237c06fe04 100644 --- a/lanius-orchestrate-client/src/common/enum/tree-menu.ts +++ b/lanius-orchestrate-client/src/common/enum/tree-menu.ts @@ -17,13 +17,13 @@ */ interface IMenuItem { - text: String; - key: String; + text: string; + key: string; // checked: Boolean; children?: IMenuItem[]; - id:String + id:string } -let treeMenu: Array = [ +let treeMenu: IMenuItem[] = [ { key: "/task-schedule", text: "任务调度", diff --git a/lanius-orchestrate-client/src/common/menu.ts b/lanius-orchestrate-client/src/common/menu.ts index 11d57224e00f7933550c2114c72da89f1fd8fdac..ed07455f899adb516cfac882585608fce7fc90dd 100644 --- a/lanius-orchestrate-client/src/common/menu.ts +++ b/lanius-orchestrate-client/src/common/menu.ts @@ -17,19 +17,19 @@ */ interface IMenuItem { - text: String; - key: String; - path?: String; - icon?: String; + text: string; + key: string; + path?: string; + icon?: string; children?: IMenuItem[]; } -let getAssetsLayoutMenuUrl = (key: String) => { +let getAssetsLayoutMenuUrl = (key: string) => { return new URL(`../assets/img/layout/menu/icon-${key}.png`, import.meta.url) .href; }; -const taskScheduleMenu: Array = [ +const taskScheduleMenu: IMenuItem[] = [ { key: "/task-schedule", icon: getAssetsLayoutMenuUrl("schedule"), @@ -84,7 +84,7 @@ const taskScheduleMenu: Array = [ }, ]; -const systemManagementMenu: Array = [ +const systemManagementMenu: IMenuItem[] = [ { key: "/system-management", icon: getAssetsLayoutMenuUrl("setting"), @@ -124,7 +124,7 @@ const systemManagementMenu: Array = [ }, ]; -const adminMenu: Array = [ +const adminMenu: IMenuItem[] = [ { key: "/admin/system-management", icon: getAssetsLayoutMenuUrl("setting"), @@ -147,9 +147,9 @@ const adminMenu: Array = [ ]; let findMenuItemByPath = ( - path: String, + path: string, rootMenuItem?: IMenuItem, - menuList?: Array + menuList?: IMenuItem[] ): IMenuItem | null => { if (menuList && menuList.length > 0 && path) { let menu = menuList.find((x) => x.path == path); @@ -226,7 +226,7 @@ let getAncestorList = ( } }; -const getBreadcrumbByPath = (currentPath: String): IMenuItem[] => { +const getBreadcrumbByPath = (currentPath: string): IMenuItem[] => { if (currentPath) { let menu = findMenuItemByPath( currentPath.toLowerCase().trim(), @@ -240,7 +240,7 @@ const getBreadcrumbByPath = (currentPath: String): IMenuItem[] => { return []; }; -let getKeys = (menuList: IMenuItem[], keys: String[]): void => { +let getKeys = (menuList: IMenuItem[], keys: string[]): void => { if (menuList && menuList.length > 0) { menuList.forEach((x) => { keys.push(x.key); @@ -249,8 +249,8 @@ let getKeys = (menuList: IMenuItem[], keys: String[]): void => { } }; -const getAllKeys = (): String[] => { - let keys: String[] = []; +const getAllKeys = (): string[] => { + let keys: string[] = []; getKeys(menus, keys); return Array.from(new Set(keys)); }; @@ -263,7 +263,7 @@ const organizationUserMenus: IMenuItem[] = [ const menus: IMenuItem[] = [...adminUserMenus, ...organizationUserMenus]; const getOrganizationUserMenus = ( - menuKeyPermissions: String[] + menuKeyPermissions: string[] ): IMenuItem[] => { let check = (menuList: IMenuItem[]): IMenuItem[] => { let tempList: IMenuItem[] = menuList.filter((item) => { @@ -285,13 +285,13 @@ const getOrganizationUserMenus = ( return check(JSON.parse(JSON.stringify(organizationUserMenus))); }; -const getOrganizationUserMenuItemByPath = (path: String): IMenuItem | null => { +const getOrganizationUserMenuItemByPath = (path: string): IMenuItem | null => { return getMenuListItemByPath(organizationUserMenus, path); }; const getMenuListItemByPath = ( list: IMenuItem[], - path: String + path: string ): IMenuItem | null => { let find = (menuList: IMenuItem[]): IMenuItem | null => { let item = menuList.find((x) => x.path == path); diff --git a/lanius-orchestrate-client/src/common/util/tooltip.ts b/lanius-orchestrate-client/src/common/util/tooltip.ts index 675f3a8f0ee74593acc75788dbdec72f0ebb8912..7b97cf1841e9efd39ad5601bcfdcc1c3b3d35b9a 100644 --- a/lanius-orchestrate-client/src/common/util/tooltip.ts +++ b/lanius-orchestrate-client/src/common/util/tooltip.ts @@ -15,7 +15,7 @@ * @author zhouyongjie@yzbdl.ac.cn * @date 2022-4-27 */ -const showTooltip = (msg: any, width: Number) => { +const showTooltip = (msg: any, width: number) => { let app = document.querySelector("#app"); let span = document.createElement("span"); span.innerHTML = msg; diff --git a/lanius-orchestrate-client/src/components/common/tree.vue b/lanius-orchestrate-client/src/components/common/tree.vue index 3e2ca97d84f526f7afad96dcc40407916310c2ab..f3e8003edcc11c72e8878423fb043e314afa06ba 100644 --- a/lanius-orchestrate-client/src/components/common/tree.vue +++ b/lanius-orchestrate-client/src/components/common/tree.vue @@ -305,7 +305,6 @@ onMounted(() => { class="search-input" v-model="searchValue" placeholder="请输入分组名称" - :suffix-icon="Search" > 新增 { v-if="data.id !== '-1' && isShowOprationIcon" > - - - + + + + - - - + + + + + + { >
- + + +
diff --git a/lanius-orchestrate-client/src/components/lanius/LaniusImage.vue b/lanius-orchestrate-client/src/components/lanius/LaniusImage.vue index fbe3929ca81e8f9f2174c6e6d3aeb4feb3bfad97..2eac562764b18ac17e69e480006cf6e8b2743478 100644 --- a/lanius-orchestrate-client/src/components/lanius/LaniusImage.vue +++ b/lanius-orchestrate-client/src/components/lanius/LaniusImage.vue @@ -21,11 +21,10 @@ diff --git a/lanius-orchestrate-client/src/layouts/Default/components/AsideMenu.vue b/lanius-orchestrate-client/src/layouts/default/components/aside-menu.vue similarity index 100% rename from lanius-orchestrate-client/src/layouts/Default/components/AsideMenu.vue rename to lanius-orchestrate-client/src/layouts/default/components/aside-menu.vue diff --git a/lanius-orchestrate-client/src/layouts/Default/components/Aside.vue b/lanius-orchestrate-client/src/layouts/default/components/aside.vue similarity index 98% rename from lanius-orchestrate-client/src/layouts/Default/components/Aside.vue rename to lanius-orchestrate-client/src/layouts/default/components/aside.vue index 8de8317151f042a39d3b2d297d77483793736149..5939d3eab0285e840a343be05d1d01abad1269ae 100644 --- a/lanius-orchestrate-client/src/layouts/Default/components/Aside.vue +++ b/lanius-orchestrate-client/src/layouts/default/components/aside.vue @@ -32,7 +32,7 @@