vap1 0.1.1 → 0.1.2

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/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;
@@ -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;
@@ -183,7 +183,8 @@ 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 +195,21 @@ const _VTable = react_1.default.forwardRef((props, ref) => {
             }
         } }));
 });
-const VTable = (props) => {
+exports.VTable = react_1.default.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, () => {
+        return {
+            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 +250,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';
@@ -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/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/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)

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/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/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.2","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}

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);
+};
 /**
  * 判断是否有权限
 */