@teamix/pro 1.2.32 → 1.2.33

package/lib/form/SchemaForm/index.js

@@ -242,18 +242,18 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = (0, _initializeRequest2.default)(request, suffix),
+      var _initializeRequest = (0, _initializeRequest2.default)(request, "".concat(suffix, "r")),
           requestReactions = _initializeRequest.reactions,
           requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, suffix),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d")),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
-          dataSourceScope = _initializeDataSource.scope; // 初始化rules
+          dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
 
 
-      var _initializeRules = (0, _initializeRules2.default)(rules, suffix),
+      var _initializeRules = (0, _initializeRules2.default)(rules, "".concat(suffix, "v")),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 

package/lib/form/index.d.ts

@@ -109,10 +109,10 @@ export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, Fo
 /**
  * 导出 Filter 组件
  */
-import { AdvancedFilter, SimpleFilter } from './Filter';
-import { QueryFilter } from './Filter/index2';
+import { QueryFilter } from './Filter';
 import { QueryFilterLayout } from './Filter/Layout';
-export { AdvancedFilter, SimpleFilter, QueryFilter, QueryFilterLayout };
+import { AdvancedFilter, SimpleFilter } from './Filter/index2';
+export { QueryFilter, QueryFilterLayout, AdvancedFilter, SimpleFilter };
 /**
  * 导出 ProForm 组件，支持快速搭建表单
  */

package/lib/form/index.js

@@ -23,15 +23,15 @@ var _exportNames = {
   FormConsumer: true,
   useForm: true,
   customComponent: true,
-  AdvancedFilter: true,
-  SimpleFilter: true,
   QueryFilter: true,
-  QueryFilterLayout: true
+  QueryFilterLayout: true,
+  AdvancedFilter: true,
+  SimpleFilter: true
 };
 Object.defineProperty(exports, "AdvancedFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.AdvancedFilter;
+    return _index.AdvancedFilter;
   }
 });
 Object.defineProperty(exports, "FormCollapse", {
@@ -73,7 +73,7 @@ Object.defineProperty(exports, "FormTab", {
 Object.defineProperty(exports, "QueryFilter", {
   enumerable: true,
   get: function get() {
-    return _index.QueryFilter;
+    return _Filter.QueryFilter;
   }
 });
 Object.defineProperty(exports, "QueryFilterLayout", {
@@ -85,7 +85,7 @@ Object.defineProperty(exports, "QueryFilterLayout", {
 Object.defineProperty(exports, "SimpleFilter", {
   enumerable: true,
   get: function get() {
-    return _Filter.SimpleFilter;
+    return _index.SimpleFilter;
   }
 });
 Object.defineProperty(exports, "createForm", {
@@ -168,10 +168,10 @@ var _customComponent = require("./ProForm/customComponent");
 
 var _Filter = require("./Filter");
 
-var _index = require("./Filter/index2");
-
 var _Layout = require("./Filter/Layout");
 
+var _index = require("./Filter/index2");
+
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/form/typing.d.ts

@@ -88,6 +88,8 @@ export interface QueryFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板模式下是否仅展示面板 */
+    purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
     /** 顶部筛选区前缀 */
@@ -112,6 +114,9 @@ export interface QueryFilterProps extends ProFormProps {
 /**
  * 兼容性导出
  */
+/**
+ * @deprecated 将在未来移除该组件，建议使用 QueryFilter 代替
+ */
 export interface IFilterProps extends ProFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.32";
+declare const version = "1.2.33";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.32';
+var version = '1.2.33';
 exports.version = version;

package/lib/info/components/ProInfoItem/index.js

@@ -36,7 +36,8 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
     }, /*#__PURE__*/_react.default.createElement(Row, {
-      gutter: 10
+      gutter: 10,
+      className: cls('base-row')
     }, /*#__PURE__*/_react.default.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')

package/lib/info/components/ProInfoItem/index.scss

@@ -22,6 +22,10 @@ $item-padding-bottom: 8px;
     display: flex;
     align-items: center;
   }
+  &-base-row {
+    display: flex;
+    align-items: center;
+  }
 }
 
 .teamix-pro-field-info-form-item-label {

package/lib/table/components/Layout/index.js

@@ -76,6 +76,19 @@ var Layout = function Layout(props) {
         context: _objectSpread(_objectSpread({}, defaultContext), mainAction.context)
       })));
     } else return mainAction;
+  }; // 渲染 addonAfter
+
+
+  var renderAddonAfter = function renderAddonAfter() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: cls('addon-after-wrapper')
+    }, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+      actionRef: actionRef,
+      quickAction: extra,
+      rowSelection: rowSelection
+    }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
+      actionRef: actionRef
+    }, otherProps)));
   }; // 渲染新版 QueryFilter
 
 
@@ -103,13 +116,7 @@ var Layout = function Layout(props) {
           },
           panelContent: dataFilter.content,
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
@@ -128,27 +135,18 @@ var Layout = function Layout(props) {
             (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand) && (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.onExpand(expand));
           },
           addonBefore: renderMainAction(),
-          addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-            actionRef: actionRef,
-            quickAction: extra,
-            rowSelection: rowSelection
-          }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-            actionRef: actionRef
-          }, otherProps)))
+          addonAfter: renderAddonAfter()
         }, dataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
       return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
-        className: "mb8",
         addonBefore: renderMainAction(),
-        addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
-          actionRef: actionRef,
-          quickAction: extra,
-          rowSelection: rowSelection
-        }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
-          actionRef: actionRef
-        }, otherProps)))
+        addonAfter: renderAddonAfter()
+      });
+    } else {
+      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+        addonAfter: renderAddonAfter()
       });
     }
   }; // 区域组合渲染
@@ -168,11 +166,19 @@ var Layout = function Layout(props) {
         rowSelection: rowSelection
       }))), renderQueryFilter());
     } else if (header && !mainAction) {
+      var _dataFilter$schema3, _dataFilter$schema4;
+
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), renderQueryFilter())));
+      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/_react.default.createElement("div", {
+        className: cls('right')
+      }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
+        actionRef: actionRef,
+        quickAction: extra,
+        rowSelection: rowSelection
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
     } else if (!header && mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

package/lib/table/components/Layout/index.scss

@@ -37,4 +37,11 @@ $prefix: 'teamix-pro-table-layout';
     padding: 16px;
     background: var(--panel-filter-bg, var(--color-fill1-2));
   }
+  &-main-action {
+    margin-bottom: 8px;
+  }
+  &-addon-after-wrapper {
+    display: flex;
+    align-items: center;
+  }
 }

package/lib/table/components/ToolBar/index.scss

@@ -1,6 +1,7 @@
 .teamix-pro-table-toolbar {
   width: 100%;
   text-align: right;
+  margin-bottom: 8px;
 }
 .teamix-pro-table-toolbar-custom {
   display: inline-block;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",