@bit-sun/business-component 4.0.11-alpha.14 → 4.0.11-alpha.16

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 (16) hide show
  1. package/dist/index.esm.js +74 -43
  2. package/dist/index.js +74 -43
  3. package/package.json +1 -1
  4. package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx +5 -5
  5. package/src/components/Business/BsSulaQueryTable/index.less +21 -38
  6. package/src/components/Business/BsSulaQueryTable/setting.tsx +5 -5
  7. package/src/components/Business/SearchSelect/BusinessUtils.tsx +8 -0
  8. package/src/components/Business/SearchSelect/index.md +1 -0
  9. package/src/components/Business/columnSettingTable/columnSetting.tsx +5 -5
  10. package/src/components/Business/columnSettingTable/index.less +33 -71
  11. package/src/components/Functional/SearchSelect/index.less +5 -0
  12. package/src/components/Functional/SearchSelect/index.tsx +28 -13
  13. package/src/components/Functional/SearchSelect/utils.ts +2 -1
  14. package/src/plugin/TableColumnSetting/index.less +38 -70
  15. package/src/plugin/TableColumnSetting/index.tsx +5 -5
  16. package/src/styles/bsDefault.less +112 -123
package/src/components/Functional/SearchSelect/utils.ts CHANGED
@@ -28,10 +28,11 @@ export const hasMoreQueryFields = (modalTableProps: any) => {
28
28
  }
29
29
 
30
30
  export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
31
- return oldSelect?.length ? oldSelect.some((o: any) => o.value == record.value) ? oldSelect.filter((s: any) => s.value != record.value) : [...oldSelect,...newSelect] : newSelect;
31
+ return oldSelect?.length ? oldSelect.some((o: any) => o.value == record?.value) ? oldSelect.filter((s: any) => s.value != record?.value) : [...oldSelect,...newSelect] : newSelect;
32
32
  }
33
33
 
34
34
  export const getTableHeigth = (list: any) => {
35
35
  const totalRows = Math.ceil((list?.length+1) / 4);
36
+ if(totalRows == 1) return 562;
36
37
  return 548 - totalRows*10
37
38
  }
package/src/plugin/TableColumnSetting/index.less CHANGED
@@ -1,11 +1,10 @@
1
- // 列自定义
2
1
  .sort_table_wrapper {
3
2
  .sort_table {
4
3
  display: flex;
5
4
 
6
5
  .sort_table_column_wrapper {
7
6
  width: 560px;
8
- margin-right: 10px;
7
+ margin-right: 8px;
9
8
  }
10
9
 
11
10
  .sort_table_content_wrapper {
@@ -17,12 +16,12 @@
17
16
  height: 20px;
18
17
  font-family: PingFangSC-Regular;
19
18
  font-weight: 400;
20
- font-size: 14px;
19
+ font-size: 12px;
21
20
  color: #000000;
22
21
  letter-spacing: 0;
23
22
 
24
23
  span {
25
- color: #848484;
24
+ color: #8E8E8E;
26
25
  }
27
26
  }
28
27
 
@@ -47,7 +46,7 @@
47
46
  text-align: center;
48
47
  font-family: PingFangSC-Regular;
49
48
  font-weight: 400;
50
- font-size: 14px;
49
+ font-size: 12px;
51
50
  color: #848484;
52
51
  }
53
52
  }
@@ -58,22 +57,25 @@
58
57
  height: 20px;
59
58
  font-family: PingFangSC-Regular;
60
59
  font-weight: 400;
61
- font-size: 14px;
60
+ font-size: 12px;
62
61
  color: #848484;
63
62
  letter-spacing: 0;
64
63
  }
65
64
 
66
65
  .ant-checkbox-wrapper {
67
66
  width: 144px;
67
+ height: 16px;
68
+ line-height: 16px;
68
69
  margin-top: 16px;
69
70
  }
70
71
 
71
- .ant-checkbox-wrapper+.ant-checkbox-wrapper {
72
+ .ant-checkbox-wrapper + .ant-checkbox-wrapper {
72
73
  margin-left: 0px;
73
74
  }
74
75
  }
75
76
 
76
77
  .sort_table_content {
78
+ height: 430px;
77
79
  margin-top: 10px;
78
80
  padding-top: 10px;
79
81
  padding-bottom: 10px;
@@ -83,7 +85,6 @@
83
85
  .ant-table-wrapper {
84
86
  padding: 0px !important;
85
87
  }
86
-
87
88
  .sort_table_title {
88
89
  height: 32px;
89
90
  line-height: 32px;
@@ -92,29 +93,11 @@
92
93
  }
93
94
  }
94
95
  }
95
-
96
- div.ant-modal-header {
97
- width: 820px;
98
- height: 64px;
99
- background: #ffffff;
100
- padding: 20px;
101
- border: 0px;
102
-
103
- div.ant-modal-title {
104
- height: 24px;
105
- font-family: PingFangSC-Medium;
106
- font-weight: 500;
107
- font-size: 18px;
108
- color: #000000;
109
- letter-spacing: 0;
110
- line-height: 24px;
111
- }
112
- }
96
+
113
97
 
114
98
  .ant-modal-body {
115
- padding: 0 20px !important;
99
+ padding: 10px 16px;
116
100
  }
117
-
118
101
  .ant-modal-close-x {
119
102
  height: 24px;
120
103
  font-family: PingFangSC-Medium;
@@ -130,7 +113,7 @@
130
113
  }
131
114
 
132
115
  input {
133
- height: 32px;
116
+ height: 22px;
134
117
  padding: 6px 4px;
135
118
  border-radius: 5px;
136
119
  }
@@ -138,34 +121,33 @@
138
121
  .ant-input-prefix {
139
122
  width: 24px;
140
123
  height: 24px;
141
- margin: 4px;
124
+ margin: 0 4px;
142
125
  // border: 1px dashed #d9d9d9;
143
126
  display: flex;
144
127
  justify-content: center;
145
128
  }
146
129
 
147
130
  .ant-modal-footer {
148
- height: 70px;
149
- border: 0;
150
- padding: 20px;
151
-
131
+ padding: 8px 16px;
132
+ display: flex;
133
+ justify-content: space-between;
134
+
152
135
  .ant-btn {
153
136
  width: 80px;
154
- height: 34px;
155
- border-radius: 5px;
137
+ height: 28px;
156
138
 
157
139
  span {
158
140
  font-family: PingFangSC-Medium;
159
141
  font-weight: 600;
160
- font-size: 14px;
142
+ font-size: 12px;
161
143
  letter-spacing: 0;
162
144
  text-align: center;
163
145
  line-height: 20px;
164
146
  }
165
147
 
166
- &:first-child {
167
- margin-right: 524px;
168
- }
148
+ // &:first-child {
149
+ // margin-right: 524px;
150
+ // }
169
151
  }
170
152
  }
171
153
 
@@ -180,21 +162,26 @@
180
162
  padding-bottom: 50px;
181
163
 
182
164
  tr {
183
- height: 36px;
184
-
165
+ height: 30px;
185
166
  td {
186
167
  width: 24px !important;
187
- height: 36px !important;
168
+ height: 30px !important;
188
169
  font-family: PingFangSC-Regular;
189
170
  font-weight: 400;
190
- font-size: 14px;
171
+ font-size: 12px;
191
172
  color: #000000;
192
173
  letter-spacing: 0;
193
174
 
194
175
  &:first-child {
195
176
  padding-left: 10px !important;
196
177
  padding-right: 0px !important;
197
- width: 115px !important;
178
+ width: 108px !important;
179
+ display: inline-block;
180
+ overflow: hidden;
181
+ text-overflow: ellipsis;
182
+ white-space: nowrap;
183
+ height: 30px !important;
184
+ line-height: 30px !important;
198
185
  }
199
186
 
200
187
  img {
@@ -210,7 +197,7 @@
210
197
  &:last-child {
211
198
  padding-left: 0px !important;
212
199
  padding-right: 3px !important;
213
- width: 34px !important;
200
+ width: 30px !important;
214
201
 
215
202
  img {
216
203
  // border: 1px dashed #d9d9d9;
@@ -221,27 +208,8 @@
221
208
  }
222
209
  }
223
210
  }
224
- }
225
-
226
- .global_tab_nav_style {
227
- top: 2px !important;
228
- }
229
-
230
- .row-dragging {
231
- background: #fafafa;
232
- border: 1px solid #ccc;
233
- z-index: 10000;
234
- }
235
-
236
- .row-dragging td {
237
- padding: 7px 16px;
238
- display: none;
239
-
240
- }
241
- .row-dragging td:first-child {
242
- display: inline-block;
243
- }
244
-
245
- .row-dragging .drag-visible {
246
- visibility: visible;
247
- }
211
+
212
+ .ant-dropdown-link {
213
+ cursor: pointer;
214
+ }
215
+ }
package/src/plugin/TableColumnSetting/index.tsx CHANGED
@@ -525,7 +525,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
525
525
  return (
526
526
  <div className={'sort_table_wrapper'}>
527
527
  <Modal
528
- title="设置表头内容"
528
+ title="筛选条件设置"
529
529
  wrapClassName={'sort_table_wrapper'}
530
530
  width={820}
531
531
  visible={visible}
@@ -546,15 +546,15 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
546
546
  <div className={'sort_table'}>
547
547
  <div className={'sort_table_column_wrapper'}>
548
548
  <span className={'sort_table_column_count'}>
549
- 可选字段 <span>（共{dataSource.length}个）</span>
549
+ <span>勾选你想使用的筛选条件</span>
550
550
  </span>
551
551
  <div className={'sort_table_column'}>
552
552
  <Input
553
553
  prefix={<SearchOutlined className="site-form-item-icon" />}
554
- placeholder="搜索"
554
+ placeholder="输入筛选条件名称搜索"
555
555
  allowClear
556
556
  onChange={this.onSearch}
557
- style={{ width: 540 }}
557
+ style={{ width: 525 }}
558
558
  />
559
559
  <div>
560
560
  {!searchDataSource && (
@@ -678,7 +678,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
678
678
  </div>
679
679
  <div className={'sort_table_content_wrapper'}>
680
680
  <span className={'sort_table_content_count'}>
681
- 已选字段 <span>（共{sortDataSource.length}个）</span>
681
+ <span>已选择的搜索条件排序</span>
682
682
  </span>
683
683
  <div className={'sort_table_content'}>
684
684
  <span style={{ paddingLeft: '10px' }}>
package/src/styles/bsDefault.less CHANGED
@@ -1762,7 +1762,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
1762
1762
 
1763
1763
  .sort_table_column_wrapper {
1764
1764
  width: 560px;
1765
- margin-right: 10px;
1765
+ margin-right: 8px;
1766
1766
  }
1767
1767
 
1768
1768
  .sort_table_content_wrapper {
@@ -1774,12 +1774,12 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
1774
1774
  height: 20px;
1775
1775
  font-family: PingFangSC-Regular;
1776
1776
  font-weight: 400;
1777
- font-size: 14px;
1777
+ font-size: 12px;
1778
1778
  color: #000000;
1779
1779
  letter-spacing: 0;
1780
1780
 
1781
1781
  span {
1782
- color: #848484;
1782
+ color: #8E8E8E;
1783
1783
  }
1784
1784
  }
1785
1785
 
@@ -1804,7 +1804,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
1804
1804
  text-align: center;
1805
1805
  font-family: PingFangSC-Regular;
1806
1806
  font-weight: 400;
1807
- font-size: 14px;
1807
+ font-size: 12px;
1808
1808
  color: #848484;
1809
1809
  }
1810
1810
  }
@@ -1815,34 +1815,33 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
1815
1815
  height: 20px;
1816
1816
  font-family: PingFangSC-Regular;
1817
1817
  font-weight: 400;
1818
- font-size: 14px;
1818
+ font-size: 12px;
1819
1819
  color: #848484;
1820
1820
  letter-spacing: 0;
1821
1821
  }
1822
1822
 
1823
- :global {
1824
- .ant-checkbox-wrapper {
1825
- width: 144px;
1826
- margin-top: 16px;
1827
- }
1823
+ .ant-checkbox-wrapper {
1824
+ width: 144px;
1825
+ height: 16px;
1826
+ line-height: 16px;
1827
+ margin-top: 16px;
1828
+ }
1828
1829
 
1829
- .ant-checkbox-wrapper + .ant-checkbox-wrapper {
1830
- margin-left: 0px;
1831
- }
1830
+ .ant-checkbox-wrapper + .ant-checkbox-wrapper {
1831
+ margin-left: 0px;
1832
1832
  }
1833
1833
  }
1834
1834
 
1835
1835
  .sort_table_content {
1836
+ height: 430px;
1836
1837
  margin-top: 10px;
1837
1838
  padding-top: 10px;
1838
1839
  padding-bottom: 10px;
1839
1840
  border: 1px solid #d9d9d9;
1840
1841
  border-radius: 5px;
1841
1842
 
1842
- :global {
1843
- .ant-table-wrapper {
1844
- padding: 0px !important;
1845
- }
1843
+ .ant-table-wrapper {
1844
+ padding: 0px !important;
1846
1845
  }
1847
1846
  .sort_table_title {
1848
1847
  height: 32px;
@@ -1852,135 +1851,125 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
1852
1851
  }
1853
1852
  }
1854
1853
  }
1855
- :global {
1856
- div.ant-modal-header {
1857
- width: 820px;
1858
- height: 64px;
1859
- background: #ffffff;
1860
- padding: 20px;
1861
- border: 0px;
1854
+
1862
1855
 
1863
- div.ant-modal-title {
1864
- height: 24px;
1865
- font-family: PingFangSC-Medium;
1866
- font-weight: 500;
1867
- font-size: 18px;
1868
- color: #000000;
1869
- letter-spacing: 0;
1870
- line-height: 24px;
1871
- }
1872
- }
1856
+ .ant-modal-body {
1857
+ padding: 10px 16px;
1858
+ }
1859
+ .ant-modal-close-x {
1860
+ height: 24px;
1861
+ font-family: PingFangSC-Medium;
1862
+ font-weight: 500;
1863
+ font-size: 18px;
1864
+ color: #000000;
1865
+ letter-spacing: 0;
1866
+ }
1873
1867
 
1874
- .ant-modal-body {
1875
- padding: 0 20px !important;
1876
- }
1868
+ .ant-input-affix-wrapper {
1869
+ padding: 0px;
1870
+ padding-right: 10px;
1871
+ }
1877
1872
 
1878
- .ant-modal-close-x {
1879
- height: 24px;
1880
- font-family: PingFangSC-Medium;
1881
- font-weight: 500;
1882
- font-size: 18px;
1883
- color: #000000;
1884
- letter-spacing: 0;
1885
- }
1873
+ input {
1874
+ height: 22px;
1875
+ padding: 6px 4px;
1876
+ border-radius: 5px;
1877
+ }
1886
1878
 
1887
- .ant-input-affix-wrapper {
1888
- padding: 0px;
1889
- padding-right: 10px;
1890
- }
1879
+ .ant-input-prefix {
1880
+ width: 24px;
1881
+ height: 24px;
1882
+ margin: 0 4px;
1883
+ // border: 1px dashed #d9d9d9;
1884
+ display: flex;
1885
+ justify-content: center;
1886
+ }
1891
1887
 
1892
- input {
1893
- height: 32px;
1894
- padding: 6px 4px;
1895
- border-radius: 5px;
1896
- }
1888
+ .ant-modal-footer {
1889
+ padding: 8px 16px;
1890
+ display: flex;
1891
+ justify-content: space-between;
1892
+
1893
+ .ant-btn {
1894
+ width: 80px;
1895
+ height: 28px;
1897
1896
 
1898
- .ant-select-selector, .ant-input-prefix {
1899
- width: 24px;
1900
- height: 24px;
1901
- margin: 4px;
1902
- // border: 1px dashed #d9d9d9;
1903
- display: flex;
1904
- justify-content: center;
1897
+ span {
1898
+ font-family: PingFangSC-Medium;
1899
+ font-weight: 600;
1900
+ font-size: 12px;
1901
+ letter-spacing: 0;
1902
+ text-align: center;
1903
+ line-height: 20px;
1904
+ }
1905
+
1906
+ // &:first-child {
1907
+ // margin-right: 524px;
1908
+ // }
1905
1909
  }
1910
+ }
1906
1911
 
1907
- .ant-modal-footer {
1908
- height: 70px;
1909
- border: 0;
1910
- padding: 20px;
1912
+ .ant-table-wrapper::-webkit-scrollbar {
1913
+ display: none;
1914
+ }
1911
1915
 
1912
- .ant-btn {
1913
- width: 80px;
1914
- height: 34px;
1915
- border-radius: 5px;
1916
+ .ant-table-wrapper {
1917
+ margin-top: 10px;
1918
+ height: 364px;
1919
+ overflow: scroll;
1920
+ padding-bottom: 50px;
1921
+
1922
+ tr {
1923
+ height: 30px;
1924
+ td {
1925
+ width: 24px !important;
1926
+ height: 30px !important;
1927
+ font-family: PingFangSC-Regular;
1928
+ font-weight: 400;
1929
+ font-size: 12px;
1930
+ color: #000000;
1931
+ letter-spacing: 0;
1916
1932
 
1917
- span {
1918
- font-family: PingFangSC-Medium;
1919
- font-weight: 600;
1920
- font-size: 14px;
1921
- letter-spacing: 0;
1922
- text-align: center;
1923
- line-height: 20px;
1933
+ &:first-child {
1934
+ padding-left: 10px !important;
1935
+ padding-right: 0px !important;
1936
+ width: 108px !important;
1937
+ display: inline-block;
1938
+ overflow: hidden;
1939
+ text-overflow: ellipsis;
1940
+ white-space: nowrap;
1941
+ height: 30px !important;
1942
+ line-height: 30px !important;
1924
1943
  }
1925
1944
 
1926
- &:first-child {
1927
- margin-right: 524px;
1945
+ img {
1946
+ // border: 1px dashed #d9d9d9;
1947
+ cursor: pointer;
1928
1948
  }
1929
- }
1930
- }
1931
1949
 
1932
- .ant-table-wrapper::-webkit-scrollbar {
1933
- display: none;
1934
- }
1950
+ &:not(:first-child) {
1951
+ padding-left: 0px !important;
1952
+ padding-right: 0px !important;
1953
+ }
1935
1954
 
1936
- .ant-table-wrapper {
1937
- margin-top: 10px;
1938
- height: 364px;
1939
- overflow: scroll;
1940
- padding-bottom: 50px;
1941
-
1942
- tr {
1943
- height: 36px;
1944
- td {
1945
- width: 24px !important;
1946
- height: 36px !important;
1947
- font-family: PingFangSC-Regular;
1948
- font-weight: 400;
1949
- font-size: 14px;
1950
- color: #000000;
1951
- letter-spacing: 0;
1952
-
1953
- &:first-child {
1954
- padding-left: 10px !important;
1955
- padding-right: 0px !important;
1956
- width: 115px !important;
1957
- }
1955
+ &:last-child {
1956
+ padding-left: 0px !important;
1957
+ padding-right: 3px !important;
1958
+ width: 30px !important;
1958
1959
 
1959
1960
  img {
1960
1961
  // border: 1px dashed #d9d9d9;
1961
- cursor: pointer;
1962
- }
1963
-
1964
- &:not(:first-child) {
1965
- padding-left: 0px !important;
1966
- padding-right: 0px !important;
1967
- }
1968
-
1969
- &:last-child {
1970
- padding-left: 0px !important;
1971
- padding-right: 3px !important;
1972
- width: 34px !important;
1973
-
1974
- img {
1975
- // border: 1px dashed #d9d9d9;
1976
- position: relative;
1977
- top: 1px;
1978
- }
1962
+ position: relative;
1963
+ top: 1px;
1979
1964
  }
1980
1965
  }
1981
1966
  }
1982
1967
  }
1983
1968
  }
1969
+
1970
+ .ant-dropdown-link {
1971
+ cursor: pointer;
1972
+ }
1984
1973
  }
1985
1974
 
1986
1975
  // 表单特性