feat: Update v3.6.5

fix: 策略删除动作和规则时提示404

GITSHA

@@ -0,0 +1 @@
+135da3e8aa006612c1bbea6b821e6488a747b967

src/components/Form/FormFields/DynamicInput.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div v-for="(command, index) in value" :key="index" :prop="'value.' + index + '.value'" class="command-item">
-      <el-input v-model="value[index]" size="mini">
+    <div v-for="(command, index) in iValue" :key="index" :prop="'iValue.' + index + '.value'" class="command-item">
+      <el-input v-model="iValue[index]" size="mini">
         <template slot="prepend"> {{ inputTitle + ' ' + (index + 1) }}</template>
       </el-input>
       <div class="input-button">
@@ -14,7 +14,7 @@
           @click="handleDelete(command)"
         />
         <el-button
-          v-if="index === value.length - 1"
+          v-if="index === iValue.length - 1"
           icon="el-icon-plus"
           size="mini"
           style="flex-shrink: 0;"
@@ -27,6 +27,7 @@
 </template>
 
 <script>
+
 export default {
   props: {
     value: {
@@ -39,20 +40,32 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      iValue: ['']
+    }
+  },
+  watch: {
+    iValue: {
+      handler(v) {
+        this.$emit('input', Array.from(v))
+      }
+    }
+  },
+  created() {
+    this.iValue = Array.from(this.value)
   },
   methods: {
     handleDelete(command) {
-      const index = this.value.indexOf(command)
+      const index = this.iValue.indexOf(command)
       if (index !== -1) {
-        this.value.splice(index, 1)
+        this.iValue.splice(index, 1)
       }
     },
     handleAdd() {
-      this.value.push('')
+      this.iValue.push('')
     },
     deleteDisabled() {
-      return this.value.length <= 1
+      return this.iValue.length <= 1
     }
   }
 }

src/i18n/langs/en.json

@@ -1648,6 +1648,7 @@
     "LDAPUser": "LDAP User",
     "InsecureCommandAlert": "Insecure command alert",
     "helpText": {
+      "UserAttr": "If the user attribute contains `uid`, change it to `cas:user`",
       "TempPassword": "For a while, there is a period of 300 seconds, failure immediately after use",
       "ApiKeyList": "The API key is used to sign the request header. The header of each request is different. Please refer to the usage documentation",
       "ConnectionTokenList": "The connection token is a kind of authentication information that combines authentication and connection assets. It allows users to log in to assets with one click. Currently supported components include: KoKo, Lion, Magnus, Razor, etc.",

src/i18n/langs/ja.json

@@ -1654,6 +1654,7 @@
     "LDAPServerInfo": "LDAPサーバー",
     "LDAPUser": "LDAPユーザー",
     "helpText": {
+      "UserAttr": "ユーザ属性で `uid` を含むものは `cas:user` に変更する必要があります。",
       "TempPassword": "一時パスワードの有効期間は300秒で、使用後すぐに失効します",
       "ApiKeyList": "Api keyを使用してリクエストヘッダに署名します。リクエストのヘッダごとに異なります。使用ドキュメントを参照してください",
       "ConnectionTokenList": "接続トークンは、認証アセットと接続アセットを組み合わせた一種の認証情報であり、ユーザーはワンクリックでアセットにログインできます。現在サポートされているコンポーネントには、KoKo、Lion、Magnus、Razorなどがあります。",

src/i18n/langs/zh.json

@@ -1652,6 +1652,7 @@
     "LDAPServerInfo": "LDAP 服务器",
     "LDAPUser": "LDAP 用户",
     "helpText": {
+      "UserAttr": "用户属性中包含 `uid` 的需要更换为 `cas:user` ",
       "TempPassword": "临时密码有效期为 300 秒，使用后立刻失效",
       "ApiKeyList": "使用 Api key 签名请求头进行认证，每个请求的头部是不一样的， 相对于 Token 方式，更加安全，请查阅文档使用",
       "ConnectionTokenList": "连接令牌是将身份验证和连接资产结合起来使用的一种认证信息，支持用户一键登录到资产，目前支持的组件包括：KoKo、Lion、Magnus、Razor 等",

src/store/modules/settings.js

@@ -64,6 +64,9 @@ const actions = {
         changeThemeColors(themeColors)
         resolve(response)
       }).catch(error => {
+        if (error.response && error.response.status === 400) {
+          alert('自 v3.6 版本开始，要求配置可信任域名或主机，否则无法正常使用, 查看: https://github.com/jumpserver/jumpserver/releases/tag/v3.6.0')
+        }
         reject(error)
       })
     })

src/styles/ztree_icon.scss

@@ -58,6 +58,8 @@
     background: url('./icons/switch.png') no-repeat center left transparent;
   }
 
+  &.k8s_ico_open,
+  &.k8s_ico_close,
   &.k8s_ico_docu {
     background: url('./icons/k8s.png') center left no-repeat;
   }

src/views/assets/Cloud/Strategy/components/ActionInput.vue

@@ -186,7 +186,9 @@ export default {
     handleDelete(index) {
       return () => {
         const item = this.tableConfig.totalData.splice(index, 1)
-        this.$axios.delete(`/api/v1/xpack/cloud/strategy-actions/${item[0]?.id}/`)
+        if (item[0]?.id) {
+          this.$axios.delete(`/api/v1/xpack/cloud/strategy-actions/${item[0].id}/`)
+        }
         this.$message.success(this.$tc('common.deleteSuccessMsg'))
       }
     }

src/views/assets/Cloud/Strategy/components/RuleInput.vue

@@ -98,7 +98,9 @@ export default {
     handleDelete(index) {
       return () => {
         const item = this.tableConfig.totalData.splice(index, 1)
-        this.$axios.delete(`/api/v1/xpack/cloud/strategy-rules/${item[0]?.id}/`)
+        if (item[0]?.id) {
+          this.$axios.delete(`/api/v1/xpack/cloud/strategy-rules/${item[0].id}/`)
+        }
         this.$message.success(this.$tc('common.deleteSuccessMsg'))
       }
     }

src/views/settings/Auth/CAS.vue

@@ -32,6 +32,7 @@ export default {
           CAS_RENAME_ATTRIBUTES: {
             component: JsonEditor,
             label: this.$t('setting.authUserAttrMap'),
+            helpText: this.$t('setting.helpText.UserAttr'),
             rules: [JsonRequiredUserNameMapped]
           }
         },

src/views/settings/Feature/index.vue

@@ -35,7 +35,7 @@ export default {
         {
           title: this.$t('setting.AccountStorage'),
           name: 'Vault',
-          hidden: !this.$hasPerm('settings.change_vault')
+          hidden: !this.$hasPerm('settings.change_vault') || !this.$store.getters.hasValidLicense
         }
       ]
     }