From 8c7295b074eac04831cab203e642357d1d4a2135 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Mon, 13 Mar 2023 13:41:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96Search=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/components/Search/History.vue | 125 ------ src/components/Search/Item.vue | 349 ----------------- src/components/Search/SaveHistory.vue | 100 ----- src/components/Search/Search.vue | 369 +----------------- src/components/index.ts | 4 +- src/router/menu.ts | 2 +- src/store/menu.ts | 8 + .../Save/components/DropdownButton/Time.vue | 6 +- .../Save/components/DropdownButton/util.ts | 6 +- src/views/rule-engine/Scene/index.vue | 2 +- yarn.lock | 8 +- 12 files changed, 41 insertions(+), 940 deletions(-) delete mode 100644 src/components/Search/History.vue delete mode 100644 src/components/Search/Item.vue delete mode 100644 src/components/Search/SaveHistory.vue diff --git a/package.json b/package.json index e01c7da6..8e4954cc 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "event-source-polyfill": "^1.0.31", "global": "^4.4.0", "jetlinks-store": "^0.0.3", - "jetlinks-ui-components": "^1.0.4", + "jetlinks-ui-components": "^1.0.5", "js-cookie": "^3.0.1", "less": "^4.1.3", "less-loader": "^11.1.0", diff --git a/src/components/Search/History.vue b/src/components/Search/History.vue deleted file mode 100644 index 27c58809..00000000 --- a/src/components/Search/History.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/Search/Item.vue b/src/components/Search/Item.vue deleted file mode 100644 index 0e96f020..00000000 --- a/src/components/Search/Item.vue +++ /dev/null @@ -1,349 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/Search/SaveHistory.vue b/src/components/Search/SaveHistory.vue deleted file mode 100644 index 49c2d091..00000000 --- a/src/components/Search/SaveHistory.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index 14d4af0f..1409f2ea 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -1,83 +1,21 @@ - \ No newline at end of file diff --git a/src/components/index.ts b/src/components/index.ts index f27cd374..e54a6c26 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -5,7 +5,7 @@ import JTable from './Table/index' import TitleComponent from "./TitleComponent/index.vue"; import Form from './Form'; import CardBox from './CardBox/index.vue'; -// import Search from './Search' +import Search from './Search' import NormalUpload from './NormalUpload/index.vue' import FileFormat from './FileFormat/index.vue' import JProUpload from './JUpload/index.vue' @@ -25,7 +25,7 @@ export default { .component('TitleComponent', TitleComponent) .component('Form', Form) .component('CardBox', CardBox) - // .component('Search', Search) + .component('ProSearch', Search) .component('NormalUpload', NormalUpload) .component('FileFormat', FileFormat) .component('JProUpload', JProUpload) diff --git a/src/router/menu.ts b/src/router/menu.ts index 3ff3bad7..1dfae58c 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -8,7 +8,7 @@ export const AccountMenu = { meta: { title: '个人中心', icon: '', - hideInMenu: false + hideInMenu: true }, children: [ { diff --git a/src/store/menu.ts b/src/store/menu.ts index 6851f153..ad8390b8 100644 --- a/src/store/menu.ts +++ b/src/store/menu.ts @@ -37,6 +37,10 @@ type MenuStateType = { } } siderMenus: MenuItem[] + params: { + key: string + params: Record + } } @@ -44,6 +48,10 @@ export const useMenuStore = defineStore({ id: 'menu', state: (): MenuStateType => ({ menus: {}, + params: { + key: '', + params: {} + }, siderMenus: [] }), getters: { diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue index bf9e6318..e3044a21 100644 --- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue +++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue @@ -19,6 +19,7 @@ :format='myFormat' :valueFormat='myFormat' :getPopupContainer='getPopupContainer' + popupClassName='manual-time-picker-popup' @change='change' /> @@ -62,7 +63,7 @@ const change = (e: string) => { } -