vap1 0.0.4 → 0.0.6

package/components/Box/Box.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Box = exports.useBox = void 0;
 const react_1 = __importStar(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
-const antd_1 = require("antd");
+const Layout_1 = require("../_adapt/Layout");
 const hooks_1 = require("../../hooks");
 const SelectBar_1 = require("./SelectBar");
 const SearchBar_1 = require("../SearchBar");
@@ -67,6 +67,7 @@ exports.useBox = useBox;
 exports.Box = react_1.default.forwardRef((props, ref) => {
     const app = (0, hooks_1.useApp)();
     const [state, setState] = (0, hooks_1.useSetState)(null);
+    const _layoutRef = (0, react_1.useRef)(null);
     const rootRef = (0, react_1.useRef)(null);
     const contextRef = (0, react_1.useRef)(null);
     const selectRef = (0, react_1.useRef)(null);
@@ -133,9 +134,15 @@ exports.Box = react_1.default.forwardRef((props, ref) => {
     // if (props.pagination && props.mode == 'inner') {
     //     paginationProps.hideOnSinglePage = true;
     // }
-    return react_1.default.createElement(antd_1.Layout, { className: utils_1.StringUtil.className(className, props.className), style: style },
+    return react_1.default.createElement(Layout_1.Layout, { className: utils_1.StringUtil.className(className, props.className), style: style, ref: _layoutRef },
         props.selectBar && (0, _register_1.getSelectBar)(props.selectBar.type) != null && react_1.default.createElement(SelectBar_1.SelectBar, Object.assign({}, props.selectBar, { ref: selectRef, onSelect: (...args) => setState({ selected: args }) })),
-        react_1.default.createElement(antd_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden' }, ref: ctx => rootRef.current = ctx.context },
+        react_1.default.createElement(Layout_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden' }, ref: () => {
+                if (_layoutRef.current != null) {
+                    let el = lodash_1.default.find(_layoutRef.current.children, (item) => lodash_1.default.toLower(item.tagName) == 'main');
+                    if (el != null)
+                        rootRef.current = el;
+                }
+            } },
             (props.searchBar ||
                 (props.actionBar && ((lodash_1.default.isArray(props.actionBar) && props.actionBar.length > 0)
                     || (!lodash_1.default.isArray(props.actionBar) && react_1.default.isValidElement(props.actionBar))))) && react_1.default.createElement(SearchBar_1.SearchBar, Object.assign({}, props.searchBar, { default: props.default, className: HEIGHT_OMIT, onExpand: (isExpand) => {

package/components/UForm/UForm.js

@@ -407,7 +407,7 @@ const _FormGroup = (props) => {
             }));
     });
 };
-const _UForm = react_1.default.forwardRef((props, ref) => {
+const _UForm = (0, react_1.forwardRef)((props, ref) => {
     const state = (0, FormWrapper_1.useFormLayout)();
     const { form } = props;
     const [checked, setChecked] = (0, react_1.useState)(false);
@@ -468,7 +468,7 @@ class _UFormAdaptor extends react_1.default.Component {
     }
 }
 // 3.0 适配层
-const UFormAdaptor = react_1.default.forwardRef((0, react_1.memo)((props, ref) => {
+const UFormAdaptor = (0, react_1.memo)((0, react_1.forwardRef)((props, ref) => {
     const FROM = antd_1.Form.create()(_UFormAdaptor);
     return react_1.default.createElement(FROM, Object.assign({}, props, { aref: ref }));
 }));

package/components/_adapt/Button.js

@@ -7,7 +7,7 @@ exports.Button = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const antd_1 = require("antd");
-// import { Icon } from './Icon';
+const Icon_1 = require("./Icon");
 const utils_1 = require("../../utils");
 const _Button = props => {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
@@ -15,9 +15,22 @@ const _Button = props => {
     let btnProps = Object.assign({}, props);
     if (props.danger)
         btnProps.type = 'danger';
+    let icon = null;
     if (props.icon) {
+        icon = lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon;
         lodash_1.default.unset(btnProps, 'icon');
     }
+    if (icon) {
+        if (props.ik)
+            return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps),
+                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.ik)
         return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps), utils_1.i18n.txt(props.ik));
     return react_1.default.createElement(antd_1.Button, Object.assign({}, btnProps));

package/components/_adapt/Layout.js

@@ -67,14 +67,19 @@ class BasicLayout extends react_1.default.Component {
             clazz.push(className);
         return (react_1.default.createElement(layout_1.LayoutContext.Provider, { value: { siderHook: this.getSiderHook() } },
             react_1.default.createElement("section", Object.assign({ className: clazz.join(' ') }, others, { ref: (el) => {
-                    if (el && this.props.elRef) {
-                        this.props.elRef.current = el;
+                    if (el && this.props.elref) {
+                        this.props.elref.current = el;
                     }
                 } }), children)));
     }
 }
 BasicLayout.displayName = 'Layout';
-const _Layout = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(context_1.ConfigConsumer, null, () => react_1.default.createElement(BasicLayout, Object.assign({}, props, { elRef: ref }))));
+const _Layout = (0, react_1.forwardRef)((props, ref) => react_1.default.createElement(context_1.ConfigConsumer, null, () => react_1.default.createElement(BasicLayout, Object.assign({}, props, { elref: ref }))));
+// const Content = generator({
+//     suffixCls: 'layout-content',
+//     tagName: 'main',
+//     displayName: 'Content',
+//   })(Basic);
 exports.Layout = _Layout;
 exports.Layout.displayName = 'Layout';
 exports.Layout.Header = antd_1.Layout.Header;

package/components/_adapt/Menu.d.ts

@@ -7,16 +7,16 @@ import type { PropsWithChildren, ExoticComponent } from 'react';
 import type { Key } from '../../basetype';
 export interface MenuItemType extends MenuItemProps {
     key: Key;
-    danger?: boolean;
-    icon?: React.ReactNode;
+    icon?: string | React.ReactNode;
+    ik?: string;
     label?: React.ReactNode;
     title?: string;
 }
 export interface SubMenuType<T extends MenuItemType = MenuItemType> extends Omit<SubMenuProps, 'children'> {
     key: Key;
-    icon?: React.ReactNode;
+    icon?: string | React.ReactNode;
+    ik?: string;
     label?: React.ReactNode;
-    theme?: 'dark' | 'light';
     children: ItemType<T>[];
 }
 export type ItemType<T extends MenuItemType = MenuItemType> = T | SubMenuType<T> | null;

package/components/_adapt/Menu.js

@@ -7,15 +7,55 @@ exports.Menu = void 0;
 const react_1 = __importDefault(require("react"));
 const lodash_1 = __importDefault(require("lodash"));
 const antd_1 = require("antd");
+const i18n_1 = require("../../utils/i18n");
+const Icon_1 = require("../_adapt/Icon");
+const getMenuProps = (props) => {
+    const result = lodash_1.default.pick(props, ['className', 'key', 'disabled', 'onClick', 'level', 'onTitleClick']);
+    if (result.icon) {
+        if (props.ik) {
+            result.title = react_1.default.createElement("span", null,
+                lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
+                " ",
+                (0, i18n_1.txt)(props.ik));
+        }
+        else {
+            result.title = react_1.default.createElement("span", null,
+                lodash_1.default.isString(props.icon) ? react_1.default.createElement(Icon_1.Icon, { type: props.icon }) : props.icon,
+                " ",
+                props.label || props.title);
+        }
+    }
+    else {
+        if (props.ik) {
+            result.title = react_1.default.createElement("span", null, (0, i18n_1.txt)(props.ik));
+        }
+        else {
+            result.title = react_1.default.createElement("span", null, props.label || props.title);
+        }
+    }
+    return result;
+};
+const renderGroup = (props) => {
+    const menuProps = getMenuProps(props);
+    return react_1.default.createElement(antd_1.Menu.SubMenu, Object.assign({ key: props.key }, menuProps, { onTitleClick: menuProps.onClick }), props.children.map(item => {
+        if (lodash_1.default.isArray(item.children)) {
+            return renderGroup(item);
+        }
+        const itemProps = getMenuProps(item);
+        return react_1.default.createElement(antd_1.Menu.Item, Object.assign({ key: item.key }, itemProps), itemProps.title);
+    }));
+};
 const _Menu = props => {
-    // const [useChildren, options] = useMemo<[boolean, BaseOption[]]>(() => {
-    //     // if (_.isArray(props.items) && props.items.length) return [false, getOptions(props.items)];
-    //     return [true, []];
-    // }, [props.items, props.children]);
-    // if (useChildren) return <AntdMenu {...props} />
     if (lodash_1.default.isArray(props.items) && props.items.length) {
-        return react_1.default.createElement(antd_1.Menu, Object.assign({}, lodash_1.default.omit(props, 'children')), props.items.map(item => {
-        }));
+        return react_1.default.createElement(antd_1.Menu, Object.assign({}, lodash_1.default.omit(props, 'children')),
+            "  ",
+            props.items.map(item => {
+                if (lodash_1.default.isArray(item.children)) {
+                    return renderGroup(item);
+                }
+                const itemProps = getMenuProps(item);
+                return react_1.default.createElement(antd_1.Menu.Item, Object.assign({ key: item.key }, itemProps), itemProps.title);
+            }));
     }
     return react_1.default.createElement(antd_1.Menu, Object.assign({}, props));
 };

package/package.json

@@ -1 +1 @@
-{"name":"vap1","version":"0.0.4","description":"vap1, Both support MicroService and SAP FrameWork","main":"index.js","author":"Xiang da","license":"ISC","dependencies":{"antd":"^3.26.20","ejs":"^3.1.9","lodash":"^4.17.21","dayjs":"npm:moment@latest","react":"^16.14.0","terser-webpack-plugin":"^5.3.9","webpack":"^5.88.2","webpack-sources":"^3.2.3"}}
+{"name":"vap1","version":"0.0.6","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}