From 78b9dc26b2709fd8904cff5f0ca284f26aa464a6 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 30 五月 2024 16:36:33 +0800
Subject: [PATCH] Low Code 更新
---
src/views/tigerprojects/system/lowcode/normal/normalDrawer.vue | 2 +-
src/layouts/default/menu/index.vue | 7 ++++++-
src/views/tigerprojects/system/menu/menu.data.ts | 2 +-
src/views/tigerprojects/system/lowcode/normal/index.vue | 7 +++++--
src/router/guard/permissionGuard.ts | 18 +++++++++---------
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/layouts/default/menu/index.vue b/src/layouts/default/menu/index.vue
index 1fa9d55..cd1e773 100644
--- a/src/layouts/default/menu/index.vue
+++ b/src/layouts/default/menu/index.vue
@@ -111,7 +111,12 @@
*/
function handleMenuClick(path: string) {
- go(path);
+ if (path.split('/').length > 1 && path.split('/')[2] == 'LC') {
+ const id = { ID: path.split('/')[1] };
+ go(`/${path.split('/')[1]}/${path.split('/')[2]}/${encodeURI(JSON.stringify(id))}`);
+ } else {
+ go(path);
+ }
}
/**
diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts
index 359b7eb..188b929 100644
--- a/src/router/guard/permissionGuard.ts
+++ b/src/router/guard/permissionGuard.ts
@@ -85,15 +85,15 @@
// get userinfo while last fetch time is empty
if (userStore.getLastUpdateTime === 0) {
try {
- var userinfo = await userStore.getUserInfoAction();
-
- if (isNullOrUnDef(userinfo?.userId)) {
- userStore.setToken(undefined);
- userStore.setSessionTimeout(false);
- userStore.setUserInfo(null);
- next(PageEnum.BASE_LOGIN);
- return;
- }
+ const userinfo = await userStore.getUserInfoAction();
+
+ if (isNullOrUnDef(userinfo?.userId)) {
+ userStore.setToken(undefined);
+ userStore.setSessionTimeout(false);
+ userStore.setUserInfo(null);
+ next(PageEnum.BASE_LOGIN);
+ return;
+ }
} catch (err) {
next();
return;
diff --git a/src/views/tigerprojects/system/lowcode/normal/index.vue b/src/views/tigerprojects/system/lowcode/normal/index.vue
index 51e0bce..bfde156 100644
--- a/src/views/tigerprojects/system/lowcode/normal/index.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/index.vue
@@ -2,7 +2,7 @@
<div>
<BasicTable @register="registerTable">
<template #toolbar>
- <a-button type="primary" @click="handleCreate"> 鏂板鍌ㄥ尯 </a-button>
+ <a-button type="primary" @click="handleCreate" preIcon="add_02|svg"> 鏂板 </a-button>
</template>
<template #action="{ record }">
<TableAction
@@ -35,7 +35,10 @@
import { DeleteRegion } from '/@/api/tigerapi/wms/region';
import { fetchJson, getListByPage } from '/@/api/tigerapi/system';
import { useGlobSetting } from '/@/hooks/setting';
+ import { useRoute } from 'vue-router';
+ const route = useRoute();
+ const RuleObj = ref(JSON.parse(decodeURI(route.params?.id as string)));
const globSetting = useGlobSetting();
const _columns = ref([]);
const _searchFormSchema = ref([]);
@@ -43,7 +46,7 @@
const [registerTable, { reload }] = useTable({
title: '鍌ㄥ尯鍒楄〃',
api: getListByPage,
- searchInfo: { TABLE_NAME: 'WMS_REGION' },
+ searchInfo: { TABLE_NAME: RuleObj.value.ID },
columns: _columns as unknown as BasicColumn[],
formConfig: {
labelWidth: 120,
diff --git a/src/views/tigerprojects/system/lowcode/normal/normalDrawer.vue b/src/views/tigerprojects/system/lowcode/normal/normalDrawer.vue
index dc2065f..bca8a94 100644
--- a/src/views/tigerprojects/system/lowcode/normal/normalDrawer.vue
+++ b/src/views/tigerprojects/system/lowcode/normal/normalDrawer.vue
@@ -43,7 +43,7 @@
}
});
- const getTitle = computed(() => (!unref(isUpdate) ? '鏂板鍌ㄥ尯' : '缂栬緫鍌ㄥ尯'));
+ const getTitle = computed(() => (!unref(isUpdate) ? '鏂板' : '缂栬緫'));
onMounted(async () => {
formSchema.value = await fetchJson(`${globSetting.downloadUrl}/LowCode/addEditform.json`);
diff --git a/src/views/tigerprojects/system/menu/menu.data.ts b/src/views/tigerprojects/system/menu/menu.data.ts
index 3fd9e39..cae797c 100644
--- a/src/views/tigerprojects/system/menu/menu.data.ts
+++ b/src/views/tigerprojects/system/menu/menu.data.ts
@@ -8,7 +8,7 @@
{
title: '鑿滃崟鍚嶇О',
dataIndex: 'name',
- width: 200,
+ width: 280,
align: 'left',
},
{
--
Gitblit v1.9.3