From 99cda38218c477e4df17854942271bff533e22a7 Mon Sep 17 00:00:00 2001
From: lhzzforever <zly2576885332@163.com>
Date: Mon, 3 Apr 2023 15:47:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?system=5Fid=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=8F=96list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/add-action-sideslider.vue      | 84 ++++++++++---------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/frontend/src/views/group/components/add-action-sideslider.vue b/frontend/src/views/group/components/add-action-sideslider.vue
index b4c9b804b..7fe264eb3 100644
--- a/frontend/src/views/group/components/add-action-sideslider.vue
+++ b/frontend/src/views/group/components/add-action-sideslider.vue
@@ -78,7 +78,7 @@
                     </div>
                 </div>
                 <div class="right-wrapper" v-bkloading="{ isLoading: isRightLoading, opacity: 1, color: '#f5f6fa' }">
-                    <template v-if="systemData[curSystem].list.length > 0 && !isRightLoading">
+                    <template v-if="systemData[curSystem] && systemData[curSystem].list.length > 0 && !isRightLoading">
                         <render-action-tag
                             style="margin: 0;"
                             :system-id="curSystem"
@@ -155,7 +155,7 @@
                             </section>
                         </div>
                     </template>
-                    <template v-if="systemData[curSystem].list.length < 1 && !isRightLoading">
+                    <template v-if="systemData[curSystem] && !systemData[curSystem].list.length && !isRightLoading">
                         <div class="empty-wrapper">
                             <ExceptionEmpty
                                 :type="emptyData.type"
@@ -608,56 +608,58 @@
             },
 
             handleDefaultData (payload, data) {
-                this.systemData[payload].list = _.cloneDeep(data);
-                this.systemData[payload].list.forEach(item => {
-                    if (!item.actions) {
-                        item.actions = [];
-                    }
-                    if (!item.sub_groups) {
-                        item.sub_groups = [];
-                    }
-                    let allChecked = true;
-                    let allDisabled = true;
-                    item.actions.forEach(act => {
-                        act.$id = `${payload}&${act.id}`;
-                        act.related_resource_types.forEach(v => {
-                            v.type = v.id;
-                        });
-                        this.$set(act, 'checked', this.defaultValue.includes(act.$id) || this.curSelectValue.includes(act.$id) || (act.tag === 'readonly' && !!this.groupId));
-                        if (!act.checked) {
-                            allChecked = false;
+                if (this.systemData[payload]) {
+                    this.systemData[payload].list = _.cloneDeep(data);
+                    this.systemData[payload].list.forEach(item => {
+                        if (!item.actions) {
+                            item.actions = [];
                         }
-                        if (act.tag === 'readonly' && !!this.groupId) {
-                            this.$set(act, 'disabled', true);
-                            ++this.systemData[payload].count;
-                        } else {
-                            allDisabled = false;
+                        if (!item.sub_groups) {
+                            item.sub_groups = [];
                         }
-                        this.linearAction.push(act);
-                    });
-                    item.sub_groups.forEach(act => {
-                        (act.actions || []).forEach(v => {
-                            v.$id = `${payload}&${v.id}`;
-                            v.related_resource_types.forEach(subItem => {
-                                subItem.type = subItem.id;
+                        let allChecked = true;
+                        let allDisabled = true;
+                        item.actions.forEach(act => {
+                            act.$id = `${payload}&${act.id}`;
+                            act.related_resource_types.forEach(v => {
+                                v.type = v.id;
                             });
-                            this.$set(v, 'checked', this.defaultValue.includes(v.$id) || this.curSelectValue.includes(v.$id) || (v.tag === 'readonly' && !!this.groupId));
-                            if (!v.checked) {
+                            this.$set(act, 'checked', this.defaultValue.includes(act.$id) || this.curSelectValue.includes(act.$id) || (act.tag === 'readonly' && !!this.groupId));
+                            if (!act.checked) {
                                 allChecked = false;
                             }
-                            if (v.tag === 'readonly' && !!this.groupId) {
-                                this.$set(v, 'disabled', true);
+                            if (act.tag === 'readonly' && !!this.groupId) {
+                                this.$set(act, 'disabled', true);
                                 ++this.systemData[payload].count;
                             } else {
                                 allDisabled = false;
                             }
-                            this.linearAction.push(v);
+                            this.linearAction.push(act);
+                        });
+                        item.sub_groups.forEach(act => {
+                            (act.actions || []).forEach(v => {
+                                v.$id = `${payload}&${v.id}`;
+                                v.related_resource_types.forEach(subItem => {
+                                    subItem.type = subItem.id;
+                                });
+                                this.$set(v, 'checked', this.defaultValue.includes(v.$id) || this.curSelectValue.includes(v.$id) || (v.tag === 'readonly' && !!this.groupId));
+                                if (!v.checked) {
+                                    allChecked = false;
+                                }
+                                if (v.tag === 'readonly' && !!this.groupId) {
+                                    this.$set(v, 'disabled', true);
+                                    ++this.systemData[payload].count;
+                                } else {
+                                    allDisabled = false;
+                                }
+                                this.linearAction.push(v);
+                            });
                         });
+                        this.$set(item, 'text', allChecked ? this.$t(`m.common['取消全选']`) : this.$t(`m.common['全选']`));
+                        this.$set(item, 'allDisabled', allDisabled);
                     });
-                    this.$set(item, 'text', allChecked ? this.$t(`m.common['取消全选']`) : this.$t(`m.common['全选']`));
-                    this.$set(item, 'allDisabled', allDisabled);
-                });
-                this.systemData[payload].system_name = this.systemList.find(item => item.id === payload).name;
+                    this.systemData[payload].system_name = this.systemList.find(item => item.id === payload).name;
+                }
 
                 if (this.defaultValue.length > 0) {
                     const curAllActionIds = [];

From bb5608e258fbe3be67b2166ac5f319718a111c63 Mon Sep 17 00:00:00 2001
From: lhzzforever <zly2576885332@163.com>
Date: Mon, 3 Apr 2023 16:41:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feature:=20=E8=8E=B7=E5=8F=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=88=97=E5=88=97=E8=A1=A8=E5=86=85=E5=B5=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0hidden=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/render-perm-template-dialog/index.vue |  8 +++++++-
 .../components/render-user-group-dialog/index.vue    |  8 +++++++-
 .../components/custom-perm-process.vue               |  8 +++++++-
 .../components/add-action-sideslider.vue             |  6 ++++++
 .../views/group/components/add-action-sideslider.vue |  8 +++++---
 .../group/components/add-group-perm-sideslider.vue   |  8 ++++++--
 frontend/src/views/group/index.vue                   |  8 ++++++--
 .../components/add-action-side-slider.vue            | 12 ++++++++++--
 .../components/add-action-sideslider.vue             |  8 ++++++--
 .../components/add-group-perm-sideslider.vue         |  8 +++++++-
 .../src/views/perm-apply/apply-custom-perm/index.vue |  8 ++++++--
 .../views/perm-apply/apply-join-user-group/index.vue |  8 ++++++--
 .../perm-apply/components/render-perm-template.vue   | 10 +++++++++-
 .../perm-template/components/render-content.vue      | 10 +++++++---
 frontend/src/views/perm-template/index.vue           |  8 ++++++--
 frontend/src/views/perm/apply-perm/index.vue         |  8 ++++++--
 frontend/src/views/resource-permiss/index.vue        |  8 +++++++-
 .../tempora-perm-apply/apply-custom-perm/index.vue   |  8 ++++++--
 .../apply-join-user-group/index.vue                  |  8 ++++++--
 .../components/render-perm-template.vue              | 10 +++++++++-
 20 files changed, 135 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/render-perm-template-dialog/index.vue b/frontend/src/components/render-perm-template-dialog/index.vue
index 85552eca8..52d59b416 100644
--- a/frontend/src/components/render-perm-template-dialog/index.vue
+++ b/frontend/src/components/render-perm-template-dialog/index.vue
@@ -184,6 +184,7 @@
     import IamSearchSelect from '@/components/iam-search-select';
     import { fuzzyRtxSearch } from '@/common/rtx';
     import { formatCodeData } from '@/common/util';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -253,6 +254,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isLoading () {
                 return this.requestQueue.length > 0 && this.isShowDialog;
             },
@@ -439,7 +441,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/components/render-user-group-dialog/index.vue b/frontend/src/components/render-user-group-dialog/index.vue
index ba6e71296..c8b381a93 100644
--- a/frontend/src/components/render-user-group-dialog/index.vue
+++ b/frontend/src/components/render-user-group-dialog/index.vue
@@ -142,6 +142,7 @@
 <script>
     import IamSearchSelect from '@/components/iam-search-select';
     import { formatCodeData } from '@/common/util';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -202,6 +203,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isLoading () {
                 return this.requestQueue.length > 0 && this.isShowDialog;
             },
@@ -331,7 +333,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/views/approval-process/components/custom-perm-process.vue b/frontend/src/views/approval-process/components/custom-perm-process.vue
index 19a8e3bea..64e543c9d 100644
--- a/frontend/src/views/approval-process/components/custom-perm-process.vue
+++ b/frontend/src/views/approval-process/components/custom-perm-process.vue
@@ -110,6 +110,7 @@
     import editProcessDialog from './edit-process-dialog';
     import { buildURLParams } from '@/common/url';
     import { formatCodeData } from '@/common/util';
+    import { mapGetters } from 'vuex';
     export default {
         name: '',
         components: {
@@ -155,6 +156,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isCanBatchDelete () {
                 return this.currentSelectList.length > 0 && this.tableList.length > 0;
             },
@@ -222,7 +224,11 @@
         methods: {
             async fetchSystemList () {
                 try {
-                    const res = await this.$store.dispatch('system/getSystems');
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const res = await this.$store.dispatch('system/getSystems', params);
                     this.systemList = res.data;
                     setTimeout(() => {
                         if (this.cacheSystemId) {
diff --git a/frontend/src/views/grading-admin/components/add-action-sideslider.vue b/frontend/src/views/grading-admin/components/add-action-sideslider.vue
index 2af7dae4d..f8fd49bb2 100644
--- a/frontend/src/views/grading-admin/components/add-action-sideslider.vue
+++ b/frontend/src/views/grading-admin/components/add-action-sideslider.vue
@@ -190,6 +190,7 @@
     import { leaveConfirm } from '@/common/leave-confirm';
     import { guid, formatCodeData } from '@/common/util';
     import RenderActionTag from '@/components/common-action';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -240,6 +241,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isLoading () {
                 return this.initRequestQueue.length > 0;
             },
@@ -501,6 +503,10 @@
             async fetchSystems () {
                 this.systemListIsLoading = true;
                 try {
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
                     const { code, data } = await this.$store.dispatch('system/getSystems');
                     this.systemList = _.cloneDeep(data);
                     this.curSystemList = _.cloneDeep(data);
diff --git a/frontend/src/views/group/components/add-action-sideslider.vue b/frontend/src/views/group/components/add-action-sideslider.vue
index 7fe264eb3..72d5d891c 100644
--- a/frontend/src/views/group/components/add-action-sideslider.vue
+++ b/frontend/src/views/group/components/add-action-sideslider.vue
@@ -497,13 +497,15 @@
             async fetchSystems () {
                 this.systemListIsLoading = true;
                 try {
-                    const { code, data } = await this.$store.dispatch('system/getSystems');
-                    this.systemList = _.cloneDeep(data);
-                    this.curSystemList = _.cloneDeep(data);
                     this.curSystem = this.defaultSystem;
+                    const params = {};
                     if (this.externalSystemId) {
+                        params.hidden = false;
                         this.curSystem = this.externalSystemId;
                     }
+                    const { code, data } = await this.$store.dispatch('system/getSystems', params);
+                    this.systemList = _.cloneDeep(data);
+                    this.curSystemList = _.cloneDeep(data);
                     this.emptyData = formatCodeData(code, this.emptyData, data.length === 0);
                     if (this.systemList.length) {
                         if (!this.curSystem) {
diff --git a/frontend/src/views/group/components/add-group-perm-sideslider.vue b/frontend/src/views/group/components/add-group-perm-sideslider.vue
index ab14168dd..8f876f257 100644
--- a/frontend/src/views/group/components/add-group-perm-sideslider.vue
+++ b/frontend/src/views/group/components/add-group-perm-sideslider.vue
@@ -210,7 +210,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             isSubset () {
                 return this.user.role.type === 'subset_manager';
             },
@@ -426,7 +426,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/views/group/index.vue b/frontend/src/views/group/index.vue
index 3b617b20d..bc837c163 100644
--- a/frontend/src/views/group/index.vue
+++ b/frontend/src/views/group/index.vue
@@ -318,7 +318,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user', 'showNoviceGuide']),
+            ...mapGetters(['user', 'showNoviceGuide', 'externalSystemId']),
             isCanEditProcess () {
                 return this.currentSelectList.length > 0;
             },
@@ -547,7 +547,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems').then(({ data }) => {
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params).then(({ data }) => {
                     return data.map(({ id, name }) => ({ id, name })).filter((item) => item.name.indexOf(value) > -1);
                 });
             },
diff --git a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
index 64307582c..182f0e4a8 100644
--- a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
+++ b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue
@@ -186,6 +186,7 @@
     import { leaveConfirm } from '@/common/leave-confirm';
     import { guid, formatCodeData } from '@/common/util';
     import RenderActionTag from '@/components/common-action';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -242,6 +243,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isLoading () {
                 return this.initRequestQueue.length > 0;
             },
@@ -502,7 +504,13 @@
             async fetchSystems () {
                 this.systemListIsLoading = true;
                 try {
-                    const { code, data } = await this.$store.dispatch('system/getSystems', { all: this.all });
+                    const params = {
+                        all: this.all
+                    };
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const { code, data } = await this.$store.dispatch('system/getSystems', params);
                     this.systemList = _.cloneDeep(data);
                     this.curSystemList = _.cloneDeep(data);
                     this.curSystem = this.defaultSystem;
@@ -1008,7 +1016,7 @@
             }
             .right-wrapper {
                 position: relative;
-                flex: 0 0 calc(100% - 220px);
+                flex: 0 0 calc(100% - 240px);
                 padding: 12px 20px;
                 background: #f5f6fa;
                 .custom-tmpl-wrapper {
diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue
index 0b82863ac..9f01f3a04 100644
--- a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue
+++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue
@@ -252,7 +252,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             isLoading () {
                 return this.initRequestQueue.length > 0;
             },
@@ -495,7 +495,11 @@
             async fetchSystems () {
                 this.systemListIsLoading = true;
                 try {
-                    const { code, data } = await this.$store.dispatch('system/getSystems');
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const { code, data } = await this.$store.dispatch('system/getSystems', params);
                     this.systemList = _.cloneDeep(data);
                     this.curSystemList = _.cloneDeep(data);
                     this.curSystem = this.defaultSystem;
diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-group-perm-sideslider.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-group-perm-sideslider.vue
index 37b920a46..a2670de91 100644
--- a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-group-perm-sideslider.vue
+++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-group-perm-sideslider.vue
@@ -134,6 +134,7 @@
     import { leaveConfirm } from '@/common/leave-confirm';
     import { fuzzyRtxSearch } from '@/common/rtx';
     import { formatCodeData } from '@/common/util';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -209,6 +210,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             isDisabled () {
                 return this.requestQueueBySys.length > 0 || this.requestQueueByTemplate.length > 0;
             }
@@ -421,7 +423,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue
index 1a8e6f1f1..c48b60e03 100644
--- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue
+++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue
@@ -655,7 +655,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             // 是否无权限申请
             isNoPermApplay () {
                 return this.routerQuery.system_id;
@@ -2053,7 +2053,11 @@
                     this.systemValue = this.routerQuery.system_id;
                 }
                 try {
-                    const res = await this.$store.dispatch('system/getSystems');
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const res = await this.$store.dispatch('system/getSystems', params);
                     (res.data || []).forEach(item => {
                         item.displayName = `${item.name}(${item.id})`;
                     });
diff --git a/frontend/src/views/perm-apply/apply-join-user-group/index.vue b/frontend/src/views/perm-apply/apply-join-user-group/index.vue
index 94c858877..fb65edfa2 100644
--- a/frontend/src/views/perm-apply/apply-join-user-group/index.vue
+++ b/frontend/src/views/perm-apply/apply-join-user-group/index.vue
@@ -255,7 +255,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user'])
+            ...mapGetters(['user', 'externalSystemId'])
         },
         watch: {
             reason () {
@@ -530,7 +530,11 @@
 
             // 系统包含数据
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems').then(({ data }) => {
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params).then(({ data }) => {
                     return data.map(({ id, name }) => ({ id, name })).filter((item) => item.name.indexOf(value) > -1);
                 });
             },
diff --git a/frontend/src/views/perm-apply/components/render-perm-template.vue b/frontend/src/views/perm-apply/components/render-perm-template.vue
index f59bbffdb..4b860546f 100644
--- a/frontend/src/views/perm-apply/components/render-perm-template.vue
+++ b/frontend/src/views/perm-apply/components/render-perm-template.vue
@@ -63,6 +63,7 @@
     import _ from 'lodash';
     import RenderPermSideslider from '../../perm/components/render-template-perm-sideslider';
     import RenderDetail from '../../perm/components/render-detail';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -107,6 +108,9 @@
                 renderDetailCom: 'RenderDetail'
             };
         },
+        computed: {
+            ...mapGetters(['externalSystemId'])
+        },
         watch: {
             'pagination.current' (value) {
                 this.currentBackup = value;
@@ -181,7 +185,11 @@
             },
 
             handleRemoteSystem () {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name }));
                     });
diff --git a/frontend/src/views/perm-template/components/render-content.vue b/frontend/src/views/perm-template/components/render-content.vue
index a71d9681d..84f7ef58a 100644
--- a/frontend/src/views/perm-template/components/render-content.vue
+++ b/frontend/src/views/perm-template/components/render-content.vue
@@ -200,7 +200,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             isShowGroupAction () {
                 return (item) => {
                     const isExistSubGroup = (item.sub_groups || []).some(v => v.sub_groups && v.sub_groups.length > 0);
@@ -458,8 +458,12 @@
 
             async fetchSystems () {
                 try {
-                    const res = await this.$store.dispatch('system/getSystems')
-                    ;(res.data || []).forEach(item => {
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const res = await this.$store.dispatch('system/getSystems', params);
+                    (res.data || []).forEach(item => {
                         item.displayName = `${item.name}(${item.id})`;
                     });
                     this.systemList = res.data || [];
diff --git a/frontend/src/views/perm-template/index.vue b/frontend/src/views/perm-template/index.vue
index 64b5870f0..dcff22680 100644
--- a/frontend/src/views/perm-template/index.vue
+++ b/frontend/src/views/perm-template/index.vue
@@ -177,7 +177,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             isCanBatchDelete () {
                 return this.currentSelectList.length > 0;
             },
@@ -449,7 +449,11 @@
             },
 
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/views/perm/apply-perm/index.vue b/frontend/src/views/perm/apply-perm/index.vue
index affb7f9d3..cd1277a02 100644
--- a/frontend/src/views/perm/apply-perm/index.vue
+++ b/frontend/src/views/perm/apply-perm/index.vue
@@ -229,7 +229,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user'])
+            ...mapGetters(['user', 'externalSystemId'])
         },
         watch: {
             reason (value) {
@@ -572,7 +572,11 @@
 
             // 系统包含数据
             async handleRemoteSystem (value) {
-                const { code, data } = await this.$store.dispatch('system/getSystems');
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                const { code, data } = await this.$store.dispatch('system/getSystems', params);
                 if (code === 0) {
                     return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                 }
diff --git a/frontend/src/views/resource-permiss/index.vue b/frontend/src/views/resource-permiss/index.vue
index 34a85d0cb..015bc9d8c 100644
--- a/frontend/src/views/resource-permiss/index.vue
+++ b/frontend/src/views/resource-permiss/index.vue
@@ -206,6 +206,7 @@
     import { leaveConfirm } from '@/common/leave-confirm';
     import { fuzzyRtxSearch } from '@/common/rtx';
     import { formatCodeData } from '@/common/util';
+    import { mapGetters } from 'vuex';
     // import iamCascade from '@/components/cascade'
 
     // 单次申请的最大实例数
@@ -270,6 +271,7 @@
             };
         },
         computed: {
+            ...mapGetters(['externalSystemId']),
             condition () {
                 if (this.curResIndex === -1 || this.groupIndex === -1) {
                     return [];
@@ -322,7 +324,11 @@
         methods: {
             async fetchSystemList () {
                 try {
-                    const res = await this.$store.dispatch('system/getSystems');
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const res = await this.$store.dispatch('system/getSystems', params);
                     this.systemList = res.data;
                 } catch (e) {
                     console.error(e);
diff --git a/frontend/src/views/tempora-perm-apply/apply-custom-perm/index.vue b/frontend/src/views/tempora-perm-apply/apply-custom-perm/index.vue
index 83fc7514b..13d2de6d6 100644
--- a/frontend/src/views/tempora-perm-apply/apply-custom-perm/index.vue
+++ b/frontend/src/views/tempora-perm-apply/apply-custom-perm/index.vue
@@ -341,7 +341,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user']),
+            ...mapGetters(['user', 'externalSystemId']),
             // 是否无权限申请
             isNoPermApplay () {
                 return this.routerQuery.system_id;
@@ -1669,7 +1669,11 @@
                     this.systemValue = this.routerQuery.system_id;
                 }
                 try {
-                    const res = await this.$store.dispatch('system/getSystems');
+                    const params = {};
+                    if (this.externalSystemId) {
+                        params.hidden = false;
+                    }
+                    const res = await this.$store.dispatch('system/getSystems', params);
                     (res.data || []).forEach(item => {
                         item.displayName = `${item.name}(${item.id})`;
                     });
diff --git a/frontend/src/views/tempora-perm-apply/apply-join-user-group/index.vue b/frontend/src/views/tempora-perm-apply/apply-join-user-group/index.vue
index 3030d5b5a..a785754e0 100644
--- a/frontend/src/views/tempora-perm-apply/apply-join-user-group/index.vue
+++ b/frontend/src/views/tempora-perm-apply/apply-join-user-group/index.vue
@@ -183,7 +183,7 @@
             };
         },
         computed: {
-            ...mapGetters(['user'])
+            ...mapGetters(['user', 'externalSystemId'])
         },
         watch: {
             reason (value) {
@@ -420,7 +420,11 @@
             },
             // 系统包含数据
             handleRemoteSystem (value) {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name })).filter(item => item.name.indexOf(value) > -1);
                     });
diff --git a/frontend/src/views/tempora-perm-apply/components/render-perm-template.vue b/frontend/src/views/tempora-perm-apply/components/render-perm-template.vue
index f59bbffdb..4b860546f 100644
--- a/frontend/src/views/tempora-perm-apply/components/render-perm-template.vue
+++ b/frontend/src/views/tempora-perm-apply/components/render-perm-template.vue
@@ -63,6 +63,7 @@
     import _ from 'lodash';
     import RenderPermSideslider from '../../perm/components/render-template-perm-sideslider';
     import RenderDetail from '../../perm/components/render-detail';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: '',
@@ -107,6 +108,9 @@
                 renderDetailCom: 'RenderDetail'
             };
         },
+        computed: {
+            ...mapGetters(['externalSystemId'])
+        },
         watch: {
             'pagination.current' (value) {
                 this.currentBackup = value;
@@ -181,7 +185,11 @@
             },
 
             handleRemoteSystem () {
-                return this.$store.dispatch('system/getSystems')
+                const params = {};
+                if (this.externalSystemId) {
+                    params.hidden = false;
+                }
+                return this.$store.dispatch('system/getSystems', params)
                     .then(({ data }) => {
                         return data.map(({ id, name }) => ({ id, name }));
                     });

From 2e84a00d2bc40825baaa719d8dc87d4318dd2268 Mon Sep 17 00:00:00 2001
From: lhzzforever <zly2576885332@163.com>
Date: Mon, 3 Apr 2023 16:42:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmagic=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BA=93=E6=97=A0=E6=B3=95=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/language/lang/en.js | 24 ++++++++++++++++--------
 frontend/src/main.js             | 24 +++++++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/frontend/src/language/lang/en.js b/frontend/src/language/lang/en.js
index 2c46a9831..631006fb3 100644
--- a/frontend/src/language/lang/en.js
+++ b/frontend/src/language/lang/en.js
@@ -460,7 +460,7 @@ export const m = {
         '申请自定义权限标题': 'If the previous permission package does not meet your needs, please apply for the permission through customization',
         '申请自定义权限场景1': 'Certain permissions for a single system',
         '申请自定义权限场景2': 'More flexible permission requirements',
-        '申请加入用户组搜索提示': 'Enter group name, description, belonging system, hierarchical administrator, etc. to search',
+        '申请加入用户组搜索提示': 'Enter group name, description, belonging system,,rating management space, etc. to search',
         '超级管理员申请加入用户组搜索提示': 'Search Tips for Super Administrators Applying to Join User Groups',
         '请输入条件搜索用户组': 'Please enter criteria to search for user groups'
     },
@@ -704,7 +704,7 @@ export const m = {
         '选择可授权人员范围': 'Select scope of authorized personnel',
         '被授权范围': 'Authorized scope',
         '添加系统和操作': 'Add systems and actions',
-        '修改一级管理空间授权范围': 'Modify the authorization scope of hierarchical administrator',
+        '修改一级管理空间授权范围': 'Modify the authorization scope of,rating management space',
         '刷新列表': 'Refresh List',
         '如需编辑一级管理空间的内容请点击': 'Click to edit',
         '操作和资源范围': 'Actions and resources',
@@ -873,13 +873,14 @@ export const m = {
         '权限模板成员更新': 'Permission template update members',
         '权限模板预更新创建': 'Permission template pre-update creation',
         '权限模板预更新删除': 'Permission template pre-update delete',
-        '创建一级管理空间': 'Create hierarchical administrator',
-        '一级管理空间增加成员': 'Hierarchical administrator add members',
-        '一级管理空间删除成员': 'Hierarchical administrator delete members',
-        '一级管理空间修改成员': 'Hierarchical administrator update members',
+        '创建一级管理空间': 'Create rating management space',
+        '管理员创建': 'Administrator Create',
+        '一级管理空间增加成员': 'rating management space add members',
+        '一级管理空间删除成员': 'rating management space delete members',
+        '一级管理空间修改成员': 'rating management space update members',
         '成员创建默认权限': 'Members create default permissions',
         '成员删除默认权限': 'Members delete default permissions',
-        '更新一级管理空间': 'Update hierarchical manager',
+        '更新一级管理空间': 'Update the primary management space',
         '管理员成员增加': 'Admin member increase',
         '管理员成员删除': 'Admin member delete',
         '管理员成员修改': 'Admin member modification',
@@ -890,8 +891,14 @@ export const m = {
         '管理员常用操作新建': 'Common operations for administrators',
         '管理员常用操作删除': 'Admin common operations delete',
         '组织架构同步': 'Organizational structure synchronization',
+        'ADMIN-API白名单创建': 'ADMIN-API whitelist create',
+        'ADMIN-API白名单删除': 'ADMIN-API whitelist delete',
+        '授权类API白名单创建': 'Author class API whitelist create',
+        '授权类API白名单删除': 'Author class API whitelist delete',
+        '管理类API白名单创建': 'Management class API whitelist create',
+        '管理类API白名单删除': 'Management class API whitelist delete',
         '回滚事件': 'Rollback event',
-        '一级管理空间用户组成员续期': 'Hierarchical administrator group members renew',
+        '一级管理空间用户组成员续期': 'rating management space group members renew',
         '用户组成员续期': 'Group members renew',
         '页面': 'Page',
         '权限模板版本全量同步': 'Permission template version is fully synchronized',
@@ -901,6 +908,7 @@ export const m = {
         '新建常用操作': 'Create common actions',
         '删除常用操作': 'Delete common actions',
         '权限模板更新同步': 'Permission template update synchronization',
+        '权限模板更新提交': 'Perm template update submit',
         '修改用户组审批流程': 'Modify the group approval process',
         '修改默认审批流程': 'Modify the default approval process',
         '修改操作审批流程': 'Modify the operation approval process',
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 7a8e33b1c..3fec5803d 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -50,7 +50,7 @@ import './common/bkmagic';
 // 全量引入自定义图标
 import './assets/iconfont/style.css';
 
-import { lang, locale } from 'bk-magic-vue';
+import magicbox from 'bk-magic-vue';
 
 import '@icon-cool/bk-icon-bk-iam';
 
@@ -73,6 +73,9 @@ Vue.prototype.scrollToLocation = function ($ref) {
 };
 
 Vue.use(VueI18n);
+Vue.use(magicbox, {
+    i18n: (key, args) => i18n.t(key, args)
+});
 
 console.log('start');
 
@@ -80,6 +83,8 @@ const cn = require('./language/lang/zh');
 
 const en = require('./language/lang/en');
 
+const { lang, locale } = magicbox;
+
 const messages = {
     'zh-cn': Object.assign(lang.zhCN, cn),
     en: Object.assign(lang.enUS, en)
@@ -93,14 +98,19 @@ const i18n = new VueI18n({
     locale: language,
     fallbackLocale: 'zh-cn',
     // this.$i18n.locale 通过切换locale的值来实现语言切换
-    messages: messages
+    messages: messages,
+    missing (locale, path) {
+        const parsedPath = i18n._path.parsePath(path);
+        return parsedPath[parsedPath.length - 1];
+    }
 });
 
-if (language === 'zh-cn') {
-    locale.use(lang.zhCN);
-} else {
-    locale.use(lang.enUS);
-}
+// if (language === 'zh-cn') {
+//     locale.use(lang.zhCN);
+// } else {
+//     console.log(lang.enUS, 6555);
+// }
+locale.use(language === 'zh-cn' ? lang.zhCN : lang.enUS);
 
 locale.i18n((key, value) => i18n.t(key, value));