@teamix/pro 1.2.29 → 1.2.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/pro.css +1 -1
  2. package/dist/pro.js +19 -4
  3. package/dist/pro.min.css +1 -1
  4. package/dist/pro.min.js +1 -1
  5. package/es/index.d.ts +1 -1
  6. package/es/index.js +1 -1
  7. package/es/table/components/Layout/index.js +18 -3
  8. package/es/table/index.scss +4 -0
  9. package/lib/index.d.ts +1 -1
  10. package/lib/index.js +1 -1
  11. package/lib/table/components/Layout/index.js +18 -3
  12. package/lib/table/index.scss +4 -0
  13. package/package.json +1 -1
package/es/index.d.ts CHANGED
@@ -24,5 +24,5 @@ export * from './skeleton';
24
24
  export * from './table';
25
25
  export * from './utils';
26
26
  export * from './step';
27
- declare const version = "1.2.29";
27
+ declare const version = "1.2.30";
28
28
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
package/es/index.js CHANGED
@@ -30,7 +30,7 @@ export * from './table';
30
30
  export * from './utils'; // export * from './sidebar';
31
31
 
32
32
  export * from './step';
33
- var version = '1.2.29';
33
+ var version = '1.2.30';
34
34
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
35
35
  ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
36
36
  ProStep, hooks, nocode, templates, utils };
package/es/table/components/Layout/index.js CHANGED
@@ -60,8 +60,10 @@ var Layout = function Layout(props) {
60
60
 
61
61
 
62
62
  var renderQueryFilter = function renderQueryFilter() {
63
- if (dataFilter) {
64
- var _dataFilter$schema;
63
+ var _dataFilter$schema;
64
+
65
+ if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
66
+ var _dataFilter$schema2;
65
67
 
66
68
  if ( /*#__PURE__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
67
69
  // 自定义渲染内容
@@ -89,7 +91,7 @@ var Layout = function Layout(props) {
89
91
  actionRef: actionRef
90
92
  }, otherProps)))
91
93
  }, dataFilter));
92
- } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) >= 0) {
94
+ } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
93
95
  return /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
94
96
  formRef: dataFilterFormRef,
95
97
  onExpand: function onExpand(expand) {
@@ -115,6 +117,19 @@ var Layout = function Layout(props) {
115
117
  }, otherProps)))
116
118
  }, dataFilter));
117
119
  }
120
+ } else if (mainAction) {
121
+ // 没传 dataFilter 但是传了 mainAction
122
+ return /*#__PURE__*/React.createElement(QueryFilterLayout, {
123
+ className: "mb8",
124
+ addonBefore: renderMainAction(),
125
+ addonAfter: /*#__PURE__*/React.createElement(React.Fragment, null, extra && !header && /*#__PURE__*/React.createElement(QuickAction, {
126
+ actionRef: actionRef,
127
+ quickAction: extra,
128
+ rowSelection: rowSelection
129
+ }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
130
+ actionRef: actionRef
131
+ }, otherProps)))
132
+ });
118
133
  }
119
134
  }; // 区域组合渲染
120
135
 
package/es/table/index.scss CHANGED
@@ -114,4 +114,8 @@ $fullscreenPadding: 24px;
114
114
  // 后面在基础组件里面覆盖
115
115
  .next-table.next-table td .next-table-cell-wrapper {
116
116
  text-overflow: unset;
117
+ }
118
+
119
+ .mb8 {
120
+ margin-bottom: 8px;
117
121
  }
package/lib/index.d.ts CHANGED
@@ -24,5 +24,5 @@ export * from './skeleton';
24
24
  export * from './table';
25
25
  export * from './utils';
26
26
  export * from './step';
27
- declare const version = "1.2.29";
27
+ declare const version = "1.2.30";
28
28
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
285
285
  // 设置图标源
286
286
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
287
287
 
288
- var version = '1.2.29';
288
+ var version = '1.2.30';
289
289
  exports.version = version;
package/lib/table/components/Layout/index.js CHANGED
@@ -80,8 +80,10 @@ var Layout = function Layout(props) {
80
80
 
81
81
 
82
82
  var renderQueryFilter = function renderQueryFilter() {
83
- if (dataFilter) {
84
- var _dataFilter$schema;
83
+ var _dataFilter$schema;
84
+
85
+ if (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) {
86
+ var _dataFilter$schema2;
85
87
 
86
88
  if ( /*#__PURE__*/(0, _react.isValidElement)(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
87
89
  // 自定义渲染内容
@@ -109,7 +111,7 @@ var Layout = function Layout(props) {
109
111
  actionRef: actionRef
110
112
  }, otherProps)))
111
113
  }, dataFilter));
112
- } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema = dataFilter.schema) === null || _dataFilter$schema === void 0 ? void 0 : _dataFilter$schema.length) >= 0) {
114
+ } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
113
115
  return /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
114
116
  formRef: dataFilterFormRef,
115
117
  onExpand: function onExpand(expand) {
@@ -135,6 +137,19 @@ var Layout = function Layout(props) {
135
137
  }, otherProps)))
136
138
  }, dataFilter));
137
139
  }
140
+ } else if (mainAction) {
141
+ // 没传 dataFilter 但是传了 mainAction
142
+ return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
143
+ className: "mb8",
144
+ addonBefore: renderMainAction(),
145
+ addonAfter: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, extra && !header && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
146
+ actionRef: actionRef,
147
+ quickAction: extra,
148
+ rowSelection: rowSelection
149
+ }), /*#__PURE__*/_react.default.createElement(_ToolBar.default, _objectSpread({
150
+ actionRef: actionRef
151
+ }, otherProps)))
152
+ });
138
153
  }
139
154
  }; // 区域组合渲染
140
155
 
package/lib/table/index.scss CHANGED
@@ -114,4 +114,8 @@ $fullscreenPadding: 24px;
114
114
  // 后面在基础组件里面覆盖
115
115
  .next-table.next-table td .next-table-cell-wrapper {
116
116
  text-overflow: unset;
117
+ }
118
+
119
+ .mb8 {
120
+ margin-bottom: 8px;
117
121
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.2.29",
3
+ "version": "1.2.30",
4
4
  "description": "TeamixPro大包",
5
5
  "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
6
6
  "author": "Velociraptor(迅猛龙)",