vap1 0.1.1 → 0.1.3

package/components/Box/Box.js

@@ -64,7 +64,7 @@ const BoxContext = (0, react_1.createContext)(null);
  * */
 const useBox = () => (0, react_1.useContext)(BoxContext);
 exports.useBox = useBox;
-exports.Box = react_1.default.forwardRef((props, ref) => {
+exports.Box = (0, react_1.forwardRef)((props, ref) => {
     const app = (0, hooks_1.useApp)();
     const [state, setState] = (0, hooks_1.useSetState)(null);
     const _layoutRef = (0, react_1.useRef)(null); // 向下兼容
@@ -125,11 +125,9 @@ exports.Box = react_1.default.forwardRef((props, ref) => {
         document.body.classList.remove('v-resizing');
     };
     (0, react_1.useEffect)(() => { setTimeout(resize, 2); }, [app === null || app === void 0 ? void 0 : app.theme.contentHeight]);
+    (0, react_1.useImperativeHandle)(ref, () => ({ resize }), []);
     (0, react_1.useLayoutEffect)(() => {
-        if (ref) {
-            ref.current = { resize };
-        }
-        setTimeout(resize, 1);
+        setTimeout(resize, 5);
     }, []);
     let paginationProps = {};
     // if (props.pagination && props.mode == 'inner') {

package/components/Box/SelectBar.js

@@ -35,7 +35,7 @@ const utils_1 = require("../../utils");
 const _register_1 = require("./_register");
 const Const_1 = require("../_setup/Const");
 const Icon_1 = require("../_adapt/Icon");
-exports.SelectBar = react_1.default.forwardRef((props, ref) => {
+exports.SelectBar = (0, react_1.forwardRef)((props, ref) => {
     const [keyword, setKeyword] = (0, react_1.useState)(null);
     const [collapsed, setCollapsed] = (0, hooks_1.useToggle)(false);
     // const setKeyword = _.debounce(_setKeyword, 100);

package/components/SearchBar/index.js

@@ -15,6 +15,10 @@ const _SearchBar = props => {
     if (utils_1.GLOBAL.CONFIG.SEARCHBAR.REVERSE)
         clazz.push('c-searchbar-reverse');
     if (!lodash_1.default.isArray(props.fields) || props.fields.length == 0) {
+        if (lodash_1.default.has(props, 'keyword'))
+            return react_1.default.createElement("div", { className: utils_1.StringUtil.className(clazz, props.className) },
+                react_1.default.createElement(ByKeyword_1.SearchBarByKeyword, Object.assign({}, props)),
+                react_1.default.createElement("div", { className: 'c-searchbar-actions' }, props.children));
         if (!lodash_1.default.has(props, 'children'))
             return react_1.default.createElement(react_1.default.Fragment, null);
         return react_1.default.createElement("div", { className: utils_1.StringUtil.className(clazz, props.className) },

package/components/Tables/ApiTable.js

@@ -27,7 +27,7 @@ exports.ApiTable = void 0;
 const react_1 = __importStar(require("react"));
 const useApi_1 = require("../../hooks/useApi");
 const VTable_1 = require("./VTable");
-exports.ApiTable = react_1.default.forwardRef((props, ref) => {
+exports.ApiTable = (0, react_1.forwardRef)((props, ref) => {
     const option = {
         api: props.api,
         rowKey: props.rowKey,
@@ -39,10 +39,6 @@ exports.ApiTable = react_1.default.forwardRef((props, ref) => {
     if (props.pagination && props.pagination.pageSize)
         option.pageSize = props.pagination.pageSize;
     const model = (0, useApi_1.useApi)(option);
-    (0, react_1.useEffect)(() => {
-        if (ref) {
-            ref.current = model;
-        }
-    }, [ref]);
+    (0, react_1.useImperativeHandle)(ref, () => model, []);
     return react_1.default.createElement(VTable_1.VTable, Object.assign({}, props, { model: model }));
 });

package/components/Tables/ApiTableModal.js

@@ -36,7 +36,7 @@ const API_TABLE_PROPERTIES = [
     'api', 'aop', 'tipDisabled', 'tipField',
     'mode', 'columns', 'showIndex', 'rowKey', 'select', 'selectDisabled', 'actionBar', 'selectBar', 'searchBar', 'default', 'autoLoad'
 ];
-exports.ApiTableModal = react_1.default.forwardRef((props, ref) => {
+exports.ApiTableModal = (0, react_1.forwardRef)((props, ref) => {
     const modalProps = lodash_1.default.omit(props, API_TABLE_PROPERTIES);
     const tableProps = lodash_1.default.pick(props, API_TABLE_PROPERTIES);
     const [tableKey, updateKey] = (0, react_1.useState)(utils_1.StringUtil.genKey());

package/components/Tables/VTable.d.ts

@@ -1,6 +1,11 @@
 import React from 'react';
-import type { BaseTableProps } from './index';
+import type { BaseTableProps, TableColumn } from './index';
 import type { ListModel } from '../../hooks/_list';
+import type { PlainObject, Key } from '../../basetype';
+export type VTableRef = {
+    getSelected: () => [Key[], PlainObject[]];
+    getParams: () => PlainObject;
+};
 export declare const getHeightByTagName: (root: HTMLElement, tagName: string) => number;
 /**
  * VTable 支持多种模型，内置模型有 API/DATA/STATIC,也支持模型规范的自定义模型
@@ -8,4 +13,18 @@ export declare const getHeightByTagName: (root: HTMLElement, tagName: string) =>
 export type VTableProps = BaseTableProps & {
     model: ListModel;
 };
-export declare const VTable: React.FC<VTableProps>;
+export declare const VTable: React.ForwardRefExoticComponent<import("./index").TableDefine & {
+    mode?: import("../Box/Box").BoxMode;
+    columns: TableColumn[];
+    showIndex?: string | false;
+    rowKey?: string;
+    select?: true | "DEFAULT" | "QUERY";
+    selectDisabled?: (record: any) => boolean;
+    actionBar?: React.ReactNode | import("./Components/ActionBar").TableActionButton[];
+    selectBar?: import("../Box/SelectBar").SelectBarProps;
+    searchBar?: Omit<import("../SearchBar").SearchBarProps, "onChange" | "onSearch">;
+    default?: PlainObject;
+    autoLoad?: false;
+} & {
+    model: ListModel;
+} & React.RefAttributes<VTableRef>>;

package/components/Tables/VTable.js

@@ -37,6 +37,7 @@ const Util_1 = require("./Util");
 const HighLight_1 = require("../_common/HighLight");
 const hooks_1 = require("../../hooks");
 const Box_1 = require("../Box/Box");
+;
 const getHeightByTagName = (root, tagName) => {
     if (root == null)
         return 0;
@@ -47,10 +48,10 @@ const getHeightByTagName = (root, tagName) => {
     return 0;
 };
 exports.getHeightByTagName = getHeightByTagName;
-const _VTable = react_1.default.forwardRef((props, ref) => {
+const _VTable = (0, react_1.forwardRef)((props, ref) => {
     const update = (0, hooks_1.useUpdate)();
     const { state, root, resize } = (0, Box_1.useBox)();
-    const [scroll, setScroll] = (0, react_1.useState)(undefined);
+    // const [scroll, setScroll] = useState<TableProps<PlainObject>['scroll']>(undefined);
     const { rowKey, list, isQuerying, pageNo, pageSize, orderBy, query, total } = props.model;
     let start = (0, react_1.useRef)(0);
     const tableProps = {};
@@ -122,7 +123,6 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
     (0, react_1.useEffect)(() => {
         if (props.autoLoad === false)
             return;
-        console.log(props.model);
         // @ts-ignore
         if (props.model.mode == 'api-global' && total > 0)
             return;
@@ -132,19 +132,16 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
         query(props.default || {});
     }, []);
     // 更新高度 table 需要把 head 排除设置滚动
-    (0, react_1.useEffect)(() => {
-        if (props.scroll === null)
-            return;
-        if (props.mode == undefined || props.mode == 'common')
-            return;
-        let height = state === null || state === void 0 ? void 0 : state.height;
-        if (!height)
-            return;
-        setTimeout(() => {
-            height -= (0, exports.getHeightByTagName)(root.current, 'thead');
-            setScroll({ y: Math.ceil(height), x: true });
-        }, 2);
-    }, [state === null || state === void 0 ? void 0 : state.height]);
+    // useEffect(() => {
+    //     if (props.scroll === null) return;
+    //     if (props.mode == undefined || props.mode == 'common') return;
+    //     let height = state?.height;
+    //     if (!height) return;
+    //     setTimeout(() => {
+    //         height -= getHeightByTagName(root.current, 'thead');
+    //         setScroll({ y: Math.ceil(height), x: true })
+    //     }, 2);
+    // }, [state?.height])
     // @ts-ignore
     const effectKey = props.model.effect;
     (0, react_1.useEffect)(() => {
@@ -183,7 +180,9 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
             },
         };
     }
-    return react_1.default.createElement(Table_1.Table, Object.assign({ rowKey: props.rowKey || rowKey, scroll: scroll, tableLayout: "fixed", 
+    return react_1.default.createElement(Table_1.Table, Object.assign({ rowKey: props.rowKey || rowKey, 
+        // scroll={scroll}
+        // tableLayout="fixed"
         // showSorterTooltip={false}
         size: utils_1.GLOBAL.CONFIG.TABLE.SIZE }, props, tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) }, dataSource: list, loading: isQuerying, onChange: (x, y, field) => {
             if (field.column) {
@@ -194,10 +193,19 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
             }
         } }));
 });
-const VTable = (props) => {
+exports.VTable = (0, react_1.forwardRef)((props, ref) => {
     const { isQuerying, pageNo, pageSize, total, totalAcc, param, pageTo, query, cost } = props.model;
     // 通过 ref 方式交互，后续扩展方法实现定制联页选择
     const selectedRef = (0, react_1.useRef)({ selected: [[], []], onSelected: () => { }, });
+    // 对外提供getSelected方法获取当前选择的数据
+    (0, react_1.useImperativeHandle)(ref, () => ({
+        getSelected() {
+            return selectedRef.current.selected;
+        },
+        getParams: () => {
+            return props.model.param;
+        }
+    }), []);
     let boxProps = lodash_1.default.pick(props, ['selectBar', 'style', 'className', 'default', 'mode']);
     if (props.searchBar) {
         boxProps.searchBar = Object.assign(Object.assign({}, props.searchBar), { disabled: isQuerying, onSearch: (data) => {
@@ -238,5 +246,4 @@ const VTable = (props) => {
     }
     return react_1.default.createElement(Box_1.Box, Object.assign({}, boxProps),
         react_1.default.createElement(_VTable, Object.assign({}, lodash_1.default.omit(props, ['className', 'style']), { ref: selectedRef })));
-};
-exports.VTable = VTable;
+});

package/components/Tables/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { TableDefined } from './Components';
-import type { ForwardRefExoticComponent, ExoticComponent } from 'react';
+import type { ForwardRefExoticComponent, ExoticComponent, RefAttributes } from 'react';
 import type { TableProps } from '../_adapt/Table';
 import type { ColumnProps } from 'antd/es/table/interface';
 import type { SearchBarProps } from '../SearchBar/index';
@@ -13,7 +13,7 @@ export type TableColumn = BaseItem & ColumnProps<PlainObject>;
  * 说明：为保持各应用 一致性 与 简单性
  * 所有VAP组装 Table 排除一些自定义属性
 */
-export type TableDefine = Omit<TableProps<PlainObject>, 'size' | 'columns' | 'dataSource' | 'bordered' | 'tableLayout' | 'rowKey' | 'title' | 'loading' | 'onChange' | 'rowSelection' | 'getPopupContainer' | 'sortDirections' | 'showSorterTooltip' | 'internalHooks' | 'transformColumns' | 'internalRefs'>;
+export type TableDefine = Omit<TableProps<PlainObject>, 'size' | 'columns' | 'dataSource' | 'bordered' | 'rowKey' | 'title' | 'loading' | 'onChange' | 'rowSelection' | 'getPopupContainer' | 'sortDirections' | 'showSorterTooltip' | 'internalHooks' | 'transformColumns' | 'internalRefs'>;
 export type BaseTableProps = TableDefine & {
     mode?: BoxMode;
     /**
@@ -66,10 +66,10 @@ export type BaseTableProps = TableDefine & {
     autoLoad?: false;
 };
 import type { ApiTableProps } from './ApiTable';
-export type ApiTable = ForwardRefExoticComponent<ApiTableProps & React.RefAttributes<ApiModel>> & TableDefined;
+export type ApiTable = ForwardRefExoticComponent<ApiTableProps & RefAttributes<ApiModel>> & TableDefined;
 export declare const ApiTable: ApiTable;
-import type { VTableProps } from './VTable';
-export type VTable = ExoticComponent<VTableProps> & TableDefined;
+import type { VTableProps, VTableRef } from './VTable';
+export type VTable = ForwardRefExoticComponent<VTableProps & RefAttributes<VTableRef>> & TableDefined;
 export declare const VTable: VTable;
 import type { STableProps } from './STable';
 export type STable = ExoticComponent<STableProps> & TableDefined;

package/components/Trees/ActionTree.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { BaseTreeState } from './BaseTree';
-import type { BaseTreeProps, ActionProps, ActionRef } from './index';
+import type { BaseTreeProps, BaseActionTreeProps, ActionTreeRef } from './index';
 import type { PlainObject, Key } from '../../basetype';
 import type { ReactNode } from 'react';
 declare enum INSER_POS {
@@ -10,7 +10,7 @@ declare enum INSER_POS {
     TOP = 3,
     BOTTOM = 4
 }
-type ActionTreeProps = BaseTreeProps & ActionProps;
+type ActionTreeProps = BaseTreeProps & BaseActionTreeProps;
 export type CacheTree = {
     /**
      * 清理缓存方法
@@ -22,7 +22,7 @@ export type CacheTree = {
     getChildren?: Function;
 };
 type ActionTreeContext = {
-    action: ActionProps;
+    action: BaseActionTreeProps;
     showAdd: (pos: INSER_POS, node: PlainObject, position: number[]) => void;
     showEdit: (node: PlainObject, position: number[]) => void;
     del: (node: PlainObject, position: number[]) => void;
@@ -45,12 +45,10 @@ export declare const ActionTree: React.ForwardRefExoticComponent<import("../../u
     defaultExpandAll?: boolean;
     mustSelect?: boolean;
     disabled?: boolean;
-    disabledNode?: (node: PlainObject) => boolean; /**
-     * 清理缓存方法
-    */
+    disabledNode?: (node: PlainObject) => boolean;
     onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
     searchValue?: string;
-} & ActionProps & CacheTree & React.RefAttributes<ActionRef>>;
+} & BaseActionTreeProps & CacheTree & React.RefAttributes<ActionTreeRef>>;
 export declare const renderRoot: (props: ActionTreeProps, state: BaseTreeState, context: ActionTreeContext) => ReactNode;
 export declare const getResponseList: (resp: PlainObject, sortField?: string) => PlainObject[];
 export {};

package/components/Trees/ActionTree.js

@@ -108,21 +108,17 @@ const _Actiontree = (0, react_1.forwardRef)((props, ref) => {
         if (props.canSort && treeState.sortField)
             action.canSort = true;
     }
-    (0, react_1.useLayoutEffect)(() => {
-        if (ref != null) {
-            ref.current = {
-                updateData, update, del, add: (data, position) => {
-                    let nodePath = position.map(i => `[${i}]`).join('.children');
-                    const { treeData } = treeState;
-                    let node = lodash_1.default.get(treeData, nodePath);
-                    if (node == null) {
-                        antd_1.message.error('No parent found');
-                    }
-                    add(data, { pos: INSER_POS.INNER, node, position });
-                }
-            };
+    (0, react_1.useImperativeHandle)(ref, () => ({
+        updateData, update, del, add: (data, position) => {
+            let nodePath = position.map(i => `[${i}]`).join('.children');
+            const { treeData } = treeState;
+            let node = lodash_1.default.get(treeData, nodePath);
+            if (node == null) {
+                antd_1.message.error('No parent found');
+            }
+            add(data, { pos: INSER_POS.INNER, node, position });
         }
-    }, [treeState.treeData]);
+    }), [treeState.treeData]);
     (0, react_1.useLayoutEffect)(() => {
         if (props.formFields) {
             FIELDS.current = props.formFields;

package/components/Trees/DTree.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { BaseTreeProps, ActionProps, ActionRef } from './index';
+import type { BaseTreeProps, BaseActionTreeProps, ActionTreeRef } from './index';
 import type { Key, PlainObject } from '../../basetype';
 export type DTreeFetch = {
     /**
@@ -19,7 +19,7 @@ export type DTreeFetch = {
     */
     childApi: string | ((parentId: Key) => Promise<PlainObject[]>);
 };
-export type DTreeProps = BaseTreeProps & ActionProps & DTreeFetch;
+export type DTreeProps = BaseTreeProps & BaseActionTreeProps & DTreeFetch;
 /**
  * 动态树
  * CRUD        ：   支持
@@ -45,4 +45,4 @@ export declare const DTree: React.MemoExoticComponent<React.ForwardRefExoticComp
     disabledNode?: (node: PlainObject) => boolean;
     onSelect?: (key: Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
     searchValue?: string;
-} & ActionProps & DTreeFetch & React.RefAttributes<ActionRef>>>;
+} & BaseActionTreeProps & DTreeFetch & React.RefAttributes<ActionTreeRef>>>;

package/components/Trees/DTree.js

@@ -125,7 +125,6 @@ const _Dtree = (props) => {
         // 如果根节点只有一个，则自动展开这个根结点
         treeProps.defaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
     }
-    // loadData?: (node: AntTreeNode) => PromiseLike<void>;
     const loadData = (evt) => __awaiter(void 0, void 0, void 0, function* () {
         const { node, position } = evt.props.data;
         const children = yield props.getChildren(node[treeState.keyField]);

package/components/Trees/FTree.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { TreeUtil } from '../../utils';
-import type { BaseTreeProps, ActionProps, ActionRef } from './index';
+import type { BaseTreeProps, BaseActionTreeProps, ActionTreeRef } from './index';
 import type { PlainObject } from '../../basetype';
 type FTreeFetch = {
     /**
@@ -8,7 +8,7 @@ type FTreeFetch = {
     */
     fetchApi?: string;
 };
-export type FTreeProps = BaseTreeProps & ActionProps & FTreeFetch;
+export type FTreeProps = BaseTreeProps & BaseActionTreeProps & FTreeFetch;
 /**
  * 动态树
  * CRUD        ：   支持
@@ -17,7 +17,9 @@ export type FTreeProps = BaseTreeProps & ActionProps & FTreeFetch;
 */
 export declare const FTree: React.MemoExoticComponent<React.ForwardRefExoticComponent<TreeUtil.BaseTreeOpts & {
     className?: string;
-    iconField?: string | ((item: any) => React.ReactNode);
+    iconField?: string | ((item: any) => React.ReactNode); /**
+     * 获取全部节点的API，如果不传，刚用 API 的GET模式代替
+    */
     titleField: string | {
         zhCN?: string;
         enUS?: string;
@@ -29,5 +31,5 @@ export declare const FTree: React.MemoExoticComponent<React.ForwardRefExoticComp
     disabledNode?: (node: PlainObject) => boolean;
     onSelect?: (key: import("../../basetype").Key, node: PlainObject, parentNode: PlainObject, crumb: PlainObject[], pos: number[]) => void;
     searchValue?: string;
-} & ActionProps & FTreeFetch & React.RefAttributes<ActionRef>>>;
+} & BaseActionTreeProps & FTreeFetch & React.RefAttributes<ActionTreeRef>>>;
 export {};

package/components/Trees/index.d.ts

@@ -66,7 +66,7 @@ export type BaseTreeProps = BaseTreeOpts & {
     */
     searchValue?: string;
 };
-export type ActionProps = {
+export type BaseActionTreeProps = {
     /**
      * 对象的 Label
     */
@@ -131,7 +131,7 @@ export type ActionProps = {
  * 说明 针对节点进行操作
  * 说明，节点信息，位置信息，可通过 onSelect 方法的第五个参数可以拿到
 */
-export type ActionRef = {
+export type ActionTreeRef = {
     updateData: (node: PlainObject, pos: number[]) => void;
     update: (node: PlainObject, pos: number[]) => Promise<void>;
     del: (node: PlainObject, pos: number[]) => Promise<void>;

package/components/UForm/UForm.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { UFromProps, UFormFunctions } from './index';
+import type { UFromProps, UFormRef } from './index';
 import type { FormState } from './FormWrapper';
 export declare const initValue: (props: UFromProps & {
     state: FormState;
@@ -14,4 +14,4 @@ export declare const initValue: (props: UFromProps & {
  * 3. 支持 ref 控制方法
  * 4. filed 支持更多提示，验证方法
 */
-export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFormFunctions>>;
+export declare const UForm: React.ForwardRefExoticComponent<UFromProps & React.RefAttributes<UFormRef>>;

package/components/UForm/UForm.js

@@ -43,13 +43,13 @@ const antd_1 = require("antd");
 const Row_1 = require("../_adapt/Row");
 const Col_1 = require("../_adapt/Col");
 const Popconfirm_1 = require("../_adapt/Popconfirm");
+const Popover_1 = require("../_adapt/Popover");
 const Button_1 = require("../_adapt/Button");
 const FormWrapper_1 = require("./FormWrapper");
 const useUpdate_1 = require("../../hooks/useUpdate");
 const Icon_1 = require("../_adapt/Icon");
 const _FormUtils_1 = require("./_FormUtils");
 const _register_1 = require("./_register");
-const Popover_1 = require("../_adapt/Popover");
 const onChangeEvent = (state, field, form, update, values, extra) => {
     const { multipleFields, requireFields, disableFields, hiddenFields, optionFields, } = state;
     if (!lodash_1.default.isArray(field.link) || field.link.length == 0)
@@ -407,24 +407,22 @@ const _UForm = (0, react_1.forwardRef)((props, ref) => {
     const { form } = props;
     const [checked, setChecked] = (0, react_1.useState)(false);
     const initRef = (0, react_1.useRef)(null);
+    (0, react_1.useImperativeHandle)(ref, () => ({
+        validate: () => __awaiter(void 0, void 0, void 0, function* () {
+            return new Promise((r, j) => {
+                form.validateFields((err, result) => {
+                    if (err) {
+                        console.error(err);
+                        return;
+                    }
+                    r(getValue(state.multipleFields.current, result, initRef));
+                });
+            });
+        }),
+        reset: () => form.resetFields(),
+        data: () => getValue(state.multipleFields.current, form.getFieldsValue(), initRef),
+    }), []);
     (0, react_1.useLayoutEffect)(() => {
-        if (ref != null) {
-            ref.current = {
-                validate: () => __awaiter(void 0, void 0, void 0, function* () {
-                    return new Promise((r, j) => {
-                        form.validateFields((err, result) => {
-                            if (err) {
-                                console.error(err);
-                                return;
-                            }
-                            r(getValue(state.multipleFields.current, result, initRef));
-                        });
-                    });
-                }),
-                reset: () => form.resetFields(),
-                data: () => getValue(state.multipleFields.current, form.getFieldsValue(), initRef),
-            };
-        }
         const checkMultiple = (field) => {
             // @ts-ignore
             if (field == null || field == false)
@@ -449,11 +447,9 @@ const _UForm = (0, react_1.forwardRef)((props, ref) => {
     if (!checked)
         return utils_1.Const.NONE;
     return react_1.default.createElement(antd_1.Form
-    // defaultValue={initRef.current}
     // initialValues={props.default}
     // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
     , { 
-        // defaultValue={initRef.current}
         // initialValues={props.default}
         // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
         className: state.isGroup ? 'c-form c-form-group' : 'c-form', style: { width: state.width }, form: form },

package/components/UForm/UFormModal.js

@@ -48,9 +48,6 @@ const FormWrapper_1 = require("./FormWrapper");
 const FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size'];
 const UFormModal = (props) => {
     const ref = (0, react_1.useRef)(null);
-    const [open, afterClose] = (0, Modal_1.useDestoryModal)(props);
-    if (!open)
-        return utils_1.Const.NONE;
     let modalProps = {
         onOk: () => __awaiter(void 0, void 0, void 0, function* () {
             const result = yield ref.current.validate();
@@ -146,7 +143,7 @@ const UFormModal = (props) => {
             });
         }
     }
-    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true, afterClose: afterClose }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
+    return react_1.default.createElement(Modal_1.Modal, Object.assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: () => props.onCancel() }, modalProps),
         react_1.default.createElement(UForm_1.UForm, Object.assign({}, lodash_1.default.pick(props, FORM_FIELDS), { ref: ref })));
 };
 exports.UFormModal = UFormModal;

package/components/UForm/index.d.ts

@@ -391,7 +391,7 @@ export type UDescriptionsItemProps = BaseItem & {
     */
     children: React.ReactNode;
 };
-export type UFormFunctions = {
+export type UFormRef = {
     /**
      * 获取当前表单数据
     */

package/components/_adapt/Button.js

@@ -28,10 +28,13 @@ const _Button = props => {
                 icon,
                 " ",
                 react_1.default.createElement("span", null, utils_1.i18n.txt(props.ik)));
-        return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps),
-            icon,
-            " ",
-            react_1.default.createElement("span", null, props.children));
+        if (props.children) {
+            return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps),
+                icon,
+                " ",
+                react_1.default.createElement("span", null, props.children));
+        }
+        return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps), icon);
     }
     if (props.ik)
         return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps), utils_1.i18n.txt(props.ik));

package/components/_adapt/Input.d.ts

@@ -1,5 +1,5 @@
 import { Input as AntdInput } from 'antd';
-import type { InputProps } from 'antd/es/input';
+import type { InputProps, PasswordProps } from 'antd/es/input';
 import type { ForwardRefExoticComponent, RefAttributes } from 'react';
 export interface InputRef {
     input: HTMLInputElement | null;
@@ -11,7 +11,7 @@ type InputComponent = ForwardRefExoticComponent<InputProps & RefAttributes<Input
     Group: typeof AntdInput.Group;
     Search: typeof AntdInput.Search;
     TextArea: typeof AntdInput.TextArea;
-    Password: typeof AntdInput.Password;
+    Password: ForwardRefExoticComponent<PasswordProps & RefAttributes<InputRef>>;
 };
 export declare const Input: InputComponent;
 export {};

package/components/_adapt/Input.js

@@ -40,4 +40,14 @@ exports.Input = _Input;
 exports.Input.Group = antd_1.Input.Group;
 exports.Input.Search = antd_1.Input.Search;
 exports.Input.TextArea = antd_1.Input.TextArea;
-exports.Input.Password = antd_1.Input.Password;
+exports.Input.Password = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(antd_1.Input.Password, Object.assign({}, props, { ref: aInput => {
+        if (aInput && ref) {
+            ref.current = {
+                input: aInput.input,
+                focus: aInput.focus,
+                blur: aInput.blur,
+                select: aInput.select,
+            };
+        }
+    } })));
+// ;

package/components/_adapt/Row.js

@@ -16,8 +16,6 @@ const Row = (props) => {
     if (props.direction != 'column')
         return react_1.default.createElement(antd_1.Row, Object.assign({ type: "flex", gutter: Global_1.CONFIG.GRID.GUTTER }, props, { className: clazz.join(' ') }));
     clazz.push('v-row-direction-column');
-    return react_1.default.createElement(antd_1.Row, Object.assign({ type: "flex", gutter: Global_1.CONFIG.GRID.GUTTER }, props, { 
-        // wrap={props.wrap || false}
-        className: clazz.join(' ') }));
+    return react_1.default.createElement(antd_1.Row, Object.assign({ type: "flex", gutter: Global_1.CONFIG.GRID.GUTTER }, props, { className: clazz.join(' ') }));
 };
 exports.Row = Row;

package/components/_setup/SelectBar/SelectTree.js

@@ -1,11 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const _register_1 = require("../../Box/_register");
 const Trees_1 = require("../../Trees");
 (0, _register_1.registerSelectBar)('stree', (props) => react_1.default.createElement(Trees_1.STree, Object.assign({}, props.config, { onSelect: props.onSelect, searchValue: props.searchValue })));
-(0, _register_1.registerSelectBar)('ftree', react_1.default.forwardRef((props, ref) => react_1.default.createElement(Trees_1.FTree, Object.assign({}, props.config, { onSelect: props.onSelect, searchValue: props.searchValue, ref: ref }))));
-(0, _register_1.registerSelectBar)('dtree', react_1.default.forwardRef((props, ref) => react_1.default.createElement(Trees_1.DTree, Object.assign({}, props.config, { onSelect: props.onSelect, searchValue: props.searchValue, ref: ref }))));
+(0, _register_1.registerSelectBar)('ftree', (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(Trees_1.FTree, Object.assign({}, props.config, { onSelect: props.onSelect, searchValue: props.searchValue, ref: ref }))));
+(0, _register_1.registerSelectBar)('dtree', (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(Trees_1.DTree, Object.assign({}, props.config, { onSelect: props.onSelect, searchValue: props.searchValue, ref: ref }))));

package/deps/_editor/tools/_TxtButton.js

@@ -13,10 +13,10 @@ const Popover_1 = require("../../../components/_adapt/Popover");
 const Slider_1 = require("../../../components/_adapt/Slider");
 const Button_1 = require("../../../components/_adapt/Button");
 const Select_1 = require("../../../components/_adapt/Select");
+const ColorPicker_1 = require("../../../components/_adapt/ColorPicker");
 const UForm_1 = require("../../../components/UForm");
 const Icon_1 = require("../../../components/_adapt/Icon");
 const hooks_1 = require("../../../hooks");
-const ColorPicker_1 = require("../../../components/_adapt/ColorPicker");
 const markValue = (editor, cmd) => {
     const marks = slate_1.Editor.marks(editor);
     if (marks && marks[cmd]) {

package/index.d.ts

@@ -132,9 +132,9 @@ export { VTable, ApiTable, ApiTableModal, STable, TopTable, TopTableModal } from
 export { STree, DTree, FTree } from './components/Trees';
 export { UploadFile, UploadImage, UploadModal } from './components/Upload';
 export { SList } from './components/Lists/SList';
-export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, UFormFunctions } from './components/UForm';
+export type { UFromProps, UModalProps, UFormField, UFormFieldGroup, LinkResult, UDescriptionsProps, UFormRef } from './components/UForm';
 export type { TableColumn } from './components/Tables/index';
-export type { VTableProps } from './components/Tables/VTable';
+export type { VTableProps, VTableRef } from './components/Tables/VTable';
 export type { ApiTableProps } from './components/Tables/ApiTable';
 export type { ApiTableModalProps } from './components/Tables/ApiTableModal';
 export type { STableProps } from './components/Tables/STable';
@@ -143,6 +143,7 @@ export type { TopTableModalProps } from './components/Tables/TopTableModal';
 export type { UploadModalProps } from './components/Upload/UploadModal';
 export type { UploadImageProps } from './components/Upload/UploadImage';
 export type { BaseUploadProps } from './components/Upload';
+export type { ActionTreeRef } from './components/Trees';
 export type { STreeProps } from './components/Trees/STree';
 export type { DTreeProps } from './components/Trees/DTree';
 export type { FTreeProps } from './components/Trees/FTree';

package/login/jit/pnxclient.d.ts

@@ -1,6 +1,7 @@
 declare global {
     const PNXGWClient: any;
     interface Window {
+        APP_ROOT: string;
         ActiveXObject: any;
     }
 }

package/package.json

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

package/screen/render.js

@@ -7,4 +7,3 @@ const react_dom_1 = require("react-dom");
 */
 const render = (children) => (0, react_dom_1.render)(children, document.getElementById('root'));
 exports.render = render;
-// createRoot(document.getElementById('root') as HTMLDivElement).render(children);

package/utils/PageUtil.d.ts

@@ -11,6 +11,14 @@ export declare const paramToUri: (param: PlainObject, baseUrl?: string) => strin
  * 将一个ip4地址转换成数字
 */
 export declare const IpToInt: (ip: string) => number;
+/**
+ * 兼容二级目录-转化URL
+*/
+export declare const resolveURL: ((url: string) => string);
+/**
+ * 兼容二级目录-恢复URL
+*/
+export declare const clearURL: ((url: string) => string);
 /**
  * 判断是否有权限
 */

package/utils/PageUtil.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOptions = exports.currentApp = exports.hasRole = exports.IpToInt = exports.paramToUri = exports.stopEvent = void 0;
+exports.getOptions = exports.currentApp = exports.hasRole = exports.clearURL = exports.resolveURL = exports.IpToInt = exports.paramToUri = exports.stopEvent = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const StringUtil_1 = require("./StringUtil");
 const _Support_1 = require("./_Support");
@@ -46,6 +46,25 @@ const IpToInt = (ip) => {
     return ip.split('.').reduce((ipInt, octet) => (ipInt << 8) + parseInt(octet, 10), 0) >>> 0;
 };
 exports.IpToInt = IpToInt;
+/**
+ * 兼容二级目录-转化URL
+*/
+exports.resolveURL = (window.APP_ROOT == null || window.APP_ROOT == '') ? (val => val) : (url) => {
+    if (!url.startsWith('/'))
+        return url;
+    if (url.startsWith(window.APP_ROOT))
+        return url;
+    return window.APP_ROOT + url;
+};
+const len = window.APP_ROOT ? window.APP_ROOT.length : 0;
+/**
+ * 兼容二级目录-恢复URL
+*/
+exports.clearURL = (len == 0) ? (val => val) : (url) => {
+    if (!url.startsWith(window.APP_ROOT))
+        return url;
+    return url.substring(len);
+};
 /**
  * 判断是否有权限
 */