vap1 0.0.5 → 0.0.7

package/components/SearchBar/ByKeyword.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchBarByKeyword = void 0;
 const react_1 = __importDefault(require("react"));
 const antd_1 = require("antd");
+const Popover_1 = require("../_adapt/Popover");
 const ByField_1 = require("./ByField");
 const utils_1 = require("../../utils");
 const Const_1 = require("../_setup/Const");
@@ -21,12 +22,12 @@ const SearchBarByKeyword = (props) => {
         }
     }
     if (props.fields && props.fields.length) {
-        inputProps.suffix = react_1.default.createElement(antd_1.Popover, { trigger: "click", placement: "bottom", content: react_1.default.createElement(react_1.default.Fragment, null,
+        inputProps.suffix = react_1.default.createElement(Popover_1.Popover, { trigger: "click", placement: "bottom", content: react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement("h3", null, utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE)),
                 react_1.default.createElement("div", { className: 'c-searchbar' },
                     react_1.default.createElement(ByField_1.SearchBarByField, Object.assign({}, props, { 
                         // @ts-ignore
-                        __innerExpand: true, __innerOutside: true })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: () => document.getElementById('vap-app-content') },
+                        __innerExpand: true, __innerOutside: true })))), rootClassName: 'c-searchbar-keyword-more', getPopupContainer: () => document.getElementById('vap-app-content') },
             react_1.default.createElement("span", { className: 'vicon vicon-menu', title: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE) }));
     }
     return react_1.default.createElement(antd_1.Input.Search, Object.assign({}, inputProps, { onSearch: keyword => props.onSearch({ keyword_: keyword }), enterButton: utils_1.i18n.txt(Const_1.V.BTN_SEARCH) }));

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);
@@ -464,11 +464,11 @@ const _UForm = react_1.default.forwardRef((props, ref) => {
 });
 class _UFormAdaptor extends react_1.default.Component {
     render() {
-        return react_1.default.createElement(_UForm, Object.assign({}, this.props, { ref: this.props.kref }));
+        return react_1.default.createElement(_UForm, Object.assign({}, this.props, { ref: this.props.aref }));
     }
 }
 // 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,14 @@ 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',
@@ -86,3 +86,9 @@ exports.Layout.Header = antd_1.Layout.Header;
 exports.Layout.Footer = antd_1.Layout.Footer;
 exports.Layout.Content = antd_1.Layout.Content;
 exports.Layout.Sider = antd_1.Layout.Sider;
+if (antd_1.Layout.Sider.defaultProps == null) {
+    antd_1.Layout.Sider.defaultProps = { trigger: null };
+}
+else {
+    antd_1.Layout.Sider.defaultProps.trigger = null;
+}

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,14 +7,52 @@ 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 (props.icon) {
+        if (props.ik) {
+            result.title = react_1.default.createElement(react_1.default.Fragment, 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(react_1.default.Fragment, 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(react_1.default.Fragment, null, (0, i18n_1.txt)(props.ik));
+        }
+        else {
+            result.title = react_1.default.createElement(react_1.default.Fragment, 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 => {
+            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/components/_adapt/Modal.js

@@ -56,7 +56,7 @@ class Modal extends react_1.Component {
     render() {
         if (!this.state.open)
             return utils_1.Const.NONE;
-        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { afterClose: () => this.setState({ open: false }), visible: this.props.open, footer: () => this.renderFooter() }));
+        return react_1.default.createElement(antd_1.Modal, Object.assign({}, this.props, { afterClose: () => this.setState({ open: false }), visible: this.props.open, footer: this.props.footer === null ? null : this.renderFooter() }));
     }
 }
 exports.Modal = Modal;

package/components/_adapt/Row.js

@@ -14,7 +14,7 @@ const Row = (props) => {
     if (props.wrap)
         clazz.push('v-row-direction-wrap');
     if (props.direction != 'column')
-        return react_1.default.createElement(antd_1.Row, Object.assign({ gutter: Global_1.CONFIG.GRID.GUTTER }, props, { 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(' ') }));
     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}

package/components/_adapt/Tabs.js

@@ -9,7 +9,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const antd_1 = require("antd");
 const _Tabs = props => {
     if (props.children == null && lodash_1.default.isArray(props.items) && props.items.length > 0) {
-        return react_1.default.createElement(antd_1.Tabs, Object.assign({}, props), props.items.map(item => react_1.default.createElement(antd_1.Tabs.TabPane, Object.assign({}, item), item.label)));
+        return react_1.default.createElement(antd_1.Tabs, Object.assign({}, props), props.items.map(item => react_1.default.createElement(antd_1.Tabs.TabPane, Object.assign({}, item, { tab: item.label }))));
     }
     return react_1.default.createElement(antd_1.Tabs, Object.assign({}, props));
 };

package/deps/_editor/advance/_Image.js

@@ -7,7 +7,7 @@ exports.Image = void 0;
 const react_1 = __importDefault(require("react"));
 const slate_1 = require("slate");
 const slate_react_1 = require("slate-react");
-const antd_1 = require("antd");
+const index_1 = require("../../../index");
 const slate_2 = require("slate");
 const ImageViewer = ({ attributes, element, children, style }) => {
     return react_1.default.createElement("div", Object.assign({}, attributes, { className: 'v-image', style: style }),
@@ -40,7 +40,7 @@ const ImageEditor = ({ attributes, element, children, style }) => {
         react_1.default.createElement("img", { src: element.url }),
         children,
         react_1.default.createElement("div", { contentEditable: false },
-            react_1.default.createElement(antd_1.Button, { icon: "delete", 
+            react_1.default.createElement(index_1.Button, { icon: "delete", 
                 // active
                 onClick: () => slate_1.Transforms.removeNodes(editor, { at: path }) })));
 };

package/package.json

@@ -1 +1 @@
-{"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"}
+{"name":"vap1","version":"0.0.7","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}