From d35117a66908d76aec439d6926fc82125df9b88c Mon Sep 17 00:00:00 2001
From: kinghao <kinghao@apache.org>
Date: Sat, 22 Nov 2025 22:11:24 +0800
Subject: [PATCH 1/5] merge web

---
 linkis-web/.env                               |   3 +-
 linkis-web/.gitignore                         |   3 +-
 linkis-web/package.json                       |  33 +-
 linkis-web/release-docs/NOTICE                |   2 +-
 .../src/apps/PythonModule/.gitattributes      |   9 +
 linkis-web/src/apps/PythonModule/index.html   |   2 +-
 linkis-web/src/apps/PythonModule/package.json |  32 ++
 .../src/apps/PythonModule/public/logo.svg     |  33 ++
 .../src/apps/PythonModule/tsconfig.json       |  33 ++
 linkis-web/src/apps/URM/i18n/common/en.json   |   4 +-
 linkis-web/src/apps/URM/i18n/common/zh.json   |   4 +-
 .../functionManagement/addFunctionModal.vue   |  82 ++-
 .../URM/module/functionManagement/index.vue   |  24 +-
 .../src/apps/URM/module/header/index.vue      |  12 +-
 .../src/apps/URM/module/header/userMenu.vue   |   4 +-
 .../module/udfManagement/addFunctionModal.vue | 133 ++++-
 .../apps/URM/module/udfManagement/index.vue   |  29 +-
 .../apps/linkis/assets/styles/console.scss    |   3 +
 .../src/apps/linkis/components/tag/index.vue  |  14 +-
 .../src/apps/linkis/i18n/common/en.json       | 111 +++-
 .../src/apps/linkis/i18n/common/zh.json       | 106 +++-
 .../src/apps/linkis/module/ECM/engineConn.vue |  49 +-
 .../src/apps/linkis/module/ECM/index.scss     |   8 +-
 .../src/apps/linkis/module/ECM/index.vue      |  12 +
 .../src/apps/linkis/module/ECM/search.vue     |   9 +
 .../module/EnginePluginManagement/index.vue   |  16 +-
 .../module/acrossClusterRule/index.scss       |   2 +-
 .../linkis/module/acrossClusterRule/index.vue | 454 ++++++++++++++--
 .../module/codeQuery/codeDetail/index.vue     |   9 +-
 .../apps/linkis/module/codeQuery/index.scss   |   2 +-
 .../apps/linkis/module/codeQuery/index.vue    |  93 +++-
 .../datasource/datasourceForm/index.vue       |   8 +
 .../apps/linkis/module/datasource/index.vue   |  10 +-
 .../module/departmentTagManagement/index.js   |  23 +
 .../module/departmentTagManagement/index.scss |  43 ++
 .../module/departmentTagManagement/index.vue  | 511 ++++++++++++++++++
 .../apps/linkis/module/eurekaService/index.js |  21 +
 .../linkis/module/eurekaService/index.scss    |  59 ++
 .../linkis/module/eurekaService/index.vue     | 269 +++++++++
 .../gatewayAuthToken/EditForm/index.vue       |   4 +-
 .../linkis/module/gatewayAuthToken/index.vue  | 138 ++++-
 .../linkis/module/gatewayAuthToken/service.js |   6 +-
 .../module/globalHistoryManagement/index.scss |  12 +-
 .../module/globalHistoryManagement/index.vue  | 375 +++++++++++--
 .../module/globalHistoryManagement/log.vue    | 165 ++++++
 .../globalHistoryManagement/viewHistory.vue   | 322 ++++++++---
 .../src/apps/linkis/module/header/index.vue   |   8 +-
 .../apps/linkis/module/header/userMenu.vue    |   2 +
 .../linkis/module/ipListManagement/index.vue  |   2 +-
 .../module/microServiceManagement/index.scss  |   4 +-
 .../module/microServiceManagement/index.vue   |   2 +-
 .../apps/linkis/module/pythonModule/index.js  |  23 +
 .../module/resourceManagement/index.scss      |  12 +-
 .../module/resourceManagement/index.vue       |  14 +-
 .../linkis/module/resourceManagement/log.vue  |   8 +-
 .../apps/linkis/module/setting/setting.vue    |  50 +-
 .../statisticsDashboard.vue                   |   2 +-
 .../module/tenantTagManagement/index.vue      |  91 +++-
 .../linkis/module/udfTree/EditForm/index.vue  |   2 +-
 .../apps/linkis/module/userConfig/index.vue   |  27 +-
 linkis-web/src/apps/linkis/router.js          |  80 ++-
 linkis-web/src/apps/linkis/view/layout.vue    |  25 +-
 .../src/apps/linkis/view/linkis/index.vue     | 185 +++++--
 linkis-web/src/common/i18n/en.json            |   2 +-
 linkis-web/src/common/i18n/zh.json            |   6 +-
 .../src/components/consoleComponent/log.vue   |  41 +-
 .../components/consoleComponent/result.vue    |   8 +-
 .../src/components/consoleComponent/term.vue  | 177 ++++++
 .../components/consoleComponent/toolbar.vue   |  31 +-
 linkis-web/src/components/editor/editor.vue   |   6 +
 .../src/components/editor/languages/log.js    |   2 +
 .../src/components/editor/theme/logView.js    |   1 +
 linkis-web/src/components/log/index.vue       |   6 +
 linkis-web/src/components/table/table.vue     |   4 +-
 .../historyTable/historyTable.vue             |   9 +-
 .../src/components/virtualTable/index.scss    |   1 +
 linkis-web/src/dss/module/header/index.scss   |   2 +-
 linkis-web/src/dss/module/header/index.vue    |   8 +-
 linkis-web/src/dss/module/header/userMenu.vue |   2 +
 .../src/dss/module/resourceSimple/engine.vue  |  30 +-
 .../src/dss/module/resourceSimple/index.scss  |   5 +
 .../src/dss/module/resourceSimple/job.vue     |  54 +-
 .../src/dss/module/resourceSimple/queue.vue   |   4 +-
 linkis-web/src/dss/router.js                  |  10 -
 linkis-web/src/dss/view/login/index.vue       |  21 +-
 linkis-web/src/main.js                        |   9 +-
 linkis-web/src/router.js                      |  53 +-
 87 files changed, 3754 insertions(+), 571 deletions(-)
 create mode 100644 linkis-web/src/apps/PythonModule/.gitattributes
 create mode 100644 linkis-web/src/apps/PythonModule/package.json
 create mode 100644 linkis-web/src/apps/PythonModule/public/logo.svg
 create mode 100644 linkis-web/src/apps/PythonModule/tsconfig.json
 create mode 100644 linkis-web/src/apps/linkis/module/departmentTagManagement/index.js
 create mode 100644 linkis-web/src/apps/linkis/module/departmentTagManagement/index.scss
 create mode 100644 linkis-web/src/apps/linkis/module/departmentTagManagement/index.vue
 create mode 100644 linkis-web/src/apps/linkis/module/eurekaService/index.js
 create mode 100644 linkis-web/src/apps/linkis/module/eurekaService/index.scss
 create mode 100644 linkis-web/src/apps/linkis/module/eurekaService/index.vue
 create mode 100644 linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue
 create mode 100644 linkis-web/src/apps/linkis/module/pythonModule/index.js
 create mode 100644 linkis-web/src/components/consoleComponent/term.vue

diff --git a/linkis-web/.env b/linkis-web/.env
index 4660cdfacef..27591f1bfd7 100644
--- a/linkis-web/.env
+++ b/linkis-web/.env
@@ -1,5 +1,4 @@
 VUE_APP_HOST=
-BACKEND_URL=http://127.0.0.1:9001
 VUE_APP_MN_CONFIG_PREFIX=
 VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
-VUE_APP_VERSION=1.8.0
+VUE_APP_VERSION=1.3.2
diff --git a/linkis-web/.gitignore b/linkis-web/.gitignore
index 89cc5767eb7..8f5fdeb9187 100644
--- a/linkis-web/.gitignore
+++ b/linkis-web/.gitignore
@@ -2,11 +2,12 @@
 .vscode
 .cache
 .idea/
+.fes
 
 node_modules/
 dist/
 
-package-lock.json
 apache-linkis-*.tar.gz
 ./cn.json
 .env.*
+package-lock.json
diff --git a/linkis-web/package.json b/linkis-web/package.json
index 4ee88e7d5e1..a518db2f5fd 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "linkis",
-    "version": "1.8.0",
+    "version": "1.10.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",
@@ -8,7 +8,9 @@
         "lint": "vue-cli-service lint --no-fix",
         "fix": "eslint --ext .js,.vue src --fix",
         "precommit": "lint-staged",
-        "preinstall": "npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions"
+        "preinstall": "npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions",
+        "buildSubModule": "cd src/apps/PythonModule && npm run build:prod && cd ../../..",
+        "installAll": "npm install && cd src/apps/PythonModule && npm install --legacy-peer-deps && cd ../../.."
     },
     "husky": {
         "hooks": {
@@ -23,55 +25,58 @@
     },
     "dependencies": {
         "@form-create/iview": "2.5.27",
-        "axios": "1.12.0",
-        "babel-polyfill": "6.26.0",
-        "core-js": "3.27.2",
+        "axios": "1.12.2",
         "dexie": "3.2.3",
         "dt-sql-parser": "3.0.5",
-        "eslint": "7.21.0",
-        "eslint-plugin-vue": "9.6.0",
+        "echarts": "^5.6.0",
         "highlight.js": "10.7.0",
+        "hint.css": "^2.7.0",
         "iview": "3.5.4",
         "jsencrypt": "3.2.1",
         "lodash": "4.17.21",
         "md5": "2.3.0",
-        "mitt": "1.2.0",
         "moment": "2.29.4",
         "monaco-editor": "0.30.1",
         "object-to-formdata": "4.2.2",
         "path-browserify": "1.0.1",
-        "postcss": "8.4.31",
         "qs": "6.11.0",
         "reconnecting-websocket": "4.4.0",
+        "sass": "1.77.8",
         "sql-formatter": "2.3.3",
         "svgo": "3.0.2",
         "v-jsoneditor": "1.4.5",
-        "vue": "3.0.0",
+        "vue": "2.6.12",
         "vue-i18n": "8.22.1",
         "vue-router": "3.4.8",
         "vuedraggable": "2.24.3",
         "vuescroll": "4.16.1",
         "worker-loader": "3.0.8",
-        "echarts": "^5.1.1"
+        "xterm": "5.3.0",
+        "xterm-addon-fit": "0.8.0"
     },
     "devDependencies": {
         "@intlify/vue-i18n-loader": "1.0.0",
-        "@vue/cli-plugin-babel": "5.0.8",
+        "@vue/cli-plugin-babel": "5.0.1",
         "@vue/cli-plugin-eslint": "5.0.8",
         "@vue/cli-service": "5.0.8",
         "@vue/eslint-config-standard": "4.0.0",
         "archiver": "3.1.1",
         "autoprefixer": "10.4.14",
         "babel-eslint": "10.1.0",
+        "babel-polyfill": "6.26.0",
         "copy-webpack-plugin": "9.1.0",
+        "core-js": "3.27.2",
         "csp-html-webpack-plugin": "5.1.0",
+        "eslint": "7.21.0",
+        "eslint-plugin-vue": "9.6.0",
         "filemanager-webpack-plugin": "7.0.0",
         "husky": "1.3.1",
         "lint-staged": "13.1.1",
         "material-design-icons": "3.0.1",
+        "mitt": "1.2.0",
         "monaco-editor-webpack-plugin": "6.0.0",
-        "node-sass": "8.0.0",
         "npm-force-resolutions": "0.0.10",
+        "postcss": "8.4.21",
         "sass-loader": "10.4.1",
         "svg-sprite-loader": "6.0.0",
         "vue-cli-plugin-mockjs": "0.1.3",
@@ -79,6 +84,6 @@
         "webpack-virtual-modules": "0.3.2"
     },
     "resolutions": {
-        "postcss": "8.4.31"
+        "postcss": "8.4.21"
     }
 }
diff --git a/linkis-web/release-docs/NOTICE b/linkis-web/release-docs/NOTICE
index 3012346c23d..c9b63ba5c61 100644
--- a/linkis-web/release-docs/NOTICE
+++ b/linkis-web/release-docs/NOTICE
@@ -1,5 +1,5 @@
 Apache Linkis
-Copyright 2021-2025 The Apache Software Foundation
+Copyright 2021-2023 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/linkis-web/src/apps/PythonModule/.gitattributes b/linkis-web/src/apps/PythonModule/.gitattributes
new file mode 100644
index 00000000000..ec8935df7d2
--- /dev/null
+++ b/linkis-web/src/apps/PythonModule/.gitattributes
@@ -0,0 +1,9 @@
+* text=auto
+* text eol=lf
+*.png binary
+*.gif binary
+*.ttf binary
+*.woff binary
+*.eot binary
+*.woff binary
+*.otf binary
\ No newline at end of file
diff --git a/linkis-web/src/apps/PythonModule/index.html b/linkis-web/src/apps/PythonModule/index.html
index a015c28931f..14b2fef00ac 100644
--- a/linkis-web/src/apps/PythonModule/index.html
+++ b/linkis-web/src/apps/PythonModule/index.html
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-    <!DOCTYPE html>
+<!DOCTYPE html>
     <html lang="en">
         <head>
             <meta charset="UTF-8">
diff --git a/linkis-web/src/apps/PythonModule/package.json b/linkis-web/src/apps/PythonModule/package.json
new file mode 100644
index 00000000000..d01518360b2
--- /dev/null
+++ b/linkis-web/src/apps/PythonModule/package.json
@@ -0,0 +1,32 @@
+{
+    "dependencies": {
+        "core-js": "3.35.1",
+        "vue": "3.3.9",
+        "@vueuse/core": "10.9.0",
+        "lodash-es": "4.17.21",
+        "@qlin/request": "0.2.6",
+        "@webank/letgo-components": "1.1.4",
+        "@fesjs/fes-design": "0.8.60",
+        "@webank/fes-design-material": "0.2.31",
+        "@fesjs/traction-widget": "1.9.1",
+        "dayjs": "1.11.9",
+        "lodash": "4.17.21",
+        "@fesjs/fes": "3.1.10",
+        "@fesjs/plugin-model": "3.0.1",
+        "@fesjs/plugin-request": "4.0.0-rc.3",
+        "@fesjs/plugin-locale": "4.2.5",
+        "@fesjs/builder-vite": "4.0.2"
+    },
+    "name": "linkis",
+    "version": "1.0.0",
+    "scripts": {
+        "build:test": "cross-env FES_ENV=test fes build",
+        "build:prod": "cross-env FES_ENV=prod fes build",
+        "analyze": "cross-env ANALYZE=1 fes build",
+        "dev": "fes dev"
+    },
+    "devDependencies": {
+        "typescript": "5.3.3",
+        "cross-env": "7.0.3"
+    }
+}
\ No newline at end of file
diff --git a/linkis-web/src/apps/PythonModule/public/logo.svg b/linkis-web/src/apps/PythonModule/public/logo.svg
new file mode 100644
index 00000000000..210841be54b
--- /dev/null
+++ b/linkis-web/src/apps/PythonModule/public/logo.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="362px" height="233px" viewBox="0 0 362 233" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 11</title>
+    <defs>
+        <linearGradient x1="50%" y1="23.3539127%" x2="50%" y2="75.8919734%" id="linearGradient-1">
+            <stop stop-color="#AAF2DA" offset="0%"></stop>
+            <stop stop-color="#34CD9A" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="100%" x2="50%" y2="3.061617e-15%" id="linearGradient-2">
+            <stop stop-color="#599EFF" offset="0%"></stop>
+            <stop stop-color="#1973F2" offset="99.9127581%"></stop>
+        </linearGradient>
+        <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-3">
+            <stop stop-color="#1973F2" offset="0.0872418597%"></stop>
+            <stop stop-color="#599EFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Fes-logo" transform="translate(-312.000000, -180.000000)">
+            <g id="编组-11" transform="translate(312.938719, 180.587900)">
+                <rect id="矩形备份-186" fill="url(#linearGradient-1)" transform="translate(179.801981, 116.472643) scale(-1, 1) rotate(-45.000000) translate(-179.801981, -116.472643) " x="143.248626" y="-10.2344074" width="73.1067103" height="253.414101" rx="30.7817728"></rect>
+                <g id="编组-16备份-10" transform="translate(115.948055, 115.948055) rotate(-45.000000) translate(-115.948055, -115.948055) translate(33.950773, 33.970025)">
+                    <path d="M0.0481867714,59.2637891 L59.3119758,59.2637891 L59.3119758,163.956059 L30.8299595,163.956059 C13.8296559,163.956059 0.0481867714,150.17459 0.0481867714,133.174287 L0.0481867714,59.2637891 L0.0481867714,59.2637891 Z" id="矩形备份-182" fill="url(#linearGradient-2)"></path>
+                    <path d="M0.0472202895,75.9520701 L0.0481867714,59.2637891 L0.0461296915,59.2637891 L0.017351946,24.1772609 L3.99314558e-07,24.1681816 C-0.00247808834,10.9598356 11.5330724,0.230998197 25.8645189,0.0036581736 L26.3655734,4.54747351e-13 L133.183567,4.54747351e-13 C150.177656,0.0145961112 163.956549,12.642143 163.981254,28.2242722 L163.994554,51.8115325 C164.001076,55.9272978 160.666468,59.265668 156.5507,59.2679887 C156.5493,59.2679895 156.547899,59.2679899 156.546498,59.2637891 L18.0022314,59.2637891 C8.50175631,59.2637891 0.720152073,66.62315 0.0472202895,75.9520701 Z" id="形状结合" fill="url(#linearGradient-3)"></path>
+                </g>
+                <g id="编组-16备份-11" transform="translate(244.595176, 115.948055) scale(-1, -1) rotate(-45.000000) translate(-244.595176, -115.948055) translate(162.597894, 33.970025)">
+                    <path d="M0.0481867714,59.2637891 L59.3119758,59.2637891 L59.3119758,163.956059 L30.8299595,163.956059 C13.8296559,163.956059 0.0481867714,150.17459 0.0481867714,133.174287 L0.0481867714,59.2637891 L0.0481867714,59.2637891 Z" id="矩形备份-182" fill="url(#linearGradient-2)"></path>
+                    <path d="M0.0472202895,75.9520701 L0.0481867714,59.2637891 L0.0461296915,59.2637891 L0.017351946,24.1772609 L3.99314558e-07,24.1681816 C-0.00247808834,10.9598356 11.5330724,0.230998197 25.8645189,0.0036581736 L26.3655734,4.54747351e-13 L133.183567,4.54747351e-13 C150.177656,0.0145961112 163.956549,12.642143 163.981254,28.2242722 L163.994554,51.8115325 C164.001076,55.9272978 160.666468,59.265668 156.5507,59.2679887 C156.5493,59.2679895 156.547899,59.2679899 156.546498,59.2637891 L18.0022314,59.2637891 C8.50175631,59.2637891 0.720152073,66.62315 0.0472202895,75.9520701 Z" id="形状结合" fill="url(#linearGradient-3)"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/linkis-web/src/apps/PythonModule/tsconfig.json b/linkis-web/src/apps/PythonModule/tsconfig.json
new file mode 100644
index 00000000000..5ccb046d8ad
--- /dev/null
+++ b/linkis-web/src/apps/PythonModule/tsconfig.json
@@ -0,0 +1,33 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "target": "esnext",
+    "lib": [
+      "esnext",
+      "dom"
+    ],
+    "sourceMap": true,
+    "baseUrl": ".",
+    "jsx": "preserve",
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "allowJs": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+      "@@/*": [
+        "./src/.fes/*"
+      ]
+    }
+  },
+  "include": [
+    "src",
+    "package.json"
+  ]
+}
\ No newline at end of file
diff --git a/linkis-web/src/apps/URM/i18n/common/en.json b/linkis-web/src/apps/URM/i18n/common/en.json
index f6f8319cc8e..89ab41bc82b 100644
--- a/linkis-web/src/apps/URM/i18n/common/en.json
+++ b/linkis-web/src/apps/URM/i18n/common/en.json
@@ -60,6 +60,7 @@
         "no": "No",
         "sprak": "sprak",
         "jarPackage": "jar Package",
+        "registerFunc": "Register Function",
         "scriptPath": "Script Path",
         "registerFunction": "Register Function",
         "registerFormat": "Register Format",
@@ -88,7 +89,8 @@
         "XGHS": "Update Funtion",
         "XG": "Update",
         "QPZS": "View in Full Screen",
-        "QXQP": "Cancel Full Screen"
+        "QXQP": "Cancel Full Screen",
+        "XZHS": "Select Function"
       }
     }
   }
diff --git a/linkis-web/src/apps/URM/i18n/common/zh.json b/linkis-web/src/apps/URM/i18n/common/zh.json
index 942c66a7e2c..becc40b4fed 100644
--- a/linkis-web/src/apps/URM/i18n/common/zh.json
+++ b/linkis-web/src/apps/URM/i18n/common/zh.json
@@ -60,6 +60,7 @@
         "no": "否",
         "sprak": "sprak",
         "jarPackage": "jar包",
+        "registerFunc": "注册函数",
         "scriptPath": "脚本路径",
         "registerFunction": "注册的函数",
         "registerFormat": "注册格式",
@@ -88,7 +89,8 @@
         "XGHS": "修改函数",
         "XG": "修改",
         "QPZS": "全屏展示",
-        "QXQP": "取消全屏"
+        "QXQP": "取消全屏",
+        "XZHS": "选择函数"
       }
     }
   }
diff --git a/linkis-web/src/apps/URM/module/functionManagement/addFunctionModal.vue b/linkis-web/src/apps/URM/module/functionManagement/addFunctionModal.vue
index 10fb4e2344a..a12a1abac2c 100644
--- a/linkis-web/src/apps/URM/module/functionManagement/addFunctionModal.vue
+++ b/linkis-web/src/apps/URM/module/functionManagement/addFunctionModal.vue
@@ -5,15 +5,15 @@
   ~ The ASF licenses this file to You under the Apache License, Version 2.0
   ~ (the "License"); you may not use this file except in compliance with
   ~ the License.  You may obtain a copy of the License at
-  ~ 
+  ~
   ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~ 
+  ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  -->
+-->
 
 <template>
   <Modal
@@ -39,7 +39,7 @@
       <FormItem
         :label="$t('message.linkis.udf.functionName')"
         prop="name">
-        <Input v-model="setting.name" :disabled="model === 1" />
+        <Input v-model="setting.name" :disabled="model === 1 || !registerFunctionEditable" />
       </FormItem>
       <FormItem
         :label="$t('message.linkis.udf.functionType')"
@@ -95,6 +95,21 @@
           fs-type="share"
           @set-node="setNodePath"/>
       </FormItem>
+      <FormItem
+        v-if="registerFunctions.length > 0 && model !== 1"
+        :label="$t('message.linkis.udf.XZHS')"
+        prop="name">
+        <Select
+          v-model="setting.name"
+          @on-change="handleFuncChange"
+          filterable>
+          <Option
+            v-for="(item) in registerFunctions"
+            :label="item"
+            :value="item"
+            :key="item"/>
+        </Select>
+      </FormItem>
       <!-- <FormItem
         v-if="fnType === 0 && fnCategory.isCommon"
         :label="$t('message.linkis.udf.registerFormat')"
@@ -200,10 +215,10 @@
           type="textarea"/>
       </FormItem>
       <FormItem :label="$t('message.linkis.udf.class')" prop="directory">
-        <Select 
-          ref="directory" 
+        <Select
+          ref="directory"
           v-model="setting.directory" filterable
-          @on-query-change="queryChange" 
+          @on-query-change="queryChange"
           :remoteMethod="filterAdd" :disabled="model === 1">
           <Option
             v-for="(item) in directories"
@@ -214,7 +229,7 @@
       </FormItem>
       <FormItem :label="$t('message.linkis.udf.clusterName')">
         <Select v-model="setting.clusterName" :disabled="model === 1">
-          <Option   
+          <Option
             label="all"
             value="all" />
         </Select>
@@ -268,6 +283,7 @@ export default {
         isCommon: false,
         isCustom: true,
       },
+      registerFunctions: [],
       TYPELIB: {
         jar: 0,
         Spark: {
@@ -308,6 +324,8 @@ export default {
         directory: ''
       },
       isShareLoading: false,
+
+      registerFunctionEditable: true,
       rules: {
         name: [
           { required: true, message: this.$t('message.linkis.udf.QSRMC'), trigger: 'blur' },
@@ -514,6 +532,11 @@ export default {
     getHeight() {
       this.resize(window.innerHeight);
     },
+    handleFuncChange(val) {
+      if(this.model !== 1) {
+        this.setting.name = val;
+      }
+    },
     open(node) {
       this.resetData();
       const titleMap = [this.$t('message.linkis.udf.addFunction'), this.$t('message.linkis.udf.updateFunction')];
@@ -531,7 +554,10 @@ export default {
       this.title = titleMap[this.model];
       this.btnLabel = btnLabelMap[this.model];
     },
-
+    async getRegisterFunction(path) {
+      const res = await api.fetch('/udf/get-register-functions', { path }, 'get');
+      return res.functions
+    },
     init() {
       let { name, shared, description, path, udfName, directory, udfType, registerFormat, load, useFormat } = this.node;
       let fnType = 'Spark'
@@ -556,6 +582,18 @@ export default {
       });
       this.$nextTick(() => {
         this.$set(this.setting, this.getTypes(), path);
+        // try {
+        //   this.registerFunctions = await this.getRegisterFunction(path);
+        //   if(this.registerFunctions.length !== 0) {
+        //     this.registerFunctionEditable = false;
+        //   } else {
+        //     this.registerFunctionEditable = true;
+        //   }
+        // } catch (err) {
+        //   window.console.error(err);
+        //   this.registerFunctions = [];
+        //   this.registerFunctionEditable = true;
+        // }
       });
     },
 
@@ -631,7 +669,7 @@ export default {
             clusterName
           };
           if (this.model) {
-            postData = Object.assign(postData, { shared: false });
+            postData = Object.assign(postData, { shared: false, defaultLoad });
             this.$emit('update', postData);
           } else {
             postData = Object.assign(postData, { defaultLoad });
@@ -659,8 +697,24 @@ export default {
       this.modalHeight = h - 380 + 'px';
     },
 
-    setNodePath(node) {
+    async setNodePath(node) {
       this.$set(this.setting, this.getTypes(), node.path);
+      if(this.model !== 1 && /^[\w\u4e00-\u9fa5:.\\/]*(py|scala)$/.test(node.path)) {
+        try {
+          this.registerFunctions = await this.getRegisterFunction(node.path);
+          if(this.registerFunctions.length !== 0) {
+            this.registerFunctionEditable = false;
+            this.setting.name = '';
+          } else {
+            this.registerFunctionEditable = true;
+          }
+        } catch (err) {
+          window.console.error(err);
+          this.registerFunctions = [];
+          this.registerFunctionEditable = true;
+        }
+      }
+
     },
 
     getTypes() {
@@ -697,6 +751,8 @@ export default {
       };
       this.showScalaRF = '';
       this.showScalaUF = '';
+      this.registerFunctions = [];
+      this.registerFunctionEditable = true;
     },
 
     getDir() {
@@ -780,7 +836,7 @@ export default {
         height: 100% !important;
       }
     }
-  
+
     .ivu-modal-content {
       height: 100% !important;
     }
@@ -789,4 +845,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/linkis-web/src/apps/URM/module/functionManagement/index.vue b/linkis-web/src/apps/URM/module/functionManagement/index.vue
index 389b1003c3d..f0eebb321c4 100644
--- a/linkis-web/src/apps/URM/module/functionManagement/index.vue
+++ b/linkis-web/src/apps/URM/module/functionManagement/index.vue
@@ -13,7 +13,7 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  -->
+-->
 
 <template>
   <div class="function-management">
@@ -389,6 +389,9 @@ export default {
           this.search()
           this.isLoading = false
           this.loading = false
+          if (data.defaultLoad) {
+            this.confirmKillIdle()
+          }
         })
         .catch(() => {
           // this.list = [{}]
@@ -422,6 +425,9 @@ export default {
           this.loading = false
           this.search()
           this.$Message.success(this.$t('message.linkis.udf.success'));
+          if (data.defaultLoad) {
+            this.confirmKillIdle()
+          }
         })
         .catch(() => {
           this.isLoading = false
@@ -663,6 +669,22 @@ export default {
           })
       }
     },
+    confirmKillIdle() {
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.setting.killEngineTitle'),
+        content: this.$t('message.linkis.setting.killEngine'),
+        onOk: async () => {
+          try {
+            api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
+              creator: '*',
+              engineType: 'spark'
+            })
+          } catch (err) {
+            window.console.warn(err)
+          }
+        }
+      })
+    },
     getShareUsers() {
       return api.fetch('/udf/getSharedUsers', {udfId: this.handleRow.id}, 'post')
     },
diff --git a/linkis-web/src/apps/URM/module/header/index.vue b/linkis-web/src/apps/URM/module/header/index.vue
index c251e0e6f3b..1acc2b3676d 100644
--- a/linkis-web/src/apps/URM/module/header/index.vue
+++ b/linkis-web/src/apps/URM/module/header/index.vue
@@ -5,9 +5,9 @@
   ~ The ASF licenses this file to You under the Apache License, Version 2.0
   ~ (the "License"); you may not use this file except in compliance with
   ~ the License.  You may obtain a copy of the License at
-  ~
+  ~ 
   ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
+  ~ 
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -95,13 +95,13 @@ export default {
     linkTo(type) {
       let url = "";
       if (type === "book") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch3/DSS_User_Manual.md`;
       } else if (type === "github") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio`;
       } else if (type === "freedback") {
-        url = "https://linkis.apache.org/";
+        url = "https://wj.qq.com/s2/4943071/c037/ ";
         if (localStorage.getItem("locale") === "en") {
-          url = "https://linkis.apache.org/";
+          url = "https://wj.qq.com/s2/4943706/5a8b";
         }
       }
       util.windowOpen(url);
diff --git a/linkis-web/src/apps/URM/module/header/userMenu.vue b/linkis-web/src/apps/URM/module/header/userMenu.vue
index 1daf58301fd..6c453d2f2f0 100644
--- a/linkis-web/src/apps/URM/module/header/userMenu.vue
+++ b/linkis-web/src/apps/URM/module/header/userMenu.vue
@@ -121,11 +121,13 @@ export default {
       });
     },
     changeLang() {
-      // 中文切换英文
+      // Chinese to English(中文切换英文)
       if (localStorage.getItem('locale') === 'zh-CN') {
         localStorage.setItem('locale', 'en');
+        localStorage.setItem('fes_locale', 'en-US');
       } else {
         localStorage.setItem('locale', 'zh-CN');
+        localStorage.setItem('fes_locale', 'zh-CN');
       }
       window.location.reload();
     }
diff --git a/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue b/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
index 8f12aee69e2..205b00fc946 100644
--- a/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
+++ b/linkis-web/src/apps/URM/module/udfManagement/addFunctionModal.vue
@@ -96,6 +96,38 @@
           fs-type="share"
           @set-node="setNodePath"/>
       </FormItem>
+      <FormItem
+        v-if="fnType === 1 && fnCategory.isSpark && registerFunctions.length > 0"
+        :label="$t('message.linkis.udf.registerFunc')"
+        prop="pyPara">
+        <Select
+          v-model="setting.pyPara"
+          @on-change="handleFuncChange"
+          :placeholder="$t('message.linkis.udf.registerFunction')"
+          filterable>
+          <Option
+            v-for="(item) in registerFunctions"
+            :label="item"
+            :value="item"
+            :key="item"/>
+        </Select>
+      </FormItem>
+      <FormItem
+        v-if="fnType === 2 && fnCategory.isSpark && registerFunctions.length > 0"
+        :label="$t('message.linkis.udf.registerFunc')"
+        prop="scalapara">
+        <Select
+          v-model="setting.scalapara"
+          @on-change="handleFuncChange"
+          :placeholder="$t('message.linkis.udf.registerFunction')"
+          filterable>
+          <Option
+            v-for="(item) in registerFunctions"
+            :label="item"
+            :value="item"
+            :key="item"/>
+        </Select>
+      </FormItem>
       <FormItem
         v-if="fnType === 0 && fnCategory.isCommon"
         :label="$t('message.linkis.udf.registerFormat')"
@@ -110,6 +142,7 @@
         prop="pyPara">
         <Input
           v-model="setting.pyPara"
+          :disabled="!registerFunctionEditable"
           :placeholder="$t('message.linkis.udf.registerFunction')"/>
       </FormItem>
       <FormItem
@@ -134,6 +167,7 @@
           <FormItem prop="scalapara">
             <Input
               v-model="setting.scalapara"
+              :disabled="!registerFunctionEditable"
               :placeholder="$t('message.linkis.udf.registerFunction')"/>
           </FormItem>
         </div>
@@ -288,6 +322,8 @@ export default {
         },
       },
       title: '',
+      registerFunctions: [],
+      registerFunctionEditable: true,
       show: false,
       btnLabel: this.$t('message.common.ok'),
       modalHeight: '',
@@ -552,7 +588,11 @@ export default {
         };
       }
     },
-
+    handleFuncChange(val) {
+      if(this.model !== 1) {
+        this.setting.name = val;
+      }
+    },
     init() {
       let { name, shared, description, path, udfName, directory, udfType, registerFormat, load, useFormat } = this.node;
       let fnType = 'Spark'
@@ -575,9 +615,27 @@ export default {
         fnType,
         defaultLoad: !!load
       });
-      this.$nextTick(() => {
+      this.$nextTick(async () => {
         this.$set(this.setting, this.getTypes(), path);
+        if(this.getTypes() !== 'jarPath') {
+          if (/^[\w\u4e00-\u9fa5:.\\/]*(py|scala)$/.test(path)) {
+            try {
+              this.registerFunctions = await this.getRegisterFunction(path);
+              if(this.registerFunctions.length !== 0) {
+                this.registerFunctionEditable = false;
+              } else {
+                this.registerFunctionEditable = true;
+              }
+            } catch (err) {
+              window.console.error(err);
+              this.registerFunctions = [];
+              this.registerFunctionEditable = true;
+            }
+          } 
+        
+        }
       });
+      
     },
 
     close() {
@@ -594,27 +652,31 @@ export default {
       } else if (this.node.udfType === 1) {
         this.setting.pyPara = conver(',', ')', 'indexOf', 'lastIndexOf');
       } else {
-        const type = rf.slice(rf.indexOf('[') + 1, rf.indexOf(']'));
+        const typeStart = rf.indexOf('[') + 1;
+        const typeEnd = rf.lastIndexOf(']');
+        const type = rf.slice(typeStart, typeEnd);
         window.console.log(type, rf, '=====');
-        // 如果存在多个逗号，就只用使用格式来截取，否则会出现多个类型填入input异常的问题
-        if (type.indexOf(',') !== type.lastIndexOf(',')) {
-          // there are 2 case:
-          // 1. tuple,  return params in ();
-          // 2. multi params, the first params is return params
-          if (type.indexOf('(') !== -1) {
-            // tuple
-            this.setting.scalaTypeL = type.slice(type.indexOf('('), type.indexOf(')') + 1)
-            this.setting.scalaTypeR = type.slice(type.indexOf(')')+2)
-          } else {
-            // multi params
-            this.setting.scalaTypeL = type.split(',')[0];
-            this.setting.scalaTypeR = type.split(',').slice(1).toString();
+        const findFirstValidComma = (str) => {
+          let brackets = 0;
+          for (let i = 0; i < str.length; i++) {
+            const char = str[i];
+            // 计算所有类型的括号
+            if (char === '[' || char === '(') brackets++;
+            if (char === ']' || char === ')') brackets--;
+            // 只在最外层找逗号
+            if (char === ',' && brackets === 0) return i;
           }
+          return -1;
+        };
 
-          this.showScalaRF = this.node.registerFormat;
+        const commaPos = findFirstValidComma(type);
+        
+        if (commaPos !== -1) {
+          this.setting.scalaTypeL = type.slice(0, commaPos).trim();
+          this.setting.scalaTypeR = type.slice(commaPos + 1).trim();
         } else {
-          this.setting.scalaTypeL = conver('[', ',', 'indexOf', 'indexOf');
-          this.setting.scalaTypeR = conver(',', ']', 'indexOf', 'indexOf');
+          this.setting.scalaTypeL = type.trim();
+          this.setting.scalaTypeR = '';
         }
         this.setting.scalapara = conver(',', ')', 'lastIndexOf', 'lastIndexOf');
       }
@@ -635,7 +697,6 @@ export default {
         this.$set(this.setting, `${type}R`, right);
       }
     },
-
     handleShareChange() {
       if (!this.isShareLoading) {
         this.isShareLoading = true;
@@ -662,10 +723,10 @@ export default {
             udfType: this.fnType,
             isLeaf: true,
             directory,
-            clusterName
+            clusterName,
           };
           if (this.model) {
-            postData = Object.assign(postData, { shared: false });
+            postData = Object.assign(postData, { shared: false, defaultLoad });
             this.$emit('update', postData);
           } else {
             postData = Object.assign(postData, { defaultLoad });
@@ -692,12 +753,38 @@ export default {
     resize(h) {
       this.modalHeight = h - 380 + 'px';
     },
+    // 获取注册函数
+    async getRegisterFunction(path) {
+      const res = await api.fetch('/udf/get-register-functions', { path }, 'get');
+      return res.functions
+    },
 
-    setNodePath(node) {
+    async setNodePath(node) {
       ['jarPath', 'sparkPath', 'customPath'].forEach(item => {
         const temp = item === this.getTypes() ? node.path : '';
         this.$set(this.setting, item, temp);
       })
+      if(this.getTypes() !== 'jarPath') {
+
+        
+        if (/^[\w\u4e00-\u9fa5:.\\/]*(py|scala)$/.test(node.path)) {
+          try {
+            this.registerFunctions = await this.getRegisterFunction(node.path);
+            if(this.registerFunctions.length !== 0) {
+              this.registerFunctionEditable = false;
+            } else {
+              this.registerFunctionEditable = true;
+            }
+          } catch (err) {
+            window.console.error(err);
+            this.registerFunctions = [];
+            this.registerFunctionEditable = true;
+          }
+        }
+          
+        
+      }
+      
     },
 
     getTypes() {
diff --git a/linkis-web/src/apps/URM/module/udfManagement/index.vue b/linkis-web/src/apps/URM/module/udfManagement/index.vue
index 870b6ddf2ca..c8408bac2c7 100644
--- a/linkis-web/src/apps/URM/module/udfManagement/index.vue
+++ b/linkis-web/src/apps/URM/module/udfManagement/index.vue
@@ -360,7 +360,7 @@ export default {
       }
     },
     // 新增函数
-    addFunction(data) {
+    async addFunction(data) {
       if (this.loading) return
       this.loading = true;
       const params = {
@@ -377,19 +377,24 @@ export default {
         clusterName: data.clusterName,
         directory: data.directory
       }
-      api
+      await api
         .fetch('/udf/add', {udfAddVo: params}, 'post')
         .then(() => {
           this.showAddModal(false)
           this.search()
           this.isLoading = false
           this.loading = false
+          if (data.defaultLoad) {
+            this.confirmKillIdle(data)
+          }
         })
         .catch(() => {
           // this.list = [{}]
           this.loading = false
           this.isLoading = false
+          
         })
+      
     },
     // 更新
     updateFunction(data) {
@@ -417,12 +422,32 @@ export default {
           this.loading = false
           this.search()
           this.$Message.success(this.$t('message.linkis.udf.success'));
+          
+          if (data.defaultLoad) {
+            this.confirmKillIdle(data)
+          }
         })
         .catch(() => {
           this.isLoading = false
           this.loading = false
         })
     },
+    confirmKillIdle(data) {
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.setting.killEngineTitle'),
+        content: this.$t('message.linkis.setting.killEngine'),
+        onOk: async () => {
+          try {
+            api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
+              creator: '*',
+              engineType: [1, 2].includes(data.udfType) ? 'spark' : '*'
+            })
+          } catch (err) {
+            window.console.warn(err)
+          }
+        }
+      })
+    },
     checkChange(v) {
       this.list = this.list.map(it => {
         it.checked = !it.disabled && v
diff --git a/linkis-web/src/apps/linkis/assets/styles/console.scss b/linkis-web/src/apps/linkis/assets/styles/console.scss
index 008a4b7686e..8fbca0a359d 100644
--- a/linkis-web/src/apps/linkis/assets/styles/console.scss
+++ b/linkis-web/src/apps/linkis/assets/styles/console.scss
@@ -32,6 +32,9 @@ body {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "JinbiaoSong", "JinbiaoSongExt" !important;
     .monaco-editor {
         --monaco-monospace-font: "SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace, "JinbiaoSong", "JinbiaoSongExt";
+        .inline-folded::after {
+            content: "\00B7\00B7\00B7"
+        }
     }
     .monaco-mouse-cursor-text {
         font-family: Consolas, "Courier New", monospace, "JinbiaoSong", "JinbiaoSongExt" !important;
diff --git a/linkis-web/src/apps/linkis/components/tag/index.vue b/linkis-web/src/apps/linkis/components/tag/index.vue
index b1816178984..3b6d16b29c2 100644
--- a/linkis-web/src/apps/linkis/components/tag/index.vue
+++ b/linkis-web/src/apps/linkis/components/tag/index.vue
@@ -153,8 +153,8 @@ export default {
       let reg = /[`~!#$%^&*()\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、\s+]/g;
       if (reg.test(this.value2)) {
         this.$Message.error("Label content cannot be special symbols and spaces(标签内容不能为特殊符号和空格)！");
-      } else if (this.value2.length >= 16) {
-        this.$Message.error("Tag content length not exceeding 16(标签内容长度不超过16)！");
+      } else if (this.value2.length >= 100) {
+        this.$Message.error("Tag content length not exceeding 100(标签内容长度不超过100)！");
       } else if (this.value1 && this.value2) {
         this.$emit("addEnter", this.value1, this.value2);
         this.adding = false;
@@ -175,8 +175,8 @@ export default {
       let reg = /[`~!#$%^&*()\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、\s+]/g;
       if (reg.test(editedInputValue)) {
         this.$Message.error("标签内容不能为特殊符号和空格！");
-      } else if (editedInputValue.length >= 16) {
-        this.$Message.error("标签内容长度不超过16！");
+      } else if (editedInputValue.length >= 100) {
+        this.$Message.error("Tag content length not exceeding 100(标签内容长度不超过100)！");
       } else if (item.key && editedInputValue) {
         this.$emit("editEnter", item.key, item.value, editedInputValue);
         this.clickValue = '';
@@ -195,9 +195,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .linkiesTagModal {
-  /deep/ .ivu-tag {
+  ::v-deep .ivu-tag {
     vertical-align: middle;
-    /deep/ .ivu-tag-text {
+    ::v-deep .ivu-tag-text {
       display: inline-block;
       max-width: 140px;
       overflow: hidden;
@@ -206,7 +206,7 @@ export default {
       vertical-align: middle;
     }
   }
-  /deep/ .ivu-tooltip-inner {
+  ::v-deep .ivu-tooltip-inner {
     max-width: 100%;
   }
   .addAndCancel {
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json b/linkis-web/src/apps/linkis/i18n/common/en.json
index ce5c0da8050..39f44c6dbd2 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -1,13 +1,24 @@
 {
   "message": {
     "linkis": {
+      "tokenPlain": "Plaintext Token",
+      "tokenCipher": "Ciphertext Token",
+      "udfLog": "UDF Log",
+      "diagnosticLog": "Diagnostic Log",
       "refresh": "Refresh",
+      "tableSetting": "Table Setting",
+      "downloadLog": "Download",
+      "countinueDownload": "Countinue Download?",
+      "exceed10000": "The current data exceeds 10,000 records, and only up to 10,000 records are supported. Do you want to proceed with the download?",
       "noDescription": "No description",
       "placeholderZip": "Please enter the workspace Python package path (only zip is supported)!",
       "emptyString": "Empty String",
       "description": "Description",
       "name": "Name",
       "order": "Order",
+      "findNewVer": "New Version Found",
+      "whetherUpdateNow": "Do you want to update now?",
+      "downloadSucceed": "Download succeeded!",
       "addParameterConfig": "Add Parameter Configuration",
       "addEngineType": "Add Engine Type",
       "editDescriptionEngineConfig": "Edit Description Engine Config",
@@ -18,6 +29,7 @@
       "addTags": "Add Tags",
       "unfold": "Unfold",
       "fold": "Fold",
+      "jump": "Quick Jump",
       "jumpPage": "Please check in the jump page...",
       "initiator": "Created From",
       "inputOwnerHint": "Please input owner",
@@ -31,9 +43,11 @@
       "defaultValue": "Default",
       "noDefaultValue": "No default value",
       "stop": "Stop",
+      "batchUnhealth": "Batch change to unhealth",
       "tip": "Tip",
       "serverTip": "No Results（resultLocation:null）",
       "log": "Task Log",
+      "executionCode": "Execution Code",
       "detail": "Task Detail",
       "result": "Task Result",
       "engineLog": "Engine Log",
@@ -51,6 +65,12 @@
       "instanceNum": "Instance Number",
       "keyTip": "The key cannot be empty",
       "instanceName": "Instance Name",
+      "remark": "Remark",
+      "healthInfo": "Health Information",
+      "serviceName": "Service Name",
+      "IP": "IP",
+      "hostname": "Hostname",
+      "versionInfo": "Version Info",
       "resources": "Resources",
       "reset": "Reset",
       "clearSearch": "Clear",
@@ -66,6 +86,11 @@
       "create": "Create",
       "noDataText": "No data yet",
       "jobId": "JobID",
+      "remarkPlaceholder": "Please provide a description for adding or modifying labels, otherwise the labels will be cleaned up",
+      "engineInstance": {
+        "label": "ECM",
+        "placeholder": "Please input ECM"
+      },
       "userName": "Username",
       "password": "Password",
       "unselect": "Please select task",
@@ -75,6 +100,7 @@
       "showAdvancedSearch": "Advanced Search",
       "hideAdvancedSearch": "Hide Advanced Search",
       "manageView": "Switch to the Admin View",
+      "deptManageView": "Switch to the Dept Admin View",
       "back": "Back",
       "download": "Download Log",
       "confirmText": "Confirm downloading the log",
@@ -90,9 +116,6 @@
       "tenant": "Tenant",
       "inputTenant": "Please Input Tenant",
       "globalSettings": "GlobalSettings",
-      "taskOverTimeTop": "TaskDuration-TOP",
-      "taskTotalNum": "TaskTotalNum",
-      "engineTotalNum":"engineTotalNum",
       "resultSet": {
         "prefixText": "Because your result set is large, for a better experience, ",
         "linkText": "View result set",
@@ -110,7 +133,7 @@
       "resourceManagement": {
         "resourceUsage": "Resource usage",
         "applicationList": "Applications"
-      },
+    },
       "time": {
         "second": "Second",
         "minute": "Minute",
@@ -118,16 +141,22 @@
         "day": "Day"
       },
       "tableColumns": {
+        "isReuse": "Reuse",
+        "requestStartTime": "Request Start Time",
+        "requestEndTime": "Request End Time",
+        "requestSpendTime": "Request Spend Time",
+        "metrix": "Metrix",
         "instanceName": "Instance Name",
         "initiator": "Initiator",
         "engineInstance": "Engine Instance",
         "engineType": "Engine Type",
-        "serveType": "Serve Type",
+        "serveType": "Serve Name",
         "appType": "App Type",
         "taskID": "JobID",
         "fileName": "Source",
         "executionCode": "Execution Code",
         "status": "Status",
+        "healthInfo": "Health Information",
         "label": "Label",
         "engineVersion": "Engine Version",
         "engineVersionCannotBeNull": "Engine Version Cannot Be Null",
@@ -140,6 +169,7 @@
         "costTime": "Time Elapsed",
         "executeApplicationName": "Engine",
         "requestApplicationName": "App",
+        "runType": "RunType",
         "user": "User",
         "createdTime": "Created at",
         "updateTime": "Update Time",
@@ -155,7 +185,11 @@
         "engineUsed": "Engine Used",
         "engineTop": "Engine Max",
         "versioTips": "If no engine version is available, check whether the engine materials of the corresponding version are installed",
-        "applicationRole": "Application role"
+        "applicationRole": "Application role",
+        "serviceAddress": "IP:Port",
+        "hostname": "Hostname",
+        "registryTime": "Registration Time",
+        "versionInfo": "Version Info"
       },
       "logLoading": "Requesting logs, please hold on",
       "title": "Linkis Control Panel",
@@ -178,12 +212,14 @@
             "dateReport": "Global Variables",
             "globalValiable": "Frequently Asked",
             "microserviceManage": "Microservice Management",
+            "eurekaService": "Eureka Service",
             "ECMManage": "ECM Management",
             "udfFunctionTitle": "UDF Function",
             "udfFunctionManage": "UDF Management",
             "dataSourceManage": "DataSource Management",
             "userResourceManagement": "User Resource Management",
             "tenantTagManagement": "Tenant Tag Management",
+            "departmentTagManagement": "Department Tag Management",
             "ipListManagement": "White List Management",
             "acrossClusterRule": "Across Cluster Rule Management",
             "errorCode": "Error Manage",
@@ -192,6 +228,8 @@
             "rmExternalResourceProvider": "External Resource Provider Manage",
             "udfManager": "UDF User Manage",
             "udfTree": "UDF Tree",
+            "pythonModule": "Python Module",
+            "taskResourceManage": "Task Resource Manage",
             "datasourceAccess": "Data source access permissions",
             "datasourceEnv": "DataSource Environment",
             "datasourceType": "DataSource Type",
@@ -202,8 +240,7 @@
             "EngineConnList": "Engine Conn List",
             "opsTool": "OPS Tool",
             "userConfig": "User Configuration",
-            "configManagement": "Configuration Management",
-            "statisticsDashboard": "Statistics Dashboard"
+            "configManagement": "Configuration Management"
           }
         }
       },
@@ -223,11 +260,13 @@
         "update": "Update Engine Plugin",
         "updateFileOnly": "Update",
         "resourceVersion": "Engine Material BML Version",
+        "resourceAddress": "Material Address",
         "user": "Affiliated Person",
         "deleteCurrentbml": "Delete",
         "versionList": "Version List",
         "rollback": "Roll Back ",
-        "action": "Operation"
+        "action": "Operation",
+        "globalConfig": "global config"
       },
       "modal": {
         "modalTitle": "Prompt message ",
@@ -235,6 +274,7 @@
         "modalDeleteRecord": "Confirm whether to delete the record?",
         "modalDeleteTask": "Confirm whether to stop the selected task?",
         "modalDeleteInstance": "Determines whether to stop the current selected instance?",
+        "modalunheathyInstance": "Confirm whether to modify the status of instances in batches to unhealthy",
         "modalDeleteSuccess": "Deleted successfully",
         "modalDeleteFail": "Delete failed"
       },
@@ -249,11 +289,15 @@
         "instance": {
           "label": "Entrance Instance",
           "placeholder": "Please search by entering the instance"
-      },
+        },
         "creator": {
           "label": "App",
           "placeholder": "Please search by entering the application name"
         },
+        "runType": {
+          "label": "RunType",
+          "placeholder": "Please search by entering the runType"
+        },
         "engine": {
           "label": "Engine"
         },
@@ -336,7 +380,9 @@
         "show": "Show",
         "advancedSetting": "Advanced Settings",
         "dataDev": "Data Development",
-        "maxLimit": "(The resource template specifies an upper limit value of {limit})"
+        "maxLimit": "(The resource template specifies an upper limit value of {limit})",
+        "killEngine": "The parameter changes have taken effect. Clicking 'OK' will stop the idle engines, and busy engines will stop after task execution",
+        "killEngineTitle": "Whether to stop idle engines"
       },
       "globalValiable": "Global Variables",
       "rules": {
@@ -420,6 +466,7 @@
         "inputTenant": "Please Input Tenant Tag",
         "inputDesc": "Please Input Description",
         "inputCreateUser": "Please Input Creare User",
+        "selectDepartment": "Please Select Department",
         "yourTagMapping": "Your Tag Mapping",
         "notEmpty": "Cannot be empty",
         "maxLen": "A maximum of 100 characters is allowed",
@@ -427,6 +474,7 @@
         "contentError1": "English, numbers and underline only",
         "contentError2": "English, numbers, underscores and dashes only",
         "check": "Check",
+        "department": "Department",
         "OK": "OK",
         "Cancel": "Cancel",
         "action": "Action",
@@ -477,10 +525,14 @@
         "rules": "Rules",
         "startTime": "Start Time",
         "endTime": "End Time",
-        "CPUThreshold": "CPU Threshold(Core)",
-        "MemoryThreshold": "Memory Threshold(G)",
-        "CPUPercentageThreshold": "CPU Percentage Threshold",
-        "MemoryPercentageThreshold": "Memory Percentage Threshold",
+        "priorityCluster": "Priority Cluster",
+        "targetCPUThreshold": "Target CPU Threshold(Core)",
+        "targetMemoryThreshold": "Target Memory Threshold(G)",
+        "targetCPUPercentageThreshold": "Target CPU Percentage Threshold",
+        "targetMemoryPercentageThreshold": "Target Memory Percentage Threshold",
+        "originCPUPercentageThreshold": "Origin CPU Percentage Threshold",
+        "originMemoryPercentageThreshold": "Origin Memory Percentage Threshold",
+        "acrossClusterQueue": "Across Cluster Queue",
         "timeError": "The time format should be XX:XX, please enter the correct time",
         "thresholdError": "Please enter an integer between 0 and 10000",
         "percentageThresholdError": "Please enter an integer between 0 and 1",
@@ -519,14 +571,28 @@
         "confirmDisable": "Confirm whether to disable the [{name}] option?",
         "enableSuccessfully": "Enable Successfully",
         "disableSuccessfully": "Disable Successfully",
-        "templateRequired": "Required"
+        "templateRequired": "Required",
+        "batchOperate": "Batch",
+        "batchDelete": "Batch Delete",
+        "batchEnable": "Batch Enable",
+        "batchDisable": "Batch Disable",
+        "batchModify": "Batch Modify",
+        "adjustConf": "Adjust Configuration",
+        "confirmBatchModify": "Confirm bulk modifications to these rules",
+        "confirmBatchDelete": "Confirm bulk deleteion of these rules",
+        "confirmBatchEnable": "Confirm bulk enabling of these rules",
+        "confirmBatchDisable": "Confirm bulk disabling of these rules",
+        "confirmModifyBtn": "Confirm Modify",
+        "confirmDeleteBtn": "Confirm Delete",
+        "confirmEnableBtn": "Confirm Enable",
+        "confirmDisableBtn": "Confirm Disable"
       },
       "codeQuery": {
         "executionCode": "Execution Code",
         "dateRange": "Date Range",
         "engineType": "Engine Type",
         "placeholder": {
-            "executionCode": "Please Input Execution Code",
+            "executionCode": "Please enter the execution code, which does not support special characters such as ', `, and can use % and _ as wildcards: % represents any character, and _ represents a single character.",
             "dateRange": "Please select date range",
             "status": "Please select status"
         },
@@ -539,13 +605,15 @@
         "status": "Status",
         "submitUser": "Submit User",
         "createdTime": "Created Time",
-        "searchRange": "Only T-1 history code can be queried"
-
+        "searchRange": "Only T-1 history code can be queried",
+        "fullMatch": "Full Match",
+        "keyword": "Keyword Match"
       },
       "basedataManagement": {
         "add": "Add",
         "remove": "Remove",
         "edit": "Edit",
+        "tokenInfo": "Token",
         "searchLabel": "Fuzzy Search:",
         "searchPlaceholder": "Please enter your search",
         "search": "Search",
@@ -725,7 +793,10 @@
         "configVKey": "Configuration",
         "configValue": "Configuration Value",
         "configValuePro": "Please Input Configuration Value",
-        "versionInputPro": "Please Input Engine Version"
+        "versionInputPro": "Please Input Engine Version",
+        "isForceVerify": "Whether to perform strong verification",
+        "yes": "yes",
+        "no": "no"
       }
     }
   }
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json b/linkis-web/src/apps/linkis/i18n/common/zh.json
index 50f6d2ecf04..18042b12c82 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -1,12 +1,23 @@
 {
   "message": {
       "linkis": {
+          "tokenPlain": "token明文",
+          "tokenCipher": "token密文",
+          "udfLog": "UDF 日志",
+          "diagnosticLog": "诊断日志",
           "refresh": "刷新",
+          "findNewVer": "检测到新版本",
+          "whetherUpdateNow": "是否立即更新？",
+          "tableSetting": "表格展示列设置",
+          "downloadLog": "下载",
           "placeholderZip": "请输入工作空间python包路径（只支持zip）!",
           "emptyString": "空字符串",
           "addAppType": "新增应用类型",
           "editContents": "编辑目录",
           "ConfirmEdit": "完成编辑",
+          "downloadSucceed": "下载成功!",
+          "countinueDownload": "是否下载",
+          "exceed10000": "当前数据超过一万条，最多只支持一万条下载数据，是否继续下载",
           "serviceRegistryCenter":  "服务注册中心",
           "addParameterConfig": "新增参数配置",
           "addEngineType": "新增引擎类型",
@@ -25,15 +36,18 @@
           "errorDescription": "错误描述",
           "notLog": "未获取到日志！",
           "unfold": "展开",
-          "fold": "收起",
+          "fold": "折叠",
+          "jump": "快速跳转",
           "addVariable": "新增变量",
           "defaultValue": "默认值",
           "noDefaultValue": "无默认值",
           "stop": "停止",
+          "batchUnhealth": "批量修改状态为UnHealthy",
           "tip": "提示",
           "serverTip": "无结果集（resultLocation:null）",
           "stopEngineTip": "请问确认要停止当前引擎？",
           "log": "任务日志",
+          "executionCode": "执行代码",
           "detail": "任务详情",
           "result": "任务结果",
           "engineLog": "引擎日志",
@@ -52,11 +66,18 @@
           "resources": "资源",
           "instanceNum": "实例数",
           "instanceName": "实例名称",
+          "remark": "备注信息",
+          "healthInfo": "健康信息",
+          "serviceName": "服务名称",
+          "IP": "IP",
+          "hostname": "主机名",
+          "versionInfo": "版本信息",
           "reset": "重置",
           "clearSearch": "清空",
           "showOperations": "显示操作",
           "hide": "隐藏操作",
           "resetAll": "全部重置",
+          "remarkPlaceholder": "添加或修改标签请给描述信息，否则标签会被清理",
           "remove": "移除",
           "submit": "确定",
           "search": "搜索",
@@ -75,6 +96,7 @@
           "showAdvancedSearch": "高级筛选",
           "hideAdvancedSearch": "隐藏高级筛选",
           "manageView": "切换管理员视图",
+          "deptManageView": "切换部门管理员视图",
           "back": "返回",
           "download": "下载日志",
           "confirmText": "确认下载该日志",
@@ -90,9 +112,10 @@
           "tenant": "租户标签",
           "inputTenant": "请输入租户标签",
           "globalSettings": "全局设置",
-          "taskOverTimeTop": "任务耗时-TOP",
-          "taskTotalNum": "任务总数",
-          "engineTotalNum":"引擎总数",
+          "engineInstance": {
+            "label": "ECM",
+            "placeholder": "请输入ECM"
+          },
           "resultSet": {
             "prefixText": "因为您的结果集较大，为了更好的体验，",
             "linkText": "点击查看结果集",
@@ -117,16 +140,22 @@
               "day": "天"
           },
           "tableColumns": {
+              "isReuse": "是否复用引擎标识",
+              "requestStartTime": "申请开始时间",
+              "requestEndTime": "申请完成时间",
+              "requestSpendTime": "申请耗时",
+              "metrix": "指标",
               "instanceName": "实例名称",
               "initiator": "启动者",
               "engineInstance": "引擎实例",
               "engineType": "引擎类型",
-              "serveType": "服务类型",
+              "serveType": "服务名称",
               "appType": "应用类型",
               "taskID": "任务ID",
               "fileName": "来源",
               "executionCode": "查询语句",
               "status": "状态",
+              "healthInfo": "健康信息",
               "costTime": "已耗时",
               "label": "标签",
               "engineVersion": "引擎版本",
@@ -139,6 +168,7 @@
               "startTime": "启动时间",
               "executeApplicationName": "引擎",
               "requestApplicationName": "应用",
+              "runType": "任务类型",
               "user": "用户",
               "createdTime": "创建时间",
               "updateTime": "更新时间",
@@ -154,7 +184,11 @@
               "engineUsed": "引擎已用资源",
               "engineTop": "引擎上限资源",
               "versioTips": "如果没有对应的版本，请确认是否已安装对应的版本引擎物料",
-              "applicationRole": "应用方"
+              "applicationRole": "应用方",
+              "serviceAddress": "IP端口",
+              "hostname": "主机名",
+              "registryTime": "注册时间",
+              "versionInfo": "版本信息"
           },
           "logLoading": "日志请求中，请稍后",
           "title": "Linkis管理台",
@@ -178,12 +212,14 @@
                       "globalValiable": "常见问题",
                       "ECMManage": "ECM管理",
                       "microserviceManage": "微服务管理",
+                      "eurekaService": "Eureka服务",
                       "udfFunctionTitle": "UDF函数",
                       "udfFunctionManage": "UDF管理",
                       "functionManagement": "函数管理",
                       "dataSourceManage": "数据源管理",
                       "userResourceManagement": "用户资源管理",
                       "tenantTagManagement": "租户标签管理",
+                      "departmentTagManagement": "部门标签管理",
                       "ipListManagement": "白名单管理",
                       "acrossClusterRule": "跨集群规则管理",
                       "errorCode": "错误码管理",
@@ -191,6 +227,8 @@
                       "rmExternalResourceProvider": "扩展资源管理",
                       "udfManager": "用户管理",
                       "udfTree": "UDF分类",
+                      "pythonModule": "Python模块管理",
+                      "taskResourceManage": "任务物料管理",
                       "datasourceAccess": "数据源权限",
                       "datasourceEnv": "数据源环境",
                       "datasourceType": "数据源分类",
@@ -202,8 +240,7 @@
                       "EngineConnList": "引擎列表",
                       "opsTool": "运维工具",
                       "userConfig": "用户配置",
-                      "configManagement": "配置项管理",
-                      "statisticsDashboard": "统计看板"
+                      "configManagement": "配置项管理"
                   }
               }
           },
@@ -213,6 +250,7 @@
           "modalDeleteRecord": "确认是否删除该记录?",
           "modalDeleteTask": "确认是否停止当前选择任务?",
           "modalDeleteInstance": "确认是否停止当前选择实例?",
+          "modalunheathyInstance": "确认是否批量修改实例状态为unhealthy",
           "modalDeleteSuccess": "删除成功",
           "modalDeleteFail": "删除失败"
         },
@@ -232,6 +270,10 @@
                   "label": "应用",
                   "placeholder": "请输入应用搜索"
               },
+              "runType": {
+                  "label": "任务类型",
+                  "placeholder": "请输入runType"
+              },
               "engine": {
                   "label": "引擎"
               },
@@ -314,7 +356,9 @@
               "show": "显示",
               "advancedSetting": "高级设置",
               "dataDev": "数据开发",
-              "maxLimit": "(资源模板指定上限值为{limit})"
+              "maxLimit": "(资源模板指定上限值为{limit})",
+              "killEngine": "参数修改已生效，点击确定将停止空闲引擎，繁忙引擎在任务执行后停止",
+              "killEngineTitle": "是否停止空闲引擎"
           },
           "globalValiable": "全局变量",
           "rules": {
@@ -383,6 +427,7 @@
           },
           "tenantTagManagement": {
               "userName": "用户名",
+              "department": "部门",
               "appName": "应用名",
               "tenantTag": "租户标签",
               "search": "搜索",
@@ -397,6 +442,7 @@
               "inputTenant": "请输入租户标签",
               "inputDesc": "请输入业务来源",
               "inputCreateUser": "请输入创建者",
+              "selectDepartment": "请选择部门",
               "yourTagMapping": "您的标签映射",
               "notEmpty": "不能为空",
               "maxLen": "长度不能超过100",
@@ -452,10 +498,14 @@
               "rules": "规则",
               "startTime": "开始时间",
               "endTime": "结束时间",
-              "CPUThreshold": "CPU阈值(核)",
-              "MemoryThreshold": "内存阈值(G)",
-              "CPUPercentageThreshold": "CPU百分比阈值",
-              "MemoryPercentageThreshold": "内存百分比阈值",
+              "priorityCluster": "策略优先集群",
+              "targetCPUThreshold": "目标队列CPU阈值(Core)",
+              "targetMemoryThreshold": "目标队列内存阈值(G)",
+              "targetCPUPercentageThreshold": "目标队列CPU百分比阈值",
+              "targetMemoryPercentageThreshold": "目标队列内存百分比阈值",
+              "originCPUPercentageThreshold": "原队列CPU百分比阈值",
+              "originMemoryPercentageThreshold": "原队列内存百分比阈值",
+              "acrossClusterQueue": "跨集群队列",
               "view": "查看",
               "errorJson": "请输入格式正确且不为空的JSON",
               "deleteSuccess": "删除成功",
@@ -494,13 +544,28 @@
               "confirmDisable": "确认是否停用[{name}]该规则?",
               "enableSuccessfully": "启用成功",
               "disableSuccessfully": "停用成功",
-              "templateRequired": "是否必填"
+              "templateRequired": "是否必填",
+              "batchOperate": "批量操作",
+              "batchDelete": "批量删除",
+              "batchEnable": "批量启用",
+              "batchDisable": "批量停用",
+              "batchModify": "批量修改",
+              "adjustConf": "调整配置",
+              "confirmBatchModify": "是否确认批量修改规则",
+              "confirmBatchDelete": "是否确认批量删除规则",
+              "confirmBatchEnable": "是否确认批量启用规则",
+              "confirmBatchDisable": "是否确认批量停用规则",
+              "confirmModifyBtn": "确认修改",
+              "confirmDeleteBtn": "确认删除",
+              "confirmEnableBtn": "确认启用",
+              "confirmDisableBtn": "确认停用"
           },
           "basedataManagement": {
             "add": "新增",
             "addUDFAdmin": "新增UDF管理员",
             "remove": "删除",
             "edit": "编辑",
+            "tokenInfo": "Token信息",
             "searchLabel": "模糊搜索:",
             "searchPlaceholder": "请输入搜索内容",
             "search": "搜索",
@@ -661,21 +726,25 @@
           "update": "更新引擎插件",
           "updateFileOnly": "更新",
           "resourceVersion": "引擎物料bml版本",
+          "resourceAddress": "物料地址",
           "user": "所属人",
           "deleteCurrentbml": "删除",
           "versionList": "版本列表",
           "rollback": "回滚",
-          "action": "操作"
+          "action": "操作",
+          "globalConfig": "全局配置"
         },
         "codeQuery": {
           "executionCode": "执行代码",
           "dateRange": "时间范围",
           "engineType": "引擎类型",
           "placeholder": {
-              "executionCode": "请输入执行代码",
+              "executionCode": "请输入执行代码，不支持特殊字符如',`。可以使用%和_作通配符：%代表任意字符，_代表单字符",
               "dateRange": "时间范围",
               "status": "状态"
           },
+          "fullMatch": "全匹配搜索",
+          "keyword": "关键词搜索",
           "inputCode": "请输入执行代码",
           "id": "任务ID",
           "code": "代码",
@@ -693,7 +762,10 @@
           "configVKey": "配置项",
           "configValue": "配置值",
           "configValuePro": "请输入配置值",
-          "versionInputPro": "请输入引擎版本"
+          "versionInputPro": "请输入引擎版本",
+          "isForceVerify": "是否强校验",
+          "yes": "是",
+          "no": "否"
         }
     }
   }
diff --git a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
index 333fa486b43..c2f97d27127 100644
--- a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
@@ -18,7 +18,7 @@
 <template>
   <div :style="{height: '100%'}">
     <div v-show="!showviewlog" class="ecmEngine">
-      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" @stop="stopAll" :stopbtn="true" />
+      <Search :statusList="statusList" :ownerList="ownerList" :engineTypes="engineTypes" @search="search" @stop="stopAll" @batchUnhealth="batchUnhealth" :stopbtn="true" :healthbtn="true" />
       <Spin
         v-if="loading"
         size="large"
@@ -86,6 +86,15 @@
                 :key="item"/>
             </Select>
           </FormItem>
+          <FormItem :label="`${$t('message.linkis.healthInfo')}：`">
+            <Select v-model="formItem.nodeHealthy">
+              <Option
+                v-for="(item) in healthinfoList"
+                :label="item"
+                :value="item"
+                :key="item"/>
+            </Select>
+          </FormItem>
         </Form>
       </Modal>
     </div>
@@ -105,6 +114,7 @@ export default {
       showviewlog: false,
       loading: false,
       healthyStatusList: [],
+      healthinfoList: ['Healthy', 'UnHealthy'],
       ownerList: [],
       engineTypes: [],
       applicationName: '',
@@ -116,6 +126,7 @@ export default {
         labels: [],
         emStatus: '',
         applicationName: '',
+        nodeHealthy: ''
       },
       tagTitle: [],
       applicationList: {},
@@ -159,6 +170,12 @@ export default {
           minWidth: 100,
           className: 'table-project-column'
         },
+        {
+          title: this.$t('message.linkis.tableColumns.healthInfo'),
+          key: 'nodeHealthy',
+          minWidth: 100,
+          className: 'table-project-column'
+        },
         {
           title: this.$t('message.linkis.tableColumns.status'),
           key: 'nodeStatus',
@@ -258,6 +275,7 @@ export default {
                     })
                     obj.emStatus = params.row.nodeStatus;
                     obj.applicationName = params.row.applicationName;
+                    obj.nodeHealthy ='';
                     this.formItem = Object.assign(this.formItem, obj)
                   }
                 }
@@ -348,6 +366,35 @@ export default {
         }
       })
     },
+    batchUnhealth() {
+      if (!this.selection || !this.selection.length) {
+        this.$Message.warning(this.$t('message.linkis.noselection'));
+        return;
+      }
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.modal.modalTitle'),
+        content: this.$t('message.linkis.modal.modalunheathyInstance'),
+        onOk: () => {
+          let data = [];
+          this.selection.forEach(row => {
+            data.push({
+              applicationName: row.applicationName,
+              instance: row.instance,
+              engineType: row.engineType,
+            });
+          })
+          api.fetch(`/linkisManager/batchSetEngineToUnHealthy`, { instances: data }).then(() => {
+            this.initExpandList();
+            this.$Message.success({
+              background: true,
+              content: 'Modify Success！！'
+            });
+          }).catch((err) => {
+            window.console.err(err)
+          });
+        }
+      })
+    },
     selctionChange(selection) {
       this.selection = selection
     },
diff --git a/linkis-web/src/apps/linkis/module/ECM/index.scss b/linkis-web/src/apps/linkis/module/ECM/index.scss
index 73379036a1a..0a1b1c77440 100644
--- a/linkis-web/src/apps/linkis/module/ECM/index.scss
+++ b/linkis-web/src/apps/linkis/module/ECM/index.scss
@@ -33,7 +33,7 @@ td.table-name-column {
     cursor: pointer;
   }
 }
-/deep/.table-project-column {
+::v-deep .table-project-column {
   text-align: center;
   .ivu-table-cell {
     display: inline-block;
@@ -47,20 +47,20 @@ td.table-project-column {
   text-align: center;
   padding: 10px 0;
 }
-/deep/.addTagClass {
+::v-deep .addTagClass {
   position: relative;
   z-index: 99;
 }
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
-  /deep/ .ivu-tag {
+  ::v-deep .ivu-tag {
     max-width: 140px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  /deep/ .ivu-tooltip-inner {
+  ::v-deep .ivu-tooltip-inner {
     max-width: 100%;
   }
 }
diff --git a/linkis-web/src/apps/linkis/module/ECM/index.vue b/linkis-web/src/apps/linkis/module/ECM/index.vue
index e2bc61907a9..7b841498c94 100644
--- a/linkis-web/src/apps/linkis/module/ECM/index.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/index.vue
@@ -82,6 +82,9 @@
               :key="item"/>
           </Select>
         </FormItem>
+        <FormItem :label="`${$t('message.linkis.remark')}：`">
+          <Input v-model="formItem.description" :placeholder="$t('message.linkis.remarkPlaceholder')" />
+        </FormItem>
       </Form>
     </Modal>
     <Modal
@@ -123,6 +126,7 @@ export default {
         labels: [],
         emStatus: '',
         applicationName: '',
+        description: ''
       },
       tagTitle: [],
       addTagForm: { // form with new label(新增标签的form表单)
@@ -199,6 +203,13 @@ export default {
           className: 'table-project-column',
           minWidth: 150,
         },
+        {
+          title: this.$t('message.linkis.remark'), // remark(备注信息)
+          key: 'description',
+          minWidth: 150,
+          tooltip: true,
+          align: 'center',
+        },
         {
           title: this.$t('message.linkis.tableColumns.startTime'), // enable time(启用时间)
           key: 'startTime',
@@ -238,6 +249,7 @@ export default {
                     })
                     obj.emStatus = params.row.nodeHealthy;
                     obj.applicationName = params.row.applicationName;
+                    obj.description = params.row?.description || '';
                     this.formItem = Object.assign(this.formItem, obj)
                   }
                 }
diff --git a/linkis-web/src/apps/linkis/module/ECM/search.vue b/linkis-web/src/apps/linkis/module/ECM/search.vue
index 5408a31757b..0490ab33173 100644
--- a/linkis-web/src/apps/linkis/module/ECM/search.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/search.vue
@@ -57,6 +57,9 @@
       <Button v-if="stopbtn" type="error" @click="stop"  style="margin-left:20px">
         {{ $t('message.linkis.stop') }}
       </Button>
+      <Button v-if="healthbtn" type="error" @click="batchUnhealth"  style="margin-left:20px">
+        {{ $t('message.linkis.batchUnhealth') }}
+      </Button>
     </FormItem>
   </Form>
 
@@ -81,6 +84,9 @@ export default {
     },
     stopbtn: {
       type: Boolean
+    },
+    healthbtn: {
+      type: Boolean
     }
   },
   data() {
@@ -110,6 +116,9 @@ export default {
     },
     stop() {
       this.$emit("stop")
+    },
+    batchUnhealth() {
+      this.$emit('batchUnhealth')
     }
   },
 };
diff --git a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
index 9a799cd2353..d5b02fed686 100644
--- a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
@@ -290,17 +290,24 @@ export default {
           title: this.$t('message.linkis.EnginePluginManagement.resourceVersion'),
           key: 'resourceVersion',
           tooltip: true,
-          minWidth: 60,
+          minWidth: 100,
           align: 'center',
         },
         {
-          title: this.$t('message.linkis.EnginePluginManagement.user'),
-          key: 'user',
+          title: this.$t('message.linkis.EnginePluginManagement.resourceAddress'),
+          key: 'resourceAddress',
           tooltip: true,
-          minWidth: 60,
+          minWidth: 500,
           align: 'center',
         },
         // {
+        //   title: this.$t('message.linkis.EnginePluginManagement.user'),
+        //   key: 'user',
+        //   tooltip: true,
+        //   minWidth: 60,
+        //   align: 'center',
+        // },
+        // {
         //   title: this.$t('message.linkis.EnginePluginManagement.action'),
         //   key: 'action',
         //   tooltip: true,
@@ -470,6 +477,7 @@ export default {
         for (let index = 0; index < response.ResourceVersions.versions.length; index++) {
           let element = {};
           element.resourceVersion = response.ResourceVersions.versions[index].version;
+          element.resourceAddress = response.ResourceVersions.versions[index].resource;
           element.user=userName;
           th.currentVersionList.push(element);
         }
diff --git a/linkis-web/src/apps/linkis/module/acrossClusterRule/index.scss b/linkis-web/src/apps/linkis/module/acrossClusterRule/index.scss
index 97d93f1606c..9164fdaf543 100644
--- a/linkis-web/src/apps/linkis/module/acrossClusterRule/index.scss
+++ b/linkis-web/src/apps/linkis/module/acrossClusterRule/index.scss
@@ -38,7 +38,7 @@
     
   }
   .button {
-    width: 70px; 
+    width: 55px; 
     margin-right: 5px; 
     margin-left: 5px; 
     padding: 5px;
diff --git a/linkis-web/src/apps/linkis/module/acrossClusterRule/index.vue b/linkis-web/src/apps/linkis/module/acrossClusterRule/index.vue
index 89e35b8f8fd..ae8d860ddc5 100644
--- a/linkis-web/src/apps/linkis/module/acrossClusterRule/index.vue
+++ b/linkis-web/src/apps/linkis/module/acrossClusterRule/index.vue
@@ -22,48 +22,73 @@
       size="large"
       fix/>
     <Row class="search-bar">
-      <Col span="6" class="search-item">
+      
+      <Col span="5" class="search-item">
         <span :title="$t('message.linkis.ipListManagement.userName')" class="search-label">{{$t('message.linkis.ipListManagement.userName')}}</span>
         <Input
           v-model="queryData.username"
           class="input"
           :placeholder="$t('message.linkis.ipListManagement.inputUser')"
           @on-enter="search"
-          style="width: 290px"
+          style="width: 270px"
         ></Input>
       </Col>
-      <Col span="6" class="search-item">
+      <Col span="5" class="search-item">
         <span :title="$t('message.linkis.ipListManagement.appName')" class="search-label">{{$t('message.linkis.ipListManagement.appName')}}</span>
         <Input
           v-model="queryData.creator"
           class="input"
           :placeholder="$t('message.linkis.ipListManagement.inputApp')"
           @on-enter="search"
-          style="width: 290px"
+          style="width: 270px"
         ></Input>
       </Col>
-      <Col span="6" class="search-item">
+      <Col span="5" class="search-item">
         <span :title="$t('message.linkis.ipListManagement.cluster')" class="search-label">{{$t('message.linkis.ipListManagement.cluster')}}</span>
         <Input
           v-model="queryData.clusterName"
           class="input"
           :placeholder="$t('message.linkis.ipListManagement.inputCluster')"
           @on-enter="search"
-          style="width: 290px"
+          style="width: 270px"
         ></Input>
       </Col>
-      <Col span="6">
-        <Button type="primary" class="button" @click="search">{{
+      <Col span="5" class="search-item">
+        <span :title="$t('message.linkis.ipListManagement.isValid')" class="search-label">{{$t('message.linkis.ipListManagement.isValid')}}</span>
+        <Select v-model="queryData.isValid" filterable clearable style="width: calc(100% - 105px);">
+          <Option v-for="item in validOptions" :value="item.value" :key="item.value" :label="item.label"/>
+        </Select>
+      </Col>
+      <Col span="4">
+        <Button :disabled="isBatch" type="primary" class="button" @click="search">{{
           $t('message.linkis.ipListManagement.search')
         }}</Button>
-        <Button type="warning" class="button" @click="clearSearch">{{
+        <Button :disabled="isBatch" type="warning" class="button" @click="clearSearch">{{
           $t('message.linkis.ipListManagement.clear')
         }}</Button>
-        <Button type="success" class="button" @click="createRules">{{
+        <Button v-if="isLogAdmin && !isBatch" type="success" class="button" @click="createRules">{{
           $t('message.linkis.ipListManagement.create')
         }}</Button>
+        <Dropdown v-if="isLogAdmin" @on-click="batch">
+          <Button type="primary" class="button">
+            {{ $t('message.linkis.ipListManagement.batchOperate')}}
+          </Button>
+          <template #list>
+            <DropdownMenu>
+              <DropdownItem name="enable">{{ $t('message.linkis.ipListManagement.batchEnable')}}</DropdownItem>
+              <DropdownItem name="disable">{{ $t('message.linkis.ipListManagement.batchDisable')}}</DropdownItem>
+              <DropdownItem name="delete">{{ $t('message.linkis.ipListManagement.batchDelete')}}</DropdownItem>
+              <DropdownItem name="modify">{{ $t('message.linkis.ipListManagement.batchModify')}}</DropdownItem>
+            </DropdownMenu>
+          </template>
+        </Dropdown>
       </Col>
     </Row>
+    <div v-if="isBatch" class="second-action-bar">
+      <Button class="action-btn" v-if="batchMode === 'modify'" type="primary" @click="createRules">{{ $t('message.linkis.ipListManagement.adjustConf')}}</Button>
+      <Button class="action-btn" type="primary" :disabled="!confirmable" @click="batchConfirm">{{ confirmBtnText}}</Button>
+      <Button class="action-btn" type="default" @click="batchCancel">{{ $t('message.linkis.ipListManagement.Cancel')}}</Button>
+    </div>
     <Table
       border
       size="small"
@@ -71,8 +96,8 @@
       :columns="tableColumns"
       :data="datalist"
       :loading="tableLoading"
-      class="table-content data-source-table">
-
+      class="table-content data-source-table"
+      @on-selection-change="handleSelectionChange">
     </Table>
     <Page
       :page-size="page.pageSize"
@@ -96,7 +121,7 @@
           <FormItem :label="$t('message.linkis.ipListManagement.cluster')" prop="clusterName">
             <Input class="input" v-model="modalData.clusterName"></Input>
           </FormItem>
-          <FormItem :label="$t('message.linkis.ipListManagement.userName')" prop="username">
+          <FormItem v-if="!isBatch" :label="$t('message.linkis.ipListManagement.userName')" prop="username">
             <Input class="input" v-model="modalData.username"></Input>
           </FormItem>
           <FormItem :label="$t('message.linkis.ipListManagement.appName')" prop="creator">
@@ -108,17 +133,35 @@
           <FormItem :label="$t('message.linkis.ipListManagement.endTime')" prop="endTime">
             <Input class="input" v-model="modalData.endTime" placeholder="XX:XX"></Input>
           </FormItem>
-          <FormItem :label="$t('message.linkis.ipListManagement.CPUThreshold')" prop="CPUThreshold">
+          <FormItem :label="$t('message.linkis.ipListManagement.acrossClusterQueue')" prop="crossQueue">
+            <Input class="input" v-model="modalData.crossQueue"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.priorityCluster')" prop="priorityCluster">
+            <Input class="input" v-model="modalData.priorityCluster"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.targetCPUThreshold')" prop="targetCPUThreshold">
+            <Input class="input" v-model="modalData.targetCPUThreshold"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.targetMemoryThreshold')" prop="targetMemoryThreshold">
+            <Input class="input" v-model="modalData.targetMemoryThreshold"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.targetCPUPercentageThreshold')" prop="targetCPUPercentageThreshold">
+            <Input class="input" v-model="modalData.targetCPUPercentageThreshold"  placeholder="0~1"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.targetMemoryPercentageThreshold')" prop="targetMemoryPercentageThreshold">
+            <Input class="input" v-model="modalData.targetMemoryPercentageThreshold"  placeholder="0~1"></Input>
+          </FormItem>
+          <!-- <FormItem :label="$t('message.linkis.ipListManagement.CPUThreshold')" prop="CPUThreshold">
             <Input class="input" v-model="modalData.CPUThreshold"></Input>
           </FormItem>
           <FormItem :label="$t('message.linkis.ipListManagement.MemoryThreshold')" prop="MemoryThreshold">
             <Input class="input" v-model="modalData.MemoryThreshold"></Input>
+          </FormItem> -->
+          <FormItem :label="$t('message.linkis.ipListManagement.originCPUPercentageThreshold')" prop="originCPUPercentageThreshold">
+            <Input class="input" v-model="modalData.originCPUPercentageThreshold"  placeholder="0~1"></Input>
           </FormItem>
-          <FormItem :label="$t('message.linkis.ipListManagement.CPUPercentageThreshold')" prop="CPUPercentageThreshold">
-            <Input class="input" v-model="modalData.CPUPercentageThreshold"  placeholder="0~1"></Input>
-          </FormItem>
-          <FormItem :label="$t('message.linkis.ipListManagement.MemoryPercentageThreshold')" prop="MemoryPercentageThreshold">
-            <Input class="input" v-model="modalData.MemoryPercentageThreshold"  placeholder="0~1"></Input>
+          <FormItem :label="$t('message.linkis.ipListManagement.originMemoryPercentageThreshold')" prop="originMemoryPercentageThreshold">
+            <Input class="input" v-model="modalData.originMemoryPercentageThreshold"  placeholder="0~1"></Input>
           </FormItem>
           <FormItem :label="$t('message.linkis.ipListManagement.isValid')" prop="isValid">
             <RadioGroup v-model="modalData.isValid">
@@ -151,17 +194,25 @@ export default {
   name: 'acrossClusterRule',
   data() {
     return {
+      isLogAdmin: false,
       modalTitle: '',
       loading: false,
       queryData: {
         username: '',
-        creator: ''
+        creator: '',
+        isValid: '',
       },
       confirmQuery: {
         username: '',
         creator: '',
+        isValid: '',
       },
       tableColumns: [
+        // {
+        //   type: 'selection', 
+        //   width: 60,
+        //   align: 'center'
+        // },
         {
           title: "ID",
           key: 'id',
@@ -179,14 +230,14 @@ export default {
         {
           title: this.$t('message.linkis.ipListManagement.userCreator'),
           key: 'userCreator',
-          width: 550,
+          width: 450,
           tooltip: true,
           align: 'center',
         },
         {
           title: this.$t('message.linkis.ipListManagement.isValid'),
           key: 'isValid',
-          width: 200,
+          width: 150,
           tooltip: true,
           align: 'center',
           render: (h, params) => {
@@ -195,6 +246,18 @@ export default {
             ]);
           }
         },
+        {
+          title: this.$t('message.linkis.ipListManagement.priorityCluster'),
+          key: 'parsedRules',
+          width: 150,
+          tooltip: true,
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('span', params.row?.parsedRules?.priorityClusterRule?.priorityCluster || '--')
+            ]);
+          }
+        },
         {
           title: this.$t('message.linkis.ipListManagement.rules'),
           key: '',
@@ -223,6 +286,21 @@ export default {
           width: 200,
           align: 'center',
           render: (h, params) => {
+            if(!this.isLogAdmin) {
+              return h('div', [
+                h('Button', {
+                  props: {
+                    type: params.row.isValid === 'N' ? 'success' : 'warning',
+                    size: 'small'
+                  },
+                  on: {
+                    click: () => {
+                      this.enable(params.row)
+                    }
+                  }
+                }, params.row.isValid === 'N' ? this.$t('message.linkis.ipListManagement.enable') : this.$t('message.linkis.ipListManagement.disable')),
+              ]);
+            }
             return h('div', [
               h('Button', {
                 props: {
@@ -268,16 +346,22 @@ export default {
         }
       ],
       datalist: [],
+      isBatch: false,
+      batchMode: '',
       tableLoading: false,
       showCreateModal: false,
       modalData: {
         username: '',
         creator: '',
         clusterName: '',
-        CPUThreshold: '',
-        CPUPercentageThreshold: '',
-        MemoryThreshold: '',
-        MemoryPercentageThreshold: '',
+        crossQueue: '',
+        priorityCluster: '',
+        targetCPUThreshold: '',
+        targetMemoryThreshold: '',
+        targetCPUPercentageThreshold: '',
+        targetMemoryPercentageThreshold: '',
+        originCPUPercentageThreshold: '',
+        originMemoryPercentageThreshold: '',
         startTime: '',
         endTime: '',
         isValid: 'Y'
@@ -285,19 +369,22 @@ export default {
       modalDataRule: {
         username: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
-          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'}
+          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'},
+          {type: 'string', max: 20, message: this.$t('message.linkis.ipListManagement.customLen', {length: '20'})}
         ],
         creator: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
-          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'}
-        ],
-        parsedRules: [
-          {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur', type: 'object'},
-          {validator: this.ruleJsonValidator, trigger: 'blur'}
+          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'},
+          {type: 'string', max: 20, message: this.$t('message.linkis.ipListManagement.customLen', {length: '20'})}
         ],
+        // parsedRules: [
+        //   {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur', type: 'object'},
+        //   {validator: this.ruleJsonValidator, trigger: 'blur'}
+        // ],
         clusterName: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
-          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'}
+          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'},
+          {type: 'string', max: 20, message: this.$t('message.linkis.ipListManagement.customLen', {length: '20'})}
         ],
         startTime: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
@@ -307,24 +394,44 @@ export default {
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
           {pattern: /^([01]\d|2[0-3]):[0-5]\d$/, message: this.$t('message.linkis.ipListManagement.timeError'), type: 'string'}
         ],
-        MemoryThreshold: [
+        targetMemoryThreshold: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
           {validator: this.thresholdValidator, trigger: 'blur'},
         ],
-        CPUThreshold: [
+        targetCPUThreshold: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
           {validator: this.thresholdValidator, trigger: 'blur'},
         ],
-        MemoryPercentageThreshold: [
+        targetMemoryPercentageThreshold: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
           {validator: this.percentageThresholdValidator, trigger: 'blur'},
           {type: 'string', max: 4, message: this.$t('message.linkis.ipListManagement.customLen', {length: '4'})}
         ],
-        CPUPercentageThreshold: [
+        targetCPUPercentageThreshold: [
           {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
           {validator: this.percentageThresholdValidator, trigger: 'blur'},
           {type: 'string', max: 4, message: this.$t('message.linkis.ipListManagement.customLen', {length: '4'})}
         ],
+        originMemoryPercentageThreshold: [
+          {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
+          {validator: this.percentageThresholdValidator, trigger: 'blur'},
+          {type: 'string', max: 4, message: this.$t('message.linkis.ipListManagement.customLen', {length: '4'})}
+        ],
+        originCPUPercentageThreshold: [
+          {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
+          {validator: this.percentageThresholdValidator, trigger: 'blur'},
+          {type: 'string', max: 4, message: this.$t('message.linkis.ipListManagement.customLen', {length: '4'})}
+        ],
+        crossQueue: [
+          {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
+          // {validator: this.percentageThresholdValidator, trigger: 'blur'},
+          {type: 'string', max: 50, message: this.$t('message.linkis.ipListManagement.customLen', {length: '50'})}
+        ],
+        priorityCluster: [
+          {required: true, message: this.$t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'},
+          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.ipListManagement.contentError1'), type: 'string'},
+          {type: 'string', max: 20, message: this.$t('message.linkis.ipListManagement.customLen', {length: '20'})}
+        ],
       },
       // tagIsExist: true,
       mode: 'create',
@@ -344,11 +451,46 @@ export default {
       },
       showViewModal: false,
       errorJson: false,
+      batchList: [],
+      completeModifyInfo: false,
+      validOptions: [{label: this.$t('message.linkis.yes'), value: 'Y'}, {label: this.$t('message.linkis.no'), value: 'N'}],
     }
   },
   computed: {
-    mapping () {
+    mapping() {
       return (this.modalData.username || 'username') + '-' + (this.modalData.creator || 'creator') + '  -->  ' + (this.modalData.ipList || 'IPList')
+    },
+    confirmable() {
+      const pageCount = Math.ceil(this.page.totalPage / this.page.pageSize)
+      let hasItem = false;
+      for (let i = 0;i < pageCount; i++) {
+        if (this.batchList[i+1]?.length > 0) {
+          hasItem = true
+        }
+      }
+      return hasItem && (this.batchMode === 'modify' ? this.completeModifyInfo : true)
+    },
+    confirmBtnText() {
+      switch (this.batchMode) {
+        case 'enable':
+          return this.$t('message.linkis.ipListManagement.confirmEnableBtn')
+        case 'disable':
+          return this.$t('message.linkis.ipListManagement.confirmDisableBtn')
+        case 'delete':
+          return this.$t('message.linkis.ipListManagement.confirmDeleteBtn')
+        case 'modify':
+          return this.$t('message.linkis.ipListManagement.confirmModifyBtn')
+        default:
+          return '';
+      }
+    }
+  },
+  watch: {
+    modalData: {
+      handler() {
+        this.completeModifyInfo = false;
+      },
+      deep: true,
     }
   },
   methods: {
@@ -369,6 +511,9 @@ export default {
         this.datalist = res.acrossClusterRuleList.map((item) => {
           item.userCreator = item.username + "-" + item.creator;
           item.parsedRules = JSON.parse(item.rules)
+          if(!this.batchList[this.page.pageNow]) this.$set(this.batchList, this.page.pageNow, []);
+          // iview table cannot cache or bind selection
+          item._checked = this.batchList[this.page.pageNow].includes(item.id)
           // item.createTime = new Date(item.createTime).toLocaleString();
           return item;
         })
@@ -377,6 +522,7 @@ export default {
         this.tableLoading = false;
       } catch(err) {
         this.tableLoading = false;
+        window.console.warn(err);
       }
 
     },
@@ -390,6 +536,7 @@ export default {
         username: '',
         creator: '',
         clusterName: '',
+        isValid: '',
       };
       this.confirmQuery = {
         username: '',
@@ -402,24 +549,197 @@ export default {
     async createRules () {
       this.showCreateModal = true;
       this.mode = 'create';
-      this.modalTitle = this.$t('message.linkis.ipListManagement.createRules')
+      this.modalTitle = this.isBatch ? this.$t('message.linkis.ipListManagement.batchModify') : this.$t('message.linkis.ipListManagement.createRules');
+      if(this.isBatch) return;
       this.modalData.username = this.userName;
     },
+    batch(mode) {
+      this.batchMode = mode;
+      if(this.isBatch) return;
+      this.isBatch = true;
+      this.tableColumns.unshift({
+        type: 'selection', 
+        width: 200,
+        align: 'center',
+        key: 'id'
+      })
+      this.tableColumns.pop()
+      
+    },
+    async batchConfirm() {
+      const ids = [];
+      const pageCount = Math.ceil(this.page.totalPage / this.page.pageSize)
+      for (let i = 0;i < pageCount; i++) {
+        if(this.batchList[i+1]) {
+          ids.push(...this.batchList[i+1])
+        }
+      }
+      let target;
+      if(this.batchMode === 'modify') {
+        target = '/configuration/acrossClusterRule/updateByBatch';
+        this.$Modal.confirm({
+          title: this.$t('message.linkis.ipListManagement.batchModify'),
+          content: this.$t('message.linkis.ipListManagement.confirmBatchModify'),
+          onOk: async () => {
+            try {
+              const body = cloneDeep(this.modalData);
+              delete body.username;
+              body.ids = ids;
+              await api.fetch(target, body, "put");
+              this.batchCancel()
+              await this.getTableData();
+            } catch (err) {
+              window.console.warn(err)
+            }
+            
+          }
+        })
+      } else if(this.batchMode === 'delete') {
+        target = '/configuration/acrossClusterRule/deleteByBatch';
+        this.$Modal.confirm({
+          title: this.$t('message.linkis.ipListManagement.batchDelete'),
+          content: this.$t('message.linkis.ipListManagement.confirmBatchDelete'),
+          onOk: async () => {
+            try {
+              await api.fetch(target, { ids }, "put");
+              this.batchCancel();
+              this.page.pageNow = 1;
+              await this.getTableData();
+            } catch (err) {
+              window.console.warn(err)
+            }
+            
+          }
+        })
+      } else {
+        let content;
+        let title;
+        const body = { ids };
+        if(this.batchMode === 'enable') {
+          content = this.$t('message.linkis.ipListManagement.batchEnable');
+          title = this.$t('message.linkis.ipListManagement.batchEnable');
+          body.isValid = 'Y';
+        } else {
+          content = this.$t('message.linkis.ipListManagement.confirmBatchDisable');
+          title = this.$t('message.linkis.ipListManagement.batchDisable');
+          body.isValid = 'N';
+        }
+        target = '/configuration/acrossClusterRule/isValidByBatch';
+        this.$Modal.confirm({
+          title,
+          content,
+          onOk: async () => {
+            try {
+              await api.fetch(target, body, "put");
+              this.batchCancel();
+              await this.getTableData();
+            } catch (err) {
+              window.console.warn(err)
+            }
+          }
+        })
+      }
+    },
+    batchCancel() {
+      this.isBatch = false;
+      this.tableColumns.shift();
+      this.tableColumns.push({
+        title: this.$t('message.linkis.ipListManagement.action'),
+        key: 'action',
+        width: 200,
+        align: 'center',
+        render: (h, params) => {
+          if(!this.isLogAdmin) {
+            return h('div', [
+              h('Button', {
+                props: {
+                  type: params.row.isValid === 'N' ? 'success' : 'warning',
+                  size: 'small'
+                },
+                on: {
+                  click: () => {
+                    this.enable(params.row)
+                  }
+                }
+              }, params.row.isValid === 'N' ? this.$t('message.linkis.ipListManagement.enable') : this.$t('message.linkis.ipListManagement.disable')),
+            ]);
+          }
+          return h('div', [
+            h('Button', {
+              props: {
+                type: 'primary',
+                size: 'small'
+              },
+              style: {
+                marginRight: '5px'
+              },
+              on: {
+                click: () => {
+                  this.edit(params.row)
+                }
+              }
+            }, this.$t('message.linkis.ipListManagement.edit')),
+            h('Button', {
+              props: {
+                type: 'error',
+                size: 'small'
+              },
+              style: {
+                marginRight: '5px'
+              },
+              on: {
+                click: () => {
+                  this.delete(params.row)
+                }
+              }
+            }, this.$t('message.linkis.ipListManagement.delete')),
+            h('Button', {
+              props: {
+                type: params.row.isValid === 'N' ? 'success' : 'warning',
+                size: 'small'
+              },
+              on: {
+                click: () => {
+                  this.enable(params.row)
+                }
+              }
+            }, params.row.isValid === 'N' ? this.$t('message.linkis.ipListManagement.enable') : this.$t('message.linkis.ipListManagement.disable')),
+          ]);
+        }
+      })
+      this.batchMode = '';
+      this.batchList = [];
+      this.datalist = this.datalist.map((item) => {
+        delete item._checked;
+        return item;
+      })
+      this.cancel();
+    },
+    handleSelectionChange(selection) {
+      this.$set(this.batchList, this.page.pageNow, selection.map(item => item.id));
+    },
     cancel() {
       this.showCreateModal = false;
-      this.modalData = {
-        username: '',
-        creator: '',
-        clusterName: '',
-        CPUThreshold: '',
-        CPUPercentageThreshold: '',
-        MemoryThreshold: '',
-        MemoryPercentageThreshold: '',
-        startTime: '',
-        endTime: '',
-        isValid: 'Y'
+      if(!this.isBatch) {
+        this.modalData = {
+          username: '',
+          creator: '',
+          clusterName: '',
+          crossQueue: '',
+          priorityCluster: '',
+          targetCPUThreshold: '',
+          targetMemoryThreshold: '',
+          targetCPUPercentageThreshold: '',
+          targetMemoryPercentageThreshold: '',
+          originCPUPercentageThreshold: '',
+          originMemoryPercentageThreshold: '',
+          startTime: '',
+          endTime: '',
+          isValid: 'Y'
+        }
+        this.$refs.createRuleForm.resetFields();
       }
-      this.$refs.createRuleForm.resetFields();
+      
     },
     addRules() {
       if(this.isRequesting) return;
@@ -427,6 +747,11 @@ export default {
       const target = this.mode === 'edit' ? '/configuration/acrossClusterRule/update' : '/configuration/acrossClusterRule/add';
       this.$refs.createRuleForm.validate(async (valid) => {
         if(valid) {
+          if(this.isBatch) {
+            this.completeModifyInfo = true;
+            this.showCreateModal = false;
+            return;
+          }
           this.clearSearch();
           try {
             if(this.mode !== 'edit') {
@@ -455,12 +780,15 @@ export default {
     },
     edit(data) {
       const {
-        id, username, creator, clusterName, parsedRules, isValid
+        id, username, creator, clusterName, parsedRules, isValid,
       } = data
-      const { CPUPercentageThreshold, MemoryPercentageThreshold, MemoryThreshold, CPUThreshold } = parsedRules?.thresholdRule || {};
+      const { targetCPUPercentageThreshold, targetMemoryPercentageThreshold, targetMemoryThreshold, targetCPUThreshold } = parsedRules?.targetClusterRule || {};
+      const { originCPUPercentageThreshold, originMemoryPercentageThreshold } = parsedRules?.originClusterRule || {};
+      const { crossQueue } = parsedRules?.queueRule || {};
+      const { priorityCluster } = parsedRules?.priorityClusterRule || {};
       const { startTime, endTime } = parsedRules?.timeRule || {}
       this.modalData = {
-        id, username, creator, clusterName, CPUPercentageThreshold, MemoryPercentageThreshold, MemoryThreshold, CPUThreshold, startTime, endTime, isValid
+        id, username, creator, clusterName, crossQueue, targetCPUPercentageThreshold, targetMemoryPercentageThreshold, targetMemoryThreshold, targetCPUThreshold, originCPUPercentageThreshold, originMemoryPercentageThreshold, startTime, endTime, isValid, priorityCluster
       };
       this.showCreateModal = true;
       this.mode = 'edit';
@@ -509,8 +837,8 @@ export default {
     },
     async confirmDelete(data) {
       try {
-        const { username, creator } = data
-        await api.fetch('/configuration/acrossClusterRule/delete', { username, creator }, 'delete');
+        const { id } = data
+        await api.fetch('/configuration/acrossClusterRule/delete', { id }, 'delete');
         this.$Message.success(this.$t('message.linkis.ipListManagement.deleteSuccess'));
       } catch(err) {
         return;
@@ -537,8 +865,8 @@ export default {
       await this.getTableData();
     },
     async search() {
-      const { username, creator, clusterName } = this.queryData;
-      this.confirmQuery = { username, creator, clusterName };
+      const { username, creator, clusterName, isValid } = this.queryData;
+      this.confirmQuery = { username, creator, clusterName, isValid };
       this.page.pageNow = 1;
       await this.getTableData()
     },
@@ -550,7 +878,8 @@ export default {
     }
   },
   created() {
-    this.userName = storage.get('userName') || storage.get('baseInfo', 'local').username || '';
+    this.isLogAdmin = storage.get('isLogAdmin') || '';
+    this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
     this.init();
   }
 
@@ -583,4 +912,11 @@ export default {
     }
   }
 }
+.second-action-bar {
+  margin-top: 10px;
+  margin-bottom: -15px;
+  .action-btn {
+    margin-right: 5px;
+  }
+}
 </style>
diff --git a/linkis-web/src/apps/linkis/module/codeQuery/codeDetail/index.vue b/linkis-web/src/apps/linkis/module/codeQuery/codeDetail/index.vue
index 25a49966890..569062ae338 100644
--- a/linkis-web/src/apps/linkis/module/codeQuery/codeDetail/index.vue
+++ b/linkis-web/src/apps/linkis/module/codeQuery/codeDetail/index.vue
@@ -31,7 +31,7 @@
   </div>
 </template>
 <script>
-import api from '@/common/service/api'
+// import api from '@/common/service/api'
 import { filter, forEach } from 'lodash'
 export default {
   name: 'codeDetail',
@@ -42,9 +42,10 @@ export default {
     }
   },
   async mounted() {
-    const id = this.$route.query.id
-    const res = await api.fetch(`/jobhistory/es/task/${id}`, 'get');
-    this.code = res.task.executionCode
+    this.code = localStorage.getItem('queryCodeResult')
+    localStorage.removeItem('queryCodeResult')
+    // const res = await api.fetch(`/jobhistory/es/task/${id}`, 'get');
+    // this.code = res.task.executionCode
   },
   computed: {
     curCode: {
diff --git a/linkis-web/src/apps/linkis/module/codeQuery/index.scss b/linkis-web/src/apps/linkis/module/codeQuery/index.scss
index 49d9afef4ae..7e801cef45a 100644
--- a/linkis-web/src/apps/linkis/module/codeQuery/index.scss
+++ b/linkis-web/src/apps/linkis/module/codeQuery/index.scss
@@ -22,7 +22,7 @@
         height: 610px;
     }
     .datepicker {
-        /deep/.ivu-input-with-suffix {
+        ::v-deep .ivu-input-with-suffix {
             padding-right: 0px;
         }
     }
diff --git a/linkis-web/src/apps/linkis/module/codeQuery/index.vue b/linkis-web/src/apps/linkis/module/codeQuery/index.vue
index 1abe31d36c3..0aae3715bea 100644
--- a/linkis-web/src/apps/linkis/module/codeQuery/index.vue
+++ b/linkis-web/src/apps/linkis/module/codeQuery/index.vue
@@ -75,9 +75,14 @@
       <FormItem>
         <Button
           type="primary"
-          @click="confirmSearch"
+          @click="keywordSearch"
           style="margin-right: 10px;"
-        >{{ $t('message.linkis.search') }}</Button>
+        >{{ $t('message.linkis.codeQuery.search') }}</Button>
+        <!-- <Button
+          type="primary"
+          @click="fullSearch"
+          style="margin-right: 10px;"
+        >{{ $t('message.linkis.codeQuery.fullMatch') }}</Button> -->
         <Button
           type="warning"
           @click="reset"
@@ -135,6 +140,7 @@ export default {
       tableLoading: false,
       isLogAdmin: false,
       isAdminModel: false,
+      fullMatch: true,
       shortcutOpt: {
         shortcuts: [
           {
@@ -225,7 +231,7 @@ export default {
                 },
                 on: {
                   click: () => {
-                    this.check(params.row.id)
+                    this.check(params.row.executionCode)
                   }
                 }
               }, this.$t('message.linkis.codeQuery.check'))
@@ -244,17 +250,17 @@ export default {
           width: 990,
           ellipsis: true,
           align: 'center',
-          render: (h, params) => {
-            return h('span', {
-              props: {
-                type: 'text',
-                size: 'small'
-              },
-              domProps: {
-                innerHTML: params.row.executionCode
-              }
-            })
-          }
+          // render: (h, params) => {
+          //   return h('span', {
+          //     props: {
+          //       type: 'text',
+          //       size: 'small'
+          //     },
+          //     domProps: {
+          //       innerHTML: params.row.executionCode
+          //     }
+          //   })
+          // }
         },
         {
           title: this.$t('message.linkis.codeQuery.status'),
@@ -295,6 +301,15 @@ export default {
       this.page.pageNow = 1
       this.search()
     },
+    
+    keywordSearch() {
+      this.fullMatch = false;
+      this.confirmSearch();
+    },
+    fullSearch() {
+      this.fullMatch = true;
+      this.confirmSearch();
+    },
     switchAdmin() {
       if (!this.tableLoading) {
         this.isAdminModel = !this.isAdminModel
@@ -304,14 +319,18 @@ export default {
       }
     },
     async reset() {
+      const end = new Date(new Date().toLocaleDateString())
+      const start = new Date(new Date().toLocaleDateString())
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 2)
+      end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
       this.searchBar = {
         executionCode: "",
-        shortcut: [],
+        shortcut: [start, end],
         status: "",
       };
       this.searchParams = {
         executionCode: "",
-        shortcut: [],
+        shortcut: [start, end],
         status: "",
       };
       this.beforeSearch = true;
@@ -321,6 +340,19 @@ export default {
       this.page.pageNow = val;
       await this.search();
     },
+    convertTableData(data) {
+      const tableFormatData = [];
+      for(let i = 0; i< data.length;i++) {
+        const item = data[i];
+        const tableItem = {
+          id: item[0],
+          executionCode: item[1],
+          status: item[2],
+        }
+        tableFormatData.push(tableItem);
+      }
+      return tableFormatData;
+    },
     async search() {
       try {
         this.tableLoading = true
@@ -341,7 +373,8 @@ export default {
           pageSize,
           status,
           engineType,
-          creator
+          creator,
+          fullMatch: this.fullMatch
         }
         if (!shortcut[0]) {
           delete params.startDate
@@ -358,17 +391,15 @@ export default {
         }
 
         const res = await api.fetch(`/jobhistory/es/search`, params, 'get');
-        this.tableData = res.tasks.content
+        this.tableData = this.convertTableData(res.data.fileContent) 
         this.page.totalPage = res.tasks.totalElements
         this.tableLoading = false
       } catch (err) {
         this.tableLoading = false
       }
     },
-    check(id) {
-      const query = {
-        id
-      }
+    check(code) {
+      localStorage.setItem('queryCodeResult', code);
       // set storage
       sessionStorage.setItem('code-search', JSON.stringify(this.searchParams));
       sessionStorage.setItem('code-use-cache', true);
@@ -377,7 +408,6 @@ export default {
 
       this.$router.push({
         path: '/console/codeDetail',
-        query
       })
     },
     colorGetter(status) {
@@ -411,8 +441,21 @@ export default {
     }
     next();
   },
+  beforeRouteLeave(to, from, next) {
+    if(to.name !== 'codeDetail') {
+      this.reset();
+      this.tableData = [];
+    }
+    next();
+  },
   mounted() {
-
+    
+    const end = new Date(new Date().toLocaleDateString())
+    const start = new Date(new Date().toLocaleDateString())
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 2)
+    end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
+    this.searchBar.shortcut = [start, end];
+    this.searchParams.shortcut = [start, end];
     if(sessionStorage.getItem('code-use-cache') === 'true') {
       this.searchParams = JSON.parse(sessionStorage.getItem('code-search'));
       this.searchBar = JSON.parse(sessionStorage.getItem('code-search'));
@@ -428,7 +471,7 @@ export default {
 </script>
 <style lang="scss" src="./index.scss" scoped></style>
 <style lang="scss" scoped>
-/deep/ .ivu-btn {
+::v-deep .ivu-btn {
   &:hover {
     border-color: transparent;
   }
diff --git a/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue b/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
index c19af012d37..14f749c6ab8 100644
--- a/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasource/datasourceForm/index.vue
@@ -22,6 +22,7 @@
       v-model="fApi"
       :option="options"
       :value.sync="formData"
+      @change="handleFormChange"
     />
   </div>
 </template>
@@ -160,6 +161,7 @@ export default {
       options: {
         submitBtn: false,
       },
+      isEncrypt: '',
       rule: [
         {
           type: 'input',
@@ -219,11 +221,17 @@ export default {
     },
   },
   methods: {
+    handleFormChange(field, value, rule, api, setFlag) {
+      if(field === 'password' && !setFlag) {
+        this.isEncrypt = '';
+      }
+    },
     getDataSource(newV) {
       if (this.data.id) {
         getDataSourceByIdAndVersion(newV.id, newV.versionId || 0).then(
           (result) => {
             const mConnect = result.info.connectParams
+            this.isEncrypt = result.info.connectParams?.isEncrypt || '';
             this.sourceConnectData = mConnect
             delete result.info.connectParams
             this.dataSrc = { ...result.info, ...mConnect }
diff --git a/linkis-web/src/apps/linkis/module/datasource/index.vue b/linkis-web/src/apps/linkis/module/datasource/index.vue
index 1ad41841bc5..82d6fd524a9 100644
--- a/linkis-web/src/apps/linkis/module/datasource/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasource/index.vue
@@ -588,7 +588,9 @@ export default {
         realFormData.connectParams = formData
         realFormData.createSystem = 'Linkis'
         realFormData.dataSourceTypeId = this.currentSourceData.dataSourceTypeId
-
+        if(this.$refs.datasourceForm.isEncrypt) {
+          realFormData.connectParams.isEncrypt = this.$refs.datasourceForm.isEncrypt;
+        }
         let postDataSource = createDataSource
         let commentMsg = this.$t('message.linkis.datasource.initVersion')
         if (!this.currentSourceData.id) {
@@ -694,8 +696,12 @@ export default {
             realFormData[key] = formData[key]
             delete formData[key]
           })
-
           realFormData.connectParams = formData
+          // console.log(this.$refs.datasourceForm.isEncrypt);
+          if(this.$refs.datasourceForm.isEncrypt) {
+            realFormData.connectParams.isEncrypt = this.$refs.datasourceForm.isEncrypt;
+          }
+          
           realFormData.createSystem = 'Linkis'
           realFormData.dataSourceTypeId =
             this.currentSourceData.dataSourceTypeId
diff --git a/linkis-web/src/apps/linkis/module/departmentTagManagement/index.js b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.js
new file mode 100644
index 00000000000..32620a78431
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+
+export default {
+  name: 'tenantTagManagement',
+  events: [],
+  component: () => import('./index.vue'),
+};
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/departmentTagManagement/index.scss b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.scss
new file mode 100644
index 00000000000..29be39de74f
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.scss
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+@import '@/common/style/variables.scss';
+.search-bar {
+  .search-item {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-size: $font-size-base;
+    .lable {
+      flex-basis: 120px;
+      text-align: center;
+    }
+  }
+  .search {
+    margin-left: 25px;
+  }
+  .ivu-input-wrapper {
+    width: calc(100% - 105px);
+  }
+}
+.table-content {
+    margin-top: 25px;
+    height: 687px;
+}
+.form {
+    padding: 40px 50px;
+}
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/departmentTagManagement/index.vue b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.vue
new file mode 100644
index 00000000000..f74ce96b682
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/departmentTagManagement/index.vue
@@ -0,0 +1,511 @@
+<!--
+~ Licensed to the Apache Software Foundation (ASF) under one or more
+~ contributor license agreements.  See the NOTICE file distributed with
+~ this work for additional information regarding copyright ownership.
+~ The ASF licenses this file to You under the Apache License, Version 2.0
+~ (the "License"); you may not use this file except in compliance with
+~ the License.  You may obtain a copy of the License at
+~
+~   http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<template>
+  <div class="tenantManagement">
+    <Spin
+      v-if="loading"
+      size="large"
+      fix/>
+    <Row class="search-bar">
+      <Col span="6" class="search-item">
+        <span :style="{minWidth: '40px', textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden', marginRight: '5px', fontSize: '14px', lineHeight: '32px'}" :title="$t('message.linkis.tenantTagManagement.department')">{{$t('message.linkis.tenantTagManagement.department')}}</span>
+        <Select
+          v-model="queryData.department"
+          style="width: calc(100% - 66px);"
+          class="input"
+          :placeholder="$t('message.linkis.tenantTagManagement.selectDepartment')"
+          filterable
+          clearable
+        >
+          <Option v-for="item in departments" :value="item.label" :key="item.label" :label="item.label"/>
+        </Select>
+      </Col>
+      <Col span="6" class="search-item">
+        <span :title="$t('message.linkis.tenantTagManagement.appName')" :style="{minWidth: '40px', textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden', marginRight: '5px', fontSize: '14px', lineHeight: '32px'}">{{$t('message.linkis.tenantTagManagement.appName')}}</span>
+        <Input
+          v-model="queryData.creator"
+          class="input"
+          :placeholder="$t('message.linkis.tenantTagManagement.inputApp')"
+          @on-enter="search"
+        ></Input>
+      </Col>
+      <Col span="6" class="search-item">
+        <span :style="{minWidth: '40px', textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden', marginRight: '5px', fontSize: '14px', lineHeight: '32px'}">{{$t('message.linkis.tenantTagManagement.tenantTag')}}</span>
+        <Input
+          v-model="queryData.tenantValue"
+          class="input"
+          :placeholder="$t('message.linkis.tenantTagManagement.inputTenant')"
+          @on-enter="search"
+        ></Input>
+      </Col>
+      <Col span="6">
+        <Button type="primary" class="button" :style="{width: '70px', marginRight: '5px', marginLeft: '5px', padding: '5px'}" @click="search">{{
+          $t('message.linkis.tenantTagManagement.search')
+        }}</Button>
+        <Button type="warning" class="button" :style="{width: '70px', marginRight: '5px', marginLeft: '5px', padding: '5px'}" @click="clearSearch">{{
+          $t('message.linkis.tenantTagManagement.clear')
+        }}</Button>
+        <Button type="success" class="button" :style="{width: '70px', marginRight: '5px', marginLeft: '5px', padding: '5px'}" @click="createTenant">{{
+          $t('message.linkis.tenantTagManagement.create')
+        }}</Button>
+      </Col>
+    </Row>
+    <Table
+      border
+      size="small"
+      align="center"
+      :columns="tableColumns"
+      :data="datalist"
+      :loading="tableLoading"
+      class="table-content data-source-table">
+
+    </Table>
+    <Page
+      :page-size="page.pageSize"
+      :current="page.pageNow"
+      :total="page.totalPage"
+      @on-change="changePage"
+      size="small"
+      show-elevator
+      show-total
+      :prev-text="$t('message.linkis.previousPage')" :next-text="$t('message.linkis.nextPage')"
+      style="position: absoulute; bottom: 10px; overflow: hidden; text-align: center;"
+    ></Page>
+    <Modal
+      v-model="showCreateModal"
+      class="modal"
+      @on-cancel="cancel">
+      <div class="form">
+        <Form ref="createTenantForm" :model="modalData" label-position="left" :label-width="85" :rules="modalDataRule">
+          <FormItem :label="$t('message.linkis.tenantTagManagement.department')" prop="department">
+            <Select
+              v-model="modalData.department"
+              style="width: 319px"
+              class="input"
+              :placeholder="$t('message.linkis.tenantTagManagement.selectDepartment')"
+              @on-change="handleChange"
+              filterable
+              clearable
+            >
+              <Option v-for="item in departments" :value="item.label" :key="item.label" :label="item.label"/>
+            </Select>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.tenantTagManagement.appName')" prop="creator">
+            <Input class="input" v-model="modalData.creator" style="width: 319px"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.tenantTagManagement.tenantTag')" prop="tenantValue">
+            <Input class="input" v-model="modalData.tenantValue" style="width: 319px"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.tenantTagManagement.createUser')" prop="createBy">
+            <Input class="input" v-model="modalData.createBy" style="width: 319px"></Input>
+          </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.isValid')" prop="isValid">
+            <RadioGroup v-model="modalData.isValid">
+              <Radio label="Y">{{$t('message.linkis.ipListManagement.yes')}}</Radio>
+              <Radio label="N">{{$t('message.linkis.ipListManagement.no')}}</Radio>
+            </RadioGroup>
+          </FormItem>
+        </Form>
+      </div>
+      <div slot="footer">
+        <Button @click="cancel">{{$t('message.linkis.tenantTagManagement.Cancel')}}</Button>
+        <Button type="primary"  @click="addTenantTag" :loading="isRequesting">{{$t('message.common.ok')}}</Button>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import {cloneDeep} from 'lodash'
+import storage from "@/common/helper/storage";
+import api from '@/common/service/api'
+export default {
+  name: 'tenantTagManagement',
+  data() {
+    return {
+      loading: false,
+      queryData: {
+        department: '',
+        creator: '',
+        tenantValue: '',
+      },
+      confirmQuery: {
+        department: '',
+        creator: '',
+        tenantValue: '',
+      },
+      tableColumns: [
+        {
+          title: "ID",
+          key: 'id',
+          width: 150,
+          tooltip: true,
+          align: 'center',
+        },
+        {
+          title: this.$t('message.linkis.tenantTagManagement.department'),
+          key: 'department',
+          width: 180,
+          tooltip: true,
+          align: 'center',
+        },
+        {
+          title: this.$t('message.linkis.tenantTagManagement.appName'),
+          key: 'creator',
+          width: 170,
+          tooltip: true,
+          align: 'center',
+        },
+        {
+          title: this.$t('message.linkis.tenantTagManagement.tenantTag'),
+          key: 'tenantValue',
+          width: 250,
+          tooltip: true,
+          align: 'center',
+        },
+        
+        {
+          title: this.$t('message.linkis.ipListManagement.isValid'),
+          key: 'isValid',
+          width: 100,
+          tooltip: true,
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('span', params.row.isValid === 'Y' ? this.$t('message.linkis.ipListManagement.yes') : this.$t('message.linkis.ipListManagement.no'))
+            ]);
+          }
+        },
+        {
+          title: this.$t('message.linkis.tenantTagManagement.createUser'),
+          key: 'createBy',
+          width: 350,
+          tooltip: true,
+          align: 'center',
+        },
+        {
+          title: this.$t('message.linkis.tenantTagManagement.createTime'),
+          key: 'createTime',
+          width: 245,
+          tooltip: true,
+          align: 'center',
+        },
+        
+        {
+          title: this.$t('message.linkis.tenantTagManagement.action'),
+          key: 'action',
+          width: 200,
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('Button', {
+                props: {
+                  type: 'primary',
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.edit(params.row)
+                  }
+                }
+              }, this.$t('message.linkis.tenantTagManagement.edit')),
+              h('Button', {
+                props: {
+                  type: 'error',
+                  size: 'small'
+                },
+                style: {
+                  marginRight: '5px'
+                },
+                on: {
+                  click: () => {
+                    this.delete(params.row)
+                  }
+                }
+              }, this.$t('message.linkis.tenantTagManagement.delete')),
+              h('Button', {
+                props: {
+                  type: params.row.isValid === 'N' ? 'success' : 'warning',
+                  size: 'small'
+                },
+                on: {
+                  click: () => {
+                    this.enable(params.row)
+                  }
+                }
+              }, params.row.isValid === 'N' ? this.$t('message.linkis.ipListManagement.enable') : this.$t('message.linkis.ipListManagement.disable')),
+            ]);
+          }
+        }
+      ],
+      datalist: [],
+      tableLoading: false,
+      showCreateModal: false,
+      departments: [],
+      modalData: {
+        department: '',
+        creator: '',
+        tenantValue: '',
+        createBy: '',
+        isValid: 'Y',
+      },
+      modalDataRule: {
+        department: [
+          {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
+        ],
+        creator: [
+          {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
+          {pattern: /^[0-9a-zA-Z_\*]+$/, message: this.$t('message.linkis.tenantTagManagement.contentError'), type: 'string'}
+        ],
+        tenantValue: [
+          {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
+          {pattern: /^[0-9a-zA-Z_\*\-]+$/, message: this.$t('message.linkis.tenantTagManagement.contentError2'), type: 'string'}
+        ],
+        createBy: [
+          {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
+          {pattern: /^[0-9a-zA-Z_]+$/, message: this.$t('message.linkis.tenantTagManagement.contentError1'), type: 'string'}
+        ],
+      },
+      mode: 'create',
+      // 缓存，用于校验
+      editData: {},
+      page: {
+        pageSize: 10,
+        pageNow: 1,
+        totalPage: 0,
+      },
+      userName: '',
+      isRequesting: false
+    }
+  },
+  methods: {
+    async getTableData() {
+      try {
+        this.tableLoading = true;
+        let params = {};
+        const keys = Object.keys(this.confirmQuery);
+        for (let i = 0; i< keys.length; i++) {
+          if(this.confirmQuery[keys[i]]) {
+            params[[keys[i]]] = this.confirmQuery[keys[i]];
+          }
+        }
+        if(params.department) {
+          params.departmentId = this.departments.find(item => item.label===params.department).value;
+        }
+        params.pageNow = this.page.pageNow;
+        params.pageSize = this.page.pageSize;
+        await api.fetch("/configuration/tenant-mapping/query-department-tenant", params, "get")
+          .then((res) => {
+            this.datalist = res.tenantList.map((item) => {
+              item.createTime = new Date(item.createTime).toLocaleString();
+              return item;
+            });
+            this.page.totalPage = res.totalPage;
+          })
+        this.tableLoading = false;
+      } catch(err) {
+        this.tableLoading = false;
+      }
+
+    },
+    async getDepartments() {
+      try {
+        const res = await api.fetch('/configuration/tenant-mapping/query-department', {}, 'get');
+        this.departments = res.departmentList.map((item) => ({
+          label: item.orgName,
+          value: item.orgId
+        }))
+      } catch (err) {
+        window.console.warn(err);
+      }
+    },
+    async init() {
+      this.loading = true;
+      await this.getDepartments();
+      await this.getTableData();
+      this.loading = false;
+    },
+    async clearSearch() {
+      this.queryData = {
+        department: '',
+        creator: '',
+        tenantValue: '',
+      };
+      this.confirmQuery = {
+        department: '',
+        creator: ''
+      }
+      this.page.pageNow = 1;
+      await this.getTableData()
+    },
+    async createTenant () {
+      this.showCreateModal = true;
+      this.mode = 'create';
+      this.modalData.createBy = this.userName;
+    },
+    cancel() {
+      this.showCreateModal = false;
+      this.modalData = {
+        departmentId: '',
+        department: '',
+        creator: '',
+        isValid: 'Y',
+        createBy: '',
+      };
+      this.editData = {
+        departmentId: '',
+        department: '',
+        creator: '',
+        isValid: 'Y',
+        createBy: '',
+      };
+      this.$refs.createTenantForm.resetFields();
+    },
+    addTenantTag() {
+      if(this.isRequesting) return;
+      const target = '/configuration/tenant-mapping/save-department-tenant';
+      this.$refs.createTenantForm.validate(async (valid) => {
+        if(valid) {
+          this.clearSearch();
+          try {
+            if (this.mode !== 'edit') {
+              this.page.pageNow = 1;
+            }
+            this.isRequesting = true;
+            await api.fetch(target, this.modalData, "post").then(async (res) => {
+              window.console.log(res);
+              await this.getTableData();
+              this.cancel();
+              this.$Message.success(this.$t('message.linkis.udf.success'));
+            });
+            this.isRequesting = false;
+          } catch(err) {
+            this.isRequesting = false;
+          }
+        } else {
+          this.$Message.error(this.$t('message.linkis.error.validate'));
+        }
+      })
+
+    },
+    edit(data) {
+      const {
+        id, departmentId, department, creator, tenantValue, createBy, isValid
+      } = data
+      this.modalData = {
+        id, departmentId, department, creator, tenantValue, createBy, isValid
+      };
+      this.editData = {
+        id, departmentId, department, creator, tenantValue, createBy, isValid
+      };
+      this.showCreateModal = true;
+      this.mode = 'edit';
+    },
+    delete(data) {
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.tenantTagManagement.confirmDel'),
+        content: this.$t('message.linkis.tenantTagManagement.isConfirmDel', {name: `id:${data.id}`}),
+        onOk: async () => {
+          await this.confirmDelete(data);
+          await this.getTableData();
+        },
+      })
+    },
+    handleChange(val) {
+      if(this.departments.find(item => item.label === val)?.value) {
+        this.modalData.departmentId = this.departments.find(item => item.label === val).value;
+      }
+      
+    },
+    async confirmDelete(data) {
+      try {
+        await api.fetch('configuration/tenant-mapping/delete-department-tenant', {id: data.id}, 'get');
+      } catch(err) {
+        return;
+      }
+    },
+    async changePage(val) {
+      this.page.pageNow = val;
+      await this.getTableData();
+    },
+    async search() {
+      const { department, creator, tenantValue } = this.queryData;
+      this.confirmQuery = { department, creator, tenantValue };
+      this.page.pageNow = 1;
+      await this.getTableData()
+    },
+    async confirmEnable(data) {
+      const status = data.isValid;
+      const tempData = cloneDeep(data);
+      delete tempData._index;
+      delete tempData._rowKey;
+      delete tempData.updateTime;
+      delete tempData.createTime;
+      delete tempData.userCreator;
+      tempData.isValid = tempData.isValid === 'Y' ? 'N' : 'Y';
+      try {
+        await api.fetch('/configuration/tenant-mapping/save-department-tenant', tempData, 'post');
+        if(status === 'N') {
+          this.$Message.success(this.$t('message.linkis.ipListManagement.enableSuccessfully'));
+        } else {
+          this.$Message.success(this.$t('message.linkis.ipListManagement.disableSuccessfully'));
+        }
+          
+      } catch (err) {
+        return;
+      }
+        
+      
+    },
+    enable(data) {
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.ipListManagement.confirmDel'),
+        content: data.isValid === 'N' ? this.$t('message.linkis.ipListManagement.confirmEnable', {name: `${data.id}`}) : this.$t('message.linkis.ipListManagement.confirmDisable', {name: `${data.id}`}),
+        onOk: async () => {
+          await this.confirmEnable(data);
+          await this.getTableData();
+        },
+      })
+    },
+  },
+  created() {
+    this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
+    this.init();
+  }
+
+};
+</script>
+<style lang="scss" src="./index.scss" scoped></style>
+<style lang="scss" scoped>
+.modal {
+
+  .input-area {
+    padding: 20px 50px;
+    .item {
+      display: flex;
+      margin-bottom: 10px;
+      .input {
+        width: calc(100% - 66px);
+      }
+    }
+  }
+}
+
+</style>
diff --git a/linkis-web/src/apps/linkis/module/eurekaService/index.js b/linkis-web/src/apps/linkis/module/eurekaService/index.js
new file mode 100644
index 00000000000..889a16be0ca
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/eurekaService/index.js
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+export default {
+  name: 'eurekaService',
+  component: () => import('./index.vue'),
+}
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/eurekaService/index.scss b/linkis-web/src/apps/linkis/module/eurekaService/index.scss
new file mode 100644
index 00000000000..0577299a3fc
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/eurekaService/index.scss
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+@import '@/common/style/variables.scss';
+.search-bar {
+  .search-item {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-size: $font-size-base;
+    .lable {
+      flex-basis: 100px;
+      text-align: center; 
+    }
+  }
+  .search {
+    margin-left: 25px;
+  }
+  .jump{
+    margin-left: 25px;
+  }
+  .ivu-input-wrapper {
+    width: calc(100% - 105px);
+  }
+}
+.table-content {
+  margin-top: 25px;
+  .name {
+    color:$primary-color;
+  }
+  .unlock {
+    color: $success-color;
+  }
+  .lock {
+    color: $error-color;
+  }
+  .text-button {
+    color:$primary-color;
+    cursor: pointer;
+  }
+}
+.page-bar {
+  text-align: center;
+  padding: 10px 0;
+}
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/eurekaService/index.vue b/linkis-web/src/apps/linkis/module/eurekaService/index.vue
new file mode 100644
index 00000000000..800225d13c6
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/eurekaService/index.vue
@@ -0,0 +1,269 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<template>
+  <div class="eurekaService">
+    <Spin
+      v-if="loading"
+      size="large"
+      fix
+    />
+    <Row class="search-bar">
+      <Col span="5" class="search-item">
+        <span class="lable">{{ $t('message.linkis.serviceName') }}</span>
+        <Input
+          v-model="app"
+          class="input"
+          :placeholder="$t('message.linkis.serviceName')"
+          @on-enter="searchAction"
+        ></Input>
+      </Col>
+      <Col
+        span="5"
+        class="search-item"
+      >
+        <span class="lable">{{
+          $t("message.linkis.IP")
+        }}</span>
+        <Input
+          v-model="ip"
+          class="input"
+          :placeholder="$t('message.linkis.IP')"
+          @on-enter="searchAction"
+        ></Input>
+      </Col>
+      <Col
+        span="5"
+        class="search-item"
+      >
+        <span class="lable">{{
+          $t("message.linkis.hostname")
+        }}</span>
+        <Input
+          v-model="hostName"
+          class="input"
+          :placeholder="$t('message.linkis.hostname')"
+          @on-enter="searchAction"
+        ></Input>
+      </Col>
+      <Col
+        span="5"
+        class="search-item"
+      >
+        <span class="lable">{{
+          $t("message.linkis.versionInfo")
+        }}</span>
+        <Input
+          v-model="version"
+          class="input"
+          :placeholder="$t('message.linkis.versionInfo')"
+          @on-enter="searchAction"
+        ></Input>
+      </Col>
+      <Col span="4" class="search-item">
+        <Button class="search" type="primary" @click="searchAction">{{
+          $t("message.linkis.find")
+        }}</Button>
+      </Col>
+    </Row>
+    <Table
+      border
+      :columns="tableColumnNum"
+      :data="pageDatalist"
+      class="table-content eureka-service-table"
+    >
+      <template
+        slot-scope="{ row }"
+        slot="serviceAddress"
+      >
+        <span>{{ row.ipAddr + ':' + row.metadata['management.port'] }}</span>
+      </template>
+      <template
+        slot-scope="{ row }"
+        slot="registryTime"
+      >
+        <span>{{ dateFormatter(row.leaseInfo ? row.leaseInfo.registrationTimestamp : '') }}</span>
+      </template>
+      <template
+        slot-scope="{ row }"
+        slot="versionInfo"
+      >
+        <span>{{ row.metadata ? row.metadata['linkis.app.version'] || '--' : '--' }}</span>
+      </template>
+    </Table>
+    <div class="page-bar">
+      <Page
+        ref="page"
+        :total="page.totalSize"
+        :page-size-opts="page.sizeOpts"
+        :page-size="page.pageSize"
+        :current="page.pageNow"
+        class-name="page"
+        size="small"
+        show-total
+        show-sizer
+        :prev-text="$t('message.linkis.previousPage')"
+        :next-text="$t('message.linkis.nextPage')"
+        @on-change="change"
+        @on-page-size-change="changeSize"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import api from "@/common/service/api";
+import moment from "moment";
+export default {
+  name: 'microServiceManagement',
+  components: {},
+  data() {
+    return {
+      loading: false,
+      app: "",
+      ip: "",
+      hostName: "",
+      version: "",
+      page: {
+        totalSize: 0,
+        sizeOpts: [15, 30, 45],
+        pageSize: 15,
+        pageNow: 1,
+      },
+      tableColumnNum: [
+        {
+          title: this.$t("message.linkis.serviceName"),
+          key: "app",
+          align: "center",
+          minWidth: 120,
+        },
+        {
+          title: this.$t("message.linkis.tableColumns.serviceAddress"),
+          key: "serviceAddress",
+          slot: "serviceAddress",
+          align: "center",
+          minWidth: 100,
+        },
+        {
+          title: this.$t("message.linkis.tableColumns.hostname"),
+          key: "hostName",
+          align: "center",
+          minWidth: 100,
+        },
+        {
+          title: this.$t("message.linkis.tableColumns.status"),
+          key: "status",
+          align: "center",
+          minWidth: 120,
+        },
+        {
+          title: this.$t("message.linkis.tableColumns.registryTime"),
+          key: "registryTime",
+          slot: "registryTime",
+          align: "center",
+          minWidth: 100,
+        },
+        {
+          title: this.$t("message.linkis.tableColumns.versionInfo"),
+          key: "versionInfo",
+          slot: "versionInfo",
+          align: "center",
+          minWidth: 120,
+        },
+      ],
+      tableData: [], // data for presentation(用于展示的数据)
+      allTableData: [], // All data temporarily stored for filtering(暂存的所有数据，用于做筛选)
+    };
+  },
+  computed: {
+    pageDatalist() {
+      // Displayed data(展示的数据)
+      return this.tableData.filter((item, index) => {
+        return (
+          (this.page.pageNow - 1) * this.page.pageSize <= index &&
+          index < this.page.pageNow * this.page.pageSize
+        );
+      });
+    },
+  },
+  created() {
+    this.getAllInstance();
+  },
+  methods: {
+    // Get all microservices(获取所有的微服务)
+    getAllInstance() {
+      this.loading = true;
+      api.fetch("/microservice/serviceInstances", "get").then((res) => {
+        this.allTableData = res.list.map(item=> item.instanceInfo) || [];
+        this.tableData = res.list.map(item=> item.instanceInfo)  || [];
+        this.page.totalSize = this.tableData.length;
+        this.loading = false;
+      });
+    },
+    searchAction() {
+      this.search(this.app.replace(/ /g, '') || '', this.ip.replace(/ /g, '') || '', this.hostName.replace(/ /g, '') || '', this.version.replace(/ /g, '') || '');
+    },
+    // Click to search to filter the data(点击搜索 对数据进行筛选)
+    search(app = "", ip = "", hostName = "", version = "") {
+      this.loading = true;
+      api.fetch("/microservice/serviceInstances", { serviceName: app, ip, hostName, version }, "get").then((res) => {
+        this.allTableData = res.list.map(item => item.instanceInfo) || [];
+        this.tableData = res.list.map(item => item.instanceInfo) || [];
+        this.page.totalSize = this.tableData.length;
+        this.loading = false;
+      });
+      this.page.pageNow = 1;
+    },
+    // Toggle pagination(切换分页)
+    change(val) {
+      this.page.pageNow = val;
+    },
+    // page size change(页容量变化)
+    changeSize(val) {
+      this.page.pageSize = val;
+      this.page.pageNow = 1;
+    },
+    // Convert time format(转换时间格式)
+    dateFormatter(date) {
+      return date ? moment(date).format("YYYY-MM-DD HH:mm:ss") : '--';
+    },
+  },
+};
+</script>
+<style lang="scss" src="./index.scss" scoped></style>
+  
+<style lang="scss">
+
+.eureka-service-table {
+  border: 0;
+  height: calc(100% - 110px);
+
+  .ivu-table:before {
+    height: 0
+  }
+
+  .ivu-table:after {
+    width: 0
+  }
+
+  .ivu-table {
+    height: auto;
+    border: 1px solid #dcdee2;
+  }
+}
+
+</style>
+  
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
index cddf5c4f80b..fedb44e0720 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/EditForm/index.vue
@@ -136,8 +136,8 @@ export default {
           value: false,
           hidden: false,
           options: [
-            {value: false,label: "否",disabled: false},
-            {value: true,label: "是",disabled: false},
+            {value: false,label: this.$t('message.linkis.no'),disabled: false},
+            {value: true,label: this.$t('message.linkis.yes'),disabled: false},
           ],
           on: {
             'on-change': () => {
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
index 19fb808ea08..91ee9f886d5 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/index.vue
@@ -37,6 +37,14 @@
       class="table-content mytable">
       <template slot-scope="{ row,index }" slot="action">
         <ButtonGroup size="small">
+          <Button
+            :disabled="row.expire"
+            size="small"
+            type="primary"
+            @click="onTokenCheck(row, index)"
+          >{{ $t('message.linkis.basedataManagement.tokenInfo') }}
+          </Button
+          >
           <Button
             :disabled="row.expire"
             size="small"
@@ -81,14 +89,43 @@
         <Button type="text" size="large" @click="onModalCancel()">{{$t('message.linkis.basedataManagement.modal.cancel')}}</Button>
         <Button type="primary" size="large" @click="onModalOk('userConfirm')">{{$t('message.linkis.basedataManagement.modal.confirm')}}</Button>
       </div>
-      <EditForm ref="editForm" :data="modalEditData"></EditForm>
+      <EditForm ref="editForm" :data="modalEditData" :mode="modalAddMode"></EditForm>
+    </Modal>
+
+    <!-- Token信息查看弹窗 -->
+    <Modal
+      width="600"
+      v-model="tokenModalShow"
+      :title="$t('message.linkis.basedataManagement.tokenInfo')"
+      :loading="tokenModalLoading"
+    >
+      <div slot="footer">
+        <Button type="primary" size="large" @click="onTokenModalClose()">{{$t('message.linkis.basedataManagement.modal.confirm')}}</Button>
+      </div>
+      <div style="padding: 20px;">
+        <div style="margin-bottom: 20px; display: flex;">
+          <div style="display:flex; align-items: center">{{ $t('message.linkis.tokenPlain') }}：</div>
+          <div style="flex:1; padding: 10px; background-color: #f8f8f9; border: 1px solid #dcdee2; border-radius: 4px; word-break: break-all;">
+            {{ tokenInfo.decryptToken || '' }}
+          </div>
+        </div>
+        <div style="display: flex; position: relative">
+          <div>{{ $t('message.linkis.tokenCipher') }}：</div>
+          <div style="flex:1; padding: 10px; background-color: #f8f8f9; border: 1px solid #dcdee2; border-radius: 4px; word-break: break-all;">
+            {{ tokenInfo.encryptToken || '' }}
+          </div>
+          <div style="text-align: right; top: 5px; right: -18px; position: absolute">
+            <Icon type="md-copy" :size="18" style="cursor: pointer; color: #2d8cf0;" @click="copyToClipboard(tokenInfo.encryptToken)" title="点击后可复制密文"></Icon>
+          </div>
+        </div>
+      </div>
     </Modal>
   </div>
 </template>
 <script>
 import mixin from '@/common/service/mixin';
 import EditForm from './EditForm/index'
-import {add, del, edit, getList} from "./service";
+import {add, del, edit, getDecryptToken, getList} from "./service";
 import {formatDate} from "iview/src/components/date-picker/util";
 export default {
   mixins: [mixin],
@@ -172,7 +209,7 @@ export default {
         },
         {
           title: this.$t('message.linkis.basedataManagement.action'),
-          width: 150,
+          width: 190,
           slot: 'action',
           align: 'center',
         },
@@ -182,7 +219,14 @@ export default {
       modalShow: false,
       modalAddMode: 'add',
       modalEditData: {},
-      modalLoading: false
+      modalLoading: false,
+      // Token信息弹窗相关数据
+      tokenModalShow: false,
+      tokenModalLoading: false,
+      tokenInfo: {
+        decryptToken: '',
+        encryptToken: ''
+      }
     };
   },
   created() {
@@ -216,6 +260,7 @@ export default {
         elapseDay: -1,
         permanentlyValid: true
       }
+      this.$refs.editForm.formModel.rule[1].props.disabled = false
       this.$refs.editForm.formModel.rule[5].hidden = true
       this.$refs.editForm.formModel.setValue(row)
 
@@ -227,10 +272,54 @@ export default {
         row.permanentlyValid = true;
         this.$refs.editForm.formModel.rule[5].hidden = true
       }
+      this.$refs.editForm.formModel.rule[1].props.disabled = true
       this.$refs.editForm.formModel.setValue(row)
       this.modalAddMode = 'edit'
       this.modalShow = true
     },
+    onTokenCheck(row) {
+      this.tokenModalLoading = true;
+      this.tokenModalShow = true;
+
+      // 调用getDecryptToken API
+      getDecryptToken(row).then((data) => {
+        this.tokenModalLoading = false;
+        this.tokenInfo = {
+          decryptToken: data.decryptToken,
+          encryptToken: data.encryptToken
+        };
+      }).catch(() => {
+        this.tokenModalLoading = false;
+      });
+    },
+    onTokenModalClose() {
+      this.tokenModalShow = false;
+      this.tokenInfo = {
+        decryptToken: '',
+        encryptToken: ''
+      };
+    },
+    copyToClipboard(text) {
+      if (!text) {
+        this.$Message.warning('没有可复制的内容');
+        return;
+      }
+
+      // 创建临时textarea元素
+      const textarea = document.createElement('textarea');
+      textarea.value = text;
+      document.body.appendChild(textarea);
+      textarea.select();
+
+      try {
+        document.execCommand('copy');
+        this.$Message.success('复制成功');
+      } catch (err) {
+        this.$Message.error('复制失败，请手动复制');
+      }
+
+      document.body.removeChild(textarea);
+    },
     onTableDelete(row){
       this.$Modal.confirm({
         title: this.$t('message.linkis.basedataManagement.modal.modalTitle'),
@@ -305,28 +394,29 @@ export default {
 };
 </script>
 
-<style lang="scss" src="./index.scss" scoped>
-</style>
+  <style lang="scss" src="./index.scss" scoped>
+  </style>
 
-<style lang="scss">
-.mytable {
-  border: 0;
-  height: calc(100% - 110px);
-  width: 100%;
-  overflow-y: auto;
+  <style lang="scss">
+  .mytable {
+    border: 0;
+    height: calc(100% - 110px);
+    width: 100%;
+    overflow-y: auto;
 
-  .ivu-table:before {
-    height: 0
-  }
+    .ivu-table:before {
+      height: 0
+    }
 
-  .ivu-table:after {
-    width: 0
-  }
+    .ivu-table:after {
+      width: 0
+    }
 
-  .ivu-table {
-    height: auto;
-    border: 1px solid #dcdee2;
-    width: 100%;
+    .ivu-table {
+      height: auto;
+      border: 1px solid #dcdee2;
+      width: 100%;
+    }
   }
-}
-</style>
+  </style>
+  
diff --git a/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js b/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
index 27a10490b15..b7d1d027e4b 100644
--- a/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
+++ b/linkis-web/src/apps/linkis/module/gatewayAuthToken/service.js
@@ -35,10 +35,14 @@ const edit = (data)=> {
 const del = (params)=> {
   return api.fetch(`${authTokenBaseUrl}/${params.id}`,'delete')
 }
+const getDecryptToken = (params) => {
+  return api.fetch(`${authTokenBaseUrl}/decrypt-token?token=${encodeURIComponent(params.tokenSign)}`,'get')
+}
 
 export{
   getList,
   add,
   edit,
-  del
+  del,
+  getDecryptToken
 }
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.scss b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.scss
index 5cc3eca2984..0c9ce5fdeea 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.scss
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.scss
@@ -5,16 +5,16 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 @import '@/common/style/variables.scss';
 .progress-wrap {
     position: $relative;
@@ -72,8 +72,8 @@
                 }
             }
         }
-        
-        
+
+
     }
     .ivu-form {
         display: flex;
@@ -157,4 +157,4 @@
 
 .render-btn {
     padding: 1px 0 2px 0 !important;
-}
\ No newline at end of file
+}
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index 21e33d47588..de1bdce01d2 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -17,7 +17,7 @@
 
 <template>
   <div class="global-history">
-    <div class="global-history-searchbar">
+    <div ref="searchBar" class="global-history-searchbar">
       <div class="searchbar-items">
         <div class="searchbar-item">
           <label class="label">{{$t('message.linkis.jobId')}}</label>
@@ -44,12 +44,13 @@
             class="datepicker"
             :options="shortcutOpt"
             v-model="searchBar.shortcut"
-            type="daterange"
+            type="datetimerange"
             placement="bottom-start"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm"
             :placeholder="$t('message.linkis.formItems.date.placeholder')"
-            style="width: 160px"
+            style="width: 250px"
             :editable="false"
+            @on-change="onDatePickerChange"
           />
         </div>
         <div class="searchbar-item">
@@ -61,6 +62,15 @@
             style="width:80px;"
           />
         </div>
+        <div class="searchbar-item">
+          <label class="label">{{$t('message.linkis.formItems.runType.label')}}</label>
+          <Input
+            :maxlength="50"
+            v-model.trim="searchBar.runType"
+            :placeholder="$t('message.linkis.formItems.runType.placeholder')"
+            style="width:80px;"
+          />
+        </div>
         <div class="searchbar-item">
           <label class="label">{{$t('message.linkis.formItems.engine.label')}}</label>
           <Select v-model="searchBar.engine" style="width: 70px">
@@ -86,13 +96,20 @@
               style="width:150px;"
             />
           </FormItem>
+          <FormItem prop="engineInstance" :label="$t('message.linkis.engineInstance.label')">
+            <Input
+              v-model.trim="searchBar.engineInstance"
+              :placeholder="$t('message.linkis.engineInstance.placeholder')"
+              style="width:150px;"
+            />
+          </FormItem>
         </Form>
       </div>
       <div class="search-btns">
         <Button
           class="search-btn"
           type="primary"
-          @click="search"
+          @click="search(false)"
           style="margin-right: 10px;"
         >{{ $t('message.linkis.search') }}</Button>
         <Button
@@ -105,22 +122,44 @@
         <Button
           class="search-btn"
           type="primary"
-          @click="switchAdmin"
-          v-show="isLogAdmin || isHistoryAdmin"
+          @click="switchAdmin(false)"
+          v-show="isLogAdmin || isHistoryAdmin || isDeptAdmin"
           style="margin-right: 10px;"
-        >{{ isAdminModel ? $t('message.linkis.generalView') : $t('message.linkis.manageView') }}</Button>
+        >{{ isAdminModel ? $t('message.linkis.generalView') : (isDeptAdmin && !isLogAdmin && !isHistoryAdmin ? $t('message.linkis.deptManageView') : $t('message.linkis.manageView')) }}</Button>
         <Button
           class="search-btn"
           type="primary"
           @click="clickAdvance"
         >{{ showAdvance ? $t('message.linkis.hideAdvancedSearch') :  $t('message.linkis.showAdvancedSearch') }}</Button>
+        <Dropdown placement="bottom-start" trigger="click">
+          <Button
+            class="search-btn"
+            type="primary"
+          >{{$t('message.linkis.tableSetting')}}</Button>
+          <template #list>
+            <DropdownMenu>
+              <CheckboxGroup v-model="visibleColumns" style="display: flex; flex-direction: column; padding: 10px 10px 0;">
+                <Checkbox :label="item.title" v-for="(item, index) in column" v-show="item.title" :key="index" style="margin-bottom: 10px">
+                  <span>{{item.title}}</span>
+                </Checkbox>
+              </CheckboxGroup>
+            </DropdownMenu>
+          </template>
+        </Dropdown>
+        <Button
+          class="search-btn"
+          type="primary"
+          @click="download"
+          :loading="downloading"
+        >{{ $t('message.linkis.downloadLog') }}</Button>
       </div>
+      
     </div>
     <div class="global-history-table" :style="{width: '100%', 'height': moduleHeight +'px'}">
       <Icon v-show="isLoading" type="ios-loading" size="30" class="global-history-loading" />
       <history-table
         v-if="!isLoading"
-        :columns="column"
+        :columns="filteredColumns"
         :data="list"
         :height="moduleHeight"
         :no-data-text="$t('message.linkis.noDataText')"
@@ -135,11 +174,14 @@
         :total="pageSetting.total"
         :page-size="pageSetting.pageSize"
         :current="pageSetting.current"
+        :page-size-opts="pageSetting.sizeOpts"
         size="small"
         show-total
         show-elevator
+        show-sizer
         :prev-text="$t('message.linkis.previousPage')" :next-text="$t('message.linkis.nextPage')"
         @on-change="changePage"
+        @on-page-size-change="changePageSize"
       />
     </div>
   </div>
@@ -149,6 +191,7 @@ import storage from '@/common/helper/storage'
 import table from '@/components/virtualTable'
 import mixin from '@/common/service/mixin'
 import api from '@/common/service/api'
+import axios from 'axios'
 export default {
   name: 'GlobalHistory',
   components: {
@@ -160,13 +203,15 @@ export default {
     return {
       list: [],
       column: [],
+      visibleColumns: [],
       getEngineTypes: [],
       isLoading: false,
       showAdvance: false,
       pageSetting: {
         total: 0,
         pageSize: 50,
-        current: 1
+        current: 1,
+        sizeOpts: [25, 50, 100]
       },
       searchBar: {
         id: null,
@@ -174,10 +219,22 @@ export default {
         creator: '',
         engine: 'all',
         status: '',
-        shortcut: [today, today]
+        shortcut: [new Date(today.setHours(0, 0, 0, 0)), new Date(today.setHours(23, 59, 59, 0))],
       },
       inputType: 'number',
       shortcutOpt: {
+        disabledDate(date) {
+          if (!date) {
+            return false;
+          }
+
+          const now = new Date();
+          const ninetyDaysAgo = new Date(now);
+          ninetyDaysAgo.setDate(now.getDate() - 90);
+          ninetyDaysAgo.setHours(0, 0, 0, 0);
+
+          return date.valueOf() < ninetyDaysAgo.valueOf() || date.valueOf() > now.valueOf();
+        },
         shortcuts: [
           {
             text: this.$t('message.linkis.shortcuts.week'),
@@ -278,23 +335,55 @@ export default {
       ],
       isLogAdmin: false,
       isHistoryAdmin: false,
+      isDeptAdmin: false,
       isAdminModel: false,
-      moduleHeight: 300
+      moduleHeight: 300,
+      lastChooseDate: ['', ''],
+      curDateTime: ['', ''],
+      downloading: false
     }
   },
   async created() {
     // Get whether it is a historical administrator(获取是否是历史管理员权限)
-    await api.fetch('/jobhistory/governanceStationAdmin', 'get').then(res => {
-      this.isLogAdmin = res.admin
-      this.isHistoryAdmin = res.historyAdmin
-    })
-    await api.fetch('/configuration/engineType', 'get').then(res => {
-      this.getEngineTypes = ['all', ...res.engineType]
-    })
+    try {
+      await api.fetch('/jobhistory/governanceStationAdmin', 'get').then(res => {
+        this.isLogAdmin = res.admin
+        this.isHistoryAdmin = res.historyAdmin
+        this.isDeptAdmin = res.deptAdmin
+      })
+      await api.fetch('/configuration/engineType', 'get').then(res => {
+        this.getEngineTypes = ['all', ...res.engineType]
+      })
+    } catch(err) {
+      window.console.warn(err);
+    }
+
   },
   mounted() {
+    if(sessionStorage.getItem('last-page-columns')) {
+      this.visibleColumns = JSON.parse(sessionStorage.getItem('last-page-columns'))
+    } else {
+      this.visibleColumns = this.getColumns().filter(
+        (item) => {
+          return [
+            'checked',
+            'control',
+            'taskID',
+            'source',
+            'executionCode',
+            'status',
+            'costTime',
+            'failedReason',
+            'requestApplicationName',
+            'createdTime',
+            'isReuse',
+          ].includes(item.key)
+        }
+      ).map(item => item.title);
+      this.visibleColumns.push(this.$t('message.linkis.tableColumns.user'));
+    }
+    
     this.init()
-    this.moduleHeight = this.$parent.$el.clientHeight - 220
     // Monitor window changes and get browser width and height(监听窗口变化，获取浏览器宽高)
     window.addEventListener('resize', this.getHeight)
   },
@@ -310,17 +399,96 @@ export default {
       sessionStorage.removeItem('last-searchbar-status');
       sessionStorage.removeItem('last-pageSetting-status');
       sessionStorage.removeItem('last-searchbar-advance');
+      sessionStorage.removeItem('last-page-columns');
     }
     next();
   },
   activated() {
     this.init()
   },
+  computed: {
+    filteredColumns() {
+      return this.column.filter(item => this.visibleColumns.includes(item.title));
+    }
+  },
   methods: {
+    async download() {
+      try {
+        
+        if(this.downloading) return;
+        if(this.pageSetting.total >= 10000) {
+          this.$Modal.confirm({
+            title: this.$t('message.linkis.countinueDownload'),
+            content: this.$t('message.linkis.exceed10000'),
+            onOk: async () => {
+              try {
+                const params = this.getParams();
+                params.pageNow = 1;
+                params.pageSize = 10000;
+                this.downloading = true;
+                const res = await axios({
+                  url: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/jobhistory/download-job-list`,
+                  method: 'get',
+                  responseType: 'blob',
+                  params,
+                  headers: {
+                    'Content-Language': localStorage.getItem('locale') || 'zh-CN'
+                  }
+                })
+                
+                let blob = res.data
+                let url = window.URL.createObjectURL(blob);
+                let l = document.createElement('a')
+                l.href = url;
+                l.download = 'ResultOfJobHistory';
+                document.body.appendChild(l);
+                l.click()
+                window.URL.revokeObjectURL(url)
+                this.downloading = false
+                this.$Message.success(this.$t('message.linkis.downloadSucceed'))
+              } catch (err) {
+                window.console.warn(err)
+                this.downloading = false;
+              }
+            
+            }
+          })
+        } else {
+          this.downloading = true
+          const params = this.getParams();
+          params.pageNow = 1;
+          params.pageSize = 10000;
+          const res = await axios({
+            url: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/jobhistory/download-job-list`,
+            method: 'get',
+            responseType: 'blob',
+            params,
+            headers: {
+              'Content-Language': localStorage.getItem('locale') || 'zh-CN'
+            }
+          })
+          let blob = res.data
+          let url = window.URL.createObjectURL(blob);
+          let l = document.createElement('a')
+          l.href = url;
+          l.download = 'ResultOfJobHistory';
+          document.body.appendChild(l);
+          l.click()
+          window.URL.revokeObjectURL(url)
+          this.downloading = false
+          this.$Message.success(this.$t('message.linkis.downloadSucceed'))
+        }
+       
+      } catch(err) {
+        this.downloading = false
+      }
+      
+        
+    },
     getHeight() {
-      this.moduleHeight = this.$parent.$el.clientHeight - 228
+      this.moduleHeight = this.$parent.$el.clientHeight - this.$refs.searchBar.offsetHeight - 210;
       if(this.showAdvance) {
-        this.moduleHeight -= 42
+        this.moduleHeight -= 10
       }
     },
     clickAdvance() {
@@ -338,18 +506,20 @@ export default {
           lastSearch.shortcut = [new Date(lastSearch.shortcut[0]), new Date(lastSearch.shortcut[1])]
         } else {
           const today = new Date(new Date().toLocaleDateString())
-          lastSearch.shortcut = [today, today]
+          lastSearch.shortcut = [new Date(today.setHours(0, 0, 0, 0)), new Date(today.setHours(23, 59, 59, 0))]
         }
         this.searchBar = lastSearch
       }
-      if (lastPage) {
-        this.pageSetting = lastPage
-      }
-      if (isAdminModel) {
-        this.switchAdmin()
-      } else {
-        this.search()
-      }
+      this.$nextTick(()=> {
+        if (lastPage) {
+          this.pageSetting = lastPage
+        }
+        if (isAdminModel) {
+          this.switchAdmin(true)
+        } else {
+          this.search(true)
+        }
+      })
       storage.remove('last-pageSetting-status')
     },
     convertTimes(runningTime) {
@@ -401,6 +571,7 @@ export default {
       storage.set('last-searchbar-status', this.searchBar)
       storage.set('last-pageSetting-status', this.pageSetting)
       storage.set('last-searchbar-advance', this.showAdvance)
+      storage.set('last-page-columns', this.visibleColumns)
       // Jump to view the history details page(跳转查看历史详情页面)
       this.$router.push({
         path: '/console/viewHistory',
@@ -409,20 +580,23 @@ export default {
     },
 
     getParams(page) {
-      const startDate = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setHours(0, 0, 0, 0)) : this.searchBar.shortcut[0]
-      const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setHours(23, 59, 59, 0)): this.searchBar.shortcut[1]
+      const startDate = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setSeconds(0)) : this.searchBar.shortcut[0]
+      const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setSeconds(59)): this.searchBar.shortcut[1]
       const params = {
         taskID: this.searchBar.id,
+        runType: this.searchBar.runType,
         creator: this.searchBar.creator,
         executeApplicationName: this.searchBar.engine,
         status: this.searchBar.status,
         startDate: startDate && startDate.getTime(),
         endDate: endDate && endDate.getTime(),
+        engineInstance: this.searchBar.engineInstance,
         pageNow: page || this.pageSetting.current,
         pageSize: this.pageSetting.pageSize,
         proxyUser: this.searchBar.proxyUser,
-        isAdminView: this.isAdminModel,
-        instance: this.searchBar.instance?.replace(/ /g, '') || ''
+        isAdminView: this.isAdminModel && (storage.get('isLogAdmin') || storage.get('isLogHistoryAdmin')),
+        instance: this.searchBar.instance?.replace(/ /g, '') || '',
+        isDeptView: this.isAdminModel && storage.get('isLogDeptAdmin') && !storage.get('isLogAdmin') && !storage.get('isLogHistoryAdmin')
       }
       if (!this.isAdminModel) {
         delete params.proxyUser
@@ -435,6 +609,8 @@ export default {
         delete params.endDate
         delete params.proxyUser
         delete params.instance
+        delete params.engineInstance
+        delete params.runType
       } else {
         let { engine, status, shortcut } = this.searchBar
         if (engine === 'all') {
@@ -462,17 +638,33 @@ export default {
         .then(rst => {
           this.isLoading = false
           this.list = this.getList(rst.tasks)
-          this.pageSetting.current = page
-          this.pageSetting.total = rst.totalPage
+          // this.pageSetting.current = page
+          const maxPage = Math.ceil(rst.totalPage / this.pageSetting.pageSize);
+          if(maxPage < page) {
+            this.pageSetting.current = maxPage;
+          } else {
+            this.pageSetting.current = page;
+          }
+          this.pageSetting.total = rst.totalPage;
         })
         .catch(() => {
           this.isLoading = false
           this.list = []
         })
     },
-    search() {
+    // page size change(页容量变化)
+    changePageSize(pageSize) {
+      this.pageSetting.pageSize = pageSize
+      if(this.pageSetting.current === 1) this.search()
+      this.pageSetting.current = 1
+    },
+    search(isInit = false) {
       this.isLoading = true
+      if(!isInit) {
+        this.pageSetting.current = 1;
+      }
       const params = this.getParams()
+      
       this.column = this.getColumns()
       api
         .fetch('/jobhistory/list', params, 'get')
@@ -510,6 +702,15 @@ export default {
             runType: item.runType,
             instance: item.instance,
             engineInstance: item.engineInstance,
+            isReuse: item.isReuse === null 
+              ? '' 
+              : item.isReuse 
+                ? this.$t('message.linkis.yes') 
+                : this.$t('message.linkis.no'),
+            requestSpendTime: item.requestSpendTime,
+            requestStartTime: item.requestStartTime,
+            requestEndTime: item.requestEndTime,
+            metrics: item.metrics
           }
         })
       }
@@ -518,7 +719,12 @@ export default {
           disabled:
               ['Submitted', 'Inited', 'Scheduled', 'Running'].indexOf(item.status) === -1,
           failedReason: getFailedReason(item),
-          source: item.sourceTailor
+          source: item.sourceTailor,
+          isReuse: item.isReuse === null 
+            ? '' 
+            : item.isReuse 
+              ? this.$t('message.linkis.yes') 
+              : this.$t('message.linkis.no'),
         })
       })
     },
@@ -606,13 +812,56 @@ export default {
           }
         },
         {
-          title: this.$t('message.linkis.tableColumns.requestApplicationName') + ' / ' + this.$t('message.linkis.tableColumns.executeApplicationName'),
+          title: this.$t('message.linkis.tableColumns.isReuse'),
+          key: 'isReuse',
+          align: 'center',
+          width: 100,
+          // renderType: 'tooltip',
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.requestStartTime'),
+          key: 'requestStartTime',
+          align: 'center',
+          width: 150,
+          // overflow to show(溢出以...显示)
+          renderType: 'formatTime'
+          // renderType: 'tooltip',
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.requestEndTime'),
+          key: 'requestEndTime',
+          align: 'center',
+          width: 150,
+          renderType: 'formatTime'
+          // renderType: 'tooltip',
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.requestSpendTime'),
+          key: 'requestSpendTime',
+          align: 'center',
+          width: 100,
+          // overflow to show(溢出以...显示)
+          renderType: 'convertTime'
+          // renderType: 'tooltip',
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.metrix'),
+          key: 'metrics',
+          align: 'center',
+          width: 300,
+          // overflow to show(溢出以...显示)
+          ellipsis: true
+          // renderType: 'tooltip',
+        },
+        {
+          title: this.$t('message.linkis.tableColumns.requestApplicationName') + ' / ' +  this.$t('message.linkis.tableColumns.runType') + ' / ' + this.$t('message.linkis.tableColumns.executeApplicationName'),
           key: 'requestApplicationName',
           align: 'center',
           width: 130,
-          renderType: 'concat',
+          renderType: 'multiConcat',
           renderParams: {
-            concatKey: 'executeApplicationName'
+            concatKey1: 'runType',
+            concatKey2: 'executeApplicationName'
           }
 
         },
@@ -646,14 +895,15 @@ export default {
         shortcut: ''
       }
     },
-    switchAdmin() {
+    switchAdmin(isInit = false) {
       if (!this.isLoading) {
         if (this.isAdminModel) {
           this.searchBar.id = null
           this.searchBar.proxyUser = ''
+
         }
         this.isAdminModel = !this.isAdminModel
-        this.search()
+        this.search(isInit)
       }
     },
     linkTo(params) {
@@ -715,12 +965,43 @@ export default {
 
           Promise.all(p).then(()=> {
             this.$Message.success(this.$t('message.linkis.udf.success'));
-            this.search()
+            this.search(false)
           })
         }
       })
-    }
+    },
+    // 改造日期选择器选择日期时默认时间段为00:00-23:59
+    onDatePickerChange(date) {
+      // 兼容重复修改时间段00:00-00:00的情况
+      const isLastChooseDefault = (this.lastChooseDate[0].slice(-5) === '00:00'&& this.lastChooseDate[1].slice(-5) === '00:00')
+        && (date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00')
+        && (this.lastChooseDate[0].slice(0, 10) === date[0].slice(0, 10) && this.lastChooseDate[1].slice(0, 10) === date[1].slice(0, 10))
+
+      // 是否手动改动日期为00:00-00:00，条件：更改过日期 && （ 上次时间为00:00-(xx:xx) || (上次时间为（xx:xx)-00:00)）
+      const isChooseDefault = (date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00')
+          &&
+          (
+            (this.lastChooseDate[0].slice(-5) === '00:00'
+              && ((this.lastChooseDate[1].slice(-5, -3) === '00' && this.lastChooseDate[1].slice(-2) !== '00') || (this.lastChooseDate[1].slice(-5, -3) !== '00' && this.lastChooseDate[1].slice(-2) === '00')))
+            || (this.lastChooseDate[1].slice(-5) === '00:00'
+              && ((this.lastChooseDate[0].slice(-5, -3) === '00' && this.lastChooseDate[0].slice(-2) !== '00') || (this.lastChooseDate[0].slice(-5, -3) !== '00' && this.lastChooseDate[0].slice(-2) === '00'))))
+
+      if(isLastChooseDefault || isChooseDefault) {
+        this.lastChooseDate = JSON.parse(JSON.stringify(date))
+        return
+      }
+      // 修改日期默认为00:00-23:59
+      if(date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00') {
+        this.searchBar.shortcut = [new Date(new Date(date[0]).setHours(0, 0, 0, 0)), new Date(new Date(date[1]).setHours(23, 59, 59, 0))]
+        this.curDateTime =  JSON.parse(JSON.stringify([date[0].split(' ')[0]+' 00:00',  date[1].split(' ')[0] + ' 23:59']))
+      } else {
+        this.curDateTime =  JSON.parse(JSON.stringify(date))
+      }
+      this.lastChooseDate = JSON.parse(JSON.stringify(this.curDateTime))
+    },
   }
 }
 </script>
-<style src="./index.scss" lang="scss"></style>
+<style src="./index.scss" lang="scss">
+
+</style>
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue
new file mode 100644
index 00000000000..ff8bd5c54af
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue
@@ -0,0 +1,165 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<template>
+  <div class="log" style="position:relative">
+
+    <log :logs="logs" :scriptViewState="scriptViewState"/>
+    <Page
+      ref="page"
+      :total="page.totalSize"
+      :page-size="page.pageSize"
+      :current="page.pageNow"
+      class-name="page engine-log-page"
+      size="small"
+      :prev-text="$t('message.linkis.previousPage')" :next-text="$t('message.linkis.nextPage')"
+      @on-change="change"/>
+  </div>
+</template>
+<script>
+import api from '@/common/service/api';
+import log from '@/components/consoleComponent/log.vue'
+import elementResizeEvent from '@/common/helper/elementResizeEvent';
+export default {
+  components: {
+    log
+  },
+  props: {
+    logType: {
+      default: '',
+      type: String,
+    }
+  },
+  data() {
+    return {
+      page: {
+        totalSize: 0,
+        pageSize: 1000,
+        pageNow: 1,
+      },
+      logs: {
+        all: ''
+      },
+      scriptViewState: {
+        bottomContentHeight: window.innerHeight - 353
+      },
+      param: {},
+      engineType: '',
+    };
+  },
+  computed: {
+  },
+  created() {
+
+  },
+  mounted() {
+    window.addEventListener("resize", this.resize);
+    elementResizeEvent.bind(this.$el, this.resize);
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.resize);
+    elementResizeEvent.unbind(this.$el);
+  },
+  methods: {
+    // Toggle pagination(切换分页)
+    change(val) {
+      this.page.pageNow = val;
+      this.getLogs((val - 1) * this.page.pageSize)
+    },
+    clearLogs() {
+      this.logs = {
+        all: '',
+      }
+      this.tabName = 'stdout'
+    },
+    async getLogs(fromLine, param) {
+      if (param) {
+        this.param = param
+        this.engineType = param.engineType
+      }
+      if (this.param) {
+        const params = {
+          applicationName: this.param.applicationName,
+          emInstance: this.param.emInstance,
+          instance: this.param.instance,
+          parameters: {
+            pageSize: 1000,
+            fromLine,
+            logType: this.logType,
+            logDirSuffix: this.param.logDirSuffix,
+            ticketId: this.param.ticketId
+          }
+        }
+        let res = await api.fetch('/linkisManager/openEngineLog', params, 'post') || {};
+        this.param.logPath = res.result?.logPath?.split('/').slice(0, -1).join('/');
+        if (res && res.result) {
+          if (res.result.rows < 1000) { // the last page(最后一页)
+            this.page.totalSize = this.page.pageNow * 1000
+          } else {
+            this.page.totalSize = (this.page.pageNow + 1) * 1000
+          }
+          this.logs = {
+            all: res.result.logs ? res.result.logs.join('\n') : ''
+          }
+        }
+      }
+    },
+    resize() {
+      this.scriptViewState = {
+        bottomContentHeight: window.innerHeight - 353
+      }
+    },
+    onClickTabs(name) {
+      this.tabName = name
+      this.page.pageNow = 1
+      this.getLogs(0)
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.btns {
+  position: absolute;
+  top: -2px;
+  right: 20px;
+  display: grid;
+  grid-template-columns: auto auto;
+  justify-items: end;
+  .downloadButton {
+    margin-top: 2px
+  }
+  .backButton {
+    margin-top: 2px
+  }
+}
+.page {
+  text-align: center
+}
+</style>
+<style lang="scss" scoped>
+.engine-log-page .ivu-page-item, .engine-log-page .ivu-page-item-jump-prev {
+  display: none;
+}
+.engine-log-page li.ivu-page-next {
+  padding-left: 20px;
+}
+.log {
+  .workbench-log-view {
+    height: calc(100% - 24px) !important;
+  }
+}
+</style>
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
index 67556e127e1..fc1574e1b63 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
@@ -1,3 +1,4 @@
+
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one or more
   ~ contributor license agreements.  See the NOTICE file distributed with
@@ -15,17 +16,24 @@
   ~ limitations under the License.
   -->
 
+
 <template>
   <div class="global-history">
-    <Tabs @on-click="onClickTabs">
-      <TabPane name="log" :label="$t('message.linkis.log')"></TabPane>
-      <!-- <TabPane name="detail" :label="$t('message.linkis.detail')" disabled></TabPane> -->
-      <TabPane name="result" :label="$t('message.linkis.result')"></TabPane>
-      <TabPane v-if="hasEngine" name="engineLog" :label="$t('message.linkis.engineLog')"></TabPane>
+    <Tabs v-model="tabName" @on-click="onClickTabs">
+      <TabPane
+        v-for="tab in tabs"
+        :key="tab.name"
+        :name="tab.name"
+        :label="$t(tab.label)">
+      </TabPane>
     </Tabs>
+    <!-- <Button v-if="tabName === 'log' && yarnAddress" class="jumpButton" type="primary" @click="jump">{{$t('message.linkis.jump')}}</Button> -->
+    <Button v-if="tabName === 'log'" class="foldButton" type="primary" @click="fold">{{foldFlag ? $t('message.linkis.unfold') : $t('message.linkis.fold')}}</Button>
     <Button v-if="!isHistoryDetail" class="backButton" type="primary" @click="back">{{$t('message.linkis.back')}}</Button>
+
     <Icon v-show="isLoading" type="ios-loading" size="30" class="global-history-loading" />
-    <log v-if="tabName === 'log'" :logs="logs" :from-line="fromLine" :script-view-state="scriptViewState" />
+    <log ref="logRef" key="log" v-if="tabName === 'log'" :logs="logs" :from-line="fromLine" :script-view-state="scriptViewState" @tabClick="handleTabClick" />
+    <log ref="codeRef" key="code" v-if="tabName === 'code'" :logs="codes" :from-line="fromLine" :script-view-state="scriptViewState" @tabClick="handleTabClick" status="code" />
     <result
       v-if="tabName === 'result'"
       class="result-class"
@@ -41,27 +49,37 @@
       :visualParams="visualParams"
     />
     <ViewLog ref="logPanel" :inHistory="true" v-show="tabName === 'engineLog' && hasEngine" @back="showviewlog = false" />
+    <logWithPage ref="udfLog" logType="udfLog" v-show="tabName === 'udfLog' && showUDF && hasEngine" />
+
+    <term ref="termRef" v-if="tabName === 'terminal'" :logs="termLogs" :script-view-state="scriptViewState" :loading="termLogLoading" />
   </div>
 </template>
 <script>
 import result from '@/components/consoleComponent/result.vue'
+import logWithPage from './log.vue';
 import log from '@/components/consoleComponent/log.vue'
+import term from '@/components/consoleComponent/term.vue'
 import api from '@/common/service/api'
 import mixin from '@/common/service/mixin'
 import util from '@/common/util'
 import ViewLog from '@/apps/linkis/module/resourceManagement/log.vue'
-import { isUndefined } from 'lodash'
+import { cloneDeep, isUndefined } from 'lodash'
+import storage from '@/common/helper/storage';
+
 export default {
   name: 'viewHistory',
   components: {
     log,
     result,
-    ViewLog
+    ViewLog,
+    term,
+    logWithPage
   },
   mixins: [mixin],
   props: {},
   data() {
     return {
+      foldFlag: true,
       hasResultData: false,
       isLoading: true,
       tabName: 'log',
@@ -93,36 +111,77 @@ export default {
         warning: '',
         info: ''
       },
+      codes: { code: '' },
+      termLogs: '',
+      termLogLoading: false,
       engineLogs: '',
       fromLine: 1,
       isAdminModel: false,
       jobhistoryTask: null,
       hasEngine: false,
-      param: {}
+      yarnAddress: '',
+      logTimer: null,
+      preName: 'log',
+      showUDF: false,
+      tabs: [],
     }
   },
-  created() {
+  async created() {
     this.hasResultData = false
-  },
-  async mounted() {
-    let taskID = this.$route.query.taskID
     let engineInstance = this.$route.query.engineInstance
 
-    if(engineInstance) {
-      let url = '/linkisManager/ecinfo/ecrHistoryList?';
-      const endDate = new Date(); 
-      const startDate = new Date();
-      startDate.setMonth(startDate.getMonth() - 3);
-      url += `instance=${engineInstance}&startDate=${this.formatDate(startDate)}&endDate=${this.formatDate(endDate)}`;
-      const res = await api.fetch(url,'get')
-      const param = res.engineList[0]
-      this.param = param;
-      this.hasEngine = !!param;
-         
+    const engineLogOnlyAdminEnable = storage.get('engineLogOnlyAdminEnable')
+    // 仅管理员可以查看引擎日志
+    const isAdminShowEngineLog = !engineLogOnlyAdminEnable || (engineLogOnlyAdminEnable && (storage.get('isLogAdmin') || storage.get('isLogHistoryAdmin') || storage.get('isLogDeptAdmin')))
+    let taskID = this.$route.query.taskID
+    await this.initHistory(taskID);
+    if(engineInstance && isAdminShowEngineLog) {
+      let hasEngine = (!!this.jobhistoryTask.ticketId && !!this.jobhistoryTask.ecmInstance && !!this.jobhistoryTask.engineInstance && !!this.jobhistoryTask.engineLogPath);
+      if(!hasEngine){
+        // 可能是因为老数据在get里面没有 再查一下ecrHistoryList试试
+        let url = '/linkisManager/ecinfo/ecrHistoryList?';
+        const endDate = new Date();
+        const startDate = new Date();
+        startDate.setMonth(startDate.getMonth() - 3);
+        url += `instance=${engineInstance}&startDate=${this.formatDate(startDate)}&endDate=${this.formatDate(endDate)}`;
+        const res = await api.fetch(url,'get')
+        const param = res.engineList[0]
+        if(param){
+          this.jobhistoryTask.ticketId = param.ticketId;
+          this.jobhistoryTask.engineType = param.engineType;
+          this.jobhistoryTask.ecmInstance = param.ecmInstance;
+          this.jobhistoryTask.engineInstance = param.serviceInstance;
+          this.jobhistoryTask.engineLogPath = param.logDirSuffix;
+          this.jobhistoryTask.udfLogPath = param.logDirSuffix;
+        }
+      }
+      this.hasEngine = (!!this.jobhistoryTask.ticketId && !!this.jobhistoryTask.ecmInstance && !!this.jobhistoryTask.engineInstance && !!this.jobhistoryTask.engineLogPath);
+      this.showUDF = this.hasEngine && ['spark', 'hive'].includes(this.jobhistoryTask?.engineType || '')
+    }
+    this.tabs = [
+      { name: 'log', label: 'message.linkis.log' },
+      { name: 'code', label: 'message.linkis.executionCode' },
+      // { name: 'detail', label: 'message.linkis.detail', disabled: true },
+      { name: 'result', label: 'message.linkis.result' },
+      { name: 'engineLog', label: 'message.linkis.engineLog' },
+      { name: 'udfLog', label: 'message.linkis.udfLog' },
+      { name: 'terminal', label: 'message.linkis.diagnosticLog' }
+    ]
+    if(!this.hasEngine) {
+      this.tabs = this.tabs.filter(tab => tab.name !== 'engineLog')
+    }
+    if(!this.showUDF) {
+      this.tabs = this.tabs.filter(tab => tab.name !== 'udfLog')
+    }
+  },
+  destroyed() {
+    if(this.logTimer) {
+      clearTimeout(this.logTimer);
     }
-    this.initHistory(taskID);
+  },
+  async mounted() {
     const node = document.getElementsByClassName('global-history')[0];
-    this.scriptViewState.bottomContentHeight = node.clientHeight - 85
+    this.scriptViewState.bottomContentHeight = node.clientHeight - 85;
   },
   computed: {
     isHistoryDetail() {
@@ -130,9 +189,27 @@ export default {
     }
   },
   methods: {
+    handleTabClick() {
+      this.foldFlag = true;
+    },
     // The request is triggered when the tab is clicked, and the log is requested at the beginning, and no judgment is made.(点击tab时触发请求，log初始就请求了，不做判断)
-    onClickTabs(name) {
+    async onClickTabs(name) {
+      const canResultSet = sessionStorage.getItem('canResultSet');
+      if(name === 'result' && canResultSet === 'false') {
+        try {
+          setTimeout(() => {
+            this.tabName = this.preName;
+          }, 0);
+          window.open(`http://${window.location.host}/#/results?parentPath=${this.jobhistoryTask.resultLocation}&taskId=${this.$route.query.taskID}&fileName=example.${this.jobhistoryTask.runType}`, '_blank')
+
+          return;
+        } catch (error) {
+          window.console.error(error)
+        }
+
+      }
       this.tabName = name
+      this.preName = name
       if (name === 'result') {
         // Determine whether it is a result set(判断是否为结果集)
         if (this.hasResultData) return // Determine whether the data has been obtained, and return directly if it is obtained(判断是否已经获取过数据，获取过则直接返回)
@@ -146,17 +223,56 @@ export default {
           })
         }
       } else if(name === 'engineLog') {
-        if(this.param) {
+        if(this.jobhistoryTask) {
           this.$refs.logPanel.getLogs(0, {
             applicationName: "linkis-cg-engineconn",
-            emInstance: this.param?.ecmInstance || '',
-            instance: this.param?.serviceInstance || '',
-            ticketId: this.param?.ticketId || '',
-            engineType: this.param?.engineType || '',
-            logDirSuffix: this.param?.logDirSuffix || '',
+            emInstance: this.jobhistoryTask.ecmInstance || '',
+            instance: this.jobhistoryTask.engineInstance || '',
+            ticketId: this.jobhistoryTask.ticketId || '',
+            engineType: this.jobhistoryTask.engineType || '',
+            logDirSuffix: this.jobhistoryTask.engineLogPath || '',
+          })
+        }
+
+      } else if(name === 'udfLog') {
+        if(this.jobhistoryTask) {
+          this.$refs.udfLog.getLogs(0, {
+            applicationName: "linkis-cg-engineconn",
+            emInstance: this.jobhistoryTask.ecmInstance || '',
+            instance: this.jobhistoryTask.engineInstance || '',
+            ticketId: this.jobhistoryTask.ticketId || '',
+            engineType: this.jobhistoryTask.engineType || '',
+            logDirSuffix: this.jobhistoryTask.engineLogPath || '',
           })
         }
 
+      } else if(name === 'code') {
+        // window.console.log('click code')
+        if(this.codes.code) return;
+        const res = await api.fetch(`/jobhistory/job-extra-info?jobId=${this.$route.query.taskID}`, 'get')
+        const { executionCode } = res.metricsMap;
+        this.codes = { code: executionCode };
+      } else if(name === 'terminal') {
+        if (['Scheduled', 'Running'].includes(this.$route.query.status) || !this.termLogs) {
+          try {
+            this.termLogLoading = true;
+            const res = await api.fetch(`/jobhistory/diagnosis-query?taskID=${this.$route.query.taskID}`, 'get')
+            this.termLogLoading = false;
+            const { diagnosisMsg } = res;
+            this.termLogs = diagnosisMsg;
+          } catch (err) {
+            window.console.error(err);
+            this.termLogs = '';
+          }
+
+        }
+
+      } else {
+        this.$nextTick(() => {
+          this.$refs.logRef.fold();
+          this.foldFlag = true;
+        })
+
       }
     },
     changeResultSet(data, cb) {
@@ -177,25 +293,40 @@ export default {
             url,
             {
               path: resultPath,
+              enableLimit: true,
               pageSize
             },
             'get'
           )
           .then(ret => {
             let result = {}
-            if (ret.metadata && ret.metadata.length >= 500) {
+            if (ret.display_prohibited) {
               result = {
                 headRows: [],
                 bodyRows: [],
                 // If totalLine is null, it will be displayed as 0(如果totalLine是null，就显示为0)
                 total: ret.totalLine ? ret.totalLine : 0,
                 // (If the content is null, it will display no data)如果内容为null,就显示暂无数据
-                type: ret.fileContent ? ret.type : 0,
+                type: ret.type,
                 path: resultPath,
                 current: 1,
                 size: 20,
-                hugeData: true
+                hugeData: true,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
               }
+            } else if(ret.column_limit_display) {
+              result = {
+                headRows: ret.metadata,
+                bodyRows: ret.fileContent,
+                // If totalLine is null, it will be displayed as 0(如果totalLine是null，就显示为0)
+                total: ret.totalLine ? ret.totalLine : 0,
+                // If the content is null, it will display no data(如果内容为null,就显示暂无数据)
+                type: ret.fileContent ? ret.type : 0,
+                path: resultPath,
+                current: 1,
+                size: 20,
+                tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+              };
             } else {
               result = {
                 headRows: ret.metadata,
@@ -228,6 +359,14 @@ export default {
         cb()
       }
     },
+    fold() {
+      if(this.foldFlag) {
+        this.$refs.logRef.unfold()
+      } else {
+        this.$refs.logRef.fold()
+      }
+      this.foldFlag = !this.foldFlag;
+    },
     // Format the array into json form.(将数组格式化成json形式。)
     openAnalysisTab(type) {
       this.visualShow = type
@@ -324,13 +463,53 @@ export default {
 
       return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     },
+    async getLogs(jobhistory) {
+      const params = {
+        path: jobhistory.task.logPath
+      }
+      if (this.$route.query.proxyUser) {
+        params.proxyUser = this.$route.query.proxyUser
+      }
+      let openLog = {}
+      if (this.$route.query.status === 'Scheduled' || this.$route.query.status === 'Running') {
+        const tempParams = {
+          fromLine: this.fromLine,
+          size: 10000,
+        }
+        openLog = await api.fetch(`/entrance/${this.$route.query.execID}/log`, tempParams, 'get')
+      } else {
+        openLog = await api.fetch('/filesystem/openLog', params, 'get')
+      }
+      if (openLog) {
+        const log = cloneDeep(this.logs)
+        const convertLogs = util.convertLog(openLog.log)
+        Object.keys(convertLogs).forEach(key => {
+          if (convertLogs[key]) {
+            log[key] += convertLogs[key] + '\n'
+          }
+        })
+        this.logs = log
+        this.fromLine = openLog.fromLine
+        this.$nextTick(() => {
+          this.$refs.logRef.fold();
+          this.foldFlag = true;
+        })
+        if (convertLogs['all'].split('\n').length >= 10000 && ['Scheduled', 'Running'].includes(this.$route.query.status)) {
+          if(this.logTimer) clearTimeout(this.logTimer);
+          this.logTimer = setTimeout(async () => await this.getLogs(jobhistory), 2000);
+        }
+      }
+    },
     // Get historical details(获取历史详情)
     async initHistory(jobId) {
       try {
         let jobhistory = await api.fetch(`/jobhistory/${jobId}/get`, 'get')
         const option = jobhistory.task
+        // const executionCode = option.executionCode;
         this.jobhistoryTask = option
         this.script.runType = option.runType
+        this.yarnAddress = option.yarnAddress
+        // this.codes = { code: executionCode }
         if (!jobhistory.task.logPath) {
           const errCode = jobhistory.task.errCode
             ? `\n${this.$t('message.linkis.errorCode')}：${
@@ -347,33 +526,8 @@ export default {
           this.fromLine = 1
           return
         }
-        const params = {
-          path: jobhistory.task.logPath
-        }
-        if (this.$route.query.proxyUser) {
-          params.proxyUser = this.$route.query.proxyUser
-        }
-        let openLog = {}
-        if (this.$route.query.status === 'Scheduled' || this.$route.query.status === 'Running') {
-          const tempParams = {
-            fromLine: this.fromLine,
-            size: -1,
-          }
-          openLog = await api.fetch(`/entrance/${this.$route.query.execID}/log`, tempParams, 'get')
-        } else {
-          openLog = await api.fetch('/filesystem/openLog', params, 'get')
-        }
-        if (openLog) {
-          const log = { all: '', error: '', warning: '', info: '' }
-          const convertLogs = util.convertLog(openLog.log)
-          Object.keys(convertLogs).forEach(key => {
-            if (convertLogs[key]) {
-              log[key] += convertLogs[key] + '\n'
-            }
-          })
-          this.logs = log
-          this.fromLine = log['all'].split('\n').length
-        }
+        await this.getLogs(jobhistory);
+
         this.isLoading = false
       } catch (errorMsg) {
         window.console.error(errorMsg)
@@ -406,21 +560,36 @@ export default {
                 {
                   path: currentResultPath,
                   page: 1,
+                  enableLimit: true,
                   pageSize: 5000
                 },
                 'get'
               )
               .then(ret => {
                 let tmpResult = {}
-                if (ret.metadata && ret.metadata.length >= 500) {
+                if (ret.display_prohibited) {
                   tmpResult = {
                     headRows: [],
                     bodyRows: [],
                     total: ret.totalLine,
                     type: ret.type,
                     path: currentResultPath,
-                    hugeData: true
-                  }
+                    hugeData: true,
+                    tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg
+                  };
+                } else if(ret.column_limit_display) {
+                  tmpResult = {
+                    headRows: ret.metadata,
+                    bodyRows: ret.fileContent,
+                    // If totalLine is null, it will be displayed as 0(如果totalLine是null，就显示为0)
+                    total: ret.totalLine,
+                    // If the content is null, it will display no data(如果内容为null,就显示暂无数据)
+                    type: ret.type,
+                    path: currentResultPath,
+                    current: 1,
+                    size: 20,
+                    tipMsg: localStorage.getItem("locale") === "en" ? ret.en_msg : ret.zh_msg,
+                  };
                 } else {
                   tmpResult = {
                     headRows: ret.metadata,
@@ -466,22 +635,35 @@ export default {
         return this.$Message.warning(this.$t('message.linkis.logLoading'))
       }
       this.$router.go(-1)
-    }
+    },
+    // quick jump to yarn log page(快速跳转至yarn日志页面)
+    // jump() {
+    //   window.open(this.yarnAddress, '_blank')
+    // }
   }
 }
 </script>
 <style lang="scss" scoped>
-
+.foldButton {
+  position: absolute;
+  top: 0;
+  right:83px;
+}
+// .jumpButton {
+//   position: absolute;
+//   top: 0;
+//   right:146px;
+// }
 
 .backButton {
   position: absolute;
   top: 0;
   right: 20px;
 }
-/deep/ .table-div {
+::v-deep .table-div {
   height: 100% !important;
 }
-/deep/ .log {
+::v-deep .log {
     height: calc(100% - 70px)
 }
 </style>
diff --git a/linkis-web/src/apps/linkis/module/header/index.vue b/linkis-web/src/apps/linkis/module/header/index.vue
index 7af5a55c57b..1486ee110b6 100644
--- a/linkis-web/src/apps/linkis/module/header/index.vue
+++ b/linkis-web/src/apps/linkis/module/header/index.vue
@@ -99,13 +99,13 @@ export default {
     linkTo(type) {
       let url = "";
       if (type === "book") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch3/DSS_User_Manual.md`;
       } else if (type === "github") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio`;
       } else if (type === "freedback") {
-        url = "https://linkis.apache.org/";
+        url = "https://wj.qq.com/s2/4943071/c037/ ";
         if (localStorage.getItem("locale") === "en") {
-          url = "https://linkis.apache.org/";
+          url = "https://wj.qq.com/s2/4943706/5a8b";
         }
       }
       util.windowOpen(url);
diff --git a/linkis-web/src/apps/linkis/module/header/userMenu.vue b/linkis-web/src/apps/linkis/module/header/userMenu.vue
index 7e93ee0e6fb..15606b4efaa 100644
--- a/linkis-web/src/apps/linkis/module/header/userMenu.vue
+++ b/linkis-web/src/apps/linkis/module/header/userMenu.vue
@@ -124,8 +124,10 @@ export default {
       // Chinese to English(中文切换英文)
       if (localStorage.getItem('locale') === 'zh-CN') {
         localStorage.setItem('locale', 'en');
+        localStorage.setItem('fes_locale', 'en-US');
       } else {
         localStorage.setItem('locale', 'zh-CN');
+        localStorage.setItem('fes_locale', 'zh-CN');
       }
       window.location.reload();
     }
diff --git a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
index 2c833f66975..9ef476d9ff6 100644
--- a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
@@ -431,7 +431,7 @@ export default {
     }
   },
   created() {
-    this.userName = storage.get('userName') || storage.get('baseInfo', 'local').username || '';
+    this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
     this.init();
   }
 
diff --git a/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss b/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
index 663e993b23f..47b53622170 100644
--- a/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
+++ b/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
@@ -59,13 +59,13 @@
 }
 .microService {
   height: 100%;
-  /deep/ .ivu-tag {
+  ::v-deep .ivu-tag {
     max-width: 140px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  /deep/ .ivu-tooltip-inner {
+  ::v-deep .ivu-tooltip-inner {
     max-width: 100%;
   }
 }
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
index 74addbbc565..f9d4b8a2a11 100644
--- a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
@@ -34,7 +34,7 @@
       </Col>
       <Col span="9" class="search-item">
         <span class="lable">{{
-          $t("message.linkis.tableColumns.engineType")
+          $t("message.linkis.tableColumns.serveType")
         }}</span>
         <Select v-model="applicationName" class="input">
           <Option v-for="item in typeList" :key="item" :value="item">{{
diff --git a/linkis-web/src/apps/linkis/module/pythonModule/index.js b/linkis-web/src/apps/linkis/module/pythonModule/index.js
new file mode 100644
index 00000000000..126a73fa170
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/pythonModule/index.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+
+export default {
+  name: 'pythonModule',
+  events: [],
+  component: () => import('./index.vue'),
+};
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.scss b/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
index b45cfa80dba..732b2a29d43 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
@@ -45,7 +45,7 @@ td.table-name-column {
     cursor: pointer;
   }
 }
-/deep/.table-project-column {
+::v-deep .table-project-column {
   text-align: center;
   .ivu-table-cell {
     display: inline-block;
@@ -78,7 +78,7 @@ td.table-project-column {
     padding-right: 10px;
   }
 }
-/deep/.addTagClass {
+::v-deep .addTagClass {
   position: relative;
   z-index: 99;
 }
@@ -110,7 +110,7 @@ td.table-name-column {
     cursor: pointer;
   }
 }
-/deep/.table-project-column {
+::v-deep .table-project-column {
   text-align: center;
   .ivu-table-cell {
     display: inline-block;
@@ -124,20 +124,20 @@ td.table-project-column {
   text-align: center;
   padding: 10px 0;
 }
-/deep/.addTagClass {
+::v-deep .addTagClass {
   position: relative;
   z-index: 99;
 }
 .ecm, .ecmEngine {
   height: 100%;
   overflow: hidden;
-  /deep/ .ivu-tag {
+  ::v-deep .ivu-tag {
     max-width: 140px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-  /deep/ .ivu-tooltip-inner {
+  ::v-deep .ivu-tooltip-inner {
     max-width: 100%;
   }
 }
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index 5fc070bdbd0..ab6aeea90dd 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -143,25 +143,25 @@
     <template v-if="isAdminModel">
       <Table class="table-content" border :width="tableWidth" :columns="admincolumns" :data="adminTableData">
         <template slot-scope="{row}" slot="usedResource">
-          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instance')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instances')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="lockedResource">
-          <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instance')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instances')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="maxResource">
-          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instance')}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instances')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="leftResource">
-          <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instance')}`}}</span>
+          <span :class="'label-'+row.loadResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instances')}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnUsedResource">
-          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instance', true)}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instances', true)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnMaxResource">
-          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instance', true)}`}}</span>
+          <span>{{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instances', true)}`}}</span>
         </template>
         <template slot-scope="{row}" slot="yarnLeftResource">
-          <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instance', true)}`}}</span>
+          <span :class="'label-'+row.queueResourceStatus">{{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instances', true)}`}}</span>
         </template>
       </Table>
       <div class="page-bar">
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/log.vue b/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
index 837cfe94dce..5d583d9afb1 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
@@ -27,7 +27,7 @@
       <Button class="downloadButton" :style="!inHistory ? 'margin-right: 10px' : 'margin-right: 0px'" type="default" @click="downloadLog">{{$t('message.linkis.download')}}</Button>
       <Button v-if="!inHistory" class="backButton" type="primary" @click="back">{{$t('message.linkis.back')}}</Button>
     </div>
-    
+
     <log :logs="logs" :scriptViewState="scriptViewState"/>
     <Page
       ref="page"
@@ -104,7 +104,7 @@ export default {
         onOk: async () => {
           const {emInstance, instance, logPath } = this.param;
           // eslint-disable-next-line no-unused-vars
-          
+
           const url = `/api/rest_j/v1/engineconnManager/downloadEngineLog?emInstance=${emInstance}&instance=${instance}&logDirSuffix=${encodeURIComponent(logPath)}&logType=${this.tabName}`;
 
           const downloadLink = document.createElement('a');
@@ -116,7 +116,7 @@ export default {
           document.body.removeChild(downloadLink);
         }
       })
-      
+
     },
     async getLogs(fromLine, param) {
       if (param) {
@@ -137,7 +137,7 @@ export default {
           }
         }
         let res = await api.fetch('/linkisManager/openEngineLog', params, 'post') || {};
-        this.param.logPath = res.result.logPath.split('/').slice(0, -1).join('/');
+        this.param.logPath = res.result?.logPath?.split('/').slice(0, -1).join('/');
         if (res && res.result) {
           if (res.result.rows < 1000) { // the last page(最后一页)
             this.page.totalSize = this.page.pageNow * 1000
diff --git a/linkis-web/src/apps/linkis/module/setting/setting.vue b/linkis-web/src/apps/linkis/module/setting/setting.vue
index 7e6ea424d5a..b3bb9330a9f 100644
--- a/linkis-web/src/apps/linkis/module/setting/setting.vue
+++ b/linkis-web/src/apps/linkis/module/setting/setting.vue
@@ -398,8 +398,40 @@ export default {
         cb(true);
       }, 200);
     },
+    preCheckConfig() {
+      try {
+        this.fullTree.forEach((item) => {
+          if (item.settings) {
+            item.settings.forEach((s) => {
+              if (
+                s.key === "spark.conf" && s.configValue
+              ) {
+                const kvList = s.configValue.split(';').map(kv => kv.replace(/^\s+|\s+$/g,''));
+                kvList.forEach((kv) => {
+                  if(kv && !/^[\w.-]+=[\w.-]+$/.test(kv)) {
+                    this.unValidMsg = {key: s.key, msg: s.description}
+                    throw new Error('invalid')
+                  }
+                });
+                const formattedKvString = kvList.join(';\n');
+                s.configValue = formattedKvString.trim();
+              }
+            });
+          }
+        });
+        return true;
+      } catch(err) {
+        window.console.warn(err);
+        this.isAdvancedShow = true;
+        return false;
+      }
+    },
     save() {
       this.loading = true;
+      if(!this.preCheckConfig()) {
+        this.loading = false;
+        return;
+      }
       this.checkValid();
       api
         .fetch("/configuration/saveFullTree", {
@@ -411,6 +443,20 @@ export default {
           this.getAppVariable(this.activeMenu);
           this.unValidMsg = {};
           this.$Message.success(this.$t("message.linkis.save"));
+          this.$Modal.confirm({
+            title: this.$t('message.linkis.setting.killEngineTitle'),
+            content: this.$t('message.linkis.setting.killEngine'),
+            onOk: async () => {
+              try {
+                api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
+                  creator: this.currentTabName,
+                  engineType: this.subCategory[this.currentTabName] ? this.subCategory[this.currentTabName].categoryName : null
+                })
+              } catch (err) {
+                window.console.warn(err)
+              }
+            }
+          })
         })
         .catch((err) => {
           this.loading = false;
@@ -747,7 +793,7 @@ export default {
     font-size: 14px;
   }
   .tabs {
-    /deep/.ivu-tabs-bar {
+    ::v-deep .ivu-tabs-bar {
       &::before {
         content: '';
         display: block;
@@ -756,7 +802,7 @@ export default {
         float: left;
       }
     }
-    /deep/.ivu-tabs-tab:not(:last-of-type) {
+    ::v-deep .ivu-tabs-tab:not(:last-of-type) {
       position: relative;
       &::after {
         content: '';
diff --git a/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue b/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
index 2600cbf868b..751b80a0800 100644
--- a/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
+++ b/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
@@ -434,7 +434,7 @@ export default {
   top: 0;
   right: 20px;
 }
-/deep/ .table-div {
+::v-deep .table-div {
   height: 100% !important;
 }
 </style>
diff --git a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
index 4818e09b7a9..740d0b4457d 100644
--- a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
@@ -103,6 +103,12 @@
           <FormItem :label="$t('message.linkis.tenantTagManagement.desc')" prop="desc">
             <Input class="input" v-model="modalData.desc" style="width: 319px"></Input>
           </FormItem>
+          <FormItem :label="$t('message.linkis.ipListManagement.isValid')" prop="isValid">
+            <RadioGroup v-model="modalData.isValid">
+              <Radio label="Y">{{$t('message.linkis.ipListManagement.yes')}}</Radio>
+              <Radio label="N">{{$t('message.linkis.ipListManagement.no')}}</Radio>
+            </RadioGroup>
+          </FormItem>
         </Form>
         <div style="margin-top: 60px">
           <span style="width: 60px">{{ $t('message.linkis.tenantTagManagement.yourTagMapping') }}</span>
@@ -118,6 +124,7 @@
   </div>
 </template>
 <script>
+import {cloneDeep} from 'lodash'
 import storage from "@/common/helper/storage";
 import api from '@/common/service/api'
 export default {
@@ -146,7 +153,7 @@ export default {
         {
           title: this.$t('message.linkis.tenantTagManagement.userCreator'),
           key: 'userCreator',
-          width: 350,
+          width: 250,
           tooltip: true,
           align: 'center',
         },
@@ -157,6 +164,18 @@ export default {
           tooltip: true,
           align: 'center',
         },
+        {
+          title: this.$t('message.linkis.ipListManagement.isValid'),
+          key: 'isValid',
+          width: 100,
+          tooltip: true,
+          align: 'center',
+          render: (h, params) => {
+            return h('div', [
+              h('span', params.row.isValid === 'Y' ? this.$t('message.linkis.ipListManagement.yes') : this.$t('message.linkis.ipListManagement.no'))
+            ]);
+          }
+        },
         {
           title: this.$t('message.linkis.tenantTagManagement.createUser'),
           key: 'bussinessUser',
@@ -197,12 +216,26 @@ export default {
                   type: 'error',
                   size: 'small'
                 },
+                style: {
+                  marginRight: '5px'
+                },
                 on: {
                   click: () => {
                     this.delete(params.row)
                   }
                 }
-              }, this.$t('message.linkis.tenantTagManagement.delete'))
+              }, this.$t('message.linkis.tenantTagManagement.delete')),
+              h('Button', {
+                props: {
+                  type: params.row.isValid === 'N' ? 'success' : 'warning',
+                  size: 'small'
+                },
+                on: {
+                  click: () => {
+                    this.enable(params.row)
+                  }
+                }
+              }, params.row.isValid === 'N' ? this.$t('message.linkis.ipListManagement.enable') : this.$t('message.linkis.ipListManagement.disable')),
             ]);
           }
         }
@@ -215,7 +248,8 @@ export default {
         creator: '',
         tenantValue: '',
         bussinessUser: '',
-        desc: ''
+        desc: '',
+        isValid: 'Y',
       },
       modalDataRule: {
         user: [
@@ -228,7 +262,8 @@ export default {
         ],
         tenantValue: [
           {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
-          {pattern: /^[0-9a-zA-Z_\*\-]+$/, message: this.$t('message.linkis.tenantTagManagement.contentError2'), type: 'string'}
+          {pattern: /^[0-9a-zA-Z_\*\-]+$/, message: this.$t('message.linkis.tenantTagManagement.contentError2'), type: 'string'},
+          {type: 'string', max: 100, message: this.$t('message.linkis.tenantTagManagement.maxLen')},
         ],
         bussinessUser: [
           {required: true, message: this.$t('message.linkis.tenantTagManagement.notEmpty'), trigger: 'blur'},
@@ -286,10 +321,44 @@ export default {
       }
 
     },
+    enable(data) {
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.ipListManagement.confirmDel'),
+        content: data.isValid === 'N' ? this.$t('message.linkis.ipListManagement.confirmEnable', {name: `${data.id}`}) : this.$t('message.linkis.ipListManagement.confirmDisable', {name: `${data.id}`}),
+        onOk: async () => {
+          await this.confirmEnable(data);
+          await this.getTableData();
+        },
+      })
+    },
     async init() {
       this.loading = true;
       await this.getTableData();
       this.loading = false;
+    },
+    async confirmEnable(data) {
+      const status = data.isValid;
+      const tempData = cloneDeep(data);
+      delete tempData._index;
+      delete tempData._rowKey;
+      delete tempData.updateTime;
+      delete tempData.createTime;
+      delete tempData.userCreator;
+
+      tempData.isValid = tempData.isValid === 'Y' ? 'N' : 'Y';
+      try {
+        await api.fetch('/configuration/tenant-mapping/update-tenant', tempData, 'post');
+        if(status === 'N') {
+          this.$Message.success(this.$t('message.linkis.ipListManagement.enableSuccessfully'));
+        } else {
+          this.$Message.success(this.$t('message.linkis.ipListManagement.disableSuccessfully'));
+        }
+          
+      } catch (err) {
+        return;
+      }
+        
+      
     },
     async clearSearch() {
       this.queryData = {
@@ -348,14 +417,16 @@ export default {
         creator: '',
         tenantValue: '',
         bussinessUser: '',
-        desc: ''
+        desc: '',
+        isValid: 'Y',
       };
       this.editData = {
         user: '',
         creator: '',
         tenantValue: '',
         bussinessUser: '',
-        desc: ''
+        desc: '',
+        isValid: 'Y',
       };
       this.$refs.createTenantForm.resetFields();
     },
@@ -388,13 +459,13 @@ export default {
     },
     edit(data) {
       const {
-        id, user, creator, tenantValue, bussinessUser, desc
+        id, user, creator, tenantValue, bussinessUser, desc, isValid
       } = data
       this.modalData = {
-        id, user, creator, tenantValue, bussinessUser, desc
+        id, user, creator, tenantValue, bussinessUser, desc, isValid
       };
       this.editData = {
-        id, user, creator, tenantValue, bussinessUser, desc
+        id, user, creator, tenantValue, bussinessUser, desc, isValid
       };
       this.showCreateModal = true;
       this.tagIsExist = false;
@@ -434,7 +505,7 @@ export default {
     }
   },
   created() {
-    this.userName = storage.get('userName') || storage.get('baseInfo', 'local').username || '';
+    this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
     this.init();
   }
 
diff --git a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
index 382bebe97d1..3dac9914bea 100644
--- a/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
+++ b/linkis-web/src/apps/linkis/module/udfTree/EditForm/index.vue
@@ -252,7 +252,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 
-/deep/ .ivu-tree {
+::v-deep .ivu-tree {
   .ivu-tree-children {
     li {
       margin: 0px
diff --git a/linkis-web/src/apps/linkis/module/userConfig/index.vue b/linkis-web/src/apps/linkis/module/userConfig/index.vue
index 701a781c031..212752f8eaa 100644
--- a/linkis-web/src/apps/linkis/module/userConfig/index.vue
+++ b/linkis-web/src/apps/linkis/module/userConfig/index.vue
@@ -121,6 +121,12 @@
           <FormItem :label="$t('message.linkis.userConfig.configValue')" :rules="{required: !!defaultValue , message: $t('message.linkis.ipListManagement.notEmpty'), trigger: 'blur'}" prop="configValue">
             <Input class="input" v-model="modalData.configValue" clearable  style="width: 319px" :placeholder="$t('message.linkis.userConfig.configValuePro')"></Input>
           </FormItem>
+          <FormItem :label="$t('message.linkis.userConfig.isForceVerify')" prop="force">
+            <RadioGroup v-model="modalData.force">
+              <Radio label="false">{{$t('message.linkis.userConfig.yes')}}</Radio>
+              <Radio label="true">{{$t('message.linkis.userConfig.no')}}</Radio>
+            </RadioGroup>
+          </FormItem>
         </Form>
       </div>
       <div slot="footer">
@@ -241,7 +247,9 @@ export default {
         engineType: '',
         version: '',
         configKey: '',
-        configValue: ''
+        configValue: '',
+        force: "false",
+        configKeyId: ''
       },
       modalDataRule: {
         user: [
@@ -305,7 +313,7 @@ export default {
         params.pageNow = this.page.pageNow;
         params.pageSize = this.page.pageSize;
         const res = await api.fetch("/configuration/userKeyValue", params, "get")
-          
+
         this.datalist = res.configValueList.map((item) => {
           const labelValue = item.labelValue;
           const baseArr = labelValue.split(',');
@@ -333,7 +341,7 @@ export default {
             });
             this.engineTypeOptions = [...res.engineType];
             this.allEngineTypeOptions = [...res.engineType];
-            this.allEngineTypeOptions.unshift({label: this.$t('message.linkis.all'),value: '*'});
+            this.allEngineTypeOptions.unshift({label: this.$t('message.linkis.EnginePluginManagement.globalConfig'),value: '*'});
           })
       } catch(err) {
         return;
@@ -368,7 +376,9 @@ export default {
         engineType: '',
         version: '',
         configKey: '',
-        configValue: ''
+        configValue: '',
+        configKeyId: '',
+        force: 'false'
       }
       this.configOption = [];
       this.versionOption = [];
@@ -384,7 +394,8 @@ export default {
               this.page.pageNow = 1;
             }
             this.isRequesting = true
-            await api.fetch(target, this.modalData, "post")
+            const { force, configKeyId } = this.modalData
+            await api.fetch(target, {...this.modalData, force: JSON.parse(force), configKeyId: String(configKeyId)}, "post")
             await this.getTableData();
             this.cancel();
             this.$Message.success(this.$t('message.linkis.udf.success'));
@@ -400,12 +411,12 @@ export default {
     },
     edit(data) {
       const {
-        user, creator, engineType, version, key, configValue, defaultValue
+        user, creator, engineType, version, key, configValue, defaultValue, configKeyId
       } = data;
       this.configOption.push({value: key, label: key});
       this.defaultValue = defaultValue
       this.modalData = {
-        user, creator, engineType, version, configKey: key, configValue,
+        user, creator, engineType, version, configKey: key, configValue, force: 'false', configKeyId
       };
       this.versionOption = [{label: version, value: version}];
       this.showCreateModal = true;
@@ -485,7 +496,7 @@ export default {
     }
   },
   created() {
-    this.userName = storage.get('userName') || storage.get('baseInfo', 'local').username || '';
+    this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
     this.init();
     this.getEngineOptionsData();
   }
diff --git a/linkis-web/src/apps/linkis/router.js b/linkis-web/src/apps/linkis/router.js
index 70ea0b04541..5edb25b2c16 100644
--- a/linkis-web/src/apps/linkis/router.js
+++ b/linkis-web/src/apps/linkis/router.js
@@ -148,6 +148,16 @@ export default [
         publicPage: true,
       },
     },
+    {
+      name: 'eurekaService',
+      path: 'eurekaService',
+      component: () =>
+        import('./module/eurekaService/index.vue'),
+      meta: {
+        title: 'eurekaService',
+        publicPage: true,
+      },
+    },
     {
       name: 'datasource',
       path: 'datasource',
@@ -168,6 +178,16 @@ export default [
         publicPage: true,
       }
     },
+    {
+      name: 'departmentTagManagement',
+      path: 'departmentTagManagement',
+      component: () =>
+        import('./module/departmentTagManagement/index.vue'),
+      meta: {
+        title: 'departmentTagManagement',
+        publicPage: true,
+      }
+    },
     {
       name: 'errorCode',
       path: 'errorCode',
@@ -188,6 +208,16 @@ export default [
         publicPage: true,
       },
     },
+    {
+      name: 'acrossClusterRule',
+      path: 'acrossClusterRule',
+      component: () =>
+        import('./module/acrossClusterRule/index.vue'),
+      meta: {
+        title: 'acrossClusterRule',
+        publicPage: true,
+      },
+    },
     {
       name: 'gatewayAuthToken',
       path: 'gatewayAuthToken',
@@ -238,6 +268,16 @@ export default [
         publicPage: true,
       },
     },
+    {
+      name: 'pythonModule',
+      path: 'pythonModule',
+      component: () =>
+        import('./module/pythonModule/index.vue'),
+      meta: {
+        title: 'pythonModule',
+        publicPage: true,
+      },
+    },
     {
       name: 'datasourceAccess',
       path: 'datasourceAccess',
@@ -288,6 +328,16 @@ export default [
         publicPage: true,
       },
     },
+    {
+      name: 'codeQuery',
+      path: 'codeQuery',
+      component: () =>
+        import('./module/codeQuery/index.vue'),
+      meta: {
+        title: 'codeQuery',
+        publicPage: true,
+      },
+    },
     {
       name: 'configManagement',
       path: 'configManagement',
@@ -298,6 +348,16 @@ export default [
         publicPage: true,
       },
     },
+    {
+      name: 'codeDetail',
+      path: 'codeDetail',
+      component: () =>
+        import('./module/codeQuery/codeDetail/index.vue'),
+      meta: {
+        title: 'codeDetail',
+        publicPage: true,
+      },
+    },
     {
       name: 'viewHistoryDetail',
       path: 'viewHistoryDetail',
@@ -319,26 +379,6 @@ export default [
         publicPage: true,
       },
     },
-    {
-      name: 'statisticsDashboard',
-      path: 'statisticsDashboard',
-      component: () =>
-        import('./module/statisticsDashboard/index.vue'),
-      meta: {
-        title: 'statisticsDashboard',
-        publicPage: true,
-      },
-    },
-    {
-      name: 'statisticsDashboardDetail',
-      path: 'statisticsDashboardDetail',
-      component: () =>
-        import('./module/statisticsDashboard/statisticsDashboard.vue'),
-      meta: {
-        title: 'statisticsDashboardHistory',
-        publicPage: true,
-      },
-    },
     ],
   },
 ]
diff --git a/linkis-web/src/apps/linkis/view/layout.vue b/linkis-web/src/apps/linkis/view/layout.vue
index e581a4777dd..476e0d74b76 100644
--- a/linkis-web/src/apps/linkis/view/layout.vue
+++ b/linkis-web/src/apps/linkis/view/layout.vue
@@ -20,7 +20,7 @@
     <layout-header
       v-show="showHeader"
       @clear-session="clearSession"/>
-    <router-view/>
+    <router-view />
     <layout-footer v-show="showFooter"/>
   </div>
 </template>
@@ -28,6 +28,7 @@
 import headerModule from '../module/header';
 import footerModule from '@/dss/module/footer';
 import layoutMixin from '@/common/service/layoutMixin.js';
+import eventbus from '@/common/helper/eventbus';
 export default {
   components: {
     layoutFooter: footerModule.component,
@@ -41,6 +42,28 @@ export default {
     showFooter() {
       return this.$route.query.noFooter || location.search.indexOf('noFooter') < 0
     }
+  },
+  mounted() {
+    eventbus.on('show_app_update_notice', () => {
+      window.console.log('received message, update')
+      this.$Modal.confirm({
+        title: this.$t('message.linkis.findNewVer'),
+        content: this.$t('message.linkis.updateNow'),
+        onOk: async () => {
+          try {
+            location.reload()
+          } catch (err) {
+            window.console.warn(err)
+          }
+        },
+        onCancel: () => {
+          // do nothing
+        }
+      })
+    })
+  },
+  unmounted() {
+    eventbus.off('show_app_update_notice')
   }
 };
 </script>
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index 6530358eea7..474ca45c968 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -30,28 +30,28 @@
             <CellGroup v-for="(item, index2) in sideNavList.children" :key="index2"
               @on-click="handleCellClick">
               <Cell
-                v-if="!isLogAdmin? (item.path !=='/console/ECM')&&(item.path !=='/console/microService')&&(item.key !== '1-10')&&(item.key !== '1-12'):true"
+                v-if="!isLogAdmin? (item.path !=='/console/ECM')&&(item.path !=='/console/microService')&&(item.key !== '1-12'):true"
                 :key="index2" :class="{ crrentItem: crrentItem === item.key }" :title="item.name"
                 :name="item.key">
                 <div>
                   <span>{{item.name}}</span>
                   <div class="sub-menu-row">
                     <Icon
-                      v-show="item.showSubMenu && (item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12')"
+                      v-show="item.showSubMenu && (item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12' || item.key === '1-13')"
                       type="ios-arrow-down" class="user-icon" />
                     <Icon
-                      v-show="!item.showSubMenu && (item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12')"
+                      v-show="!item.showSubMenu && (item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12' || item.key === '1-13')"
                       type="ios-arrow-up" class="user-icon" />
                   </div>
                 </div>
                 <div
-                  v-if="(item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12') && !item.showSubMenu">
+                  v-if="(item.key === '1-8' || item.key === '1-9' || item.key === '1-10' || item.key === '1-12' || item.key === '1-13') && !item.showSubMenu">
                   <div @click.stop="">
                     <CellGroup
                       v-for="(item3, index3) in getChildMap(item.key).children"
                       :key="index3" @on-click="clickToRoute">
                       <div
-                        v-if="isLogAdmin ? true : item3.key === '1-8-1' || item3.key === '1-9-2' || item3.key === '1-9-1'">
+                        v-if="isLogAdmin ? true : ['1-8-1', '1-9-2', '1-9-1', '1-10-7', '1-13-1'].includes(item3.key)">
                         <Cell :key="index3" :class="{ crrentItem: crrentItem === item3.key }"
                           :title="item3.name" :name="item3.key" />
                       </div>
@@ -65,7 +65,7 @@
         <div class="content-body-side-right">
           <div class="content-body-side-right-title">
             <Breadcrumb
-              v-if="$route.name !== 'resource' && $route.name !== 'resourceEngineConnList'">
+              v-if="!['resource', 'resourceEngineConnList', 'microService', 'eurekaService'].includes($route.name)">
               <BreadcrumbItem :to="skipPath">
                 <Icon v-if="skipPath" type="ios-arrow-back" size="16" color="#338cf0"></Icon>
                 {{ breadcrumbSecondName }}
@@ -89,9 +89,21 @@
                 href="/resource">
               </Tab-pane>
             </Tabs>
+            <Tabs v-if="$route.name === 'microService' || $route.name === 'eurekaService'"
+              value="microService" @on-click="clickResourceTab" class="resource-tab">
+              <Tab-pane name="microService"
+                :label="$t('message.linkis.sideNavList.function.children.microserviceManage')"
+                href="/microService"></Tab-pane>
+              <Tab-pane name="eurekaService"
+                :label="$t('message.linkis.sideNavList.function.children.eurekaService')"
+                href="/eurekaService">
+              </Tab-pane>
+            </Tabs>
           </div>
           <div class="content-body-side-right-content">
-            <router-view></router-view>
+            <keep-alive :include="['codeQuery']">
+              <router-view />
+            </keep-alive>
           </div>
         </div>
       </div>
@@ -106,6 +118,31 @@ import storage from '@/common/helper/storage'
 import api from '@/common/service/api'
 export default {
   name: 'Layout',
+  mounted() {
+    window.addEventListener('message', (e) => {
+      if(e.data === 'Unauhorized') {
+        this.$emit('clear-session');
+        storage.set('need-refresh-proposals-hql', true);
+        storage.set('need-refresh-proposals-python', true);
+        this.$router.push({ path: '/login' });
+      }
+    })
+    if(!localStorage.getItem('hasRead')) {
+      this.clickToRoute('1-13-1')
+      // this.crrentItem = '1-13-1'
+      // this.$router.push({path: '/console/pythonModule'})
+    }
+  },
+  unmounted() {
+    window.removeEventListener('message', (e) => {
+      if(e.data === 'Unauhorized') {
+        this.$emit('clear-session');
+        storage.set('need-refresh-proposals-hql', true);
+        storage.set('need-refresh-proposals-python', true);
+        this.$router.push({ path: '/login' });
+      }
+    })
+  },
   data() {
     return {
       crrentItem: '1-1',
@@ -174,26 +211,28 @@ export default {
             showSubMenu: true,
           },
           {
-            key: '1-10',
+            key: '1-13',
             name: this.$t(
-              'message.linkis.sideNavList.function.children.basedataManagement'
+              'message.linkis.sideNavList.function.children.taskResourceManage'
             ),
             showSubMenu: true,
           },
           {
-            key: '1-12',
+            key: '1-10',
             name: this.$t(
-              'message.linkis.sideNavList.function.children.opsTool'
+              'message.linkis.sideNavList.function.children.basedataManagement'
             ),
             showSubMenu: true,
           },
+          { key: '1-11', name: this.$t('message.linkis.sideNavList.function.children.codeQuery'), path: '/console/codeQuery' },
           {
-            key: '1-13',
+            key: '1-12',
             name: this.$t(
-              'message.linkis.sideNavList.function.children.statisticsDashboard'
+              'message.linkis.sideNavList.function.children.opsTool'
             ),
-            path: '/console/statisticsDashboard',
+            showSubMenu: true,
           },
+          // {key: '1-13', name: this.$t('message.linkis.sideNavList.function.children.pythonModule'), path: '/console/pythonModule' },
         ],
       },
       datasourceNavList: {
@@ -268,6 +307,13 @@ export default {
             ),
             path: '/console/tenantTagManagement',
           },
+          {
+            key: '1-10-9',
+            name: this.$t(
+              'message.linkis.sideNavList.function.children.departmentTagManagement'
+            ),
+            path: '/console/departmentTagManagement',
+          },
           {
             key: '1-10-6',
             name: this.$t(
@@ -275,6 +321,13 @@ export default {
             ),
             path: '/console/ipListManagement',
           },
+          {
+            key: '1-10-7',
+            name: this.$t(
+              'message.linkis.sideNavList.function.children.acrossClusterRule'
+            ),
+            path: '/console/acrossClusterRule',
+          },
           {
             key: '1-10-8',
             name: this.$t(
@@ -306,6 +359,7 @@ export default {
           },
           {key: '1-9-3', name: this.$t('message.linkis.sideNavList.function.children.udfManager'), path: '/console/udfManager' },
           {key: '1-9-4', name: this.$t('message.linkis.sideNavList.function.children.udfTree'), path: '/console/udfTree' },
+          
         ],
       },
       opsTool: {
@@ -323,6 +377,21 @@ export default {
           },
         ],
       },
+      taskResourceManage: {
+        key: '1',
+        name: this.$t('message.linkis.sideNavList.function.children.taskResourceManage'),
+        padding: 0,
+        icon: 'ios-options',
+        children: [
+          {
+            key: '1-13-1',
+            name: this.$t(
+              'message.linkis.sideNavList.function.children.pythonModule'
+            ),
+            path: '/console/pythonModule',
+          },
+        ],
+      },
       breadcrumbSecondName: this.$t(
         'message.linkis.sideNavList.function.children.globalHistory'
       ),
@@ -344,7 +413,7 @@ export default {
       return this.$route.meta.noLayout
     },
   },
-  created() {
+  async created() {
     // Display the title of the page based on the path(根据路径显示页面的标题)
     this.sideNavList.children.forEach((element) => {
       if (element.path === this.$route.path) {
@@ -358,14 +427,17 @@ export default {
       this.crrentItem = '1-11'
     }
     // Get whether it is a historical administrator(获取是否是历史管理员权限)
-    api.fetch('/jobhistory/governanceStationAdmin', 'get').then((res) => {
+    await api.fetch('/jobhistory/governanceStationAdmin', 'get').then((res) => {
       this.isLogAdmin = res.admin
+      sessionStorage.setItem('canResultSet', res.canResultSet)
       storage.set('isLogAdmin', res.admin, 'session')
     })
+    this.isLogAdmin = storage.get('isLogAdmin', 'session');
     // Whether the result set can be downloaded
-    api.fetch('/user/baseinfo', 'get').then((res) => {
+    await api.fetch('/user/baseinfo', 'get').then((res) => {
       storage.set('resultSetExportEnable', res.resultSetExportEnable ? true : false,'session')
       storage.set('clusterInfo', res.linkisClusterName || '')
+      storage.set('engineLogOnlyAdminEnable', res.engineLogOnlyAdminEnable || false)
     })
   },
   methods: {
@@ -375,6 +447,7 @@ export default {
         '1-9': this.urmSideNavList,
         '1-10': this.basedataNavList,
         '1-12': this.opsTool,
+        '1-13': this.taskResourceManage
       }
       return map[key]
     },
@@ -389,16 +462,21 @@ export default {
           !this.sideNavList.children[7].showSubMenu
         return
       }
-      if (index === '1-10') {
+      if (index === '1-13') {
         this.sideNavList.children[8].showSubMenu =
           !this.sideNavList.children[8].showSubMenu
         return
       }
-      if (index === '1-12') {
+      if (index === '1-10') {
         this.sideNavList.children[9].showSubMenu =
           !this.sideNavList.children[9].showSubMenu
         return
       }
+      if (index === '1-12') {
+        this.sideNavList.children[11].showSubMenu =
+          !this.sideNavList.children[11].showSubMenu
+        return
+      }
       // index = index.split('-')[0] + '-' + index.split('-')[1]; //防止出现三级菜单
       let activedCellParent
       switch (index) {
@@ -418,13 +496,37 @@ export default {
           activedCellParent = this.urmSideNavList
           this.sideNavList.children[7].showSubMenu = false
           break
+        case '1-13-1':
+          activedCellParent = this.taskResourceManage
+          this.sideNavList.children[8].showSubMenu = false
+          break
         case '1-10-5':
           activedCellParent = this.basedataNavList
-          this.sideNavList.children[8].showSubMenu = false
+          this.sideNavList.children[9].showSubMenu = false
           break
         case '1-10-6':
           activedCellParent = this.basedataNavList
-          this.sideNavList.children[8].showSubMenu = false
+          this.sideNavList.children[9].showSubMenu = false
+          break
+        case '1-10-7':
+          activedCellParent = this.basedataNavList
+          this.sideNavList.children[9].showSubMenu = false
+          break
+        case '1-10-4':
+          activedCellParent = this.basedataNavList
+          this.sideNavList.children[9].showSubMenu = false
+          break
+        case '1-10-3':
+          activedCellParent = this.basedataNavList
+          this.sideNavList.children[9].showSubMenu = false
+          break
+        case '1-10-2':
+          activedCellParent = this.basedataNavList
+          this.sideNavList.children[9].showSubMenu = false
+          break
+        case '1-10-1':
+          activedCellParent = this.basedataNavList
+          this.sideNavList.children[9].showSubMenu = false
           break
         default:
           activedCellParent = this.sideNavList
@@ -465,7 +567,7 @@ export default {
       this.$router.push(`/console/${value}`)
     },
   },
-  beforeRouteEnter(to, from, next) {
+  async beforeRouteEnter(to, from, next) {
     if (to.name === 'FAQ' && from.name === 'Home') {
       next((vm) => {
         vm.breadcrumbFirstName = this.$t(
@@ -482,24 +584,37 @@ export default {
       !from.name
     ) {
       const lastActiveConsole = storage.get('lastActiveConsole')
-
       // If it is historical details, refresh directly(如果为历史详情则直接刷新)
       if (['viewHistory', 'viewHistoryDetail', 'codeDetail'].includes(to.name)) return next()
+      try {
+        let isLogAdmin = false;
+        await api.fetch('/jobhistory/governanceStationAdmin', 'get').then((res) => {
+          isLogAdmin = res.admin
+          storage.set('isLogAdmin', res.admin, 'session')
+          storage.set('isLogHistoryAdmin', res.historyAdmin, 'session')
+          storage.set('isLogDeptAdmin', res.deptAdmin, 'session')
+        })
 
-      next((vm) => {
-        if (lastActiveConsole) {
-          if (
-            lastActiveConsole.key === '1-9-1' ||
-            lastActiveConsole.key === '1-9-2'
-          ) {
-            vm.clickToRoute(lastActiveConsole.key)
+        next((vm) => {
+          const noAccess = !isLogAdmin && !['1-1', '1-2', '1-3', '1-4', '1-8-1', '1-9-1', '1-9-2', '1-10-7', '1-11'].includes(lastActiveConsole?.key)
+          if (lastActiveConsole && !noAccess ) {
+            if (
+              lastActiveConsole?.key === '1-9-1' ||
+              lastActiveConsole?.key === '1-9-2'
+            ) {
+              vm.clickToRoute(lastActiveConsole?.key)
+            } else {
+              vm.handleCellClick(lastActiveConsole?.key)
+            }
           } else {
-            vm.handleCellClick(lastActiveConsole.key)
+            vm.handleCellClick('1-1')
           }
-        } else {
-          vm.handleCellClick('1-1')
-        }
-      })
+        })
+      } catch(err) {
+        window.console.warn(err);
+      }
+
+
     }
     next()
   },
diff --git a/linkis-web/src/common/i18n/en.json b/linkis-web/src/common/i18n/en.json
index 23b21bca442..1f64e94352b 100644
--- a/linkis-web/src/common/i18n/en.json
+++ b/linkis-web/src/common/i18n/en.json
@@ -207,6 +207,7 @@
         "QD": "Starting",
         "LX": "By Category",
         "AZT": "By Status",
+        "AYY": "By Creator",
         "DDJK": "Waiting for API response!",
         "QDYQWFJS": "Cannot shut down an engine with starting status!",
         "WXZYQ": "No engine selected!",
@@ -265,7 +266,6 @@
         "userName": "Please enter your username",
         "remenber": "Remember me",
         "login": "Login",
-        "oauthLogin": "OAuth Login",
         "passwordHint": "Please enter your password",
         "password": "Please enter password！",
         "loginSuccess": "Login Success",
diff --git a/linkis-web/src/common/i18n/zh.json b/linkis-web/src/common/i18n/zh.json
index cc4c24e0c25..9d999977997 100644
--- a/linkis-web/src/common/i18n/zh.json
+++ b/linkis-web/src/common/i18n/zh.json
@@ -19,7 +19,7 @@
       "path": "请选择路径",
       "resultList": "结果集",
       "process": "执行耗时：",
-      "ok": "确认", 
+      "ok": "确认",
       "cancel": "取消",
       "delete": "删除",
       "failedNotice": "验证项未通过，请检查后再试！",
@@ -208,6 +208,7 @@
         "QD": "启动",
         "LX": "按类别",
         "AZT": "按状态",
+        "AYY": "按应用",
         "DDJK": "请等待接口返回！",
         "QDYQWFJS": "启动状态引擎无法结束！",
         "WXZYQ": "未选中引擎！",
@@ -266,7 +267,6 @@
         "userName": "请输入用户名",
         "remenber": "记住当前用户",
         "login": "登录",
-        "oauthLogin": "OAuth 登录",
         "passwordHint": "请输入密码！",
         "loginSuccess": "登录成功",
         "haveLogin": "您已经登录，请不要重复登录",
@@ -366,4 +366,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/linkis-web/src/components/consoleComponent/log.vue b/linkis-web/src/components/consoleComponent/log.vue
index fe497b9296f..5e66b5b4b76 100644
--- a/linkis-web/src/components/consoleComponent/log.vue
+++ b/linkis-web/src/components/consoleComponent/log.vue
@@ -21,7 +21,8 @@
       <div class="log-tools-control">
         <Tabs
           v-model="curPage"
-          class="log-tabs">
+          class="log-tabs"
+          @on-click="handleTabClick">
           <TabPane
             v-if="logs.all !== undefined"
             name="all"
@@ -41,6 +42,11 @@
             v-if="logs.info !== undefined"
             name="info"
             label="Info"/>
+          <TabPane
+            v-if="logs.code !== undefined"
+            name="code"
+            label="Code"
+          />
         </Tabs>
         <Input
           v-model="searchText"
@@ -128,7 +134,7 @@ export default {
       if (this.$refs.logEditor.editor) {
         this.$refs.logEditor.editor.revealLine(val);
       }
-    }
+    },
   },
   computed: {
     height() {
@@ -137,6 +143,9 @@ export default {
   },
   mounted() {
     elementResizeEvent.bind(this.$el, this.resize);
+    if(this.status === 'code') {
+      this.curPage = 'code'
+    }
   },
   beforeDestroy() {
     elementResizeEvent.unbind(this.$el);
@@ -147,12 +156,22 @@ export default {
         this.$refs.logEditor.editor.layout();
       }
     }, 1000),
+    handleTabClick() {
+      this.$nextTick(() => this.$refs.logEditor.fold())
+      this.$emit('tabClick')
+    },
     change() {
       this.scriptViewState.cacheLogScroll = this.$refs.logEditor.editor.getScrollTop();
     },
     editorOnload() {
       this.$refs.logEditor.editor.setScrollPosition({ scrollTop: this.scriptViewState.cacheLogScroll || 0 });
     },
+    unfold() {
+      this.$refs.logEditor.unfold();
+    },
+    fold() {
+      this.$refs.logEditor.fold();
+    },
     formattedLogs() {
       let logs = {};
       Object.keys(this.logs).map((key) => {
@@ -164,8 +183,22 @@ export default {
     getPointNum(logs) {
       const errorLogs = trim(logs.error).split('\n').filter((e) => !!e);
       const warnLogs = trim(logs.warning).split('\n').filter((e) => !!e);
-      this.errorNum = errorLogs.length;
-      this.warnNum = warnLogs.length;
+      const errorRegex = /\sERROR\s.*/;
+      const warnRegex = /\sWARN\s.*/;
+      let errorCount = 0;
+      let warnCount = 0;
+      for (const str of errorLogs) {
+        if (str.match(errorRegex)) {
+          errorCount++;
+        }
+      }
+      for (const str of warnLogs) {
+        if (str.match(warnRegex)) {
+          warnCount++;
+        }
+      }
+      this.errorNum = errorCount;
+      this.warnNum = warnCount;
     },
     getSearchList(log) {
       let MatchText = '';
diff --git a/linkis-web/src/components/consoleComponent/result.vue b/linkis-web/src/components/consoleComponent/result.vue
index d59ac743e57..f3d97dec5f2 100644
--- a/linkis-web/src/components/consoleComponent/result.vue
+++ b/linkis-web/src/components/consoleComponent/result.vue
@@ -97,7 +97,8 @@
           ref="watermask"></we-water-mask>
       </template>
       <div v-if="result.hugeData" :style="{height: resultHeight+'px', padding: '15px'}">
-        {{ $t('message.linkis.resultSet.prefixText') }}<a :href="`/#/results?resultPath=${resultPath}&fileName=${$route.query.fileName}`" target="_blank">{{ $t('message.linkis.resultSet.linkText') }}</a>
+        <p v-if="result.tipMsg">{{ result.tipMsg }}</p>
+        <p v-else>{{ $t('message.linkis.resultSet.prefixText') }}<a :href="`/#/results?resultPath=${resultPath}&fileName=${$route.query.fileName}`" target="_blank">{{ $t('message.linkis.resultSet.linkText') }}</a></p>
       </div>
     </div>
     <div v-else-if="['visual', 'dataWrangler'].includes(visualShow)  && resultType === '2'">
@@ -135,7 +136,8 @@
         :list="script.resultList"
         @change="changeSet">
       </result-set-list>
-      <div class="page-hint">
+      <div v-if="!result.hugeData" class="page-hint">
+        <p v-if="result.tipMsg" :title="result.tipMsg" style="margin-right: 20px;max-width: calc(100% - 250px);overflow: hidden;text-overflow: ellipsis;">{{ result.tipMsg }}</p>
         <Page
           :transfer="true"
           v-if="resultType === '2'"
@@ -737,7 +739,7 @@ export default {
 .result-normal-table .columnClass {
   height: 30px;
   line-height: 1.25;
-  /deep/.ivu-table-cell {
+  ::v-deep .ivu-table-cell {
     display: -webkit-box;
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 2;
diff --git a/linkis-web/src/components/consoleComponent/term.vue b/linkis-web/src/components/consoleComponent/term.vue
new file mode 100644
index 00000000000..817d5c0411a
--- /dev/null
+++ b/linkis-web/src/components/consoleComponent/term.vue
@@ -0,0 +1,177 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<template>
+  <div>
+    <div
+      ref="terminal" 
+      class="terminal-container"
+      :style="{ height: terminalHeight + 'px' }"
+    >
+      <Spin
+        v-show="loading"
+        size="large"
+        fix/>
+    </div>
+  </div>
+  
+</template>
+
+<script>
+import { Terminal } from 'xterm'
+import { FitAddon } from 'xterm-addon-fit'
+import 'xterm/css/xterm.css'
+
+export default {
+  name: 'TerminalLog',
+  props: {
+    logs: {
+      type: String,
+      default: ''
+    },
+    scriptViewState: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+
+  data() {
+    return {
+      terminal: null,
+      fitAddon: null,
+      terminalHeight: 400,
+    }
+  },
+
+  watch: {
+    logs(newVal) {
+      if (this.terminal && newVal) {
+        this.terminal.clear();
+        this.terminal.write(newVal)
+        setTimeout(() => {
+          this.terminal.scrollToTop();
+        }, 0)
+        
+      }
+    },
+    scriptViewState: {
+      handler(newVal) {
+        this.terminalHeight = newVal.bottomContentHeight
+        this.$nextTick(() => {
+          this.fitAddon?.fit()
+        })
+      },
+      deep: true,
+      immediate: true,
+    }
+  },
+
+  mounted() {
+    this.initTerminal()
+    window.addEventListener('resize', this.onResize)
+  },
+
+  beforeDestroy() {
+    window.removeEventListener('resize', this.onResize)
+    if (this.terminal) {
+      this.terminal.dispose()
+    }
+  },
+
+  methods: {
+    copyToClipboard(text) {
+      try {
+        // 优先使用 navigator.clipboard
+        if (navigator.clipboard && navigator.clipboard.writeText) {
+          return navigator.clipboard.writeText(text);
+        }
+    
+        // 降级使用 execCommand
+        const textarea = document.createElement('textarea');
+        textarea.value = text;
+        textarea.style.position = 'fixed';
+        textarea.style.left = '-9999px';
+        document.body.appendChild(textarea);
+        textarea.select();
+        document.execCommand('copy');
+        document.body.removeChild(textarea);
+        return Promise.resolve();
+      } catch (err) {
+        return Promise.reject(err);
+      }
+    },
+    initTerminal() {
+      this.terminal = new Terminal({
+        cursorBlink: false,
+        disableStdin: true,
+        theme: {
+          background: '#f5f5f5', // 浅灰色背景
+          foreground: "black",  // 黑色文字
+          selectionBackground: '#cccccc',   // 浅灰色选中背景色
+        //   selectionForeground: '#000000',
+        },
+        screenKeys: true,
+        fontSize: 14,
+        fontWeight: 'bold',
+        convertEol: true,        // 确保换行符正确处理
+        allowTransparency: true,  // 允许透明度
+        lineHeight: 1.2,      // 调整行高
+        padding: 8
+      })
+      
+      this.fitAddon = new FitAddon()
+      this.terminal.loadAddon(this.fitAddon)
+      
+      this.terminal.open(this.$refs.terminal)
+      this.fitAddon.fit()
+
+      if (this.logs) {
+        this.terminal.writeln(this.logs)
+        setTimeout(() => {
+          this.terminal.scrollToTop();
+        }, 0)
+      }
+      this.terminal.attachCustomKeyEventHandler((arg) => {
+        if (arg.ctrlKey && arg.code === "KeyC" && arg.type === "keydown") {
+          const selection = this.terminal.getSelection();
+          if (selection) {
+            this.copyToClipboard(selection);
+            return false;
+          }
+        }
+        return true;
+      });
+    },
+
+    onResize() {
+      this.fitAddon?.fit()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.terminal-container {
+  width: 100%;
+  overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/linkis-web/src/components/consoleComponent/toolbar.vue b/linkis-web/src/components/consoleComponent/toolbar.vue
index bcdff0af06c..bbbe640c51e 100644
--- a/linkis-web/src/components/consoleComponent/toolbar.vue
+++ b/linkis-web/src/components/consoleComponent/toolbar.vue
@@ -67,7 +67,7 @@
           </div>
         </Poptip>
       </li>
-      <li v-if="analysistext.flag !== 2 && rsDownload" :style="{cursor: rsDownload ? 'pointer': 'not-allowed'}">
+      <li v-if="analysistext.flag !== 2 && rsDownload && canDownload" :style="{cursor: rsDownload ? 'pointer': 'not-allowed'}">
         <Poptip
           :transfer="true"
           :width="500"
@@ -75,7 +75,7 @@
           placement="right"
           popper-class="we-poptip">
           <div @click.stop="openPopup('download')">
-            <i class="material-icons">cloud_download</i>
+            <i class="material-icons">cloud_download</i> 
             <span v-if="isIconLabelShow" :title="$t('message.common.download')" class="v-toolbar-icon">{{ $t('message.common.download') }}</span>
           </div>
           <div slot="content">
@@ -143,19 +143,20 @@
                 </RadioGroup>
               </Row>
             </div>
+            
+            <Row>
+              {{$t('message.common.toolbar.downloadMode')}}
+            </Row>
             <div v-if="isAll">
               <Row>
-                {{$t('message.common.toolbar.downloadMode')}}
+                <Checkbox v-model="allDownload">{{$t('message.common.toolbar.all', {count: String(allPath.length)})}}</Checkbox>
               </Row>
+            </div>
+            
+            <div v-if="isExcel">
               <Row>
-                <Checkbox v-model="allDownload">{{$t('message.common.toolbar.all', {count: String(allPath.length)})}}</Checkbox>
+                <Checkbox v-model="autoFormat">{{$t('message.common.toolbar.autoFormat')}}</Checkbox>
               </Row>
-              <div v-if="isExcel">
-                <Row>
-                  <Checkbox v-model="autoFormat">{{$t('message.common.toolbar.autoFormat')}}</Checkbox>
-                </Row>
-              </div>
-              
             </div>
             <Row class="confirm">
               <Col span="10">
@@ -300,8 +301,14 @@ export default {
       };
       return describe
     },
+    canDownload() {
+      if (this?.script?.resultList && this.script.resultList[this.script.resultSet]?.result?.tipMsg) {
+        return !this.script.resultList[this.script.resultSet].result.tipMsg;
+      }
+      return true
+    },
     isAll() {
-      return ['hql', 'sql'].includes(this.script.runType) || this.download.format === '1';
+      return ['hql', 'sql', 'tsql', 'nebula'].includes(this.script.runType) || this.download.format === '1';
     },
     isExcel() {
       return this.download.format === '2';
@@ -396,7 +403,7 @@ export default {
         let separator = encodeURIComponent(separatorItem.key || '');
         url += `&csvSeparator=${separator}`
       }
-      if(this.isAll && this.isExcel) {
+      if(this.isExcel) {
         url += `&autoFormat=${this.autoFormat}`
       }
       // Before downloading, use the heartbeat interface to confirm whether to log in(下载之前条用心跳接口确认是否登录)
diff --git a/linkis-web/src/components/editor/editor.vue b/linkis-web/src/components/editor/editor.vue
index 7ffa5558e0d..ea96d256085 100644
--- a/linkis-web/src/components/editor/editor.vue
+++ b/linkis-web/src/components/editor/editor.vue
@@ -195,6 +195,12 @@ export default {
     undo() {
       this.editor.trigger('anyString', 'undo');
     },
+    fold() {
+      this.editor.trigger('fold', 'editor.foldAll');
+    },
+    unfold() {
+      this.editor.trigger('unfold', 'editor.unfoldAll');
+    },
     redo() {
       this.editor.trigger('anyString', 'redo');
     },
diff --git a/linkis-web/src/components/editor/languages/log.js b/linkis-web/src/components/editor/languages/log.js
index d38ba145db2..75735a29f98 100644
--- a/linkis-web/src/components/editor/languages/log.js
+++ b/linkis-web/src/components/editor/languages/log.js
@@ -22,7 +22,9 @@ export default {
 
     monaco.languages.setMonarchTokensProvider('log', {
       tokenizer: {
+        // The earlier a rule is placed, the higher its priority. If a new rule does not take effect, try moving it to the top.(规则越靠前，优先级越高，如果新配置的规则不生效，尝试提到最前面去)
         root: [
+          [/^Caused by:\s.*/, 'log-caused'],
           [/(^[=a-zA-Z].*|\d\s.*)/, 'log-normal'],
           [/\sERROR\s.*/, 'log-error'],
           [/\sWARN\s.*/, 'log-warn'],
diff --git a/linkis-web/src/components/editor/theme/logView.js b/linkis-web/src/components/editor/theme/logView.js
index a9533e1405b..424c53f09d9 100644
--- a/linkis-web/src/components/editor/theme/logView.js
+++ b/linkis-web/src/components/editor/theme/logView.js
@@ -27,6 +27,7 @@ export default {
         { token: 'log-warn', foreground: 'FFA500' },
         { token: 'log-date', foreground: '008800' },
         { token: 'log-normal', foreground: '808080' },
+        { token: 'log-caused', foreground: 'ff0000', fontStyle: 'bold' },
       ],
       colors: {
         'editor.lineHighlightBackground': '#ffffff',
diff --git a/linkis-web/src/components/log/index.vue b/linkis-web/src/components/log/index.vue
index da73836c4c6..dc20c78996d 100644
--- a/linkis-web/src/components/log/index.vue
+++ b/linkis-web/src/components/log/index.vue
@@ -143,6 +143,12 @@ export default {
       this.errorNum = errorLogs.length;
       this.warnNum = warnLogs.length;
     },
+    unfold() {
+      this.$refs.logEditor.unfold();
+    },
+    fold() {
+      this.$refs.logEditor.fold();
+    },
     getSearchList(log) {
       let MatchText = '';
       const val = this.searchText;
diff --git a/linkis-web/src/components/table/table.vue b/linkis-web/src/components/table/table.vue
index e3ca03d90fd..6b9b7c4fedc 100644
--- a/linkis-web/src/components/table/table.vue
+++ b/linkis-web/src/components/table/table.vue
@@ -68,7 +68,7 @@
           cellpadding="0"
           cellspacing="0"
           border="0"
-          style="width:100%;table-layout:fixed;"
+          style="width:100%;table-layout:fixed;overflow:hidden"
           :style="{height:`${loadedNum*tdHeight}px`}"
         >
           <tbody>
@@ -95,7 +95,7 @@
                   v-if="item.key"
                   :key="`${index}-${indexs}`"
                   class="bottom-td"
-                  :class="[hasLineBreak(item.logic==undefined?items[item.key]:item.logic(items)) ? '' : 'hint--bottom hint--rounded']"
+                  :class="[hasLineBreak(item.logic==undefined?items[item.key]:item.logic(items)) ? '' : 'hint--right hint--rounded']"
                   :style="{width: item.width?`${item.width}px`:'auto'}"
                   :aria-label="item.logic==undefined?items[item.key]:item.logic(items)"
                 >
diff --git a/linkis-web/src/components/virtualTable/historyTable/historyTable.vue b/linkis-web/src/components/virtualTable/historyTable/historyTable.vue
index 65988bd7cf1..477ce5a1d56 100644
--- a/linkis-web/src/components/virtualTable/historyTable/historyTable.vue
+++ b/linkis-web/src/components/virtualTable/historyTable/historyTable.vue
@@ -53,7 +53,7 @@
             :style="{'text-align': th.align}"
             class="we-table-row-cell"
             :aria-label="td[th.key]"
-            :class="[!th.ellipsis ? '' : 'hint--bottom hint--rounded']">
+            :class="[!th.ellipsis ? '' : 'hint--right hint--rounded']">
             <div
               class="we-table-row-label"
               :style="{'width': th.width ? th.width + 'px' : getComputedWidth(th)}"
@@ -142,6 +142,8 @@ export default {
           return this.renderIf(cell, params);
         case 'checkbox':
           return this.renderCheckbox(value, cell, trIndex);
+        case 'multiConcat':
+          return this.render2Concat(value, cell, params);
         default:
           return null;
       }
@@ -339,6 +341,11 @@ export default {
         return h('span', {}, `${value} / ${cell[params.concatKey]}`);
       };
     },
+    render2Concat(value, cell, params) {
+      return (h) => {
+        return h('span', {}, `${value} / ${cell[params.concatKey1]} /  ${cell[params.concatKey2]}`);
+      };
+    },
     renderIf(cell, params) {
       const opt = params.action({ row: cell });
       return this[`render${opt.type}`](opt.value);
diff --git a/linkis-web/src/components/virtualTable/index.scss b/linkis-web/src/components/virtualTable/index.scss
index 5bc010d8d6a..b9cd814a7f9 100644
--- a/linkis-web/src/components/virtualTable/index.scss
+++ b/linkis-web/src/components/virtualTable/index.scss
@@ -146,6 +146,7 @@ $border-color: #e0e0e0;
     .we-table {
         border: 1px solid #dcdee2;
         table-layout: fixed;
+        overflow: hidden;
         .we-table-thead {
             background-color: #2d8cf0;
             color: #fff;
diff --git a/linkis-web/src/dss/module/header/index.scss b/linkis-web/src/dss/module/header/index.scss
index ad758b39b07..8edff761bd1 100644
--- a/linkis-web/src/dss/module/header/index.scss
+++ b/linkis-web/src/dss/module/header/index.scss
@@ -80,7 +80,7 @@
             }
         }
     }
-    /deep/ .ivu-select-dropdown {
+    ::v-deep .ivu-select-dropdown {
         padding: 0;
         margin: 0;
     }
diff --git a/linkis-web/src/dss/module/header/index.vue b/linkis-web/src/dss/module/header/index.vue
index 43dae0e0628..ee9c25e29f4 100644
--- a/linkis-web/src/dss/module/header/index.vue
+++ b/linkis-web/src/dss/module/header/index.vue
@@ -98,13 +98,13 @@ export default {
     linkTo(type) {
       let url = "";
       if (type === "book") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch3/DSS_User_Manual.md`;
       } else if (type === "github") {
-        url = `https://linkis.apache.org/`;
+        url = `https://github.com/WeBankFinTech/DataSphereStudio`;
       } else if (type === "freedback") {
-        url = "https://linkis.apache.org/";
+        url = "https://wj.qq.com/s2/4943071/c037/ ";
         if (localStorage.getItem("locale") === "en") {
-          url = "https://linkis.apache.org/";
+          url = "https://wj.qq.com/s2/4943706/5a8b";
         }
       }
       util.windowOpen(url);
diff --git a/linkis-web/src/dss/module/header/userMenu.vue b/linkis-web/src/dss/module/header/userMenu.vue
index 6c5216fcff1..42f9f46e690 100644
--- a/linkis-web/src/dss/module/header/userMenu.vue
+++ b/linkis-web/src/dss/module/header/userMenu.vue
@@ -126,8 +126,10 @@ export default {
       // Chinese to English(中文切换英文)
       if (localStorage.getItem('locale') === 'zh-CN') {
         localStorage.setItem('locale', 'en');
+        localStorage.setItem('fes_locale', 'en-US');
       } else {
         localStorage.setItem('locale', 'zh-CN');
+        localStorage.setItem('fes_locale', 'zh-CN');
       }
       window.location.reload();
     }
diff --git a/linkis-web/src/dss/module/resourceSimple/engine.vue b/linkis-web/src/dss/module/resourceSimple/engine.vue
index b9acb7c53cc..cc9833485ea 100644
--- a/linkis-web/src/dss/module/resourceSimple/engine.vue
+++ b/linkis-web/src/dss/module/resourceSimple/engine.vue
@@ -41,7 +41,7 @@
           class="engine-list"
           v-for="item in ideClassList"
           :key="item">
-          <span class="engline-name">{{ calssifyName(item) }}</span>
+          <span class="engline-name" :title="calssifyName(item)">{{ calssifyName(item) }}</span>
           <ul class="engine-ul">
             <template
               v-for="(subitem, index) in ideEngineList">
@@ -49,7 +49,7 @@
                 <li
                   class="engine-li"
                   :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
-                  v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+                  v-if="shouldRender(subitem, item)"
                   :key="index"
                   @click="subitem.isActive = !subitem.isActive">
                   <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
@@ -84,7 +84,7 @@
           class="engine-list"
           v-for="item in boardClassList"
           :key="item">
-          <span class="engline-name">{{ calssifyName(item) }}</span>
+          <span class="engline-name" :title="calssifyName(item)">{{ calssifyName(item) }}</span>
           <ul class="engine-ul">
             <template
               v-for="(subitem, index) in boardEngineList">
@@ -92,7 +92,7 @@
                 <li
                   class="engine-li"
                   :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
-                  v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+                  v-if="shouldRender(subitem, item)"
                   :key="index"
                   @click="subitem.isActive = !subitem.isActive">
                   <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
@@ -127,7 +127,7 @@
           class="engine-list"
           v-for="item in otherClassList"
           :key="item">
-          <span class="engline-name">{{ calssifyName(item) }}</span>
+          <span class="engline-name" :title="calssifyName(item)">{{ calssifyName(item) }}</span>
           <ul class="engine-ul">
             <template
               v-for="(subitem, index) in otherEngineList">
@@ -135,7 +135,7 @@
                 <li
                   class="engine-li"
                   :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
-                  v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+                  v-if="shouldRender(subitem, item)"
                   :key="index"
                   @click="subitem.isActive = !subitem.isActive">
                   <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
@@ -181,6 +181,10 @@ export default {
           value: 1,
           label: this.$t('message.common.resourceSimple.AZT'),
         },
+        {
+          value: 2,
+          label: this.$t('message.common.resourceSimple.AYY'),
+        },
       ],
       ideEngineList: [],
       boardEngineList: [],
@@ -268,6 +272,14 @@ export default {
           return params;
       }
     },
+    shouldRender(subitem, item) {
+      const isEngineTypeOrStatusMatch = subitem.engineType === item || subitem.engineStatus === item;
+      const isIdleAndErrorShuttingDownOrDead = 
+        (item === 'Idle' && ['Error', 'ShuttingDown', 'Dead'].includes(subitem.engineStatus));
+      const isCreatorMatch = subitem.creator === item;
+
+      return isEngineTypeOrStatusMatch || isIdleAndErrorShuttingDownOrDead ||isCreatorMatch;
+    },
     killJob() {
       if (this.loading) return this.$Message.warning(this.$t('message.common.resourceSimple.DDJK'));
       const params = [];
@@ -344,6 +356,12 @@ export default {
             classList.push(item.engineType);
           }
         });
+      } else if(selectData === 2) {
+        engineList.map((item) => {
+          if (!classList.includes(item.creator)) {
+            classList.push(item.creator);
+          }
+        });
       } else {
         engineList.map((item) => {
           if (!classList.includes('Idle') && (item.engineStatus === 'Error' || item.engineStatus === 'ShuttingDown' || item.engineStatus === 'Dead')) {
diff --git a/linkis-web/src/dss/module/resourceSimple/index.scss b/linkis-web/src/dss/module/resourceSimple/index.scss
index 71478c8a33a..78ad437b613 100644
--- a/linkis-web/src/dss/module/resourceSimple/index.scss
+++ b/linkis-web/src/dss/module/resourceSimple/index.scss
@@ -372,6 +372,11 @@
                 flex-basis: 62px;
                 font-size: 16px;
                 margin-right: 20px;
+                display: inline-block;
+                width: 62px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                
             }
             .engine-ul {
                 flex: 1;
diff --git a/linkis-web/src/dss/module/resourceSimple/job.vue b/linkis-web/src/dss/module/resourceSimple/job.vue
index f37b12bc1d6..c9848996350 100644
--- a/linkis-web/src/dss/module/resourceSimple/job.vue
+++ b/linkis-web/src/dss/module/resourceSimple/job.vue
@@ -16,11 +16,11 @@
   -->
 
 <template>
-  <div>
-    <Spin
-      v-if="loading"
-      size="large"
-      fix/>
+  <Spin
+    v-if="loading"
+    size="large"
+    fix/>
+  <div v-else >
     <div class="job-manager">
       <div
         class="job-manager-empty"
@@ -31,12 +31,12 @@
         :key="index">
         <span
           class="job-manager-title"
-          v-if="jobList.length && checkJobLength(type.en)">{{ type.cn }}</span>
+          v-if="jobList.length && checkJobLength(type)">{{ type }}</span>
         <div
           v-for="(item, subIndex) in jobList"
           :key="subIndex">
           <div
-            v-if="item.requestApplicationName === type.en"
+            v-if="item.requestApplicationName === type"
             class="job-manager-item-wrapper"
             :style="getClass(item)"
             :class="{'actived': item.isActive}"
@@ -108,35 +108,25 @@ export default {
     },
   },
   methods: {
-    getJobList() {
-      if(this.loading) return;
+    async getJobList() {
+      if (this.loading) return;
       this.jobList = [];
       this.loading = true;
-      api.fetch('/jobhistory/listundonetasks', {
-        pageSize: 100,
-        status: 'Running,Inited,Scheduled',
-      }, 'get').then((rst) => {
+      try {
+        const rst = await api.fetch('/jobhistory/listundonetasks', {}, 'get')
         this.loading = false;
-        // Eliminate tasks whose requestApplicationName is "nodeexecution"(剔除requestApplicationName为 "nodeexecution" 的task)
-        let tasks = rst.tasks.filter(item => item.requestApplicationName !== "nodeexecution" && item.requestApplicationName !== "CLI")
-        this.dispatch('Footer:updateRunningJob', tasks.length);
-        this.jobTypeList = [
-          { 'en': 'IDE', 'cn': this.$t('message.common.resourceSimple.YS') },
-          { 'en': 'Visualis', 'cn': this.$t('message.common.resourceSimple.ZH') },
-          { 'en': 'flowexecution', 'cn': this.$t('message.common.resourceSimple.FLOW1') },
-          { 'en': 'Scheduler', 'cn': this.$t('message.common.resourceSimple.FLOW2')}];
-        tasks.forEach((item) => {
+        (rst.tasks||[]).forEach((item) => {
           const tmpItem = Object.assign({}, item, { isActive: false, fileName: this.convertJson(item) });
           this.jobList.push(tmpItem);
+          if (this.jobTypeList.indexOf(item.requestApplicationName) < 0) {
+            this.jobTypeList.push(item.requestApplicationName)
+          }
         });
         this.jobList = orderBy(this.jobList, ['status', 'fileName']);
-        this.$emit('update-job', tasks.length);
-      }).catch((err) => {
+      } catch (err) {
         this.loading = false;
-        window.console.error(err)
-      });
+      }
     },
-    // delete current job(删除当前工作)
     killJob() {
       const item = this.lastClick;
       if (this.loading) return this.$Message.warning(this.$t('message.common.resourceSimple.DDJK'));
@@ -146,7 +136,6 @@ export default {
       api.fetch(`/entrance/${item.strongerExecId}/kill`, {taskID: item.taskID},'get').then(() => {
         this.loading = false;
         this.$emit('close-modal');
-        // stop execution(停止执行)
         this.$Notice.close(item.scriptPath);
         this.$Notice.warning({
           title: this.$t('message.common.resourceSimple.YXTS'),
@@ -204,11 +193,10 @@ export default {
         this.$emit('close-modal');
         if (this.$route.name === 'Home') {
           this.dispatch('Workbench:add', {
-            id: md5Id, // Unique identification, even if the file name is changed, it can identify it as it is(唯一标识，就算文件名修改，它都能标识它是它)
+            id: md5Id,
             taskID: item.taskID,
             filename: name,
             filepath: item.scriptPath,
-            // saveAs represents a temporary script that needs to be closed or saved when saved(saveAs表示临时脚本，需要关闭或保存时另存)
             saveAs: true,
             code: item.executionCode,
             type: 'historyScript',
@@ -218,7 +206,6 @@ export default {
             }
           });
         } else {
-          // After the module is split, there are two cases, one is with scripts, and the other is without the general log display.(模块拆分后分两种情况，一种是带scriptis的，一种是不带走通用日志展示)
           const currentModules = util.currentModules();
           if (currentModules.hasScriptis) {
             this.$router.push({ path: '/home',
@@ -316,7 +303,6 @@ export default {
       if (item.fileName) {
         return item.fileName;
       } else {
-        // 取sourceJson里的值
         const nameJson = JSON.parse(item.sourceJson);
         if (item.requestApplicationName === 'IDE') {
           if (nameJson.fileName) {
@@ -324,7 +310,9 @@ export default {
           } else if (nameJson.scriptPath) {
             const arr = nameJson.scriptPath.split('/');
             return arr[arr.length - 1];
-          } else  {
+          } else if (nameJson.nodeName) {
+            return nameJson.nodeName;
+          } else {
             return this.$t('message.common.resourceSimple.WZJBMC')
           }
         } else if (item.requestApplicationName === 'flowexecution') {
diff --git a/linkis-web/src/dss/module/resourceSimple/queue.vue b/linkis-web/src/dss/module/resourceSimple/queue.vue
index ad2ec492e6e..7e56b7a8811 100644
--- a/linkis-web/src/dss/module/resourceSimple/queue.vue
+++ b/linkis-web/src/dss/module/resourceSimple/queue.vue
@@ -59,8 +59,8 @@
             class="queue-manager-circle"></v-circle>
           <v-circle
             :percent="getPercentage(infos.queueInfo.numActiveApps, infos.queueInfo.maxApps)"
-            :used="infos.queueInfo.numActiveApps"
-            :max="infos.queueInfo.maxApps"
+            :used="infos.queueInfo.numActiveApps.toString()"
+            :max="infos.queueInfo.maxApps.toString()"
             suffixe=""
             width="120px"
             height="120px"
diff --git a/linkis-web/src/dss/router.js b/linkis-web/src/dss/router.js
index bac6af2994a..01b5ede6499 100644
--- a/linkis-web/src/dss/router.js
+++ b/linkis-web/src/dss/router.js
@@ -61,16 +61,6 @@ export default [
     component: () =>
       import('./view/login/index.vue'),
   },
-  {
-    path: '/login/oauth/callback',
-    name: 'OAuthCallback',
-    meta: {
-      title: 'OAuthCallback',
-      publicPage: true,
-    },
-    component: () =>
-      import('./view/login/oauthCallback.vue'),
-  },
   // Public pages, not subject to permission control(公用页面，不受权限控制)
   {
     path: '/500',
diff --git a/linkis-web/src/dss/view/login/index.vue b/linkis-web/src/dss/view/login/index.vue
index c3ec243b215..81c6af0bdba 100644
--- a/linkis-web/src/dss/view/login/index.vue
+++ b/linkis-web/src/dss/view/login/index.vue
@@ -20,7 +20,7 @@
     class="login"
     @keyup.enter.stop.prevent="handleSubmit('loginForm')">
     <i class="login-bg"/>
-    <div class="login-main" :style="{height: OAuthRedirectUrl ? '500px' : ''}">
+    <div class="login-main">
       <Form
         ref="loginForm"
         :model="loginForm"
@@ -56,14 +56,6 @@
             size="large"
             @click="handleSubmit('loginForm')">{{$t('message.common.login.login')}}</Button>
         </FormItem>
-        <FormItem>
-          <Button
-            v-if="OAuthRedirectUrl"
-            type="primary"
-            long
-            size="large"
-            @click="handleOAuthLogin()">{{$t('message.common.login.oauthLogin')}}</Button>
-        </FormItem>
       </Form>
     </div>
   </div>
@@ -79,7 +71,6 @@ export default {
   data() {
     return {
       loading: false,
-      OAuthRedirectUrl: null,
       loginForm: {
         user: '',
         password: '',
@@ -106,7 +97,6 @@ export default {
       this.loginForm.password = userNameAndPass.split('&')[1];
     }
     this.getPublicKey();
-    this.checkOAuthStatus();
   },
   mounted() {
   },
@@ -189,15 +179,6 @@ export default {
     clearSession() {
       storage.clear();
     },
-    // check OAuth status(检查OAuth状态)
-    checkOAuthStatus() {
-      api.fetch('/user/oauth-redirect', {}, 'get').then((res) => {
-        this.OAuthRedirectUrl = res.redirectUrl;
-      })
-    },
-    handleOAuthLogin() {
-      window.location.href = this.OAuthRedirectUrl;
-    },
   },
 };
 </script>
diff --git a/linkis-web/src/main.js b/linkis-web/src/main.js
index 67904bcd811..3b6d14e9368 100644
--- a/linkis-web/src/main.js
+++ b/linkis-web/src/main.js
@@ -62,7 +62,14 @@ Vue.config.productionTip = false
 Vue.prototype.$Message.config({
   duration: 3
 })
-
+const locale = localStorage.getItem('locale')
+if(locale) {
+  if(locale === 'zh-CN') {
+    localStorage.setItem('fes_locale', 'zh-CN')
+  } else if(locale === 'en') {
+    localStorage.setItem('fes_locale', 'en-US')
+  }
+}
 new Vue({
   router,
   i18n,
diff --git a/linkis-web/src/router.js b/linkis-web/src/router.js
index f14afa78b17..c9054ba2b4a 100644
--- a/linkis-web/src/router.js
+++ b/linkis-web/src/router.js
@@ -15,10 +15,32 @@
  * limitations under the License.
  */
 
-
+import {Modal} from 'iview';
 import VueRouter from "vue-router";
 import { routes } from './dynamic-apps'
-
+// import eventbus from '@/common/helper/eventbus';
+import axios from 'axios'
+// eslint-disable-next-line require-jsdoc
+async function checkNeedShowUpdate() {
+  try {
+    const { data } = await axios.get(`/dss/linkis/index.html?t=${Date.now()}`)
+    let serverAppHash = data.split('src="js/app.')[1].split('>')[0]
+    serverAppHash = serverAppHash && serverAppHash.substring(0, 8)
+    const appjs = [
+      ...document.getElementsByTagName('script')
+    ]
+      .map(it => it.src)
+      .find(it => /app\.[\da-z]{8}\.js/.test(it))
+    const pageAppHash = appjs && appjs.match(/app\.([\da-z]{8})\.js/)[1];
+    window.console.log(serverAppHash, pageAppHash);
+    return Promise.resolve(pageAppHash !== serverAppHash)
+  } catch(err) {
+    
+    window.console.error(err)
+    return Promise.reject(false)
+  }
+  
+}
 // Solve the error of repeated click routing jump(解决重复点击路由跳转报错)
 const originalPush = VueRouter.prototype.push;
 VueRouter.prototype.push = function push(location) {
@@ -45,10 +67,35 @@ router.beforeEach((to, from, next) => {
   }
 });
 
-router.afterEach((to) => {
+router.afterEach(async (to) => {
   if (to.meta) {
     document.title = to.meta.title || 'Linkis';
   }
+  await checkNeedShowUpdate().then(
+    (show) => {
+      window.console.log(show)
+      const deniedUpdate = sessionStorage.getItem('deniedUpdate');
+      if(deniedUpdate === 'true') return;
+      if (show) {
+        window.console.log('exist difference')
+        Modal.confirm({
+          title: '发现新版本',
+          content: '为获得更好的体验，是否立即更新',
+          onOk: async () => {
+            try {
+              location.reload()
+            } catch (err) {
+              window.console.warn(err)
+            }
+          },
+          onCancel: () => {
+            // do nothing
+            sessionStorage.setItem('deniedUpdate', 'true');
+          }
+        })
+      }
+    }
+  )
 });
 
 export default router;

From 94752a29a2872df79e26ada7c289615263304ed3 Mon Sep 17 00:00:00 2001
From: kinghao <kinghao@apache.org>
Date: Sat, 22 Nov 2025 23:30:24 +0800
Subject: [PATCH 2/5] optimize pythonModule

---
 linkis-web/.env                               |   3 +
 linkis-web/PYTHON_MODULE_CHANGES.md           | 122 ++++++++++++++++++
 linkis-web/PYTHON_MODULE_CONFIG.md            |  95 ++++++++++++++
 linkis-web/src/apps/linkis/router.js          |   7 +-
 .../src/apps/linkis/view/linkis/index.vue     |  13 +-
 5 files changed, 234 insertions(+), 6 deletions(-)
 create mode 100644 linkis-web/PYTHON_MODULE_CHANGES.md
 create mode 100644 linkis-web/PYTHON_MODULE_CONFIG.md

diff --git a/linkis-web/.env b/linkis-web/.env
index 27591f1bfd7..4a6bf84df2c 100644
--- a/linkis-web/.env
+++ b/linkis-web/.env
@@ -2,3 +2,6 @@ VUE_APP_HOST=
 VUE_APP_MN_CONFIG_PREFIX=
 VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
 VUE_APP_VERSION=1.3.2
+# Enable or disable Python Module feature (true/false)
+# Set to false if you cannot access @webank internal npm packages
+VUE_APP_ENABLE_PYTHON_MODULE=false
diff --git a/linkis-web/PYTHON_MODULE_CHANGES.md b/linkis-web/PYTHON_MODULE_CHANGES.md
new file mode 100644
index 00000000000..c5389aacd80
--- /dev/null
+++ b/linkis-web/PYTHON_MODULE_CHANGES.md
@@ -0,0 +1,122 @@
+# Python Module Feature Toggle - Implementation Summary
+
+## Changes Made
+
+### 1. Environment Variable Configuration
+**File**: `.env`
+- Added `VUE_APP_ENABLE_PYTHON_MODULE=false` (default disabled)
+- This controls whether the Python Module feature is available
+
+### 2. Router Configuration
+**File**: `src/apps/linkis/router.js`
+
+**Changes**:
+- Added environment variable check: `export const isPythonModuleEnabled = process.env.VUE_APP_ENABLE_PYTHON_MODULE === 'true'`
+- Modified pythonModule route to be conditionally loaded:
+  ```javascript
+  ...(isPythonModuleEnabled ? [{
+    name: 'pythonModule',
+    path: 'pythonModule',
+    component: () => import('./module/pythonModule/index.vue'),
+    meta: {
+      title: 'pythonModule',
+      publicPage: true,
+    },
+  }] : []),
+  ```
+
+### 3. View Component Updates
+**File**: `src/apps/linkis/view/linkis/index.vue`
+
+**Changes**:
+- Imported `isPythonModuleEnabled` from router
+- Added to component data: `isPythonModuleEnabled: isPythonModuleEnabled`
+- Modified sidebar menu visibility condition to hide Python Module when disabled:
+  ```javascript
+  v-if="(!isLogAdmin? ...) && (item.key !== '1-13' || isPythonModuleEnabled)"
+  ```
+- Updated default redirect logic in `mounted()`:
+  ```javascript
+  if(!localStorage.getItem('hasRead')) {
+    if (isPythonModuleEnabled) {
+      this.clickToRoute('1-13-1')  // Python Module
+    } else {
+      this.clickToRoute('1-1')      // Global History
+    }
+  }
+  ```
+
+## Feature Behavior
+
+### When VUE_APP_ENABLE_PYTHON_MODULE=false (Default)
+✅ **Recommended for users without WeBank npm registry access**
+
+- Python Module route is NOT registered
+- Python Module menu item is HIDDEN from sidebar
+- After login, users are redirected to **Global History** page
+- Accessing `/console/pythonModule` directly will show 404 error
+- No dependency on internal `@webank` packages required
+
+### When VUE_APP_ENABLE_PYTHON_MODULE=true
+⚠️ **Requires WeBank internal npm registry access**
+
+- Python Module route is registered
+- Python Module menu item is VISIBLE in sidebar
+- After login, users are redirected to **Python Module** page (if first time)
+- Accessing `/console/pythonModule` directly works normally
+- Requires successful build of PythonModule sub-application
+
+## Testing
+
+To test the feature toggle:
+
+### Test 1: Disabled State (Default)
+```bash
+# 1. Ensure .env has VUE_APP_ENABLE_PYTHON_MODULE=false
+cat linkis-web/.env | grep VUE_APP_ENABLE_PYTHON_MODULE
+
+# 2. Rebuild
+cd linkis-web
+npm run build
+
+# 3. Verify behavior:
+# - Python Module menu should NOT appear in sidebar
+# - Login should redirect to Global History
+# - /console/pythonModule should return 404
+```
+
+### Test 2: Enabled State
+```bash
+# 1. Update .env
+echo "VUE_APP_ENABLE_PYTHON_MODULE=true" >> linkis-web/.env
+
+# 2. Rebuild
+cd linkis-web
+npm run build
+
+# 3. Verify behavior:
+# - Python Module menu should appear in sidebar
+# - Login should redirect to Python Module
+# - /console/pythonModule should work (if built)
+```
+
+## Migration Notes
+
+- **Backward Compatibility**: Default is `false`, so existing deployments won't be affected
+- **No Breaking Changes**: All other features remain unchanged
+- **Easy Rollback**: Simply set `VUE_APP_ENABLE_PYTHON_MODULE=false` and rebuild
+
+## Documentation
+
+- Detailed configuration guide: `PYTHON_MODULE_CONFIG.md`
+- This summary document: `PYTHON_MODULE_CHANGES.md`
+
+## Next Steps
+
+For users who want to enable Python Module:
+1. Obtain access to WeBank internal npm registry
+2. Configure `.npmrc` with registry credentials
+3. Set `VUE_APP_ENABLE_PYTHON_MODULE=true` in `.env`
+4. Run `npm run installAll` to install all dependencies
+5. Run `npm run buildSubModule` to build Python Module
+6. Run `npm run build` to build main application
diff --git a/linkis-web/PYTHON_MODULE_CONFIG.md b/linkis-web/PYTHON_MODULE_CONFIG.md
new file mode 100644
index 00000000000..6ca023b8b4c
--- /dev/null
+++ b/linkis-web/PYTHON_MODULE_CONFIG.md
@@ -0,0 +1,95 @@
+# Python Module Feature Configuration
+
+## Overview
+
+The Python Module feature can be enabled or disabled via environment variable configuration. This feature depends on internal WeBank npm packages (`@webank/fes-design-material`, `@webank/letgo-components`) which are not publicly available.
+
+## Configuration
+
+### Environment Variable
+
+Edit the `.env` file in the `linkis-web` root directory:
+
+```bash
+# Enable or disable Python Module feature (true/false)
+# Set to false if you cannot access @webank internal npm packages
+VUE_APP_ENABLE_PYTHON_MODULE=false
+```
+
+### Options
+
+- `VUE_APP_ENABLE_PYTHON_MODULE=true`: Enable Python Module feature
+  - The Python Module menu item will be displayed in the sidebar
+  - After login, users will be redirected to the Python Module page
+  - Requires access to WeBank internal npm registry to build
+
+- `VUE_APP_ENABLE_PYTHON_MODULE=false`: Disable Python Module feature (Default)
+  - The Python Module menu item will be hidden from the sidebar
+  - After login, users will be redirected to the Global History page
+  - No special npm registry access required
+
+## Implementation Details
+
+### Modified Files
+
+1. **`.env`**: Added `VUE_APP_ENABLE_PYTHON_MODULE` environment variable
+2. **`src/apps/linkis/router.js`**:
+   - Added `isPythonModuleEnabled` constant
+   - Conditionally load pythonModule route
+3. **`src/apps/linkis/view/linkis/index.vue`**:
+   - Import `isPythonModuleEnabled` from router
+   - Conditionally display pythonModule in sidebar menu
+   - Modified default redirect logic based on feature flag
+
+### Behavior
+
+When `VUE_APP_ENABLE_PYTHON_MODULE=false`:
+- ❌ Python Module route is not registered
+- ❌ Python Module menu item is hidden
+- ✅ Users are redirected to Global History page after login
+- ✅ Direct access to `/console/pythonModule` will show 404
+
+When `VUE_APP_ENABLE_PYTHON_MODULE=true`:
+- ✅ Python Module route is registered
+- ✅ Python Module menu item is visible
+- ✅ Users are redirected to Python Module page after login (if not `hasRead`)
+- ✅ Direct access to `/console/pythonModule` works
+
+## Building
+
+After changing the environment variable:
+
+```bash
+# Rebuild the project
+cd linkis-web
+npm run build
+```
+
+## For Internal Users
+
+If you have access to WeBank's internal npm registry:
+
+1. Set `VUE_APP_ENABLE_PYTHON_MODULE=true` in `.env`
+2. Configure npm registry (contact your administrator for registry URL)
+3. Install dependencies: `npm run installAll`
+4. Build PythonModule: `npm run buildSubModule`
+5. Build main application: `npm run build`
+
+## Troubleshooting
+
+### Issue: 404 Error when accessing Python Module
+
+**Solution**: Check that `VUE_APP_ENABLE_PYTHON_MODULE=true` and rebuild the application
+
+### Issue: Python Module menu not showing
+
+**Solution**:
+1. Verify `.env` has `VUE_APP_ENABLE_PYTHON_MODULE=true`
+2. Clear browser cache
+3. Rebuild: `npm run build`
+
+### Issue: Cannot install dependencies for PythonModule
+
+**Solution**:
+1. Set `VUE_APP_ENABLE_PYTHON_MODULE=false` to disable the feature
+2. Or configure access to WeBank internal npm registry
diff --git a/linkis-web/src/apps/linkis/router.js b/linkis-web/src/apps/linkis/router.js
index 5edb25b2c16..4db08510fe0 100644
--- a/linkis-web/src/apps/linkis/router.js
+++ b/linkis-web/src/apps/linkis/router.js
@@ -27,6 +27,9 @@ export const subAppRoutes = {
   children: []
 }
 
+// Check if Python Module is enabled via environment variable
+export const isPythonModuleEnabled = process.env.VUE_APP_ENABLE_PYTHON_MODULE === 'true'
+
 export default [
   {
     path: 'console',
@@ -268,7 +271,7 @@ export default [
         publicPage: true,
       },
     },
-    {
+    ...(isPythonModuleEnabled ? [{
       name: 'pythonModule',
       path: 'pythonModule',
       component: () =>
@@ -277,7 +280,7 @@ export default [
         title: 'pythonModule',
         publicPage: true,
       },
-    },
+    }] : []),
     {
       name: 'datasourceAccess',
       path: 'datasourceAccess',
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index 474ca45c968..816fa7eda90 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -30,7 +30,7 @@
             <CellGroup v-for="(item, index2) in sideNavList.children" :key="index2"
               @on-click="handleCellClick">
               <Cell
-                v-if="!isLogAdmin? (item.path !=='/console/ECM')&&(item.path !=='/console/microService')&&(item.key !== '1-12'):true"
+                v-if="(!isLogAdmin? (item.path !=='/console/ECM')&&(item.path !=='/console/microService')&&(item.key !== '1-12'):true) && (item.key !== '1-13' || isPythonModuleEnabled)"
                 :key="index2" :class="{ crrentItem: crrentItem === item.key }" :title="item.name"
                 :name="item.key">
                 <div>
@@ -116,6 +116,7 @@
 <script>
 import storage from '@/common/helper/storage'
 import api from '@/common/service/api'
+import { isPythonModuleEnabled } from '../../router'
 export default {
   name: 'Layout',
   mounted() {
@@ -128,9 +129,12 @@ export default {
       }
     })
     if(!localStorage.getItem('hasRead')) {
-      this.clickToRoute('1-13-1')
-      // this.crrentItem = '1-13-1'
-      // this.$router.push({path: '/console/pythonModule'})
+      // Jump to pythonModule if enabled, otherwise jump to globalHistory
+      if (isPythonModuleEnabled) {
+        this.clickToRoute('1-13-1')
+      } else {
+        this.clickToRoute('1-1')
+      }
     }
   },
   unmounted() {
@@ -147,6 +151,7 @@ export default {
     return {
       crrentItem: '1-1',
       isLogAdmin: false,
+      isPythonModuleEnabled: isPythonModuleEnabled,
       sideNavList: {
         key: '1',
         name: this.$t('message.linkis.sideNavList.function.name'),

From e2aca04c7c6cd8e7f347b8ef69b058ad8bbe9fbe Mon Sep 17 00:00:00 2001
From: aiceflower <aiceflower@sina.com>
Date: Sat, 22 Nov 2025 23:35:21 +0800
Subject: [PATCH 3/5] Update version to 1.8.0

---
 linkis-web/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkis-web/.env b/linkis-web/.env
index 4a6bf84df2c..5f7be0422c5 100644
--- a/linkis-web/.env
+++ b/linkis-web/.env
@@ -1,7 +1,7 @@
 VUE_APP_HOST=
 VUE_APP_MN_CONFIG_PREFIX=
 VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
-VUE_APP_VERSION=1.3.2
+VUE_APP_VERSION=1.8.0
 # Enable or disable Python Module feature (true/false)
 # Set to false if you cannot access @webank internal npm packages
 VUE_APP_ENABLE_PYTHON_MODULE=false

From b996e38c8316a7687b4b85890c6ffb6011bbaae9 Mon Sep 17 00:00:00 2001
From: aiceflower <aiceflower@sina.com>
Date: Sat, 22 Nov 2025 23:36:04 +0800
Subject: [PATCH 4/5] Update package.json

---
 linkis-web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkis-web/package.json b/linkis-web/package.json
index a518db2f5fd..52984ce7879 100644
--- a/linkis-web/package.json
+++ b/linkis-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "linkis",
-    "version": "1.10.0",
+    "version": "1.8.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",

From ae9238cda124294b32876674105842f481b5b251 Mon Sep 17 00:00:00 2001
From: aiceflower <aiceflower@sina.com>
Date: Sat, 22 Nov 2025 23:36:40 +0800
Subject: [PATCH 5/5] Update NOTICE

---
 linkis-web/release-docs/NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkis-web/release-docs/NOTICE b/linkis-web/release-docs/NOTICE
index c9b63ba5c61..3012346c23d 100644
--- a/linkis-web/release-docs/NOTICE
+++ b/linkis-web/release-docs/NOTICE
@@ -1,5 +1,5 @@
 Apache Linkis
-Copyright 2021-2023 The Apache Software Foundation
+Copyright 2021-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).