vap1 0.6.5 → 0.6.7

package/components/Box/Box.d.ts

@@ -107,9 +107,15 @@ export type BoxProps = SearchTool & {
     */
     overflowAuto?: true;
     /**
-     * 默认查询参数
+     * @deprecated
+     * 说明：在一些极端场景下编译，可能会有Bug，
+     * 统一使用 defaultParam 替代，后续版本会移除
     */
     default?: PlainObject;
+    /**
+     * 默认查询条件
+    */
+    defaultParam?: PlainObject;
     /**
      * 在部分皮肤下有效，强制不显示背景
     */
@@ -145,9 +151,15 @@ export declare const Box: React.ForwardRefExoticComponent<SearchTool & {
     */
     overflowAuto?: true;
     /**
-     * 默认查询参数
+     * @deprecated
+     * 说明：在一些极端场景下编译，可能会有Bug，
+     * 统一使用 defaultParam 替代，后续版本会移除
     */
     default?: PlainObject;
+    /**
+     * 默认查询条件
+    */
+    defaultParam?: PlainObject;
     /**
      * 在部分皮肤下有效，强制不显示背景
     */

package/components/Box/Box.js

@@ -149,7 +149,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         }
     }, [state === null || state === void 0 ? void 0 : state.height]);
     var resize = (0, react_1.useCallback)(function () {
-        if (mode == 'common' || app == null) {
+        if (mode == 'common') {
             if (state === null)
                 setState({});
             return;
@@ -207,7 +207,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         //     const isFix = _.isBoolean(props.searchBand.fixMode) ? props.searchBand.fixMode : CONFIG.SEARCHBAND.FIX_MODE;
         //     return <SearchBand
         //         {...props.searchBand}
-        //         default={props.default}
+        //         defaultParam={props.defaultParam || props.default}
         //         className={HEIGHT_OMIT}
         //         extraAction={null}
         //         onSearch={(data) => {
@@ -217,7 +217,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
         //     >{action}</SearchBand>
         // }
         if (hasBar) {
-            return react_1.default.createElement(SearchBar_1.SearchBar, __assign({}, props.searchBar, { default: props.default, className: HEIGHT_OMIT, onExpand: function (isExpand) {
+            return react_1.default.createElement(SearchBar_1.SearchBar, __assign({}, props.searchBar, { defaultParam: props.defaultParam || props.default, className: HEIGHT_OMIT, onExpand: function (isExpand) {
                     resize();
                     if (lodash_1.default.isFunction(props.searchBar.onExpand)) {
                         props.searchBar.onExpand(isExpand);
@@ -225,7 +225,7 @@ exports.Box = (0, react_1.forwardRef)(function (props, ref) {
                 } }), action);
         }
         if (action) {
-            return react_1.default.createElement(SearchBar_1.SearchBar, { onSearch: LOOP, default: props.default, className: HEIGHT_OMIT, onExpand: LOOP }, action);
+            return react_1.default.createElement(SearchBar_1.SearchBar, { onSearch: LOOP, defaultParam: props.defaultParam || props.default, className: HEIGHT_OMIT, onExpand: LOOP }, action);
         }
         return utils_1.Const.NONE;
     }, [props.actionBar, props.searchBar,

package/components/Lists/VList.js

@@ -60,7 +60,7 @@ var VList = function (props) {
     var model = props.model;
     var app = (0, useApp_1.useApp)();
     var _a = (0, LayoutSwitcher_1.useListLayout)(props), layout = _a.layout, layouts = _a.layouts, setLayout = _a.setLayout;
-    (0, react_1.useLayoutEffect)(function () { model.query(props.default || {}); }, []);
+    (0, react_1.useLayoutEffect)(function () { model.query(props.defaultParam || {}); }, []);
     var extraAction = (0, react_1.useMemo)(function () {
         if (layouts.length <= 1)
             return null;
@@ -85,7 +85,7 @@ var VList = function (props) {
         return classNames.join(' ');
     }, [props.className]);
     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); }, default: props.default, 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(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 })));
 };

package/components/Lists/components/SearchTool.d.ts

@@ -8,6 +8,6 @@ export type SearchToolProps = XOR<{
 }>;
 export declare const SearchTool: FC<PropsWithChildren<SearchToolProps & {
     onSearch: (data: PlainObject) => void;
-    default?: any;
+    defaultParam?: any;
     extraAction?: ReactNode;
 }>>;

package/components/Lists/components/SearchTool.js

@@ -26,9 +26,9 @@ var SearchTool = function (props) {
         return react_1.default.createElement(SearchTool_1.SearchBar, { onSearch: function () { }, children: props.children });
     }
     if (props.searchBand)
-        return react_1.default.createElement(SearchTool_1.SearchBand, __assign({}, props.searchBand, { default: props.default, onSearch: props.onSearch, children: props.children, extraAction: props.extraAction }));
+        return react_1.default.createElement(SearchTool_1.SearchBand, __assign({}, props.searchBand, { defaultParam: props.defaultParam, onSearch: props.onSearch, children: props.children, extraAction: props.extraAction }));
     if (props.searchBar)
-        return react_1.default.createElement(SearchTool_1.SearchBar, __assign({}, props.searchBar, { default: props.default, onSearch: props.onSearch, children: props.children }));
+        return react_1.default.createElement(SearchTool_1.SearchBar, __assign({}, props.searchBar, { defaultParam: props.defaultParam, onSearch: props.onSearch, children: props.children }));
     return Const_1.NONE;
 };
 exports.SearchTool = SearchTool;

package/components/Lists/index.d.ts

@@ -123,7 +123,8 @@ export type ListRenderDefine = {
 export type ListLayoutType = keyof ListRenderDefine;
 type CommonListProps = Pick<ListProps<PlainObject>, 'rowKey' | 'className' | 'style'> & ListRenderDefine & {
     defaultLayout?: ListLayoutType;
+    onLayoutChange?: (layout: ListLayoutType) => void;
 };
 export type BaseListProps = CommonListProps & Pick<ListProps<PlainObject>, 'dataSource' | 'loading'>;
-export type VListProps = CommonListProps & SearchToolProps & Pick<VTableProps, 'default' | 'model' | 'mode' | 'pagination' | 'actionBar'>;
+export type VListProps = CommonListProps & SearchToolProps & Pick<VTableProps, 'defaultParam' | 'model' | 'mode' | 'pagination' | 'actionBar'>;
 export {};

package/components/SearchTool/SearchBand/hooks.js

@@ -129,7 +129,7 @@ var useTableColumns = function (props, labelWidth, data, fixMode) {
     }, [data]);
 };
 var useSearchBand = function (props, fixMode) {
-    var _a = __read((0, react_1.useState)(props.default || {}), 2), state = _a[0], setState = _a[1];
+    var _a = __read((0, react_1.useState)(props.defaultParam || {}), 2), state = _a[0], setState = _a[1];
     var isFristMount = (0, hooks_1.useFirstMountState)();
     var labelWidth = (0, react_1.useMemo)(function () {
         if (lodash_1.default.isNumber(props.labelWidth))

package/components/SearchTool/SearchBand/type.d.ts

@@ -44,8 +44,8 @@ export type SearchBandProps = {
     onSearch: (param: PlainObject) => void;
     /**
      * 默认参数
-     */
-    default?: PlainObject;
+    */
+    defaultParam?: PlainObject;
     /**
      * 如果为true, 则不会以Tag显示
     */

package/components/SearchTool/SearchBar/ActionButtons.d.ts

@@ -42,9 +42,9 @@ export type ActButton = {
     /**
      * 说明 ： 最多支持2级子菜单，不能递归
     */
-    children?: ActButton[];
+    children?: Array<ActButton>;
 };
 export declare const ActionButtons: FC<{
-    buttons: (ActButton | null | false)[];
+    buttons: Array<ActButton | null | false>;
     size?: ButtonSize;
 }>;

package/components/SearchTool/SearchBar/ByField.js

@@ -75,15 +75,15 @@ var SearchField_1 = require("./SearchField");
 var _register_1 = require("./_register");
 exports.InnerSearchBarByField = (0, react_1.forwardRef)(function (props, ref) {
     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 _a = __read((0, react_1.useState)(props.defaultParam || 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 clear = (0, react_1.useCallback)(function () { return setData(function (prev) {
         var data = {};
         lodash_1.default.keys(prev).map(function (item) {
             data[item] = null;
         });
-        if (props.default) {
-            return lodash_1.default.extend({}, data, props.default);
+        if (props.defaultParam || props.default) {
+            return lodash_1.default.extend({}, data, props.defaultParam || props.default);
         }
         return data;
     }); }, []);

package/components/SearchTool/SearchBar/type.d.ts

@@ -48,9 +48,15 @@ export type SearchBarByFieldProps = {
      */
     onExpand?: (isShowMore: boolean) => void;
     /**
-     * 默认参数
+     * @deprecated
+     * 说明：在一些极端场景下编译，可能会有Bug，
+     * 统一使用 defaultParam 替代，后续版本会移除
      */
-    default?: any;
+    default?: PlainObject;
+    /**
+     * 默认参数
+    */
+    defaultParam?: PlainObject;
     /**
      * 用于单独使用时，不需要按钮的情况
     */

package/components/Tables/ApiTable.d.ts

@@ -3,7 +3,7 @@ import type { BaseTableProps } from './index';
 import type { ApiModel } from '../../hooks/_list';
 import type { ApiOption } from '../../hooks/useApiBase';
 export type ApiTableProps = BaseTableProps & Pick<ApiOption, 'api' | 'aop' | 'tipDisabled' | 'tipField'>;
-export declare const ApiTable: React.ForwardRefExoticComponent<import("./index").TableDefine & Pick<import("../..").BoxProps, "default" | "mode" | "selectBar"> & {
+export declare const ApiTable: React.ForwardRefExoticComponent<import("./index").TableDefine & Pick<import("../..").BoxProps, "default" | "mode" | "selectBar" | "defaultParam"> & {
     searchBar?: Omit<import("../SearchTool").SearchBarProps, "onChange" | "onSearch">;
 } & {
     columns: import("./index").TableCol[];

package/components/Tables/ApiTable.js

@@ -52,7 +52,7 @@ exports.ApiTable = (0, react_1.forwardRef)(function (props, ref) {
     var option = {
         api: props.api,
         rowKey: props.rowKey,
-        param: props.default,
+        param: props.defaultParam || props.default || {},
         aop: props.aop,
         tipDisabled: props.tipDisabled,
         tipField: props.tipField,

package/components/Tables/ApiTableModal.d.ts

@@ -3,7 +3,7 @@ import type { ModalProps } from '../_adapt/Modal';
 import type { ApiTableProps } from './ApiTable';
 import type { ApiModel } from '../../hooks/_list';
 export type ApiTableModalProps = ApiTableProps & ModalProps;
-export declare const ApiTableModal: React.ForwardRefExoticComponent<import(".").TableDefine & Pick<import("../..").BoxProps, "default" | "mode" | "selectBar"> & {
+export declare const ApiTableModal: React.ForwardRefExoticComponent<import(".").TableDefine & Pick<import("../..").BoxProps, "default" | "mode" | "selectBar" | "defaultParam"> & {
     searchBar?: Omit<import("../SearchTool").SearchBarProps, "onChange" | "onSearch">;
 } & {
     columns: import(".").TableCol[];

package/components/Tables/ApiTableModal.js

@@ -71,7 +71,7 @@ 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', 'autoLoad'
+    'mode', 'columns', 'showIndex', 'rowKey', 'select', 'selectDisabled', 'actionBar', 'selectBar', 'searchBar', 'default', 'defaultParam', 'autoLoad'
 ];
 exports.ApiTableModal = (0, react_1.forwardRef)(function (props, ref) {
     var modalProps = lodash_1.default.omit(props, API_TABLE_PROPERTIES);

package/components/Tables/Components/useTableContext.d.ts

@@ -11,6 +11,6 @@ type TableAction = {
     initObjects: (List: Array<any>) => void;
     reflushPage: (List: Array<any>) => void;
 };
-export declare const TableContextWrapper: FC<PropsWithChildren<Pick<VTableProps, 'default' | 'defaultSelectedKeys' | 'rowKey'>>>;
+export declare const TableContextWrapper: FC<PropsWithChildren<Pick<VTableProps, 'defaultParam' | 'defaultSelectedKeys' | 'rowKey'>>>;
 export declare const useTableContext: () => TableContext & TableAction;
 export {};

package/components/Tables/Components/useTableContext.js

@@ -73,14 +73,11 @@ var TableContextWrapper = function (props) {
         var DEFAULT = {
             selectedRowKeys: [],
             selectedObjects: [],
-            param: {},
+            param: props.defaultParam || {},
         };
         if (lodash_1.default.isArray(props.defaultSelectedKeys)) {
             DEFAULT.selectedRowKeys = props.defaultSelectedKeys;
         }
-        if (props.default) {
-            DEFAULT.param = __assign({}, props.default);
-        }
         return DEFAULT;
     }), 2), state = _a[0], setState = _a[1];
     var setSelection = (0, react_1.useCallback)(function (selectedRowKeys, selectedObjects) {

package/components/Tables/VTable.d.ts

@@ -27,7 +27,7 @@ export type VTableProps = BaseTableProps & {
     */
     onSelectedChange?: (selectedRowKeys: Key[], selectedRows?: any[]) => void;
 };
-export declare const VTable: React.ForwardRefExoticComponent<import("./index").TableDefine & Pick<BoxProps, "default" | "mode" | "selectBar"> & {
+export declare const VTable: React.ForwardRefExoticComponent<import("./index").TableDefine & Pick<BoxProps, "default" | "mode" | "selectBar" | "defaultParam"> & {
     searchBar?: Omit<import("../SearchTool").SearchBarProps, "onChange" | "onSearch">;
 } & {
     columns: import("./index").TableCol[];

package/components/Tables/VTable.js

@@ -128,7 +128,7 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
             return;
         if (lodash_1.default.isFunction((_b = props.selectBar) === null || _b === void 0 ? void 0 : _b.onSelect)) {
             var param = (_a = props.selectBar).onSelect.apply(_a, __spreadArray([], __read(state.selected), false));
-            query(__assign(__assign({}, props.default), param));
+            query(__assign(__assign({}, (props.defaultParam || props.default)), param));
         }
     }, [state.selected]);
     // 更新页数
@@ -162,7 +162,7 @@ var _VTable = (0, react_1.forwardRef)(function (props) {
             return;
         if (lodash_1.default.has(props.selectBar, 'config.mustSelect') && props.selectBar.config.mustSelect == true)
             return;
-        query(props.default || {});
+        query(props.defaultParam || props.default || {});
     }, []);
     // 更新高度 table 需要把 head 排除设置滚动
     // useEffect(() => {
@@ -316,7 +316,11 @@ var VTableRoot = (0, react_1.forwardRef)(function (props, ref) {
 });
 exports.VTable = (0, react_1.forwardRef)(function (props, ref) {
     var _a;
-    var initValue = (0, react_1.useMemo)(function () { return lodash_1.default.pick(props, ['defaultSelectedKeys', 'default']); }, []);
+    var initValue = (0, react_1.useMemo)(function () {
+        var initProps = lodash_1.default.pick(props, ['defaultSelectedKeys', 'rowKey']);
+        initProps.defaultParam = props.defaultParam || props.default || {};
+        return initProps;
+    }, []);
     return react_1.default.createElement(useTableContext_1.TableContextWrapper, __assign({}, initValue, { rowKey: ((_a = props.model) === null || _a === void 0 ? void 0 : _a.rowKey) || props.rowKey || 'id' }),
         react_1.default.createElement(VTableRoot, __assign({}, props, { ref: ref })));
 });

package/components/Tables/index.d.ts

@@ -22,7 +22,7 @@ type SearchToolProps = {
  * 所有VAP组装 Table 排除一些自定义属性
 */
 export type TableDefine = Omit<TableProps<PlainObject>, 'size' | 'columns' | 'dataSource' | 'bordered' | 'rowKey' | 'title' | 'loading' | 'onChange' | 'rowSelection' | 'getPopupContainer' | 'sortDirections' | 'showSorterTooltip' | 'internalHooks' | 'transformColumns' | 'internalRefs'>;
-export type BaseTableProps = TableDefine & Pick<BoxProps, 'mode' | 'selectBar' | 'default'> & SearchToolProps & {
+export type BaseTableProps = TableDefine & Pick<BoxProps, 'mode' | 'selectBar' | 'defaultParam' | 'default'> & SearchToolProps & {
     /**
      * 列
     */

package/components/UForm/UForm.js

@@ -413,7 +413,7 @@ var getValue = function (multipleFields, values, initRef) {
 };
 var initValue = function (props) {
     var e_1, _a;
-    var values = __assign(__assign({}, props.default), props.data);
+    var values = __assign(__assign({}, (props.defaultValue || props.default)), props.data);
     var _loop_1 = function (key) {
         var fields = key.split(',').map(lodash_1.default.trim);
         if (fields.length == 1) {
@@ -564,10 +564,10 @@ var _UForm = (0, react_1.forwardRef)(function (props, ref) {
     if (state.isGroup)
         clazz.push('c-form-group');
     return react_1.default.createElement(antd_1.Form
-    // initialValues={props.default}
+    // initialValues={props.defaultValue || props.default}
     // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
     , { 
-        // initialValues={props.default}
+        // initialValues={props.defaultValue || props.default}
         // size={props.size || GLOBAL.CONFIG.FORM.SIZE}
         className: clazz.join(' '), style: { width: state.width }, form: form },
         props.tip && react_1.default.createElement("div", { className: 'c-form-tip' }, props.tip),

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', 'width'];
+var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'defaultValue', 'data', 'mode', 'size', 'width'];
 var UFormModal = function (props) {
     var ref = (0, react_1.useRef)(null);
     var modalProps = {

package/components/UForm/UInfoModal.js

@@ -22,7 +22,7 @@ var utils_1 = require("../../utils");
 var UInfo_1 = require("./UInfo");
 var _i18n_1 = require("../_i18n");
 var FormWrapper_1 = require("./FormWrapper");
-var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'data', 'mode', 'hideBorder', 'theme'];
+var FORM_FIELDS = ['layout', 'fields', 'groupType', 'isEdit', 'tip', 'default', 'defaultValue', 'data', 'mode', 'hideBorder', 'theme'];
 var UInfoModal = function (props) {
     var param = lodash_1.default.omit(props, FORM_FIELDS);
     if (!lodash_1.default.has(props, 'title') && lodash_1.default.has(props, 'autoTitle')) {

package/components/UForm/_FormUtils.d.ts

@@ -1,5 +1,5 @@
 import type { UFormField } from './index';
 import type { BaseOption } from '../../basetype';
 import type { ValidationRule } from 'antd/es/form/Form';
-export declare const requireStatus: (field: UFormField, required: Map<string, boolean>, disabled: Set<string>, hiden: Set<string>) => [boolean, ValidationRule[]];
+export declare const requireStatus: (field: UFormField, required: Map<string, boolean>, disabled: Set<string>, hiden: Set<string>) => [boolean, Array<ValidationRule>];
 export declare const getOptions: (items: BaseOption[], field: UFormField, data: any) => BaseOption[];

package/components/UForm/_input.js

@@ -159,7 +159,7 @@ var builderApiTableSerletor = function (options, nameIdx) { return function (pro
     };
     return react_1.default.createElement(react_1.Fragment, null,
         values[0] != undefined ? react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), getTip(values)) : react_1.default.createElement(Button_1.Button, __assign({}, params, { icon: 'select', onClick: function () { return setOpen(true); } }), (0, exports.getPlaceholder)(field, true)),
-        react_1.default.createElement(Tables_1.ApiTableModal, __assign({ title: options.title, searchBar: options.searchBar, width: options.width || 720 }, field.config, { api: options.api, default: defaultParam, columns: __spreadArray(__spreadArray([], __read(options.columns), false), [
+        react_1.default.createElement(Tables_1.ApiTableModal, __assign({ title: options.title, searchBar: options.searchBar, width: options.width || 720 }, field.config, { api: options.api, defaultParam: defaultParam, columns: __spreadArray(__spreadArray([], __read(options.columns), false), [
                 Tables_1.ApiTable.COL_OPERACTION({ render: function (data) { return react_1.default.createElement(Tables_1.ApiTable.ACTION, { title: "\u9009\u62E9", icon: "select", onClick: function () { return onSelect(data); } }); } })
             ], false), open: open, onCancel: function () { return setOpen(false); } })));
 }; };

package/components/UForm/_register.d.ts

@@ -69,7 +69,7 @@ export type FormFieldOptions = {
      * 校验规则
      * 支持传Rule, Rule数组，及一个方法，接收一个数组
      */
-    rules?: ValidationRule | ValidationRule[] | ((field: UFormField) => ValidationRule | ValidationRule[]);
+    rules?: ValidationRule | Array<ValidationRule> | ((field: UFormField) => ValidationRule | Array<ValidationRule>);
 };
 export type FormField = FormFieldOptions & {
     component: FormFieldComponent;

package/components/UForm/index.d.ts

@@ -172,12 +172,12 @@ export type UFormField = BaseItem & {
     /**
      * rules 用法： https://github.com/yiminghe/async-validator
     */
-    rules?: ValidationRule[];
+    rules?: Array<ValidationRule>;
     /**
      * 字段联动，目前只支持 `text` `select` 类型，受影响的字段只能是具有 `options` 属性的类型
      *
     */
-    link?: Link[];
+    link?: Array<Link>;
     /**
      * （试验中，暂不要使用）
      * 在复杂类型中使用时，可使用dataType定义类型
@@ -266,9 +266,15 @@ export type UFromProps = {
     */
     tip?: ReactNode;
     /**
-     * 默认
+     * @deprecated
+     * 说明：在一些极端场景下编译，可能会有Bug，
+     * 统一使用 defaultValue 替代，后续版本会移除
     */
     default?: PlainObject;
+    /**
+     * 默认值
+    */
+    defaultValue?: PlainObject;
     /**
      * 数据
     */

package/components/_common/AutoComplete.d.ts

@@ -23,7 +23,7 @@ export interface IAutoCompleteProps extends Omit<AutoCompleteProps, 'onChange'>
     /**
      * 接口默认参数
      */
-    default?: any;
+    defaultParam?: any;
     onChange?: (value: any, option: any) => void;
 }
 /**

package/components/_common/AutoComplete.js

@@ -141,7 +141,7 @@ var IAutoComplete = function (props) {
                             setOptions(cacheRef.current.get(text));
                             return [2 /*return*/];
                         }
-                        param = lodash_1.default.merge({ start_: 0, count_: 15 }, props.default);
+                        param = lodash_1.default.merge({ start_: 0, count_: 15 }, props.defaultParam);
                         if (text) {
                             param[paramField] = text;
                         }

package/hooks/index.d.ts

@@ -13,4 +13,5 @@ export { useOpenState } from './useOpenState';
 export { useFirstMountState } from './useFirstMountState';
 export { useToggle } from './useToggle';
 export { useUpdate } from './useUpdate';
+export { usePreference } from './usePreference';
 export { useSyncExternalStore } from './useSyncExternalStore';

package/hooks/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSyncExternalStore = exports.useUpdate = exports.useToggle = exports.useFirstMountState = exports.useOpenState = exports.useAjaxAction = exports.useAjaxQuery = exports.useEffectFunction = exports.useModals = exports.useGlobal = exports.useDoLoad = exports.useSetState = exports.useArray = exports.useApiGlobal = exports.useApi = exports.useApp = void 0;
+exports.useSyncExternalStore = exports.usePreference = exports.useUpdate = exports.useToggle = exports.useFirstMountState = exports.useOpenState = exports.useAjaxAction = exports.useAjaxQuery = exports.useEffectFunction = exports.useModals = exports.useGlobal = exports.useDoLoad = exports.useSetState = exports.useArray = exports.useApiGlobal = exports.useApi = exports.useApp = void 0;
 // export type { GlobalApp } from './useApp';
 var useApp_1 = require("./useApp");
 Object.defineProperty(exports, "useApp", { enumerable: true, get: function () { return useApp_1.useApp; } });
@@ -46,6 +46,8 @@ Object.defineProperty(exports, "useToggle", { enumerable: true, get: function ()
 var useUpdate_1 = require("./useUpdate");
 Object.defineProperty(exports, "useUpdate", { enumerable: true, get: function () { return useUpdate_1.useUpdate; } });
 // export { useUpdateEffect } from './useUpdateEffect';
+var usePreference_1 = require("./usePreference");
+Object.defineProperty(exports, "usePreference", { enumerable: true, get: function () { return usePreference_1.usePreference; } });
 var useSyncExternalStore_1 = require("./useSyncExternalStore");
 Object.defineProperty(exports, "useSyncExternalStore", { enumerable: true, get: function () { return useSyncExternalStore_1.useSyncExternalStore; } });
 // 说明： 主要从以下两个库中提取常用hooks 集成至VAP

package/hooks/usePreference.d.ts

@@ -0,0 +1,9 @@
+type UsePreferenceConfig = {
+    module: string;
+    key: string;
+    defaultValue?: string;
+    allowValue?: Array<string>;
+};
+type UsePreferenceResult = [boolean, string, (val: string) => void];
+export declare const usePreference: (config: UsePreferenceConfig) => UsePreferenceResult;
+export {};

package/hooks/usePreference.js

@@ -0,0 +1,101 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.usePreference = void 0;
+var lodash_1 = __importDefault(require("lodash"));
+var react_1 = require("react");
+var useApp_1 = require("./useApp");
+var usePreference = function (config) {
+    var _a = (0, useApp_1.useApp)().user, getConfig = _a.getConfig, setConfig = _a.setConfig;
+    var _b = __read((0, react_1.useState)(null), 2), value = _b[0], setValue = _b[1];
+    var allowValue = (0, react_1.useCallback)(function (value) {
+        if (lodash_1.default.isArray(config.allowValue) && config.allowValue.length > 0) {
+            return lodash_1.default.includes(config.allowValue, value);
+        }
+        return true;
+    }, []);
+    var set = (0, react_1.useCallback)(function (value) { return __awaiter(void 0, void 0, void 0, function () {
+        var isOk;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!allowValue(value))
+                        return [2 /*return*/];
+                    return [4 /*yield*/, setConfig(config.module, config.key, value)];
+                case 1:
+                    isOk = _a.sent();
+                    if (isOk) {
+                        setValue(value);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); }, []);
+    (0, react_1.useEffect)(function () {
+        getConfig(config.module, config.key).then(function (result) {
+            var value = result || config.defaultValue || '';
+            if (allowValue(value)) {
+                setValue(value);
+            }
+            else {
+                setValue(config.defaultValue || '');
+            }
+        });
+    }, []);
+    return [value === null, value === null ? config.defaultValue : value, set];
+};
+exports.usePreference = usePreference;

package/package.json

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

package/uform/panel/Propreties/Component/LinkAsyncFunction.js

@@ -102,7 +102,7 @@ var LinkAsyncFunction = function (props) {
                     react_1.default.createElement("b", null, "dayjs")),
                 react_1.default.createElement("li", { style: { listStyle: 'none' } },
                     "\u65B9\u6CD5\u8FD4\u56DE\u6253\u5370 \uFF1A",
-                    react_1.default.createElement("b", null, "print"))) }), title: props.isEdit ? '编辑联动方法' : '添加联动方法', default: { method: 'GET', url: '/api/${value}' }, fields: [
+                    react_1.default.createElement("b", null, "print"))) }), title: props.isEdit ? '编辑联动方法' : '添加联动方法', defaultValue: { method: 'GET', url: '/api/${value}' }, fields: [
             { field: 'field', title: '被联动字段', required: true, options: targetOptions, type: 'select' },
             {
                 field: 'url,method', title: '请求',

package/uform/panel/Propreties/Component/ValidateAsyncFunction.js

@@ -64,7 +64,7 @@ var ValidateAsyncFunction = function (props) { return react_1.default.createElem
                 "\u652F\u6301 lodash \u53D8\u91CF\u540D \uFF1A",
                 react_1.default.createElement("b", null, "_")),
             react_1.default.createElement("li", { style: { listStyle: 'none' } },
-                react_1.default.createElement(index_1.Alert, { type: "error", message: "\u8BF4\u660E2\uFF1A\u5F02\u6B65\u9A8C\u8BC1\u4EC5\u652F\u6301 VAP2, \u6682\u4E0D\u652F\u6301 VAP1" }))) }), title: props.isEdit ? '编辑校验方法' : '添加校验方法', default: { method: 'GET', url: '/api/${value}' }, fields: [
+                react_1.default.createElement(index_1.Alert, { type: "error", message: "\u8BF4\u660E2\uFF1A\u5F02\u6B65\u9A8C\u8BC1\u4EC5\u652F\u6301 VAP2, \u6682\u4E0D\u652F\u6301 VAP1" }))) }), title: props.isEdit ? '编辑校验方法' : '添加校验方法', defaultValue: { method: 'GET', url: '/api/${value}' }, fields: [
         {
             field: 'url,method', title: '请求',
             type: 'input-with-select',

package/uform/utils/Convert.js

@@ -311,7 +311,7 @@ var schemaToForm = function (schema) {
     if (schema.size)
         uformProps.size = schema.size;
     if (lodash_1.default.keys(defaultValue).length > 0)
-        uformProps.default = defaultValue;
+        uformProps.defaultValue = defaultValue;
     return uformProps;
 };
 exports.schemaToForm = schemaToForm;

package/utils/CustomApp.d.ts

@@ -39,10 +39,10 @@ export type Menu = {
      *
      * 1 ：菜单组
      * 2 : 链接
-     * 3 : 权限码
-     * 4 : 小组件
+     * 3 : 权限码 - 无效
+     * 4 : 小组件 -无效
     */
-    type: 1 | 2 | 3 | 4;
+    type: 1 | 2;
     /**
      * 图标
     */
@@ -72,12 +72,21 @@ export type Menu = {
      * type = 1 时存在
      * 其它 type 也可存在，但只能放置权限码
     */
-    children?: Menu[];
+    children?: Array<Menu>;
 };
 type CustomAppMenu = {
+    /**
+     * none: (默认)无菜单模式
+     *      一般情况下，注册一个 '/' 路由即可
+     * list: 自定义菜单模式
+     *      使用 list 模式时，必须指定 list , 为已经整理好结构的 Menu 结构
+     * parent: 向上找一个菜单
+     *      使用 parent 模式时，必须指定 parent
+     *      使用资源里面的菜单
+    */
     mode?: 'none' | 'list' | 'parent';
     parent?: string;
-    list?: Menu[];
+    list?: Array<Menu>;
 };
 export type CustomAppTheme = {
     /**

package/utils/Renders/FileRender.d.ts

@@ -5,7 +5,7 @@ type ImgRenderOptions = {
     style?: CSSProperties;
     width?: number;
     height?: number;
-    default?: string;
+    defaultValue?: string;
 };
 export declare const ImgRender: (option?: ImgRenderOptions) => (link: string) => React.JSX.Element;
 export declare const imgRender: (link: string) => React.JSX.Element;

package/utils/Renders/FileRender.js

@@ -98,7 +98,7 @@ var ImgRender = function (option) {
         style.height = 80;
         style.width = 80;
     }
-    var defaultValue = (option === null || option === void 0 ? void 0 : option.default) || null;
+    var defaultValue = (option === null || option === void 0 ? void 0 : option.defaultValue) || null;
     if (lodash_1.default.has(option, 'style')) {
         style = __assign(__assign({}, style), option.style);
     }

package/utils/py.js

@@ -89,7 +89,7 @@ var matchKeywordByIndex = function (key, index) {
         /**
          * 4. 如果原文本已经遍历完成 ,不管关键字有没有完成 ,都直接中段
         */
-        if (textCursor >= (textLen - 1))
+        if (textCursor >= textLen)
             break;
         keywordCursor++;
     }