changes
This commit is contained in:
@@ -1169,9 +1169,9 @@ export default defineNuxtPlugin((nuxtApp) => {
|
||||
// get data
|
||||
const getapi = async function (list) {
|
||||
try {
|
||||
let arr = list.map((v) => {
|
||||
let found = apis.find((api) => api.name === v.name);
|
||||
let url = (v.path ? paths.find((x) => x.name === v.path).url : path) + (v.url ? v.url : found.url);
|
||||
const arr = list.map((v) => {
|
||||
const found = apis.find((api) => api.name === v.name);
|
||||
const url = (v.path ? paths.find((x) => x.name === v.path).url : path) + (v.url ? v.url : found.url);
|
||||
let params = v.params ? v.params : found.params === undefined ? {} : found.params;
|
||||
params.login = $store.login ? $store.login.id : undefined;
|
||||
return { url, params };
|
||||
@@ -1365,21 +1365,21 @@ export default defineNuxtPlugin((nuxtApp) => {
|
||||
return copy;
|
||||
};
|
||||
|
||||
const getdata = async function (name, filter, params, first) {
|
||||
let found = findapi(name);
|
||||
const getdata = async function (name, { filter, params, first = false } = {}) {
|
||||
const found = findapi(name);
|
||||
if (params) found.params = params;
|
||||
else if (filter) found.params.filter = filter;
|
||||
let rs = await getapi([found]);
|
||||
let data = rs[0].data;
|
||||
const rs = await getapi([found]);
|
||||
const { data } = rs[0];
|
||||
if (data) {
|
||||
if (data.rows) {
|
||||
return first ? (data.rows.length > 0 ? data.rows[0] : undefined) : data.rows;
|
||||
return first ? data.rows[0] : data.rows;
|
||||
} else {
|
||||
let rows = Array.isArray(data) ? data : [data];
|
||||
const rows = Array.isArray(data) ? data : [data];
|
||||
return first ? (rows.length > 0 ? rows[0] : data) : data;
|
||||
}
|
||||
} else {
|
||||
let rows = Array.isArray(data) ? data : [data];
|
||||
const rows = Array.isArray(data) ? data : [data];
|
||||
return first ? (rows.length > 0 ? rows[0] : data) : data;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -87,12 +87,12 @@ import MenuAccount from "@/components/menu/MenuAccount.vue";
|
||||
import ImageLayout from "@/components/media/ImageLayout.vue";
|
||||
|
||||
import CountdownTimer from "@/components/common/CountdownTimer.vue";
|
||||
import CustomerInfo2 from "@/components/customer/CustomerInfo2.vue";
|
||||
import CustomerInfo from "@/components/customer/CustomerInfo.vue";
|
||||
import MenuFile from "@/components/menu/MenuFile.vue";
|
||||
|
||||
const components = {
|
||||
PivotDataView,
|
||||
CustomerInfo2,
|
||||
CustomerInfo,
|
||||
CountdownTimer,
|
||||
InternalEntry,
|
||||
ViewList,
|
||||
|
||||
Reference in New Issue
Block a user