vap1 0.8.7 → 0.8.8

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.7","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"}