Merge branch 'v4' of github.com:jumpserver/lina into v4

src/components/Form/FormFields/Select2.vue

@@ -249,9 +249,6 @@ export default {
       handler(newValue, oldValue) {
       },
       deep: true
-    },
-    iOptions(val) {
-      this.remote = val.length !== 0
     }
   },
   async mounted() {

src/styles/icons/mysql.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-     width="24" height="24"
-     viewBox="0 0 24 24">
-  <path
-    d="M 3.125 1 C 2.219 1 1.5030625 1.4805 1.1640625 2.3125 C 1.0570625 2.5695 1.0029531 2.8420469 1.0019531 3.1230469 C 1.0009531 4.0540469 1.6009375 4.8097188 1.9609375 5.2617188 C 2.0239375 5.3407187 2.080625 5.4110938 2.140625 5.4960938 L 2.3027344 5.7109375 C 2.4637344 5.9219375 2.6470781 6.16125 2.7050781 6.28125 C 2.7240781 6.33625 2.7492031 6.4326875 2.7832031 6.5546875 C 2.9402031 7.1196875 3.2332187 8.16975 3.6992188 8.96875 C 3.8872187 9.29075 4.1517969 9.6954687 4.3417969 9.9804688 C 4.2147969 10.616469 4 11.788 4 12.5 C 4 13.75 4.2592188 14.753875 4.8242188 15.671875 C 5.0332187 15.999875 5.671 17 6.75 17 C 7.133 17 7.7694062 16.850391 7.9414062 15.900391 C 8.7064063 16.887391 10 18.125 12 19 C 12 19 8.2507969 14.625438 7.5917969 11.898438 C 7.5917969 11.898437 6.874625 12.625375 6.265625 14.109375 C 6.083625 13.651375 6 13.135 6 12.5 C 6 11.873 6.2758125 10.471375 6.3828125 9.984375 L 6.4765625 9.5605469 L 6.2304688 9.203125 C 6.2264687 9.196125 5.7227344 8.4688906 5.4277344 7.9628906 C 5.0917344 7.3868906 4.8439375 6.4955781 4.7109375 6.0175781 C 4.6459375 5.7845781 4.594875 5.6159531 4.546875 5.5019531 C 4.371875 5.1229531 4.115625 4.7900937 3.890625 4.4960938 L 3.765625 4.3300781 C 3.702625 4.2390781 3.6193906 4.133625 3.5253906 4.015625 C 3.3423906 3.785625 3.0017188 3.3570312 3.0117188 3.0820312 L 3.1230469 3.0039062 L 3.125 3 C 3.92 3 4.9440781 3.5643437 5.3300781 3.7773438 C 5.4560781 3.8463438 5.5486563 3.8940156 5.5976562 3.9160156 L 5.7714844 3.9921875 L 6.1132812 4.0039062 C 6.5602813 4.0139062 7.9189063 4.0456875 8.8789062 4.4296875 C 10.629906 5.1296875 11.598031 5.830375 12.582031 7.109375 C 14.906031 10.131375 15.763484 14.044984 15.771484 14.083984 L 15.896484 14.648438 L 16.443359 14.826172 C 16.462359 14.833172 17.992922 15.344641 19.419922 16.681641 C 17.624922 17.125641 17 18 17 18 C 17 18 17.476 18.928 19.75 20.375 C 21.125 21.25 21.875 21.875 23 23 C 23 23 21.875688 20.499813 20.304688 18.507812 C 21.500687 18.124813 22.970703 17.925781 22.970703 17.925781 L 22.060547 16.664062 C 20.562547 14.587063 18.553656 13.538859 17.597656 13.130859 C 17.265656 11.864859 16.262969 8.614625 14.167969 5.890625 C 12.968969 4.331625 11.693094 3.3993125 9.6210938 2.5703125 C 8.3940937 2.0803125 6.9187188 2.0218594 6.2617188 2.0058594 C 5.6867187 1.6898594 4.409 1 3.125 1 z M 7.1875 5 C 7.1875 5 6.75 5 6.25 5.125 L 7.625 6.9980469 C 8 6.5000469 8 5.9179688 8 5.9179688 C 8 5.9179688 7.7505 5.25 7.1875 5 z"></path>
-</svg>

src/styles/ztree_icon.scss

@@ -105,7 +105,7 @@
   }
 
   &.chatgpt_ico_docu {
-    background: url('./icons/chatgpt.png') no-repeat center left transparent;
+    background: url('./icons/gpt.png') no-repeat center left transparent;
   }
 
   &.clickhouse_ico_docu {

src/views/assets/Asset/AssetList/components/PlatformDialog.vue

@@ -28,7 +28,8 @@
                 shadow="hover"
                 @click.native="createAsset(platform)"
               >
-                {{ platform.name }}
+                <img :src="loadImage(platform)" class="asset-icon" alt="icon">
+                <span class="platform-name">{{ platform.name }}</span>
               </el-card>
             </el-col>
           </el-collapse-item>
@@ -37,7 +38,6 @@
     </div>
   </Dialog>
 </template>
-
 <script>
 import Dialog from '@/components/Dialog'
 
@@ -123,6 +123,25 @@ export default {
     })
   },
   methods: {
+    loadImage(platform) {
+      const platformMap = {
+        'Huawei': 'huawei',
+        'Cisco': 'cisco',
+        'Gateway': 'gateway',
+        'macOS': 'macos',
+        'BSD': 'bsd',
+        'Vmware-vSphere': 'vmware'
+      }
+
+      const value = platformMap[platform.name] || platform.type.value
+
+      try {
+        return require(`@/assets/img/icons/${value}.png`)
+      } catch (error) {
+        this.$log.debug(`Image not found: ${value}.png`)
+        return require(`@/assets/img/icons/other.png`)
+      }
+    },
     loadRecentPlatformIds() {
       const recentPlatformIds = JSON.parse(localStorage.getItem('RecentPlatforms')) || []
       this.recentPlatformIds = recentPlatformIds
@@ -175,7 +194,7 @@ export default {
 .platform-item {
   margin: 5px 0;
 
-  & >>> .el-card__body {
+  & > > > .el-card__body {
     padding: 10px
   }
 
@@ -190,15 +209,35 @@ export default {
   font-weight: 500;
   color: #303133;
 }
->>> .el-collapse {
+
+> > > .el-collapse {
   border: none;
+
   .el-collapse-item:last-child {
     .el-collapse-item__header {
       border: none;
     }
+
     .el-collapse-item__wrap {
       border-bottom: none;
     }
   }
 }
+
+::v-deep .el-card__body {
+  display: flex;
+  align-items: center;
+}
+
+.asset-icon {
+  width: 1.5em;
+  height: 1.5em;
+  vertical-align: -0.2em;
+  fill: currentColor;
+  overflow: hidden;
+}
+
+.platform-name {
+  margin-left: 10px;
+}
 </style>

src/views/profile/index.vue

@@ -175,7 +175,7 @@ export default {
           },
           callbacks: {
             click: function() {
-              this.$router.push({ name: 'ProfileSetting', query: { tab: 'PasswordUpdate' }})
+              this.$router.push({ name: 'PasswordAndSSHKey', query: { tab: 'Password' }})
             }.bind(this)
           }
         },
@@ -188,7 +188,7 @@ export default {
           },
           callbacks: {
             click: function() {
-              this.$router.push({ name: 'ProfileSetting', query: { tab: 'SSHUpdate' }})
+              this.$router.push({ name: 'PasswordAndSSHKey', query: { tab: 'SSHKey' }})
             }.bind(this)
           }
         },