@yqg/permission 1.3.2-alpha.1 → 1.3.2

package/package.json

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

package/src/App.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {reactive, ref} from 'vue';
+import {ref} from 'vue';
 import {Button} from 'ant-design-vue';
 
 // 中英印尼菲律宾
@@ -8,9 +8,7 @@ type LocaleType = 'zh-CN' | 'en-US' | 'id-ID' | 'fil-PH';
 const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
-const permissions = reactive([
-	'yewei0313.REAQS.DEPAWED_ANQ2.QUERY',
-]);
+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(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
 	color.value = color.value === '#f00' ? '#1677ff' : '#f00';
@@ -31,7 +29,7 @@ const changeLocale = () => {
 			<!-- 03541 -->
 			<!-- 02124 -->
 			<!-- 05184 -->
-			<yqg-permission :permissions="permissions" workNumber="03817" :color="color" :locale="locale"
+			<yqg-permission :permissions="permissions" workNumber="05615" :color="color" :locale="locale"
 				@onSuccess="() => {console.log('成功')}">
 			</yqg-permission>
 		</div>

package/src/components/apply-modal.vue

@@ -1,12 +1,13 @@
 <template>
-	<Modal v-model:open="open" width="1100px" :maskClosable="false">
+	<Modal v-model:open="open" width="1100px" :maskClosable="false" :zIndex="zIndex">
 		<template #footer>
 			<Button @click="open = false" v-show="!isAllChecked && permissionList.length">{{ t('cancel') }}</Button>
 			<Button type="primary" @click="handleOk" :loading="loading">{{ t('submit') }}</Button>
 		</template>
 		<template #title>
 			<span>{{ t('permissionApply') }}</span>
-			<span v-show="isAllChecked && permissionList.length" class="crane-permission-title-tips">{{ t('isAllOwnTips') }}</span>
+			<span v-show="isAllChecked && permissionList.length" class="crane-permission-title-tips">{{
+				t('isAllOwnTips') }}</span>
 		</template>
 		<Form ref="formRef" :model="formState" :labelCol="{ span: 4 }" :wrapperCol="{ span: 19 }">
 			<FormItem :label="t('applyPermission')" name="features"
@@ -110,7 +111,11 @@ const props = defineProps({
 	isAllChecked: {
 		type: Boolean,
 		default: false
-	}
+	},
+	zIndex: {
+		type: Number,
+		default: 1000
+	},
 
 });
 const emit = defineEmits(['onSubmit', 'onSuccess']);

package/src/components/category-selector.vue

@@ -8,9 +8,10 @@
                 v-show="categoryValuesMap[item.id]?.length"
                 :rules="[{ required: true, message: t('pleaseChoose'), trigger: ['change', 'blur'] }]">
                 <TreeSelect treeCheckable treeDefaultExpandAll :tree-data="categoryValuesMap[item.id]" showSearch
-                    allowClear v-model:value="item.attributeValueIds_view" treeNodeFilterProp="attributeName"
-                    v-model:searchValue="searchValue" :fieldNames="{ label: 'attributeName', value: 'id' }"
-                    treeNodeLabelProp="attributeName" :show-checked-strategy="SHOW_PARENT">
+                    :getPopupContainer="() => $el" allowClear v-model:value="item.attributeValueIds_view"
+                    treeNodeFilterProp="attributeName" v-model:searchValue="searchValue"
+                    :fieldNames="{ label: 'attributeName', value: 'id' }" treeNodeLabelProp="attributeName"
+                    :show-checked-strategy="SHOW_PARENT">
                     <template #title="{ attributeName }">
                         <span v-if="searchValue.toLowerCase() && attributeName.includes(searchValue.toLowerCase())"
                             style="color: #1677ff; font-weight: bold;">{{ attributeName

package/src/components/yqg-permission.vue

@@ -4,7 +4,7 @@
 			colorPrimary: props.color,
 		}
 	}">
-		<div class="crane-wraper" :key="props.locale">
+		<div class="crane-wraper">
 			<template v-if="[COM_TYPE.FLOATBUTTON, COM_TYPE.TEXT].includes(type)">
 				<FloatButton ref="dragElement" type="primary" :tooltip="t('clickToApply')" :style="{
 					right: RIGHT_DEFAULT,
@@ -42,7 +42,7 @@
 					</div>
 					<div>
 						<Button class="crane-margin-right10" @click="goViewApproval">{{ t('viewApprovalDetail')
-						}}</Button>
+							}}</Button>
 						<Button type="primary" @click="showModal">+ {{ t('applyMore') }}</Button>
 					</div>
 				</template>
@@ -62,7 +62,7 @@
 			</template>
 		</div>
 
-		<ApplyModal v-model="open" :permissionList="permissionList" :spining="loading" :workNumber="workNumber"
+		<ApplyModal v-model="open" :permissionList="permissionList" :spining="loading" :workNumber="workNumber" :zIndex="zIndex"
 			:defaultCheckedIds="defaultCheckedIds" :isAllChecked="isAllChecked" @onSuccess="() => emit('onSuccess')"
 			@onSubmit="getPermissions">
 		</ApplyModal>
@@ -75,7 +75,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, { setLocale } from '../utils';
+import t from '../utils';
 import useDraggable from '../hooks/useDragable';
 import useStatus from '../hooks/useStatus';
 import useFormat from '../hooks/useFormat';
@@ -112,7 +112,7 @@ const props = defineProps({
 	},
 	locale: {
 		type: String,
-		default: 'zh'
+		default: 'zh-CN'
 	},
 	color: {
 		type: String,
@@ -125,7 +125,11 @@ const props = defineProps({
 	top: {
 		type: String,
 		default: '100px'
-	}
+	},
+	zIndex: {
+		type: Number,
+		default: 10000
+	},
 });
 
 const open = ref(false);
@@ -188,7 +192,7 @@ watchEffect(() => {
 });
 watch(() => props.locale, (cur, pre) => {
 	if (cur === pre) return;
-	setLocale(cur);
+	localStorage.setItem('permission_locale', props.locale);
 }, { immediate: true });
 </script>
 

package/src/i18n/en-US.ts

@@ -1,57 +1,57 @@
 export default {
-    permissionApply: 'Permission Application',
-    applyPermission: 'Apply for Permission',
-    applyReason: 'Application Reason',
-    approvalProcess: 'Approval Process',
-    isAllOwnTips: 'The current page already has permission or is under approval, no need to apply',
-    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: 'There are no permission points under this menu, no need to apply',
-    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!',
+    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: '永久有效',
+    },
     levels: {
-        L1: 'Low',
-        L2: 'Medium',
-        L3: 'High',
+        L1: '低',
+        L2: '中',
+        L3: '高',
     },
     status: {
-        PENDING: 'Pending Approval',
-        NO: 'Not Applicable',
-        OWNER: 'Permanently Owned',
-        TEMP_OWNER: 'Temporarily Owned',
+        PENDING: '审批中',
+        NO: '不可申请',
+        OWNER: '永久拥有',
+        TEMP_OWNER: '临时拥有',
     },
     operationType: {
-        QUERY: 'Query',
-        MANAGE: 'Operation',
+        QUERY: '查询',
+        MANAGE: '操作',
     }
-};
+};

package/src/i18n/index.ts

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

package/src/i18n/zh-CH.ts

@@ -39,6 +39,14 @@ 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/utils/index.ts

@@ -1,16 +1,13 @@
 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(localkey) || 'en';
-	console.log('en', localStorage.getItem(localkey));
+	const en = localStorage.getItem('permission_locale') || 'zh-CN';
     const keys = key.split('.');
-    let result = language[en as string] || language['en'];
+    let result = language[en as string] || language['en-US'];
     for (let i = 0; i < keys.length; i++) {
         result = result[keys[i]];
     }
@@ -57,15 +54,3 @@ 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);
-}

package/src/i18n/in-ID.ts

@@ -1,57 +0,0 @@
-export default {
-    permissionApply: 'Aplikasi Izin',
-    applyPermission: 'Ajukan Izin',
-    applyReason: 'Alasan Pengajuan',
-    approvalProcess: 'Proses Persetujuan',
-    isAllOwnTips: 'Halaman saat ini sudah memiliki izin atau sedang dalam proses persetujuan, tidak perlu mengajukan permohonan',
-    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, tidak perlu mengajukan permohonan',
-    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',
-    }
-};