vap1 0.8.5 → 0.8.7

package/cems/admin/utils.d.ts

@@ -32,6 +32,52 @@ export type GetApiDataXMLHttpRequest = (_url: any, _type: "POST" | 'GET', _param
  * @returns 当为同步请求时，返回查询到的所有数据
  */
 export type GetApiData = (_url: any, _type: "POST" | 'GET', _param?: any, _requestType?: "RequestParam" | "RequestBody", _isAsync?: any, _callBackFun?: any, _headerList?: any, _isEncodeURIComponent?: any) => any;
+/**
+ *通过 fetch API发送请求获取数据
+ * @param _url 接口地址
+ * @param _type 请求类型 "POST"|'GET'
+ * @param _param 需要传入的参数例如：{name:"tester"}
+ * @param _requestType 后台接口接收的参数类型 "RequestParam"|"RequestBody"，不传默认为“RequestBody”
+ * @param _callBackFun 请求成功后的回调函数
+ * @param _errorCallBackFun 请求失败后的回调函数
+ * @param _completeCallBackFun 请求完成后的回调函数（无论成功失败都会执行）
+ * @param _headerList 需要放到请求头header中的数据
+ * @param _isEncodeURIComponent 是否对参数进行 encodeURIComponent编码
+ * @returns Promise<any> 返回解析后的数据
+ * @example
+    示例一：
+        const result = await getApiDataFetch(
+            "/api/user/list",
+            "POST",
+            { name: "test" },
+            "RequestBody",
+            (data) => { console.log("Success:", data); }, // _callBackFun
+            (xhr, status, err) => { console.error("Error:", err); }, // _errorCallBackFun
+            () => { console.log("Complete"); }, // _completeCallBackFun
+            {}, // _headerList
+            false // _isEncodeURIComponent
+        );
+        console.log("Returned Data:", result);
+
+    示例二：
+    getApiDataFetch(
+        "/api/user/list",
+        "GET",
+        { id: 1 },
+        "RequestParam",
+        (data) => { console.log("Success:", data); },
+        (xhr, status, err) => { console.error("Error:", err); },
+        () => { console.log("Complete"); }
+    )
+    .then(data => {
+        // 这里也可以处理返回的数据，虽然 callback 已经执行了
+    })
+    .catch(err => {
+        // 错误处理
+    });
+
+ */
+export type GetApiDataFetch = (_url: string, _type: "POST" | "GET", _param?: any, _requestType?: "RequestParam" | "RequestBody", _callBackFun?: Function, _errorCallBackFun?: Function, _completeCallBackFun?: Function, _headerList?: any, _isEncodeURIComponent?: boolean) => Promise<any>;
 /**
  * 获取指定长度的16进制随机数据，
  * @param len 指定长度，不传默认返回32位

package/cems/index.d.ts

@@ -13,7 +13,7 @@ interface BuiltInAdminComponents {
     AsyncSelect: AsyncSelectComponent;
     CustomPagination: CustomPaginationComponent;
 }
-import type { GetTreeIconNumByOrgFlag, GetOrgFlagByTreeIconNum, MD5, AES, RSA, InitSchema, ConvertOptions, RegExpTest, CallWhereWhileFunc, GetApiData, GetApiDataXMLHttpRequest, GetUUIDFor16 } from './admin/utils';
+import type { GetTreeIconNumByOrgFlag, GetOrgFlagByTreeIconNum, MD5, AES, RSA, InitSchema, ConvertOptions, RegExpTest, CallWhereWhileFunc, GetApiData, GetApiDataXMLHttpRequest, GetApiDataFetch, GetUUIDFor16 } from './admin/utils';
 import type { Validator } from './admin/validator';
 interface BuiltInAdminUtils {
     getTreeIconNumByOrgFlag: GetTreeIconNumByOrgFlag;
@@ -28,6 +28,7 @@ interface BuiltInAdminUtils {
     regExpTest: RegExpTest;
     callWhereWhileFunc: CallWhereWhileFunc;
     getApiData: GetApiData;
+    getApiDataFetch: GetApiDataFetch;
     getApiDataXMLHttpRequest: GetApiDataXMLHttpRequest;
     getUUIDFor16: GetUUIDFor16;
     isOpenInCemsProject: boolean;
@@ -194,6 +195,7 @@ export declare const convertOptions: ConvertOptions;
 export declare const regExpTest: RegExpTest;
 export declare const callWhereWhileFunc: CallWhereWhileFunc;
 export declare const getApiData: GetApiData;
+export declare const getApiDataFetch: GetApiDataFetch;
 export declare const getUUIDFor16: GetUUIDFor16;
 export declare const getApiDataXMLHttpRequest: GetApiDataXMLHttpRequest;
 export declare const isOpenInCemsProject: boolean;

package/cems/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DInput = exports.DDynamicTreeSelect = exports.DDynamicSelect = exports.DDatePicker = exports.DColorPicker = exports.DCheckboxGroup = exports.DCheckbox = exports.DButton = exports.DApiTable = exports.DForm = exports.CForm = exports.formatCols = exports.formatColumns = exports.useDApiGlobal = exports.useDApi = exports.useDModals = exports.getReload = exports.AjaxPostData = exports.Patch = exports.DivWidth = exports.Sensitive = exports.DModalInfo = exports.DInfo = exports.DModalTable = exports.DTable = exports.CUpload = exports.ChartPie = exports.ChartBar = exports.ChartBase = exports.isOpenInCemsProject = exports.getApiDataXMLHttpRequest = exports.getUUIDFor16 = exports.getApiData = exports.callWhereWhileFunc = exports.regExpTest = exports.convertOptions = exports.initSchema = exports.rsa = exports.aesDecrypted = exports.aes = exports.md5 = exports.validator = exports.getOrgFlagByTreeIconNum = exports.getTreeIconNumByOrgFlag = exports.CustomPagination = exports.AsyncSelect = exports.EasyuiTree = exports.CardTable = exports.UTILS = exports.COMPONENTS = void 0;
-exports.registerCustomComponent = exports.registerComponent = exports.CustomLibrary = exports.ComponentLibrary = exports.useDForm = exports.convertArrayToObject = exports.convertObjectToArray = exports.compareVersion = exports.uuid = exports.checkIpPort = exports.checkIpRange = exports.checkIPRangeIntersect = exports.DDrawer = exports.DIcon = exports.DDiv = exports.DCol = exports.DUpload = exports.DTree = exports.DTimePicker = exports.DPTable = exports.DTab = exports.DSwitch = exports.DSlider = exports.DSelect = exports.DSCTable = exports.DRadio = exports.DLabel = void 0;
+exports.DDynamicTreeSelect = exports.DDynamicSelect = exports.DDatePicker = exports.DColorPicker = exports.DCheckboxGroup = exports.DCheckbox = exports.DButton = exports.DApiTable = exports.DForm = exports.CForm = exports.formatCols = exports.formatColumns = exports.useDApiGlobal = exports.useDApi = exports.useDModals = exports.getReload = exports.AjaxPostData = exports.Patch = exports.DivWidth = exports.Sensitive = exports.DModalInfo = exports.DInfo = exports.DModalTable = exports.DTable = exports.CUpload = exports.ChartPie = exports.ChartBar = exports.ChartBase = exports.isOpenInCemsProject = exports.getApiDataXMLHttpRequest = exports.getUUIDFor16 = exports.getApiDataFetch = exports.getApiData = exports.callWhereWhileFunc = exports.regExpTest = exports.convertOptions = exports.initSchema = exports.rsa = exports.aesDecrypted = exports.aes = exports.md5 = exports.validator = exports.getOrgFlagByTreeIconNum = exports.getTreeIconNumByOrgFlag = exports.CustomPagination = exports.AsyncSelect = exports.EasyuiTree = exports.CardTable = exports.UTILS = exports.COMPONENTS = void 0;
+exports.registerCustomComponent = exports.registerComponent = exports.CustomLibrary = exports.ComponentLibrary = exports.useDForm = exports.convertArrayToObject = exports.convertObjectToArray = exports.compareVersion = exports.uuid = exports.checkIpPort = exports.checkIpRange = exports.checkIPRangeIntersect = exports.DDrawer = exports.DIcon = exports.DDiv = exports.DCol = exports.DUpload = exports.DTree = exports.DTimePicker = exports.DPTable = exports.DTab = exports.DSwitch = exports.DSlider = exports.DSelect = exports.DSCTable = exports.DRadio = exports.DLabel = exports.DInput = void 0;
 /**
  * 说明,如需要使用 `vap2/deps/cems`  请确保是 CEMS 应用/模块
 */
@@ -28,6 +28,7 @@ exports.convertOptions = exports.UTILS['convertOptions'];
 exports.regExpTest = exports.UTILS['regExpTest'];
 exports.callWhereWhileFunc = exports.UTILS['callWhereWhileFunc'];
 exports.getApiData = exports.UTILS['getApiData'];
+exports.getApiDataFetch = exports.UTILS['getApiDataFetch'];
 exports.getUUIDFor16 = exports.UTILS['getUUIDFor16'];
 exports.getApiDataXMLHttpRequest = exports.UTILS['getApiDataXMLHttpRequest'];
 exports.isOpenInCemsProject = exports.UTILS['isOpenInCemsProject'];

package/hooks/useApiGlobal.d.ts

@@ -8,4 +8,6 @@ export type ApiGlobalOption = ApiOption & {
     */
     namespace?: string;
 };
-export declare const useApiGlobal: (options: string | ApiGlobalOption) => ApiListState;
+type UseAppGlobal = (option: string | ApiGlobalOption) => ApiListState;
+export declare const useApiGlobal: UseAppGlobal;
+export {};

package/hooks/useApiGlobal.js

@@ -33,15 +33,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useApiGlobal = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var react_1 = require("react");
-var PageUtil_1 = require("../utils/PageUtil");
+// import { clearURL } from '../utils/PageUtil'
 var _list_1 = require("./_list");
 var useGlobal_1 = require("./useGlobal");
 var useApiBase_1 = require("./useApiBase");
+var useApi_1 = require("./useApi");
 var toKey = function () {
     var pathname = location.pathname, hash = location.hash;
-    if (lodash_1.default.has(window, '__MICRO_APP_BASE_ROUTE__')) {
-        return (0, PageUtil_1.clearURL)(pathname);
-    }
     var root = lodash_1.default.trim(pathname).toLowerCase();
     if (root.endsWith('/'))
         root = root.substring(0, root.length - 1);
@@ -50,7 +48,7 @@ var toKey = function () {
     root = root.replace('/', '-');
     return root + hash;
 };
-var useApiGlobal = function (options) {
+exports.useApiGlobal = (lodash_1.default.has(window, '__MICRO_APP_BASE_ROUTE__') && window['__MICRO_APP_BASE_ROUTE__']) ? useApi_1.useApi : function (options) {
     var config = lodash_1.default.isString(options) ? { api: options } : options;
     var BASE = __assign(__assign({}, _list_1.DEFAULT_STATE), { effect: null });
     BASE.rowKey = config.rowKey || 'id';
@@ -67,4 +65,3 @@ var useApiGlobal = function (options) {
     var _a = __read((0, useGlobal_1.useGlobal)(namespace, BASE), 2), state = _a[0], doLoad = _a[1];
     return (0, useApiBase_1.useApiBase)(config, state, doLoad, 'api-global');
 };
-exports.useApiGlobal = useApiGlobal;

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.8.5","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
+{"name":"vap1","version":"0.8.7","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}