diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 745e69895..c9bdf9d60 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -158,7 +158,7 @@ li{ min-width: 120px; } .nz-btn { - border-radius: 4px; + border-radius: 2px; cursor: pointer; text-align: center; box-sizing: border-box; diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index b995d9a83..f5601221c 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -67,6 +67,7 @@ const cn = { exportAll: "总计", importFile: "请上传文件", importTip: "只允许xlsx/xls格式文件", + importTipImg: "只允许jpg/png格式文件", dragFileTip: "将文件拖到此处", or: "或", clickUpload: "点击上传", @@ -1071,6 +1072,11 @@ const cn = { curve:'曲线', polyline:'折线', line:'直线', + placeholderImg:'请输入名称', + unitError:'请选择对应的目录', + imgError:'请上传图片', + folder:'目录', + selMod:'请个所有节点绑定module', }, }, date:{ diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 58f0f3766..e6d604b2f 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -70,6 +70,7 @@ const en = { exportAll:'All', importFile:'Please upload file', importTip:'Only allowed xlsx/xls file', + importTipImg: "Only allowed jpg/png file", dragFileTip:'Drag file here', or:'or', clickUpload:'Click to upload', @@ -989,10 +990,10 @@ const en = { module:'Module element', add:'Add', selTwoNode:'Please select two module', - save:'save', - cancel:'cancel', - exit:'exit', - preview:'preview', + save:'Save', + cancel:'Cancel', + exit:'Exit', + preview:'Preview', addLine:'Add line', editLine:'Edit line', lineName:'Line Name', @@ -1041,7 +1042,7 @@ const en = { grids:'Grids', gridSize:'Grid Size', gridColor:'Grid Color', - rule:"Rule", + rule:"Ruler", ruleColor:"Rule Color", defaultStartArrow:'Default start arrow', defaultEndArrow:'Default end arrow', @@ -1076,6 +1077,11 @@ const en = { curve:'curve', polyline:'polyline', line:'line', + placeholderImg:'Please enter name', + unitError:'Please select the folder', + imgError:'Please upload pictures', + folder:'Folder', + selMod:'Please bind module for all nodes', }, }, date:{ diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 964ba85a4..8b9d1cd59 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -1324,13 +1324,13 @@ display: flex; position: relative; line-height: 25px; - border-radius: 4px; + border-radius: 2px; border: 1px solid #D8D8D8; /*box-shadow: inset 0 0 5px 0 rgba(184,184,184,0.80);*/ } .new-search .nz-btn { box-shadow: 0 0 1px 1px #d8d8d8; - border-radius: 0 4px 4px 0; + border-radius: 0 2px 2px 0; } .new-search .search-input-all{ width: 231px !important; @@ -1559,10 +1559,12 @@ float: left; padding-left: 5px !important; box-sizing: border-box; + outline: none; } .select_input input:focus { border:none; box-shadow:none; + outline: none; } .select_input .select_info_list{ position: fixed;