diff --git a/web/src/api/websocket.js b/web/src/api/websocket.js index 3ef1022..4dbc3a3 100644 --- a/web/src/api/websocket.js +++ b/web/src/api/websocket.js @@ -29,8 +29,8 @@ function webSocketOnError (e) { */ function webSocketOnMessage (e) { const data = JSON.parse(e.data) - const { refresh_unread, systemConfig } = data - if (refresh_unread) { + const { refreshUnread, systemConfig } = data + if (refreshUnread) { // 更新消息通知条数 store.dispatch('d2admin/messagecenter/setUnread') } diff --git a/web/src/components/index.js b/web/src/components/index.js index 4491b34..1b305be 100644 --- a/web/src/components/index.js +++ b/web/src/components/index.js @@ -4,7 +4,7 @@ import d2Container from './d2-container' import tableProgress from './table-progress/lib/table-progress.vue' import cardSelect from '@/components/card-select/index' import selectorTable from '@/components/selector-table/index' -import m2mValuesPopover from '@/components/m2m-values-popover/index' +import valuesPopover from '@/components/values-popover/index' // 注意 有些组件使用异步加载会有影响 Vue.component('d2-container', d2Container) Vue.component('d2-icon', () => import('./d2-icon')) @@ -18,4 +18,4 @@ Vue.component('dvaHtml2pdf', () => import('./dvaHtml2pdf/index.vue')) Vue.component('table-progress', tableProgress) Vue.use(selectorTable) Vue.use(cardSelect) -Vue.use(m2mValuesPopover) +Vue.use(valuesPopover) diff --git a/web/src/components/m2m-values-popover/m2m-values-popover.vue b/web/src/components/m2m-values-popover/m2m-values-popover.vue deleted file mode 100644 index 4b4617b..0000000 --- a/web/src/components/m2m-values-popover/m2m-values-popover.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - diff --git a/web/src/components/selector-table/selector-table.vue b/web/src/components/selector-table/selector-table.vue index e213b59..aa2c731 100644 --- a/web/src/components/selector-table/selector-table.vue +++ b/web/src/components/selector-table/selector-table.vue @@ -6,10 +6,23 @@ trigger="click" @show="visibleChange">
- - - + + + + + + + + 清空选择 + +
- + diff --git a/web/src/components/m2m-values-popover/group.js b/web/src/components/values-popover/group.js similarity index 100% rename from web/src/components/m2m-values-popover/group.js rename to web/src/components/values-popover/group.js diff --git a/web/src/components/m2m-values-popover/index.js b/web/src/components/values-popover/index.js similarity index 78% rename from web/src/components/m2m-values-popover/index.js rename to web/src/components/values-popover/index.js index 1d70908..8bd2a04 100644 --- a/web/src/components/m2m-values-popover/index.js +++ b/web/src/components/values-popover/index.js @@ -2,7 +2,7 @@ import { d2CrudPlus } from 'd2-crud-plus' import group from './group' function install (Vue, options) { - Vue.component('m2m-values-popover', () => import('./m2m-values-popover')) + Vue.component('values-popover', () => import('./values-popover')) if (d2CrudPlus != null) { // 注册字段类型`demo-extend` d2CrudPlus.util.columnResolve.addTypes(group) diff --git a/web/src/components/values-popover/values-popover.vue b/web/src/components/values-popover/values-popover.vue new file mode 100644 index 0000000..436b31b --- /dev/null +++ b/web/src/components/values-popover/values-popover.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/web/src/store/modules/d2admin/modules/messagecenter.js b/web/src/store/modules/d2admin/modules/messagecenter.js index 02482c3..43ea3bf 100644 --- a/web/src/store/modules/d2admin/modules/messagecenter.js +++ b/web/src/store/modules/d2admin/modules/messagecenter.js @@ -1,6 +1,4 @@ import { request } from '@/api/service' -import { urlPrefix } from '@/views/system/messageCenter/api' - export default { namespaced: true, state: { diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue index d7ee18e..0e0dd5d 100644 --- a/web/src/views/system/config/components/formContent.vue +++ b/web/src/views/system/config/components/formContent.vue @@ -331,7 +331,7 @@ export default { const form = JSON.parse(JSON.stringify(this.form)) const keys = Object.keys(form) const values = Object.values(form) - let submitForm = Object.assign([],this.formList) + const submitForm = Object.assign([], this.formList) for (const index in this.formList) { const item = this.formList[index] // eslint-disable-next-line camelcase @@ -397,14 +397,13 @@ export default { const { tableData } = $table.getTableData() const tableLength = tableData.length if (tableLength === 0) { - const { row } = $table.insert() + $table.insert() } else { const errMap = await $table.validate().catch(errMap => errMap) if (errMap) { this.$message.error('校验不通过!') } else { - const { row } = $table.insert() - + $table.insert() } } },