From 7c1376f0ce2084f71111f64c19f410c76c1c8e3f Mon Sep 17 00:00:00 2001 From: jackhoo_98 Date: Thu, 30 Mar 2023 15:28:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E5=99=A8=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataCollect/Collector/Tree/Save/index.vue | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue index 01ec25b3..0c8782fb 100644 --- a/src/views/DataCollect/Collector/Tree/Save/index.vue +++ b/src/views/DataCollect/Collector/Tree/Save/index.vue @@ -106,13 +106,7 @@ :column="2" /> -
+

当前内存布局:{{ endianMap.get(formData.configuration.endian) @@ -123,6 +117,19 @@ 具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)

+ + + Date: Thu, 30 Mar 2023 15:55:57 +0800 Subject: [PATCH 2/5] fix: bug#11226 --- src/views/device/Category/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue index 1691f350..8ddab919 100644 --- a/src/views/device/Category/index.vue +++ b/src/views/device/Category/index.vue @@ -129,7 +129,7 @@ let params = ref(); */ const handleSearch = (e: any) => { params.value = e; - expandedRowKeys.value = [] + expandedRowKeys.value = []; }; /** * 操作栏按钮 @@ -210,21 +210,20 @@ const table = reactive({ dataIndex: 'name', key: 'name', ellipsis: true, - width: 600, + width: 500, }, { title: '排序', dataIndex: 'sortIndex', key: 'sortIndex', scopedSlots: true, - width: 200, + width: 100, }, { title: '说明', dataIndex: 'description', key: 'description', ellipsis: true, - width: 700, }, { title: '操作', @@ -232,6 +231,7 @@ const table = reactive({ fixed: 'right', ellipsis: true, scopedSlots: true, + width: 120, }, ], /** From a1b67ce45c2d3f6ac4cf70f834eef9446684e5f8 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Thu, 30 Mar 2023 14:47:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 6 ++++-- src/router/menu.ts | 6 ++++-- src/views/user/Login/index.vue | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 9290694b..f2b5a21c 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,5 @@ import { createRouter, createWebHashHistory } from 'vue-router' -import menus, { LoginPath } from './menu' +import menus, { AccountCenterBindPath, InitHomePath, LoginPath } from './menu' import { cleanToken, getToken } from '@/utils/comm' import { useUserInfo } from '@/store/userInfo' import { useSystem } from '@/store/system' @@ -14,6 +14,8 @@ const router = createRouter({ } }) +const filterPath = [ InitHomePath, AccountCenterBindPath ] + router.beforeEach((to, from, next) => { // TODO 切换路由取消请求 const token = getToken() @@ -24,7 +26,7 @@ router.beforeEach((to, from, next) => { const userInfo = useUserInfo() const system = useSystem() const menu = useMenuStore() - if (!menu.siderMenus.length) { + if (!menu.siderMenus.length && !filterPath.includes(to.path)) { userInfo.getUserInfo().then(() => { system.getSystemVersion().then((menuData: any[]) => { menuData.forEach(r => { diff --git a/src/router/menu.ts b/src/router/menu.ts index 823178a7..cd2e8bf8 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -1,4 +1,6 @@ export const LoginPath = '/login' +export const InitHomePath = '/init-home' +export const AccountCenterBindPath = '/account/center/bind' export const AccountMenu = { path: '/account', @@ -55,11 +57,11 @@ export default [ component: () => import('@/views/user/Login/index.vue') }, { - path: '/account/center/bind', + path: AccountCenterBindPath, component: () => import('@/views/account/Center/bind/index.vue') }, { - path: '/init-home', // 初始化 + path: InitHomePath, // 初始化 component: () => import('@/views/init-home/index.vue') }, diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue index a1ec8cdb..ffa0eab2 100644 --- a/src/views/user/Login/index.vue +++ b/src/views/user/Login/index.vue @@ -237,7 +237,7 @@ const onFinish = async () => { username: form.username, }); LocalStore.set(TOKEN_KEY, res?.result.token); - if (res.result.username === 'admin') { + if (res.result.user?.username === 'admin') { const resp: any = await getInitSet(); if (resp.status === 200 && !resp.result.length) { window.location.href = '/#/init-home'; From 57e107c5882b577fb627af5c329ebd9eb8165f81 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Thu, 30 Mar 2023 16:03:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update:=20=E6=96=B0=E5=A2=9EFullPage?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Layout/FullPage.vue | 19 +++++++++++++++++++ src/components/Layout/index.ts | 3 ++- src/components/index.ts | 3 ++- .../Scene/Save/components/Timer/index.vue | 2 +- src/views/rule-engine/Scene/index.vue | 3 +++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 src/components/Layout/FullPage.vue diff --git a/src/components/Layout/FullPage.vue b/src/components/Layout/FullPage.vue new file mode 100644 index 00000000..ee448cf9 --- /dev/null +++ b/src/components/Layout/FullPage.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/components/Layout/index.ts b/src/components/Layout/index.ts index c4c946e2..9214b6a0 100644 --- a/src/components/Layout/index.ts +++ b/src/components/Layout/index.ts @@ -1,2 +1,3 @@ export { default as BasicLayoutPage } from './BasicLayoutPage.vue' -export { default as BlankLayoutPage } from './BlankLayoutPage.vue' \ No newline at end of file +export { default as BlankLayoutPage } from './BlankLayoutPage.vue' +export { default as FullPage } from './FullPage.vue' \ No newline at end of file diff --git a/src/components/index.ts b/src/components/index.ts index 71e6d881..e798c473 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -8,7 +8,7 @@ import Search from './Search' import NormalUpload from './NormalUpload/index.vue' import FileFormat from './FileFormat/index.vue' import JProUpload from './Upload/index.vue' -import { BasicLayoutPage, BlankLayoutPage } from './Layout' +import { BasicLayoutPage, BlankLayoutPage, FullPage } from './Layout' import { PageContainer, AIcon, Ellipsis } from 'jetlinks-ui-components' // import Ellipsis from './Ellipsis/index.vue' import JEmpty from './Empty/index.vue' @@ -38,5 +38,6 @@ export default { .component('PathSimplifier', PathSimplifier) .component('ValueItem', ValueItem) .component('RowPagination', RowPagination) + .component('FullPage', FullPage) } } diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue index 7531a609..38c690ab 100644 --- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue +++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue @@ -220,7 +220,7 @@ Object.assign(formModel, props.value) formModel.when = props.value.when || [] watchEffect(() => { - if(props.value?.period.unit === 'hours') { + if(props.value?.period?.unit === 'hours') { unitMax. value = 99999 } else { diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue index dc9641d5..b9aa6cef 100644 --- a/src/views/rule-engine/Scene/index.vue +++ b/src/views/rule-engine/Scene/index.vue @@ -1,6 +1,8 @@ + From 7f4d01f2c0fd51121353bdd225fd0225e250084f Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Thu, 30 Mar 2023 16:13:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96FullPage=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Layout/FullPage.vue | 4 +- src/views/rule-engine/Scene/Save/index.vue | 72 +++++++++++----------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/components/Layout/FullPage.vue b/src/components/Layout/FullPage.vue index ee448cf9..d4f61d7c 100644 --- a/src/components/Layout/FullPage.vue +++ b/src/components/Layout/FullPage.vue @@ -1,5 +1,5 @@ @@ -8,7 +8,7 @@ import { useElementBounding } from '@vueuse/core' const fullPage = ref(null) -const { x } = useElementBounding(fullPage) +const { y } = useElementBounding(fullPage) diff --git a/src/views/rule-engine/Scene/Save/index.vue b/src/views/rule-engine/Scene/Save/index.vue index da8797e9..86f2f3ce 100644 --- a/src/views/rule-engine/Scene/Save/index.vue +++ b/src/views/rule-engine/Scene/Save/index.vue @@ -1,42 +1,44 @@