@zat-design/sisyphus-react 3.4.6-beta.6 → 3.4.6-beta.7

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.
@@ -4146,6 +4146,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4146
4146
  -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
4147
4147
  box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
4148
4148
  }
4149
+ .pro-edit-table td[rowspan] {
4150
+ vertical-align: middle !important;
4151
+ }
4149
4152
  .pro-edit-table .pro-edit-table-tooltip {
4150
4153
  display: -webkit-inline-box;
4151
4154
  display: -webkit-inline-flex;
package/dist/less.esm.css CHANGED
@@ -4146,6 +4146,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4146
4146
  -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
4147
4147
  box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
4148
4148
  }
4149
+ .pro-edit-table td[rowspan] {
4150
+ vertical-align: middle !important;
4151
+ }
4149
4152
  .pro-edit-table .pro-edit-table-tooltip {
4150
4153
  display: -webkit-inline-box;
4151
4154
  display: -webkit-inline-flex;
@@ -2,6 +2,9 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-edit-table {
5
+ td[rowspan]{
6
+ vertical-align: middle !important;
7
+ }
5
8
  .pro-edit-table-tooltip {
6
9
  display : inline-flex;
7
10
  align-items: center;
@@ -217,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
217
217
  extra?: string | React.ReactNode;
218
218
  /** 是否固定字段, 不隐藏 */
219
219
  fixed?: boolean;
220
- confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
220
+ confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
221
221
  }
222
222
  export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
223
223
  /**
package/es/global.less CHANGED
@@ -9,30 +9,29 @@ pre {
9
9
  scrollbar-face-color: #d2d3d7;
10
10
  scrollbar-highlight-color: #979797;
11
11
  scrollbar-3dlight-color: #979797;
12
- }
12
+ ::-webkit-scrollbar  {
13
+ width: 16px;
14
+ }
13
15
 
14
- ::-webkit-scrollbar  {
15
- width: 16px;
16
- }
16
+ // // 滑块
17
+ ::-webkit-scrollbar-thumb {
18
+ background-color: #d2d3d7;
19
+ background-clip: padding-box;
20
+ border-color: transparent;
21
+ border-style: dashed;
22
+ border-width: 4px;
23
+ border-radius: 10px;
24
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
25
+ }
17
26
 
18
- // // 滑块
19
- ::-webkit-scrollbar-thumb {
20
- background-color: #d2d3d7;
21
- background-clip: padding-box;
22
- border-color: transparent;
23
- border-style: dashed;
24
- border-width: 4px;
25
- border-radius: 10px;
26
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
27
- }
28
-
29
- // 轨道
30
- ::-webkit-scrollbar-track {
31
- background-color: transparent;
32
- border-radius: 10px;
33
- }
27
+ // 轨道
28
+ ::-webkit-scrollbar-track {
29
+ background-color: transparent;
30
+ border-radius: 10px;
31
+ }
34
32
 
35
- // 悬浮轨道
36
- ::-webkit-scrollbar-thumb:hover {
37
- background-color: #979797;
33
+ // 悬浮轨道
34
+ ::-webkit-scrollbar-thumb:hover {
35
+ background-color: #979797;
36
+ }
38
37
  }
@@ -2,6 +2,9 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-edit-table {
5
+ td[rowspan]{
6
+ vertical-align: middle !important;
7
+ }
5
8
  .pro-edit-table-tooltip {
6
9
  display : inline-flex;
7
10
  align-items: center;
@@ -217,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
217
217
  extra?: string | React.ReactNode;
218
218
  /** 是否固定字段, 不隐藏 */
219
219
  fixed?: boolean;
220
- confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
220
+ confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
221
221
  }
222
222
  export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
223
223
  /**
package/lib/global.less CHANGED
@@ -9,30 +9,29 @@ pre {
9
9
  scrollbar-face-color: #d2d3d7;
10
10
  scrollbar-highlight-color: #979797;
11
11
  scrollbar-3dlight-color: #979797;
12
- }
12
+ ::-webkit-scrollbar  {
13
+ width: 16px;
14
+ }
13
15
 
14
- ::-webkit-scrollbar  {
15
- width: 16px;
16
- }
16
+ // // 滑块
17
+ ::-webkit-scrollbar-thumb {
18
+ background-color: #d2d3d7;
19
+ background-clip: padding-box;
20
+ border-color: transparent;
21
+ border-style: dashed;
22
+ border-width: 4px;
23
+ border-radius: 10px;
24
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
25
+ }
17
26
 
18
- // // 滑块
19
- ::-webkit-scrollbar-thumb {
20
- background-color: #d2d3d7;
21
- background-clip: padding-box;
22
- border-color: transparent;
23
- border-style: dashed;
24
- border-width: 4px;
25
- border-radius: 10px;
26
- -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
27
- }
28
-
29
- // 轨道
30
- ::-webkit-scrollbar-track {
31
- background-color: transparent;
32
- border-radius: 10px;
33
- }
27
+ // 轨道
28
+ ::-webkit-scrollbar-track {
29
+ background-color: transparent;
30
+ border-radius: 10px;
31
+ }
34
32
 
35
- // 悬浮轨道
36
- ::-webkit-scrollbar-thumb:hover {
37
- background-color: #979797;
33
+ // 悬浮轨道
34
+ ::-webkit-scrollbar-thumb:hover {
35
+ background-color: #979797;
36
+ }
38
37
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.6-beta.6",
3
+ "version": "3.4.6-beta.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",