Merge pull request #3897 from hLinx/hotfix_master

Hotfix master

Author: hLinx

src/frontend/src/components/app-select/index.vue

@@ -0,0 +1,46 @@
+import _ from 'lodash';
+import { onBeforeUnmount, watch } from 'vue';
+
+export default (scrollEle, expandScopeGroupMap, list, isShowSelectPanel) => {
+  const handleScroll = _.throttle(() => {
+    const groupElList = Array.from(scrollEle.value?.querySelectorAll('.group-item') || []);
+    const { top: listTop, bottom: listBottom } = scrollEle.value.getBoundingClientRect();
+    const stickyIndexMap = {};
+    groupElList.forEach((groupEl, index) => {
+      const { top } = groupEl.getBoundingClientRect();
+      if (top - 32 * index < listTop) {
+        groupEl.style.position = 'sticky';
+        groupEl.style.top = `${32 * index}px`;
+        groupEl.style.bottom = '';
+        stickyIndexMap[index] = true;
+      }
+    });
+    _.reverse(groupElList).forEach((groupEl, index) => {
+      const { bottom } = groupEl.getBoundingClientRect();
+      if (bottom + 32 * index > listBottom) {
+        groupEl.style.position = 'sticky';
+        groupEl.style.top = '';
+        groupEl.style.bottom = `${32 * index}px`;
+        stickyIndexMap[groupElList.length - 1 - index] = true;
+      }
+    });
+  }, 60);
+
+  watch(scrollEle, () => {
+    if (scrollEle.value) {
+      scrollEle.value?.addEventListener('scroll', handleScroll);
+    }
+  });
+  watch([expandScopeGroupMap, list, isShowSelectPanel], () => {
+    setTimeout(() => {
+      handleScroll();
+    }, 60);
+  }, {
+    immediate: true,
+  });
+
+
+  onBeforeUnmount(() => {
+    scrollEle.value?.removeEventListener('scroll', handleScroll);
+  });
+};

src/frontend/src/components/app-select/useGroup.js

@@ -34,7 +34,24 @@ export default (scrollEle, loadingEle, list) => {
   });
 
 
-  const renderData = computed(() => list.value.slice(0, pagination.current * pagination.pageSize));
+  const groupItemMap = computed(() => list.value.reduce((result, item) => {
+    if (!item.groupId) {
+      Object.assign(result, { [item.id]: item });
+    }
+    return result;
+  }, {}));
+
+  const renderData = computed(() => {
+    const renderList = list.value.slice(0, pagination.current * pagination.pageSize);
+
+    const appendGroupMap = { ...groupItemMap.value };
+    renderList.forEach((item) => {
+      if (!item.groupId && appendGroupMap[item.id]) {
+        delete appendGroupMap[item.id];
+      }
+    });
+    return renderList.concat(Object.values(appendGroupMap));
+  });
 
   const handleScroll = _.throttle(() => {
     if (pagination.current * pagination.pageSize >= pagination.total) {

src/frontend/src/components/app-select/usePagination.js

@@ -44,4 +44,8 @@ export default {
     return AppManageSource.updateCancelFavorApp(params)
       .then(({ data }) => data);
   },
+  fetchGroupPanel() {
+    return AppManageSource.getGroupPanel()
+      .then(({ data }) => data);
+  },
 };

src/frontend/src/domain/service/app-manage.js

@@ -60,6 +60,11 @@ class AppManage extends ModuleBase {
       params,
     });
   }
+  getGroupPanel() {
+    return Request.get(`${this.module}/scopeGroupPanel`, {
+      cache: 1000,
+    });
+  }
 }
 
 export default new AppManage();

src/frontend/src/domain/source/app-manage.js

@@ -571,5 +571,7 @@
   "输入目标机器上的自定义解释器软件路径，如：D:\\Software\\python3\\python.exe。请勿指定命令行选项。": "Enter the path of the custom interpreter software on the target machine, such as: D:\\Software\\python3\\python.exe",
   "解释器路径有误，需为合法的文件路径、且以 .exe 结尾。": "Interpreter path is invalid; it must be a valid file path ending with .exe.",
   "执行目标包含 Linux 服务器，但自定义解释器仅对 Windows 有效，请知悉。": "Please note: The execution targets include Linux hosts, but the interpreter is only supported on Windows.",
-  "未分配管控区，请到节点管理重装 Agent": "Unassigned control area. Please reinstall the Agent in the Node Management interface."
+  "未分配管控区，请到节点管理重装 Agent": "Unassigned control area. Please reinstall the Agent in the Node Management interface.",
+  "去新建": "New",
+  "请联系业务运维加入业务": "Please contact the business operation and maintenance to join the business."
 }

src/frontend/src/i18n/language/en.json

@@ -571,5 +571,7 @@
   "输入目标机器上的自定义解释器软件路径，如：D:\\Software\\python3\\python.exe。请勿指定命令行选项。": "输入目标机器上的自定义解释器软件路径，如：D:\\Software\\python3\\python.exe。请勿指定命令行选项。",
   "解释器路径有误，需为合法的文件路径、且以 .exe 结尾。": "解释器路径有误，需为合法的文件路径、且以 .exe 结尾。",
   "执行目标包含 Linux 服务器，但自定义解释器仅对 Windows 有效，请知悉。": "执行目标包含 Linux 服务器，但自定义解释器仅对 Windows 有效，请知悉。",
-  "未分配管控区，请到节点管理重装 Agent": "未分配管控区，请到节点管理重装 Agent"
+  "未分配管控区，请到节点管理重装 Agent": "未分配管控区，请到节点管理重装 Agent",
+  "去新建": "去新建",
+  "请联系业务运维加入业务": "请联系业务运维加入业务"
 }

src/frontend/src/i18n/language/zh.json

@@ -24,18 +24,18 @@
 */
 
 import Cookie from 'js-cookie';
+import _ from 'lodash';
+
 
 const CRRF_TOKEN_KEY = 'job_csrf_key';
 
 export default (interceptors) => {
   interceptors.use((request) => {
     const CSRFToken = Cookie.get(CRRF_TOKEN_KEY);
-    if (CSRFToken !== undefined) {
+    if (CSRFToken && _.trim(request.baseURL) === _.trim(window.PROJECT_CONFIG.AJAX_URL_PREFIX)) {
       Object.assign(request.headers, {
         'X-CSRF-Token': CSRFToken || '',
       });
-    } else {
-      console.warn('Can not find csrftoken in document.cookie');
     }
 
     return request;