@yqg/permission 1.3.8 → 1.3.9-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.3.8",
+    "version": "1.3.9-beta.0",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",
@@ -14,31 +14,33 @@
         "preview": "vite preview",
         "demo:build": "vue-tsc -b && STAGE=test vite build",
         "prod:build": "vue-tsc -b && STAGE=prod vite build"
-
     },
     "devDependencies": {
+        "@alicloud/cdn20180510": "3.1.2",
+        "@alicloud/openapi-client": "0.4.12",
         "@ant-design/icons-vue": "^7.0.1",
         "@commitlint/cli": "^19.5.0",
         "@commitlint/config-conventional": "^19.5.0",
+        "@originjs/vite-plugin-commonjs": "1.0.3",
         "@types/vue": "^2.0.0",
         "@typescript-eslint/parser": "^8.13.0",
         "@vitejs/plugin-vue": "^5.1.4",
+        "@yqg/max-utils": "^1.0.2",
+        "ali-oss": "6.17.1",
         "ant-design-vue": "4.x",
         "axios": "^1.7.7",
+        "chalk": "5.3.0",
         "eslint": "^9.14.0",
         "husky": "^9",
         "lint-staged": "^13.2.0",
+        "ora": "5.4.1",
         "typescript": "~5.5.4",
         "vite": "^5.4.9",
         "vite-plugin-css-injected-by-js": "^3.5.2",
         "vue": "^3.5.12",
-        "vue-tsc": "^2.1.8",
-        "@alicloud/cdn20180510": "3.1.2",
-        "@alicloud/openapi-client": "0.4.12",
-        "@originjs/vite-plugin-commonjs": "1.0.3",
-        "@yqg/max-utils": "^1.0.2",
-        "ali-oss": "6.17.1",
-        "chalk": "5.3.0",
-        "ora": "5.4.1"
+        "vue-tsc": "^2.1.8"
+    },
+    "dependencies": {
+        "sharp": "^0.34.3"
     }
 }

package/src/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive } from 'vue';
+import { ref } from 'vue';
 import {Button} from 'ant-design-vue';
 
 // 中英印尼菲律宾
@@ -9,9 +9,7 @@ const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('id-ID');
 
 // const permissions = ref('CALL_CENTER.DATA_BUSINESS.QUERY,CALL_CENTER.ENTER_ADMIN,CALL_CENTER.USER.QUERY,CALL_CENTER.USER.MANAGE,CALL_CENTER.BUSINESS.QUERY,CALL_CENTER.SKILL_GROUP.QUERY');
-const permissions = reactive([
-	'yewei0313.REAQS.DEPAWED_ANQ2.QUERY',
-]);
+const permissions = 'RECONCILIATION.DATA_INGESTION.RESOLVE_TASK.QUERY,RECONCILIATION.DATA_INGESTION.RESOLVE_TASK.CANCEL,RECONCILIATION.DATA_INGESTION.RESOLVE_TASK.FILE_DOWNLOAD';
 //05615
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
@@ -33,8 +31,8 @@ const changeLocale = () => {
 			<!-- 03541 -->
 			<!-- 02124 -->
 			<!-- 05184 -->
-			<yqg-permission :permissions="permissions" workNumber="03817" :color="color" :locale="locale"
-				:omitCategoryIds="[81, 102]" @onSuccess="() => {console.log('成功')}">
+			<yqg-permission :omitCategoryIds="[]" :permissions="permissions" workNumber="05004" :color="color" :locale="locale"
+				@onSuccess="() => {console.log('成功')}">
 			</yqg-permission>
 		</div>
 		<data class="case-card">

package/src/components/apply-modal.vue

@@ -22,11 +22,9 @@
 							{{ t('noPermissionTips') }}
 						</span>
 						<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">
+								:expandedKeys="expandedKeys" :checkedKeys="formState.features" @check="onCheck"
+								@expand="expandedKeys = $event">
 								<template #title="item: PermissionType">
 									<div v-if="item.children && item.children.length">
 										{{ item.shortName }}
@@ -59,11 +57,12 @@
 
 			</Form>
 
-			<SuccessModal ref="successModal" />
-
 		</ConfigProvider>
 
 	</Modal>
+	
+	<SuccessModal ref="successModal" />
+
 </template>
 <script lang="ts" setup>
 import {
@@ -173,15 +172,20 @@ const handleOk = async () => {
 		open.value = false;
 		return;
 	}
-	await Promise.all([formRef.value.validate(), categoryRef.value?.validate()])
-	loading.value = true;
-	const params = getParams();
-	let res = await Http.submitApply(params);
-	const url = res?.body?.oaFlowUrl;
-	open.value = false;
-	loading.value = false;
-	emit('onSubmit');
-	successModal.value?.countDown(url, () => emit('onSuccess'));
+	if (loading.value) return;
+	try { 
+		await Promise.all([formRef.value.validate(), categoryRef.value?.validate()])
+		loading.value = true;
+		const params = getParams();
+		let res = await Http.submitApply(params);
+		const url = res?.body?.oaFlowUrl;
+		open.value = false;
+		loading.value = false;
+		emit('onSubmit');
+		successModal.value?.countDown(url, () => emit('onSuccess'));
+	} catch (e) {
+		loading.value = false;
+	}
 };
 
 
@@ -294,24 +298,22 @@ 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;
-	}
+  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) => {
 		if (item.children && item.children.length) {
 			expandedKeys.value.push(item.feature);
 		}
-	})
+	});
 
 	nextTick(() => {
 		initScrollBar();
@@ -378,10 +380,7 @@ const getPopupContainer = ():HTMLElement => {
 }
 
 .yqg-permission-tree-list-wraper :deep(.yqg-permission-tree-list-scrollbar) {
-	display: block !important;
+  display: block !important;
 }
 
-
-
-
 </style>

package/src/components/category-selector.vue

@@ -19,7 +19,7 @@
                         <span v-else>{{ attributeName }}</span>
                     </template>
                 </TreeSelect>
-                <span v-if="item.attributeValueIds_view?.includes(ALL_CATEGORY_ID)" style="color: #ff4d4f; font-size: 12px;">
+                <span v-if="item.attributeValueIds_view?.includes(-1)" style="color: #ff4d4f; font-size: 12px;">
                     {{ t('categoryChangeTips', { category: item.categoryName }) }}
                 </span>
             </FormItem>
@@ -36,11 +36,8 @@ import {
 import { defineProps, PropType, ref, computed, defineExpose } from 'vue';
 import t from '../utils';
 import useAttributesCache from '../hooks/useAttributesCache';
-
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
-const ALL_CATEGORY_ID = -1;
-
 const props = defineProps({
     categoryList: {
         type: Array as PropType<CategoryType[]>,

package/src/components/yqg-permission.vue

@@ -137,7 +137,6 @@ const props = defineProps({
 		required: false,
 		default: () => []
 	},
-
 });
 
 const open = ref(false);
@@ -151,6 +150,13 @@ let curStatus = ref<Record<string, any>>({
 	status: '',
 })
 
+const needOmitCategoryIds = computed(() => {
+  if (Array.isArray(props.omitCategoryIds)) {
+    return props.omitCategoryIds;
+  }
+  return props.omitCategoryIds?.split(',')?.map((item) => Number(item)) || [];
+}); 
+
 const allPermissions = computed(() => {
 	permissionList.value = [];
 	if (Array.isArray(props.permissions)) {
@@ -159,14 +165,6 @@ const allPermissions = computed(() => {
 	return props.permissions?.split(',')?.filter((item) => item.trim()) || [];
 });
 
-
-const needOmitCategoryIds = computed(() => {
-	if (Array.isArray(props.omitCategoryIds)) {
-		return props.omitCategoryIds;
-	}
-	return props.omitCategoryIds?.split(',')?.map((item) => Number(item)) || [];
-});	
-
 const goViewApproval = () => {
 	const url = curApproving.value?.oaFlowUrl;
 	if (!url) return;