vap1 0.7.2 → 0.7.4

package/components/Lists/VList.js

@@ -87,6 +87,10 @@ var VList = function (props) {
     return react_1.default.createElement("div", { style: style, className: clazz },
         react_1.default.createElement(SearchTool_1.SearchTool, __assign({}, props, { onSearch: function (data) { return model.query(data, true); }, defaultParam: props.defaultParam, extraAction: extraAction, children: lodash_1.default.isEmpty(props.actionBar) ? undefined : (lodash_1.default.isArray(props.actionBar) ? react_1.default.createElement(ActionButtons_1.ActionButtons, { buttons: props.actionBar }) : props.actionBar) })),
         react_1.default.createElement(BaseList_1.BaseList, __assign({}, props, { layout: layout, style: null, className: null, dataSource: model.list, loading: model.isQuerying })),
-        props.pagination !== false && react_1.default.createElement(Upagination_1.UPagination, __assign({}, (0, Upagination_1.defaultPaginationProps)(props.pagination), { disabled: model.isQuerying, total: model.total, totalAcc: model.totalAcc, onChange: model.pageTo })));
+        props.pagination !== false && react_1.default.createElement(Upagination_1.UPagination
+        // {...defaultPaginationProps(props.pagination)}
+        , { 
+            // {...defaultPaginationProps(props.pagination)}
+            disabled: model.isQuerying, total: model.total, totalAcc: model.totalAcc, onChange: model.pageTo }));
 };
 exports.VList = VList;

package/components/Tables/ApiTableModal.js

@@ -71,7 +71,8 @@ var ApiTable_1 = require("./ApiTable");
 var utils_1 = require("../../utils");
 var API_TABLE_PROPERTIES = [
     'api', 'aop', 'tipDisabled', 'tipField',
-    'mode', 'columns', 'showIndex', 'rowKey', 'select', 'selectDisabled', 'actionBar', 'selectBar', 'searchBar', 'default', 'defaultParam', 'autoLoad'
+    'mode', 'columns', 'showIndex', 'rowKey', 'select', 'selectDisabled', 'actionBar', 'selectBar', 'searchBar', 'default', 'defaultParam', 'autoLoad',
+    'pagination',
 ];
 exports.ApiTableModal = (0, react_1.forwardRef)(function (props, ref) {
     var modalProps = lodash_1.default.omit(props, API_TABLE_PROPERTIES);
@@ -93,18 +94,8 @@ exports.ApiTableModal = (0, react_1.forwardRef)(function (props, ref) {
         }
     }
     else {
-        tableProps.pagination = { pageSize: utils_1.GLOBAL.CONFIG.PAGINATION.SIZE_SMALL };
+        tableProps.pagination = { pageSize: utils_1.GLOBAL.CONFIG.PAGINATION.SIZE_SMALL, };
     }
-    // if (props.height) {
-    //     if (modalProps.bodyStyle) {
-    //         modalProps.bodyStyle.height = props.height;
-    //     } else {
-    //         modalProps.bodyStyle = { height: props.height };
-    //     }
-    //     tableProps.mode = "inner";
-    // }
-    // if (props.width && ) {
-    // }
     return react_1.default.createElement(Modal_1.Modal, __assign({ footer: null }, modalProps),
         react_1.default.createElement(ApiTable_1.ApiTable, __assign({ key: tableKey }, tableProps, { ref: ref })));
 });

package/components/Tables/VTable.js

@@ -96,13 +96,6 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
     var _a = (0, useTableContext_1.useTableContext)(), selectedRowKeys = _a.selectedRowKeys, initObjects = _a.initObjects, reflushPage = _a.reflushPage, setSelection = _a.setSelection;
     var _b = (0, Box_1.useBox)(), state = _b.state, root = _b.root, resize = _b.resize;
     var update = (0, hooks_1.useUpdate)();
-    var inModal = (0, react_1.useMemo)(function () {
-        if (root.current == null)
-            return false;
-        return root.current.parentElement.parentElement.classList.contains('ant-modal-body')
-            || root.current.parentElement.parentElement.parentElement.classList.contains('ant-modal-body')
-            || root.current.parentElement.parentElement.parentElement.parentElement.classList.contains('ant-modal-body');
-    }, []);
     var _c = __read((0, react_1.useState)(undefined), 2), scroll = _c[0], setScroll = _c[1];
     var _d = props.model, rowKey = _d.rowKey, list = _d.list, isQuerying = _d.isQuerying, pageNo = _d.pageNo, pageSize = _d.pageSize, orderBy = _d.orderBy, query = _d.query, total = _d.total, cost = _d.cost;
     var _e = __read((0, react_1.useState)([false, false]), 2), _f = __read(_e[0], 2), pageEnterd = _f[0], pageLoaded = _f[1], setSatus = _e[1];
@@ -301,12 +294,15 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
             onChange: pageTo,
         };
         if (props.pagination) {
-            if (props.pagination.hideOnSinglePage) {
-                pagination.hideOnSinglePage = true;
-            }
-            if (props.pagination.className) {
-                pagination.className = props.pagination.className;
-            }
+            lodash_1.default.assign(pagination, lodash_1.default.pick(props.pagination, [
+                'defaultPageSize',
+                'hideOnSinglePage',
+                'className',
+                'pageSizeOptions',
+                'pageSize',
+                'showSizeChanger',
+                'showQuickJumper',
+            ]));
         }
     }
     return react_1.default.createElement(Box_1.Box, __assign({}, boxBaseProps, { pagination: pagination }),

package/components/Trees/DTree.js

@@ -177,7 +177,7 @@ var _Dtree = function (props) {
                                 // @ts-ignore
                                 { props: { data: { node: tree[0], position: [0] } } }
                             ]
-                        });
+                        }, tree);
                     }
                     return [2 /*return*/];
             }

package/package.json

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

package/utils/VAP.js

@@ -116,7 +116,6 @@ var _INIT = function (confs) {
         }
     });
     _VAP_LOAD_FN.loaded = true;
-    // console.log('load', _VAP_LOAD_FN.fns)
     while (_VAP_LOAD_FN.fns.length > 0) {
         var fn = _VAP_LOAD_FN.fns.shift();
         if (typeof fn == 'function') {