vap1 0.2.5 → 0.2.7

package/components/Box/Box.js

@@ -160,10 +160,6 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useLayoutEffect)(function () {
         setTimeout(resize, 5);
     }, []);
-    var paginationProps = {};
-    // if (props.pagination && props.mode == 'inner') {
-    //     paginationProps.hideOnSinglePage = true;
-    // }
     return react_1.default.createElement(Layout_1.Layout, { id: domId, 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, __assign({}, props.selectBar, { ref: selectRef, onSelect: function () {
                 var args = [];
@@ -195,5 +191,5 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
                 } }), props.actionBar ? (lodash_1.default.isArray(props.actionBar) ? react_1.default.createElement(SearchBar_1.SearchBar.ActionButtons, { buttons: props.actionBar }) : props.actionBar) : []),
             react_1.default.createElement(BoxContext.Provider, { value: { state: state, resize: resize, root: contextRef, selectRef: selectRef } },
                 react_1.default.createElement("div", { className: 'ubox-content', ref: contextRef }, state != null && props.children)),
-            props.pagination && react_1.default.createElement(Upagination_1.UPagination, __assign({}, paginationProps, props.pagination, { className: HEIGHT_OMIT }))));
+            props.pagination && react_1.default.createElement(Upagination_1.UPagination, __assign({}, props.pagination, { className: HEIGHT_OMIT }))));
 });

package/components/Box/SelectBar.js

@@ -60,7 +60,7 @@ var antd_1 = require("antd");
 var hooks_1 = require("../../hooks");
 var utils_1 = require("../../utils");
 var _register_1 = require("./_register");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 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];
@@ -108,11 +108,11 @@ exports.SelectBar = (0, react_1.forwardRef)(function (props, ref) {
             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 },
-        react_1.default.createElement("div", { className: 'c-selectbar-closed', onClick: setCollapsed, title: utils_1.i18n.txt(Const_1.V.TXT_EXPAND) }),
+        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' },
                 react_1.default.createElement("div", { className: 'c-selectbar-title' },
-                    react_1.default.createElement(Icon_1.Icon, { type: "left-circle", title: utils_1.i18n.txt(Const_1.V.TXT_COLLAPSE), onClick: setCollapsed }),
+                    react_1.default.createElement(Icon_1.Icon, { type: "left-circle", title: utils_1.i18n.txt(_i18n_1.V.TXT_COLLAPSE), onClick: setCollapsed }),
                     props.filter && react_1.default.createElement("input", { onChange: function (evt) { return utils_1.PageUtil.stopEvent(evt, function () { return setKeyword(evt.target.value); }); }, value: keyword, placeholder: utils_1.i18n.getText(props.ik, props.title) }),
                     !props.filter && react_1.default.createElement("span", null, title)),
                 react_1.default.createElement("div", { className: 'c-selectbar-action' }, (props.actions || []).map(function (item) { return react_1.default.createElement(SearchAction, __assign({}, item)); }))),

package/components/SearchBar/ByField.d.ts

@@ -1,3 +1,22 @@
 import React from 'react';
 import type { SearchBarByFieldProps } from './index';
+/**
+ * 仅内容使用
+*/
+type InnerSearchBarByFieldProps = SearchBarByFieldProps & {
+    /**
+     * 强制展开
+    */
+    __innerExpand?: boolean;
+    /**
+     * 强制外展示
+    */
+    __innerOutside?: boolean;
+    /**
+     * 是否在Keyword中弹出
+    */
+    __innnerPopup?: boolean;
+};
+export declare const InnerSearchBarByField: React.FC<InnerSearchBarByFieldProps>;
 export declare const SearchBarByField: React.FC<SearchBarByFieldProps>;
+export {};

package/components/SearchBar/ByField.js

@@ -53,35 +53,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SearchBarByField = void 0;
+exports.SearchBarByField = exports.InnerSearchBarByField = void 0;
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var antd_1 = require("antd");
 var Button_1 = require("../_adapt/Button");
 var Popover_1 = require("../_adapt/Popover");
-// import { Icon, } from '../_adapt/Icon';
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var SearchField_1 = require("./SearchField");
 var _register_1 = require("./_register");
-var txt = utils_1.i18n.txt;
-var SearchBarByField = function (props) {
-    // @ts-ignore
+var InnerSearchBarByField = function (props) {
     var isAwaysExpand = utils_1.GLOBAL.CONFIG.SEARCHBAR.AWAYS_EXPAND || props.__innerExpand;
     var _a = __read((0, react_1.useState)(props.default || {}), 2), data = _a[0], setData = _a[1];
     var _b = __read((0, react_1.useState)(isAwaysExpand), 2), isExpand = _b[0], _setIsExpand = _b[1];
-    var _c = __read((0, react_1.useState)(null), 2), layout = _c[0], setLayout = _c[1];
-    // const warpData = (data) => {
-    //     let result: any = {};
-    //     _.keys(data).map(key => {
-    //         if (data[key] === null || data[key] === undefined) {
-    //             result[key] = ''
-    //         } else {
-    //             result[key] = data[key];
-    //         }
-    //     })
-    //     return result;
-    // }
     var clear = function () { return setData(function (prev) {
         var data = {};
         lodash_1.default.keys(prev).map(function (item) {
@@ -98,105 +83,108 @@ var SearchBarByField = function (props) {
             setTimeout(function () { return props.onExpand(isExpand); }, 3);
         }
     };
-    (0, react_1.useLayoutEffect)(function () {
-        var layout = {
-            rows: [],
-            cols: 3,
-            minWidth: 0,
-            // @ts-ignore
-            isOutSide: utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_AWAYS_OUTSIDE || props.__innerOutside,
-            labelWidth: 0,
-            inputWidth: 0,
-        };
-        if (props.fields == undefined || props.fields.length == 0) {
-            setLayout(layout);
-            return;
+    // 说明，默认以 3 列展示，弹框展示时，超过6个字段默认两列，小于6个字段默认1列
+    var cols = (0, react_1.useMemo)(function () {
+        if (props.cols)
+            return props.cols;
+        if (props.fields == undefined || !lodash_1.default.isArray(props.fields) || props.fields.length == 0)
+            return 3;
+        if (props.__innnerPopup) {
+            if (props.fields.length < 6)
+                return 1;
+            return 2;
         }
         ;
-        if (lodash_1.default.has(props, 'cols'))
-            layout.cols = props.cols;
-        layout.rows.push([]);
+        return 3;
+    }, [props.fields]);
+    var layout = (0, react_1.useMemo)(function () {
+        if (props.fields == undefined || !lodash_1.default.isArray(props.fields) || props.fields.length == 0)
+            return null;
+        var rows = [];
+        var isOutSide = utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_AWAYS_OUTSIDE || props.__innerOutside;
+        rows.push([]); // 日前已使用
         var rowUse = 0;
         props.fields.map(function (field) {
             if (field.roleCode && !utils_1.PageUtil.hasRole(field.roleCode))
                 return;
             var SearchField = (0, _register_1.getSearchField)(field.type);
             if (SearchField.outside)
-                layout.isOutSide = true;
-            field.span = field.span || SearchField.defaultSpan || 1;
+                isOutSide = true;
+            if (field.span) {
+                if (field.span > cols)
+                    field.span = cols;
+            }
+            else {
+                field.span = SearchField.defaultSpan || 1;
+            }
             var tryfill = rowUse + field.span;
-            if (tryfill > layout.cols) {
-                layout.rows.push([{ field: field, SearchField: SearchField.component }]);
+            if (tryfill > cols) {
+                rows.push([{ field: field, SearchField: SearchField.component }]);
                 rowUse = field.span;
             }
             else {
-                layout.rows[layout.rows.length - 1].push({ field: field, SearchField: SearchField.component });
+                rows[rows.length - 1].push({ field: field, SearchField: SearchField.component });
                 rowUse += field.span;
             }
         });
-        if (layout.isOutSide) {
-            if (lodash_1.default.isArray(props.fieldWidth)) {
-                layout.labelWidth = props.fieldWidth[0];
-                layout.inputWidth = props.fieldWidth[1];
-            }
-            else {
-                layout.labelWidth = utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_LABEL_WIDTH;
-                layout.inputWidth = utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_IPNUT_WIDTH;
-            }
-        }
-        else if (lodash_1.default.has(props, 'fieldWidth')) {
-            if (lodash_1.default.isNumber(props.fieldWidth)) {
-                layout.inputWidth = props.fieldWidth;
-            }
-            else {
-                layout.inputWidth = props.fieldWidth[0] + props.fieldWidth[1];
+        return { rows: rows, isOutSide: isOutSide };
+    }, [props.fields]);
+    var _c = __read((0, react_1.useMemo)(function () {
+        if (layout == null)
+            return [0, 0];
+        // 标签在内模式(placehoder表现)
+        if (!layout.isOutSide) {
+            if (lodash_1.default.has(props, 'fieldWidth')) {
+                if (lodash_1.default.isNumber(props.fieldWidth)) {
+                    return [0, props.fieldWidth];
+                }
+                else {
+                    return [0, props.fieldWidth[0] + props.fieldWidth[1]];
+                }
             }
+            return [0, utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_INSIDE_WIDTH];
         }
-        else {
-            layout.inputWidth = utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_INSIDE_WIDTH;
+        if (props.fieldWidth && lodash_1.default.isArray(props.fieldWidth))
+            return props.fieldWidth;
+        // 标签在外模式(label表现)
+        if (props.__innnerPopup) {
+            return [utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_LABEL_WIDTH_POP, utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_IPNUT_WIDTH_POP];
         }
-        layout.minWidth = layout.rows[0].length * (layout.labelWidth + layout.inputWidth) + 90;
-        setLayout(layout);
-    }, [props.fields]);
-    var rowRender = (0, react_1.useCallback)(function (rows, layout) { return rows.map(function (item) {
+        return [utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_LABEL_WIDTH, utils_1.GLOBAL.CONFIG.SEARCHBAR.FIELD_IPNUT_WIDTH];
+    }, [layout]), 2), labelWidth = _c[0], inputWidth = _c[1];
+    var rowRender = (0, react_1.useCallback)(function (rows) { return rows.map(function (item) {
         var field = __assign({}, item.field);
         var txt;
         txt = (item.field.ik && utils_1.i18n.hasKey(item.field.ik)) ? utils_1.i18n.txt(item.field.ik) : item.field.label;
         field.label = txt;
         if (!lodash_1.default.has(field, 'placeholder')) {
-            var key = lodash_1.default.isArray(item.field.options) ? Const_1.V.INPUT_SELECT : Const_1.V.INPUT_TEXT;
+            var key = lodash_1.default.isArray(item.field.options) ? _i18n_1.V.INPUT_SELECT : _i18n_1.V.INPUT_TEXT;
             field.placeholder = utils_1.i18n.txt(key) + txt;
         }
         var SearchInput = layout.isOutSide ? SearchField_1.InputOutSide : SearchField_1.InputInSide;
-        return react_1.default.createElement(SearchInput, { key: item.field.field, disabled: props.disabled, labelWidth: layout.labelWidth, inputWidth: layout.inputWidth, field: field, SearchField: item.SearchField, onChange: function (value) {
+        return react_1.default.createElement(SearchInput, { key: item.field.field, disabled: props.disabled, labelWidth: labelWidth, inputWidth: inputWidth, field: field, SearchField: item.SearchField, onChange: function (value) { return setData(function (prev) {
                 var _a, _b;
                 var formData;
                 if (lodash_1.default.isObject(value)) {
-                    formData = __assign(__assign({}, data), value);
+                    formData = __assign(__assign({}, prev), value);
                 }
                 else if (lodash_1.default.isString(value)) {
                     // let val = _.trim(value);
                     // if (val.length == 0) {
                     //     formData = _.omit(data, item.field.field);
                     // } else {
-                    formData = __assign(__assign({}, data), (_a = {}, _a[item.field.field] = value, _a));
+                    formData = __assign(__assign({}, prev), (_a = {}, _a[item.field.field] = value, _a));
                     // }
                 }
                 else {
-                    formData = __assign(__assign({}, data), (_b = {}, _b[item.field.field] = value, _b));
+                    formData = __assign(__assign({}, prev), (_b = {}, _b[item.field.field] = value, _b));
                 }
-                // _.keys(formData).map(key => {
-                //     if (formData[key] === null || formData[key] === undefined) {
-                //         // _.unset(formData, key)
-                //         // formData[key] = undefined;
-                //     }
-                // })
-                setData(formData);
                 if (lodash_1.default.isFunction(props.onChange)) {
                     props.onChange(formData);
                 }
-            }, triggerSearch: function () { return props.onSearch(data); }, data: data });
-    }); }, [data]);
+                return formData;
+            }); }, triggerSearch: function () { return props.onSearch(data); }, data: data });
+    }); }, [data, layout]);
     var btnRender = function (rowSize, isExpand) {
         if (props.hideAction || isExpand || isAwaysExpand)
             return utils_1.Const.NONE;
@@ -207,21 +195,44 @@ var SearchBarByField = function (props) {
             rowSize > 1 && utils_1.GLOBAL.CONFIG.SEARCHBAR.USE_MODAL && react_1.default.createElement(Popover_1.Popover, { content: "更多条件" },
                 react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'filter' })));
     };
+    var _d = __read((0, react_1.useMemo)(function () {
+        if (layout == null)
+            return ['', {}];
+        var clazz = ['c-searchbar-btns'];
+        var style = { marginLeft: layout.isOutSide ? labelWidth : 0 };
+        if (props.__innnerPopup) {
+            clazz.push('c-searchbar-btns-' + utils_1.GLOBAL.CONFIG.SEARCHBAR.POPUP_BUTTONS_POSITION);
+            if (utils_1.GLOBAL.CONFIG.SEARCHBAR.POPUP_BUTTONS_POSITION != 'left') {
+                lodash_1.default.unset(style, 'marginLeft');
+            }
+        }
+        return [clazz.join(' '), style];
+    }, [layout.isOutSide]), 2), btnsClass = _d[0], fristBtnStyle = _d[1];
     var moreRender = function (layout) { return [
-        lodash_1.default.tail(layout.rows).map(function (row) { return layout.isOutSide ? react_1.default.createElement("div", { className: 'c-searchbar-outgroup' }, rowRender(row, layout)) : react_1.default.createElement(antd_1.Input.Group, { compact: true }, rowRender(row, layout)); }),
-        props.hideAction ? utils_1.Const.NONE : react_1.default.createElement("div", { className: 'c-searchbar-btns' },
-            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, style: { marginLeft: layout.isOutSide ? layout.labelWidth : 0 }, icon: 'search', type: "primary", onClick: function (e) { return utils_1.PageUtil.stopEvent(e, search); } }, txt(Const_1.V.BTN_SEARCH)),
-            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'redo', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, clear); } }, txt(Const_1.V.BTN_RESET)),
-            !isAwaysExpand && react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'filter', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, function () { return setIsExpand(false); }); } }, txt(Const_1.V.BTN_LESS)))
+        lodash_1.default.tail(layout.rows).map(function (row) { return layout.isOutSide ? react_1.default.createElement("div", { className: 'c-searchbar-outgroup' }, rowRender(row)) : react_1.default.createElement(antd_1.Input.Group, { compact: true }, rowRender(row)); }),
+        props.hideAction ? utils_1.Const.NONE : react_1.default.createElement("div", { className: btnsClass },
+            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, style: fristBtnStyle, icon: 'search', type: "primary", onClick: function (e) { return utils_1.PageUtil.stopEvent(e, search); } }, utils_1.i18n.txt(_i18n_1.V.BTN_SEARCH)),
+            react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'redo', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, clear); } }, utils_1.i18n.txt(_i18n_1.V.BTN_RESET)),
+            !isAwaysExpand && react_1.default.createElement(Button_1.Button, { disabled: props.disabled, icon: 'filter', onClick: function (e) { return utils_1.PageUtil.stopEvent(e, function () { return setIsExpand(false); }); } }, utils_1.i18n.txt(_i18n_1.V.BTN_LESS)))
     ]; };
+    var fieldsStyle = (0, react_1.useMemo)(function () {
+        if (layout == null)
+            return {};
+        var width = cols * (labelWidth + inputWidth);
+        if (props.__innnerPopup)
+            return { width: width + 12 };
+        return { minWidth: width + 90 };
+    }, [layout.rows]);
     if (layout == null)
         return react_1.default.createElement("div", { className: 'c-searchbar-fields' });
-    return react_1.default.createElement("div", { className: 'c-searchbar-fields', style: { minWidth: layout.minWidth } }, layout.rows.length && react_1.default.createElement(react_1.default.Fragment, null,
+    return react_1.default.createElement("div", { className: 'c-searchbar-fields', style: fieldsStyle }, layout.rows.length && react_1.default.createElement(react_1.default.Fragment, null,
         layout.isOutSide ? react_1.default.createElement("div", { className: "c-searchbar-outgroup c-searchbar-fixgroup" },
-            rowRender(layout.rows[0], layout),
+            rowRender(layout.rows[0]),
             btnRender(layout.rows.length, isExpand)) : react_1.default.createElement(antd_1.Input.Group, { compact: true, className: "c-searchbar-fixgroup" },
-            rowRender(layout.rows[0], layout),
+            rowRender(layout.rows[0]),
             btnRender(layout.rows.length, isExpand)),
         isExpand && moreRender(layout)));
 };
+exports.InnerSearchBarByField = InnerSearchBarByField;
+var SearchBarByField = function (props) { return react_1.default.createElement(exports.InnerSearchBarByField, __assign({}, props)); };
 exports.SearchBarByField = SearchBarByField;

package/components/SearchBar/ByKeyword.js

@@ -56,32 +56,34 @@ var antd_1 = require("antd");
 var Popover_1 = require("../_adapt/Popover");
 var ByField_1 = require("./ByField");
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var SearchBarByKeyword = function (props) {
     var _a = __read((0, react_1.useState)(false), 2), open = _a[0], setOpen = _a[1];
     var spanRef = (0, react_1.useRef)(null);
-    var inputProps = {
-        className: "c-searchbar-keyword",
-        placeholder: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_KEYWORD),
-        allowClear: true,
-    };
-    if (props.keyword !== true) {
-        if (props.keyword.placeholder) {
-            inputProps.placeholder = props.keyword.placeholder;
+    var inputProps = (0, react_1.useMemo)(function () {
+        var searchProps = {
+            className: "c-searchbar-keyword",
+            placeholder: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_KEYWORD),
+            allowClear: true,
+        };
+        if (props.keyword !== true) {
+            if (props.keyword.placeholder) {
+                searchProps.placeholder = props.keyword.placeholder;
+            }
         }
-    }
+        return searchProps;
+    }, []);
+    var suffixProps = {};
     if (props.fields && props.fields.length) {
-        inputProps.suffix = react_1.default.createElement(react_1.default.Fragment, null,
-            react_1.default.createElement("span", { ref: spanRef, onClick: function () { return setOpen(true); }, style: { pointerEvents: props.disabled ? 'none' : 'unset' }, className: 'vicon vicon-menu', title: utils_1.i18n.txt(Const_1.V.INPUT_SEARCH_ADVANCE) }, "\u00A0"),
+        suffixProps.suffix = react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement("span", { ref: spanRef, onClick: function () { return setOpen(true); }, style: { pointerEvents: props.disabled ? 'none' : 'unset' }, className: 'vicon vicon-menu', title: utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_ADVANCE) }, "\u00A0"),
             react_1.default.createElement(Popover_1.Popover, { open: open, onOpenChange: setOpen, 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("h3", null, utils_1.i18n.txt(_i18n_1.V.INPUT_SEARCH_ADVANCE)),
                     react_1.default.createElement("div", { className: 'c-searchbar' },
-                        react_1.default.createElement(ByField_1.SearchBarByField, __assign({}, props, { onSearch: function (param) {
+                        react_1.default.createElement(ByField_1.InnerSearchBarByField, __assign({}, props, { __innerExpand: true, __innerOutside: true, __innnerPopup: true, onSearch: function (param) {
                                 props.onSearch(param);
                                 setOpen(false);
-                            }, 
-                            // @ts-ignore
-                            __innerExpand: true, __innerOutside: true })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: function () {
+                            } })))), overlayClassName: 'c-searchbar-keyword-more', getPopupContainer: function () {
                     var maskEls = document.getElementsByClassName('ant-modal-mask');
                     var hasMask = false;
                     for (var i = 0, _i = maskEls.length; i < _i; i++) {
@@ -95,6 +97,6 @@ var SearchBarByKeyword = function (props) {
                     return spanRef.current.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
                 } }));
     }
-    return react_1.default.createElement(antd_1.Input.Search, __assign({}, inputProps, { onSearch: function (keyword) { return props.onSearch({ keyword_: keyword }); }, enterButton: utils_1.i18n.txt(Const_1.V.BTN_SEARCH) }));
+    return react_1.default.createElement(antd_1.Input.Search, __assign({}, inputProps, suffixProps, { onSearch: function (keyword) { return props.onSearch({ keyword_: keyword }); }, enterButton: utils_1.i18n.txt(_i18n_1.V.BTN_SEARCH) }));
 };
 exports.SearchBarByKeyword = SearchBarByKeyword;

package/components/SearchBar/index.d.ts

@@ -64,10 +64,8 @@ export type Field = BaseItem & {
     config?: any;
 };
 /**
- *
- * 说明，内部两个属性，暂不开放，如需使用，自行处理编译问题
- * __innerExpand
- * __innerOutside
+ * 当没有指定 keyword时，SearchBar的配置参数
+ * 指字 keyword 时，将出以弹出方式展示
 */
 export type SearchBarByFieldProps = {
     /**

package/components/Tables/Components/ActionBar.js

@@ -57,7 +57,7 @@ exports.BUTTON_EXPORT = exports.BUTTON_IMPORT = exports.BUTTON_MORE = exports.BU
 var react_1 = __importStar(require("react"));
 var lodash_1 = __importDefault(require("lodash"));
 var ActionButtons_1 = require("../../SearchBar/ActionButtons");
-var Const_1 = require("../../_setup/Const");
+var _i18n_1 = require("../../_i18n");
 var i18n_1 = require("../../../utils/i18n");
 var hooks_1 = require("../../../hooks");
 var convertButton = function (item, selectedRowKeys, selectedObjects, queryParam) {
@@ -102,18 +102,18 @@ exports.ActionBar = ActionBar;
 /**
  * 通用添加按钮
 */
-var BUTTON_ADD = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.ACT_ADD), icon: 'plus', type: 'primary' }, props), { onClick: onClick })); };
+var BUTTON_ADD = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.ACT_ADD), icon: 'plus', type: 'primary' }, props), { onClick: onClick })); };
 exports.BUTTON_ADD = BUTTON_ADD;
 /**
  * 通用删除按钮
 */
-var BUTTON_DELETE = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.ACT_DELETE), icon: 'delete', danger: true, mustSelected: true, confirm: (0, i18n_1.txt)(Const_1.V.ACT_DELETE_BATCH) }, props), { onClick: onClick })); };
+var BUTTON_DELETE = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.ACT_DELETE), icon: 'delete', danger: true, mustSelected: true, confirm: (0, i18n_1.txt)(_i18n_1.V.ACT_DELETE_BATCH) }, props), { onClick: onClick })); };
 exports.BUTTON_DELETE = BUTTON_DELETE;
 /**
  * 通用更多按钮，需要传子菜单
 */
 var BUTTON_MORE = function (children) { return ({
-    label: (0, i18n_1.txt)(Const_1.V.BTN_MORE),
+    label: (0, i18n_1.txt)(_i18n_1.V.BTN_MORE),
     onClick: null,
     children: children
 }); };
@@ -121,10 +121,10 @@ exports.BUTTON_MORE = BUTTON_MORE;
 /**
  * 通用导入按钮
 */
-var BUTTON_IMPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.BTN_IMPORT), icon: 'import' }, props), { onClick: onClick })); };
+var BUTTON_IMPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(_i18n_1.V.BTN_IMPORT), icon: 'import' }, props), { onClick: onClick })); };
 exports.BUTTON_IMPORT = BUTTON_IMPORT;
 /**
  * 通用导出按钮
 */
-var BUTTON_EXPORT = function (onClick, props) { return (__assign(__assign({ label: (0, i18n_1.txt)(Const_1.V.BTN_EXPORT), icon: 'export' }, props), { onClick: onClick })); };
+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;

package/components/Tables/Components/Actions.js

@@ -20,7 +20,7 @@ var lodash_1 = __importDefault(require("lodash"));
 var Popconfirm_1 = require("../../_adapt/Popconfirm");
 var Icon_1 = require("../../_adapt/Icon");
 var utils_1 = require("../../../utils");
-var Const_1 = require("../../_setup/Const");
+var _i18n_1 = require("../../_i18n");
 var DEFAULT_CLASS = {
     INFO: 'c-oper-info',
     EDIT: 'c-oper-edit',
@@ -29,7 +29,7 @@ var DEFAULT_CLASS = {
 var INFO = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.BTN_INFO);
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.BTN_INFO);
     return react_1.default.createElement("span", { className: DEFAULT_CLASS.INFO, onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); }, title: "".concat(title, " ").concat(props.name || '') },
         react_1.default.createElement(Icon_1.Icon, { type: 'search' }),
         react_1.default.createElement("span", null, title));
@@ -38,7 +38,7 @@ exports.INFO = INFO;
 var EDIT = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_UPDATE);
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.ACT_UPDATE);
     return react_1.default.createElement("span", { className: DEFAULT_CLASS.EDIT, onClick: function (evt) { return utils_1.PageUtil.stopEvent(evt, props.onClick); }, title: "".concat(title, " ").concat(props.name || '') },
         react_1.default.createElement(Icon_1.Icon, { type: 'edit' }),
         react_1.default.createElement("span", null, title));
@@ -47,8 +47,8 @@ exports.EDIT = EDIT;
 var DELETE = function (props) {
     if (props.roleCode && !utils_1.PageUtil.hasRole(props.roleCode))
         return react_1.default.createElement(react_1.default.Fragment, null);
-    var title = utils_1.i18n.getText(props.ik, props.title, Const_1.V.ACT_DELETE);
-    var popTitle = utils_1.i18n.txt(Const_1.V.ACT_DELETE_CONFIRM, props.name || '');
+    var title = utils_1.i18n.getText(props.ik, props.title, _i18n_1.V.ACT_DELETE);
+    var popTitle = utils_1.i18n.txt(_i18n_1.V.ACT_DELETE_CONFIRM, props.name || '');
     return react_1.default.createElement(Popconfirm_1.Popconfirm, { onConfirm: function (e) { return utils_1.PageUtil.stopEvent(e, function () { return props.onClick(); }); }, placement: "right", title: react_1.default.createElement("span", null, popTitle), overlayClassName: 'c-table-action-confirm' },
         react_1.default.createElement("span", { className: DEFAULT_CLASS.DELETE, title: "".concat(title, " ").concat(props.name || '') },
             react_1.default.createElement(Icon_1.Icon, { type: 'delete' }),
@@ -92,11 +92,11 @@ var COL_OPERACTION = function (props) {
         if (len > 0) {
             clazz.push('c-table-actions-' + len);
         }
-        return { align: 'center', title: utils_1.i18n.getText(Const_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' '), render: props };
+        return { align: 'center', title: utils_1.i18n.getText(_i18n_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' '), render: props };
     }
     else if (props.className) {
         clazz.push(props.className);
     }
-    return __assign(__assign({ align: 'center' }, props), { title: utils_1.i18n.getText(props.ik, null, Const_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' ') });
+    return __assign(__assign({ align: 'center' }, props), { title: utils_1.i18n.getText(props.ik, null, _i18n_1.V.TXT_OPERATION), ellipsis: false, className: clazz.join(' ') });
 };
 exports.COL_OPERACTION = COL_OPERACTION;

package/components/Tables/Util.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIdxColumn = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var utils_1 = require("../../utils");
-var Const_1 = require("../_setup/Const");
+var _i18n_1 = require("../_i18n");
 var getIdxColumn = function (ref, showIndex, isRank) {
     if (showIndex === void 0) { showIndex = null; }
     if (isRank === void 0) { isRank = false; }
@@ -21,7 +21,7 @@ var getIdxColumn = function (ref, showIndex, isRank) {
         }
     }
     else {
-        title = utils_1.i18n.txt(isRank ? Const_1.V.TXT_RANK : Const_1.V.TXT_IDX);
+        title = utils_1.i18n.txt(isRank ? _i18n_1.V.TXT_RANK : _i18n_1.V.TXT_IDX);
     }
     var width = 48;
     if (ref.current < 1000) {

package/components/Tables/VTable.js

@@ -253,6 +253,8 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
                 update();
             },
             getCheckboxProps: function (record) {
+                if (lodash_1.default.isFunction(props.selectDisabled))
+                    return { disabled: props.selectDisabled(record) };
                 if (!lodash_1.default.has(record, rowKey))
                     return { disabled: true };
                 return { disabled: false };
@@ -263,7 +265,7 @@ var _VTable = (0, react_1.forwardRef)(function (props, ref) {
         // scroll={scroll}
         // tableLayout="fixed"
         // showSorterTooltip={false}
-        size: utils_1.GLOBAL.CONFIG.TABLE.SIZE, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) } }, props, tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, dataSource: list, loading: isQuerying, onChange: function (x, y, field) {
+        size: utils_1.GLOBAL.CONFIG.TABLE.SIZE, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) } }, lodash_1.default.omit(props, ['children']), tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, dataSource: list, loading: isQuerying, onChange: function (x, y, field) {
             if (field.column) {
                 orderBy(field.field, field.order == 'ascend' ? 'asc' : 'desc');
             }