diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index d885b78cb..539127430 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -637,7 +637,7 @@ export const tableSet = { case 'gname': return 'gname' default : return prop } - default: break + default: return prop } }, // 本地正序 diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 1f9c695fd..b3db77108 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -438,7 +438,8 @@ const cn = { uSize: '必须是(1 - 47)的数字', requiredIdc: '机房为必选项', tooLong: '文本太长', - key: '不合法的值' + key: '不合法的值', + onlyWord: '只可以输入a-z、A-Z、0-9、"_" 字符' }, search: { searchTip: '点击或回车执行搜索', @@ -930,6 +931,35 @@ const cn = { createAssetState: '新增资产状态', editAssetState: '编辑资产状态' }, + assetMeta: { + example: '示例', + assetMeta: '资产标签', + addGroup: '创建分组', + editGroup: '编辑分组', + addMeta: '创建Meta', + editMeta: '编辑Meta', + groupName: '名称', + key: '键名', + name: '名称', + group: '组', + search: '搜索', + display: '显示', + type: '类型', + params: '参数', + updateMeta: '编辑Meta', + deleteMeta: '删除 Meta', + infoMeta: 'Meta 信息', + text: '单行文本', + multitext: '多行文本', + textarea: '文本域', + radio: '单选按钮', + checkbox: '多选', + select: '下拉列表', + integer: '整数', + double: '小数', + datetime: '日期', + email: '邮箱' + }, exprTemp: { exprTemp: 'expression模板', exprTempInfo: 'Expression 模板详情', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 66866ec19..23c38424a 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -441,7 +441,8 @@ const en = { requiredIdc: 'dc is required', key: 'Invalid key', repeat: 'Repeat', - tooLong: 'Too long content' + tooLong: 'Too long content', + onlyWord: 'only input a-z、A-Z、0-9、"_" ' }, search: { searchTip: 'Enter to search', // '点击或回车执行搜索' @@ -933,6 +934,35 @@ const en = { createAssetState: 'Create asset state', editAssetState: 'Edit asset state' }, + assetMeta: { + example: 'Example', + assetMeta: 'Asset meta', + addGroup: 'Create group', + editGroup: 'Edit group', + addMeta: 'Create meta', + editMeta: 'Edit meta', + groupName: 'Name', + key: 'Key', + name: 'Name', + group: 'Group', + search: 'Search', + display: 'Display', + type: 'Type', + params: 'Params', + updateMeta: 'Update Meta', + deleteMeta: 'Delete Meta', + infoMeta: 'Meta Info', + text: 'TEXT', + multitext: 'MULTITEXT', + textarea: 'TEXTAREA', + radio: 'RADIO', + checkbox: 'CHECKBOX', + select: 'SELECT', + integer: 'INTEGER', + double: 'DOUBLE', + datetime: 'DATETIME', + email: 'EMAIL' + }, exprTemp: { exprTemp: 'Expression template', exprTempInfo: 'Expression template Info', diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue new file mode 100644 index 000000000..d6fee2200 --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -0,0 +1,437 @@ + + + + + diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue new file mode 100644 index 000000000..5561a96ec --- /dev/null +++ b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/nezha-fronted/src/components/common/rightBox/roleBox.vue b/nezha-fronted/src/components/common/rightBox/roleBox.vue index 1acab1cad..c90536398 100644 --- a/nezha-fronted/src/components/common/rightBox/roleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/roleBox.vue @@ -143,7 +143,7 @@ export default { if (response.code == 200) { this.menus = response.data.list - console.log("menus",this.menus) + console.log('menus', this.menus) } else { this.$message.error('load menu faild') } diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue new file mode 100644 index 000000000..16fee2391 --- /dev/null +++ b/nezha-fronted/src/components/page/config/assetMeta.vue @@ -0,0 +1,584 @@ + + + + + diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index f56128788..75c29bbc8 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -65,6 +65,10 @@ export default new Router({ path: '/assetState', component: resolve => require(['../components/page/config/assetState.vue'], resolve) }, + { + path: '/assetMeta', + component: resolve => require(['../components/page/config/assetMeta.vue'], resolve) + }, { path: '/dc', component: resolve => require(['../components/page/config/dc.vue'], resolve) diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json index ca9183fea..66c3c57ef 100644 --- a/nezha-fronted/static/config.json +++ b/nezha-fronted/static/config.json @@ -1 +1 @@ -{"baseUrl":"", "version": "1.2.2020.11.10.14.10"} +{"baseUrl":"http://192.168.40.42:8080/nz-admin/", "version": "1.2.2020.11.10.14.10"}