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

package/packages/components/upload/uploader.vue

@@ -1,13 +1,16 @@
 <script setup lang="ts">
 import {
+    type ClassificationLevel,
     createAxiosWithoutCache,
-    type FileInfo, Jari,
+    type FileInfo,
+    Jari,
+    type UploadInitParams,
     useFilesApi,
-    useLoginUser,
-    type ClassificationLevel, type UploadInitParams, useLoading
+    useLoading,
+    useLoginUser
 } from "@jari-ace/app-bolts";
 import { nextTick, onMounted, onUnmounted, ref, watch } from "vue";
-import { ArrowDown, Download, Upload } from "@element-plus/icons-vue";
+import { ArrowDown, Download, Upload, WarningFilled } from "@element-plus/icons-vue";
 import {
     useSystemClassificationLevelMap,
     useSystemClassificationLevels
@@ -67,7 +70,23 @@ const props = defineProps<{
     /**
      * 文件列表最大高度
      */
-    maxHeight?: string | number
+    maxHeight?: string | number,
+    /**
+     * 是否允许上传, 为空表示采用应用里的附件设置
+     */
+    allowUpload?: boolean,
+    /**
+     * 是否允许下载，为空表示采用应用里的附件设置
+     */
+    allowDownload?: boolean,
+    /**
+     * 是否允许删除，为空表示采用应用里的附件设置
+     */
+    allowDelete?: boolean,
+    /**
+     * 是否允许预览，为空表示采用应用里的附件设置
+     */
+    allowPreview?: boolean,
 }>();
 const attachId = defineModel<string>({
     required: false
@@ -79,6 +98,7 @@ const files = ref<FileInfo[]>([]);
 const classificationLevels = ref<ClassificationLevel[]>([]);
 const allowedClassificationLevels = ref<ClassificationLevel[]>([]);
 const classificationLevelMap = ref<Map<number, string>>();
+const highestClassificationLevel = ref<number>();
 const user = ref<Ace.User>();
 const selectedFileClassificationLevel = ref(50);
 const curAttachToken = ref<string>();
@@ -151,18 +171,7 @@ let uppy: Uppy | undefined;
 curAttachToken.value = props.attachToken;
 
 onMounted(async () => {
-    user.value = useLoginUser();
-    const cl = Math.max(props.classificationLevel ?? 50, user.value?.classifiedLevel ?? 50);
-    classificationLevels.value = await useSystemClassificationLevels();
-    classificationLevelMap.value = await useSystemClassificationLevelMap();
-    allowedClassificationLevels.value = classificationLevels.value.filter(l => l.value >= cl);
-    console.log(`附件控件密级调试:
-    表单密级:`, props.classificationLevel, `
-    用户密级:`, user.value?.classifiedLevel, `
-    表单/用户密级比较后取最低密级:`, cl, `
-    系统密级:`, classificationLevels.value, `
-    最终可选密级:`, allowedClassificationLevels.value
-    )
+    await updateAllowedClassificationLevels();
     if (props.attachToken) {
         await initLoad();
     } else {
@@ -175,6 +184,22 @@ onUnmounted(() => {
     uppy = undefined;
 });
 
+async function updateAllowedClassificationLevels() {
+    user.value = useLoginUser();
+    const cl = Math.max(props.classificationLevel ?? 50, user.value?.classifiedLevel ?? 50);
+    classificationLevels.value = await useSystemClassificationLevels();
+    classificationLevelMap.value = await useSystemClassificationLevelMap();
+    allowedClassificationLevels.value = classificationLevels.value.filter(l => l.value >= cl);
+    highestClassificationLevel.value = Math.min(...allowedClassificationLevels.value.map(l=>l.value))
+    console.log(`附件控件密级调试:
+    表单密级:`, props.classificationLevel, `
+    用户密级:`, user.value?.classifiedLevel, `
+    表单/用户密级比较后取最低密级:`, cl, `
+    系统密级:`, classificationLevels.value, `
+    最终可选密级:`, allowedClassificationLevels.value
+    );
+}
+
 async function loadFileInfos() {
     if (!curAttachToken.value) {
         files.value = [];
@@ -393,66 +418,71 @@ async function downloadAll() {
 }
 
 function checkAllowUpload() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.uploadAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.uploadAuthCode);
+    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;
             }
-            return !cfg.disallowUpload && hasRole;
+            return !cfg.disallowUpload;
         }
-        return !cfg.disallowUpload;
+        console.log('file cfg is null')
     }
-    console.log('file cfg is null')
-    return false;
+    return props.allowUpload;
 }
 
 function checkAllowDownload() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.downloadAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.downloadAuthCode);
+    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;
             }
-            return !cfg.disallowDownload && hasRole;
+            return !cfg.disallowDownload;
         }
-        return !cfg.disallowDownload;
     }
-    return false;
+    return props.allowDownload;
 }
 
 function checkAllowDelete() {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        let hasRole = true;
-        if (cfg.deleteAuthCode) {
-            const login = useLoginUser();
-            if (login) {
-                hasRole = login.hasRole(cfg.deleteAuthCode);
+    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;
             }
-            return !cfg.disallowDelete && hasRole;
+            return !cfg.disallowDelete;
         }
-        return !cfg.disallowDelete;
     }
-    return false;
+    return props.allowDelete;
 }
 
 function checkAllowPreview(file: FileInfo) {
-    const cfg = uploadInitParams.value?.fileConfig;
-    if (cfg) {
-        if (cfg.disablePreview) {
-            return false;
-        }
-        if (!previewableFileExts.some(ext => file.fileName.endsWith(ext))) {
-            return false;
+    if (props.allowPreview == undefined) {
+        const cfg = uploadInitParams.value?.fileConfig;
+        if (cfg) {
+            if (cfg.disablePreview) {
+                return false;
+            }
+            return previewableFileExts.some(ext => file.fileName.endsWith(ext));
         }
-        return true;
     }
-    return false;
+    return props.allowPreview;
 }
 
 watch(() => props.attachToken, () => {
@@ -463,6 +493,8 @@ watch(() => props.attachToken, () => {
     }
 });
 
+watch(()=> props.classificationLevel,  updateAllowedClassificationLevels)
+
 </script>
 
 <template>
@@ -506,12 +538,17 @@ watch(() => props.attachToken, () => {
                     {{ prettyBytes(scope.row.fileSize) }}
                 </template>
             </el-table-column>
-            <el-table-column prop="classifiedLevel" width="60">
+            <el-table-column prop="classifiedLevel" width="80">
                 <template #default="scope">
                     <el-tag
                         :type="scope.row.classifiedLevel < 50 ? (scope.row.classifiedLevel < 30 ? 'danger' : 'warning') : 'info'">
                         {{ classificationLevelMap?.get(scope.row.classifiedLevel) }}
                     </el-tag>
+                    <el-tooltip v-if="scope.row.classifiedLevel < highestClassificationLevel" content="文件密级已高于当前许可范围，请立即删除">
+                        <el-icon color="#F56C6C">
+                            <warning-filled/>
+                        </el-icon>
+                    </el-tooltip>
                 </template>
             </el-table-column>
             <el-table-column align="right" width="150" fixed="right">

package/packages/components/userGroupTree/src/userGroupTree.vue

@@ -10,7 +10,14 @@
                  :expand-on-click-node="false"
                  v-bind="$attrs" @current-change="currentChange" :props="{
                 class: (node: TreeNodeData) => selected?.id === node.id ? 'selected-group' : 'group',
-            }"></el-tree>
+            }">
+            
+            <template #default="{ data }">
+                <div>
+                    <div class="name">{{ data.label }} <el-tag v-if="data.resourceScoped" type="info">资源域</el-tag></div>
+                </div>
+            </template>
+            </el-tree>
     </div>
 </template>
 
@@ -24,7 +31,7 @@ import {
     useUserGroupApi,
 } from "@jari-ace/app-bolts";
 import {type TreeNodeType, useTreeData} from "../../../hooks/useTreeData";
-import {ElOption, ElSelect, ElTree, vLoading} from "element-plus";
+import {ElOption, ElSelect, ElTree, vLoading, ElTag} from "element-plus";
 import type {TreeNodeData} from "element-plus/es/components/tree/src/tree.type";
 import {useAppInstances} from "../../../hooks/useAppInstances";
 import {useGroups} from "../../../hooks/useGroups";