vap1 0.0.4 → 0.0.5

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/_adapt/Layout.js

@@ -75,6 +75,11 @@ class BasicLayout extends react_1.default.Component {
 }
 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 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/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.5","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}