verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 77 Releases Wiki Activity

refactor: refs #8028 modified arrayData to fix inject warning
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Jon Elias 2025-04-24 16:18:38 +02:00
parent 508cf2f684
commit d568fc3100
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ui/VnPaginate.vue
View File

@ -146,14 +146,14 @@ const addFilter = async (filter, params) => {
};
async function fetch(params) {
useArrayData(props.dataKey, params);
arrayData.setOptions(params);
arrayData.resetPagination();
await arrayData.fetch({ append: false });
return emitStoreData();
}
async function update(params) {
useArrayData(props.dataKey, params);
arrayData.setOptions(params);
const { limit, skip } = store;
store.limit = limit + skip;
store.skip = 0;

13
src/composables/useArrayData.js
View File

@ -41,7 +41,7 @@ export function useArrayData(key, userOptions) {
if (key && userOptions) setOptions();
function setOptions() {
function setOptions(params = userOptions) {
const allowedOptions = [
'url',
'filter',
@ -57,14 +57,14 @@ export function useArrayData(key, userOptions) {
'mapKey',
'oneRecord',
];
if (typeof userOptions === 'object') {
for (const option in userOptions) {
const isEmpty = userOptions[option] == null || userOptions[option] === '';
if (typeof params === 'object') {
for (const option in params) {
const isEmpty = params[option] == null || params[option] === '';
if (isEmpty || !allowedOptions.includes(option)) continue;
if (Object.hasOwn(store, option)) {
const defaultOpts = userOptions[option];
store[option] = userOptions.keepOpts?.includes(option)
const defaultOpts = params[option];
store[option] = params.keepOpts?.includes(option)
? Object.assign(defaultOpts, store[option])
: defaultOpts;
if (option === 'userParams') store.defaultParams = store[option];
@ -367,5 +367,6 @@ export function useArrayData(key, userOptions) {
deleteOption,
reset,
resetPagination,
setOptions,
};
}