jumpserver · fit2bot · Dec 18, 2025 · Jan 14, 2026 · Jan 14, 2026 · Jan 14, 2026
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20251105_092554 AS stage-build
+FROM jumpserver/lina-base:20260114_045651 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "fix": "eslint --ext .js,.vue --fix src",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
     "test:ci": "npm run lint && npm run test:unit",
-    "svgo": "svgo -f src/icons/svg --config=src/icas/svgo.yml",
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "vue-i18n-extract": "vue-i18n-extract",
     "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'",
     "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json",

diff --git a/public/theme/README.md b/public/theme/README.md
@@ -1,23 +1,23 @@
 # 主题颜色
 ```
-alpha-1: "rgba(64, 158, 255, 0.1)"
-alpha-2: "rgba(64, 158, 255, 0.2)"
-alpha-3: "rgba(64, 158, 255, 0.3)"
-alpha-4: "rgba(64, 158, 255, 0.4)"
-alpha-5: "rgba(64, 158, 255, 0.5)"
-alpha-6: "rgba(64, 158, 255, 0.6)"
-alpha-7: "rgba(64, 158, 255, 0.7)"
-alpha-8: "rgba(64, 158, 255, 0.8)"
-alpha-9: "rgba(64, 158, 255, 0.9)"
-light-1: "#53a8ff"
-light-2: "#66b1ff"
-light-3: "#79bbff"
-light-4: "#8cc5ff"
-light-5: "#a0cfff"
-light-6: "#b3d8ff"
-light-7: "#c6e2ff"
-light-8: "#d9ecff"
-light-9: "#ecf5ff"
-primary: "#409EFF"
+alpha-1: "rgba(28, 110, 255, 0.1)"
+alpha-2: "rgba(28, 110, 255, 0.2)"
+alpha-3: "rgba(28, 110, 255, 0.3)"
+alpha-4: "rgba(28, 110, 255, 0.4)"
+alpha-5: "rgba(28, 110, 255, 0.5)"
+alpha-6: "rgba(28, 110, 255, 0.6)"
+alpha-7: "rgba(28, 110, 255, 0.7)"
+alpha-8: "rgba(28, 110, 255, 0.8)"
+alpha-9: "rgba(28, 110, 255, 0.9)"
+light-1: "#337dff"
+light-2: "#498bff"
+light-3: "#609aff"
+light-4: "#77a8ff"
+light-5: "#8eb7ff"
+light-6: "#a4c5ff"
+light-7: "#bbd4ff"
+light-8: "#d2e2ff"
+light-9: "#e8f1ff"
+primary: "#1C6EFF"
 ```
-primary是初始主题颜色，其他颜色均属于primary的系列颜色
+primary是初始主题颜色，其他颜色均属于primary的系列颜色
diff --git a/public/theme/element-extra.css b/public/theme/element-extra.css
@@ -186,7 +186,7 @@ td .el-button.el-button--mini {
   background-color: #FFFFFF;
   background-image: none;
   border: 1px solid #e5e6e7;
-  border-radius: 1px;
+  border-radius: 2px;
   color: inherit;
   display: block;
   padding: 6px 12px;

diff --git a/public/theme/element-ui.css b/public/theme/element-ui.css
diff --git a/src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue b/src/components/Apps/ChatAi/components/ChitChat/ChatInput.vue
@@ -136,7 +136,7 @@ export default {
         height: 100%;
         padding: 8px 10px;
         resize: none;
-        border-radius: 5px;
+        border-radius: 2px;
 
         &::-webkit-scrollbar {
           width: 12px;

diff --git a/src/components/Common/DataActions/index.vue b/src/components/Common/DataActions/index.vue
@@ -228,16 +228,16 @@ export default {
 
 <style lang="scss" scoped>
 $btn-text-color: #ffffff;
-$color-btn-background: #e8f7f4;
-$color-btn-focus-background: #83cbba;
 $color-divided: #e4e7ed;
+$color-btn-focus-background: #79bbff;
 $color-drop-menu-title: #909399;
 $color-drop-menu-border: #e4e7ed;
 
 // 通用
 .layout {
   .action-item {
     margin-left: 5px;
+    box-shadow: unset;
 
     &.grouped {
       margin-left: 0;
@@ -258,9 +258,11 @@ $color-drop-menu-border: #e4e7ed;
   .action-item.el-dropdown {
     font-size: 11px;
 
-    .more-action.el-button--default {
-      ::v-deep .el-icon-arrow-down.el-icon--right {
-        color: var(--color-icon-primary) !important;
+    .more-action {
+      .el-button--default {
+        ::v-deep .el-icon-arrow-down.el-icon--right {
+          color: var(--color-icon-primary) !important;
+        }
       }
     }
 
@@ -287,9 +289,9 @@ $color-drop-menu-border: #e4e7ed;
     line-height: 1.3;
     font-size: 13px;
 
-    &:not(.is-plain) {
-      color: $btn-text-color;
-    }
+    // &:not(.is-plain) {
+    //   color: $btn-text-color;
+    // }
 
     overflow: hidden;
     text-overflow: ellipsis;
@@ -300,20 +302,24 @@ $color-drop-menu-border: #e4e7ed;
     }
   }
 
-  ::v-deep .action-item.el-dropdown .el-button {
-    display: block;
-    color: var(--color-primary);
-    background-color: $color-btn-background;
-    border-color: $color-btn-focus-background;
+  .action-item.delete.el-button--text {
+    color: #f56c6c;
 
+    &:hover,
     &:focus {
-      color: $btn-text-color;
-      background-color: $color-btn-focus-background !important;
+      color: #f56c6c;
     }
+  }
+
+  ::v-deep .action-item.el-dropdown .el-button.el-button--text {
+    display: block;
+    color: var(--color-primary);
+    transition: all 0.2s;
 
+    &:focus,
     &:hover {
-      color: $btn-text-color;
-      background-color: $color-btn-focus-background;
+      border-color: transparent;
+      background-color: transparent;
     }
   }
 }

diff --git a/src/components/Form/DataForm/index.vue b/src/components/Form/DataForm/index.vue
@@ -341,7 +341,7 @@ export default {
       }
 
       .el-textarea .el-textarea__inner {
-        border-radius: 0;
+        border-radius: 2px;
       }
 
       .el-data-table .el-table {

diff --git a/src/components/Form/FormFields/JsonEditor.vue b/src/components/Form/FormFields/JsonEditor.vue
@@ -2,7 +2,7 @@
   <div class="json-editor">
     <JsonEditor
       v-model="resultInfo"
-      :class="{resize: resize === 'vertical'}"
+      :class="{ resize: resize === 'vertical' }"
       :mode="'code'"
       :show-btns="false"
       @json-change="onJsonChange"
@@ -24,7 +24,7 @@ export default {
     },
     resize: {
       type: String,
-      validator: (value) => {
+      validator: value => {
         return ['none', 'vertical'].indexOf(value) !== -1
       },
       default: 'vertical'
@@ -52,43 +52,46 @@ export default {
         this.$emit('change', this.resultInfo)
       }, 500)
     },
-    onError: _.debounce(function(value) {
+    onError: _.debounce(function (value) {
       this.$message.error(this.$tc('FormatError'))
     }, 1500)
   }
 }
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/variables";
-
-  .json-editor {
-    .resize {
-      & ::v-deep .jsoneditor {
-        resize: vertical;
-        cursor: s-resize;
-      }
-    }
+@import '~@/styles/variables';
 
+.json-editor {
+  .resize {
     & ::v-deep .jsoneditor {
-      border: 1px solid #e5e6e7;
+      resize: vertical;
+      cursor: s-resize;
     }
+  }
 
-    & ::v-deep .jsoneditor-compact {
-      display: none;
-    }
+  & ::v-deep .jsoneditor {
+    border: 1px solid #e5e6e7;
+    border-left: unset;
+    border-top: unset;
+    border-radius: 2px;
+  }
 
-    & ::v-deep .jsoneditor-modes {
-      display: none;
-    }
+  & ::v-deep .jsoneditor-compact {
+    display: none;
+  }
 
-    & ::v-deep .jsoneditor-poweredBy {
-      display: none;
-    }
+  & ::v-deep .jsoneditor-modes {
+    display: none;
+  }
 
-    & ::v-deep .jsoneditor-menu {
-      background: var(--color-primary);
-      border-bottom: 1px solid var(--color-primary);
-    }
+  & ::v-deep .jsoneditor-poweredBy {
+    display: none;
   }
+
+  & ::v-deep .jsoneditor-menu {
+    background: var(--color-primary);
+    border-bottom: 1px solid var(--color-primary);
+  }
+}
 </style>
diff --git a/src/components/Table/DataTable/index.vue b/src/components/Table/DataTable/index.vue
@@ -167,12 +167,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.el-data-table {
-  ::v-deep .el-pagination.is-background .el-pager li {
-    margin: 0 1px;
-    padding: 0 2px;
-  }
-}
-</style>
diff --git a/src/components/Table/InfoCardTable/Panel.vue b/src/components/Table/InfoCardTable/Panel.vue
@@ -172,7 +172,7 @@ div.info-panel {
         flex-basis: 225px;
         flex-direction: column;
         justify-content: center;
-        align-items: start;
+        align-items: flex-start;
         max-width: 225px;
         min-width: 0;
         overflow-x: hidden;

diff --git a/src/components/Table/ListTable/TableAction/ImportDialog.vue b/src/components/Table/ListTable/TableAction/ImportDialog.vue
@@ -22,8 +22,8 @@
         <div style="line-height: 1.5">
           <span class="el-upload__tip">
             {{ downloadTemplateTitle }}
-            <el-link type="success" @click="downloadTemplateFile('csv')"> CSV </el-link>
-            <el-link type="success" @click="downloadTemplateFile('xlsx')"> XLSX </el-link>
+            <el-link type="primary" @click="downloadTemplateFile('csv')"> CSV </el-link>
+            <el-link type="primary" @click="downloadTemplateFile('xlsx')"> XLSX </el-link>
           </span>
         </div>
       </el-form-item>

diff --git a/src/components/Table/ListTable/TableAction/LabelSearch.vue b/src/components/Table/ListTable/TableAction/LabelSearch.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="label-search">
-    <el-button
-      v-if="!showLabelSearch"
-      class="label-button"
-      size="small"
-      @click="showSearchSelect"
-    >
+    <el-button v-if="!showLabelSearch" class="label-button" size="small" @click="showSearchSelect">
       <svg-icon icon-class="tag" />
     </el-button>
     <el-cascader
@@ -100,7 +95,7 @@ export default {
         setTimeout(() => {
           this.$refs.labelCascader.updateStyle()
           input.style.height = '30px'
-        },)
+        })
         return
       } else {
         input.style.height = '30px'
@@ -147,41 +142,44 @@ export default {
       }, 200)
     },
     listenViewPort() {
-      window.addEventListener('resize', debounce((e) => {
-        const viewPort = e?.target?.innerWidth
-        this.showLabelSearch = viewPort < 992
-      }, 100), false)
+      window.addEventListener(
+        'resize',
+        debounce(e => {
+          const viewPort = e?.target?.innerWidth
+          this.showLabelSearch = viewPort < 992
+        }, 100),
+        false
+      )
     }
   }
 }
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .label-search {
-  margin-right: 10px;
   border: 1px solid var(--color-border);
   overflow: hidden;
 
   ::v-deep .el-button.label-button {
     height: 28px;
     border: none;
+    padding: 8px;
   }
 
   .label-cascader {
     width: 300px;
     height: 28px;
-    line-height: 28px;
+    line-height: unset !important;
 
     ::v-deep .el-input {
       .el-input__inner {
         height: 28px !important;
-        line-height: 28px;
         font-size: 13px;
         border: none;
       }
 
       .el-input__suffix {
-        color: var(--color-icon-primary) !important;;
+        color: var(--color-icon-primary) !important;
       }
     }
 

diff --git a/src/components/Table/ListTable/TableAction/index.vue b/src/components/Table/ListTable/TableAction/index.vue
@@ -178,6 +178,7 @@ $headerHeight: 30px;
     .right-side-item.action-search {
       border: 1px solid var(--color-border);
       overflow: hidden;
+      border-radius: 4px;
     }
   }
 
@@ -189,6 +190,8 @@ $headerHeight: 30px;
   .search.right {
     display: flex;
     flex-wrap: wrap;
+    align-items: center;
+    gap: 8px;
     padding-right: 10px;
   }
 }

diff --git a/src/components/Table/ListTable/index.vue b/src/components/Table/ListTable/index.vue
@@ -390,9 +390,4 @@ export default {
     }
   }
 }
-
-//修改颜色
-.el-button--text {
-  color: #409eff;
-}
 </style>