@bit-sun/business-component 4.2.0-alpha.6.1 → 4.2.0-alpha.6.10

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Table as SulaTable, request } from 'bssula';
 import { Resizable } from 'react-resizable';
@@ -22,7 +23,7 @@ export default class ColumnSettingSulaTable extends React.Component {
       showColumns: [],
       selectedRowKeys: [], // 新增状态，用于跟踪选中的行的键
       selectedRows: [],
-      showSummary: null 
+      showSummary: null
     }
     this.sulaTableRef = React.createRef<any>();
   }
@@ -79,9 +80,9 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 新增函数，用于根据传入的小数位数进行四舍五入
-   * @param number 
-   * @param decimalPlaces 
-   * @returns 
+   * @param number
+   * @param decimalPlaces
+   * @returns
    */
   roundToDecimalPlaces = (number: any, decimalPlaces: number) => {
     const factor = Math.pow(10, (decimalPlaces || 2));
@@ -90,7 +91,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 合计行逻辑
-   * @returns 
+   * @returns
    */
   getTableSummaryInfo = () => {
     const { summary = undefined, rowSelection, expandable, isSpecial = false, modeType }: any = this.props;
@@ -167,10 +168,10 @@ export default class ColumnSettingSulaTable extends React.Component {
         </Table.Summary.Row>
       </Table.Summary>
     );
-    
+
     return () => summaryDom;
-  }; 
-  
+  };
+
   handledynamicColumns = (col: any[]) => {
     let { dynamicColumns, modeType }: any = this.props;
     col = col.map((item: any) => {
@@ -205,7 +206,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   ResizeableTitle = (props: any) => {
     const { onResize, width, ...restProps } = props;
-    
+
     const [innerWidth, setInnerWidth] = useState(width);
     const [isResizing, setIsResizing] = useState(false); // 标记是否正在拖拽
     const [isDragging, setIsDragging] = useState(false); // 标记拖拽句柄是否被拖拽
@@ -213,9 +214,9 @@ export default class ColumnSettingSulaTable extends React.Component {
     const markerPosition = useRef({ left: 0, top: 0 });
     const currentStart = useRef(0);
     const uuidref = useRef(uuid());
-    
+
     const prevWidthRef = useRef(width);
-  
+
     const handleMouseDown = (e: any) => {
       currentStart.current = e.clientX;
       markerPosition.current = { left: e.clientX, top: e.clientY }
@@ -223,35 +224,35 @@ export default class ColumnSettingSulaTable extends React.Component {
       document.addEventListener('mousemove', handleMouseMove);
       document.addEventListener('mouseup', handleMouseUp);
     };
-  
+
     const handleMouseMove = (e: any) => {
       e.stopPropagation();
       e.preventDefault();
       // 更新标记位置
       markerPosition.current = { left: e.clientX, top: e.clientY }
       const dom: HTMLElement | null =  document.getElementById('text1');
-  
+
       if (dom && dom.style) {
         dom.style.left = `${e.clientX}px`;
         dom.style.top = `${e.clientY - 20}px`;
       }
     };
-  
+
     const handleMouseUp = (e: any) => {
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
       setIsResizing(false);
     };
-    
+
     const handleresize = (e: any, data: any, title: string) => {
       const newWidth = data?.size?.width || 0;
       setInnerWidth(newWidth); // 更新内部分宽度
     };
-  
+
     const handleResizeStart = () => {
       setIsResizing(true);
     };
-  
+
     const handleResizeStop = (e: any, data: any) => {
       setIsResizing(false);
       if (onResize) {
@@ -265,11 +266,11 @@ export default class ColumnSettingSulaTable extends React.Component {
         setInnerWidth(width);
       }
     }, [width]);
-  
+
     const thStyle = {
       boxShadow: isResizing ? '2px 2px 10px rgba(0, 0, 0, 0.3)' : 'none',
     };
-  
+
     return (
       <Resizable
         width={innerWidth}
@@ -333,7 +334,7 @@ export default class ColumnSettingSulaTable extends React.Component {
 
   /**
    * 处理行点击事件
-   * @param record 
+   * @param record
    */
   handleRowClick = (record: any) => {
     const { selectedRowKeys, selectedRows, } = this.state;
@@ -420,7 +421,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         ...propRowSelection,
         selectedRowKeys: this.state.selectedRowKeys,
         onChange: (selectedRowKeys: any, selectedRows: any) => {
-            this.setState({ 
+            this.setState({
                 selectedRowKeys,
                 selectedRows
             });
@@ -436,7 +437,7 @@ export default class ColumnSettingSulaTable extends React.Component {
         };
       },
     }
-    
+
     return (
       <div style={{ position: 'relative' }}>
         <span style={{ position: 'absolute', zIndex: '10', right: '8px', top: '10px' }} className="ant-dropdown-link">

package/src/components/Functional/AddSelect/index.tsx

@@ -222,6 +222,98 @@ const AddSelect = (props: any) => {
               acc[key] = typeof value === 'function' ? value?.(record) : value;
               return acc;
             }, {});
+
+            // 可输入非数字字符
+            if(item.canInputString) {
+              return (
+                <InputNumber
+                  min={0}
+                  precision={0}
+                  controls={false}
+                  {...inputProps}
+                  value={text || ''}
+                  keyboard={false}
+                  onPressEnter={(e: any) => {
+                    e.target.blur();
+                  }}
+                  onBlur={async (e: any) => {
+                    const {
+                      target: { value },
+                    } = e;
+                    record[item.dataIndex] = value
+                    editRecord(record)
+                  }}
+                  onKeyDown={(e) => {
+                    if(e.keyCode === 13 && e.ctrlKey) {
+                      handleOk(true)
+                      document.getElementById("first-query")?.focus()
+                    }
+                    if(e.keyCode === 8 && e.ctrlKey) {
+                      message.success('删除当前行')
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                      deleteRecord(record, popvalue);
+                    }
+                    if (e.keyCode === 37 && e.shiftKey) {   // 左滑动
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 39 && e.shiftKey) {  //  右滑
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    }
+                    if (e.keyCode === 40) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
+                      if (dom) {
+                        dom.select();
+                        dom.focus();
+                        dom.scrollIntoView(false)
+                      }
+                      dom = null
+                    } else if (e.keyCode === 38) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                      let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
+                      if (dom1) {
+                        // dom1.value=""
+                        // dom1.setSelectionRange(100, 0);
+                        dom1.select();
+                        dom1.focus();
+                        dom1.scrollIntoViewIfNeeded(false)
+                        // dom1.value=record['count']
+                      }
+                      dom1 = null
+                    } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
+                      e.stopPropagation();
+                      e.preventDefault();
+                    }
+                  }}
+                />
+              );
+            }
             
             return (
               <InputNumber

package/src/components/Functional/SearchSelect/index.css

@@ -0,0 +1,274 @@
+.search_select .ant-select-selector {
+  height: 24px;
+  overflow: hidden;
+}
+.search_select .ant-select-selector .ant-select-selection-overflow {
+  height: 40px;
+  flex-wrap: nowrap;
+  overflow-x: auto;
+}
+.search_select .ant-select-selector .ant-select-selection-overflow-item {
+  align-self: auto;
+}
+.search_select_show {
+  display: flex;
+}
+.search_select_show .ant-select-dropdown {
+  top: 24px !important;
+  width: calc(141%) !important;
+}
+.search_select_show .ant-select-clear {
+  right: 33px;
+}
+.search_select_show .ant-select-multiple.ant-select-show-arrow .ant-select-selector,
+.search_select_show .ant-select-multiple.ant-select-allow-clear .ant-select-selector {
+  padding-right: 28px;
+}
+.search_select_show.search_select_show_list .ant-select-dropdown {
+  top: 24px !important;
+  width: calc(100% + 110px) !important;
+}
+.search_select_expand_button {
+  position: relative;
+  right: -11px;
+  width: 30px;
+  border-left: 1px solid #d9d9d9;
+  height: 24px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: bolder;
+}
+.search_select_expand_button span {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+.search_select_expand_button:hover {
+  background-color: #005cff;
+  color: #fff;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.search_select_expand_button_disabled:hover {
+  background-color: transparent;
+  color: rgba(0, 0, 0, 0.25);
+  cursor: not-allowed;
+}
+.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {
+  font-family: MiSans-Regular;
+  font-weight: 400;
+  font-size: 12px;
+}
+.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {
+  color: #7F7F7F;
+}
+.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {
+  justify-content: center;
+}
+.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {
+  color: #333333;
+}
+.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,
+.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {
+  visibility: hidden;
+  padding: 0;
+  margin: 0;
+  width: 0;
+  height: 0;
+  min-width: 0;
+  min-height: 0;
+  border: none;
+}
+.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column .ant-radio-wrapper,
+.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column .ant-radio-wrapper {
+  display: none;
+}
+.search_select_modal_wrapper .ant-modal {
+  top: 60px;
+}
+.search_select_modal_wrapper .ant-modal-header {
+  padding: 6px 0px 6px 16px;
+}
+.search_select_modal_wrapper .ant-modal-header .ant-modal-title {
+  height: 20px;
+  color: #000000;
+  line-height: 20px;
+}
+.search_select_modal_wrapper .ant-modal-close-x {
+  width: 32px;
+  height: 32px;
+  line-height: 32px;
+}
+.search_select_modal_wrapper .ant-modal-body {
+  padding: 0px;
+  background: #F3F3F3;
+  height: calc(100vh - 190px);
+  overflow: hidden;
+}
+.search_select_modal_wrapper .ant-modal-footer .ant-btn.ant-btn-default {
+  color: #005cff;
+  border-color: #005cff;
+}
+.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary,
+.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {
+  background: #005cff;
+  border-color: #005cff;
+}
+.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {
+  opacity: 0.5;
+  color: #fff;
+}
+.search_select_wrapper {
+  position: relative;
+  font-size: 14px;
+}
+.search_select_wrapper_topForm .select_list_columns {
+  width: 100%;
+  padding: 10px 6px 2px 16px;
+  background-color: #fff;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form {
+  padding: 0;
+  display: flex;
+  align-items: flex-start;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item,
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-col .ant-space {
+  font-size: 12px !important;
+  margin-right: 0px !important;
+  margin-bottom: 8px !important;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {
+  background-color: #fafafa;
+  border: 0.8px solid #D9D9D9;
+  border-radius: 2px;
+  font-size: 12px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {
+  width: 100%;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {
+  width: 110px;
+  order: 1;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {
+  width: 100%;
+  text-align: left;
+  padding: 0 10px;
+  color: #333333;
+  font-size: 12px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {
+  order: 2;
+  width: 100px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {
+  border: 0;
+  font-size: 12px;
+  background-color: #fafafa;
+  padding: 0 11px;
+  height: 24px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {
+  background-color: #fafafa !important;
+  border: 0;
+  font-size: 12px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {
+  border: 0 !important;
+  background-color: #fafafa !important;
+  font-size: 12px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {
+  background-color: #fafafa !important;
+  border: 0;
+  font-size: 12px;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {
+  background: #005cff;
+}
+.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {
+  order: 2;
+  padding-right: 10px;
+}
+.search_select_wrapper_topForm .select_list_button_space {
+  margin-right: 10px;
+}
+.search_select_wrapper_bottomTable {
+  margin: 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.search_select_wrapper_bottomTable_wrapLeft1,
+.search_select_wrapper_bottomTable_wrapLeft2,
+.search_select_wrapper_bottomTable_wrapRight {
+  background: #fff;
+  width: calc(50% - 5px);
+}
+.search_select_wrapper_bottomTable_wrapLeft1 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,
+.search_select_wrapper_bottomTable_wrapLeft2 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,
+.search_select_wrapper_bottomTable_wrapRight .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {
+  justify-content: center;
+}
+.search_select_wrapper_bottomTable_wrapLeft1 {
+  width: 100%;
+}
+.search_select_wrapper_bottomTable_wrapRight {
+  margin-left: 10px;
+}
+.search_select_wrapper_bottomTable .ant-tabs-nav {
+  margin: 0;
+  padding: 6px 18.5px;
+}
+.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {
+  height: 28px;
+  font-size: 14px;
+}
+.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {
+  padding: 4px 0;
+}
+.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {
+  left: 3px !important;
+  width: 40px !important;
+  background: #005cff;
+}
+.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {
+  color: #005cff;
+  cursor: pointer;
+}
+.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
+  color: #005cff;
+}
+.search_select_wrapper_bottomTable .ant-tabs-content-holder {
+  padding: 10px 10px 7px;
+}
+.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {
+  color: #7F7F7F;
+}
+.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {
+  justify-content: center;
+}
+.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {
+  color: #333333;
+}
+.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {
+  color: #005cff;
+  background: #005cff;
+}
+.search_select_wrapper_bottomTable .ant-pagination-item-active a {
+  color: #005cff;
+}
+.search_select_wrapper_bottomTable .ant-pagination-item-active {
+  border-color: #005cff;
+}
+.searchSelectSpin > div {
+  height: 300px !important;
+}
+.searchSelectMaxTagToolTip .ant-tooltip-inner {
+  max-height: 72px;
+  overflow-x: auto;
+  padding: 0px;
+}

package/src/components/Functional/SearchSelect/index.less

@@ -135,7 +135,7 @@
     .ant-modal-body {
       padding: 0px;
       background: #F3F3F3;
-      height: calc(100vh - 235px); // modal弹窗760 调整为700 适应小屏
+      height: calc(100vh - 190px); // modal弹窗760 调整为700 适应小屏
       overflow: hidden;
     }
     .ant-modal-footer {
@@ -185,7 +185,7 @@
           .ant-row .ant-form-item-label {
             width: 110px;
             order: 1;
-    
+
             label{
               width: 100%;
               text-align: left;
@@ -193,7 +193,7 @@
               color: #333333;
               font-size: 12px;
               font-family: PingFangSC-Regular;
-              font-weight: 400; 
+              font-weight: 400;
             }
           }
           .ant-row .ant-form-item-control {
@@ -287,11 +287,11 @@
       }
       .ant-tabs-content-holder {
         padding: 10px 10px 7px;
-        
+
         .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content {
           // max-height: 472px;  // 空数据528px；非空数据因为有分页所以472px
           // overflow: auto scroll !important; // 这样滑动会将表头滑走，使用table自带的scrolly 解决高度问题
-          
+
           .ant-table-thead > tr > th {
             color: #7F7F7F;
           }

package/src/components/Functional/SearchSelect/index.tsx

@@ -32,6 +32,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     highestPopContainer = undefined,
     fieldComponent,
     onSaveCallback,
+    returnFormat = [],
     selectBusinessType,
   } = props;
   const {
@@ -66,6 +67,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
   const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
   const currentSelectProps = {
+    // 回显字段可自定义
+    optionLabelProp: "label",
     ...selectProps,
     // 以下属性不可更改----设计配置项
     showArrow: true,
@@ -73,7 +76,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     filterOption: false,
     allowClear: true,
     listHeight: 160,
-    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   }
@@ -431,7 +433,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
-      const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
+      const getFromat = (format, val) => format.map(({key,value})=> ({[key]:val[value]}))
+      const formatResult = value.map((i: any) => (Object.assign({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }, ...getFromat(returnFormat, i))))
       onChange(selectMode ? formatResult : formatResult[0], value,source)
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')

package/src/components/Solution/RuleComponent/index.js

@@ -748,6 +748,7 @@ class RuleObjectComponent extends Component {
       <div
         className={'rule_line_content'}
         style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
+        key={itemDetail.elementId}
       >
         <div
           className={'logical_operate_content'}