diff --git a/src/api/dictDetail.js b/src/api/dictDetail.js index d58bdc3..b03d1cc 100644 --- a/src/api/dictDetail.js +++ b/src/api/dictDetail.js @@ -13,6 +13,19 @@ export function get(dictName) { }) } +export function getDictMap(dictName) { + const params = { + dictName, + page: 0, + size: 9999 + } + return request({ + url: 'api/dictDetail/map', + method: 'get', + params + }) +} + export function add(data) { return request({ url: 'api/dictDetail', diff --git a/src/api/user.js b/src/api/user.js index 4364049..220cc26 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -23,17 +23,6 @@ export function edit(data) { }) } -export function validPass(password) { - const data = { - password - } - return request({ - url: 'api/users/validPass/', - method: 'post', - data - }) -} - export function updatePass(password) { const data = { password diff --git a/src/mixins/initData.js b/src/mixins/initData.js index 2c6110d..87c4ef6 100644 --- a/src/mixins/initData.js +++ b/src/mixins/initData.js @@ -3,7 +3,7 @@ import { initData } from '@/api/data' export default { data() { return { - loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 170 + loading: true, data: [], page: 0, size: 10, total: 0, url: '', params: {}, query: {}, time: 170, isAdd: false } }, methods: { @@ -46,6 +46,10 @@ export default { if (this.data.length === size && this.page !== 0) { this.page = this.page - 1 } + }, + toQuery() { + this.page = 0 + this.init() } } } diff --git a/src/mixins/initDict.js b/src/mixins/initDict.js index 312f41e..43b8cdf 100644 --- a/src/mixins/initDict.js +++ b/src/mixins/initDict.js @@ -1,9 +1,9 @@ -import { get } from '@/api/dictDetail' +import { get, getDictMap } from '@/api/dictDetail' export default { data() { return { - dicts: [] + dicts: [], dictMap: {} } }, methods: { @@ -16,6 +16,26 @@ export default { reject(err) }) }) + }, + // 多个字典查询时使用逗号拼接， 如： + // 加载多个数据字典，如何调用如下： + // this.getDict('user_status,job_status') + // 在vue中使用加载出来的字典： + // dictMap.[字典名称] 如：dictMap.user_status、 dictMap.job_status + async getDictMap(names) { + // 优先放入到dictMap中，避免页面加载时 undefined + const arr = names.split(',') + for (let i = 0; i < arr.length; i++) { + this.dictMap[arr[i]] = [] + } + return new Promise((resolve, reject) => { + getDictMap(names).then(res => { + this.dictMap = res + resolve(res) + }).catch(err => { + reject(err) + }) + }) } } } diff --git a/src/views/generator/module/generator.vue b/src/views/generator/generator.vue similarity index 97% rename from src/views/generator/module/generator.vue rename to src/views/generator/generator.vue index c46566c..c01a18f 100644 --- a/src/views/generator/module/generator.vue +++ b/src/views/generator/generator.vue @@ -1,6 +1,6 @@