diff --git a/src/components/Form/DataForm/rules/index.js b/src/components/Form/DataForm/rules/index.js index 56c80ed87..54c1c1ac0 100644 --- a/src/components/Form/DataForm/rules/index.js +++ b/src/components/Form/DataForm/rules/index.js @@ -66,16 +66,6 @@ export const MatchExcludeParenthesis = { trigger: ['blur', 'change'] } -export default { - IpCheck, - Required, - RequiredChange, - EmailCheck, - specialEmojiCheck, - matchAlphanumericUnderscore, - MatchExcludeParenthesis -} - export const JsonRequired = { required: true, trigger: 'change', @@ -105,3 +95,13 @@ export const JsonRequiredUserNameMapped = { } } } + +export default { + IpCheck, + Required, + RequiredChange, + EmailCheck, + specialEmojiCheck, + matchAlphanumericUnderscore, + MatchExcludeParenthesis +} diff --git a/src/components/Table/ListTable/index.vue b/src/components/Table/ListTable/index.vue index 6c91c6784..757fc4785 100644 --- a/src/components/Table/ListTable/index.vue +++ b/src/components/Table/ListTable/index.vue @@ -73,7 +73,8 @@ export default { return { selectedRows: [], init: false, - extraQuery: extraQuery + extraQuery: extraQuery, + urlUpdated: {} } }, computed: { @@ -165,14 +166,16 @@ export default { deep: true } }, - deactivated() { - this.preURL = location.href + mounted() { + this.urlUpdated[this.tableUrl] = location.href }, activated() { - if (this.preURL === location.href) { + const preURL = this.urlUpdated[this.tableUrl] + if (!preURL || preURL === location.href) { return } - this.$log.info('Reload the table get latest data: pre ', this.preURL, ' current: ', location.href) + this.tableUrl[this.tableUrl] = location.href + this.$log.info('Reload the table get latest data: pre ', preURL, ' current: ', location.href) setTimeout(() => { this.reloadTable() }, 500) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 6e6d00007..3b4c929f6 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1,4 +1,12 @@ { "FieldRequiredError": "This field is required.", - "ServerError": "An error occurred while processing your request. Please try again later." + "ServerError": "An error occurred while processing your request. Please try again later.", + "InputEmailAddress": "Please enter a valid email address.", + "FormatError": "The value entered is not in the correct format.", + "NotSpecialEmoji": "Emoji is not allowed.", + "notAlphanumericUnderscore": "Only alphanumeric characters and underscores are allowed.", + "notParenthesis": "Parentheses are not allowed.", + "InvalidJson": "Invalid JSON format.", + "requiredHasUserNameMapped": "Username attr is required." } + diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 366681c1c..cd7765272 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1,3 +1,11 @@ { - "FieldRequiredError": "这个字段是必需的。" + "FieldRequiredError": "这个字段是必需的。", + "InputEmailAddress": "输入一个电子邮件地址。", + "ServerError": "服务错误,请联系管理员。", + "FormatError": "格式错误。", + "NotSpecialEmoji": "不支持表情字符。", + "notAlphanumericUnderscore": "仅支持字母、数字和下划线。", + "notParenthesis": "不能包含括号。", + "InvalidJson": "JSON 格式错误.", + "requiredHasUserNameMapped": "用户名属性是必需的。" } diff --git a/src/i18n/langs/zh_Hant.json b/src/i18n/langs/zh_Hant.json index 359881b47..190221188 100644 --- a/src/i18n/langs/zh_Hant.json +++ b/src/i18n/langs/zh_Hant.json @@ -2313,4 +2313,4 @@ }, "Footer": "頁尾" } -} \ No newline at end of file +}