diff --git a/src/App.vue b/src/App.vue index 68aca5ca..6ce19a10 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,7 +28,7 @@ import BreadCrumb from "@/components/BreadCrumb"; import zhCN from "ant-design-vue/es/locale/zh_CN"; import * as api1 from "@/api/index1"; import * as api2 from "@/api/index"; -import {boeRequest, request} from "@/api/request"; +import {request} from "@/api/request"; import {USER_PERMISSION} from "@/api/apis"; const store = useStore(); diff --git a/src/api/request.js b/src/api/request.js index ba2def14..a41c60eb 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -79,68 +79,68 @@ export function useBoeApiPage(_url, params = {}, config = { }; } -export function useBoeApi(_url, params = {}, config = { - init: true, - result: res => res.result, -}) { +// export function useBoeApi(_url, params = {}, config = { +// init: true, +// result: res => res.result, +// }) { +// +// const state = reactive({ +// data: [], +// loading: false, +// }); +// watch(() => params, () => { +// fetch(); +// }); +// +// function fetch() { +// state.loading = true; +// return boeRequest(_url, params).then(r => { +// state.data = config.result(r); +// state.loading = false; +// }); +// } +// +// config.init && fetch(); +// return { +// ...toRefs(state), +// fetch, +// }; +// } - const state = reactive({ - data: [], - loading: false, - }); - watch(() => params, () => { - fetch(); - }); - - function fetch() { - state.loading = true; - return boeRequest(_url, params).then(r => { - state.data = config.result(r); - state.loading = false; - }); - } - - config.init && fetch(); - return { - ...toRefs(state), - fetch, - }; -} - -export function useBoeUserListPage(_url, params = {}, init = true) { - - const state = reactive({ - data: [], - loading: false, - total: 0, - totalPage: 0, - page: 1, - ...params - }); - - watch(() => params.keyword, throttle(fetch, 600)); - watch(() => params.page, fetch); - - function fetch() { - state.loading = true; - if (!params.keyword) { - state.loading = false; - return; - } - return boeRequest(_url, params).then(r => { - state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList]; - state.totalPage = r.result.totalPage; - state.total = r.result.totalElement; - state.loading = false; - }); - } - - init && fetch(); - return { - ...toRefs(state), - fetch, - }; -} +// export function useBoeUserListPage(_url, params = {}, init = true) { +// +// const state = reactive({ +// data: [], +// loading: false, +// total: 0, +// totalPage: 0, +// page: 1, +// ...params +// }); +// +// watch(() => params.keyword, throttle(fetch, 600)); +// watch(() => params.page, fetch); +// +// function fetch() { +// state.loading = true; +// if (!params.keyword) { +// state.loading = false; +// return; +// } +// return boeRequest(_url, params).then(r => { +// state.data = params.page === 1 ? r.result.userInfoList : [...state.data, ...r.result.userInfoList]; +// state.totalPage = r.result.totalPage; +// state.total = r.result.totalElement; +// state.loading = false; +// }); +// } +// +// init && fetch(); +// return { +// ...toRefs(state), +// fetch, +// }; +// } export function useNewRowsPageNoInit(_url, params) { const state = reactive({ data: [], @@ -318,7 +318,32 @@ export function useRequest(_url, params, init = true) { fetchData, }; } +export function useArrayRequest(_url, params, init = true) { + const data = ref([]); + const loading = ref(false); + + if (isRef(params)) { + watch(params.value, () => { + fetchData(); + }); + } + + function fetchData() { + loading.value = true; + request(_url, unref(params)).then(r => { + data.value = r.data; + loading.value = false; + }); + } + + init && fetchData(); + return { + data, + loading, + fetchData, + }; +} export async function boeRequest(_url, params = {}) { const s = _url.split(" "); let url = s[0]; diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index f687e4a2..d010a9a5 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -36,7 +36,7 @@