@jari-ace/element-plus-component 0.4.3 → 0.5.0

package/packages/components/upload/uploader.vue

@@ -16,7 +16,6 @@ import {
     useSystemClassificationLevels
 } from "../../hooks/useClassificationLevels";
 import Ace = Jari.Ace;
-import { ElMessageBox } from "element-plus";
 import "@uppy/core/css/style.min.css";
 import "@uppy/dashboard/css/style.min.css";
 import "@uppy/audio/css/style.min.css";
@@ -33,8 +32,8 @@ import Dashboard from "@uppy/dashboard";
 import ImageEditor from "@uppy/image-editor";
 import prettyBytes from "pretty-bytes";
 import PdfViewerModal from "./pdf-viewer/PdfViewerModal.vue";
-
 import {
+    ElMessageBox,
     ElTable,
     ElTableColumn,
     ElButton,
@@ -46,6 +45,7 @@ import {
     ElTooltip
 } from "element-plus";
 import type { AceFile } from "./types";
+import { fa } from "element-plus/es/locales.mjs";
 
 const props = defineProps<{
     /**
@@ -419,69 +419,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;
 }

package/packages/components/userPicker/src/JaUserList.vue

@@ -255,7 +255,6 @@ onUnmounted(() => {
                         <Check v-if="userSelected(u)"/>
                     </el-icon>
                     <ja-user-info-tag :user-id="u.id" :full-name="u.fullName"
-                                      :has-avatar="u.hasAvatar"
                                       placement="left-start"
                                       :theme="userTagTheme(u)"></ja-user-info-tag>
                 </li>

package/packages/components/userTag/UserInfoTag.vue

@@ -29,7 +29,7 @@ const props = withDefaults(defineProps<{
     realm?: string,
     username?: string,
     theme?: keyof typeof themeClass,
-    hasAvatar?: boolean,
+    showAvatarInTag?: boolean,
     placement?: 'top' | 'top-start' | 'top-end' | 'bottom' | 'bottom-start' | 'bottom-end' | 'left' | 'left-start' | 'left-end' | 'right' | 'right-start' | 'right-end'
 }>(), {
     closable: false,
@@ -106,7 +106,7 @@ function doUnbookmark() {
             <div :class="themeClass[props.theme]">
                 <div class="portrait">
                     <ja-avatar :size="24" :user-id="userId" :realm="realm"
-                               :username="username" :has-avatar="false"></ja-avatar>
+                               :username="username" :has-avatar="showAvatarInTag"></ja-avatar>
                 </div>
                 <div class="user-info">
                     {{ fullName }}

package/packages/hooks/useRouteableVisible.ts

@@ -0,0 +1,35 @@
+import { computed, ref, type Ref } from 'vue';
+import { useRouter } from 'vue-router';
+/**
+ * 支持通过路由控制对话框visible或者通过v-model控制对话框visible
+ * 
+ * @param modelValue 对话框的visible模型变量
+ * @returns 
+ */
+export function useRouteableVisible(modelValue: Ref<boolean | undefined>) {
+  const router = useRouter();
+
+  // Use internal state if modelValue is not provided (route mode)
+  const internalVisible = ref(true);
+  const isRouteMode = computed(() => modelValue.value === undefined);
+
+  const visible = computed({
+    get: () => (isRouteMode.value ? internalVisible.value : modelValue.value!),
+    set: (val) => {
+      if (isRouteMode.value) {
+        internalVisible.value = val;
+        if (!val) {
+          // If closed in route mode, go back
+          router.back();
+        }
+      } else {
+        modelValue.value = val;
+      }
+    },
+  });
+
+  return {
+    visible,
+    isRouteMode,
+  };
+}

package/packages/index.ts

@@ -31,3 +31,4 @@ export * from "./hooks/useEntities"
 export * from "./hooks/useGroups"
 export * from "./hooks/useRoleCategories"
 export * from "./hooks/useProperties"
+export * from "./hooks/useRouteableVisible"