From 4c3673aef2c37a9c0c6dcfc74b2a518f13cdea6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Wed, 11 Oct 2023 16:44:46 +0800 Subject: [PATCH 01/11] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E7=89=88=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 2 + src/i18n/langs/ja.json | 2 + src/i18n/langs/zh.json | 2 + .../AccountTemplateCreateUpdate.vue | 34 ++++++- .../AccountTemplateDetail/Account.vue | 19 ++-- .../AccountTemplateChangeSecretDialog.vue | 93 ------------------- 6 files changed, 45 insertions(+), 107 deletions(-) delete mode 100644 src/views/accounts/AccountTemplate/AccountTemplateDetail/AccountTemplateChangeSecretDialog.vue diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index e3d7d203c..006a12905 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -116,6 +116,8 @@ "AccountExportTips": "The exported information contains account secret, which involves sensitive information. The exported format is an encrypted zip file (if no encryption password is set, please go to personal information to set the file encryption password).", "TaskID": "Task ID", "AccountTemplate": "Account template", + "Sync": "Sync", + "SyncUpdateAccountInfo": "Sync update account info", "AddAccountResult": "Add account result", "AutoPush": "Auto Push", "GeneralAccounts": "General Accounts", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index bbb1ff9b7..617cd419a 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -116,6 +116,8 @@ "AccountExportTips": "エクスポート情報には機密情報を含むアカウント暗号文が含まれており、エクスポートされたフォーマットは暗号化されたzipファイルです（暗号化パスワードが設定されていない場合は、個人情報にファイル暗号化パスワードを設定してください）。", "TaskID": "タスク ID", "AccountTemplate": "账号模版", + "Sync": "同期", + "SyncUpdateAccountInfo": "アカウント情報の同期更新", "AddAccountResult": "账号批量添加结果", "AutoPush": "自動プッシュ", "GeneralAccounts": "一般アカウント", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index a3cca2731..df354eedc 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -10,6 +10,8 @@ "GenerateSuccessMsg": "账号生成成功", "GenerateAccounts": "重新生成账号", "UpdateSecret": "更新密文", + "Sync": "同步", + "SyncUpdateAccountInfo": "同步更新账号信息", "AddAccountResult": "账号批量添加结果", "AccountPolicy": "账号策略", "BulkCreateStrategy": "创建时对于不符合要求的账号，如：密钥类型不合规，唯一键约束，可选择以上策略。", diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue index 7ef7fecba..b5f1d363a 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue @@ -14,6 +14,14 @@ export default { }, data() { const vm = this + const isUpdate = vm.$route.path.indexOf('/update') > -1 && vm.$route.params?.id + const formFields = templateFields(vm) + for (const [key, value] of formFields) { + if (key === vm.$t('assets.Secret')) { + isUpdate && value.push('is_sync_account') + } + } + return { initial: { secret_type: 'password', @@ -21,11 +29,28 @@ export default { }, url: '/api/v1/accounts/account-templates/', hasDetailInMsg: false, - fields: [ - ...templateFields(vm) - ], + fields: formFields, fieldsMeta: { - ...templateFieldsMeta(vm) + ...templateFieldsMeta(vm), + is_sync_account: { + label: this.$t('accounts.SyncUpdateAccountInfo'), + el: { + icon: 'fa fa-external-link', + type: 'primary', + size: 'mini' + }, + component: 'el-button', + on: { + click: () => { + vm.$router.push({ + name: 'AccountTemplateDetail', + query: { + activeTab: 'Account' + } + }) + } + } + } }, cleanFormValue(value) { Object.keys(value).forEach((item, index, arr) => { @@ -35,6 +60,7 @@ export default { } }) value['secret'] = encryptPassword(value['secret']) + delete value.is_sync_account return value }, createSuccessNextRoute: { name: 'AccountTemplateList' }, diff --git a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue index 4e4d1ef74..d851671a9 100644 --- a/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue +++ b/src/views/accounts/AccountTemplate/AccountTemplateDetail/Account.vue @@ -20,10 +20,6 @@ :url="secretUrl" :visible.sync="showViewSecretDialog" /> - @@ -31,17 +27,16 @@ From fd018dc5acef2ef89f79a8533050cff8bbc03fb3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 11 Oct 2023 16:31:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?perf:=20=E4=BB=85=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=81=E8=AE=B8=E4=BD=BF=E7=94=A8=20passke?= =?UTF-8?q?y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Apps/UserConfirmDialog/index.vue | 5 +++-- src/i18n/langs/en.json | 7 ++++++- src/i18n/langs/ja.json | 9 +++++++-- src/i18n/langs/zh.json | 3 ++- src/views/profile/PassKey.vue | 16 ++++++++++++++-- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/components/Apps/UserConfirmDialog/index.vue b/src/components/Apps/UserConfirmDialog/index.vue index afa42e35f..9938fd50b 100644 --- a/src/components/Apps/UserConfirmDialog/index.vue +++ b/src/components/Apps/UserConfirmDialog/index.vue @@ -94,10 +94,10 @@ export default { data() { return { title: this.$t('common.CurrentUserVerify'), + smsBtnText: this.$t('common.SendVerificationCode'), smsWidth: 0, subTypeSelected: '', inputPlaceholder: '', - smsBtnText: this.$t('common.SendVerificationCode'), smsBtnDisabled: false, confirmTypeRequired: '', subTypeChoices: [], @@ -119,7 +119,7 @@ export default { watch: { visible(val) { if (!val) { - this.$emit('onConfirmCancel', true) + this.$emit('onConfirmFinal', true) } } }, @@ -189,6 +189,7 @@ export default { }).catch((e) => { this.$emit('onHandlerError', e) }).finally(() => { + this.$emit('onConfirmFinal') this.visible = false }) }, diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 006a12905..86735aaca 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -2313,5 +2313,10 @@ "applets": { "PublishStatus": "Publish status", "NoPublished": "Unpublished" + }, + "profile": { + "CreateAccessKey": "Create Access key", + "ApiKeyWarning": "To reduce the risk of AccessKey exposure, Secret is provided only during creation and cannot be queried again later. Please keep it safe.", + "PasskeyAddDisableInfo": "Your authentication source is {source}, and Passkey addition is not supported." } -} +} \ No newline at end of file diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 617cd419a..e261aaa40 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1023,7 +1023,7 @@ "ratio": "スケール", "run": "実行", "runAs": "実行ユーザー", - "runningPath":"実行パス", + "runningPath": "実行パス", "runTimes": "実行回数", "selectAssetsMessage": "左側の資産を選択し、実行するシステムユーザーを選択し、コマンドを一括実行します", "selectedAssets": "選択済アセット:", @@ -2304,5 +2304,10 @@ "applets": { "PublishStatus": "投稿ステータス", "NoPublished": "未発表" + }, + "profile": { + "CreateAccessKey": "Create Access key", + "ApiKeyWarning": "AccessKeyの漏洩リスクを低減するため、Secretは作成時にのみ提供され、後で再度クエリできません。安全に保管してください。", + "PasskeyAddDisableInfo": "あなたの認証元は {source} であり、Passkeyの追加はサポートされていません。" } -} +} \ No newline at end of file diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index df354eedc..4e8370a69 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1878,7 +1878,8 @@ }, "profile": { "CreateAccessKey": "创建访问密钥", - "ApiKeyWarning": "为降低 AccessKey 泄露的风险，只在创建时提供 Secret，后续不可再进行查询，请妥善保存。" + "ApiKeyWarning": "为降低 AccessKey 泄露的风险，只在创建时提供 Secret，后续不可再进行查询，请妥善保存。", + "PasskeyAddDisableInfo": "你的认证来源是 {source}, 不支持添加 Passkey" }, "users": { "LunaSettingUpdate": "Luna 配置设置", diff --git a/src/views/profile/PassKey.vue b/src/views/profile/PassKey.vue index 86ad4fbda..8845410b3 100644 --- a/src/views/profile/PassKey.vue +++ b/src/views/profile/PassKey.vue @@ -10,7 +10,10 @@ :title="$tc('auth.AddPassKey')" :visible.sync="dialogVisible" > - + + {{ $t('profile.PasskeyAddDisableInfo', {source: source.label}) }} + + @@ -115,6 +118,12 @@ export default { computed: { getRefsListTable() { return this.$refs.GenericListTable.$refs.ListTable.$refs.ListTable || {} + }, + isLocalUser() { + return this.source?.value === 'local' + }, + source() { + return this.$store.getters.currentUser?.source } }, methods: { @@ -149,5 +158,8 @@ export default { } - From 8727bac56041a6ee92b94227494f0fefa1f0db48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Wed, 11 Oct 2023 10:59:44 +0800 Subject: [PATCH 03/11] =?UTF-8?q?perf:=20=E7=99=BB=E5=BD=95=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=A4=8D=E6=A0=B8=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tickets/LoginAssetConfirm/Detail/TicketDetail.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue index fb53f8b13..dff64ca1f 100644 --- a/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue +++ b/src/views/tickets/LoginAssetConfirm/Detail/TicketDetail.vue @@ -39,6 +39,17 @@ export default { key: this.$t('acl.apply_login_account'), value: object.apply_login_account }, + { + key: this.$t('tickets.ApplyFromSession'), + value: object.apply_from_session, + formatter: function(item, value) { + const to = { name: 'SessionDetail', params: { id: value?.id }, query: { oid: object.org_id }} + if (!this.$hasPerm('terminal.view_session')) { + return {this.$t('sessions.session')} + } + return {this.$t('sessions.session')} + } + }, { key: this.$t('acl.apply_login_user'), value: object.apply_login_user.name From e055429ff296f839d7af855b53155375e0d67bd1 Mon Sep 17 00:00:00 2001 From: Bai Date: Wed, 11 Oct 2023 17:44:42 +0800 Subject: [PATCH 04/11] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AF=A6=E6=83=85=20phone=20=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/UserDetail/UserInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue index 24ad7f80a..b0e57e878 100644 --- a/src/views/users/User/UserDetail/UserInfo.vue +++ b/src/views/users/User/UserDetail/UserInfo.vue @@ -181,7 +181,7 @@ export default { key: this.$t('users.Phone'), formatter: () => { const phoneObj = this.object.phone - return
{phoneObj?.code}{phoneObj?.phone}
+ return
{phoneObj?.code} {phoneObj?.phone}
} }, 'wecom_id', 'dingtalk_id', 'feishu_id', From 2d2a4be3a2c276d90cd8eb290cd5786dfaa62fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Thu, 28 Sep 2023 16:23:03 +0800 Subject: [PATCH 05/11] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E6=94=B6=E9=9B=86=E3=80=81=E8=B4=A6=E5=8F=B7=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E3=80=81=E8=B4=A6=E5=8F=B7=E5=A4=87=E4=BB=BD=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E7=82=B9=E5=87=BB=E6=89=A7=E8=A1=8C=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/TabPage/index.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue index 4260b3325..32c1c1726 100644 --- a/src/layout/components/TabPage/index.vue +++ b/src/layout/components/TabPage/index.vue @@ -28,7 +28,7 @@ - + @@ -60,6 +60,11 @@ export default { required: true } }, + data() { + return { + loading: true + } + }, computed: { iActiveMenu: { get() { @@ -90,6 +95,18 @@ export default { return needActiveComponent } }, + watch: { + $route(to, from) { + const activeTab = to.query?.activeTab + if (activeTab && this.iActiveMenu !== activeTab) { + this.iActiveMenu = activeTab + this.loading = false + setTimeout(() => { + this.loading = true + }) + } + } + }, created() { this.iActiveMenu = this.getPropActiveTab() }, From ae2391f07f53317b9e77f5e18c15ea0d0bc6af42 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Oct 2023 13:53:10 +0800 Subject: [PATCH 06/11] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue index 214dab6a2..4002d4e27 100644 --- a/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue +++ b/src/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue @@ -17,6 +17,9 @@ export default { addFieldsMeta: this.getAddFieldsMeta() } }, + mounted() { + this.url = `${this.url}?platform=${this.$route.query.platform}` + }, methods: { getAddFields() { const platform = this.$route.query.type From 6a8161dcaf04fb6c49c973eece330ced8db0b731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Thu, 12 Oct 2023 15:50:00 +0800 Subject: [PATCH 07/11] =?UTF-8?q?perf:=E5=88=9B=E5=BB=BAapi=20key=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=B3=E9=97=AD=E5=90=8E=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/profile/ApiKey.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/profile/ApiKey.vue b/src/views/profile/ApiKey.vue index 414c8a80f..6be645c09 100644 --- a/src/views/profile/ApiKey.vue +++ b/src/views/profile/ApiKey.vue @@ -17,7 +17,8 @@ :title="$tc('profile.CreateAccessKey')" :visible.sync="visible" width="700px" - @confirm="visible = false" + @close="onClose" + @confirm="onConfirm" > {{ warningText }} @@ -151,6 +152,13 @@ export default { setTimeout(() => { this.mfaDialogVisible = false }) + }, + onClose() { + this.getRefsListTable.reloadTable() + }, + onConfirm() { + this.visible = false + this.getRefsListTable.reloadTable() } } } From fb757686e397f9ae1ef335ef71bc376e07c1dc2f Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Thu, 12 Oct 2023 16:56:43 +0800 Subject: [PATCH 08/11] =?UTF-8?q?perf:=20=E8=B5=84=E4=BA=A7=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0=E5=B9=B3=E5=8F=B0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=B9=B3=E5=8F=B0=E7=BA=A6=E6=9D=9F?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E8=87=AA=E5=8A=A8=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 3 ++- src/i18n/langs/ja.json | 3 ++- src/i18n/langs/zh.json | 1 + .../assets/Platform/PlatformDetail/Detail.vue | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 86735aaca..775892d94 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -230,6 +230,7 @@ "NoSQLProtocol": "NoSQL Protocol" }, "assets": { + "SyncProtocolToAsset": "Sync protocol to asset", "CommentHelpText": "Note: Note information will be hovered and displayed in the user authorization asset tree of Luna page, which can be viewed by ordinary users. Please do not fill in sensitive information.", "BulkUpdatePlatformHelpText": "Only when the original platform type of the asset is the same as the selected platform type will it be updated, if the platform type before and after the update is different, it will not be updated.", "ImportMessage": "Please go to the page of mapping type to import data", @@ -2319,4 +2320,4 @@ "ApiKeyWarning": "To reduce the risk of AccessKey exposure, Secret is provided only during creation and cannot be queried again later. Please keep it safe.", "PasskeyAddDisableInfo": "Your authentication source is {source}, and Passkey addition is not supported." } -} \ No newline at end of file +} diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index e261aaa40..31af15cd9 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -230,6 +230,7 @@ "NoSQLProtocol": "非リレーショナルデータベース" }, "assets": { + "SyncProtocolToAsset": "プロトコルをアセットに同期", "CommentHelpText": "注意：コメント情報はLunaページのユーザー認可資産ツリーに表示されます。一般ユーザーは表示できますので、機密情報を記入しないでください。", "BulkUpdatePlatformHelpText": "アセットの元のプラットフォーム タイプが選択したプラットフォーム タイプと同じ場合にのみ更新され、更新の前後のプラットフォーム タイプが異なる場合は更新されません。", "ImportMessage": "ミラータイプのページにデータをインポートしてください", @@ -2310,4 +2311,4 @@ "ApiKeyWarning": "AccessKeyの漏洩リスクを低減するため、Secretは作成時にのみ提供され、後で再度クエリできません。安全に保管してください。", "PasskeyAddDisableInfo": "あなたの認証元は {source} であり、Passkeyの追加はサポートされていません。" } -} \ No newline at end of file +} diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 4e8370a69..889e0da11 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -230,6 +230,7 @@ }, "assets": { "CustomType": "自定义类型", + "SyncProtocolToAsset": "同步协议到资产", "CustomHelpMessage": "自定义类型资产，依赖于远程应用，请前往系统设置在远程应用中配置", "CustomFields": "自定义属性", "CommentHelpText": "注意：备注信息会在 Luna 页面的用户授权资产树中进行悬停显示，普通用户可以查看，请不要填写敏感信息。", diff --git a/src/views/assets/Platform/PlatformDetail/Detail.vue b/src/views/assets/Platform/PlatformDetail/Detail.vue index 9deab0fe1..f0874cf61 100644 --- a/src/views/assets/Platform/PlatformDetail/Detail.vue +++ b/src/views/assets/Platform/PlatformDetail/Detail.vue @@ -131,6 +131,22 @@ export default { }) } }) + }, + { + title: this.$t(`assets.SyncProtocolToAsset`), + attrs: { + type: 'primary', + label: this.$t('accounts.Sync') + }, + callbacks: Object.freeze({ + click: () => { + const data = { platform_id: this.object.id } + this.$axios.post( + '/api/v1/assets/assets/sync-platform-protocols/', data).then(res => { + this.$message.success(this.$tc('common.updateSuccessMsg')) + }) + } + }) } ] this.quickActions = quickActions From 23b08590cfac3ad596d52d98f69353d043d02491 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Fri, 13 Oct 2023 11:05:23 +0800 Subject: [PATCH 09/11] =?UTF-8?q?perf:=20=E5=B7=A5=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=A4=BE=E5=8C=BA=E7=89=88=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settings/Feature/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/settings/Feature/index.vue b/src/views/settings/Feature/index.vue index fa58f42aa..e960eff3b 100644 --- a/src/views/settings/Feature/index.vue +++ b/src/views/settings/Feature/index.vue @@ -26,7 +26,8 @@ export default { }, { title: this.$t('setting.Ticket'), - name: 'Ticket' + name: 'Ticket', + hidden: !this.$store.getters.hasValidLicense }, { title: this.$t('setting.AppOps'), From 6fa80528787f294cd4d536f643066a6eb754c1d6 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 13 Oct 2023 14:35:38 +0800 Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E4=BB=A4=E7=89=8C=E8=BF=87=E6=9C=9F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=A2=AB=E7=A6=81=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/profile/ConnectionToken.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/profile/ConnectionToken.vue b/src/views/profile/ConnectionToken.vue index 4fbb1898f..0cd1474b8 100644 --- a/src/views/profile/ConnectionToken.vue +++ b/src/views/profile/ConnectionToken.vue @@ -52,7 +52,7 @@ export default { name: 'Expired', title: this.$t('setting.Expire'), type: 'info', - can: ({ row }) => !row['is_expired'] && this.$hasPerm('authentication.change_connectiontoken'), + can: ({ row }) => !row['is_expired'] && this.$hasPerm('authentication.expire_connectiontoken'), callback: function({ row }) { this.$axios.patch(`${ajaxUrl}${row.id}/expire/`, ).then(res => { From fc5029e88a470955c67e2193fbfd51621502baab Mon Sep 17 00:00:00 2001 From: halo Date: Fri, 13 Oct 2023 15:29:37 +0800 Subject: [PATCH 11/11] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0DB2=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/icons/db2.png | Bin 0 -> 199 bytes src/styles/ztree_icon.scss | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 src/styles/icons/db2.png diff --git a/src/styles/icons/db2.png b/src/styles/icons/db2.png new file mode 100644 index 0000000000000000000000000000000000000000..216dc5659ef3d4af857aa83563be651b890bedce GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k&H|6fVg?3oVGw3ym^DWNC|K#~ z;uumfXX`~nu4V_3mc;W91dFEKs9;$ysHo{G&?2(ag)d>Iot)NP@wgj@+^!$u;n}S7 z+5X-p*N^23UAnW6O@F~waJa|tvE?qtl83UhOZMLrIw0L&^8JY9Wif&0)u+V$UTkk* u44rjniA;Fo-ux9GCx(~2Vy-h