Merge pull request #5092 from jumpserver/dev

merge: v4.10.4-lts

Author: baijiangjie

.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "semi": false,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "endOfLine": "lf"
+}

Dockerfile

@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20250616_083043 AS stage-build
+FROM jumpserver/lina-base:20250709_063112 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION

package.json

@@ -38,7 +38,7 @@
         "deepmerge": "^4.2.2",
         "dompurify": "^3.1.6",
         "echarts": "4.7.0",
-        "element-ui": "2.15.14",
+        "elementui-lts": "^2.16.0",
         "eslint-plugin-html": "^6.0.0",
         "highlight.js": "^11.9.0",
         "install": "^0.13.0",
@@ -103,7 +103,6 @@
         "compression-webpack-plugin": "^6.1.1",
         "connect": "3.6.6",
         "deasync": "^0.1.29",
-        "element-theme-chalk": "^2.13.1",
         "eslint": "^5.15.3",
         "eslint-plugin-vue": "5.2.2",
         "eslint-plugin-vue-i18n": "^0.3.0",
@@ -113,6 +112,7 @@
         "less-loader": "^5.0.0",
         "lint-staged": "^10.1.2",
         "mockjs": "1.0.1-beta3",
+        "pretty-bytes": "^5.6.0",
         "runjs": "^4.3.2",
         "sass": "~1.32.6",
         "sass-loader": "^7.1.0",

src/components/Apps/GrantedAssets/index.vue

@@ -85,6 +85,7 @@ export default {
         hasTree: true,
         columnsExtra: ['view_account'],
         columnsExclude: ['spec_info'],
+        columns: ['id', 'name', 'address', 'platform', 'view_account', 'actions'],
         columnsShow: {
           min: ['name', 'address', 'accounts'],
           default: ['name', 'address', 'platform', 'view_account', 'actions']

src/components/Common/QuickActions/action.vue

@@ -1,25 +1,23 @@
 <template>
   <tr>
-    <td>{{ getActionTitle(action) }}</td>
     <td>
-      <el-popover
-        :content="action.attrs.tip"
-        :disabled="!action.attrs.showTip"
-        placement="left-end"
-        trigger="hover"
-      >
-        <span slot="reference">
-          <component
-            :is="iType"
-            v-model="action.attrs.model"
-            :title="label"
-            v-bind="action.attrs"
-            v-on="callbacks"
-          >
-            {{ label }}
-          </component>
-        </span>
-      </el-popover>
+      {{ getActionTitle(action) }}
+      <el-tooltip v-if="action.attrs.showTip" :content="action.attrs.tip" :open-delay="500" effect="dark">
+        <i class="fa fa-question-circle-o" />
+      </el-tooltip>
+    </td>
+    <td>
+      <span slot="reference">
+        <component
+          :is="iType"
+          v-model="action.attrs.model"
+          :title="label"
+          v-bind="action.attrs"
+          v-on="callbacks"
+        >
+          {{ label }}
+        </component>
+      </span>
     </td>
   </tr>
 </template>

src/components/Table/AutoDataTable/utils.js

@@ -20,18 +20,18 @@ export class TableColumnsGenerator {
     this.vm = vm
   }
 
-  dynamicActionWidth() {
-    console.log(i18n.locale)
-    if (i18n.locale === 'zh-hans' || i18n.locale === 'zh-hant') {
-      return '100px'
-    }
+  // dynamicActionWidth() {
+  //   console.log(i18n.locale)
+  //   if (i18n.locale === 'zh-hans' || i18n.locale === 'zh-hant') {
+  //     return '100px'
+  //   }
 
-    if (i18n.locale === 'ja' || i18n.locale === 'ko') {
-      return '120px'
-    }
+  //   if (i18n.locale === 'ja' || i18n.locale === 'ko') {
+  //     return '120px'
+  //   }
 
-    return '160px'
-  }
+  //   return '160px'
+  // }
 
   generateColumns() {
     const config = _.cloneDeep(this.config)
@@ -135,7 +135,7 @@ export class TableColumnsGenerator {
           prop: 'actions',
           label: i18n.t('Actions'),
           align: 'center',
-          width: this.dynamicActionWidth(),
+          width: '120px',
           formatter: ActionsFormatter,
           fixed: 'right',
           formatterArgs: {}

src/components/Table/CardTable/Panel.vue

@@ -4,29 +4,29 @@
       {{ $t('Enterprise') }}
     </span>
     <el-row class="panel">
-      <el-col v-if="d.icon" :span="8" class="image">
+      <el-col v-if="d.icon" :span="d.icon ? 8 : 0" class="image">
         <img
           v-if="d.icon.startsWith('/') || d.icon.startsWith('data:')"
           :alt="d.display_name"
           :src="d.icon"
         >
         <Icon v-else :icon="d.icon" />
       </el-col>
-      <el-col :span="16" class="text-zone">
+      <el-col :span="d.icon ? 16 : 24" class="text-zone">
         <div class="one-line">
           <b>{{ d.display_name }}</b>
-          <el-tag v-if="d.version" size="mini" style="margin-left: 5px">
-            {{ d.version }}
-          </el-tag>
-        </div>
-        <div :title="d.comment " class="comment">
-          {{ d.comment }}
         </div>
         <div class="tag-zone">
+          <el-tag v-if="d.version" size="mini" style="margin-left: 5px; background-color: #ecf5ff; color: #409eff;">
+            {{ d.version }}
+          </el-tag>
           <el-tag v-for="tag of d.tags" :key="tag" size="mini">
             {{ capitalize(tag) }}
           </el-tag>
         </div>
+        <div :title="d.comment " class="comment">
+          {{ d.comment }}
+        </div>
       </el-col>
     </el-row>
   </div>
@@ -107,22 +107,20 @@ export default {
 
     .comment {
       display: -webkit-box;
-      height: 120px;
+      margin-top: 10px;
       font-size: 12px;
-      padding: 10px 0;
       cursor: pointer;
       overflow: hidden;
       -webkit-line-clamp: 4;
-      -webkit-box-flex: 1;
       -webkit-box-orient: vertical;
-      text-align: left;
     }
 
     .tag-zone {
       display: flex;
-      height: 30%;
       align-items: center;
       cursor: pointer;
+      margin-top: 10px;
+      margin-left: -5px;
     }
   }
 }

src/components/Table/CardTable/index.vue

@@ -248,6 +248,10 @@ export default {
     display: flex;
     justify-content: left;
     flex-wrap: wrap;
+
+    .el-card .el-card__body div {
+      height: inherit;
+    }
   }
 
   .el-col, div {

src/components/Table/DrawerListTable/index.vue

@@ -196,26 +196,33 @@ export default {
       }
 
       let title = this.title
+
       if (!title && this.resource) {
         title = this.resource
       }
+
       if (!title) {
         title = this.$route.meta?.title
         title = title.replace('List', '').replace('列表', '')
         title = _.trimEnd(title, 's')
       }
+
       if (!title) {
         title = this.$t('NoTitle')
       }
+
       let actionLabel = ''
+
       if (action === 'clone' || action === 'create') {
         actionLabel = this.$t('Create')
       } else if (action === 'update') {
         actionLabel = this.$t('Update')
       } else if (action === 'detail') {
         actionLabel = this.$t('Detail')
       }
+
       title = actionLabel + this.$t('WordSep') + toLowerCaseExcludeAbbr(title)
+
       return title
     },
     getDefaultDrawer(action) {

src/components/Table/TableFormatters/AccountConnectFormatter.vue

@@ -60,6 +60,7 @@ export default {
               asset=${assetId}
               &account=${row.id}
               &protocol=${protocol}
+              &org_id=${this.$store.getters.currentOrg.id}
             `.replace(/\s+/g, '')
           },
           asset: null,