From d31929eb33379b84d8d8c1de7feb4ccaded603e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Sat, 22 Oct 2022 23:31:12 +0800
Subject: [PATCH 01/10] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=9E=84?=
=?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b54bf8999..2ad4c1be3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
FROM node:14.16 as stage-build
ARG TARGETARCH
-ARG VERSION
-ENV VERSION=$VERSION
ARG NPM_REGISTRY="https://registry.npmmirror.com"
ENV NPM_REGISTY=$NPM_REGISTRY
@@ -12,10 +10,15 @@ RUN set -ex \
&& yarn config set registry ${NPM_REGISTRY} \
&& yarn config set cache-folder /root/.cache/yarn/lina
+ADD package.json yarn.lock /data
+RUN --mount=type=cache,target=/root/.cache/yarn \
+ yarn install
+
+ARG VERSION
+ENV VERSION=$VERSION
ADD . /data
RUN --mount=type=cache,target=/root/.cache/yarn \
sed -i "s@Version .*@Version ${VERSION}@g" src/layout/components/Footer/index.vue \
- && yarn install \
&& yarn build
FROM nginx:alpine
From 4a2ffc754f948b8958c2a42aa91b907347657005 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai"
Date: Tue, 1 Nov 2022 16:30:04 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E7=AC=AC=E4=B8=89=E6=96=B9=E7=94=A8=E6=88=B7=E6=97=B6?=
=?UTF-8?q?=20need=5Fupdate=5Fpassword=20=E9=BB=98=E8=AE=A4=E4=B8=BA=20tru?=
=?UTF-8?q?e=20=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/users/User/UserCreateUpdate.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 4a0021ce7..92d3e3b69 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -171,6 +171,9 @@ export default {
if (value.update_password !== undefined) {
delete value.update_password
}
+ if (value.source !== 'local') {
+ delete value.need_update_password
+ }
return value
}
}
From 4a11ea2c57c7558ad2dad93cffdb245a40bf9d69 Mon Sep 17 00:00:00 2001
From: jiangweidong <80373698+Hi-JWD@users.noreply.github.com>
Date: Fri, 4 Nov 2022 14:31:20 +0800
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E4=BA=91=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E9=87=91=E5=B1=B1=E4=BA=91=20(#2125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/langs/en.json | 1 +
src/i18n/langs/ja.json | 1 +
src/i18n/langs/zh.json | 1 +
src/views/assets/Cloud/Account/AccountList.vue | 6 +++++-
src/views/assets/Cloud/const.js | 6 ++++++
5 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 6dbfb08a8..c34326714 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1435,6 +1435,7 @@
"HuaweiCloud": "Huawei Cloud",
"BaiduCloud": "Baidu Cloud",
"JDCloud": "JD Cloud",
+ "KingSoftCloud": "KingSoft Cloud",
"Azure":"Azure(China)",
"Azure_Int": "Azure(International)",
"HostnameStrategy": "Used to produce the asset hostname. For example, 1. Instance name (instanceDemo);2. Instance name and Partial IP (instanceDemo-250.1)",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 34ef1fb39..2c51d6c55 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1478,6 +1478,7 @@
"HuaweiCloud": "ファーウェイ雲",
"BaiduCloud": "百度雲",
"JDCloud": "京東雲",
+ "KingSoftCloud": "金山雲",
"Azure": "Azure(中国)",
"Azure_Int": "Azure (国際)",
"HostnameStrategy": "資産を生成するためにホスト名。例: 1. インスタンス名 (instanceDemo) 2.インスタンス名と一部IP (下位2桁) (instanceDemo-250.1)",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 9d0f6bc20..bc518e94b 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1479,6 +1479,7 @@
"HuaweiCloud": "华为云",
"BaiduCloud": "百度云",
"JDCloud": "京东云",
+ "KingSoftCloud": "金山云",
"Azure":"Azure(中国)",
"Azure_Int": "Azure(国际)",
"HostnameStrategy": "用于生成资产主机名。例如:1. 实例名称 (instanceDemo);2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
diff --git a/src/views/assets/Cloud/Account/AccountList.vue b/src/views/assets/Cloud/Account/AccountList.vue
index 55e21cb5a..ea8822469 100644
--- a/src/views/assets/Cloud/Account/AccountList.vue
+++ b/src/views/assets/Cloud/Account/AccountList.vue
@@ -4,7 +4,7 @@
+
+
diff --git a/src/components/TableFormatters/index.js b/src/components/TableFormatters/index.js
index 8cbb56dde..016da83ca 100644
--- a/src/components/TableFormatters/index.js
+++ b/src/components/TableFormatters/index.js
@@ -12,6 +12,7 @@ import DialogDetailFormatter from './DialogDetailFormatter'
import EditableInputFormatter from './EditableInputFormatter'
import StatusFormatter from './StatusFormatter'
import TagsFormatter from './TagsFormatter'
+import TwoTabFormatter from './TwoTabFormatter'
export default {
DetailFormatter,
@@ -27,7 +28,8 @@ export default {
ArrayFormatter,
EditableInputFormatter,
StatusFormatter,
- TagsFormatter
+ TagsFormatter,
+ TwoTabFormatter
}
export {
@@ -44,5 +46,6 @@ export {
ArrayFormatter,
EditableInputFormatter,
StatusFormatter,
- TagsFormatter
+ TagsFormatter,
+ TwoTabFormatter
}
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 0aecf2c7e..a56140933 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -245,7 +245,9 @@
"View": "View",
"LoginIP": "Login IP",
"LoginCity": "Login city",
- "LoginDate": "Login date"
+ "LoginDate": "Login date",
+ "BeforeChange": "Before change",
+ "AfterChange": "After change"
},
"auth": {
"LoginRequiredMsg": "You account has logout, Please login again",
@@ -255,6 +257,7 @@
"ReLoginErr": "Login time has exceeded 5 minutes, please login again"
},
"common": {
+ "NoContent": "No content",
"NeedAddAppsOrSystemUserErrMsg": "Please add apps or system user",
"VerificationCodeSent": "The verification code has been sent",
"SendVerificationCode": "Send verification code",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 01dd04940..7611a6090 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -250,7 +250,9 @@
"SystemUserName": "システムユーザー名",
"LoginIP": "ログインIP",
"LoginCity": "ログイン都市",
- "LoginDate": "ログイン日"
+ "LoginDate": "ログイン日",
+ "BeforeChange": "変更前",
+ "AfterChange": "変更後"
},
"auth": {
"LoginRequiredMsg": "アカウントが終了しました。ログインし直してください",
@@ -260,6 +262,7 @@
"ReLoginErr": "ログイン時間が 5 分を超えました。もう一度ログインしてください"
},
"common": {
+ "NoContent": "まだ内容がない",
"NeedAddAppsOrSystemUserErrMsg": "アプリケーションまたはシステムユーザーを追加してください",
"VerificationCodeSent": "検証コードが送信されました",
"SendVerificationCode": "認証コードの送信",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index dcb93f876..c9426cdd1 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -250,7 +250,9 @@
"SystemUserName": "系统用户名",
"LoginIP": "登录IP",
"LoginCity": "登录城市",
- "LoginDate": "登录日期"
+ "LoginDate": "登录日期",
+ "BeforeChange": "变更前",
+ "AfterChange": "变更后"
},
"auth": {
"LoginRequiredMsg": "账号已退出,请重新登录",
@@ -260,6 +262,7 @@
"ReLoginErr": "登录时长已超过 5 分钟,请重新登录"
},
"common": {
+ "NoContent": "暂无内容",
"NeedAddAppsOrSystemUserErrMsg": "需要添加应用或系统用户",
"VerificationCodeSent": "验证码已发送",
"SendVerificationCode": "发送验证码",
diff --git a/src/views/audits/OperateLogList.vue b/src/views/audits/OperateLogList.vue
index 5a1234f8c..cb21b4916 100644
--- a/src/views/audits/OperateLogList.vue
+++ b/src/views/audits/OperateLogList.vue
@@ -1,23 +1,43 @@
-
+
+
+
+
+
+