vap1 0.8.6 → 0.8.8

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/components/Tables/VTable.js

@@ -155,6 +155,7 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
     var _b = (0, useTableContext_1.useTableContext)(), selectedRowKeys = _b.selectedRowKeys, initObjects = _b.initObjects, reflushPage = _b.reflushPage, setSelection = _b.setSelection;
     var _c = (0, Box_1.useBox)(), state = _c.state, root = _c.root, resize = _c.resize;
     var update = (0, hooks_1.useUpdate)();
+    var isFristMount = (0, hooks_1.useFirstMountState)();
     var _d = __read((0, react_1.useState)(undefined), 2), scroll = _d[0], setScroll = _d[1];
     var _e = __read((0, react_1.useState)({}), 2), columnWidths = _e[0], setColumnWidths = _e[1];
     var _f = props.model, rowKey = _f.rowKey, list = _f.list, isQuerying = _f.isQuerying, pageNo = _f.pageNo, pageSize = _f.pageSize, orderBy = _f.orderBy, query = _f.query, total = _f.total, cost = _f.cost;
@@ -181,7 +182,12 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
             return;
         if (lodash_1.default.isFunction((_b = props.selectBar) === null || _b === void 0 ? void 0 : _b.onSelect)) {
             var param = (_a = props.selectBar).onSelect.apply(_a, __spreadArray([], __read(state.selected), false));
-            query(__assign(__assign({}, (props.defaultParam || props.default)), param));
+            if (isFristMount) {
+                query(__assign(__assign({}, (props.defaultParam || props.default)), param));
+            }
+            else {
+                query(param, false);
+            }
         }
     }, [state.selected]);
     // 更新页数

package/components/Trees/STree.d.ts

@@ -1,5 +1,8 @@
-import type { FC } from 'react';
-import type { BaseTreeProps } from './index';
+import React from 'react';
+import type { ReactNode } from 'react';
+import type { BaseTreeProps, BaseTreeRef } from './index';
+import type { TreeProps } from 'antd/es/tree';
+import type { PlainObject } from '../../basetype';
 import type { TreeNodeData } from '../../utils/TreeUtil';
 export type STreeData = {
     /**
@@ -19,4 +22,12 @@ export type STreeProps = BaseTreeProps & STreeData;
  * 搜索         ： 支持
  * 数据         ： 需要组装好后传入
 */
-export declare const STree: FC<STreeProps>;
+export declare const STree: React.MemoExoticComponent<React.ForwardRefExoticComponent<import("../../utils/TreeUtil").BaseTreeOpts & Pick<TreeProps, "className" | "disabled" | "defaultExpandAll"> & {
+    iconField?: string | ((item: any) => ReactNode);
+    titleField: string | import("./index").LanguageField;
+    titleRender?: (node: PlainObject) => ReactNode;
+    mustSelect?: boolean;
+    disabledNode?: (node: PlainObject) => boolean;
+    onSelect?: (key: import("../../basetype").Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
+    searchValue?: string;
+} & STreeData & React.RefAttributes<BaseTreeRef>>>;

package/components/Trees/STree.js

@@ -87,10 +87,13 @@ var _i18n_1 = require("../_i18n");
  * 搜索         ： 支持
  * 数据         ： 需要组装好后传入
 */
-exports.STree = (0, react_1.memo)(function (props) { return react_1.default.createElement(BaseTree_1.BaseTree, __assign({}, props),
-    react_1.default.createElement(_Stree, __assign({}, props))); }, function (p, n) { return p.searchValue == n.searchValue; });
+exports.STree = (0, react_1.memo)((0, react_1.forwardRef)(function (props, ref) { return react_1.default.createElement(BaseTree_1.BaseTree, __assign({}, props),
+    react_1.default.createElement(_Stree, __assign({}, props, { treeRef: ref }))); }), function (p, n) { return p.searchValue == n.searchValue; });
 var _Stree = function (props) {
     var _a = (0, BaseTree_1.useBaseTree)(), baseProps = _a.baseProps, treeState = _a.treeState, onSelect = _a.onSelect, setTreeData = _a.setTreeData;
+    (0, react_1.useImperativeHandle)(props.treeRef, function () { return ({
+        getSelected: function () { return treeState.selectedNode; },
+    }); }, [treeState.selectedNode]);
     (0, react_1.useLayoutEffect)(function () {
         var tree = [];
         if (props.isFlat) {

package/components/Trees/index.d.ts

@@ -123,14 +123,16 @@ export type BaseActionTreeProps = {
     */
     idForApiField?: string;
 };
+export type BaseTreeRef = {
+    getSelected: () => PlainObject;
+};
 /**
  * 说明 针对节点进行操作
  * 说明，节点信息，位置信息，可通过 onSelect 方法的第五个参数可以拿到
 */
-export type ActionTreeRef = {
+export type ActionTreeRef = BaseTreeRef & {
     updateData: (node: PlainObject, pos: number[]) => void;
     update: (node: PlainObject, pos: number[]) => Promise<void>;
     del: (node: PlainObject, pos: number[]) => Promise<void>;
     add: (node: PlainObject, pos: number[]) => void;
-    getSelected: () => PlainObject;
 };

package/package.json

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