@zat-design/sisyphus-react 3.13.20-beta.3 → 3.13.20-beta.5

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 (17) hide show
  1. package/dist/index.esm.css +1 -1
  2. package/dist/less.esm.css +1 -1
  3. package/es/ProSelect/index.js +1 -4
  4. package/es/ProTable/hooks/useAntdTable.js +2 -1
  5. package/es/ProTable/propsType.d.ts +1 -1
  6. package/es/ProTabs/components/Card/index.js +3 -2
  7. package/es/ProTabs/index.js +4 -1
  8. package/es/ProTabs/propType.d.ts +5 -0
  9. package/es/ProTabs/style/index.less +34 -3
  10. package/lib/ProSelect/index.js +1 -4
  11. package/lib/ProTable/hooks/useAntdTable.js +2 -1
  12. package/lib/ProTable/propsType.d.ts +1 -1
  13. package/lib/ProTabs/components/Card/index.js +3 -2
  14. package/lib/ProTabs/index.js +4 -1
  15. package/lib/ProTabs/propType.d.ts +5 -0
  16. package/lib/ProTabs/style/index.less +34 -3
  17. package/package.json +1 -1
package/es/ProSelect/index.js CHANGED
@@ -324,10 +324,7 @@ export var ProSelect = (props, ref) => {
324
324
  allowClear: true,
325
325
  showArrow: true,
326
326
  loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
327
- onChange: handleChange
328
- // optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错，添加默认值
329
- // optionLabelProp="label" // 解决warning报错，添加默认值
330
- ,
327
+ onChange: handleChange,
331
328
  showSearch: true,
332
329
  filterOption: isFunction(_onSearch) ? false : (input, option) => {
333
330
  var _option$children;
package/es/ProTable/hooks/useAntdTable.js CHANGED
@@ -94,7 +94,8 @@ function useAntdTable(service, options, useRequestOptions) {
94
94
  queryBean: (_pickBy = pickBy(queryBean, item => item !== undefined)) !== null && _pickBy !== void 0 ? _pickBy : {}
95
95
  });
96
96
  if (transformParams) {
97
- return transformParams(realParams, requestParams);
97
+ var mergedParams = _objectSpread(_objectSpread({}, realParams), requestParams);
98
+ return transformParams(mergedParams);
98
99
  }
99
100
  return requestParams;
100
101
  };
package/es/ProTable/propsType.d.ts CHANGED
@@ -639,7 +639,7 @@ export interface ProTableRequestOptionsType<T, R> {
639
639
  * @description 在发送请求前转换参数
640
640
  * @default undefined
641
641
  */
642
- transformParams?: (params: any, requestParams: any) => any;
642
+ transformParams?: (params: any) => any;
643
643
  /**
644
644
  * 转换响应数据
645
645
  * @description 处理服务器返回的数据
package/es/ProTabs/components/Card/index.js CHANGED
@@ -13,7 +13,8 @@ var Card = props => {
13
13
  label = props.label,
14
14
  icon = props.icon,
15
15
  mode = props.mode,
16
- loading = props.loading;
16
+ loading = props.loading,
17
+ size = props.size;
17
18
  var antIcon = /*#__PURE__*/_jsx(LoadingOutlined, {
18
19
  style: {
19
20
  fontSize: 24
@@ -24,7 +25,7 @@ var Card = props => {
24
25
  className: "pro-tabs-card",
25
26
  children: mode === 'card' ? /*#__PURE__*/_jsxs(_Space, {
26
27
  size: 8,
27
- align: "center",
28
+ align: size === 'small' ? 'start' : 'center',
28
29
  children: [/*#__PURE__*/_jsxs("div", {
29
30
  className: "pro-tabs-card-left",
30
31
  children: [/*#__PURE__*/_jsx("div", {
package/es/ProTabs/index.js CHANGED
@@ -60,7 +60,8 @@ var ProTabs = (props, ref) => {
60
60
  icon: itemProps.icon,
61
61
  mode,
62
62
  title: itemProps.title || itemProps.label,
63
- loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading
63
+ loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
64
+ size: rest === null || rest === void 0 ? void 0 : rest.size
64
65
  };
65
66
  return _objectSpread(_objectSpread({}, omit(itemProps, ['total', 'label', 'icon'])), {}, {
66
67
  label: /*#__PURE__*/_jsx(Card, _objectSpread({}, cardItemProps))
@@ -69,7 +70,9 @@ var ProTabs = (props, ref) => {
69
70
  }, [selectList, fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading]);
70
71
  var cls = classNames({
71
72
  'pro-tabs': mode === 'card',
73
+ 'pro-tabs-mode-card': mode === 'card',
72
74
  'pro-tabs-tab': mode !== 'card',
75
+ 'pro-tabs-size-small': (rest === null || rest === void 0 ? void 0 : rest.size) === 'small',
73
76
  [className]: className
74
77
  });
75
78
  var handleChange = key => {
package/es/ProTabs/propType.d.ts CHANGED
@@ -85,6 +85,11 @@ export interface ProTabsType extends Omit<TabsProps, 'items' | 'onChange'> {
85
85
  service: Service<any, any>;
86
86
  options?: Options<any, any>;
87
87
  };
88
+ /**
89
+ * @description 卡片大小
90
+ * @default default
91
+ */
92
+ size?: 'small' | 'middle' | 'large';
88
93
  [key: string]: any;
89
94
  }
90
95
  export type ProTabsProps = ProTabsType;
package/es/ProTabs/style/index.less CHANGED
@@ -2,6 +2,37 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-tabs {
5
+ &.pro-tabs-mode-card {
6
+ &.pro-tabs-size-small {
7
+ .pro-tabs-card {
8
+ .pro-tabs-card-left {
9
+ width: 84px !important;
10
+ }
11
+ .pro-tabs-card-right img {
12
+ width: 24px !important;
13
+ }
14
+ }
15
+ }
16
+ .@{ant-prefix}-tabs-tab {
17
+ margin-right: 10px !important;
18
+ background: #ffffff !important;
19
+ border-radius: 8px !important;
20
+ &.@{ant-prefix}-tabs-tab-active {
21
+ background: var(--ant-primary-1) !important;
22
+ border: 1px solid var(--ant-primary-color) !important;
23
+ }
24
+ .pro-tabs-card {
25
+ width: 100%;
26
+ padding: 8px 12px !important;
27
+ border: none !important;
28
+ border: 1px solid #E7E7E7 !important;
29
+ border-radius: 8px !important;
30
+ }
31
+ }
32
+ .@{ant-prefix}-tabs-ink-bar {
33
+ display: none !important;
34
+ }
35
+ }
5
36
  .@{ant-prefix}-tabs .@{ant-prefix}-tabs-nav-list .@{ant-prefix}-tabs-tab {
6
37
  padding: 0 !important;
7
38
  }
@@ -35,7 +66,7 @@
35
66
  }
36
67
 
37
68
  .pro-tabs-card {
38
- width: 200px;
69
+ width: 192px;
39
70
  padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
40
71
  border: 1px solid var(--zaui-line, #dddddd);
41
72
  border-left: none;
@@ -47,11 +78,11 @@
47
78
  .pro-tabs-card-left-total {
48
79
  color: var(--zaui-text, #343434);
49
80
  font-weight: 600;
50
- font-size: var(--zaui-font-size-lg-title, 24px);
81
+ font-size: var(--zaui-font-size-lg, 16px);
51
82
  }
52
83
 
53
84
  .pro-tabs-card-left-label {
54
- color: var(--aui-text, #343434);
85
+ color: #626366;
55
86
  font-weight: 400;
56
87
  font-size: var(--zaui-font-size, 14px);
57
88
  }
package/lib/ProSelect/index.js CHANGED
@@ -332,10 +332,7 @@ var ProSelect = (props, ref) => {
332
332
  allowClear: true,
333
333
  showArrow: true,
334
334
  loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
335
- onChange: handleChange
336
- // optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错，添加默认值
337
- // optionLabelProp="label" // 解决warning报错，添加默认值
338
- ,
335
+ onChange: handleChange,
339
336
  showSearch: true,
340
337
  filterOption: (0, _lodash.isFunction)(_onSearch) ? false : (input, option) => {
341
338
  var _option$children;
package/lib/ProTable/hooks/useAntdTable.js CHANGED
@@ -102,7 +102,8 @@ function useAntdTable(service, options, useRequestOptions) {
102
102
  queryBean: (_pickBy = (0, _lodash.pickBy)(queryBean, item => item !== undefined)) !== null && _pickBy !== void 0 ? _pickBy : {}
103
103
  });
104
104
  if (transformParams) {
105
- return transformParams(realParams, requestParams);
105
+ var mergedParams = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, realParams), requestParams);
106
+ return transformParams(mergedParams);
106
107
  }
107
108
  return requestParams;
108
109
  };
package/lib/ProTable/propsType.d.ts CHANGED
@@ -639,7 +639,7 @@ export interface ProTableRequestOptionsType<T, R> {
639
639
  * @description 在发送请求前转换参数
640
640
  * @default undefined
641
641
  */
642
- transformParams?: (params: any, requestParams: any) => any;
642
+ transformParams?: (params: any) => any;
643
643
  /**
644
644
  * 转换响应数据
645
645
  * @description 处理服务器返回的数据
package/lib/ProTabs/components/Card/index.js CHANGED
@@ -19,7 +19,8 @@ var Card = props => {
19
19
  label = props.label,
20
20
  icon = props.icon,
21
21
  mode = props.mode,
22
- loading = props.loading;
22
+ loading = props.loading,
23
+ size = props.size;
23
24
  var antIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.LoadingOutlined, {
24
25
  style: {
25
26
  fontSize: 24
@@ -30,7 +31,7 @@ var Card = props => {
30
31
  className: "pro-tabs-card",
31
32
  children: mode === 'card' ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
32
33
  size: 8,
33
- align: "center",
34
+ align: size === 'small' ? 'start' : 'center',
34
35
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
35
36
  className: "pro-tabs-card-left",
36
37
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
package/lib/ProTabs/index.js CHANGED
@@ -68,7 +68,8 @@ var ProTabs = (props, ref) => {
68
68
  icon: itemProps.icon,
69
69
  mode,
70
70
  title: itemProps.title || itemProps.label,
71
- loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading
71
+ loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
72
+ size: rest === null || rest === void 0 ? void 0 : rest.size
72
73
  };
73
74
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(itemProps, ['total', 'label', 'icon'])), {}, {
74
75
  label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Card, (0, _objectSpread2.default)({}, cardItemProps))
@@ -77,7 +78,9 @@ var ProTabs = (props, ref) => {
77
78
  }, [selectList, fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading]);
78
79
  var cls = (0, _classnames.default)({
79
80
  'pro-tabs': mode === 'card',
81
+ 'pro-tabs-mode-card': mode === 'card',
80
82
  'pro-tabs-tab': mode !== 'card',
83
+ 'pro-tabs-size-small': (rest === null || rest === void 0 ? void 0 : rest.size) === 'small',
81
84
  [className]: className
82
85
  });
83
86
  var handleChange = key => {
package/lib/ProTabs/propType.d.ts CHANGED
@@ -85,6 +85,11 @@ export interface ProTabsType extends Omit<TabsProps, 'items' | 'onChange'> {
85
85
  service: Service<any, any>;
86
86
  options?: Options<any, any>;
87
87
  };
88
+ /**
89
+ * @description 卡片大小
90
+ * @default default
91
+ */
92
+ size?: 'small' | 'middle' | 'large';
88
93
  [key: string]: any;
89
94
  }
90
95
  export type ProTabsProps = ProTabsType;
package/lib/ProTabs/style/index.less CHANGED
@@ -2,6 +2,37 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-tabs {
5
+ &.pro-tabs-mode-card {
6
+ &.pro-tabs-size-small {
7
+ .pro-tabs-card {
8
+ .pro-tabs-card-left {
9
+ width: 84px !important;
10
+ }
11
+ .pro-tabs-card-right img {
12
+ width: 24px !important;
13
+ }
14
+ }
15
+ }
16
+ .@{ant-prefix}-tabs-tab {
17
+ margin-right: 10px !important;
18
+ background: #ffffff !important;
19
+ border-radius: 8px !important;
20
+ &.@{ant-prefix}-tabs-tab-active {
21
+ background: var(--ant-primary-1) !important;
22
+ border: 1px solid var(--ant-primary-color) !important;
23
+ }
24
+ .pro-tabs-card {
25
+ width: 100%;
26
+ padding: 8px 12px !important;
27
+ border: none !important;
28
+ border: 1px solid #E7E7E7 !important;
29
+ border-radius: 8px !important;
30
+ }
31
+ }
32
+ .@{ant-prefix}-tabs-ink-bar {
33
+ display: none !important;
34
+ }
35
+ }
5
36
  .@{ant-prefix}-tabs .@{ant-prefix}-tabs-nav-list .@{ant-prefix}-tabs-tab {
6
37
  padding: 0 !important;
7
38
  }
@@ -35,7 +66,7 @@
35
66
  }
36
67
 
37
68
  .pro-tabs-card {
38
- width: 200px;
69
+ width: 192px;
39
70
  padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
40
71
  border: 1px solid var(--zaui-line, #dddddd);
41
72
  border-left: none;
@@ -47,11 +78,11 @@
47
78
  .pro-tabs-card-left-total {
48
79
  color: var(--zaui-text, #343434);
49
80
  font-weight: 600;
50
- font-size: var(--zaui-font-size-lg-title, 24px);
81
+ font-size: var(--zaui-font-size-lg, 16px);
51
82
  }
52
83
 
53
84
  .pro-tabs-card-left-label {
54
- color: var(--aui-text, #343434);
85
+ color: #626366;
55
86
  font-weight: 400;
56
87
  font-size: var(--zaui-font-size, 14px);
57
88
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.20-beta.3",
3
+ "version": "3.13.20-beta.5",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",