@jari-ace/element-plus-component 0.4.2 → 0.4.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jari-ace/element-plus-component",
   "private": false,
-  "version": "0.4.2",
+  "version": "0.4.4",
   "main": "lib/index.umd.cjs",
   "module": "lib/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "animate.css": "^4.1.1",
     "pretty-bytes": "^7.1.0",
     "vue-pdf-embed": "^2.1.3",
-    "@jari-ace/app-bolts": "0.6.3"
+    "@jari-ace/app-bolts": "0.6.4"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",

package/packages/components/upload/uploader.vue

@@ -42,9 +42,11 @@ import {
     ElDropdownItem,
     ElDropdownMenu,
     ElIcon,
-    ElTag
+    ElTag,
+    ElTooltip
 } from "element-plus";
 import type { AceFile } from "./types";
+import { fa } from "element-plus/es/locales.mjs";
 
 const props = defineProps<{
     /**
@@ -418,69 +420,84 @@ async function downloadAll() {
 }
 
 function checkAllowUpload() {
-    if (props.allowUpload == undefined) {
-        const cfg = uploadInitParams.value?.fileConfig;
-        if (cfg) {
-            let hasRole = true;
-            if (cfg.uploadAuthCode) {
-                const login = useLoginUser();
-                if (login) {
-                    hasRole = login.hasRole(cfg.uploadAuthCode);
-                }
-                return !cfg.disallowUpload && hasRole;
+    console.log('ja-uploader 上传权限调试：')
+    console.log('props.allowUpload = ', props.allowUpload)
+    if (props.allowUpload === false) return false;
+    const cfg = uploadInitParams.value?.fileConfig;
+    if (cfg) {
+        let hasRole = true;
+        console.log('cfg.uploadAuthCode = ', cfg.uploadAuthCode)
+        if (cfg.uploadAuthCode) {
+            const login = useLoginUser();
+            if (login) {
+                hasRole = login.hasRole(cfg.uploadAuthCode);
             }
-            return !cfg.disallowUpload;
+            console.log('hasRole = ', hasRole)
+            console.log('final upload auth: ', !cfg.disallowUpload && hasRole)
+            return !cfg.disallowUpload && hasRole;
         }
-        console.log('file cfg is null')
+        return !cfg.disallowUpload;
     }
-    return props.allowUpload;
+    console.log('file cfg ' + props.configKey + ' does not exists')
+    return !!props.allowUpload;
 }
 
 function checkAllowDownload() {
-    if (props.allowDownload == undefined) {
-        const cfg = uploadInitParams.value?.fileConfig;
-        if (cfg) {
-            let hasRole = true;
-            if (cfg.downloadAuthCode) {
-                const login = useLoginUser();
-                if (login) {
-                    hasRole = login.hasRole(cfg.downloadAuthCode);
-                }
-                return !cfg.disallowDownload && hasRole;
+    console.log('ja-uploader 下载权限调试：')
+    console.log('props.allowDownload = ', props.allowDownload)
+    if (props.allowDownload === false) return false;
+    const cfg = uploadInitParams.value?.fileConfig;
+    if (cfg) {
+        let hasRole = true;
+        console.log('cfg.uploadAuthCode = ', cfg.uploadAuthCode)
+        if (cfg.downloadAuthCode) {
+            const login = useLoginUser();
+            if (login) {
+                hasRole = login.hasRole(cfg.downloadAuthCode);
             }
-            return !cfg.disallowDownload;
+            console.log('hasRole = ', hasRole)
+            console.log('final download auth: ', !cfg.disallowDownload && hasRole)
+            return !cfg.disallowDownload && hasRole;
         }
+        return !cfg.disallowDownload;
     }
-    return props.allowDownload;
+    return !!props.allowDownload;
 }
 
 function checkAllowDelete() {
-    if (props.allowDelete == undefined) {
-        const cfg = uploadInitParams.value?.fileConfig;
-        if (cfg) {
-            let hasRole = true;
-            if (cfg.deleteAuthCode) {
-                const login = useLoginUser();
-                if (login) {
-                    hasRole = login.hasRole(cfg.deleteAuthCode);
-                }
-                return !cfg.disallowDelete && hasRole;
+    console.log('ja-uploader 删除权限调试：')
+    console.log('props.allowDelete = ', props.allowDelete)
+    if (props.allowDelete === false) return false;
+    const cfg = uploadInitParams.value?.fileConfig;
+    if (cfg) {
+        let hasRole = true;
+        console.log('cfg.deleteAuthCode = ', cfg.deleteAuthCode)
+        if (cfg.deleteAuthCode) {
+            const login = useLoginUser();
+            if (login) {
+                hasRole = login.hasRole(cfg.deleteAuthCode);
             }
-            return !cfg.disallowDelete;
+            console.log('hasRole = ', hasRole)
+            console.log('final delete auth: ', !cfg.disallowDelete && hasRole)
+            return !cfg.disallowDelete && hasRole;
         }
+        return !cfg.disallowDelete;
     }
-    return props.allowDelete;
+    return !!props.allowDelete;
 }
 
 function checkAllowPreview(file: FileInfo) {
-    if (props.allowPreview == undefined) {
-        const cfg = uploadInitParams.value?.fileConfig;
-        if (cfg) {
-            if (cfg.disablePreview) {
-                return false;
-            }
-            return previewableFileExts.some(ext => file.fileName.endsWith(ext));
+    console.log('ja-uploader 预览权限调试：')
+    console.log('props.allowPreview = ', props.allowPreview)
+    if (props.allowPreview === false) return false;
+    const cfg = uploadInitParams.value?.fileConfig;
+    if (cfg) {
+        if (cfg.disablePreview) {
+            return false;
         }
+        console.log("file name: ", file.fileName)
+        console.log("可预览类型：", previewableFileExts)
+        return previewableFileExts.some(ext => file.fileName.endsWith(ext));
     }
     return props.allowPreview;
 }