@teamix/pro 1.3.17 → 1.4.2

package/es/table/utils/columnRender.js

@@ -28,9 +28,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 渲染列的逻辑函数
  */
 import React from 'react';
-import { getTargetValue, LabelIconTip } from '@teamix/utils';
+import { getTargetValue } from '@teamix/utils';
 import { ProActionGroup } from '../../actions';
-import ProField from '../../field';
+import ProField, { LabelIconTip } from '../../field';
 import Filter from '../components/Filter';
 /**
  * 增加了 icon 的功能 render title
@@ -108,7 +108,9 @@ export var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
  * 负责单元格的具体渲染
  */
 
-export var renderCell = function renderCell(value, item, index, record, actionRef) {
+export var renderCell = function renderCell(value, item, index, record, actionRef,
+/** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+context) {
   var _actionSchema$actions;
 
   var _item$valueType = item.valueType,
@@ -169,12 +171,13 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
 
   if (actionSchema && ((_actionSchema$actions = actionSchema.actions) === null || _actionSchema$actions === void 0 ? void 0 : _actionSchema$actions.length)) {
     // 默认 context
-    var defaultContext = {
+    var defaultContext = _objectSpread({
       value: value,
       index: index,
       record: record,
       action: actionRef.current
-    };
+    }, context);
+
     return /*#__PURE__*/React.createElement(ProActionGroup, _objectSpread(_objectSpread({
       type: "text"
     }, actionSchema), {}, {

package/es/table/utils/genProColumnToColumn.d.ts

@@ -6,4 +6,4 @@ import { ColumnProps } from '@alicloudfe/components/types/table';
  */
 export default function genProColumnToColumn(columns: ProTableColumnProps[], 
 /** 是否渲染骨架屏 */
-showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>): ColumnProps[];
+showSkeleton: boolean, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any): ColumnProps[];

package/es/table/utils/genProColumnToColumn.js

@@ -20,6 +20,7 @@ import { ProSkeletonRaw as Skeleton } from '../../skeleton';
 export default function genProColumnToColumn(columns,
 /** 是否渲染骨架屏 */
 showSkeleton, actionRef) {
+  var context = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   return columns.map(function (columnProps) {
     var filters = columnProps.filters,
         dataIndex = columnProps.dataIndex,
@@ -44,7 +45,7 @@ showSkeleton, actionRef) {
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: renderColumnsTitle(columnProps, actionRef),
       cell: function cell(value, index, record) {
-        return renderCell(value, columnProps, index, record, actionRef);
+        return renderCell(value, columnProps, index, record, actionRef, context);
       }
     });
   });

package/es/table/utils/pureColumnRender.js

@@ -28,8 +28,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 渲染列的逻辑函数，用于非 ProTable 比如 selectTable
  */
 import React from 'react';
-import { getTargetValue, LabelIconTip } from '@teamix/utils';
-import ProField from '../../field';
+import { getTargetValue } from '@teamix/utils';
+import ProField, { LabelIconTip } from '../../field';
 /**
  * 增加了 icon 的功能 render title
  */

package/es/timeline/ProTimeLineItem/index.js

@@ -28,11 +28,11 @@ import React, { useCallback, useState } from 'react';
 import './index.scss';
 import { Icon, Timeline } from '@alicloudfe/components';
 import classnames from 'classnames';
-import { baseClass, dateFormat } from '@teamix/utils';
-import { renderTags } from '@teamix/utils';
+import { usePrefixCls, dateFormat } from '@teamix/utils';
+import { renderTags } from '../../field';
 import TeamixIcon from '@teamix/icon';
 var TimelineItem = Timeline.Item;
-var cls = baseClass('teamix-pro-timeline');
+var cls = usePrefixCls('teamix-pro-timeline');
 
 var ProTimeLineItem = function ProTimeLineItem(props) {
   var _props$_comment = props._comment,

package/es/timeline/index.js

@@ -13,10 +13,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo } from 'react';
 import { Timeline } from '@alicloudfe/components';
 import ProTimeLineItem from './ProTimeLineItem';
-import { baseClass } from '@teamix/utils';
+import { usePrefixCls } from '@teamix/utils';
 import classNames from 'classnames';
 import './index.scss';
-var cls = baseClass('teamix-pro-timeline');
+var cls = usePrefixCls('teamix-pro-timeline');
 
 var ProTimeline = function ProTimeline(props) {
   var items = props.items,

package/es/timeline/typing.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { ProTagItem } from '@teamix/utils';
+import { ProTagItem } from '../field';
 export declare type ProTimeLineItemStatus = 'success' | 'fail' | 'process' | 'warning' | 'wait';
 export declare type FoldProps = {
     /**

package/lib/actions/index.js

@@ -262,6 +262,10 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
       tooltip = action.tooltip,
       disabledTooltip = action.disabledTooltip,
       tooltipProps = action.tooltipProps;
+  var basePrefix = (0, _utils.usePrefixCls)('', {
+    base: true
+  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-action');
   var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
@@ -299,7 +303,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
   }
 
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
-    className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
+    className: (0, _classnames.default)(_defineProperty({}, basePrefix('disabled'), disabled), basePrefix('menu-item'), prefixCls('menu-item'))
   }, buttonProps), content);
 };
 

package/lib/card/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProTagItem } from '@teamix/utils';
+import { ProTagItem } from '../field';
 import { ProMessageProps } from '../utils/message';
 import { ProActionGroupProps } from '../actions';
 import './index.scss';

package/lib/card/index.js

@@ -20,6 +20,8 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
+var _field = require("../field");
+
 var _message = require("../utils/message");
 
 var _skeleton = require("../skeleton");
@@ -78,7 +80,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-card');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-card');
 
 var renderActionGroup = function renderActionGroup(extra, context) {
   if (!extra) {
@@ -258,7 +260,7 @@ var ProCard = function ProCard(props) {
     }, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
       align: "t",
       trigger: tooltipTrigger
-    }, tooltip)), tags && (0, _utils.renderTags)(tags, 'small'), description && /*#__PURE__*/_react.default.createElement("div", {
+    }, tooltip)), tags && (0, _field.renderTags)(tags, 'small'), description && /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title-description')
     }, /*#__PURE__*/_react.default.createElement(_proField.default, {
       value: description,

package/lib/card/selectable.js

@@ -29,7 +29,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var cls = (0, _utils.baseClass)('teamix-pro-card-selectable');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-card-selectable');
 
 var ProCardSelectable = function ProCardSelectable(props) {
   var selected = props.selected,

package/lib/card/utils.js

@@ -8,7 +8,7 @@ exports.getColClassAndStyle = getColClassAndStyle;
 
 var _utils = require("@teamix/utils");
 
-var cls = (0, _utils.baseClass)('teamix-pro-card');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-card');
 
 function formatSpacing(spacing) {
   var spacingArray = spacing instanceof Array ? spacing : [spacing || 0, spacing || 0];

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

@@ -73,7 +73,9 @@ Editable.BaseBuilder = function (type) {
         visible = _useState2[0],
         setVisible = _useState2[1];
 
-    var prefixCls = (0, _utils.usePrefixCls)('formily-editable');
+    var prefixCls = (0, _utils.usePrefixCls)('formily-editable', {
+      base: true
+    });
 
     var onOk = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -131,13 +133,13 @@ Editable.BaseBuilder = function (type) {
       },
       onClick: onOpen
     }, /*#__PURE__*/_react.default.createElement(_formily.BaseItem, {
-      className: "".concat(prefixCls, "-trigger")
+      className: prefixCls('trigger')
     }, /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(prefixCls, "-content")
+      className: prefixCls('content')
     }, /*#__PURE__*/_react.default.createElement("span", {
-      className: "".concat(prefixCls, "-preview")
+      className: prefixCls('preview')
     }, field.title), pattern === 'editable' && /*#__PURE__*/_react.default.createElement(_icon.default, {
-      className: "".concat(prefixCls, "-edit-btn"),
+      className: prefixCls('edit-btn'),
       type: "form-line",
       size: "small"
     })))), /*#__PURE__*/_react.default.createElement(type, _objectSpread(_objectSpread({
@@ -162,7 +164,9 @@ Editable.Popover = (0, _react2.observer)(function (_ref3) {
       visible = _useState4[0],
       setVisible = _useState4[1];
 
-  var prefixCls = (0, _utils.usePrefixCls)('formily-editable');
+  var prefixCls = (0, _utils.usePrefixCls)('formily-editable', {
+    base: true
+  });
 
   var closePopover = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
@@ -229,13 +233,13 @@ Editable.Popover = (0, _react2.observer)(function (_ref3) {
         display: 'inline-flex'
       }
     }, /*#__PURE__*/_react.default.createElement(_formily.BaseItem, {
-      className: "".concat(prefixCls, "-trigger")
+      className: prefixCls('trigger')
     }, /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(prefixCls, "-content")
+      className: prefixCls('content')
     }, /*#__PURE__*/_react.default.createElement("span", {
-      className: "".concat(prefixCls, "-preview")
+      className: prefixCls('preview')
     }, props.title || field.title), pattern === 'editable' && /*#__PURE__*/_react.default.createElement(_icon.default, {
-      className: "".concat(prefixCls, "-edit-btn"),
+      className: prefixCls('edit-btn'),
       type: "form-line",
       size: "small"
     }))))

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

@@ -62,23 +62,27 @@ var FormGroupGroupPanel = (0, _react2.observer)(function (_ref) {
       xIndex = _ref.xIndex,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  var prefixCls = (0, _utils.usePrefixCls)('formily-group-panel');
+  var prefixCls = (0, _utils.usePrefixCls)('formily-group-panel', {
+    base: true
+  });
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, props), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className)
+    className: (0, _classnames.default)(prefixCls(), props.className)
   }), xIndex !== 0 ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-divider")
+    className: prefixCls('divider')
   }) : null, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-title")
+    className: prefixCls('title')
   }, title), children);
 });
 var FormGroup = (0, _react2.observer)(function (_ref2) {
   var children = _ref2.children,
       props = _objectWithoutProperties(_ref2, _excluded2);
 
-  var prefixCls = (0, _utils.usePrefixCls)('formily-group');
+  var prefixCls = (0, _utils.usePrefixCls)('formily-group', {
+    base: true
+  });
   var panels = usePanels();
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, props), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className)
+    className: (0, _classnames.default)(prefixCls(), props.className)
   }), panels.map(function (_ref3, index) {
     var props = _ref3.props,
         schema = _ref3.schema,

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

@@ -118,10 +118,10 @@ var LightFilter = (0, _react2.observer)(function (props) {
 
   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'
+  var basePrefix = (0, _utils.usePrefixCls)('', {
+    base: true
   });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-light-filter');
   var content = main.map(function (_ref, key) {
     var schema = _ref.schema,
         name = _ref.name;
@@ -136,16 +136,19 @@ var LightFilter = (0, _react2.observer)(function (props) {
     onFilterChange && onFilterChange(value);
   }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')
+    className: (0, _classnames.default)(basePrefix(size), prefixCls({
+      '': true,
+      'input-category': isInputCategory(currentSchema)
+    }))
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "".concat(prefixCls, "-main")
+    className: 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),
+    className: (0, _classnames.default)(prefixCls('select'), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
     onChange: onSelectChange,
     value: active
   })), content), /*#__PURE__*/_react.default.createElement("span", {
-    className: "".concat(prefixCls, "-addonAfter")
+    className: prefixCls('addonAfter')
   }, /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({}, buttonProps), /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "search-line"
   }))));

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

@@ -32,11 +32,9 @@ var Text = function Text(_ref) {
       className = _ref.className,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-text'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-text');
   return /*#__PURE__*/_react.default.createElement("span", _objectSpread({
-    className: (0, _classnames.default)(prefixCls, className)
+    className: (0, _classnames.default)(prefixCls(), className)
   }, otherProps), children);
 };
 

package/lib/form/Filter/AdvancedFilter.js

@@ -9,8 +9,6 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
@@ -62,9 +60,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       forceClear = props.forceClear,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-advanced'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
       name: 'FormGrid',
@@ -117,7 +113,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     };
   }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,
     feedbackLayout: "popover"
   }, otherProps), getTeamixLayout), {}, {

package/lib/form/Filter/Layout.js

@@ -9,8 +9,6 @@ exports.QueryFilterLayout = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _components = require("@alicloudfe/components");
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
@@ -53,9 +51,7 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
       expand = _ref.expand,
       onExpand = _ref.onExpand,
       children = _ref.children;
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-layout'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-layout');
 
   var _useState = (0, _react.useState)(!!expand),
       _useState2 = _slicedToArray(_useState, 2),
@@ -67,15 +63,15 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
     onExpand === null || onExpand === void 0 ? void 0 : onExpand(!visible);
   }, [visible]);
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(prefixCls, className)
+    className: (0, _utils.cls)(prefixCls(), className)
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-inline")
+    className: prefixCls('inline')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-left")
+    className: prefixCls('left')
   }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-addonBefore")
+    className: prefixCls('addonBefore')
   }, addonBefore) : null, inlineContent, (0, _utils.isValid)(panelContent) ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-toggle")
+    className: prefixCls('toggle')
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
     count: count,
     style: _objectSpread({
@@ -91,11 +87,13 @@ var QueryFilterLayout = function QueryFilterLayout(_ref) {
   }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "filter-line"
   }), (0, _utils.getMessage)('advancedFilter')))) : null), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-addonAfter")
+    className: prefixCls('addonAfter')
   }, addonAfter) : null), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-panel"), visible && (0, _utils.isValid)(panelContent) ? '' : "".concat(prefixCls, "-panel-hidden"))
+    className: (0, _utils.cls)(prefixCls('panel', {
+      'panel-hidden': !(visible && (0, _utils.isValid)(panelContent))
+    }))
   }, panelContent), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-children")
+    className: prefixCls('children')
   }, children));
 };
 

package/lib/form/Filter/LightFilter.js

@@ -9,8 +9,6 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _reactive = require("@formily/reactive");
 
 var _utils = require("@teamix/utils");
@@ -51,9 +49,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var filterValue = (0, _react.useRef)(defaultFilterValue || (schema === null || schema === void 0 ? void 0 : (_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-light'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-light');
   var lightFilterObs = (0, _react.useMemo)(function () {
     return (0, _reactive.observable)({
       onFilter: function onFilter() {}
@@ -115,7 +111,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       lightFilterObs: lightFilterObs
     }),
     form: form,
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     schema: LightSchema,
     feedbackLayout: "none",
     breakpoints: [],

package/lib/form/Filter/SimpleFilter.js

@@ -9,8 +9,6 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
@@ -69,9 +67,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-simple'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter-simple');
 
   var _initializeSearch = initializeSearch(schema),
       searchName = _initializeSearch.searchName,
@@ -112,7 +108,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     searchValue.current = (0, _utils.isValid)(searchDefaultValue) ? searchDefaultValue : '';
   }, []);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema,
     feedbackLayout: "popover",
     breakpoints: [],

package/lib/form/Filter/index.js

@@ -15,8 +15,6 @@ Object.defineProperty(exports, "QueryFilterLayout", {
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
 var _components = require("@alicloudfe/components");
@@ -128,9 +126,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var currentFormName = (0, _react.useRef)(defaultFormName);
   var currentForm = (0, _react.useRef)();
   var activeFilterValueRef = (0, _react.useRef)();
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-query-filter');
   var debounceFun = (0, _lodash.default)(function (fun, props) {
     return fun(props);
   }, filterDebounce); // 绑定URL
@@ -544,14 +540,16 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     setCurrentForm(currentFormName.current);
   }, []);
   return /*#__PURE__*/_react.default.createElement(_Layout.QueryFilterLayout, {
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     addonBefore: addonBefore,
     addonAfter: addonAfter,
     expand: panelVisible,
     onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
     inlineContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames.default)("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
+      className: (0, _utils.cls)(prefixCls('inline', {
+        'inline-hidden': purePanel || hasRequired
+      }))
     }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
       filterValues: filterValues,
@@ -559,7 +557,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       form: lightForm,
       onChange: onLightChange
     }))) : /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(prefixCls, "-inline")
+      className: prefixCls('inline')
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
       onChange: onSimpleChange,
@@ -585,9 +583,9 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         return onTagClose(key, index);
       }
     }, /*#__PURE__*/_react.default.createElement("span", {
-      className: "".concat(prefixCls, "-tag-title")
+      className: prefixCls('tag-title')
     }, label), /*#__PURE__*/_react.default.createElement("span", {
-      className: "".concat(prefixCls, "-tag-content")
+      className: prefixCls('tag-content')
     }, /*#__PURE__*/_react.default.createElement(_index.default, {
       type: type,
       value: value

package/lib/form/Filter/index2.js

@@ -9,8 +9,6 @@ exports.default = exports.SimpleFilter = exports.AdvancedFilter = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _utils = require("@teamix/utils");
 
 var _core = require("@formily/core");
@@ -76,9 +74,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onFilter = props.onFilter,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-simple'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-simple');
   var simpleSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'FormFlex',
@@ -103,7 +99,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     breakpoints: [],
     inset: true
   }, otherProps), eventProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     schema: simpleSchema
   }));
 });
@@ -128,9 +124,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol;
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-advanced'
-  });
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form-filter-advanced');
   var gridSchema = (0, _react.useMemo)(function () {
     return [{
       name: 'FormGrid',
@@ -190,7 +184,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     feedbackLayout: "popover"
   }, props), eventProps), getTeamixLayout), {}, {
     form: form,
-    className: (0, _classnames.default)(prefixCls, props.className),
+    className: (0, _utils.cls)(prefixCls(), props.className),
     schema: gridSchema,
     onSubmit: onFilter
   }));

package/lib/form/ProForm/index.d.ts

@@ -1,4 +1,5 @@
-import type { ComposedProForm } from '../typing';
+import React from 'react';
+import type { ProFormProps } from '../typing';
 import './index.scss';
-declare const ProForm: ComposedProForm;
+declare const ProForm: React.FC<ProFormProps>;
 export default ProForm;