vap1 0.5.4 → 0.5.7

package/components/Box/Box.d.ts

@@ -6,6 +6,10 @@ import type { ActButton } from '../SearchTool/SearchBar/ActionButtons';
 import type { Key, PlainObject } from '../../basetype';
 import type { UPaginationProps } from '../_common/Upagination';
 type BoxState = {
+    /**
+     * 是否折叠
+    */
+    collapsed?: boolean;
     /**
      * 内容区域高度
     */

package/components/Box/Box.js

@@ -106,17 +106,22 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
     var rootRef = (0, react_1.useRef)(null);
     var contextRef = (0, react_1.useRef)(null);
     var selectRef = (0, react_1.useRef)(null);
+    var _b = __read((0, react_1.useState)(function () {
+        if (props.selectBar == null)
+            return true;
+        return props.selectBar.defaultCollapse || false;
+    }), 2), collapsed = _b[0], setCollapsed = _b[1];
     var mode = (0, react_1.useMemo)(function () {
         return props.mode || 'common';
     }, [props.mode]);
     var className = (0, react_1.useMemo)(function () {
-        var clazz = ['c-box'];
-        clazz.push('c-box-nobg');
-        clazz.push('c-box-' + mode);
+        var clazz = ['c-box', 'c-box-' + mode];
+        if (props.nobg)
+            clazz.push('c-box-nobg');
         if (props.className)
             clazz.push(props.className);
         return clazz.join(' ');
-    }, [props.className, props.nobg, mode]);
+    }, [mode, collapsed]);
     var style = (0, react_1.useMemo)(function () {
         var css = __assign({}, props.style);
         if (mode == 'inner') {
@@ -174,8 +179,13 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useEffect)(function () { setTimeout(resize, 120); }, [app === null || app === void 0 ? void 0 : app.theme.contentHeight]); // 1.5 版本：延时 120ms
     (0, react_1.useImperativeHandle)(ref, function () { return ({ resize: resize }); }, [mode]);
     (0, react_1.useLayoutEffect)(function () {
-        setTimeout(resize, 5);
+        setTimeout(resize, 10);
     }, []);
+    var maxWidth = (0, react_1.useMemo)(function () {
+        if (collapsed)
+            return undefined;
+        return "calc(100% - ".concat(props.selectBar.width || utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_WIDTH || 250, "px)");
+    }, [collapsed]);
     var SearchTool = (0, react_1.useMemo)(function () {
         var hasBar = lodash_1.default.has(props, 'searchBar'), 
         // hasBand = _.has(props, 'searchBand'),
@@ -228,8 +238,8 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
                     args[_a] = arguments[_a];
                 }
                 return setState({ selected: args });
-            } })),
-        react_1.default.createElement(Layout_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden' }, ref: function () {
+            }, onSelectCollapse: setCollapsed })),
+        react_1.default.createElement(Layout_1.Layout.Content, { style: { overflow: props.overflowAuto ? 'auto' : 'hidden', maxWidth: maxWidth }, ref: function () {
                 if (_layoutRef.current == null) {
                     var layout = document.getElementById(domId);
                     if (layout) {

package/components/Box/SelectBar.d.ts

@@ -56,10 +56,6 @@ type _BoxSelectBarProps = BaseItem & {
      * 初始为收起状态，默认不收起
     */
     defaultCollapse?: boolean;
-    /**
-     * 边栏状态变更触发
-    */
-    onSelectCollapse?: (boolean: any) => void;
     /**
      * 选择区映射，用于一些特殊场景
     */
@@ -94,5 +90,6 @@ type ExtendSelectProps = {
 export type SelectBarProps = _BoxSelectBarProps & ExtendSelectProps;
 export declare const SelectBar: React.ForwardRefExoticComponent<Omit<SelectBarProps, "onSelect"> & {
     onSelect: (key: Key, object?: PlainObject, ...args: any[]) => void;
+    onSelectCollapse: (boolean: any) => void;
 } & React.RefAttributes<any>>;
 export {};

package/components/Box/SelectBar.js

@@ -75,12 +75,9 @@ var Icon_1 = require("../_adapt/Icon");
 exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
     var _a = __read((0, react_1.useState)(null), 2), keyword = _a[0], setKeyword = _a[1];
     var _b = __read((0, hooks_1.useToggle)(props.defaultCollapse || false), 2), collapsed = _b[0], setCollapsed = _b[1];
-    // const setKeyword = _.debounce(_setKeyword, 100);
     var component = (0, _register_1.getSelectBar)(props.type);
     (0, react_1.useLayoutEffect)(function () {
-        if (lodash_1.default.isFunction(props.onSelectCollapse)) {
-            props.onSelectCollapse(collapsed);
-        }
+        props.onSelectCollapse(collapsed);
     }, [collapsed]);
     if (component == undefined) {
         console.warn('SelectBar Type is not registerd ', props.type);
@@ -88,7 +85,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
     }
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return utils_1.Const.NONE;
-    var width = lodash_1.default.isNumber(props.width) ? props.width : 250;
+    var width = lodash_1.default.isNumber(props.width) ? props.width : utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_WIDTH;
     var renderContent = function () {
         if (props.type == 'custom') {
             if (!lodash_1.default.has(props, 'content')) {
@@ -117,7 +114,7 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
         return react_1.default.createElement(antd_1.Popconfirm, { placement: "right", title: props.confirm, onConfirm: props.onClick },
             react_1.default.createElement(Icon_1.Icon, __assign({}, iconProps, { evt: true })));
     };
-    return react_1.default.createElement(antd_1.Layout.Sider, { className: 'c-selectbar-' + utils_1.GLOBAL.CONFIG.BOX.SELECT_CLOSE, collapsed: collapsed, collapsedWidth: utils_1.GLOBAL.CONFIG.BOX.SELECT_CLOSE == 2 ? 0 : 6, width: width },
+    return react_1.default.createElement(antd_1.Layout.Sider, { className: 'c-selectbar-' + utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_CLOSE, collapsed: collapsed, collapsedWidth: utils_1.GLOBAL.CONFIG.BOX.SELECTBAR_CLOSE == 1 ? 6 : 0, width: width },
         react_1.default.createElement("div", { className: 'c-selectbar-closed', onClick: setCollapsed, title: utils_1.i18n.txt(_i18n_1.V.TXT_EXPAND) }),
         react_1.default.createElement("div", { className: 'c-selectbar' },
             react_1.default.createElement("div", { className: 'c-selectbar-head' },

package/components/Lists/Grid/index.js

@@ -41,7 +41,6 @@ var GridList = function (props) {
     var grids = props.grids, dataSource = props.dataSource, loading = props.loading;
     var itemRender = (0, react_1.useMemo)(function () {
         if (grids.ratio) {
-            // console.log(grids.ratio)
         }
         return function (record, i) { return react_1.default.createElement(antd_1.List.Item, null, grids.itemRender(record, i)); };
     }, [grids]);

package/components/SearchTool/SearchBar/ActionButtons.js

@@ -73,16 +73,10 @@ var getIcon = function (icon) {
     return icon;
 };
 var ActionButton = function (props) {
+    var btnParam = lodash_1.default.pick(props, ['type', 'danger', 'disabled']);
     if (props.children && props.children.length > 0) {
-        var btnParam_1 = {};
-        if (lodash_1.default.has(props, 'type'))
-            btnParam_1.type = props.type;
-        if (props.danger)
-            btnParam_1.danger = true;
-        if (props.disabled)
-            btnParam_1.disabled = true;
         if (lodash_1.default.isFunction(props.onClick))
-            btnParam_1.onClick = function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); };
+            btnParam.onClick = function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); };
         var menus_1 = [];
         props.children.map(function (item, key) {
             if (item.roleCode && !utils_1.PageUtil.hasRole(item.roleCode))
@@ -104,20 +98,13 @@ var ActionButton = function (props) {
         if (menus_1.length == 0)
             return utils_1.Const.NONE;
         return react_1.default.createElement(Dropdown_1.Dropdown, { menu: { items: menus_1 } },
-            react_1.default.createElement(Button_1.Button, __assign({}, btnParam_1),
+            react_1.default.createElement(Button_1.Button, __assign({}, btnParam),
                 props.label,
                 " ",
                 react_1.default.createElement(Icon_1.Icon, { type: "down" })));
     }
-    var btnParam = {};
     if (props.icon)
         btnParam.icon = getIcon(props.icon);
-    if (lodash_1.default.has(props, 'type'))
-        btnParam.type = props.type;
-    if (props.disabled)
-        btnParam.disabled = true;
-    if (props.danger)
-        btnParam.danger = true;
     if (props.confirm && props.disabled !== true) {
         return react_1.default.createElement(Popconfirm_1.Popconfirm, { key: Math.floor(lodash_1.default.random() * 1000000) + '', trigger: "click", placement: "bottomLeft", onConfirm: props.onClick, title: lodash_1.default.isString(props.confirm) ? props.confirm : props.confirm() },
             react_1.default.createElement(Button_1.Button, __assign({}, props.config, btnParam), props.label));

package/components/SearchTool/SearchBar/ByKeyword.js

@@ -75,7 +75,7 @@ var SearchBarByKeyword = function (props) {
         var searchProps = {
             className: "c-searchbar-keyword",
             placeholder: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_KEYWORD),
-            allowClear: true,
+            allowClear: false,
         };
         if (props.keyword !== true) {
             if (props.keyword.placeholder) {

package/components/Tables/Components/ActionBar.js

@@ -125,39 +125,3 @@ exports.BUTTON_IMPORT = BUTTON_IMPORT;
 */
 var BUTTON_EXPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.BTN_EXPORT), icon: 'export' }, props), { onClick: onClick })); };
 exports.BUTTON_EXPORT = BUTTON_EXPORT;
-// import { useLayoutEffect } from 'react';
-// import { useUpdate } from '../../../hooks'
-// type TableActionBar = {
-//     buttons: (TableActionButton | null | false)[],
-//     queryParam: PlainObject
-//     selectedRef: MutableRefObject<any>
-// }
-// export const ActionBar: FC<TableActionBar> = props => {
-//     const update = useUpdate();
-//     useLayoutEffect(() => {
-//         props.selectedRef.current.onSelected = () => {
-//             update();
-//         }
-//     }, [])
-//     const [selectedRowKeys, selectedObjects] = props.selectedRef.current.selected;
-//     const buttons = useMemo(() => {
-//         const btns = [];
-//         (props.buttons || []).map(btn => {
-//             if (btn === false) return;
-//             if (btn === null) {
-//                 btns.push(null);
-//                 return;
-//             }
-//             let sub = convertButton(btn, selectedRowKeys, selectedObjects, props.queryParam);
-//             if (_.isArray(btn.children) && btn.children.length > 0) {
-//                 sub.children = [];
-//                 btn.children.map(item => {
-//                     sub.children.push(convertButton(item, selectedRowKeys, selectedObjects, props.queryParam))
-//                 })
-//             }
-//             btns.push(sub);
-//         });
-//         return btns;
-//     }, [selectedRowKeys, props.buttons, props.queryParam])
-//     return <ActionButtons buttons={buttons} />
-// }

package/components/Tables/Components/useTableContext.js

@@ -108,7 +108,6 @@ var TableContextWrapper = function (props) {
         var toRemove = new Set(diff);
         return __assign(__assign({}, prev), { selectedRowKeys: prev.selectedRowKeys.filter(function (key) { return !toRemove.has(key); }), selectedObjects: prev.selectedObjects.filter(function (item) { return !toRemove.has(item[rowKey]); }) });
     }); }, []);
-    // console.log(state)
     return react_1.default.createElement(TableContext.Provider, { value: __assign(__assign({}, state), { setParam: setParam, setSelection: setSelection, initObjects: initObjects, reflushPage: reflushPage }) }, props.children);
 };
 exports.TableContextWrapper = TableContextWrapper;

package/components/Tables/Util.d.ts

@@ -1,7 +1,7 @@
 import type { MutableRefObject } from 'react';
 import type { BaseTableProps } from './index';
-import type { ColumnProps as ColumnsType } from 'antd/es/table/interface';
+import type { ColumnProps as ColumnType } from 'antd/es/table/interface';
 export declare const convertColumns: (props: BaseTableProps, rank: {
     ref: MutableRefObject<number>;
     isRank?: boolean;
-}) => Array<ColumnsType<any>>;
+}) => Array<ColumnType<any>>;

package/components/Tables/VTable.js

@@ -240,7 +240,6 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
 var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
     var _a = props.model, isQuerying = _a.isQuerying, pageNo = _a.pageNo, pageSize = _a.pageSize, total = _a.total, totalAcc = _a.totalAcc, pageTo = _a.pageTo, query = _a.query, cost = _a.cost;
     var _b = (0, useTableContext_1.useTableContext)(), selectedRowKeys = _b.selectedRowKeys, selectedObjects = _b.selectedObjects, param = _b.param, setSelection = _b.setSelection, setParam = _b.setParam;
-    // console.log(selectedRowKeys)
     (0, react_1.useImperativeHandle)(ref, function () {
         return {
             clearSelected: function () { return setSelection([], []); },
@@ -261,7 +260,9 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
             }
         }
         if (props.searchBar) {
-            boxProps.searchBar = __assign(__assign({}, props.searchBar), { disabled: isQuerying, onSearch: function (data) {
+            boxProps.searchBar = __assign(__assign({}, props.searchBar), { 
+                // disabled: isQuerying,
+                onSearch: function (data) {
                     var queryParam = lodash_1.default.extend({}, props.model.param, data);
                     query(queryParam, true);
                     setParam(queryParam, utils_1.GLOBAL.CONFIG.TABLE.UNSELECT_ON_QUERY);
@@ -283,6 +284,7 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
         // props.searchBand,
         props.actionBar,
         props.selectBar,
+        // isQuerying
         // props.className,
         // props.style,
         // props.mode

package/components/Trees/ActionTree.js

@@ -193,7 +193,11 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
             var treeData = treeState.treeData;
             var node = lodash_1.default.get(treeData, nodePath);
             if (node == null) {
-                // message.error('No parent found')
+                if (props.canAddRoot != true) {
+                    // message.error('No parent found')
+                    return;
+                }
+                addRoot(data, { pos: INSER_POS.AFTER, position: [] });
                 return;
             }
             add(data, { pos: INSER_POS.INNER, node: node, position: position });

package/components/Trees/BaseTree.js

@@ -117,7 +117,7 @@ var BaseTree = function (props) {
         langs: null,
         folderChecker: null,
     };
-    if (props.rootCode)
+    if (lodash_1.default.has(props, 'rootCode'))
         DEFAULT.rootCode = props.rootCode;
     if (props.keyField)
         DEFAULT.keyField = props.keyField;

package/components/Trees/STree.js

@@ -119,7 +119,7 @@ var _Stree = function (props) {
         // 如果根节点只有一个，则自动展开这个根结点
         treeProps.defaultExpandedKeys = [treeState.treeData[0][treeState.keyField]];
     }
-    return react_1.default.createElement(antd_1.Tree, __assign({}, baseProps, treeProps, { disabled: props.disabled, selectedKeys: treeState.selectedKeys, onSelect: onSelect }), renderRoot(props, treeState));
+    return react_1.default.createElement(antd_1.Tree, __assign({}, baseProps, treeProps, { showLine: true, disabled: props.disabled, selectedKeys: treeState.selectedKeys, onSelect: onSelect }), renderRoot(props, treeState));
 };
 var renderNode = function (node, position, state, search, disabledNode, folderChecker) {
     if (search.keyword && !search.match.has(position.join('-')))

package/components/UForm/FormWrapper.js

@@ -71,6 +71,7 @@ var LAYOUTS = {
     compress: [1080, 3, 9],
 };
 var COLS_SPLIT = 8;
+// const FONT_SIZE = 12;
 var getDefault = function (props) {
     var _a, _b;
     var isGroup = lodash_1.default.has(props.fields[0], 'fields');
@@ -88,6 +89,8 @@ var getDefault = function (props) {
         }
         _b = __read((col > COLS_SPLIT) ? LAYOUTS.common : LAYOUTS.simple, 3), width = _b[0], cols = _b[1], colMax = _b[2];
     }
+    if (lodash_1.default.isNumber(props.width))
+        width = props.width;
     return [isGroup, width, cols, colMax];
 };
 exports.getDefault = getDefault;
@@ -135,6 +138,8 @@ var getFormLayout = function (props, root) {
     return [isGroup, cols, width, colMax, isInfo, isEdit, isAdd];
 };
 var getMaxTitleWidth = function (field) {
+    if (field.dataType == 'NONE')
+        return 0;
     if (field.type && (0, _register_1.getUFormInput)(field.type).breakTitle)
         return 0;
     var title = null;

package/components/UForm/UFormModal.js

@@ -93,7 +93,7 @@ var UForm_1 = require("./UForm");
 var utils_1 = require("../../utils");
 var _i18n_1 = require("../_i18n");
 var FormWrapper_1 = require("./FormWrapper");
-var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size'];
+var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'size', 'width'];
 var UFormModal = function (props) {
     var ref = (0, react_1.useRef)(null);
     var modalProps = {
@@ -208,7 +208,7 @@ var UFormModal = function (props) {
             });
         }
     }
-    return react_1.default.createElement(Modal_1.Modal, __assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: function () { return props.onCancel(); } }, modalProps),
+    return react_1.default.createElement(Modal_1.Modal, __assign({ maskClosable: utils_1.GLOBAL.CONFIG.FORM.maskClosable, destroyOnClose: true, width: props.width }, lodash_1.default.omit(props, FORM_FIELDS), { className: utils_1.StringUtil.className(['u-form-modal'], props.className), onCancel: function () { return props.onCancel(); } }, modalProps),
         react_1.default.createElement(UForm_1.UForm, __assign({}, lodash_1.default.pick(props, FORM_FIELDS), { ref: ref })));
 };
 exports.UFormModal = UFormModal;

package/components/UForm/_FieldType.js

@@ -74,6 +74,7 @@ exports._FieldType = [
     'radio',
     'radio-button',
     'radio-with-more',
+    // 'segmented',   仅2.0
     'checkbox',
     'checkbox-with-all',
     'icon',
@@ -115,6 +116,6 @@ exports._FieldType = [
     'role',
     'roles',
     // CEMS 专用
-    // 'cems-org',	// org 为2.0 专属
+    // 'cems-org',	// cems-org 为2.0 专属
     'cems-org-button',
 ];

package/components/UForm/index.d.ts

@@ -312,7 +312,7 @@ export type UFromAction = ButtonProps & {
  * 新版本 ModalProps 只支持 open 且必传，
  * 不使用 deprecated 属性
 */
-export type UModalProps = UFromProps & Omit<ModalProps, 'children'> & {
+export type UModalProps = UFromProps & Omit<ModalProps, 'children' | 'width'> & {
     /**
      * open 为必填项，不使用废弃的 visable 属性
     */

package/package.json

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

package/utils/Global.d.ts

@@ -122,7 +122,12 @@ export type GlobalSetting = {
         TIME_FORMAT: string;
     };
     BOX: {
+        /**
+         * @deprecated
+        */
         SELECT_CLOSE: 1 | 2;
+        SELECTBAR_CLOSE: 1 | 2;
+        SELECTBAR_WIDTH: number;
     };
     /**
      * 通用上传服务，默认为微服务版的配置，单机版需要在 portal 里面定制一下

package/utils/Global.js

@@ -59,7 +59,7 @@ var DEFAULT = {
     RESULT: { code: 'code', message: 'message', success: '0' },
     VLIST: { list: 'list', total: 'total', totalAcc: 'totalAcc', start: 'start_', count: 'count_', order: 'order_', by: 'by_' },
     VDATA: { data: 'data' },
-    BOX: { SELECT_CLOSE: 2 },
+    BOX: { SELECT_CLOSE: 2, SELECTBAR_CLOSE: 2, SELECTBAR_WIDTH: 250 },
     AJAX: {
         timeout: 30000,
         beforeSend: null,