diff --git a/.editorconfig b/.editorconfig index ea6e20f5b..0e70861e4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,11 +4,17 @@ root = true [*] charset = utf-8 indent_style = space -indent_size = 2 end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true + +[*.{js,jsx,ts,tsx,vue}] +indent_size = 2 + +[*.py] +indent_size = 4 + [*.md] insert_final_newline = false trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index bc4a7ffa3..f90ee3a42 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ tests/**/coverage/ *.njsproj *.sln .env.development +.python-version diff --git a/package.json b/package.json index e6d9e3109..97e471abe 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,9 @@ "vue-i18n-extract": "vue-i18n-extract", "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'", "vue-i18n-report-json": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -o /tmp/abc.json", - "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a" + "vue-i18n-report-add-miss": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json' -a", + "diff-i18n": "python ./src/i18n/langs/i18n-util.py diff en ja", + "apply-i18n": "python ./src/i18n/langs/i18n-util.py apply en ja" }, "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.13.12", diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue index 5dec38bc0..6acb9b7db 100644 --- a/src/components/AccountCreateUpdateForm/index.vue +++ b/src/components/AccountCreateUpdateForm/index.vue @@ -54,7 +54,7 @@ export default { 'secret_type', 'secret', 'ssh_key', 'token', 'api_key', 'passphrase' ]], - [this.$t('common.Other'), ['push_now', 'comment']] + [this.$t('common.Other'), ['push_now', 'is_active', 'comment']] ], fieldsMeta: { assets: { diff --git a/src/components/AccountListTable/AccountList.vue b/src/components/AccountListTable/AccountList.vue index ad8ba5419..a6051cc19 100644 --- a/src/components/AccountListTable/AccountList.vue +++ b/src/components/AccountListTable/AccountList.vue @@ -106,7 +106,7 @@ export default { app: 'assets', resource: 'account' }, - columnsExclude: ['specific'], + columnsExclude: ['spec_info'], columnsShow: { min: ['name', 'username', 'actions'], default: [ @@ -244,7 +244,7 @@ export default { hasLeftActions: this.hasLeftActions, hasMoreActions: true, hasCreate: false, - hasImport: true, + hasImport: this.hasImport, hasExport: this.hasExport && this.$hasPerm('accounts.view_accountsecret'), exportOptions: { url: this.exportUrl, diff --git a/src/components/AssetSelect/dialog.vue b/src/components/AssetSelect/dialog.vue index 05a8a4987..3141d1818 100644 --- a/src/components/AssetSelect/dialog.vue +++ b/src/components/AssetSelect/dialog.vue @@ -114,9 +114,11 @@ export default { methods: { handleConfirm() { this.$emit('confirm', this.rowSelected, this.rowsAdd) + this.$eventBus.$emit('treeComponentKey') }, handleCancel() { this.$emit('cancel') + this.$eventBus.$emit('treeComponentKey') }, addRowToSelect(row) { const selectValueIndex = this.rowSelected.indexOf(row.id) diff --git a/src/components/AssetSelect/index.vue b/src/components/AssetSelect/index.vue index 8630ce52f..e87ec450f 100644 --- a/src/components/AssetSelect/index.vue +++ b/src/components/AssetSelect/index.vue @@ -14,6 +14,7 @@ :value="value" :visible.sync="dialogVisible" v-bind="$attrs" + :base-url="baseUrl" @cancel="handleCancel" @confirm="handleConfirm" v-on="$listeners" diff --git a/src/components/AutoDataZTree/index.vue b/src/components/AutoDataZTree/index.vue index 7fb5ccd4b..2ac909438 100644 --- a/src/components/AutoDataZTree/index.vue +++ b/src/components/AutoDataZTree/index.vue @@ -39,8 +39,6 @@ export default { showDelete: true, showUpdate: true, showSearch: false, - // 自定义header - customTreeHeader: false, customTreeHeaderName: this.$t('assets.AssetTree'), async: { enable: true, diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue index 5cefbfa6a..cbbecb158 100644 --- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue @@ -361,28 +361,36 @@ export default { */ newText: { type: String, - default: '新增' + default: function() { + return this.$t('ops.Add') + } }, /** * 修改按钮文案 */ editText: { type: String, - default: '修改' + default: function() { + return this.$t('ops.Modify') + } }, /** * 查看按钮文案 */ viewText: { type: String, - default: '查看' + default: function() { + return this.$t('ops.View') + } }, /** * 删除按钮文案 */ deleteText: { type: String, - default: '删除' + default: function() { + return this.$t('ops.Delete') + } }, /** * 删除提示语。接受要删除的数据(单个对象或数组);返回字符串 @@ -392,7 +400,7 @@ export default { deleteMessage: { type: Function, default() { - return `确认${this.deleteText}吗?` + return this.$t('ops.Confirm') + this.deleteText + '?' } }, /** @@ -451,7 +459,7 @@ export default { onSuccess: { type: Function, default() { - return this.$message.success('操作成功') + return this.$message.success(this.$t('ops.SuccessfulOperation')) } }, /** @@ -1159,7 +1167,7 @@ export default { * @param {object|object[]} - 要删除的数据对象或数组 */ onDefaultDelete(data) { - this.$confirm(this.deleteMessage(data), '提示', { + this.$confirm(this.deleteMessage(data), this.$t('common.Info'), { type: 'warning', confirmButtonClass: 'el-button--danger', beforeClose: async(action, instance, done) => { diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue index d261d2438..be3bd7e71 100644 --- a/src/components/DataZTree/components/ZTree/index.vue +++ b/src/components/DataZTree/components/ZTree/index.vue @@ -1,43 +1,6 @@