From babc225fb347be184e5525a755cae5baa63f8e81 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Wed, 24 Apr 2024 15:43:57 +0800
Subject: [PATCH] =?UTF-8?q?vben=E5=85=A8=E5=B1=80=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Basic/src/BasicTitle.vue       |  9 ++++--
 src/components/Form/src/BasicForm.vue         | 14 ++++++++--
 .../Form/src/hooks/useLabelWidth.ts           |  4 +--
 src/hooks/component/costomForm.ts             |  1 -
 src/hooks/web/usePermission.ts                | 28 +++++++++++++------
 5 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/components/Basic/src/BasicTitle.vue b/src/components/Basic/src/BasicTitle.vue
index e9ea4400..c943ea9d 100644
--- a/src/components/Basic/src/BasicTitle.vue
+++ b/src/components/Basic/src/BasicTitle.vue
@@ -1,3 +1,8 @@
+<!--
+ * @Description: 
+ * @Author: lijj
+ * @Date: 2024-04-15 17:08:07
+-->
 <template>
   <span :class="getClass">
     <slot></slot>
@@ -45,9 +50,9 @@
   .@{prefix-cls} {
     position: relative;
     display: flex;
-    padding-left: 7px;
     font-size: 16px;
-    font-weight: 500;
+    font-family: 'PingFang SC';
+    font-weight: 600;
     line-height: 24px;
     color: @text-color-base;
     cursor: pointer;
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 4efedad7..2835512c 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -4,9 +4,10 @@
     ref="formElRef"
     :class="getFormClass"
     :model="formModel"
+    layout="vertical"
     @keypress.enter="handleEnterPress"
   >
-    <Row v-bind="getRow">
+    <Row v-bind="getRow" :gutter="15">
       <slot name="formHeader"></slot>
       <template v-for="schema in getSchema" :key="schema.field">
         <FormItem
@@ -318,13 +319,20 @@
       &-label label::after {
         margin: 0 6px 0 2px;
       }
-
+      &-label {
+        padding-bottom: 1px;
+      }
+      &-no-colon {
+        font-size: 12px;
+        color: #262626;
+        font-weight: 600;
+      }
       &-with-help {
         margin-bottom: 0;
       }
 
       &:not(.ant-form-item-with-help) {
-        margin-bottom: 20px;
+        margin-bottom: 15px;
       }
 
       &.suffix-item {
diff --git a/src/components/Form/src/hooks/useLabelWidth.ts b/src/components/Form/src/hooks/useLabelWidth.ts
index 7e20feec..50abb8a0 100644
--- a/src/components/Form/src/hooks/useLabelWidth.ts
+++ b/src/components/Form/src/hooks/useLabelWidth.ts
@@ -15,7 +15,6 @@ export function useItemLabelWidth(schemaItemRef: Ref<FormSchema>, propsRef: Ref<
       wrapperCol: globWrapperCol,
       layout,
     } = unref(propsRef)
-
     // If labelWidth is set globally, all items setting
     if ((!globalLabelWidth && !labelWidth && !globalLabelCol) || disabledLabelWidth) {
       labelCol.style = {
@@ -34,7 +33,8 @@ export function useItemLabelWidth(schemaItemRef: Ref<FormSchema>, propsRef: Ref<
     return {
       labelCol: { style: { width }, ...col },
       wrapperCol: {
-        style: { width: layout === 'vertical' ? '100%' : `calc(100% - ${width})` },
+        // style: { width: layout === 'vertical' ? '100%' : `calc(100% - ${width})` },
+        style: { width: '100%' },
         ...wrapCol,
       },
     }
diff --git a/src/hooks/component/costomForm.ts b/src/hooks/component/costomForm.ts
index 3e5657f8..d7c0923d 100644
--- a/src/hooks/component/costomForm.ts
+++ b/src/hooks/component/costomForm.ts
@@ -10,7 +10,6 @@ import { getFormSetInfoByModule } from '/@/views/baseinfo/formset/api'
 import { getColumnSetInfoByModule } from '/@/views/baseinfo/columnset/api'
 // 引入表格权限信息（包含id和name）
 import { permissionsInfo } from '/@/hooks/web/usePermission'
-
 /**
  * @description: 调用接口更新设置后的表单
  * @param {*} updateSchema (vben提供的更新表单接口)
diff --git a/src/hooks/web/usePermission.ts b/src/hooks/web/usePermission.ts
index e755e256..68ba17f9 100644
--- a/src/hooks/web/usePermission.ts
+++ b/src/hooks/web/usePermission.ts
@@ -24,19 +24,29 @@ import { useMultipleTabStore } from '/@/store/modules/multipleTab'
 export function permissionsInfo() {
   let permissionId: string = ''
   let permissionName: string = ''
-  const fullPath = ref(router.currentRoute.value.fullPath)
-  usePermissionStore().getWrouteList.forEach((item: Record<any, any>) => {
-    item.children[0].children?.forEach((row: Record<any, any>) => {
-      if (fullPath.value.indexOf(row.path) != -1) {
-        permissionId = row.id
-        permissionName = row.name
-        console.log(permissionId)
-      }
-    })
+  const fullPath = ref(router.currentRoute.value.path)
+  const routerList = treeOptionData(usePermissionStore().getWrouteList)
+  routerList.forEach(item => {
+    if (item.path === fullPath.value) {
+      console.log(fullPath.value)
+      permissionId = item.id
+      permissionName = item.name
+    }
   })
   return { permissionId, permissionName }
 }
 
+// 递归查找路由中path与当前path完全相同的路由
+function treeOptionData(array, result = []) {
+  array.forEach(item => {
+    result.push({ name: item.name, id: item.id, path: item.path })
+    if (item.children && item.children.length) {
+      treeOptionData(item.children, result)
+    }
+  })
+  return JSON.parse(JSON.stringify(result))
+}
+
 // User permissions related operations
 export function usePermission() {
   const userStore = useUserStore()