From 6cfb1670e56aa394b7f668daf9adf01cc965ecc9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十二月 2023 11:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/LinkType.vue |   65 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/LinkType.vue b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
index a26c55d..e0f13fd 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkType.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
@@ -1,30 +1,30 @@
 <template>
     <el-container>
         <!-- 椤剁鎸夐挳 -->
-        <el-header class="businessHeader" style="height: 40px;">
-          <div>
-            <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn" plain>
-              鏂板
-            </el-button>
-            <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
-              淇敼
-            </el-button>
-          </div>
-            </el-header>
+
         <!-- 渚ц竟鏍忔爲 -->
         <el-container>
-            <el-aside width="240px">
+            <el-aside style="width: 20%;">
                 <basic-container class="businessTreeContainer">
-                    <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
-                    <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick"
-                        class="businessTree">
-                        <span class="el-tree-node__label" slot-scope="{ node, data }">
+                  <div class="app">
+                    <div style="display: flex;margin-bottom: 10px;">
+                      <el-button type="primary" @click="linkTypeAdd" size="mini"  v-if="permissionList.addBtn" plain>
+                        鏂板
+                      </el-button>
+                      <el-button type="primary" @click="linkTypeEdit" size="mini" v-if="permissionList.editBtn" plain>
+                        淇敼
+                      </el-button>
+                    </div>
+                    <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"
+                               class="businessTree">
+                      <template class="el-tree-node__label" slot-scope="{ node, data }">
                             <span>
                                 <i class="el-icon-star-on"></i>
                                 {{ (node || {}).label }}
                             </span>
-                        </span>
+                      </template>
                     </avue-tree>
+                  </div>
                 </basic-container>
             </el-aside>
             <el-container>
@@ -134,7 +134,7 @@
                 </el-main>
             </el-container>
         </el-container>
-        <link-type-add ref="linkAdd" :linkType="addOption.linkType" :domainOption="domainOptions" :icons="icons"
+        <link-type-add ref="linkAdd" :linkType="addOption.linkType" :domainOption="domainOptions" :icons="icons" :linkStatus="linkStatus"
             @refreshTable="initTreeOnLoad">
         </link-type-add>
 
@@ -154,6 +154,7 @@
     name: "LinkType",
     data() {
         return {
+            linkStatus:'',
             addOption: {
                 linkType: {
                     attributes:[]
@@ -178,7 +179,7 @@
             },
             loadOption: {
                 border: true,
-                height: 395,
+                height: 'auto',
                 editBtn: false,
                 addBtn: false,
                 menu: false,
@@ -215,6 +216,7 @@
             },
             obj: {},
             treeOption: {
+                height:'auto',
                 defaultExpandAll: true,
                 title: '閾炬帴绫诲瀷鏍�',
                 addBtn: false,
@@ -251,6 +253,7 @@
         // 娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
         linkTypeAdd() {
             this.$refs.linkAdd.linkType = {};
+            this.linkStatus = 'add';
             this.$refs.linkAdd.showSubmitDialog = true;
         },
         // 缂栬緫鎸夐挳鐐瑰嚮浜嬩欢
@@ -262,6 +265,7 @@
             var json = JSON.stringify(linktype);
             this.addOption.linkType = JSON.parse(json);
             this.$refs.linkAdd.linkType = this.addOption.linkType;
+            this.linkStatus = 'edit';
             this.$refs.linkAdd.showSubmitDialog = true;
         },
         // 浠庡凡鏈変腑鑾峰彇鎸夐挳鐐瑰嚮浜嬩欢
@@ -285,8 +289,31 @@
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
     display: none !important;
 }
+.app {
+  overflow: auto;
+  height: 84.3vh;
+}
+
+.app::-webkit-scrollbar {
+  height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+  background: white;
+  border: white;
+  width: 10px;
+
+}
+
+// 婊氬姩鏉＄殑婊戝潡
+.app::-webkit-scrollbar-thumb {
+  width: 10px;
+  height: 10px;
+  background-color: #ececec;
+  border-radius: 20px;
+  border: #ececec;
+}
+
+
 </style>

--
Gitblit v1.9.3