Commit Graph

40 Commits

Author SHA1 Message Date
@changcode
1f0fc53526 style: 调整 switch 开关主题颜色 2021-11-30 14:36:51 +08:00
chenjinsong
7581b30f2c Merge remote-tracking branch 'origin/dev-3.1' into dev-3.2
# Conflicts:
#	nezha-fronted/src/assets/css/common/rightBoxCommon.scss
#	nezha-fronted/src/assets/css/components/common/project/topology.scss
#	nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
#	nezha-fronted/src/components/common/popBox/selectPanel.vue
#	nezha-fronted/src/components/common/project/popData/Info.vue
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
#	nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
#	nezha-fronted/src/components/page/config/changePin.vue
#	nezha-fronted/src/components/page/dashboard/explore/editor.vue
#	nezha-fronted/src/components/page/dashboard/metricPreview.vue
#	nezha-fronted/src/components/page/dashboard/panel.vue
#	nezha-fronted/src/permission.js
#	nezha-fronted/src/store/user.js
2021-11-29 16:19:13 +08:00
zhangyu
ed6eb2d433 NEZ-1301 fix: 修改提示信息 2021-11-22 14:04:15 +08:00
chenjinsong
f27b6c2606 Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
2021-11-15 14:06:42 +08:00
zhangyu
6a4671ac5e NEZ-1229 fix: Chart Option 无法切换 Statistics 属性 2021-11-12 09:42:23 +08:00
chenjinsong
a709585a9f Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
2021-11-04 14:49:40 +08:00
zhangyu
dc407816ce NEZ-1167 fix:Endpoint 名称校验相关问题 2021-11-04 14:24:42 +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
441da67ecc NEZ-1042 fix: 补充selsct国际化 2021-09-30 10:23:35 +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
cb3ed0fcdc fix: asset label type列 与 Box 统一 icon 图标 2021-09-23 09:56:26 +08:00
zhangyu
83e57eec1f fix: 修改 创建 asset Double 精度未控制,时间不选择区间,以及checkBox value值的顺序不对的问题 2021-08-26 17:10:32 +08:00
@changcode
4191c8113f NEZ-835 fix: 新增页面添加标签页关闭提示功能 2021-07-15 11:56:25 +08:00
zhangyu
cc3886d38e NEZ-814 fix: 修改asset label multitext 类型 编辑页面错误 2021-07-13 11:32:21 +08:00
@changcode
d33f6ff598 NEZ-807 fix: 标签关闭 提示功能 2021-07-05 14:43:47 +08:00
chenjinsong
f135c671c1 NEZ-717 fix: 修复param没回显的问题 2021-06-21 17:44:28 +08:00
@changcode
ae7368a4c5 Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0 2021-06-02 17:16:08 +08:00
@changcode
c4ac462f7e fix: 侧滑 right-box 重名 2021-06-02 17:16:00 +08:00
zhangyu
9ee8b0f7ba NEX-717 fix:bug修改 2021-06-02 16:55:17 +08:00
@changcode
7ddc9bc67c NEZ-668 style: nezha 系统中输入框字符长度问题 2021-05-28 10:43:41 +08:00
zhangyu
8f6dbb720e NEZ-674 fix:修改 group不显示的问题 以及 回显params错误的问题 2021-05-26 15:40:42 +08:00
@changcode
1d06b939e5 fix: assetMeta创建修改对象中,添加group空对象 2021-05-26 11:15:33 +08:00
@changcode
caee2a009b fix: 去除打印 2021-05-26 10:59:29 +08:00
@changcode
23eafe446e NEZ-674 fix: asset label 编辑时回显的group不正确 2021-05-26 10:58:15 +08:00
@changcode
28c3a7d951 NEZ-651 fix : 清理浏览器控制台打印代码 2021-05-20 16:53:46 +08:00
zhangyu
b60eb36839 fix:页面bug修改 2021-05-13 11:40:22 +08:00
zhangyu
82977548f2 fix;修改所有的右滑 不再显示ID 以及修改endpoint无法修改的问题 2021-05-11 10:37:58 +08:00
chenjinsong
e46a79fb2d fix: asset-meta-box修改 2021-04-30 18:01:09 +08:00
@changcode
ceef9ba5dc fix: 细节优化修改 2021-04-30 17:02:43 +08:00
@changcode
35062498f6 fix: settings 细节问题 2021-04-30 15:12:34 +08:00
@changcode
0cbba3073d asset type页面新增列表属性 2021-04-28 14:21:01 +08:00
@changcode
d364d8f76f NEZ-586 asset Type页面新增 2021-04-27 20:59:37 +08:00
zhangyu
2276dcfa93 feat:endpoint query 图表添加比较按钮 2021-03-31 15:26:01 +08:00
zhangyu
aefafab313 fix:assetmeta option不能删除的问题 以及option可以为空的问题 2021-03-25 16:10:35 +08:00
zhangyu
a95e7638bb feat:添加示例 2021-03-25 12:38:29 +08:00
zhangyu
9cfe34be7f feat:添加资产标签 (示例暂时未添加) 2021-03-25 09:50:23 +08:00