vue-hooks-pure 0.0.1 → 0.0.2

package/README.md

@@ -1,4 +1,4 @@
-# v3-hooks
+# vue-hooks-pure
 
 <p align='center'>
   <img src='/public/logo.png' width="240" />
@@ -11,13 +11,14 @@
 ## 📦 Install
 
 ```bash
-pnpm i v3-hooks
+pnpm i vue-hooks-pure
 
 or
 
-yarn add v3-hooks
+yarn add vue-hooks-pure
 ```
 
 ## 🦄 Usage
+
 ```typescript
 ``

package/dist/cjs/usePopup/index.js

@@ -22,18 +22,16 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * 用户访问相关的弹窗
- */
 var vue_1 = require("vue");
 var domAdd_1 = require("./domAdd");
 function domSet(el) {
     el.setAttribute('style', 'position: absolute; width: 100%; height: 100vh; top: 0; left: 0; z-index: 9999;');
 }
-function usePopup(options, com) {
+function usePopup(com, options) {
+    if (options === void 0) { options = {}; }
     var renderer = options.renderer, data = __rest(options, ["renderer"]);
-    return new Promise(function () {
-        var popupInstance;
+    return new Promise(function (resolve) {
+        var popupInstance = null;
         var addDom = (0, vue_1.h)(com, {
             data: data,
         });
@@ -46,6 +44,7 @@ function usePopup(options, com) {
             footer: renderer === null || renderer === void 0 ? void 0 : renderer.footer,
         }), { domSet: domSet });
         popupInstance.add();
+        resolve(popupInstance);
     });
 }
 exports.default = usePopup;

package/dist/cjs/usePopup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/usePopup/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,2BAAuB;AACvB,mCAAiC;AAEjC,SAAS,MAAM,CAAC,EAAkB;IAChC,EAAE,CAAC,YAAY,CACb,OAAO,EACP,iFAAiF,CAClF,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,OAAY,EAAE,GAAQ;IAC9B,IAAA,QAAQ,GAAc,OAAO,SAArB,EAAK,IAAI,UAAK,OAAO,EAA/B,YAAqB,CAAF,CAAY;IACrC,OAAO,IAAI,OAAO,CAAC;QACjB,IAAI,aAAkB,CAAA;QACtB,IAAM,MAAM,GAAG,IAAA,OAAC,EAAC,GAAU,EAAE;YAC3B,IAAI,MAAA;SACL,CAAC,CAAA;QACF,IAAM,WAAW,GAAG;YAClB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,EAAE,CAAA;QAC1B,CAAC,CAAA;QAED,aAAa,GAAG,IAAA,eAAM,EACpB,IAAA,OAAC,EACC,MAAM,wBAED,IAAI,KACP,OAAO,EAAE,WAAW,KAEtB;YACE,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YACxB,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO;YAC1B,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;SACzB,CACF,EACD,EAAE,MAAM,QAAA,EAAE,CACX,CAAA;QACD,aAAa,CAAC,GAAG,EAAE,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,kBAAe,QAAQ,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/usePopup/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AACA,2BAAuB;AACvB,mCAAiC;AAkBjC,SAAS,MAAM,CAAC,EAAkB;IAChC,EAAE,CAAC,YAAY,CACb,OAAO,EACP,iFAAiF,CAClF,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAc,EAAE,OAA0B;IAA1B,wBAAA,EAAA,YAA0B;IAClD,IAAA,QAAQ,GAAc,OAAO,SAArB,EAAK,IAAI,UAAK,OAAO,EAA/B,YAAqB,CAAF,CAAY;IACrC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,IAAI,aAAa,GAAyB,IAAI,CAAA;QAC9C,IAAM,MAAM,GAAG,IAAA,OAAC,EAAC,GAAG,EAAE;YACpB,IAAI,MAAA;SACL,CAAC,CAAA;QACF,IAAM,WAAW,GAAG;YAClB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,EAAE,CAAA;QAC1B,CAAC,CAAA;QAED,aAAa,GAAG,IAAA,eAAM,EACpB,IAAA,OAAC,EACC,MAAM,wBAED,IAAI,KACP,OAAO,EAAE,WAAW,KAEtB;YACE,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YACxB,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO;YAC1B,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;SACzB,CACF,EACD,EAAE,MAAM,QAAA,EAAE,CACX,CAAA;QACD,aAAa,CAAC,GAAG,EAAE,CAAA;QACnB,OAAO,CAAC,aAAa,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,kBAAe,QAAQ,CAAA"}

package/dist/cjs/useRequest/index.js

@@ -1,10 +1,268 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("@iceywu/utils");
 var vue_1 = require("vue");
-function useRequest() {
-    var a = (0, vue_1.ref)(1);
+var utils_2 = require("./utils");
+function getListLength(data) {
+    return data.length;
+}
+function getListFinished(data, totalNums) {
+    return data.length >= totalNums;
+}
+function getListVal(data) {
+    return data;
+}
+function useRequest(request, options) {
+    if (options === void 0) { options = { target: 'list' }; }
+    /**
+     * 查询条件
+     */
+    var search = (0, vue_1.ref)({});
+    var result = (0, vue_1.ref)({});
+    var loading = (0, vue_1.ref)(false);
+    var paramsObj = (0, vue_1.reactive)({
+        page: 0,
+        size: 10,
+    });
+    var setListRefVal = function (target, val, isGet) {
+        var _a = (0, utils_1.getObjVal)(options, 'listOptions', {}), defaultDataKey = _a.defaultDataKey, defaultLoadingKey = _a.defaultLoadingKey, defaultFinishedKey = _a.defaultFinishedKey, defaultTotalKey = _a.defaultTotalKey, defaultRefreshKey = _a.defaultRefreshKey;
+        switch (target) {
+            case 'data': {
+                var dataKey = defaultDataKey || 'data';
+                if (isGet)
+                    return result.value[dataKey];
+                else
+                    result.value[dataKey] = val;
+                break;
+            }
+            case 'loading': {
+                var loadingKey = defaultLoadingKey || 'loading';
+                if (isGet)
+                    return result.value[loadingKey];
+                else
+                    result.value[loadingKey] = val;
+                break;
+            }
+            case 'finished': {
+                var finishedKey = defaultFinishedKey || 'finished';
+                if (isGet)
+                    return result.value[finishedKey];
+                else
+                    result.value[finishedKey] = val;
+                break;
+            }
+            case 'refreshing': {
+                var refreshingKey = defaultRefreshKey || 'refreshing';
+                if (isGet)
+                    return result.value[refreshingKey];
+                else
+                    result.value[refreshingKey] = val;
+                break;
+            }
+            case 'total': {
+                var totalKey = defaultTotalKey || 'total';
+                if (isGet)
+                    return result.value[totalKey];
+                else
+                    result.value[totalKey] = val;
+                break;
+            }
+        }
+    };
+    var getListRefVal = function (target) {
+        return setListRefVal(target, undefined, true);
+    };
+    var getParamsVal = function (reloadSize) {
+        var params = {};
+        var requestTarget = (0, utils_1.getObjVal)(options, 'target');
+        if (requestTarget === 'list') {
+            var _a = (0, utils_1.getObjVal)(options, 'listOptions', {}), defaultPageKey = _a.defaultPageKey, defaultSizeKey = _a.defaultSizeKey;
+            var page_key = defaultPageKey || utils_2.baseDefaultPageKey.page;
+            var size_key = defaultSizeKey || utils_2.baseDefaultPageKey.size;
+            params[page_key] = paramsObj.page;
+            params[size_key] = paramsObj.size;
+            if (reloadSize) {
+                params[page_key] = 0;
+                params[size_key] = reloadSize;
+            }
+        }
+        var tempParams = __assign(__assign({}, params), search.value);
+        return tempParams;
+    };
+    /**
+     * 数据初始化
+     */
+    function initData() {
+        var requestTarget = (0, utils_1.getObjVal)(options, 'target');
+        if (requestTarget === 'list') {
+            setListRefVal('loading', false);
+            setListRefVal('refreshing', false);
+            setListRefVal('refreshing', true);
+            setListRefVal('finished', false);
+            setListRefVal('data', []);
+            paramsObj.page = 0;
+            paramsObj.size = 10;
+        }
+        else {
+            result.value = {};
+        }
+        loading.value = false;
+    }
+    /**
+     * 加载数据
+     * @param isReload 是否重新加载
+     */
+    function onLoad() {
+        return __awaiter(this, arguments, void 0, function (isReload) {
+            var requestTarget, totalNumTemp;
+            if (isReload === void 0) { isReload = false; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        requestTarget = (0, utils_1.getObjVal)(options, 'target');
+                        if (!(requestTarget === 'list')) return [3 /*break*/, 5];
+                        if (getListRefVal('loading') || getListRefVal('finished') || loading.value)
+                            return [2 /*return*/];
+                        totalNumTemp = getListRefVal('data').length || 0;
+                        if (!(isReload && totalNumTemp > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, getData(totalNumTemp)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2:
+                        paramsObj.page++;
+                        return [4 /*yield*/, getData()];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4: return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, getData()];
+                    case 6: return [2 /*return*/, _a.sent()];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    }
+    function onRefresh() {
+        return __awaiter(this, arguments, void 0, function (isReload) {
+            if (isReload === void 0) { isReload = false; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!isReload) {
+                            // 参数重置
+                            initData();
+                        }
+                        else {
+                            setListRefVal('loading', false);
+                            setListRefVal('finished', false);
+                            loading.value = false;
+                        }
+                        return [4 /*yield*/, onLoad(isReload)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    }
+    function getData(reloadSize) {
+        return __awaiter(this, void 0, void 0, function () {
+            var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getLength, _f, getFinished, totalNums, tempList, newList;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        // 加载状态
+                        setListRefVal('loading', true);
+                        loading.value = true;
+                        target = options.target, listOptions = options.listOptions;
+                        tempParams = getParamsVal(reloadSize);
+                        return [4 /*yield*/, (0, utils_1.to)(request(tempParams))];
+                    case 1:
+                        _a = _g.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
+                        _c = (options || {}).getVal, getVal = _c === void 0 ? getListVal : _c;
+                        listData = getVal(resData);
+                        // 列表情况
+                        if (target === 'list') {
+                            _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;
+                            if (getListRefVal('refreshing')) {
+                                setListRefVal('data', (listOptions === null || listOptions === void 0 ? void 0 : listOptions.default) || []);
+                                setListRefVal('refreshing', false);
+                            }
+                            totalNums = getLength(listData) || 0;
+                            setListRefVal('total', totalNums);
+                            tempList = listData || [];
+                            if (reloadSize) {
+                                setListRefVal('data', tempList);
+                            }
+                            else {
+                                newList = getListRefVal('data').concat(tempList || []);
+                                setListRefVal('data', newList);
+                            }
+                            setListRefVal('finished', getFinished(listData, totalNums));
+                        }
+                        // 其他情况
+                        else {
+                            result.value = listData;
+                        }
+                        if (err) {
+                            setListRefVal('finished', true);
+                        }
+                        // 加载状态停止
+                        setListRefVal('loading', false);
+                        loading.value = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
     return {
-        a: a,
+        loading: loading,
+        result: result,
+        getData: getData,
+        onRefresh: onRefresh,
+        onLoad: onLoad,
     };
 }
 exports.default = useRequest;

package/dist/cjs/useRequest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":";;AAAA,2BAAyB;AAEzB,SAAS,UAAU;IACjB,IAAM,CAAC,GAAG,IAAA,SAAG,EAAC,CAAC,CAAC,CAAA;IAChB,OAAO;QACL,CAAC,GAAA;KACF,CAAA;AACH,CAAC;AAED,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"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"}

package/dist/cjs/useRequest/utils.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseDefaultPageKey = void 0;
+exports.baseDefaultPageKey = {
+    page: 'page',
+    size: 'size',
+};
+//# sourceMappingURL=utils.js.map

package/dist/cjs/useRequest/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/useRequest/utils.ts"],"names":[],"mappings":";;;AAYa,QAAA,kBAAkB,GAAG;IAChC,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;CACb,CAAA"}

package/dist/esm/usePopup/index.js

@@ -20,18 +20,16 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-/**
- * 用户访问相关的弹窗
- */
 import { h } from 'vue';
 import { domAdd } from './domAdd';
 function domSet(el) {
     el.setAttribute('style', 'position: absolute; width: 100%; height: 100vh; top: 0; left: 0; z-index: 9999;');
 }
-function usePopup(options, com) {
+function usePopup(com, options) {
+    if (options === void 0) { options = {}; }
     var renderer = options.renderer, data = __rest(options, ["renderer"]);
-    return new Promise(function () {
-        var popupInstance;
+    return new Promise(function (resolve) {
+        var popupInstance = null;
         var addDom = h(com, {
             data: data,
         });
@@ -44,6 +42,7 @@ function usePopup(options, com) {
             footer: renderer === null || renderer === void 0 ? void 0 : renderer.footer,
         }), { domSet: domSet });
         popupInstance.add();
+        resolve(popupInstance);
     });
 }
 export default usePopup;

package/dist/esm/usePopup/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/usePopup/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,SAAS,MAAM,CAAC,EAAkB;IAChC,EAAE,CAAC,YAAY,CACb,OAAO,EACP,iFAAiF,CAClF,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,OAAY,EAAE,GAAQ;IAC9B,IAAA,QAAQ,GAAc,OAAO,SAArB,EAAK,IAAI,UAAK,OAAO,EAA/B,YAAqB,CAAF,CAAY;IACrC,OAAO,IAAI,OAAO,CAAC;QACjB,IAAI,aAAkB,CAAA;QACtB,IAAM,MAAM,GAAG,CAAC,CAAC,GAAU,EAAE;YAC3B,IAAI,MAAA;SACL,CAAC,CAAA;QACF,IAAM,WAAW,GAAG;YAClB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,EAAE,CAAA;QAC1B,CAAC,CAAA;QAED,aAAa,GAAG,MAAM,CACpB,CAAC,CACC,MAAM,wBAED,IAAI,KACP,OAAO,EAAE,WAAW,KAEtB;YACE,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YACxB,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO;YAC1B,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;SACzB,CACF,EACD,EAAE,MAAM,QAAA,EAAE,CACX,CAAA;QACD,aAAa,CAAC,GAAG,EAAE,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,eAAe,QAAQ,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/usePopup/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAkBjC,SAAS,MAAM,CAAC,EAAkB;IAChC,EAAE,CAAC,YAAY,CACb,OAAO,EACP,iFAAiF,CAClF,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAc,EAAE,OAA0B;IAA1B,wBAAA,EAAA,YAA0B;IAClD,IAAA,QAAQ,GAAc,OAAO,SAArB,EAAK,IAAI,UAAK,OAAO,EAA/B,YAAqB,CAAF,CAAY;IACrC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO;QACzB,IAAI,aAAa,GAAyB,IAAI,CAAA;QAC9C,IAAM,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE;YACpB,IAAI,MAAA;SACL,CAAC,CAAA;QACF,IAAM,WAAW,GAAG;YAClB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,EAAE,CAAA;QAC1B,CAAC,CAAA;QAED,aAAa,GAAG,MAAM,CACpB,CAAC,CACC,MAAM,wBAED,IAAI,KACP,OAAO,EAAE,WAAW,KAEtB;YACE,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;YACxB,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO;YAC1B,MAAM,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM;SACzB,CACF,EACD,EAAE,MAAM,QAAA,EAAE,CACX,CAAA;QACD,aAAa,CAAC,GAAG,EAAE,CAAA;QACnB,OAAO,CAAC,aAAa,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,eAAe,QAAQ,CAAA"}

package/dist/esm/useRequest/index.js

@@ -1,8 +1,266 @@
-import { ref } from 'vue';
-function useRequest() {
-    var a = ref(1);
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { getObjVal, to } from '@iceywu/utils';
+import { reactive, ref } from 'vue';
+import { baseDefaultPageKey } from './utils';
+function getListLength(data) {
+    return data.length;
+}
+function getListFinished(data, totalNums) {
+    return data.length >= totalNums;
+}
+function getListVal(data) {
+    return data;
+}
+function useRequest(request, options) {
+    if (options === void 0) { options = { target: 'list' }; }
+    /**
+     * 查询条件
+     */
+    var search = ref({});
+    var result = ref({});
+    var loading = ref(false);
+    var paramsObj = reactive({
+        page: 0,
+        size: 10,
+    });
+    var setListRefVal = function (target, val, isGet) {
+        var _a = getObjVal(options, 'listOptions', {}), defaultDataKey = _a.defaultDataKey, defaultLoadingKey = _a.defaultLoadingKey, defaultFinishedKey = _a.defaultFinishedKey, defaultTotalKey = _a.defaultTotalKey, defaultRefreshKey = _a.defaultRefreshKey;
+        switch (target) {
+            case 'data': {
+                var dataKey = defaultDataKey || 'data';
+                if (isGet)
+                    return result.value[dataKey];
+                else
+                    result.value[dataKey] = val;
+                break;
+            }
+            case 'loading': {
+                var loadingKey = defaultLoadingKey || 'loading';
+                if (isGet)
+                    return result.value[loadingKey];
+                else
+                    result.value[loadingKey] = val;
+                break;
+            }
+            case 'finished': {
+                var finishedKey = defaultFinishedKey || 'finished';
+                if (isGet)
+                    return result.value[finishedKey];
+                else
+                    result.value[finishedKey] = val;
+                break;
+            }
+            case 'refreshing': {
+                var refreshingKey = defaultRefreshKey || 'refreshing';
+                if (isGet)
+                    return result.value[refreshingKey];
+                else
+                    result.value[refreshingKey] = val;
+                break;
+            }
+            case 'total': {
+                var totalKey = defaultTotalKey || 'total';
+                if (isGet)
+                    return result.value[totalKey];
+                else
+                    result.value[totalKey] = val;
+                break;
+            }
+        }
+    };
+    var getListRefVal = function (target) {
+        return setListRefVal(target, undefined, true);
+    };
+    var getParamsVal = function (reloadSize) {
+        var params = {};
+        var requestTarget = getObjVal(options, 'target');
+        if (requestTarget === 'list') {
+            var _a = getObjVal(options, 'listOptions', {}), defaultPageKey = _a.defaultPageKey, defaultSizeKey = _a.defaultSizeKey;
+            var page_key = defaultPageKey || baseDefaultPageKey.page;
+            var size_key = defaultSizeKey || baseDefaultPageKey.size;
+            params[page_key] = paramsObj.page;
+            params[size_key] = paramsObj.size;
+            if (reloadSize) {
+                params[page_key] = 0;
+                params[size_key] = reloadSize;
+            }
+        }
+        var tempParams = __assign(__assign({}, params), search.value);
+        return tempParams;
+    };
+    /**
+     * 数据初始化
+     */
+    function initData() {
+        var requestTarget = getObjVal(options, 'target');
+        if (requestTarget === 'list') {
+            setListRefVal('loading', false);
+            setListRefVal('refreshing', false);
+            setListRefVal('refreshing', true);
+            setListRefVal('finished', false);
+            setListRefVal('data', []);
+            paramsObj.page = 0;
+            paramsObj.size = 10;
+        }
+        else {
+            result.value = {};
+        }
+        loading.value = false;
+    }
+    /**
+     * 加载数据
+     * @param isReload 是否重新加载
+     */
+    function onLoad() {
+        return __awaiter(this, arguments, void 0, function (isReload) {
+            var requestTarget, totalNumTemp;
+            if (isReload === void 0) { isReload = false; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        requestTarget = getObjVal(options, 'target');
+                        if (!(requestTarget === 'list')) return [3 /*break*/, 5];
+                        if (getListRefVal('loading') || getListRefVal('finished') || loading.value)
+                            return [2 /*return*/];
+                        totalNumTemp = getListRefVal('data').length || 0;
+                        if (!(isReload && totalNumTemp > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, getData(totalNumTemp)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2:
+                        paramsObj.page++;
+                        return [4 /*yield*/, getData()];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4: return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, getData()];
+                    case 6: return [2 /*return*/, _a.sent()];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    }
+    function onRefresh() {
+        return __awaiter(this, arguments, void 0, function (isReload) {
+            if (isReload === void 0) { isReload = false; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!isReload) {
+                            // 参数重置
+                            initData();
+                        }
+                        else {
+                            setListRefVal('loading', false);
+                            setListRefVal('finished', false);
+                            loading.value = false;
+                        }
+                        return [4 /*yield*/, onLoad(isReload)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    }
+    function getData(reloadSize) {
+        return __awaiter(this, void 0, void 0, function () {
+            var target, listOptions, tempParams, _a, err, _b, resData, _c, getVal, listData, _d, _e, getLength, _f, getFinished, totalNums, tempList, newList;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        // 加载状态
+                        setListRefVal('loading', true);
+                        loading.value = true;
+                        target = options.target, listOptions = options.listOptions;
+                        tempParams = getParamsVal(reloadSize);
+                        return [4 /*yield*/, to(request(tempParams))];
+                    case 1:
+                        _a = _g.sent(), err = _a[0], _b = _a[1], resData = _b === void 0 ? [] : _b;
+                        _c = (options || {}).getVal, getVal = _c === void 0 ? getListVal : _c;
+                        listData = getVal(resData);
+                        // 列表情况
+                        if (target === 'list') {
+                            _d = getObjVal(options, 'listOptions', {}), _e = _d.getLength, getLength = _e === void 0 ? getListLength : _e, _f = _d.getFinished, getFinished = _f === void 0 ? getListFinished : _f;
+                            if (getListRefVal('refreshing')) {
+                                setListRefVal('data', (listOptions === null || listOptions === void 0 ? void 0 : listOptions.default) || []);
+                                setListRefVal('refreshing', false);
+                            }
+                            totalNums = getLength(listData) || 0;
+                            setListRefVal('total', totalNums);
+                            tempList = listData || [];
+                            if (reloadSize) {
+                                setListRefVal('data', tempList);
+                            }
+                            else {
+                                newList = getListRefVal('data').concat(tempList || []);
+                                setListRefVal('data', newList);
+                            }
+                            setListRefVal('finished', getFinished(listData, totalNums));
+                        }
+                        // 其他情况
+                        else {
+                            result.value = listData;
+                        }
+                        if (err) {
+                            setListRefVal('finished', true);
+                        }
+                        // 加载状态停止
+                        setListRefVal('loading', false);
+                        loading.value = false;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
     return {
-        a: a,
+        loading: loading,
+        result: result,
+        getData: getData,
+        onRefresh: onRefresh,
+        onLoad: onLoad,
     };
 }
 export default useRequest;

package/dist/esm/useRequest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAEzB,SAAS,UAAU;IACjB,IAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;IAChB,OAAO;QACL,CAAC,GAAA;KACF,CAAA;AACH,CAAC;AAED,eAAe,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/useRequest/index.ts"],"names":[],"mappings":"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"}

package/dist/esm/useRequest/utils.js

@@ -0,0 +1,5 @@
+export var baseDefaultPageKey = {
+    page: 'page',
+    size: 'size',
+};
+//# sourceMappingURL=utils.js.map

package/dist/esm/useRequest/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/useRequest/utils.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,IAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;CACb,CAAA"}

package/dist/types/usePopup/index.d.ts

@@ -1,2 +1,12 @@
-declare function usePopup(options: any, com: any): Promise<unknown>;
+import type { Component } from 'vue';
+interface Renderer {
+    header?: () => any;
+    default?: () => any;
+    footer?: () => any;
+}
+interface PopupOptions {
+    renderer?: Renderer;
+    [key: string]: any;
+}
+declare function usePopup(com: Component, options?: PopupOptions): Promise<unknown>;
 export default usePopup;

package/dist/types/useRequest/index.d.ts

@@ -1,4 +1,30 @@
-declare function useRequest(): {
-    a: import("vue").Ref<number, number>;
-};
+import type { Ref } from 'vue';
+interface RequestResult {
+    loading: Ref<boolean>;
+    result: any;
+    getData: (reloadSize?: number) => Promise<void>;
+    onRefresh: (isReload?: boolean) => Promise<void>;
+    onLoad: (isReload?: boolean) => Promise<void>;
+}
+interface Request {
+    (other?: any): Promise<any>;
+}
+interface ListOptions {
+    getLength?: (data: any) => number;
+    getFinished?: (data: any) => boolean;
+    default?: any;
+    defaultPageKey?: string;
+    defaultSizeKey?: string;
+    defaultDataKey?: string;
+    defaultLoadingKey?: string;
+    defaultFinishedKey?: string;
+    defaultTotalKey?: string;
+    defaultRefreshKey?: string;
+}
+interface Options {
+    target?: string;
+    listOptions?: ListOptions;
+    getVal?: (data: any) => any;
+}
+declare function useRequest(request: Request, options?: Options): RequestResult;
 export default useRequest;

package/dist/types/useRequest/utils.d.ts

@@ -0,0 +1,15 @@
+export interface ListObj {
+    data: any[];
+    loading: boolean;
+    finished: boolean;
+    refreshing: boolean;
+    total?: number;
+}
+export interface ParamsObj {
+    page: number;
+    size: number;
+}
+export declare const baseDefaultPageKey: {
+    page: string;
+    size: string;
+};

package/package.json

@@ -1,75 +1,75 @@
-{
-  "name": "vue-hooks-pure",
-  "type": "module",
-  "version": "0.0.1",
-  "packageManager": "pnpm@9.6.0",
-  "description": "Hooks for Vue3",
-  "author": "Icey Wu <3128006406@qq.com>",
-  "license": "MIT",
-  "funding": "https://github.com/sponsors/iceywu",
-  "homepage": "https://github.com/iceywu/v3-hooks#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/iceywu/v3-hooks"
-  },
-  "keywords": [
-    "vue3",
-    "hooks"
-  ],
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
-  "typings": "dist/types/index.d.ts",
-  "files": [
-    "README.md",
-    "dist"
-  ],
-  "engines": {
-    "node": ">=16.x"
-  },
-  "scripts": {
-    "build": "rimraf dist && npm run build:esm && npm run build:cjs && npm run build:types",
-    "build:esm": "tsc --module es2015 --target es5 --outDir dist/esm",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "build:cjs": "tsc --module commonjs --target es5 --outDir dist/cjs",
-    "build:types": "tsc --emitDeclarationOnly --declaration --project tsconfig.json --declarationDir dist/types",
-    "test": "jest",
-    "changelog": "npx changelogen@latest --bump",
-    "release": "bumpp --commit --push --tag && npm publish --registry https://registry.npmjs.org",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@iceywu/utils": "^0.0.47",
-    "vue": "^3.5.12",
-    "vue-template-compiler": "^2.7.16"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^3.8.0",
-    "@antfu/ni": "^0.23.0",
-    "@jest/environment": "^29.7.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/vue": "^8.1.0",
-    "@types/express": "^5.0.0",
-    "@types/jest": "^29.5.14",
-    "@vue/compiler-sfc": "^3.5.12",
-    "@vue/test-utils": "^2.4.6",
-    "bumpp": "^9.8.0",
-    "changelogen": "^0.5.7",
-    "eslint": "^9.13.0",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "prettier": "^3.3.3",
-    "rimraf": "^6.0.1",
-    "simple-git-hooks": "^2.11.1",
-    "talljack-eslint-config": "^0.2.6",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3",
-    "vue-tsc": "^2.1.10"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "npx lint-staged"
-  },
-  "lint-staged": {
-    "*": "eslint . --fix"
-  }
-}
+{
+  "name": "vue-hooks-pure",
+  "type": "module",
+  "version": "0.0.2",
+  "packageManager": "pnpm@9.6.0",
+  "description": "Hooks for Vue3",
+  "author": "Icey Wu <3128006406@qq.com>",
+  "license": "MIT",
+  "funding": "https://github.com/sponsors/iceywu",
+  "homepage": "https://github.com/iceywu/vue-hooks-pure#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iceywu/vue-hooks-pure"
+  },
+  "keywords": [
+    "vue3",
+    "hooks"
+  ],
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "typings": "dist/types/index.d.ts",
+  "files": [
+    "README.md",
+    "dist"
+  ],
+  "engines": {
+    "node": ">=16.x"
+  },
+  "scripts": {
+    "build": "rimraf dist && npm run build:esm && npm run build:cjs && npm run build:types",
+    "build:esm": "tsc --module es2015 --target es5 --outDir dist/esm",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "build:cjs": "tsc --module commonjs --target es5 --outDir dist/cjs",
+    "build:types": "tsc --emitDeclarationOnly --declaration --project tsconfig.json --declarationDir dist/types",
+    "test": "jest",
+    "changelog": "npx changelogen@latest --bump",
+    "release": "bumpp --commit --push --tag && npm publish --registry https://registry.npmjs.org",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@iceywu/utils": "^0.0.47",
+    "vue": "^3.5.12",
+    "vue-template-compiler": "^2.7.16"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^3.8.0",
+    "@antfu/ni": "^0.23.0",
+    "@jest/environment": "^29.7.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/vue": "^8.1.0",
+    "@types/express": "^5.0.0",
+    "@types/jest": "^29.5.14",
+    "@vue/compiler-sfc": "^3.5.12",
+    "@vue/test-utils": "^2.4.6",
+    "bumpp": "^9.8.0",
+    "changelogen": "^0.5.7",
+    "eslint": "^9.13.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "prettier": "^3.3.3",
+    "rimraf": "^6.0.1",
+    "simple-git-hooks": "^2.11.1",
+    "talljack-eslint-config": "^0.2.6",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3",
+    "vue-tsc": "^2.1.10"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "npx lint-staged"
+  },
+  "lint-staged": {
+    "*": "eslint . --fix"
+  }
+}