@yqg/permission 1.3.11 → 1.3.13

package/package.json

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

package/src/App.vue

@@ -9,9 +9,9 @@ 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 = 'RECONCILIATION.DATA_INGESTION.RESOLVE_TASK.QUERY';
+// const permissions = 'RECONCILIATION.DATA_INGESTION.RESOLVE_TASK.QUERY';
 //05615
-// const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
+// const permissions = reactive(['CRANE.BUSINESS.QUERY', 'CRANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
 	color.value = color.value === '#f00' ? '#1677ff' : '#f00';
 }
@@ -19,6 +19,8 @@ const changeLocale = () => {
 	locale.value = locale.value === 'id-ID' ? 'en-US' : 'id-ID';
 }
 
+const permissions = ref('TECH.SCHEDULER.JOB.VISIBLE,TECH.SCHEDULER.JOB.QUERY,TECH.SCHEDULER.JOB.MODIFY');
+
 </script>
 
 <template>
@@ -31,7 +33,7 @@ const changeLocale = () => {
 			<!-- 03541 -->
 			<!-- 02124 -->
 			<!-- 05184 -->
-			<yqg-permission :omitCategoryIds="[]" :permissions="permissions" workNumber="05004" :color="color" :locale="locale"
+			<yqg-permission :omitCategoryIds="[]" :permissions="permissions" workNumber="03541" :color="color" :locale="locale"
 				@onSuccess="() => {console.log('成功')}">
 			</yqg-permission>
 		</div>

package/src/components/apply-modal.vue

@@ -39,9 +39,9 @@
 					</Spin>
 				</FormItem>
 				<FormItem name="applyReason" :label="t('applyReason')" :rules="[{
-                    required: true, message: t('reasonPlaceholder'), trigger: ['change']
+                    required: true, message: t('maxMinLengthTips', { maxLength: 300, minLength: 10 }), trigger: ['change']
                 }, {
-                    max: 300, message: t('maxLengthTips', { length: 300 }), trigger: ['change', 'blur']
+                    max: 300, min: 10, message: t('maxMinLengthTips', { maxLength: 300, minLength: 10 }), trigger: ['change', 'blur']
                 }]">
 					<Textarea v-model:value.trim="formState.applyReason" :placeholder="t('applyReasonPlaceholder')"
 						:auto-size="{ minRows: 4, maxRows: 4 }" :disabled="isAllChecked || !permissionList.length">
@@ -154,7 +154,7 @@ const expandedKeys = ref<any[]>([]);
 const formState = reactive<formStateType>({
 	features: [],
 	roleVoList: [],
-	applyReason: '',
+	applyReason: t('applyReasonTips'),
 	dataRule: {
 		ruleItems: [],
 	},
@@ -202,7 +202,7 @@ const getParams = () => {
 		if (category.attributeValueIds_view.length) {
 			ruleItems.push({
 				attributeCategoryId: category.id,
-				attributeValueIds: category.attributeValueIds_view
+				attributeValueIds: category.attributeValueIds_view,
 			})
 		};
 

package/src/components/category-selector.vue

@@ -22,6 +22,9 @@
                 <span v-if="item.attributeValueIds_view?.includes(-1)" style="color: #ff4d4f; font-size: 12px;">
                     {{ t('categoryChangeTips', { category: item.categoryName }) }}
                 </span>
+                <span v-if="getDeleteAttributesNames(item)" style="color: #ff4d4f; font-size: 12px;">
+                    {{ t('deleteCategoryTips', { categorys: getDeleteAttributesNames(item) }) }}
+                </span>
             </FormItem>
         </template>
     </Form>
@@ -45,6 +48,14 @@ const props = defineProps({
     },
 })
 
+
+const formRef = ref();
+const searchValue = ref('');
+const { 
+    categoryValuesMap, 
+    getDeleteAttributesNames 
+} = useAttributesCache(props);
+
 const categoryInfo = computed(() => {
     return {
         categoryList: props.categoryList
@@ -54,9 +65,7 @@ const showForm = computed(() => {
     // 判断是否有数据
     return Object.values(categoryValuesMap).some(item => item.length > 0);
 });
-const formRef = ref();
-const searchValue = ref('');
-const { categoryValuesMap } = useAttributesCache(props);
+
 
 // 返回promise
 const validate = () => {
@@ -71,8 +80,7 @@ const validate = () => {
             reject(false);
         });
     });
-}
-
+};
 
 defineExpose({
     validate

package/src/hooks/useAttributesCache.ts

@@ -15,7 +15,29 @@ export default function useAttributesCache(props: any) {
 
     }, { immediate: true, deep: true });
 
+
+    const getCategoryName = (id: number, list: AttributeValueType[]): string => {
+        // 换成for 语句
+        for (let i = 0; i < list.length; i++) {
+            const item = list[i];
+            if (item.id === id) {
+                return item.attributeName;
+            }
+            if (item.children && item.children.length) {
+                return getCategoryName(id, item.children);
+            }
+        }
+        return '';
+    };  
+
+    const getDeleteAttributesNames = (item: CategoryType) => {
+        return item.defaultValueIds?.filter(id => !item.attributeValueIds_view.includes(id))?.map(id => {
+            return getCategoryName(id, categoryValuesMap[item.id]);
+        }).join('、');
+    };
+
     return {
-        categoryValuesMap
+        categoryValuesMap,
+        getDeleteAttributesNames
     }
 }

package/src/hooks/useCategory.ts

@@ -5,8 +5,9 @@ export default function useCategory(tree: PermissionType[], checkedIds: string[]
     const categoryList: CategoryType[] = [];
     deepTree(tree, (item) => {
         if (!item.children && checkedIds.includes(item.feature)) {
-            item.categoryVOS?.forEach((category: any) => {
+            item.categoryVOS?.forEach((category: CategoryType) => {
                 category.attributeValueIds_view = category?.attributeValueIds || [];  
+                category.defaultValueIds = category?.attributeValueIds || [];
                 categoryList.push(category);
             });
         }

package/src/i18n/en-US.ts

@@ -5,7 +5,7 @@ export default {
     approvalProcess: 'Approval Process',
     isAllOwnTips: 'The current page already has permission or is under approval, no need to apply',
     applyReasonPlaceholder: 'Please describe your reason and usage scenario in detail. Avoid vague explanations like "work needs" to prevent delays in approval.',
-    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!',
+    applyReasonTips: 'Template:Because of the 【project/work】, I need to view 【data】, and therefore require 【relevant permissions】. Other details that need to be noted: 【】',
     cancel: 'Cancel',
     submit: 'Confirm',
     close: 'Close',
@@ -26,10 +26,9 @@ export default {
     manager: 'System Administrator',
     availableTime: 'Validity Period',
     selectPlaceholder: 'Please select permission points',
-    reasonPlaceholder: 'Please enter your reason for applying',
     pleaseChoose: 'Please select',
     maxCountTips: 'You can apply for up to {count} permissions at a time',
-    maxLengthTips: 'Up to {length} characters',
+    maxMinLengthTips: 'Cannot be empty, and the reason must be between {minLength} and {maxLength} characters in length',
     today: 'Expires today',
     clickToApply: 'Click to apply for permission',
     noPermissionTips: 'There are no permission points under this menu, no need to apply',

package/src/i18n/in-ID.ts

@@ -5,7 +5,7 @@ export default {
     approvalProcess: 'Proses Persetujuan',
     isAllOwnTips: 'Halaman ini sudah memiliki izin atau sedang dalam proses persetujuan, tidak perlu mengajukan permohonan',
     applyReasonPlaceholder: 'Harap jelaskan alasan dan skenario penggunaan secara detail. Hindari penjelasan yang tidak jelas seperti "kebutuhan kerja" untuk mencegah penundaan persetujuan.',
-    applyReasonTips: 'Contoh: Karena kebutuhan proyek XX, perlu melihat/mengoperasikan skenario/masalah XXXX, yang melibatkan penggunaan izin XXX, oleh karena itu mengajukan permohonan ini!',
+    applyReasonTips: 'Templat:Karena 【proyek/pekerjaan】, saya perlu melihat 【data】, dan oleh karena itu memerlukan 【izin yang relevan】. Hal lain yang perlu dicatat: 【】',
     cancel: 'Batal',
     submit: 'Konfirmasi',
     close: 'Tutup',
@@ -26,10 +26,9 @@ export default {
     manager: 'Administrator Sistem',
     availableTime: 'Masa Berlaku',
     selectPlaceholder: 'Silakan pilih titik izin',
-    reasonPlaceholder: 'Silakan masukkan alasan permohonan Anda',
     pleaseChoose: 'Silakan pilih',
     maxCountTips: 'Anda dapat mengajukan hingga {count} izin sekaligus',
-    maxLengthTips: 'Maksimal {length} karakter',
+    maxMinLengthTips: 'Tidak boleh kosong, dan alasannya harus antara {minLength} dan {maxLength} karakter',
     today: 'Kadaluarsa hari ini',
     clickToApply: 'Klik untuk mengajukan izin',
     noPermissionTips: 'Tidak ada titik izin di bawah menu ini, tidak perlu mengajukan permohonan',

package/src/i18n/zh-CH.ts

@@ -5,7 +5,7 @@ export default {
     approvalProcess: '审批流程',
     isAllOwnTips: '当前页面权限已拥有或审批中，无需申请',
     applyReasonPlaceholder: '请尽可能详细说明申请原因和使用场景，不要只填写“工作需要”之类的理由，以免影响你获取权限的审批时间。',
-    applyReasonTips: '示例：由于XX项目需要，需要查看/操作XXXX场景/问题，涉及到XXX权限的使用，因此提交申请！',
+    applyReasonTips: '模版：因为【】项目/工作，需要查看【】数据，需要【】相关权限。其他需要说明的情况【】',
     cancel: '取消',
     submit: '确定',
     close: '关闭',
@@ -29,7 +29,7 @@ export default {
 	reasonPlaceholder: '请输入申请理由',
     pleaseChoose: '请选择',
 	maxCountTips: '一次最多只可申请{count}个权限',
-	maxLengthTips: '最多{length}个字符',
+	maxMinLengthTips: '不能为空，且理由长度在{minLength}~{maxLength}个字符之间',
 	today: '今天到期',
     clickToApply: '点击申请权限',
     noPermissionTips: '该菜单下暂无权限点，无需申请',
@@ -39,6 +39,7 @@ export default {
     category: '数据权限',
     categotySelectTips: '上方选中的权限包含数据权限，请根据实际工作需要申请/更改数据范围。',
     categoryChangeTips: '提醒：您选择的数据权限范围较大！请确认实际工作场景是否需要全量「{category}」权限，并在申请理由中写明，避免审批不通过！',
+    deleteCategoryTips: '提醒：已有的数据权限「{categorys}」被删除，将失去该数据权限，请谨慎删除',
     levels: {
         L1: '低',
         L2: '中',

package/src/typings/index.d.ts

@@ -76,6 +76,13 @@ declare type CategoryType = {
 	attributeValueIds?: number[],
 	configWay: Category,
 	attributeValueIds_view: number[],
+	defaultValueIds: number[],
+}
+
+declare type AttributeValueType = {
+	id: number,
+	attributeName: string,
+	children?: AttributeValueType[],
 }
 
 declare type OptionsType = {