@teamix/pro 1.2.28 → 1.2.29

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 (9) hide show
  1. package/dist/pro.js +15 -7
  2. package/dist/pro.min.js +1 -1
  3. package/es/index.d.ts +1 -1
  4. package/es/index.js +1 -1
  5. package/es/table/index.js +14 -6
  6. package/lib/index.d.ts +1 -1
  7. package/lib/index.js +1 -1
  8. package/lib/table/index.js +14 -6
  9. 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.28";
27
+ declare const version = "1.2.29";
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.28';
33
+ var version = '1.2.29';
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/index.js CHANGED
@@ -633,8 +633,6 @@ var ProTable = function ProTable(props) {
633
633
  }
634
634
 
635
635
  useEffect(function () {
636
- var _dataFilterForm3;
637
-
638
636
  // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
639
637
  initActionRef();
640
638
  dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
@@ -647,11 +645,21 @@ var ProTable = function ProTable(props) {
647
645
  };
648
646
  }
649
647
 
650
- if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
651
- // 在请求发送之前 处理漏斗默认数据
652
- processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
648
+ if (propsDataFilter) {
649
+ var _dataFilterForm3;
650
+
651
+ if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
652
+ // 在请求发送之前 处理漏斗默认数据
653
+ processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
654
+
655
+ _request();
656
+ }
657
+ } else {
658
+ if (requestWhenMount) {
659
+ processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
653
660
 
654
- _request();
661
+ _request();
662
+ }
655
663
  }
656
664
 
657
665
  return function () {
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.28";
27
+ declare const version = "1.2.29";
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.28';
288
+ var version = '1.2.29';
289
289
  exports.version = version;
package/lib/table/index.js CHANGED
@@ -677,8 +677,6 @@ var ProTable = function ProTable(props) {
677
677
  }
678
678
 
679
679
  (0, _react.useEffect)(function () {
680
- var _dataFilterForm3;
681
-
682
680
  // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
683
681
  (0, _utils2.initActionRef)();
684
682
  dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
@@ -691,11 +689,21 @@ var ProTable = function ProTable(props) {
691
689
  };
692
690
  }
693
691
 
694
- if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
695
- // 在请求发送之前 处理漏斗默认数据
696
- (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
692
+ if (propsDataFilter) {
693
+ var _dataFilterForm3;
694
+
695
+ if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
696
+ // 在请求发送之前 处理漏斗默认数据
697
+ (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
698
+
699
+ _request();
700
+ }
701
+ } else {
702
+ if (requestWhenMount) {
703
+ (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
697
704
 
698
- _request();
705
+ _request();
706
+ }
699
707
  }
700
708
 
701
709
  return function () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.2.28",
3
+ "version": "1.2.29",
4
4
  "description": "TeamixPro大包",
5
5
  "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
6
6
  "author": "Velociraptor(迅猛龙)",