@bit-sun/business-component 4.0.13-alpha.9 → 4.2.0-alpha.0

package/src/plugin/TableColumnSetting/index.less

@@ -151,16 +151,18 @@
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {

package/src/plugin/TableColumnSetting/index.tsx

@@ -411,7 +411,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
   DraggableContainer = (props: any) => (
     <SortableBody
       useDragHandle
-      disableAutoscroll
+      lockAxis='y'
       helperClass="row-dragging"
       onSortEnd={this.onSortEnd}
       {...props}
@@ -422,9 +422,9 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     const { sortDataSource } = this.state;
     // function findIndex base on Table rowKey props and should always be a right array index
     const index = sortDataSource.findIndex(
-      (x:any) => x.key === restProps['data-row-key'],
+      (x:any) => (x.key||x.dataIndex) == restProps['data-row-key'],
     );
-    return <SortableItem index={index} {...restProps} />;
+    return <SortableItem key={restProps['data-row-key']} index={index} {...restProps} />;
   };
 
   onChange = (e: any, title: any) => {
@@ -709,6 +709,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
                       row: this.DraggableBodyRow,
                     },
                   }}
+                  scroll={{ y: 364 }}
                 />
               </div>
             </div>

package/src/styles/bsDefault.less

@@ -1469,8 +1469,12 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 .table_odd {
   background: #f7f8fb;
 }
+.table_gray {
+  background: #D3D3D3;
+}
 // 浮起的列 设置斑马
 .table_base,
+.table_gray,
 .table_odd {
 
   .ant-table-cell-fix-left,
@@ -1908,16 +1912,18 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
     }
   }
 
-  .ant-table-wrapper::-webkit-scrollbar {
+  .ant-table-tbody::-webkit-scrollbar {
     display: none;
   }
 
   .ant-table-wrapper {
     margin-top: 10px;
-    height: 364px;
-    overflow: scroll;
     padding-bottom: 50px;
 
+    tbody tr:first-child {
+      display: none;
+    }
+
     tr {
       height: 30px;
       td {

package/src/utils/request.ts

@@ -7,27 +7,31 @@ const get = (url, params?: any) => {
   }).then(handleResponseData);
 };
 
-const post = (url, data?: any) => {
+const post = (url, data?: any, params?: any) => {
   return request.post(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const patch = (url, data?: any) => {
+const patch = (url, data?: any, params?: any) => {
   return request.patch(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const put = (url, data?: any) => {
+const put = (url, data?: any, params?: any) => {
   return request.put(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const deleteS = (url, data?: any) => {
+const deleteS = (url, data?: any, params?: any) => {
   return request.delete(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 

package/src/utils/utils.ts

@@ -87,16 +87,13 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   } else if (col.timeRender) {
     // 处理不显示 时分秒的时间
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理有问题，弃用
-  // else if (col.textOverflow) {
-  //   // 处理文字太长
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
-  //   const originalRender = col?.render;
-  //   const renderText = (params) => originalRender ? originalRender(params) : params.text;
-  //   col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
-  // } 
-  else if (col.images) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
+    const originalRender = col?.render;
+    const renderText = (params) => originalRender ? originalRender(params) : params.text;
+    col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
+  } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
   } else if (col.double) {
     col.render = ({ record }: any) =>
@@ -127,12 +124,11 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRender) {
     col.render = (text: any) => handleTooltip(text, col.timeRender);
   }
-  // 处理有问题，弃用
   // 处理文字太长
-  // if (col.textOverflow) {
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
-  //   col.render = (text: any) => handleTextOverflow(text,colWidth);
-  // }
+  if (col.textOverflow) {
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
+    col.render = (text: any) => handleTextOverflow(text,colWidth);
+  }
   if (col.images) {
     col.render = (text: any) => tableColumnsImage(text);
   }