@yqg/permission 1.3.1-alpha.0 → 1.3.2-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.3.1-alpha.0",
+    "version": "1.3.2-alpha.0",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",

package/src/axios/index.ts

@@ -2,8 +2,6 @@ import axios from './axios';
 
 const urlPrefix = '/crane';
 
-export const controller = new AbortController();
-
 type apiType = {
 	[key in string]: (params?: any) => Promise<{body: any}>
 }
@@ -11,9 +9,7 @@ type apiType = {
 export default {
     getPermissions: (params: any) => axios.get(`${urlPrefix}/permission/apply`, {params}),
 
-	getFlowPreview: (params: any) => axios.post(`${urlPrefix}/permission/apply/oa/flow/submit/preview`, params, {
-		signal: controller.signal // 关键配置
-	}),
+	getFlowPreview: (params: any)=> axios.post(`${urlPrefix}/permission/apply/oa/flow/submit/preview`, params),
 
 	submitApply: (params: any) => axios.post(`${urlPrefix}/permission/apply/oa/flow/submit`, params),
 

package/src/components/apply-modal.vue

@@ -1,13 +1,6 @@
 <template>
-	<Modal v-model:open="open" width="1100px" :maskClosable="false">
-		<template #footer>
-			<Button @click="open = false" v-show="!isAllOwn">{{ t('cancel') }}</Button>
-			<Button type="primary" @click="handleOk" :loading="loading">{{ t('submit') }}</Button>
-		</template>
-		<template #title>
-			<span>{{ t('permissionApply') }}</span>
-			<span v-show="isAllOwn" class="crane-permission-title-tips">{{ t('isAllOwnTips') }}</span>
-		</template>
+	<Modal v-model:open="open" :title="t('permissionApply')" width="1100px" @ok="handleOk" :okText="t('submit')"
+		:maskClosable="false" :ok-button-props="{ loading: loading }" :cancelText="t('cancel')">
 		<Form ref="formRef" :model="formState" :labelCol="{ span: 4 }" :wrapperCol="{ span: 19 }">
 			<FormItem :label="t('applyPermission')" name="features"
 				:rules="[{ required: true, message: t('selectPlaceholder') }]">
@@ -37,7 +30,7 @@
 				max: 300, message: t('maxLengthTips', { length: 300 }), trigger: ['change', 'blur']
 			}]">
 				<Textarea v-model:value.trim="formState.applyReason" :placeholder="t('applyReasonPlaceholder')"
-					:auto-size="{ minRows: 4, maxRows: 4 }" :disabled="isAllOwn">
+					:auto-size="{ minRows: 4, maxRows: 4 }">
 	</Textarea>
 				<span class="reason-tips" style="font-size: 12px">
 					{{ t('applyReasonTips') }}
@@ -71,8 +64,7 @@ import {
 	Textarea,
 	message,
 	Tree,
-	Spin,
-	Button
+	Spin
 } from 'ant-design-vue';
 import SuccessModal from './success-modal.vue';
 import ApprovalSteps from './approval-steps.vue';
@@ -102,14 +94,6 @@ const props = defineProps({
 	spining: {
 		type: Boolean,
 		default: false
-	},
-	defaultCheckedIds: {
-		type: Array as PropType<string[]>,
-		default: () => []
-	},
-	isAllOwn: {
-		type: Boolean,
-		default: false
 	}
 
 });
@@ -146,10 +130,6 @@ const getValidTimeOptions = async () => {
 
 getValidTimeOptions();
 const handleOk = async () => {
-	if (props.isAllOwn) {
-		open.value = false;
-		return;
-	}
 	await Promise.all([formRef.value.validate(), categoryRef.value?.validate()])
 	loading.value = true;
 	const params = getParams();
@@ -181,7 +161,7 @@ const getParams = () => {
 
 	});
 	deepTree(permissionList.value, (item: any) => {
-		if (!item.children && formState.features.includes(item.feature) && !item.disabled) {
+		if (!item.children && formState.features.includes(item.feature)) {
 			roleVoList.push({
 				roleId: item.roleId,
 				validTime: item.validTime
@@ -208,22 +188,20 @@ const onChangeTime = throttle(async () => {
 	if (params.roleVoList.length === 0) {
 		stepNodes.value = [];
 		return;
-	};
-
+	}
 	let res = await Http.getFlowPreview(params);
 	stepNodes.value = res?.body?.nodes || [];
-}, 1)
+}, 0)
 const onCheck = (checkedIds: any, info: any) => {
 	// 如果选择的是子节点，判断是否超过5个，超过的话，删除当前选的节点，并给予提示
 	// 如果选择的是父节点，判断是否超过5个，超过的话，从当前选择的父节点的叶子节点中删除多出的个数，并给予提示
 	let total = 0;
 	let curTotal = 0;
-
 	deepTree(permissionList.value, (item: any) => {
-		if (!item.children && checkedIds.includes(item.feature) && !item.disabled) {
+		if (!item.children && checkedIds.includes(item.feature)) {
 			total += 1;
 		}
-		if (!item.children && formState.features.includes(item.feature) && !item.disabled) {
+		if (!item.children && formState.features.includes(item.feature)) {
 			curTotal += 1;
 		}
 		if (!item.children && !formState.features.includes(item.feature)) {
@@ -279,10 +257,6 @@ watch(() => props.permissionList, (cur) => {
 	})
 })
 
-watch(() => props.defaultCheckedIds, (cur) => {
-	formState.features = cur.concat(formState.features);
-}, { immediate: true })
-
 watch(() => open.value, (cur) => {
 	if (cur) {
 		formRef.value?.resetFields();
@@ -293,13 +267,6 @@ watch(() => open.value, (cur) => {
 </script>
 
 <style scoped>
-.crane-permission-title-tips {
-	color: #FF4D4F;
-	font-size: 14px;
-	margin-left: 8px;
-	font-weight: 400;
-}
-
 :deep(.yqg-permission-tree-list) {
 	margin-top: 4px;
 }

package/src/components/permission-item.vue

@@ -35,10 +35,7 @@
 		<Popover v-if="item.relatedCompleteNames?.length">
 			<template #content>
 				<div style="max-width: 400px;">
-					<div>
-						{{ t('adaptDepartment') }}：
-					</div>
-					{{item.relatedCompleteNames.map((item: any) => {
+					{{ t('adaptDepartment') }}：{{item.relatedCompleteNames.map((item: any) => {
 						return item;
 					}).join('、')}}
 				</div>
@@ -70,7 +67,7 @@
 		</Popover>
 
 		<!-- 选择框 -->
-		<span v-if="checkedKeys.includes(item.feature) && !item.disabled" class="crane-weak-color crane-margin-left-12">
+		<span v-if="checkedKeys.includes(item.feature)" class="crane-weak-color crane-margin-left-12">
 			{{ t('availableTime') }}：
 			<Select v-model:value="item.validTime" style="width: 100px"
 				:disabled="item.businessApplyType === OWNER_STATUS"

package/src/components/yqg-permission.vue

@@ -4,7 +4,7 @@
 			colorPrimary: props.color,
 		}
 	}">
-		<div class="crane-wraper">
+		<div class="crane-wraper" :key="props.locale">
 			<template v-if="[COM_TYPE.FLOATBUTTON, COM_TYPE.TEXT].includes(type)">
 				<FloatButton ref="dragElement" type="primary" :tooltip="t('clickToApply')" :style="{
 					right: RIGHT_DEFAULT,
@@ -63,8 +63,7 @@
 		</div>
 
 		<ApplyModal v-model="open" :permissionList="permissionList" :spining="loading" :workNumber="workNumber"
-			:defaultCheckedIds="defaultCheckedIds" :isAllOwn="isAllOwn" @onSuccess="() => emit('onSuccess')"
-			@onSubmit="getPermissions">
+			@onSuccess="() => emit('onSuccess')" @onSubmit="getPermissions">
 		</ApplyModal>
 
 	</ConfigProvider>
@@ -75,7 +74,7 @@ import { Button, ConfigProvider, Popover, message, FloatButton } from 'ant-desig
 import applyIconUrl from '@/assets/applyicon.png';
 import noauthority from '@/assets/noauthority.png';
 import Http from '../axios/index';
-import t from '../utils';
+import t, { setLocale } from '../utils';
 import useDraggable from '../hooks/useDragable';
 import useStatus from '../hooks/useStatus';
 import useFormat from '../hooks/useFormat';
@@ -112,7 +111,7 @@ const props = defineProps({
 	},
 	locale: {
 		type: String,
-		default: 'zh-CN'
+		default: 'zh'
 	},
 	color: {
 		type: String,
@@ -131,8 +130,6 @@ const props = defineProps({
 const open = ref(false);
 const curApproving = ref<PermissionType>();
 const loading = ref(false);
-const defaultCheckedIds = ref<string[]>([]);
-const isAllOwn = ref(false);
 let permissionList = ref<PermissionListType>([]);
 let curStatus = ref<Record<string, any>>({
 	imageUrl: noauthority,
@@ -166,10 +163,7 @@ const getPermissions = async () => {
 
 	loading.value = true;
 	const res = await Http.getPermissions(params);
-	const datalist = useFormat(res.body || []);
-	permissionList.value = datalist.data;
-	defaultCheckedIds.value = datalist.ownList;
-	isAllOwn.value = datalist.isAllOwn;
+	permissionList.value = useFormat(res.body || []);
 	curStatus.value = useStatus(permissionList.value, curApproving);
 	loading.value = false;
 };
@@ -188,7 +182,7 @@ watchEffect(() => {
 });
 watch(() => props.locale, (cur, pre) => {
 	if (cur === pre) return;
-	localStorage.setItem('permission_locale', props.locale);
+	setLocale(cur);
 }, { immediate: true });
 </script>
 
@@ -208,4 +202,5 @@ watch(() => props.locale, (cur, pre) => {
 .crane-margin-right10 {
 	margin-right: 10px;
 }
-</style>
+</style>
+../hooks/useSort../hooks/useFormat

package/src/hooks/useFormat.ts

@@ -9,8 +9,6 @@ const StatusType = {
     TEMP_OWNER: 'TEMP_OWNER'
 }
 export default function useFormat(tree: PermissionListType) {
-    const ownList: string[] = [];
-    let allCount: number = 0;
     function sortTree(
         tree: PermissionListType,
         sortMap: Map<string | null, number>,
@@ -18,7 +16,7 @@ export default function useFormat(tree: PermissionListType) {
     ) {
         return tree.map((node) => {
             node.key = node.feature;
-            allCount++;
+
             if (!node.children || node.children.length === 0) {
                 node.categoryVOS = (node.categoryVOS || []).filter((item: any) => item.configWay !== Category.AUTO);
 
@@ -28,13 +26,8 @@ export default function useFormat(tree: PermissionListType) {
 
                 if ([StatusType.OWNER].includes(node.businessApplyType) && !node.categoryVOS.length) {
                     node.disabled = true;
-                    ownList.push(node.feature);
                 }
             } else {
-                // 如果当前节点的所有自节点都符合[StatusType.OWNER].includes(node.businessApplyType) && !node.categoryVOS.length；那么也把当前featrue放到ownList中
-                if (node.children.every((child) => [StatusType.OWNER].includes(child.businessApplyType) && !child?.categoryVOS?.length)) {
-                    ownList.push(node.feature);
-                }
                 // 递归对子节点进行排序
                 node.children = sortTree(node.children, sortMap, levelSortMap);
 
@@ -42,8 +35,7 @@ export default function useFormat(tree: PermissionListType) {
                 if (node.children.every((child) => child.disabled)) {
                     node.disabled = true;
                 }
-            };
-
+            }
 
             return node;
         }).sort((a, b) => {
@@ -59,10 +51,6 @@ export default function useFormat(tree: PermissionListType) {
     const sortMap = new Map(sort.map((value, index) => [value, index]));
     const levelSortMap = new Map(levelSort.map((value, index) => [value, index]));
 
-    return {
-        data: sortTree(tree, sortMap, levelSortMap),
-        ownList,
-        isAllOwn: allCount === ownList.length
-    };
+    return sortTree(tree, sortMap, levelSortMap);
 }
 

package/src/i18n/en-US.ts

@@ -1,57 +1,56 @@
 export default {
-    permissionApply: '权限申请',
-    applyPermission: '申请权限',
-    applyReason: '申请理由',
-    approvalProcess: '审批流程',
-    applyReasonPlaceholder: '请尽可能详细说明申请原因和使用场景，不要只填写“工作需要”之类的理由，以免影响你获取权限的审批时间。',
-    applyReasonTips: '示例：由于XX项目需要，需要查看/操作XXXX场景/问题，涉及到XXX权限的使用，因此提交申请！',
-    cancel: '取消',
-    submit: '确定',
-    close: '关闭',
-    viewApprovalDetail: '查看审批详情',
-    applyMore: '继续申请其他权限',
-    successTips: '已提交申请，审批通过后可拥有相关权限',
-    resoultTitle: '操作结果反馈',
-    start: '发起',
-    end: '结束',
-    noNeed: '无需审批',
-    adaptDepartment: '适用部门',
-    noApprovalProcess: '无审批流程',
-    excessTips: '一次最多可申请{number}个权限',
-    unavailableTips: '您暂无权限查看/操作该页面，请点击下方按钮进行申请',
-    appliedTips: '权限已申请，正在{status}...',
-    unapplyTips: '您暂无权限查看/操作该页面，且该页面中没有您可以申请的权限，',
-    callManager: '如有需要请联系系统管理员',
-    manager: '系统管理员',
-    availableTime: '有效期',
-    selectPlaceholder: '请选择权限点',
-    reasonPlaceholder: '请输入申请理由',
-    maxCountTips: '一次最多只可申请{count}个权限',
-    maxLengthTips: '最多{length}个字符',
-    lastDays: '{count}天后到期',
-    taday: '今天到期',
-    clickToApply: '点击申请权限',
-    noPermissionTips: '该菜单下暂无权限点',
-    availiables: {
-        SEVEN_DAYS: '7天',
-        THIRTY_DAYS: '30天',
-        SIXTY_DAYS: '60天',
-        NINETY_DAYS: '90天',
-        FOREVER: '永久有效',
-    },
+    permissionApply: 'Permission Application',
+    applyPermission: 'Apply for Permission',
+    applyReason: 'Application Reason',
+    approvalProcess: 'Approval Process',
+    applyReasonPlaceholder: 'Please describe the reason for application and usage scenarios in as much detail as possible. Avoid simply stating "work requirements" to prevent delays in the approval process.',
+    applyReasonTips: 'Example: Due to requirements of XX project, need to view/operate XXXX scenario/issue, which involves the use of XXX permission, hence submitting this application!',
+    cancel: 'Cancel',
+    submit: 'Confirm',
+    close: 'Close',
+    viewApprovalDetail: 'View Approval Details',
+    applyMore: 'Apply for Other Permissions',
+    successTips: 'Application submitted. Relevant permissions will be granted upon approval.',
+    resoultTitle: 'Operation Result Feedback',
+    start: 'Initiate',
+    end: 'End',
+    noNeed: 'No Approval Required',
+    adaptDepartment: 'Applicable Department',
+    noApprovalProcess: 'No Approval Process',
+    excessTips: 'Maximum {number} permissions can be applied for at once',
+    unavailableTips: 'You currently don\'t have permission to view/operate this page. Please click the button below to apply.',
+    appliedTips: 'Permission has been applied, currently {status}...',
+    unapplyTips: 'You don\'t have permission to view/operate this page, and there are no applicable permissions you can apply for in this page.',
+    callManager: 'If needed, please contact the system administrator',
+    manager: 'System Administrator',
+    availableTime: 'Validity Period',
+    selectPlaceholder: 'Please select permission point',
+    reasonPlaceholder: 'Please enter application reason',
+    pleaseChoose: 'Please select',
+    maxCountTips: 'Maximum {count} permissions can be applied for at once',
+    maxLengthTips: 'Maximum {length} characters',
+    today: 'Expires today',
+    clickToApply: 'Click to apply for permission',
+    noPermissionTips: 'No permission points under this menu',
+    lastDays: '{count} days',
+    categoryTips: 'Your current data scope is as follows:',
+    empty: 'Empty',
+    category: 'Data Permission',
+    categotySelectTips: 'The selected permission above includes data permissions. Please apply for/change the data scope according to actual work requirements.',
+    categoryChangeTips: 'Reminder: The data permission scope you selected is relatively large! Please confirm whether your actual work scenario requires full access to 「{category}」permission, and clearly state it in the application reason to avoid rejection!',
     levels: {
-        L1: '低',
-        L2: '中',
-        L3: '高',
+        L1: 'Low',
+        L2: 'Medium',
+        L3: 'High',
     },
     status: {
-        PENDING: '审批中',
-        NO: '不可申请',
-        OWNER: '永久拥有',
-        TEMP_OWNER: '临时拥有',
+        PENDING: 'Pending Approval',
+        NO: 'Not Applicable',
+        OWNER: 'Permanently Owned',
+        TEMP_OWNER: 'Temporarily Owned',
     },
     operationType: {
-        QUERY: '查询',
-        MANAGE: '操作',
+        QUERY: 'Query',
+        MANAGE: 'Operation',
     }
-};
+};

package/src/i18n/in-ID.ts

@@ -0,0 +1,56 @@
+export default {
+    permissionApply: 'Aplikasi Izin',
+    applyPermission: 'Ajukan Izin',
+    applyReason: 'Alasan Pengajuan',
+    approvalProcess: 'Proses Persetujuan',
+    applyReasonPlaceholder: 'Harap jelaskan alasan pengajuan dan skenario penggunaan selengkap mungkin. Hindari hanya menyebutkan "kebutuhan kerja" untuk mencegah penundaan dalam proses persetujuan.',
+    applyReasonTips: 'Contoh: Karena kebutuhan proyek XX, perlu melihat/mengoperasikan skenario/masalah XXXX, yang melibatkan penggunaan izin XXX, oleh karena itu mengajukan permohonan ini!',
+    cancel: 'Batal',
+    submit: 'Konfirmasi',
+    close: 'Tutup',
+    viewApprovalDetail: 'Lihat Detail Persetujuan',
+    applyMore: 'Ajukan Izin Lainnya',
+    successTips: 'Pengajuan telah dikirim. Izin terkait akan diberikan setelah disetujui.',
+    resoultTitle: 'Umpan Balik Hasil Operasi',
+    start: 'Mulai',
+    end: 'Selesai',
+    noNeed: 'Tidak Perlu Persetujuan',
+    adaptDepartment: 'Departemen yang Berlaku',
+    noApprovalProcess: 'Tidak Ada Proses Persetujuan',
+    excessTips: 'Maksimal {number} izin dapat diajukan sekaligus',
+    unavailableTips: 'Anda saat ini tidak memiliki izin untuk melihat/mengoperasikan halaman ini. Silakan klik tombol di bawah untuk mengajukan.',
+    appliedTips: 'Izin telah diajukan, saat ini {status}...',
+    unapplyTips: 'Anda tidak memiliki izin untuk melihat/mengoperasikan halaman ini, dan tidak ada izin yang dapat diajukan di halaman ini.',
+    callManager: 'Jika diperlukan, silakan hubungi administrator sistem',
+    manager: 'Administrator Sistem',
+    availableTime: 'Masa Berlaku',
+    selectPlaceholder: 'Silakan pilih titik izin',
+    reasonPlaceholder: 'Silakan masukkan alasan pengajuan',
+    pleaseChoose: 'Silakan pilih',
+    maxCountTips: 'Maksimal {count} izin dapat diajukan sekaligus',
+    maxLengthTips: 'Maksimal {length} karakter',
+    today: 'Kadaluarsa hari ini',
+    clickToApply: 'Klik untuk mengajukan izin',
+    noPermissionTips: 'Tidak ada titik izin di menu ini',
+    lastDays: '{count} hari',
+    categoryTips: 'Cakupan data Anda saat ini adalah sebagai berikut:',
+    empty: 'Kosong',
+    category: 'Izin Data',
+    categotySelectTips: 'Izin yang dipilih di atas mencakup izin data. Silakan ajukan/ubah cakupan data sesuai kebutuhan kerja aktual.',
+    categoryChangeTips: 'Peringatan: Cakupan izin data yang Anda pilih relatif besar! Harap konfirmasi apakah skenario kerja aktual Anda memerlukan akses penuh ke izin 「{category}」, dan jelaskan secara jelas dalam alasan pengajuan untuk menghindari penolakan!',
+    levels: {
+        L1: 'Rendah',
+        L2: 'Sedang',
+        L3: 'Tinggi',
+    },
+    status: {
+        PENDING: 'Menunggu Persetujuan',
+        NO: 'Tidak Dapat Diajukan',
+        OWNER: 'Dimiliki Secara Permanen',
+        TEMP_OWNER: 'Dimiliki Sementara',
+    },
+    operationType: {
+        QUERY: 'Kueri',
+        MANAGE: 'Operasi',
+    }
+};

package/src/i18n/index.ts

@@ -1,11 +1,14 @@
 import enUS from './en-US';
 import zhCH from './zh-CH';
+import inID from './in-ID';
 
 const language: {
     [key: string]: any;
 } = {
-    'zh-CN': zhCH,
-    'en-US': enUS,
+    'zh': zhCH,
+    'en': enUS,
+    'id': inID,
 };
 
+
 export default language;

package/src/i18n/zh-CH.ts

@@ -3,7 +3,6 @@ export default {
     applyPermission: '申请权限',
     applyReason: '申请理由',
     approvalProcess: '审批流程',
-    isAllOwnTips: '您当前已拥有该页面所有权限，无需申请',
     applyReasonPlaceholder: '请尽可能详细说明申请原因和使用场景，不要只填写“工作需要”之类的理由，以免影响你获取权限的审批时间。',
     applyReasonTips: '示例：由于XX项目需要，需要查看/操作XXXX场景/问题，涉及到XXX权限的使用，因此提交申请！',
     cancel: '取消',
@@ -39,14 +38,6 @@ export default {
     category: '数据权限',
     categotySelectTips: '上方选中的权限包含数据权限，请根据实际工作需要申请/更改数据范围。',
     categoryChangeTips: '提醒：您选择的数据权限范围较大！请确认实际工作场景是否需要全量「{category}」权限，并在申请理由中写明，避免审批不通过！',
-    availiables: {
-        SEVEN_DAYS: '7天',
-        THIRTY_DAYS: '30天',
-        SIXTY_DAYS: '60天',
-        NINETY_DAYS: '90天',
-        ONE_YEARS: '1年',
-        FOREVER: '永久有效',
-    },
     levels: {
         L1: '低',
         L2: '中',

package/src/typings/index.d.ts

@@ -39,7 +39,6 @@ declare type PermissionType = {
 	admin?: any[];
 	checked?: boolean;
 	disabled?: boolean;
-	disableCheckbox?: boolean;
 	children?: PermissionListType;
 };
 declare type PermissionListType = PermissionType[];

package/src/utils/index.ts

@@ -1,13 +1,16 @@
 import language from '../i18n';
 
+const localkey = 'yqg_permission_sdk_locale';
+
 type optionsType = {
     [key: string]: any;
 };
 const t = (key: string, options?: optionsType) => {
     // key的格式为：'xxx.xxx.xxx'//国际化todo
-	const en = localStorage.getItem('permission_locale') || 'zh-CN';
+	const en = localStorage.getItem(localkey) || 'en';
+	console.log('en', localStorage.getItem(localkey));
     const keys = key.split('.');
-    let result = language[en as string] || language['en-US'];
+    let result = language[en as string] || language['en'];
     for (let i = 0; i < keys.length; i++) {
         result = result[keys[i]];
     }
@@ -54,3 +57,15 @@ export const deepTree = (tree: any[], fn: (item:any) => void) => {
 }
 
 export default t;
+
+export const setLocale = (locale: string) => {
+	let finalLocale = '';
+	if (locale.startsWith('zh')) {
+		finalLocale = 'zh';
+	} else if (locale.startsWith('en')) {
+		finalLocale = 'en';
+	} else if (locale.startsWith('id') || locale.startsWith('in')) {
+		finalLocale = 'id';
+	}
+	localStorage.setItem(localkey, finalLocale);
+}