From 27b1308ae2cca6c1946291607ea70c22c713e0bd Mon Sep 17 00:00:00 2001
From: sunchao <2642441182@qq.com>
Date: Fri, 21 Mar 2025 17:27:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98,=20=E4=BF=AE=E6=94=B9=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormItem/OrgList.vue           |  2 ++
 src/components/FormItem/RoleList.vue          | 36 +++++++++----------
 src/components/index.ts                       |  2 ++
 .../system/Department/components/LeftTree.vue |  9 ++++-
 src/views/system/Department/index.vue         |  4 +++
 .../Save/components/VariableDefinitions.vue   | 13 ++++++-
 .../components/variableItem/InputFile.vue     |  6 ++--
 .../system/User/components/EditUserDialog.vue |  2 +-
 8 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/src/components/FormItem/OrgList.vue b/src/components/FormItem/OrgList.vue
index aa4cbe6ce..d0130066f 100644
--- a/src/components/FormItem/OrgList.vue
+++ b/src/components/FormItem/OrgList.vue
@@ -34,6 +34,8 @@ const handleData = (arr) => {
     }
     if(props.disabledData?.includes(i.id)){
       i.disabled = true
+    } else {
+      i.disabled = false
     }
     return i
   })
diff --git a/src/components/FormItem/RoleList.vue b/src/components/FormItem/RoleList.vue
index b8f420d42..fdf0e440b 100644
--- a/src/components/FormItem/RoleList.vue
+++ b/src/components/FormItem/RoleList.vue
@@ -32,6 +32,21 @@ const props = defineProps({
 const dataMap = new Map()
 
 const _treeData = computed(() => {
+  const arr = (treeData?.value || []).map((item)=>{
+    return {
+      name: item.groupName,
+      id: item.groupId,
+      disabled: true,
+      children: item.roles?.map((i)=>{
+        dataMap.set(i.id, i);
+        return {
+          name:i.name,
+          id:i.id,
+          disabled: props.disabledData.includes(i.id)
+        }
+      }) || []
+    }
+  })
   const _arr = props.extraData.filter(i => {
     return !dataMap.get(i.id)
   }).map(item => {
@@ -40,7 +55,7 @@ const _treeData = computed(() => {
       disabled: true
     }
   })
-  return [...treeData?.value || [], ..._arr]
+  return [...arr, ..._arr]
 })
 
 const { data: treeData, run } = useRequest(getRoleList, {
@@ -48,24 +63,7 @@ const { data: treeData, run } = useRequest(getRoleList, {
     paging: false,
     sorts: [{ name: 'createTime', order: 'desc' }]
   },
-  defaultValue: [],
-  onSuccess(resp) {
-    return resp.result.map((item)=>{
-      return {
-        name: item.groupName,
-        id: item.groupId,
-        disabled: true,
-        children: item.roles?.map((i)=>{
-          dataMap.set(i.id, i);
-          return {
-            name:i.name,
-            id:i.id,
-            disabled: props.disabledData.includes(i.id)
-          }
-        }) || []
-      }
-    })
-  }
+  defaultValue: []
 })
 const myValue = ref()
 const _extraData = computed(() => {
diff --git a/src/components/index.ts b/src/components/index.ts
index f252775d4..a02598879 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -4,6 +4,7 @@ import ImageUpload from "./Upload/Image/ImageUpload.vue";
 import CardBox from './CardBox/index.vue';
 import Search from './Search'
 import AMapComponent from './AMapComponent/AMap.vue'
+import PathSimplifier from './AMapComponent/PathSimplifier.vue'
 import { BasicLayoutPage, BlankLayoutPage, FullPage } from '@/layout'
 import ProUpload from './Upload/index.vue'
 import Player from './Player/index.vue'
@@ -24,6 +25,7 @@ export default {
             .component('BlankLayoutPage', BlankLayoutPage)
             .component('FullPage', FullPage)
             .component('AMapComponent', AMapComponent)
+            .component('PathSimplifier', PathSimplifier)
             .component('ProUpload', ProUpload)
             .component('Player', Player)
             .component('BatchDropdown', BatchDropdown)
diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index 8592d31c9..d22358ccd 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -23,9 +23,10 @@
         <a-tree
           v-if="treeData.length > 0"
           :tree-data="treeData"
-          v-model:selected-keys="selectedKeys"
+          :selected-keys="selectedKeys"
           v-model:expandedKeys="expandedKeys"
           :fieldNames="{ key: 'id' }"
+          @select="onSelect"
         >
           <template #title="{ name, data }">
             <div class="department-tree-item-content">
@@ -231,6 +232,12 @@ const openDialog = (row: any = {}) => {
   visible.value = true
 }
 
+const onSelect = (val: string[]) => {
+  if(val.length){
+    selectedKeys.value = val
+  }
+}
+
 watch(
   () => selectedKeys.value,
   (n) => {
diff --git a/src/views/system/Department/index.vue b/src/views/system/Department/index.vue
index 85c69a398..524719d25 100644
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@@ -34,6 +34,7 @@ import LeftTree from './components/LeftTree.vue'
 import User from './user/index.vue';
 import Position from './positions/index.vue';
 import {getModulesComponents, isNoCommunity} from "@/utils";
+import {useRouteQuery} from "@vueuse/router";
 
 const activeKey = ref<'product' | 'device' | 'user'>('product');
 
@@ -49,6 +50,9 @@ const openDeviceBind = () => {
 
 const onChange = (id: string) => {
   departmentId.value = id
+  if(!id){
+
+  }
 }
 
 const onChangeTabs = (id) => {
diff --git a/src/views/system/NoticeRule/components/Save/components/VariableDefinitions.vue b/src/views/system/NoticeRule/components/Save/components/VariableDefinitions.vue
index cf8a55e41..2075a9bda 100644
--- a/src/views/system/NoticeRule/components/Save/components/VariableDefinitions.vue
+++ b/src/views/system/NoticeRule/components/Save/components/VariableDefinitions.vue
@@ -27,6 +27,7 @@
                 <InputFile
                     v-else-if="getType(item) === 'file'"
                     v-model:value="modelRef[item.id]"
+                    @change="(dt) => onChange(dt, item)"
                 />
                 <a-input
                     v-else-if="getType(item) === 'link'"
@@ -74,6 +75,7 @@ const props = defineProps({
 const formRef = ref();
 
 const modelRef = reactive({});
+const fileNames = reactive({});
 
 watchEffect(() => {
     Object.assign(modelRef, props?.value);
@@ -83,6 +85,15 @@ const getType = (item: any) => {
     return item.expands?.businessType || item.type;
 };
 
+const onChange = (dt: any, item: any) => {
+  if(item.type === 'file'){
+    const __key = item.id.replace('location', 'name')
+    if(__key){
+      fileNames[__key] = dt?.name
+    }
+  }
+}
+
 const checkValue = (_rule: any, value: any, item: any) => {
     const type = item.expands?.businessType || item?.type;
     if (type === 'file') {
@@ -134,7 +145,7 @@ const onSave = () =>
         formRef.value
             ?.validate()
             .then((_data: any) => {
-                resolve(_data);
+                resolve({..._data, ...fileNames});
             })
             .catch(() => {
                 reject(false);
diff --git a/src/views/system/NoticeRule/components/Save/components/variableItem/InputFile.vue b/src/views/system/NoticeRule/components/Save/components/variableItem/InputFile.vue
index a6914b6e9..e5bbb8c4b 100644
--- a/src/views/system/NoticeRule/components/Save/components/variableItem/InputFile.vue
+++ b/src/views/system/NoticeRule/components/Save/components/variableItem/InputFile.vue
@@ -43,10 +43,10 @@ const props = defineProps({
     value: {
         type: String,
         default: '',
-    },
+    }
 });
 
-const emit = defineEmits(['update:value']);
+const emit = defineEmits(['update:value', 'change']);
 const url = ref(props.value || undefined);
 const loading = ref<boolean>(false);
 
@@ -59,6 +59,7 @@ const handleChange = (info: any) => {
         loading.value = false;
         const result = info.file.response?.result.accessUrl;
         emit('update:value', result);
+        emit('change', {name: info.file.response?.result?.name, url: result});
     }
 };
 
@@ -76,6 +77,7 @@ const handleBeforeUpload = (file: any) => {
 
 const onChange = (e: any) => {
     emit('update:value', e.target.value);
+    emit('change', {name: '', url: e.target.value});
 };
 
 watch(() => props.value, () => {
diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index 5930dab33..f05f9246a 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -243,7 +243,7 @@ const handleData = (data: string[], newData: string[], key: string) => {
 
 const onChange = (value: string[]) => {
   const arr = (value || []).map(i => {
-    return positionsMap.get(i)
+    return positionsMap.get(i) || i
   })
 
   const roles = map(flatten(map(arr, 'roles')), 'id').filter(i => i);