@bit-sun/business-component 4.2.0-alpha.6.16 → 4.2.0-alpha.6.18

package/dist/plugin/TableColumnSetting/index.d.ts

@@ -38,14 +38,14 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     } | {
         title: string;
         dataIndex: string;
-        render: (text: any, record: any) => React.JSX.Element;
+        render: (text: any, record: any) => JSX.Element;
         className?: undefined;
         width?: undefined;
     } | {
         title: string;
         dataIndex: string;
         className: string;
-        render: () => React.JSX.Element;
+        render: () => JSX.Element;
         width?: undefined;
     })[];
     showModal: () => void;
@@ -53,13 +53,13 @@ declare class TableColumnSetting extends React.Component<TableColumnSettingProps
     handleCancel: (e: React.MouseEvent<HTMLElement>) => void;
     handleTableHeadHidden: (title: string) => void;
     onSortEnd: ({ oldIndex, newIndex }: any) => void;
-    DraggableContainer: (props: any) => React.JSX.Element;
-    DraggableBodyRow: ({ className, style, ...restProps }: any) => React.JSX.Element;
+    DraggableContainer: (props: any) => JSX.Element;
+    DraggableBodyRow: ({ className, style, ...restProps }: any) => JSX.Element;
     onChange: (e: any, title: any) => void;
     handleReset: () => void;
     handleResetSetting: () => Promise<unknown>;
     onSearch: (e: any) => void;
     onSearchSort: (e: any) => void;
-    render(): React.JSX.Element;
+    render(): JSX.Element;
 }
 export default TableColumnSetting;

package/dist/utils/TableUtils.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import moment from 'moment';
 type mediaListType = {
     type: number;
@@ -49,24 +48,24 @@ declare const updateGuanDate: (requestParams: any, dateKeyParams?: any) => {
     };
     submit: any;
 };
-declare const textIcon: (type: string | number, text?: string) => React.JSX.Element | undefined;
-declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => React.JSX.Element;
-declare const handleTextOverflow: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextLineFeed: (text: string | undefined, width?: number) => React.JSX.Element;
-declare const handleTextTooltip: (text: any) => React.JSX.Element;
-declare const handleTextBreakSpaces: (text: any) => React.JSX.Element;
-declare const handleStatusBadge: (text: any, color: any) => React.JSX.Element;
-declare const HandleTotalCount: (totalParams: any) => React.JSX.Element;
+declare const textIcon: (type: string | number, text?: string) => JSX.Element | undefined;
+declare const handleTextDoubleOrId: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextDouble: (textOne: string | undefined, textTwo: string | undefined) => JSX.Element;
+declare const handleTextOverflow: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextLineFeed: (text: string | undefined, width?: number) => JSX.Element;
+declare const handleTextTooltip: (text: any) => JSX.Element;
+declare const handleTextBreakSpaces: (text: any) => JSX.Element;
+declare const handleStatusBadge: (text: any, color: any) => JSX.Element;
+declare const HandleTotalCount: (totalParams: any) => JSX.Element;
 declare const handleCommonTimeRender: (text: any, format?: any) => any;
-declare const handleTooltip: (text: any, timeTrue?: boolean) => React.JSX.Element;
-declare const handleTooltipHours: (text: any, timeTrue?: boolean) => React.JSX.Element;
+declare const handleTooltip: (text: any, timeTrue?: boolean) => JSX.Element;
+declare const handleTooltipHours: (text: any, timeTrue?: boolean) => JSX.Element;
 type tableColumnsImageType = {
     width?: number | string;
     height?: number | string;
     [key: string]: any;
 };
-declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => React.JSX.Element;
+declare const tableColumnsImage: (url?: string, paramsObj?: tableColumnsImageType) => JSX.Element;
 interface ColumnsEditInterfave {
     text?: string;
     record?: any;
@@ -82,7 +81,7 @@ interface ColumnsEditInterfave {
     };
     [key: string]: any;
 }
-declare const ColumnsEdit: (props: ColumnsEditInterfave) => React.JSX.Element;
+declare const ColumnsEdit: (props: ColumnsEditInterfave) => JSX.Element;
 type UserColumnsType = {
     name: string;
     department?: string;
@@ -90,13 +89,13 @@ type UserColumnsType = {
     company?: string;
     avatar?: string;
 };
-declare const userColumns: (props: UserColumnsType) => React.JSX.Element;
-declare const userInfoCard: (props: any) => React.JSX.Element;
+declare const userColumns: (props: UserColumnsType) => JSX.Element;
+declare const userInfoCard: (props: any) => JSX.Element;
 declare const getItemDefaultWidth: (item: any) => number;
-declare const sulaTableRenderTooltip: ({ text }: any) => React.JSX.Element;
+declare const sulaTableRenderTooltip: ({ text }: any) => JSX.Element;
 declare const renderNumberText: ({ text }: any) => any;
 declare const renderFixed2: (text: any) => any;
-declare const handleTextWarpCustom: (text: any, style?: {}) => React.JSX.Element;
+declare const handleTextWarpCustom: (text: any, style?: {}) => JSX.Element;
 declare const calculateValidPeriod: (start: any, end: any) => string;
-declare const handleTextWarp: (text: any) => React.JSX.Element;
+declare const handleTextWarp: (text: any) => JSX.Element;
 export { getSkuImg, updateGuanDate, textIcon, handleTextDoubleOrId, handleTextDouble, handleTextOverflow, handleTextLineFeed, handleTextTooltip, handleTextBreakSpaces, handleStatusBadge, HandleTotalCount, handleTooltip, handleCommonTimeRender, handleTooltipHours, tableColumnsImage, ColumnsEdit, userColumns, userInfoCard, getItemDefaultWidth, renderNumberText, sulaTableRenderTooltip, renderFixed2, handleTextWarpCustom, handleTextWarp, calculateValidPeriod };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.0-alpha.6.16",
+  "version": "4.2.0-alpha.6.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -967,6 +967,7 @@ export default (props: any) => {
       {/* 列设置弹出框表格 */}
       <SortableTable
         ref={sortTableRef}
+        disableColumnFixed={props.tableProps?.isVirtualTable}
         setShowColumns={setResizeShowColumns}
         showColumn={showColumn}
         setInitialTableInfo={setInitialTableInfo}

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -288,6 +288,9 @@ class SortableTable extends React.Component {
       title: '列首',
       dataIndex: 'fixedLeft',
       render: (text, record) => {
+        if(this.props.disableColumnFixed) {
+          return null
+        }
         return (
           <span
             onClick={() => {
@@ -375,6 +378,9 @@ class SortableTable extends React.Component {
       title: '列尾',
       dataIndex: 'fixedRight',
       render: (text, record) => {
+        if(this.props.disableColumnFixed) {
+          return null
+        }
         return (
           <span
             onClick={() => {

package/src/components/Solution/RuleComponent/RenderCompItem.tsx

@@ -589,7 +589,7 @@ export default function RenderCompItem(props:any){
           null}
         {/* 单选/多选  配送方式选择器  */}
         {((ites?.inputType === 20 || ites?.inputType === 30) &&
-          ites?.choiceType === 310 && (
+          (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
             <BusinessSearchSelect
               selectBusinessType="deliveryMode"
               selectProps={{
@@ -606,6 +606,14 @@ export default function RenderCompItem(props:any){
               labelInValue={true}
               value={showValue(ites.code)}
               requestConfig={{
+                ...(ites?.choiceType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {

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

@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
         }
       }
       // 配送方式选择器
-      if (dataChoiceBusinessType == 310) {
+      if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
         if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
           return (
             <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[0]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
                 labelInValue={true}
                 value={values[1]}
                 requestConfig={{
+                  ...(dataChoiceBusinessType === 311
+                  ? {
+                      otherParams: {
+                        // 配送方式只选择标准配送方式
+                        'qp-recordChannnelCode-eq': 80,
+                      },
+                    }
+                  : {}),
                   filterInit: 'qp-code-in',
                 }}
                 onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
               labelInValue={true}
               value={currentValue}
               requestConfig={{
+                ...(dataChoiceBusinessType === 311
+                ? {
+                    otherParams: {
+                      // 配送方式只选择标准配送方式
+                      'qp-recordChannnelCode-eq': 80,
+                    },
+                  }
+                : {}),
                 filterInit: 'qp-code-in',
               }}
               onChange={(value) => {