@yqg/permission 1.0.8-beta.0 → 1.0.8

package/dist/{yqg-permission-Cx73HCrN.js → yqg-permission-CijpI0ru.js}

@@ -1,4 +1,4 @@
-import { F as Qe, i as Kn, C as ug, T as Gs, d as k, r as Xe, o as Pe, a as Vn, b as MA, w as V, g as st, p as fe, c as D, e as pe, f as G, u as K, s as Y, h as Se, j as Ge, t as gg, k as I, l as qt, m as Ws, n as fg, q as qn, v as Ks, x as Zt, y as Fe, z as dg, A as pg, B as Pi, D as Cg, E as Vs, G as RA, H as qs, I as Bg, J as hg, K as Bt, L as Si, M as co, N as ht, O as He, P as En, Q as nt, R as vn, S as Eg, U as vg } from "./index-DsIoPFuc.js";
+import { F as Qe, i as Kn, C as ug, T as Gs, d as k, r as Xe, o as Pe, a as Vn, b as MA, w as V, g as st, p as fe, c as D, e as pe, f as G, u as K, s as Y, h as Se, j as Ge, t as gg, k as I, l as qt, m as Ws, n as fg, q as qn, v as Ks, x as Zt, y as Fe, z as dg, A as pg, B as Pi, D as Cg, E as Vs, G as RA, H as qs, I as Bg, J as hg, K as Bt, L as Si, M as co, N as ht, O as He, P as En, Q as nt, R as vn, S as Eg, U as vg } from "./index-CUxQJBEu.js";
 function Mn(e) {
   "@babel/helpers - typeof";
   return Mn = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(t) {
@@ -16416,7 +16416,7 @@ ne.interceptors.response.use(
     return pt.error(t), Promise.reject(e);
   }
 );
-const Wr = "/admin/crane", Gy = {
+const Wr = "/crane", Gy = {
   getPermissions: (e) => ne.get(`${Wr}/permission/apply`, { params: e }),
   getFlowPreview: (e) => ne.post(`${Wr}/permission/apply/oa/flow/submit/preview`, e),
   submitApply: (e) => ne.post(`${Wr}/permission/apply/oa/flow/submit`, e)
@@ -16426,7 +16426,7 @@ const Wr = "/admin/crane", Gy = {
   applyReason: "申请理由",
   approvalProcess: "审批流程",
   applyReason1: "新入职员工申请",
-  applyReason2: "临时项目",
+  applyReason2: "项目需要",
   applyReason3: "数据查询与分析",
   applyReasonPlaceholder: "请尽可能详细描述申请理由",
   cancel: "取消",
@@ -16442,7 +16442,7 @@ const Wr = "/admin/crane", Gy = {
   adaptDepartment: "适用部门",
   noApprovalProcess: "无审批流程",
   excessTips: "一次最多可申请{number}个权限",
-  unavailableTips: "您暂无权限查看/操作该页面，请点击按钮进行申请",
+  unavailableTips: "您暂无权限查看/操作该页面，请点击下方按钮进行申请",
   appliedTips: "权限已申请，正在{status}...",
   unapplyTips: "您暂无权限查看/操作该页面，且该页面中没有您可以申请的权限，",
   callManager: "如有需要请联系系统管理员",
@@ -16450,6 +16450,10 @@ const Wr = "/admin/crane", Gy = {
   availableTime: "有效期",
   selectPlaceholder: "请选择权限点",
   reasonPlaceholder: "请输入申请理由",
+  maxCountTips: "一次最多只可申请{count}个权限",
+  maxLengthTips: "最多{length}个字符",
+  lastDays: "{count}天后到期",
+  taday: "今天到期",
   availiables: {
     SEVEN_DAYS: "7天",
     THIRTY_DAYS: "30天",
@@ -16465,7 +16469,8 @@ const Wr = "/admin/crane", Gy = {
   status: {
     PENDING: "审批中",
     NO: "不可申请",
-    OWNER: "已拥有"
+    OWNER: "永久拥有",
+    TEMP_OWNER: "临时拥有"
   },
   operationType: {
     QUERY: "查询",
@@ -16477,7 +16482,7 @@ const Wr = "/admin/crane", Gy = {
   applyReason: "申请理由",
   approvalProcess: "审批流程",
   applyReason1: "新入职员工申请",
-  applyReason2: "临时项目",
+  applyReason2: "项目需要",
   applyReason3: "数据查询与分析",
   applyReasonPlaceholder: "请尽可能详细描述申请理由",
   cancel: "取消",
@@ -16493,7 +16498,7 @@ const Wr = "/admin/crane", Gy = {
   adaptDepartment: "适用部门",
   noApprovalProcess: "无审批流程",
   excessTips: "一次最多可申请{number}个权限",
-  unavailableTips: "您暂无权限查看/操作该页面，请点击按钮进行申请",
+  unavailableTips: "您暂无权限查看/操作该页面，请点击下方按钮进行申请",
   appliedTips: "权限已申请，正在{status}...",
   unapplyTips: "您暂无权限查看/操作该页面，且该页面中没有您可以申请的权限，",
   callManager: "如有需要请联系系统管理员",
@@ -16504,6 +16509,7 @@ const Wr = "/admin/crane", Gy = {
   maxCountTips: "一次最多只可申请{count}个权限",
   maxLengthTips: "最多{length}个字符",
   lastDays: "{count}天后到期",
+  taday: "今天到期",
   availiables: {
     SEVEN_DAYS: "7天",
     THIRTY_DAYS: "30天",
@@ -16584,7 +16590,7 @@ const Wr = "/admin/crane", Gy = {
   emits: ["onSuccess"],
   setup(e, { emit: t }) {
     const n = vg(
-      () => import("./apply-modal-DEXDzX6B.js").then((h) => h.a)
+      () => import("./apply-modal-AV3_k_ue.js").then((h) => h.a)
     ), o = {
       DEFAULT: "DEFAULT",
       PENDING: "PENDING",
@@ -16637,7 +16643,7 @@ const Wr = "/admin/crane", Gy = {
       let v = await Gy.getPermissions(h);
       s.value = u(v.body || []), l.value = g(s.value);
     }, C = () => {
-      i.value = !i.value;
+      p(), i.value = !i.value;
     };
     return Se(p), V(() => r.locale, (h, v) => {
       h !== v && localStorage.setItem("permission_locale", r.locale);
@@ -16762,7 +16768,7 @@ const Wr = "/admin/crane", Gy = {
   for (const [o, r] of t)
     n[o] = r;
   return n;
-}, sw = /* @__PURE__ */ aw(iw, [["__scopeId", "data-v-0923d8e1"]]), xw = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, sw = /* @__PURE__ */ aw(iw, [["__scopeId", "data-v-debef759"]]), xw = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: sw
 }, Symbol.toStringTag, { value: "Module" }));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.0.8-beta.0",
+    "version": "1.0.8",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",
@@ -13,16 +13,14 @@
         "dev": "vite",
         "preview": "vite preview"
     },
-    "dependencies": {
-        "@ant-design/icons-vue": "^7.0.1",
+    "devDependencies": {
+		"@ant-design/icons-vue": "^7.0.1",
         "@commitlint/cli": "^19.5.0",
         "@commitlint/config-conventional": "^19.5.0",
         "ant-design-vue": "4.x",
         "axios": "^1.7.7",
         "vite-plugin-css-injected-by-js": "^3.5.2",
-        "vue": "^3.5.12"
-    },
-    "devDependencies": {
+        "vue": "^3.5.12",
         "@typescript-eslint/parser": "^8.13.0",
         "@vitejs/plugin-vue": "^5.1.4",
         "eslint": "^9.14.0",

package/src/App.vue

@@ -8,9 +8,14 @@ type LocaleType = 'zh-CN' | 'en-US' | 'id-ID' | 'fil-PH';
 const color = ref<string>('#1677ff');
 const locale = ref<LocaleType>('zh-CN');
 
-const permissions = reactive([
-                'CRANE.EMPLOYEE.QUERY', 'CRANE.EMPLOYEE.DETAIL_QUERY', 'CRANE.EMPLOYEE.ATTRIBUTE_CREATE', 'CRANE.EMPLOYEE.ROLE_ASSIGN'
-            ]);
+const permissions = reactive(['CRANE.ROLE.QUERY',
+                'CRANE.ROLE.CREATE',
+                'CRANE.ROLE.UPDATE',
+                'CRANE.ROLE.DELETE',
+                'CRANE.ROLE.PERMISSION_ASSIGN',
+                'CRANE.ROLE.EMPLOYEE_ASSIGN',
+                'CRANE.ROLE.DETAIL_QUERY',
+                'CRANE.ROLE.EXPORT']);
 // const permissions = reactive(['CRANE.BUSINESS.QUERY', 'RANE.BUSINESS.CREATE', 'CRANE.BUSINESS.UPDATE', 'CRANE.BUSINESS.DELETE']);
 const changeColor = () => {
 	color.value = color.value === '#f00' ? '#1677ff' : '#f00';
@@ -33,7 +38,7 @@ const changeLocale = () => {
 			  <!-- 05184 -->
 			<yqg-permission 
 			:permissions="permissions"
-			workNumber="05181"
+			workNumber="EX03385"
 			businessCode="CRANE"
 			:color="color"
 			:locale="locale"

package/src/axios/index.ts

@@ -1,6 +1,6 @@
 import axios from './axios';
 
-const urlPrefix = '/admin/crane';
+const urlPrefix = '/crane';
 
 type apiType = {
 	[key in string]: (params: any) => Promise<{body: any}>

package/src/components/apply-modal.vue

@@ -173,8 +173,7 @@
 
   	const onChangeHandler = throttle(async () => {
 		if (formState.roleIds.length > 5) {
-			formState.roleIds.pop();
-			return message.warning(t('maxCountTips', {count: 5}));
+			return;
 		}
 
 		if (!formState.roleIds.length) {
@@ -187,6 +186,14 @@
 		stepNodes.value = res?.body?.nodes || [];
   	}, 0)
 
+	watch(() => formState.roleIds, (val) => {
+		// 写到watch里避免闪烁
+		if (val.length > 5) {
+			formState.roleIds.pop();
+			message.warning(t('maxCountTips', {count: 5}));
+		}
+	})
+
   	watch(() => open.value, (cur) => {
 		if (cur) {
 			formRef.value?.resetFields();

package/src/components/checkbox-item.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="crane-checkbox-line">
 		<Checkbox 
-		:value="item.roleId" 
+		:value="item.roleId"
 		:disabled="['OWNER', 'PENDING', 'NO'].includes(props.item.businessApplyType)"
 		@change="onCheck">
 			<div class="crane-flex-center crane-checkbox-label">
@@ -30,7 +30,8 @@
 				</Tag>
 				<Popover>
 					<template #content>
-						{{t('lastDays', {count: item?.ownStatusVO?.dayDiff})}}
+						<span v-if="item?.ownStatusVO?.dayDiff>0">{{t('lastDays', {count: item?.ownStatusVO?.dayDiff})}}</span>
+						<span v-else>{{ t('taday') }}</span>
 					</template>
 					<Tag
 						v-if="item.businessApplyType === 'TEMP_OWNER'" 

package/src/components/success-modal.vue

@@ -21,17 +21,17 @@
 			onOk: () => {
 				window.open(url);
 				modal1.destroy();
-				if (callback) {
-					callback();
-				} else {
+				callback && callback();
+				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (!window.YQG_PERMISSION_CALLBACK && !callback) {
 					location.reload();
 				}
 			},
 			onCancel: () => {
 				modal1.destroy();
-				if (callback) {
-					callback();
-				} else {
+				callback && callback();
+				window.YQG_PERMISSION_CALLBACK && window.YQG_PERMISSION_CALLBACK();
+				if (!window.YQG_PERMISSION_CALLBACK && !callback) {
 					location.reload();
 				}
 			},

package/src/components/yqg-permission.vue

@@ -217,6 +217,7 @@
   	};
 
   	const showModal = () => {
+		getPermissions();
 		open.value = !open.value;
   	};
 

package/src/i18n/en-US.ts

@@ -4,7 +4,7 @@ export default {
     applyReason: '申请理由',
     approvalProcess: '审批流程',
     applyReason1: '新入职员工申请',
-    applyReason2: '临时项目',
+    applyReason2: '项目需要',
     applyReason3: '数据查询与分析',
     applyReasonPlaceholder: '请尽可能详细描述申请理由',
     cancel: '取消',
@@ -20,7 +20,7 @@ export default {
     adaptDepartment: '适用部门',
 	noApprovalProcess: '无审批流程',
     excessTips: '一次最多可申请{number}个权限',
-    unavailableTips: '您暂无权限查看/操作该页面，请点击按钮进行申请',
+    unavailableTips: '您暂无权限查看/操作该页面，请点击下方按钮进行申请',
     appliedTips: '权限已申请，正在{status}...',
     unapplyTips: '您暂无权限查看/操作该页面，且该页面中没有您可以申请的权限，',
 	callManager: '如有需要请联系系统管理员',
@@ -28,6 +28,10 @@ export default {
     availableTime: '有效期',
 	selectPlaceholder: '请选择权限点',
 	reasonPlaceholder: '请输入申请理由',
+	maxCountTips: '一次最多只可申请{count}个权限',
+	maxLengthTips: '最多{length}个字符',
+	lastDays: '{count}天后到期',
+	taday: '今天到期',
     availiables: {
         SEVEN_DAYS: '7天',
         THIRTY_DAYS: '30天',
@@ -43,7 +47,8 @@ export default {
     status: {
         PENDING: '审批中',
         NO: '不可申请',
-        OWNER: '已拥有',
+        OWNER: '永久拥有',
+		TEMP_OWNER: '临时拥有',
     },
 	operationType: {
 		QUERY: '查询',

package/src/i18n/zh-CH.ts

@@ -4,7 +4,7 @@ export default {
     applyReason: '申请理由',
     approvalProcess: '审批流程',
     applyReason1: '新入职员工申请',
-    applyReason2: '临时项目',
+    applyReason2: '项目需要',
     applyReason3: '数据查询与分析',
     applyReasonPlaceholder: '请尽可能详细描述申请理由',
     cancel: '取消',
@@ -20,7 +20,7 @@ export default {
     adaptDepartment: '适用部门',
 	noApprovalProcess: '无审批流程',
     excessTips: '一次最多可申请{number}个权限',
-    unavailableTips: '您暂无权限查看/操作该页面，请点击按钮进行申请',
+    unavailableTips: '您暂无权限查看/操作该页面，请点击下方按钮进行申请',
     appliedTips: '权限已申请，正在{status}...',
     unapplyTips: '您暂无权限查看/操作该页面，且该页面中没有您可以申请的权限，',
 	callManager: '如有需要请联系系统管理员',
@@ -31,6 +31,7 @@ export default {
 	maxCountTips: '一次最多只可申请{count}个权限',
 	maxLengthTips: '最多{length}个字符',
 	lastDays: '{count}天后到期',
+	taday: '今天到期',
     availiables: {
         SEVEN_DAYS: '7天',
         THIRTY_DAYS: '30天',

package/src/typings/index.d.ts

@@ -53,3 +53,6 @@ declare type formStateType = {
 	submitWorkNumber: string,
 
 };
+declare interface Window {
+	YQG_PERMISSION_CALLBACK?: () => void;
+}

package/src/vite-env.d.ts

@@ -1 +1 @@
-/// <reference types="vite/client" />
+/// <reference types="vite/client" />