From d7e7eb8ae593d0d518f218c668b9a7646a8827fa Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 30 Apr 2024 13:45:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=8F=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98/=E7=A7=BB=E5=8A=A8=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataFilling/form/MoveSelector.vue      | 12 +++++++++++-
 core/frontend/src/views/dataFilling/form/save.vue    | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/views/dataFilling/form/MoveSelector.vue b/core/frontend/src/views/dataFilling/form/MoveSelector.vue
index 60b0a87a80..f9284b47f0 100644
--- a/core/frontend/src/views/dataFilling/form/MoveSelector.vue
+++ b/core/frontend/src/views/dataFilling/form/MoveSelector.vue
@@ -37,6 +37,8 @@
 
 <script>
 import { listForm, moveForm } from '@/views/dataFilling/form/dataFilling'
+import { hasDataPermission } from '@/utils/permission'
+import { filter } from 'lodash-es'
 
 export default {
   name: 'DataFillingFormMoveSelector',
@@ -76,7 +78,7 @@ export default {
   methods: {
     tree(group) {
       listForm({ nodeType: 'folder' }).then(res => {
-        const formList = res.data || []
+        const formList = this.filterListDeep(res.data) || []
         if (this.item.nodeType === 'folder') {
           this.tData = [
             {
@@ -92,6 +94,14 @@ export default {
         }
       })
     },
+    filterListDeep(list) {
+      return filter(list, item => {
+        if (item.children) {
+          this.filterListDeep(item.children)
+        }
+        return hasDataPermission('manage', item.privileges)
+      })
+    },
     nodeClick(data, node) {
       this.targetGroup = data
     },
diff --git a/core/frontend/src/views/dataFilling/form/save.vue b/core/frontend/src/views/dataFilling/form/save.vue
index abbea51899..b5cad4fa48 100644
--- a/core/frontend/src/views/dataFilling/form/save.vue
+++ b/core/frontend/src/views/dataFilling/form/save.vue
@@ -2,6 +2,7 @@
 import { filter, forEach, find, split, get } from 'lodash-es'
 import { listDatasource, listDatasourceType } from '@/api/system/datasource'
 import { listForm, saveForm } from '@/views/dataFilling/form/dataFilling'
+import { hasDataPermission } from '@/utils/permission'
 
 export default {
   name: 'DataFillingFormSave',
@@ -160,7 +161,7 @@ export default {
 
       this.allDatasourceList = val[1].data
 
-      this.folders = val[2].data || []
+      this.folders = this.filterListDeep(val[2].data) || []
       if (this.formData.folder) {
         this.$nextTick(() => {
           this.$refs.tree.setCurrentKey(this.formData.folder)
@@ -172,6 +173,14 @@ export default {
     })
   },
   methods: {
+    filterListDeep(list) {
+      return filter(list, item => {
+        if (item.children) {
+          this.filterListDeep(item.children)
+        }
+        return hasDataPermission('manage', item.privileges)
+      })
+    },
     getTypeOptions(formOption) {
       const _options = []
       if (formOption.type !== 'date' &&