From 1618b98c1c2c6615dbcf4ccee15cf0cb66ad51ac Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 22 Sep 2020 17:43:55 +0800
Subject: [PATCH] [feature][ui]Alert plugin design (#3734)
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* [Feature-3682][ui]Add form-create plug-in and alarm group management add sample demo (#3683)
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
* [feature][ui] Add alarm instance page
* [feature-3665][ui]Add element-ui (#3666)
* [feature-3665][ui]Add element-ui
* add license
* Add form-create plug-in and alarm group management add sample demo
* Modify node version
* fix
* fix
---
.../_source/createWarning.vue | 145 ++++++++++++
.../pages/alarmPluginExample/_source/list.vue | 224 ++++++++++++++++++
.../pages/alarmPluginExample/index.vue | 161 +++++++++++++
.../src/js/conf/home/router/index.js | 8 +
.../components/secondaryMenu/_source/menu.js | 9 +
.../src/js/module/i18n/locale/en_US.js | 2 +
.../src/js/module/i18n/locale/zh_CN.js | 2 +
.../src/sass/common/_table.scss | 3 +
8 files changed, 554 insertions(+)
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
create mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
new file mode 100644
index 0000000000..28d53c5b8e
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/createWarning.vue
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
new file mode 100644
index 0000000000..965f941987
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/_source/list.vue
@@ -0,0 +1,224 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue
new file mode 100644
index 0000000000..50a1473678
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/alarmPluginExample/index.vue
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index b65586c433..5f6f20b375 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -397,6 +397,14 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
+ },
+ {
+ path: '/security/Alarm-plugin-example',
+ name: 'Alarm-plugin-example',
+ component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
+ meta: {
+ title: `${i18n.$t('Alarm plugin example')}`
+ }
}
]
},
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
index 56834a294e..34d3ce3765 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
@@ -135,6 +135,15 @@ const menu = {
icon: 'ans-icon-document',
children: [],
disabled: true
+ },
+ {
+ name: `${i18n.$t('Alarm plugin example')}`,
+ id: 2,
+ path: 'Alarm-plugin-example',
+ isOpen: true,
+ icon: 'ans-icon-document',
+ children: [],
+ disabled: true
}
],
resource: [
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 0f59aecc5a..f1295da677 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -480,6 +480,7 @@ export default {
'Create worker group': 'Create worker group',
'Edit worker group': 'Edit worker group',
'Token manage': 'Token manage',
+ 'Alarm plugin example': 'Alarm plugin example',
'Create token': 'Create token',
'Edit token': 'Edit token',
'Please enter the IP address separated by commas': 'Please enter the IP address separated by commas',
@@ -645,6 +646,7 @@ export default {
'Current connection settings': 'Current connection settings',
'Please save the DAG before formatting': 'Please save the DAG before formatting',
'Batch copy': 'Batch copy',
+ 'Instance type': 'Instance type',
'Related items': 'Related items',
'Project name is required': 'Project name is required',
'Batch move': 'Batch move',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 0481cd0137..148bc33f0a 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -475,6 +475,7 @@ export default {
'Create worker group': '创建Worker分组',
'Edit worker group': '编辑Worker分组',
'Token manage': '令牌管理',
+ 'Alarm plugin example': '告警插件实例',
'Create token': '创建令牌',
'Edit token': '编辑令牌',
'Please enter the IP address separated by commas': '请输入IP地址多个用英文逗号隔开',
@@ -645,6 +646,7 @@ export default {
'Current connection settings': '当前连线设置',
'Please save the DAG before formatting': '格式化前请先保存DAG',
'Batch copy': '批量复制',
+ 'Instance type': '实例类型',
'Related items': '关联项目',
'Project name is required': '项目名称必填',
'Batch move': '批量移动',
diff --git a/dolphinscheduler-ui/src/sass/common/_table.scss b/dolphinscheduler-ui/src/sass/common/_table.scss
index 688f8e3269..d643053bfc 100644
--- a/dolphinscheduler-ui/src/sass/common/_table.scss
+++ b/dolphinscheduler-ui/src/sass/common/_table.scss
@@ -171,3 +171,6 @@
}
}
}
+.el-table--enable-row-hover .el-table__body tr:hover>td {
+ background-color: #ddecff;
+}