vap1 0.2.4 → 0.2.6

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/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 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,67 +83,76 @@ 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;
@@ -168,35 +162,29 @@ var SearchBarByField = function (props) {
             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(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); } }, utils_1.i18n.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); }); } }, utils_1.i18n.txt(Const_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

@@ -60,28 +60,30 @@ var Const_1 = require("../_setup/Const");
 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(Const_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,
+        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(Const_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("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(Const_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/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');
             }

package/components/Trees/ActionTree.js

@@ -686,7 +686,7 @@ var _Actiontree = (0, react_1.forwardRef)(function (props, ref) {
                 txt(Const_1.V.ACT_UPDATE),
                 action.objectName,
                 " : ",
-                react_1.default.createElement("b", null, treeState.titleField)) : ADD_TITLE() }, modals.modalState.modalProps, { fields: FIELDS.current, default: getDefault(), onOk: function (data) {
+                react_1.default.createElement("b", null, modals.modalState.data[treeState.titleField])) : ADD_TITLE() }, modals.modalState.modalProps, { fields: FIELDS.current, default: getDefault(), onOk: function (data) {
                 modals.hide();
                 if (modals.modalState.isEdit) {
                     update(data, modals.modalState.extra.position);

package/components/UForm/UForm.js

@@ -526,7 +526,8 @@ var _UForm = (0, react_1.forwardRef)(function (props, ref) {
                 return;
             if (field.type) {
                 var info = (0, _register_1.getUFormInput)(field.type);
-                if (info.isMultiple && field.field.indexOf(',') > 0) {
+                // && field.field.indexOf(',') > 0
+                if (info.isMultiple) {
                     state.multipleFields.current.add(field.field);
                 }
             }

package/components/UForm/index.d.ts

@@ -24,6 +24,7 @@ export type GroupType = 'default' | 'tabs' | 'collapse';
 export type LinkValue = string | number | boolean;
 import type { _FieldType } from './_FieldType';
 import type { SizeType } from '../_adapt/_Antd5';
+import type { TableColumn } from '../Tables';
 /**
  * 联动结果 ： 改变目标字段的交互属性
  * 所有属性为可选，需要改变几项属性，则只返回包含几个属性的对象，
@@ -193,6 +194,10 @@ export type UFormField = BaseItem & {
      * 回显方法
     */
     render?: (txt: any, obj?: any) => React.ReactNode;
+    /**
+     * 字段选项，适用于 `table` `json-table` 等
+     */
+    columns?: TableColumn[];
 };
 export type UFormFieldGroup = BaseItem & {
     /**

package/components/_common/Upagination.js

@@ -16,7 +16,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UPagination = void 0;
 var react_1 = __importDefault(require("react"));
-var Pagination_1 = require("../_adapt/Pagination");
+// import { Pagination } from '../_adapt/Pagination';
+var antd_1 = require("antd");
 var utils_1 = require("../../utils");
 var i18n_1 = require("../../utils/i18n");
 var TXT = (0, i18n_1.fastRegister)({
@@ -112,6 +113,6 @@ var getConfig = function (total, totalAcc, cost) {
 };
 var UPagination = function (props) {
     var conf = getConfig(props.total, props.totalAcc, props.cost);
-    return react_1.default.createElement(Pagination_1.Pagination, __assign({}, conf, props, { className: utils_1.StringUtil.className(['c-pagination', 'c-pagination-style' + (props.mode || utils_1.GLOBAL.CONFIG.PAGINATION.THEME || 1)], props.className) }));
+    return react_1.default.createElement(antd_1.Pagination, __assign({}, conf, props, { onShowSizeChange: props.onChange, className: utils_1.StringUtil.className(['c-pagination', 'c-pagination-style' + (props.mode || utils_1.GLOBAL.CONFIG.PAGINATION.THEME || 1)], props.className) }));
 };
 exports.UPagination = UPagination;

package/components/_setup/AjaxSettings.d.ts

@@ -0,0 +1,9 @@
+import type { GlobalSetting } from '../../utils/Global';
+/**
+ * 将 PUT/PATCH/DELETE 请求转换为 POST
+*/
+export declare const rewriteToPost: GlobalSetting['AJAX']['beforeSend'];
+/**
+ * 自动识别 Mock 请求
+*/
+export declare const autoMock: GlobalSetting['AJAX']['beforeSend'];

package/components/_setup/AjaxSettings.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoMock = exports.rewriteToPost = void 0;
+var lodash_1 = __importDefault(require("lodash"));
+/**
+ * 常用 Ajax 设置
+*/
+var reUrl = function (url, method) {
+    if (url.indexOf('?') > 0) {
+        return url + '&_method=' + method;
+    }
+    return url + '?_method=' + method;
+};
+/**
+ * 将 PUT/PATCH/DELETE 请求转换为 POST
+*/
+var rewriteToPost = function (url, method, header, param) {
+    var re_url = url;
+    var re_method = method;
+    var old_method = lodash_1.default.trim(lodash_1.default.toLower(method));
+    switch (old_method) {
+        case 'put':
+        case 'delete':
+        case 'patch':
+            re_url = reUrl(re_url, old_method);
+            re_method = 'POST';
+            break;
+        default:
+            break;
+    }
+    return [re_url, re_method, header, param];
+};
+exports.rewriteToPost = rewriteToPost;
+/**
+ * 自动识别 Mock 请求
+*/
+var autoMock = function (url, method, header, param) {
+    return [url, method, header, param];
+};
+exports.autoMock = autoMock;

package/index.js

@@ -138,7 +138,7 @@ Object.defineProperty(exports, "ColorPicker", { enumerable: true, get: function
 // Enrich antd Components
 var Upagination_1 = require("./components/_common/Upagination"); // 增强版 Pagination
 Object.defineProperty(exports, "UPagination", { enumerable: true, get: function () { return Upagination_1.UPagination; } });
-// VAP Data Components 
+// VAP Data Components
 var UForm_1 = require("./components/UForm"); // UForm 系列 
 Object.defineProperty(exports, "UForm", { enumerable: true, get: function () { return UForm_1.UForm; } });
 Object.defineProperty(exports, "UFormModal", { enumerable: true, get: function () { return UForm_1.UFormModal; } });

package/package.json

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

package/uform/FormEditor.js

@@ -87,7 +87,7 @@ var FormEditor = function (props) {
                         react_1.default.createElement(index_1.Button.Group, { style: { float: 'right', marginRight: 6, display: 'block' } },
                             editor.form.isGroup && react_1.default.createElement(index_1.Button, { icon: "plus", onClick: function () { return editor.addGroup(); } }, "\u6DFB\u52A0\u5206\u7EC4"),
                             react_1.default.createElement(index_1.Button, { icon: 'eye', type: "primary", onClick: function () {
-                                    if (schema.fields && schema.fields.length > 1) {
+                                    if (editor.form.fields && editor.form.fields.length > 0) {
                                         setOpen(true);
                                     }
                                     else {

package/uform/inputs/register.d.ts

@@ -1,6 +1,13 @@
 /// <reference types="react" />
 import type { FormItem } from '../schema';
 import type { PlainObject } from '../../basetype';
+export type CustomConfig = {
+    label: string;
+    key: string;
+    type: string;
+    defaultValue?: any;
+    options?: PlainObject;
+};
 export type FormInput = {
     title: string;
     type: string;
@@ -13,6 +20,7 @@ export type FormInput = {
     defaultProperties?: PlainObject;
     defaultConfig?: PlainObject;
     defaultPlaceholder?: string;
+    customConfig?: CustomConfig[];
 };
 type FormGroup = {
     title: string;

package/uform/panel/Propreties/_ItemBase.js

@@ -10,17 +10,49 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var index_1 = require("../../../index");
+var index_2 = require("../../../index");
 var plugins_1 = require("../../plugins");
 var FieldPlugin_1 = require("./Component/FieldPlugin");
 var OptionTable_1 = require("./Component/OptionTable");
+var _register_1 = require("../../../components/UForm/_register");
 exports.default = (function (props) {
+    var _a, _b;
     var setFieldProperties = props.setFieldProperties, field = props.field, input = props.input, baseSpan = props.baseSpan;
+    var config = field.config || {};
+    var setConfig = function (key, value) {
+        config[key] = value;
+        setFieldProperties('config', config);
+    };
+    var renderCustomConfig = function (item) {
+        var element = (0, _register_1.getUFormInput)(item.type).component;
+        return (0, react_1.createElement)(element, __assign(__assign({}, item), { field: item.type, title: '' }));
+    };
     return react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(index_1.Form.Item, { label: "\u5B57\u6BB5\u540D", required: true },
             react_1.default.createElement(index_1.Input, { size: 'small', value: field.field, onChange: function (evt) { return setFieldProperties('field', evt.target.value); } })),
@@ -41,5 +73,13 @@ exports.default = (function (props) {
         input.fieldCount == null && react_1.default.createElement(index_1.Form.Item, { label: "\u9ED8\u8BA4\u503C" },
             react_1.default.createElement(index_1.Input, { size: 'small', placeholder: '\u8F93\u5165\u53D6\u503C', value: field._default, onChange: function (evt) { return setFieldProperties('_default', evt.target.value); } })),
         input.hasOption && react_1.default.createElement(OptionTable_1.OptionTable, __assign({}, props)),
+        ((_a = field.customConfig) === null || _a === void 0 ? void 0 : _a.length) > 0 && react_1.default.createElement(index_2.Divider, { orientation: "left" }, "\u81EA\u5B9A\u4E49\u5C5E\u6027"),
+        ((_b = field.customConfig) === null || _b === void 0 ? void 0 : _b.length) > 0 && field.customConfig.map(function (item) {
+            var value = config[item.key] || item.defaultValue || null;
+            var onChange = function (v) {
+                setConfig(item.key, v);
+            };
+            return react_1.default.createElement(index_1.Form.Item, { label: item.label }, renderCustomConfig(__assign(__assign({}, item), { value: value, onChange: onChange })));
+        }),
         react_1.default.createElement(FieldPlugin_1.FieldPlugin, __assign({}, props, { slot: plugins_1.PluginSlot.FIELD_BASE })));
 });