Merge pull request #9481 from ulleo/dev

fix(X-Pack): 修复数据填报表单可保存/移动文件夹没有根据权限过滤问题

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
     },

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' &&