@yqg/permission 1.3.6 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",

package/src/components/apply-modal.vue

@@ -21,19 +21,22 @@
 						<span v-if="!permissionList.length">
 							{{ t('noPermissionTips') }}
 						</span>
-
-						<Tree checkable :default-expand-all="true" :tree-data="permissionList" :height="200"
-							:expandedKeys="expandedKeys" :checkedKeys="formState.features"
-							@check="onCheck" @expand="expandedKeys = $event">
-							<template #title="item: PermissionType">
-								<div v-if="item.children && item.children.length">
-									{{ item.shortName }}
-								</div>
-								<PermissionItem v-else :checkedKeys="formState.features" :item="item"
-									@onChangeTime="onChangeTime" @updateTime="setDefaultTime"
-									:validTimeOptions="validTimeOptions" />
-							</template>
-						</Tree>
+						<div v-else :class="{ 'yqg-permission-tree-list-wraper': showScrollBar }">
+
+
+							<Tree checkable :default-expand-all="true" :tree-data="permissionList" :height="200"
+								:expandedKeys="expandedKeys"
+								:checkedKeys="formState.features" @check="onCheck" @expand="expandedKeys = $event">
+								<template #title="item: PermissionType">
+									<div v-if="item.children && item.children.length">
+										{{ item.shortName }}
+									</div>
+									<PermissionItem v-else :checkedKeys="formState.features" :item="item"
+										@onChangeTime="onChangeTime" @updateTime="setDefaultTime"
+										:validTimeOptions="validTimeOptions" />
+								</template>
+							</Tree>
+						</div>
 						<CategorySelector v-if="categoryList.length" :categoryList="categoryList" ref="categoryRef" />
 					</Spin>
 				</FormItem>
@@ -70,7 +73,8 @@ import {
 	ref,
 	watch,
 	PropType,
-	computed
+	computed,
+	nextTick
 } from 'vue';
 import Http from '../axios/index';
 import {
@@ -144,6 +148,7 @@ const successModal = ref<InstanceType<typeof SuccessModal>>();
 const formRef = ref();
 const categoryRef = ref();
 let stepNodes = ref([]);
+const showScrollBar = ref(false);
 const categoryList = ref<CategoryType[]>([]);
 const validTimeOptions = ref([]);
 const expandedKeys = ref<any[]>([]);
@@ -288,6 +293,18 @@ const onCheck = (checkedIds: any, info: any) => {
 	// 预览审批流程
 }
 
+const initScrollBar = () => {
+	const treeHeight = document.querySelector('.yqg-permission-tree-list-holder')?.children?.[0]?.clientHeight || 0;
+	if (treeHeight > 200) {
+		// 设置树的高度
+		showScrollBar.value = true;
+	} else {
+		showScrollBar.value = false;
+	}
+}
+
+
+
 watch(() => props.permissionList, (cur) => {
 	expandedKeys.value = [];
 	deepTree(cur, (item: any) => {
@@ -295,6 +312,10 @@ watch(() => props.permissionList, (cur) => {
 			expandedKeys.value.push(item.feature);
 		}
 	})
+
+	nextTick(() => {
+		initScrollBar();
+	})
 })
 
 watch(() => props.defaultCheckedIds, (cur) => {
@@ -356,7 +377,11 @@ const getPopupContainer = ():HTMLElement => {
 	width: 100% !important;
 }
 
-:deep(.yqg-permission-tree-list-scrollbar) {
+.yqg-permission-tree-list-wraper :deep(.yqg-permission-tree-list-scrollbar) {
 	display: block !important;
 }
+
+
+
+
 </style>