vue-hooks-pure 0.0.2 → 0.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -50,11 +50,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
50
50
  var utils_1 = require("@iceywu/utils");
51
51
  var vue_1 = require("vue");
52
52
  var utils_2 = require("./utils");
53
- function getListLength(data) {
54
- return data.length;
55
- }
53
+ // function getListLength(data: any) {
54
+ // return data?.length || 0
55
+ // }
56
56
  function getListFinished(data, totalNums) {
57
- return data.length >= totalNums;
57
+ return (data === null || data === void 0 ? void 0 : data.length) >= totalNums;
58
58
  }
59
59
  function getListVal(data) {
60
60
  return data;
@@ -168,8 +168,11 @@ function useRequest(request, options) {
168
168
  case 0:
169
169
  requestTarget = (0, utils_1.getObjVal)(options, 'target');
170
170
  if (!(requestTarget === 'list')) return [3 /*break*/, 5];
171
- if (getListRefVal('loading') || getListRefVal('finished') || loading.value)
171
+ if (getListRefVal('loading')
172
+ || getListRefVal('finished')
173
+ || loading.value) {
172
174
  return [2 /*return*/];
175
+ }
173
176
  totalNumTemp = getListRefVal('data').length || 0;
174
177
  if (!(isReload && totalNumTemp > 0)) return [3 /*break*/, 2];
175
178
  return [4 /*yield*/, getData(totalNumTemp)];
@@ -209,28 +212,31 @@ function useRequest(request, options) {
209
212
  }
210
213
  function getData(reloadSize) {
211
214
  return __awaiter(this, void 0, void 0, function () {
212
- var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getLength, _f, getFinished, totalNums, tempList, newList;
213
- return __generator(this, function (_g) {
214
- switch (_g.label) {
215
+ var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getFinished, getTotal, totalNums, tempList, newList;
216
+ return __generator(this, function (_f) {
217
+ switch (_f.label) {
215
218
  case 0:
216
219
  // 加载状态
217
220
  setListRefVal('loading', true);
218
221
  loading.value = true;
219
222
  target = options.target, listOptions = options.listOptions;
220
223
  tempParams = getParamsVal(reloadSize);
224
+ if (!request) {
225
+ return [2 /*return*/];
226
+ }
221
227
  return [4 /*yield*/, (0, utils_1.to)(request(tempParams))];
222
228
  case 1:
223
- _a = _g.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
229
+ _a = _f.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
224
230
  _c = (options || {}).getVal, getVal = _c === void 0 ? getListVal : _c;
225
231
  listData = getVal(resData);
226
232
  // 列表情况
227
233
  if (target === 'list') {
228
- _d = (0, utils_1.getObjVal)(options, 'listOptions', {}), _e = _d.getLength, getLength = _e === void 0 ? getListLength : _e, _f = _d.getFinished, getFinished = _f === void 0 ? getListFinished : _f;
234
+ _d = (0, utils_1.getObjVal)(options, 'listOptions', {}), _e = _d.getFinished, getFinished = _e === void 0 ? getListFinished : _e, getTotal = _d.getTotal;
229
235
  if (getListRefVal('refreshing')) {
230
236
  setListRefVal('data', (listOptions === null || listOptions === void 0 ? void 0 : listOptions.default) || []);
231
237
  setListRefVal('refreshing', false);
232
238
  }
233
- totalNums = getLength(listData) || 0;
239
+ totalNums = getTotal(resData) || 0;
234
240
  setListRefVal('total', totalNums);
235
241
  tempList = listData || [];
236
242
  if (reloadSize) {
@@ -263,6 +269,7 @@ function useRequest(request, options) {
263
269
  getData: getData,
264
270
  onRefresh: onRefresh,
265
271
  onLoad: onLoad,
272
+ search: search,
266
273
  };
267
274
  }
268
275
  exports.default = useRequest;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uCAA6C;AAC7C,2BAAmC;AACnC,iCAA4C;AAe5C,sCAAsC;AACtC,6BAA6B;AAC7B,IAAI;AACJ,SAAS,eAAe,CAAC,IAAS,EAAE,SAAiB;IACnD,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,SAAS,CAAA;AAClC,CAAC;AACD,SAAS,UAAU,CAAC,IAAS;IAC3B,OAAO,IAAI,CAAA;AACb,CAAC;AAqBD,SAAS,UAAU,CACjB,OAAgB,EAChB,OAAqC;IAArC,wBAAA,EAAA,YAAqB,MAAM,EAAE,MAAM,EAAE;IAErC;;OAEG;IACH,IAAM,MAAM,GAAG,IAAA,SAAG,EAAC,EAAE,CAAC,CAAA;IAEtB,IAAM,MAAM,GAAG,IAAA,SAAG,EAAM,EAAE,CAAC,CAAA;IAC3B,IAAM,OAAO,GAAG,IAAA,SAAG,EAAC,KAAK,CAAC,CAAA;IAC1B,IAAM,SAAS,GAAG,IAAA,cAAQ,EAAY;QACpC,IAAI,EAAE,CAAC;QACP,IAAI,EAAE,EAAE;KACT,CAAC,CAAA;IAEF,IAAM,aAAa,GAAG,UACpB,MAAgE,EAChE,GAAQ,EACR,KAAe;QAET,IAAA,KAMF,IAAA,iBAAS,EAAC,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,EALvC,cAAc,oBAAA,EACd,iBAAiB,uBAAA,EACjB,kBAAkB,wBAAA,EAClB,eAAe,qBAAA,EACf,iBAAiB,uBACsB,CAAA;QACzC,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,IAAM,OAAO,GAAG,cAAc,IAAI,MAAM,CAAA;gBAExC,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;;oBACzB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;gBAChC,MAAK;YACP,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,IAAM,UAAU,GAAG,iBAAiB,IAAI,SAAS,CAAA;gBACjD,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;;oBAC5B,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,CAAA;gBACnC,MAAK;YACP,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,IAAM,WAAW,GAAG,kBAAkB,IAAI,UAAU,CAAA;gBACpD,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;;oBAC7B,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,GAAG,CAAA;gBACpC,MAAK;YACP,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,IAAM,aAAa,GAAG,iBAAiB,IAAI,YAAY,CAAA;gBAEvD,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;;oBAC/B,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,GAAG,CAAA;gBACtC,MAAK;YACP,CAAC;YACD,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,IAAM,QAAQ,GAAG,eAAe,IAAI,OAAO,CAAA;gBAE3C,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;;oBAC1B,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAA;gBACjC,MAAK;YACP,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IACD,IAAM,aAAa,GAAG,UACpB,MAAgE;QAEhE,OAAO,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC,CAAA;IAED,IAAM,YAAY,GAAG,UAAC,UAAmB;QACvC,IAAM,MAAM,GAAQ,EAAE,CAAA;QACtB,IAAM,aAAa,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAElD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YACvB,IAAA,KAAqC,IAAA,iBAAS,EAClD,OAAO,EACP,aAAa,EACb,EAAE,CACH,EAJO,cAAc,oBAAA,EAAE,cAAc,oBAIrC,CAAA;YACD,IAAM,QAAQ,GAAG,cAAc,IAAI,0BAAkB,CAAC,IAAI,CAAA;YAC1D,IAAM,QAAQ,GAAG,cAAc,IAAI,0BAAkB,CAAC,IAAI,CAAA;YAE1D,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,IAAI,CAAA;YACjC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,IAAI,CAAA;YAEjC,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;gBACpB,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,IAAM,UAAU,yBAAQ,MAAM,GAAK,MAAM,CAAC,KAAK,CAAE,CAAA;QACjD,OAAO,UAAU,CAAA;IACnB,CAAC,CAAA;IACD;;OAEG;IACH,SAAS,QAAQ;QACf,IAAM,aAAa,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAClD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YAC7B,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;YAC/B,aAAa,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;YAClC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;YACjC,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;YAChC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;YACzB,SAAS,CAAC,IAAI,GAAG,CAAC,CAAA;YAClB,SAAS,CAAC,IAAI,GAAG,EAAE,CAAA;QACrB,CAAC;aACI,CAAC;YACJ,MAAM,CAAC,KAAK,GAAG,EAAE,CAAA;QACnB,CAAC;QAED,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;IACvB,CAAC;IACD;;;OAGG;IACH,SAAe,MAAM;4DAAC,QAAgB;;YAAhB,yBAAA,EAAA,gBAAgB;;;;wBAC9B,aAAa,GAAG,IAAA,iBAAS,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;6BAC9C,CAAA,aAAa,KAAK,MAAM,CAAA,EAAxB,wBAAwB;wBAC1B,IACE,aAAa,CAAC,SAAS,CAAC;+BACrB,aAAa,CAAC,UAAU,CAAC;+BACzB,OAAO,CAAC,KAAK,EAChB,CAAC;4BACD,sBAAM;wBACR,CAAC;wBACK,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,CAAA;6BAClD,CAAA,QAAQ,IAAI,YAAY,GAAG,CAAC,CAAA,EAA5B,wBAA4B;wBACvB,qBAAM,OAAO,CAAC,YAAY,CAAC,EAAA;4BAAlC,sBAAO,SAA2B,EAAA;;wBAGlC,SAAS,CAAC,IAAI,EAAE,CAAA;wBACT,qBAAM,OAAO,EAAE,EAAA;4BAAtB,sBAAO,SAAe,EAAA;;4BAIjB,qBAAM,OAAO,EAAE,EAAA;4BAAtB,sBAAO,SAAe,EAAA;;;;;KAEzB;IACD,SAAe,SAAS;4DAAC,QAAgB;YAAhB,yBAAA,EAAA,gBAAgB;;;;wBACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,OAAO;4BACP,QAAQ,EAAE,CAAA;wBACZ,CAAC;6BACI,CAAC;4BACJ,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;4BAC/B,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;4BAChC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;wBACvB,CAAC;wBACM,qBAAM,MAAM,CAAC,QAAQ,CAAC,EAAA;4BAA7B,sBAAO,SAAsB,EAAA;;;;KAC9B;IAED,SAAe,OAAO,CAAC,UAAmB;;;;;;wBACxC,OAAO;wBACP,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;wBAC9B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;wBACZ,MAAM,GAAkB,OAAO,OAAzB,EAAE,WAAW,GAAK,OAAO,YAAZ,CAAY;wBAEjC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;wBAE3C,IAAI,CAAC,OAAO,EAAE,CAAC;4BACb,sBAAM;wBACR,CAAC;wBAC2B,qBAAM,IAAA,UAAE,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAA;;wBAAnD,KAAsB,SAA6B,EAAlD,GAAG,QAAA,EAAE,UAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA;wBAEhB,KAAwB,CAAA,OAAO,IAAI,EAAE,CAAA,OAAlB,EAAnB,MAAM,mBAAG,UAAU,KAAA,CAAkB;wBAEvC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;wBAEhC,OAAO;wBACP,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;4BAChB,KAA8C,IAAA,iBAAS,EAC3D,OAAO,EACP,aAAa,EACb,EAAE,CACH,EAJO,mBAA6B,EAA7B,WAAW,mBAAG,eAAe,KAAA,EAAE,QAAQ,cAAA,CAI9C;4BACD,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;gCAChC,aAAa,CAAC,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,KAAI,EAAE,CAAC,CAAA;gCACjD,aAAa,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;4BACpC,CAAC;4BACK,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;4BACxC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;4BAC3B,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAA;4BAC/B,IAAI,UAAU,EAAE,CAAC;gCACf,aAAa,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;4BACjC,CAAC;iCACI,CAAC;gCACE,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;gCAC5D,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;4BAChC,CAAC;4BACD,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAA;wBAC7D,CAAC;wBACD,OAAO;6BACF,CAAC;4BACJ,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAA;wBACzB,CAAC;wBAED,IAAI,GAAG,EAAE,CAAC;4BACR,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;wBACjC,CAAC;wBACD,SAAS;wBACT,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;wBAC/B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;;;;;KACtB;IAED,OAAO;QACL,OAAO,SAAA;QACP,MAAM,QAAA;QACN,OAAO,SAAA;QACP,SAAS,WAAA;QACT,MAAM,QAAA;QACN,MAAM,QAAA;KACP,CAAA;AACH,CAAC;AAED,kBAAe,UAAU,CAAA"}
@@ -48,11 +48,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
48
48
  import { getObjVal, to } from '@iceywu/utils';
49
49
  import { reactive, ref } from 'vue';
50
50
  import { baseDefaultPageKey } from './utils';
51
- function getListLength(data) {
52
- return data.length;
53
- }
51
+ // function getListLength(data: any) {
52
+ // return data?.length || 0
53
+ // }
54
54
  function getListFinished(data, totalNums) {
55
- return data.length >= totalNums;
55
+ return (data === null || data === void 0 ? void 0 : data.length) >= totalNums;
56
56
  }
57
57
  function getListVal(data) {
58
58
  return data;
@@ -166,8 +166,11 @@ function useRequest(request, options) {
166
166
  case 0:
167
167
  requestTarget = getObjVal(options, 'target');
168
168
  if (!(requestTarget === 'list')) return [3 /*break*/, 5];
169
- if (getListRefVal('loading') || getListRefVal('finished') || loading.value)
169
+ if (getListRefVal('loading')
170
+ || getListRefVal('finished')
171
+ || loading.value) {
170
172
  return [2 /*return*/];
173
+ }
171
174
  totalNumTemp = getListRefVal('data').length || 0;
172
175
  if (!(isReload && totalNumTemp > 0)) return [3 /*break*/, 2];
173
176
  return [4 /*yield*/, getData(totalNumTemp)];
@@ -207,28 +210,31 @@ function useRequest(request, options) {
207
210
  }
208
211
  function getData(reloadSize) {
209
212
  return __awaiter(this, void 0, void 0, function () {
210
- var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getLength, _f, getFinished, totalNums, tempList, newList;
211
- return __generator(this, function (_g) {
212
- switch (_g.label) {
213
+ var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getFinished, getTotal, totalNums, tempList, newList;
214
+ return __generator(this, function (_f) {
215
+ switch (_f.label) {
213
216
  case 0:
214
217
  // 加载状态
215
218
  setListRefVal('loading', true);
216
219
  loading.value = true;
217
220
  target = options.target, listOptions = options.listOptions;
218
221
  tempParams = getParamsVal(reloadSize);
222
+ if (!request) {
223
+ return [2 /*return*/];
224
+ }
219
225
  return [4 /*yield*/, to(request(tempParams))];
220
226
  case 1:
221
- _a = _g.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
227
+ _a = _f.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
222
228
  _c = (options || {}).getVal, getVal = _c === void 0 ? getListVal : _c;
223
229
  listData = getVal(resData);
224
230
  // 列表情况
225
231
  if (target === 'list') {
226
- _d = getObjVal(options, 'listOptions', {}), _e = _d.getLength, getLength = _e === void 0 ? getListLength : _e, _f = _d.getFinished, getFinished = _f === void 0 ? getListFinished : _f;
232
+ _d = getObjVal(options, 'listOptions', {}), _e = _d.getFinished, getFinished = _e === void 0 ? getListFinished : _e, getTotal = _d.getTotal;
227
233
  if (getListRefVal('refreshing')) {
228
234
  setListRefVal('data', (listOptions === null || listOptions === void 0 ? void 0 : listOptions.default) || []);
229
235
  setListRefVal('refreshing', false);
230
236
  }
231
- totalNums = getLength(listData) || 0;
237
+ totalNums = getTotal(resData) || 0;
232
238
  setListRefVal('total', totalNums);
233
239
  tempList = listData || [];
234
240
  if (reloadSize) {
@@ -261,6 +267,7 @@ function useRequest(request, options) {
261
267
  getData: getData,
262
268
  onRefresh: onRefresh,
263
269
  onLoad: onLoad,
270
+ search: search,
264
271
  };
265
272
  }
266
273
  export default useRequest;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import type { Ref } from 'vue';
2
2
  interface RequestResult {
3
3
  loading: Ref<boolean>;
4
4
  result: any;
5
+ search: any;
5
6
  getData: (reloadSize?: number) => Promise<void>;
6
7
  onRefresh: (isReload?: boolean) => Promise<void>;
7
8
  onLoad: (isReload?: boolean) => Promise<void>;
@@ -11,7 +12,8 @@ interface Request {
11
12
  }
12
13
  interface ListOptions {
13
14
  getLength?: (data: any) => number;
14
- getFinished?: (data: any) => boolean;
15
+ getTotal?: (data: any) => number;
16
+ getFinished?: (data: any, total: any) => boolean;
15
17
  default?: any;
16
18
  defaultPageKey?: string;
17
19
  defaultSizeKey?: string;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "vue-hooks-pure",
3
3
  "type": "module",
4
- "version": "0.0.2",
4
+ "version": "0.0.22",
5
5
  "packageManager": "pnpm@9.6.0",
6
6
  "description": "Hooks for Vue3",
7
7
  "author": "Icey Wu <3128006406@qq.com>",