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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jari-ace/element-plus-component",
   "private": false,
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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.5.11"
+    "@jari-ace/app-bolts": "0.6.3"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",

package/packages/components/upload/uploader.vue

@@ -10,7 +10,7 @@ import {
     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
@@ -98,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>();
@@ -170,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 {
@@ -194,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 = [];
@@ -487,6 +493,8 @@ watch(() => props.attachToken, () => {
     }
 });
 
+watch(()=> props.classificationLevel,  updateAllowedClassificationLevels)
+
 </script>
 
 <template>
@@ -530,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";