Commit Graph

38 Commits

Author SHA1 Message Date
likexuan
a094f651e3 perf : 统一 textarea样式 2022-06-10 14:55:46 +08:00
@changcode
72435b9581 fix: 修复ipam type 下拉重复内容 2022-03-21 18:05:33 +08:00
@changcode
ce8e3e8b74 feat: license签发界面 2022-03-15 18:06:40 +08:00
@changcode
c7573eb09c fix: modelbox 监听错误 2022-03-11 18:18:45 +08:00
@changcode
8b0a334dde NEZ-1664 feat: asset model 新增补充 2022-03-11 18:16:07 +08:00
@changcode
878207d722 feat: asset model 增加 type,sysObjectId 2022-03-11 14:26:14 +08:00
@changcode
c1d94feea1 NEZ-1378 fix: Module内容过长时鼠标悬浮提示,补充国际化 2021-12-02 21:51:31 +08:00
chenjinsong
a0dcb8d877 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
2021-11-11 11:28:19 +08:00
zhangyu
f7ba3bec13 NEZ-1205 fix: 英文状态下选择框内的提示语是中文 修改 2021-11-09 10:17:12 +08:00
zhangyu
e79a3ac165 NEZ-1205 fix: 开启两个窗口 一个中文一个英文 v-select组件 显示不对的问题 2021-11-08 15:55:51 +08:00
chenjinsong
ef664be5ef Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/assets/css/common.scss
#	nezha-fronted/src/assets/css/common/tableCommon.scss
#	nezha-fronted/src/assets/stylus/main.scss
#	nezha-fronted/src/components/charts/chart-list.vue
#	nezha-fronted/src/components/charts/logs.vue
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/alert/alertRuleInfo.vue
#	nezha-fronted/src/components/common/bottomBox/bottomBox.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/detailView/list/dc/dcDetail.vue
#	nezha-fronted/src/components/common/detailView/list/endpoint/endpointDetail.vue
#	nezha-fronted/src/components/common/detailView/list/module/moduleDetail.vue
#	nezha-fronted/src/components/common/detailView/nzDetailView.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/multipleTime.vue
#	nezha-fronted/src/components/common/pickTime.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/project/L5/topoTooltip.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
#	nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
#	nezha-fronted/src/components/common/table/settings/userTable.vue
#	nezha-fronted/src/components/layout/header.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
#	nezha-fronted/src/components/page/alert/nzAlertTag.vue
#	nezha-fronted/src/components/page/asset/components/operation.vue
#	nezha-fronted/src/components/page/config/mibBrowser.vue
#	nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
#	nezha-fronted/src/components/page/dashboard/explore/logTab.vue
#	nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
2021-11-01 18:24:01 +08:00
chenjinsong
914c096463 NEZ-1072 feat: 主题切换 2021-11-01 17:23:01 +08:00
@changcode
47d1863111 style: 优化select公用样式,及类名 2021-10-29 12:02:34 +08:00
@changcode
9542e1a63a style: Box 样式调整 2021-09-26 18:14:47 +08:00
@changcode
5879ca0c8a style:下拉选择器样式统一 2021-09-26 11:56:36 +08:00
@changcode
025ae13877 NEZ-1023 style: 下拉列表 样式调整 2021-09-24 17:07:16 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
@changcode
d33f6ff598 NEZ-807 fix: 标签关闭 提示功能 2021-07-05 14:43:47 +08:00
@changcode
afe82f2c03 fix: 统一国际化 2021-06-08 09:44:32 +08:00
@changcode
c4ac462f7e fix: 侧滑 right-box 重名 2021-06-02 17:16:00 +08:00
@changcode
7ddc9bc67c NEZ-668 style: nezha 系统中输入框字符长度问题 2021-05-28 10:43:41 +08:00
zhangyu
6ec63ff6f3 fix:修改asset connect点击报错 ,panel-addByTemplate穿梭框,varIds传参不正确,以及assetmodel编辑框中chart-template回显问题 2021-05-25 14:21:14 +08:00
zhangyu
6d348c2268 fix:修改查询chart模板 参数不正确的问题 2021-05-20 17:37:54 +08:00
chenjinsong
5052aeb853 NEZ-627 perf: 图表高度改为span 2021-05-17 22:31:14 +08:00
@changcode
1467f15a7c NEZ-613 fix:
1.asset 编辑页面bug ssh port 默认端口:22
2.asset model 搜索分页国际化添加
2021-05-17 13:31:25 +08:00
zhangyu
e39e71708b fix:修改分页选择组件 不传pageSize -1 2021-05-07 11:16:17 +08:00
@changcode
73950be33c fix: modelBox侧滑 ChartTemplate列表搜索字段名修改 2021-05-06 16:46:42 +08:00
@changcode
4c30b35785 fix: modelBox验证添加 2021-05-06 14:08:28 +08:00
@changcode
a1c4445a68 fix: 国际化修改 2021-04-30 18:25:04 +08:00
@changcode
d5e7761695 NEZ-592 fix: 数据中心细节问题修复 2021-04-30 12:59:36 +08:00
@changcode
ce76460a23 NEZ-589 fix: seetting菜单下编辑页面样式修改 2021-04-29 10:56:41 +08:00
@changcode
53ad7e9e65 asset model v-selectpage分页国际化 不限制选中条数 2021-04-28 09:49:23 +08:00
@changcode
2fda104eeb Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-04-27 21:00:11 +08:00
@changcode
d364d8f76f NEZ-586 asset Type页面新增 2021-04-27 20:59:37 +08:00
zhangyu
06584204ae fix:endpoint 显示bug修改 以及修改 chart 参数 2021-04-27 17:38:58 +08:00
@changcode
6383dd22a7 解决冲突 2021-04-27 10:15:07 +08:00
@changcode
92dcc61ae4 解决输入框重复绑定数据 2021-04-27 10:05:54 +08:00
@changcode
db79b6c43e NEZ-579 asset model新增编辑页面属性 2021-04-26 19:33:49 +08:00