@@ -57,7 +64,7 @@
import LayoutContent from '@/components/business/LayoutContent'
import ComplexTable from '@/components/business/complex-table'
-import { query } from '@/api/system/msg'
+import { query, batchDelete } from '@/api/system/msg'
import { msgTypes, getTypeName, loadMsgTypes } from '@/utils/webMsg'
import { addOrder, formatOrders } from '@/utils/index'
import { mapGetters } from 'vuex'
@@ -85,7 +92,8 @@ export default {
currentPage: 1,
pageSize: 10,
total: 0
- }
+ },
+ multipleSelection: []
}
},
computed: {
@@ -164,6 +172,20 @@ export default {
}
addOrder({ field: prop, value: order }, this.orderConditions)
this.search()
+ },
+ deleteBatch() {
+ if (this.multipleSelection.length === 0) {
+ this.$warning(this.$t('webmsg.please_select'))
+ return
+ }
+ const param = this.multipleSelection.map(item => item.msgId)
+ batchDelete(param).then(res => {
+ this.$success(this.$t('commons.delete_success'))
+ this.search()
+ })
+ },
+ handleSelectionChange(val) {
+ this.multipleSelection = val
}
}
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 2e86229107..d02c121d19 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -96,8 +96,8 @@
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index 6f53ecb6f5..0aca7f717e 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -133,6 +133,13 @@ export default {
this.$warning(this.$t('chart.name_can_not_empty'))
return false
}
+
+ debugger
+ if (this.editPanel.panelInfo.name.length > 50) {
+ this.$warning(this.$t('commons.char_can_not_more_50'))
+ return false
+ }
+
if (!this.editPanel.panelInfo.panelData && this.editPanel.optType === 'new' && this.inputType === 'copy') {
this.$warning(this.$t('chart.template_can_not_empty'))
return false
diff --git a/frontend/static/fonts/element-icons.535877f.woff b/frontend/static/fonts/element-icons.535877f.woff
new file mode 100644
index 0000000000..02b9a2539e
Binary files /dev/null and b/frontend/static/fonts/element-icons.535877f.woff differ
diff --git a/frontend/static/fonts/element-icons.732389d.ttf b/frontend/static/fonts/element-icons.732389d.ttf
new file mode 100644
index 0000000000..91b74de367
Binary files /dev/null and b/frontend/static/fonts/element-icons.732389d.ttf differ
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 57748c2042..1fbffca388 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -2,6 +2,8 @@
const path = require('path')
const defaultSettings = require('./src/settings.js')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+
function resolve(dir) {
return path.join(__dirname, dir)
}
@@ -27,6 +29,7 @@ module.exports = {
},
before: require('./mock/mock-server.js')
},
+
pages: {
index: {
entry: 'src/main.js',
@@ -46,7 +49,15 @@ module.exports = {
alias: {
'@': resolve('src')
}
- }
+ },
+ plugins: [
+ new CopyWebpackPlugin([
+ {
+ from: path.join(__dirname, 'static'),
+ to: path.join(__dirname, 'dist/static')
+ }
+ ])
+ ]
},
chainWebpack: config => {
config.module.rules.delete('svg') // 删除默认配置中处理svg,