@teamix/pro 1.2.16 → 1.2.20

package/es/table/typing.d.ts

@@ -129,6 +129,7 @@ export declare type rowSelectionType = {
     onSelect?: (selected: boolean, record: any, records: Array<any>) => void;
     onSelectAll?: (selected: boolean, records: Array<any>) => void;
     selectedRowKeys?: Array<any>;
+    selectedRecords?: any[];
     mode?: 'single' | 'multiple';
     titleProps?: () => any;
     columnProps?: () => any;
@@ -177,6 +178,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 表格当前的数据 */
+    data?: any[];
 } & ProTableActionTypeMutations;
 /** action State 定义 */
 export declare type ProTableActionTypeMutations = {
@@ -232,6 +235,8 @@ export declare type ProTableTopAreaProps = {
     dataFilter?: ProTableDataFilterProps;
     /** 数据过滤区 form 表单模型 */
     dataFilterForm?: FormType;
+    /** 排序、筛选列展示状态 */
+    filterColumnType?: 'dialog' | 'dropdown' | 'auto';
 };
 /** 单个工具栏 */
 export declare type ProTableToolBarItem = React.ReactNode | 'refresh' | 'density' | 'filterColumn' | 'fullscreen';

package/es/table/utils/columnRender.js

@@ -96,7 +96,7 @@ export var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   };
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
-    label: getItemLabel(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/React.createElement(Filter, {

package/lib/actions/base.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { MaybePromise } from '@teamix/utils';
 export interface BaseAction {
     /** 事件触发方式，默认是 onClick */
@@ -17,7 +18,7 @@ export interface BaseAction {
     /** 事件开始执行完毕的回调函数 */
     onFinish?: (params?: any) => any;
 }
-export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any) => void): {
+export declare function eventHandler(action: BaseAction, actionContext: any, onTrigger: (context: any, e: React.MouseEvent<HTMLElement>) => void): {
     [x: string]: (e: React.MouseEvent<HTMLElement>) => Promise<void>;
 };
 export default eventHandler;

package/lib/actions/base.js

@@ -65,7 +65,7 @@ function eventHandler(action, actionContext, onTrigger) {
               return _context.abrupt("return");
 
             case 14:
-              onTrigger(Object.assign({}, beforeActionContext, actionContext));
+              onTrigger(Object.assign({}, beforeActionContext, actionContext), e);
               (_action$onTrigger = action.onTrigger) === null || _action$onTrigger === void 0 ? void 0 : _action$onTrigger.call(action);
 
             case 16:

package/lib/actions/danger-pop-confirm.d.ts

@@ -0,0 +1,5 @@
+import { PopConfirmAction } from './pop-confirm';
+export declare function useDangerPopConfirmAction(action: PopConfirmAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
+};
+export default useDangerPopConfirmAction;

package/lib/actions/danger-pop-confirm.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.useDangerPopConfirmAction = useDangerPopConfirmAction;
+
+var _utils = require("@teamix/utils");
+
+var _dialog = require("./dialog");
+
+function useDangerPopConfirmAction(action, context) {
+  return (0, _dialog.useDialogAction)((0, _utils.deepMerge)({
+    dialogType: 'pop',
+    popType: 'danger',
+    align: 'br'
+  }, action), context);
+}
+
+var _default = useDangerPopConfirmAction;
+exports.default = _default;

package/lib/actions/dialog.d.ts

@@ -8,7 +8,7 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     /** 点击「确认按钮」后的数据请求地址，非必填，不填就不发请求 */
     url?: string;
     /** 弹窗类型，支持普通弹窗和抽屉两种模式，默认为普通弹窗 */
-    dialogType?: 'dialog' | 'drawer';
+    dialogType?: 'dialog' | 'drawer' | 'pop';
     /** 弹窗快捷调用类型 */
     dialogQuickShowType?: 'alert' | 'confirm';
     /** 弹窗消息类型 */

package/lib/actions/dialog.js

@@ -16,6 +16,8 @@ var _reactRouterDom = require("react-router-dom");
 
 var _components = require("@alicloudfe/components");
 
+var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
+
 var _utils = require("@teamix/utils");
 
 var _form = _interopRequireWildcard(require("../form"));
@@ -29,7 +31,7 @@ var _request = require("./request");
 var _utils2 = require("./utils");
 
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -102,7 +104,9 @@ function useDialogAction(action, actionContext) {
   var footerDescriptionRef = (0, _react.useRef)();
   var history = (0, _reactRouterDom.useHistory)();
 
-  var onActionStart = function onActionStart(context) {
+  var onActionStart = function onActionStart(context, e) {
+    var _objectSpread2;
+
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -126,6 +130,7 @@ function useDialogAction(action, actionContext) {
         dialogQuickShowType = _getTargetValue.dialogQuickShowType,
         _getTargetValue$messa = _getTargetValue.messageType,
         messageType = _getTargetValue$messa === void 0 ? 'notice' : _getTargetValue$messa,
+        popType = _getTargetValue.popType,
         beforeRequest = _getTargetValue.beforeRequest,
         onTrigger = _getTargetValue.onTrigger,
         link = _getTargetValue.link,
@@ -135,20 +140,25 @@ function useDialogAction(action, actionContext) {
         footerDescription = _getTargetValue.footerDescription,
         footerAlign = _getTargetValue.footerAlign,
         className = _getTargetValue.className,
-        containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+        containerOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var isDrawer = dialogType === 'drawer';
-    var container = isDrawer ? _components.Drawer : _components.Dialog;
-    var dialogOnlyProps = {
+    var isPop = dialogType === 'pop';
+    var container = isDrawer ? _components.Drawer : isPop ? _popConfirm.default : _components.Dialog;
+    var containerProps = isDrawer ? {
+      okText: (0, _utils.getMessage)('ok'),
+      cancelText: (0, _utils.getMessage)('cancel'),
+      closeable: !loading
+    } : isPop ? {
+      type: popType,
+      trigger: e.currentTarget
+    } : {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
-      }
+      },
+      closeable: !loading
     };
-    var containerOtherProps = isDrawer ? {
-      okText: (0, _utils.getMessage)('ok'),
-      cancelText: (0, _utils.getMessage)('cancel')
-    } : dialogOnlyProps;
 
     var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
       if (footer instanceof Array || footer.component) {
@@ -177,15 +187,12 @@ function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (url) {
+                  if (!link) {
                     _context.next = 5;
                     break;
                   }
 
-                  if (link) {
-                    (0, _utils.goToLink)(link, history);
-                  }
-
+                  (0, _utils.goToLink)(link, history);
                   onFinish && onFinish();
                   resolve(true);
                   return _context.abrupt("return");
@@ -243,27 +250,19 @@ function useDialogAction(action, actionContext) {
       key: (0, _utils.uuid)()
     }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _objectSpread(_objectSpread({
-      // @ts-ignore
-      onOk: onOk,
-      title: addContextForReactNode(title, dialogContext),
-      content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-before-content"
-      }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-message"
-      }, (0, _message.renderProMessage)(message, {
-        type: 'notice'
-      })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
-        className: "teamix-pro-dialog-after-content"
-      }, addContextForReactNode(afterContent, dialogContext)), footerDescription && /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
-      }, renderDialogFooterDescription(footerDescription))),
-      closeable: !loading,
-      footerAlign: footerAlign,
-      className: (0, _classnames.default)('teamix-pro-action-dialog', {
-        'has-footer-description': !!footerDescription
-      })
-    }, containerOtherProps), containerProps);
+    var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-before-content"
+    }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-message"
+    }, (0, _message.renderProMessage)(message, {
+      type: 'notice'
+    })), dialogContent, afterContent && /*#__PURE__*/_react.default.createElement("div", {
+      className: "teamix-pro-dialog-after-content"
+    }, addContextForReactNode(afterContent, dialogContext)), !isPop && footerDescription && /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
+    }, renderDialogFooterDescription(footerDescription)))), _defineProperty(_objectSpread2, "footerAlign", footerAlign), _defineProperty(_objectSpread2, "className", (0, _classnames.default)('teamix-pro-action-dialog', {
+      'has-footer-description': !!footerDescription
+    })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
     store.hide = ret.hide;

package/lib/actions/index.d.ts

@@ -7,6 +7,7 @@ import { DialogAction } from './dialog';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
 import { DialogInfoAction } from './dialog-info';
+import { PopConfirmAction } from './pop-confirm';
 import './index.scss';
 export declare type ProActionConfig = ({
     type: 'dialog-form' | 'drawer-form';
@@ -15,6 +16,8 @@ export declare type ProActionConfig = ({
 } & DialogTableAction) | ({
     type: 'dialog-info' | 'drawer-info';
 } & DialogInfoAction) | ({
+    type: 'pop-confirm' | 'danger-pop-confirm';
+} & PopConfirmAction) | ({
     type: 'dialog' | 'drawer' | 'confirm' | 'danger-confirm' | 'notice' | 'error';
 } & DialogAction) | ({
     type: 'request';
@@ -24,6 +27,7 @@ export declare type ProActionConfig = ({
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ButtonProps {
+    key?: string | number;
     config?: ProActionConfig;
     visible?: any;
     disabled?: any;
@@ -33,6 +37,7 @@ export interface ProActionButtonProps extends ButtonProps {
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
 export interface ProActionMenuButtonProps extends MenuButtonProps {
+    key?: string | number;
     actions: ProActionProps[];
     visible?: any;
     icon?: string;

package/lib/actions/index.js

@@ -47,6 +47,10 @@ var _drawerTable = require("./drawer-table");
 
 var _drawerInfo = require("./drawer-info");
 
+var _popConfirm = require("./pop-confirm");
+
+var _dangerPopConfirm = require("./danger-pop-confirm");
+
 require("./index.scss");
 
 var _excluded = ["type"],
@@ -54,8 +58,8 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["actions"],
-    _excluded7 = ["config"],
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
     _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -155,6 +159,14 @@ function useAction(config, context) {
     return (0, _drawerInfo.useDrawerInfoAction)(others, context);
   }
 
+  if (type === 'pop-confirm') {
+    return (0, _popConfirm.usePopConfirmAction)(others, context);
+  }
+
+  if (type === 'danger-pop-confirm') {
+    return (0, _dangerPopConfirm.useDangerPopConfirmAction)(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {
@@ -242,8 +254,8 @@ function renderCommonActionButtonMenuItem(action, key, context) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
       key: key,
       label: menuBtn.label || menuBtn.children
-    }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, String(j), context);
+    }, menuBtn.actions.map(function (a) {
+      return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
 
@@ -278,7 +290,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, String(i), context);
+    return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -292,7 +304,9 @@ function formatGroupActions(actions, max, moreConfig) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({}, moreConfig), {}, {
+  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+    key: '__teamix_pro_action_group_more_btn'
+  }, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
 } // 渲染一个 button 或者 menu button
@@ -338,22 +352,34 @@ function getDefaultMoreButton(type, moreText) {
 
 var MAX_ACTTIONS = 4;
 
-function getActionConfig(action, context) {
+function getKey(index, key) {
+  if (key !== undefined) {
+    return key;
+  }
+
+  return "__teamix_pro_action_key_".concat(index);
+}
+
+function getActionConfig(action, index, context) {
   if (action.actions) {
-    var actions = action.actions,
+    var _key = action.key,
+        actions = action.actions,
         _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
-      actions: actions.map(function (a) {
-        return getActionConfig(a, context);
+      key: getKey(index, _key),
+      actions: actions.map(function (a, j) {
+        return getActionConfig(a, j, context);
       })
     }, (0, _utils.getTargetValue)(_others, context));
   }
 
-  var config = action.config,
+  var key = action.key,
+      config = action.config,
       others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
+    key: getKey(index, key),
     config: config
   }, (0, _utils.getTargetValue)(others, context));
 }
@@ -373,8 +399,8 @@ function ProActionGroup(props) {
       containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
-  var filteredActions = actions.map(function (action) {
-    return getActionConfig(action, context);
+  var filteredActions = actions.map(function (action, index) {
+    return getActionConfig(action, index, context);
   }).filter(function (action) {
     return action.visible !== false;
   });
@@ -386,7 +412,7 @@ function ProActionGroup(props) {
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
-      key: i
+      key: actionBtn.key
     }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
       direction: "ver"
     }));

package/lib/actions/pop-confirm.d.ts

@@ -0,0 +1,9 @@
+import { IPopConfirmProps } from '@teamix/pop-confirm';
+import { DialogAction } from './dialog';
+export declare type PopConfirmAction = DialogAction & Omit<IPopConfirmProps, 'type' | 'trigger'> & {
+    popType?: IPopConfirmProps['type'];
+};
+export declare function usePopConfirmAction(action: PopConfirmAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
+};
+export default usePopConfirmAction;

package/lib/actions/pop-confirm.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.usePopConfirmAction = usePopConfirmAction;
+
+var _utils = require("@teamix/utils");
+
+var _dialog = _interopRequireDefault(require("./dialog"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function usePopConfirmAction(action, context) {
+  return (0, _dialog.default)((0, _utils.deepMerge)({
+    dialogType: 'pop',
+    align: 'br'
+  }, action), context);
+}
+
+var _default = usePopConfirmAction;
+exports.default = _default;

package/lib/form/Components/LightFilter/componentMap.d.ts

@@ -1,2 +1,3 @@
 declare const componentMap: any;
-export default componentMap;
+declare const inputCategory: any[];
+export { componentMap, inputCategory };

package/lib/form/Components/LightFilter/componentMap.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.inputCategory = exports.componentMap = void 0;
 var componentMap = {
   Radio: 'Select',
   Checkbox: 'Select'
 };
-var _default = componentMap;
-exports.default = _default;
+exports.componentMap = componentMap;
+var inputCategory = ['Input', 'Password', 'TextArea', 'NumberPicker', 'Percent', 'Money'];
+exports.inputCategory = inputCategory;

package/lib/form/Components/LightFilter/index.d.ts

@@ -8,6 +8,7 @@ import './index.scss';
 interface ILightFiter {
     size?: 'small' | 'medium' | 'large';
     defaultFilterValue?: string;
+    onFilterChange?: (schema?: any) => any;
     filterProps?: SelectProps;
     buttonProps?: ButtonProps;
 }

package/lib/form/Components/LightFilter/index.js

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
-var _componentMap = _interopRequireDefault(require("./componentMap"));
+var _componentMap = require("./componentMap");
 
 require("./index.scss");
 
@@ -53,13 +53,12 @@ var useMain = function useMain(active) {
   var main = [];
   schema.mapProperties(function (schema, name) {
     // console.log(schema.required); // 添加 *
-    // console.log(schema);
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': _componentMap.default[schema['x-component']] || schema['x-component']
+          'x-component': _componentMap.componentMap[schema['x-component']] || schema['x-component']
         })
       });
     }
@@ -78,16 +77,21 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
+}; // 是否输入框类型的组件
+
+
+var isInputCategory = function isInputCategory(currentSchema) {
+  var component = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema['x-component'];
+  return _componentMap.inputCategory.includes(component);
 };
 
 var LightFilter = (0, _react2.observer)(function (props) {
-  var _filterItems$;
+  var _filterItems$, _main$;
 
-  var field = (0, _react2.useField)();
-  var schema = (0, _react2.useFieldSchema)();
   var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
 
@@ -97,6 +101,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
       setActive = _useState2[1];
 
   var main = useMain(active);
+  var currentSchema = (_main$ = main[0]) === null || _main$ === void 0 ? void 0 : _main$.schema;
   var defaultCls = (0, _utils.usePrefixCls)();
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-light-filter'
@@ -107,20 +112,21 @@ var LightFilter = (0, _react2.observer)(function (props) {
     return /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
       key: key,
       name: name,
-      schema: schema,
-      filterProperties: function filterProperties(schema) {
-        return true;
-      }
+      schema: schema
     });
   });
+  var onSelectChange = (0, _react.useCallback)(function (value) {
+    setActive(value);
+    onFilterChange && onFilterChange(value);
+  }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size))
+    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-main")
   }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
     className: (0, _classnames.default)("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
-    onChange: setActive,
+    onChange: onSelectChange,
     value: active
   })), content), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-addonAfter")

package/lib/form/Components/LightFilter/index.scss

@@ -18,10 +18,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
     box-sizing: border-box;
     border: var(--search-normal-normal-border-width, 1px) solid
       var(--color-line1-2, #d9d9d9);
-    border-right: 0;
     border-radius: var(--search-normal-corner, 2px);
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
     // 表单项选择
     .#{$light-filter}-select {
       min-width: auto;
@@ -30,7 +27,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
         border: 0;
         box-shadow: none;
         .#{$css-prefix}input-text-field {
-          padding-right: 0;
+          padding-right: 4px;
         }
       }
       .#{$css-prefix}input {
@@ -44,6 +41,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
 
   // 按钮后缀
   .#{$light-filter}-addonAfter {
+    display: none;
     .#{$css-prefix}btn {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
@@ -54,6 +52,18 @@ $light-filter: #{teamix-pro-form}-light-filter;
   }
 }
 
+// LightFilter输入类
+.#{$light-filter}-input-category {
+  .#{$light-filter}-main {
+    border-right: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .#{$light-filter}-addonAfter {
+    display: block;
+  }
+}
+
 // LightFilter无边框
 .#{$form-item-cls}-bordered-none {
   .#{$form-item-cls}-control {

package/lib/form/Filter/AdvancedFilter.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import type { FilterProps } from '../typing';
+/**
+ * 高级筛选
+ */
+declare const AdvancedFilter: React.FC<FilterProps>;
+export default AdvancedFilter;