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

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

@@ -4,7 +4,7 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty, DatePicker } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
 import request from '@/utils/request';
-import _, { escapeRegExp, isNil, values } from "lodash"
+import _, { escapeRegExp, isNil, values, cloneDeep, isEmpty } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput, QueryMutipleSearchSelect } from '@/index';
 import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder, getShowStr, handleTableColumns }  from './utils';
@@ -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'
   }
@@ -83,7 +85,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const isFormPage = pathname.match(pattern)?.length > 0;
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
-  const tableInitPagination = { ...initPagination, total: 0, current: 1 }
+  const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSizeOptions: [10, 20, 50, 100, 500, 1000] }
   const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {
@@ -360,6 +362,30 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     };
   },[isModalVisible])
 
+  const safeJSONParse = (str: string) => {
+    try {
+      return JSON.parse(str);
+    } catch (error) {
+      console.warn('JSON解析失败:', error);
+      return null;
+    }
+  };
+
+  // 获取回显的value值 如果开启了搜索条件 则需要过滤掉搜索条件
+  const getShowValue = (value: any) => {
+    let newValue = cloneDeep(value);
+    if(selectProps.useSearchCondition && newValue) {
+      // 回显的时候 把搜索项的内容去掉
+      if(selectMode) {
+        newValue = newValue.filter((item: any) => {
+          const parsedItem = safeJSONParse(decodeURIComponent(item));
+          // 过滤掉JSON对象（搜索条件），保留非JSON数据（实际选择项）
+          return !parsedItem || !(parsedItem && typeof parsedItem === 'object' && !Array.isArray(parsedItem));
+        });
+      }
+    }
+    return newValue;
+  }
   const showModal = () => {
     if(sDisabled) return;
     
@@ -371,8 +397,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     // 回显
     if (value) {
       if (selectMode) {
-        setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
-        setSelectedRows(labelInValue ? value.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : value.map(i => ({ [mappingValueField]: i, value: i })))
+        const newValue = getShowValue(value);
+        setSelectedRowKeys(labelInValue ? newValue.map(i => i.key) : newValue)
+        setSelectedRows(labelInValue ? newValue.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : newValue.map(i => ({ [mappingValueField]: i, value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(itemsTotal && value.length === itemsTotal);
@@ -393,8 +420,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       setSelectDataSource(source,source?.length)
       formaData(selectedValue, source);
     } else {
-      const formatResult = selectMode ? [] : null
-      onChange(formatResult, selectedValue)
+      var formatResult = selectMode ? [] : null;
+      // 支持使用查询条件 筛选
+      if (selectProps.useSearchCondition) {
+        var formValue = form.getFieldsValue();
+        // 一次性处理数据转换和过滤
+        var processedFormValue = Object.keys(formValue).reduce(function (acc, key) {
+          var value = formValue[key];
+          // 过滤空值（确保trim函数存在）
+          var trimmedValue = typeof value === 'string' ? value.trim() : value;
+          if (trimmedValue && trimmedValue !== '') {
+            acc[key] = trimmedValue;
+          }
+          return acc;
+        }, {});
+        const result = JSON.stringify(processedFormValue)
+        onChange(isEmpty(processedFormValue) ? formatResult : selectMode ? [result] : result, selectedValue);
+      } else {
+        onChange(formatResult, selectedValue);
+      }
     }
   }
   const handleOk = () => {
@@ -424,14 +468,15 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         setConfirmLoading(false)
       })
     } else {
-      handleSelectOver(popvalue)
+      handleSelectOver(selectedRows.length ? popvalue : [])
       handleCancel();
     }
   };
 
   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')
@@ -931,7 +976,20 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           footer={
             selectMode || modalTableProps?.modalRadioNeedFooter
               ? [
-                  <Button key="back" onClick={handleCancel}>
+                  selectProps.useSearchCondition ? (
+                    <div 
+                      key="instructions" 
+                      style={{ 
+                        position: 'absolute', 
+                        width: 'calc(100% - 500px)', 
+                        textAlign: 'left' 
+                      }}
+                    >
+                      <div>操作说明：结果集过多时，可无需选择具体数据，系统将直接按已设筛选条件查询</div>
+                      <Input style={{marginTop: '3px', height: '22px'}} value={value} />
+                    </div>
+                  ) : <></>,
+                  <Button key="back" onClick={handleCancel} style={{margin: selectProps.useSearchCondition ? '10px 0' : 0}}>
                     取消
                   </Button>,
                   <Button

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

@@ -403,7 +403,10 @@ export const maxTagPlaceholder = (selectedValues: any, { selectProps, onChange,
 // 弹窗数据表头处理
 export const handleTableColumns = (tableColumns: any) => {
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
-  const showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number')||tableColumns||[];
+  let showTableColumns = tableColumns?.filter((s: any) => typeof s.defaultSort == 'number') || tableColumns || [];
+
+  showTableColumns = showTableColumns?.length ? showTableColumns : tableColumns; 
+
   return showTableColumns?.sort((a: any,b: any)=> a.defaultSort-b.defaultSort)||[]
 };
 

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

@@ -57,6 +57,7 @@ export default (props: Iprops) => {
         // handleEdit(ites.code, value);
       }}
       options={dataSource}
+      filterOption ={(input: any, option: any) => option?.label?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
     />
   );
 };

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

@@ -155,6 +155,7 @@ export default function RenderCompItem(props:any){
               onChange={(value) => {
                 handleEdit(ites.code, value);
               }}
+              filterOption ={(input: any, option: any) => option?.text?.toLowerCase()?.indexOf(input?.toLowerCase()) >= 0}
             >
               {Object.keys(ites.enumeration).map((it) => (
                 <Select.Option key={it} value={it}>
@@ -170,7 +171,7 @@ export default function RenderCompItem(props:any){
             <InnerSelect
               disabled={disabled}
               inputType={ites?.inputType}
-              defaultValue={ites.defaultValue}
+              defaultValue={ites?.defaultValue}
               styleCommon={styleCommon}
               value={showValue(ites.code)}
               onChange={(value) => {
@@ -588,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={{
@@ -605,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/RenderCompItem_README.md

@@ -0,0 +1,189 @@
+# RenderCompItem 组件说明文档
+
+`RenderCompItem` 是一个通用的表单控件渲染组件，它根据传入的配置对象 (`ites`) 动态渲染不同类型的 Ant Design 表单组件或业务封装组件。
+
+## 1. 组件引入
+
+```typescript
+import RenderCompItem from '@/components/Solution/RuleComponent/RenderCompItem';
+```
+
+## 2. Props 参数说明
+
+| 参数名 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `ites` | `object` | 是 | 核心配置对象，决定渲染什么组件（见下文详解） |
+| `showValue` | `(code: string, type?: string) => any` | 是 | 获取组件当前值的回调函数 |
+| `handleEdit` | `(code: string, value: any) => void` | 是 | 组件值发生变化时的回调函数 |
+| `disabled` | `boolean` | 否 | 是否禁用组件 |
+| `regularDataList` | `array` | 否 | 用于表达式 (`Formula`) 组件的数据源列表 |
+| `others` | `object` | 否 | 扩展属性（目前主要用于 `CustomSelector` 的配置，**注意：源码中可能未正确解构此参数，使用自定义选择器时需检查**） |
+
+## 3. `ites` 配置详解
+
+`ites` 对象通过 `inputType`、`valueType` 和 `choiceType` 的组合来决定渲染的具体组件。
+
+### 3.1 基础输入类 (`inputType: 10`)
+
+当 `inputType` 为 `10` 时，根据 `valueType` 区分：
+
+| valueType | 组件类型 | 说明 | 对应 Antd 组件 |
+| --- | --- | --- | --- |
+| `21` | 文本输入 | 默认字符串输入 | `Input` |
+| `22` | 小数输入 | 保留2位小数 | `InputNumber` |
+| `23` | 整数输入 | 整数，无小数 | `InputNumber` |
+| `24` | 布尔开关 | Switch 开关 | `Switch` |
+| `32` | 日期时间 | 选择日期和时间 | `DatePicker` (showTime) |
+| `40` | 时间范围 | 选择时间范围 | `RangePicker` (showTime) |
+| `41` | 日期 | 仅选择日期 | `DatePicker` |
+
+### 3.2 选择类 (`inputType: 20 | 30`)
+
+*   `inputType: 20`: 单选
+*   `inputType: 30`: 多选
+
+根据 `choiceType` 区分具体业务组件：
+
+| choiceType | 组件类型 | 说明 | 数据源/依赖 |
+| --- | --- | --- | --- |
+| `10` | 枚举选择 | 静态选项 | 需提供 `ites.enumeration` 对象 (key-value) |
+| `20` | 数据字典 | 字典选择 | 需提供 `ites.dictionaryCode` |
+| `110` | 物理仓 | 业务选择器 | `BusinessSearchSelect` (physicalWarehouse) |
+| `120` | 逻辑仓 | 业务选择器 | `BusinessSearchSelect` (realWarehouse) |
+| `130` | 虚拟仓 | 业务选择器 | `BusinessSearchSelect` (virtualWarehouse) |
+| `140` | 渠道仓 | 业务选择器 | `BusinessSearchSelect` (channelWarehouse) |
+| `150` | SPU | 业务选择器 | `BusinessSearchSelect` (spuCommodity) |
+| `160` | SKU | 业务选择器 | `BusinessSearchSelect` (skuCommodity) |
+| `190` | 省市区 | 级联选择 | `BsCascader` |
+| `210` | 行政组织 | 树形选择 | `BusinessTreeSearchSelect` (department) |
+| `220` | 采购组织 | 树形选择 | `BusinessTreeSearchSelect` (purchase-organization) |
+| `230` | 销售组织 | 树形选择 | `BusinessTreeSearchSelect` (sales-organization) |
+| `240` | 供应商 | 业务选择器 | `BusinessSearchSelect` (supplier2) |
+| `250` | 客户 | 业务选择器 | `BusinessSearchSelect` (customer2) |
+| `260` | 店铺 | 业务选择器 | `BusinessSearchSelect` (shopFile2) |
+| `270` | 员工 | 业务选择器 | `BusinessSearchSelect` (employee2) |
+| `280` | 库存组织 | 树形选择 | `BusinessTreeSearchSelect` (stock-organization) |
+| `290` | 结算组织 | 树形选择 | `BusinessTreeSearchSelect` (settle-organization) |
+| `310` / `311`| 配送方式 | 业务选择器 | `BusinessSearchSelect` (deliveryMode) |
+| `360` | 角色 | 业务选择器 | `BusinessSearchSelect` (role) |
+| `410` | 品牌 | 业务选择器 | `BusinessSearchSelect` (brand) |
+| `420` | 类目 | 树形选择 | `BusinessTreeSearchSelect` (background-category) |
+| `40` | 自定义 | 自定义组件 | `CustomSelector` (依赖 `others.customSelectorConfig`) |
+
+### 3.3 表达式 (`inputType: 40`)
+
+渲染 `Formula` 组件，用于配置计算公式。依赖 `regularDataList` 作为变量源。
+
+## 4. 使用示例
+
+```tsx
+import React, { useState } from 'react';
+import RenderCompItem from './RenderCompItem';
+
+const Demo = () => {
+  const [formData, setFormData] = useState<any>({});
+
+  // 模拟数据回显
+  const showValue = (code: string) => {
+    return formData[code];
+  };
+
+  // 模拟数据更新
+  const handleEdit = (code: string, value: any) => {
+    console.log('Update:', code, value);
+    setFormData((prev: any) => ({ ...prev, [code]: value }));
+  };
+
+  // 配置项示例：文本输入
+  const inputConfig = {
+    code: 'userName',
+    inputType: 10,
+    valueType: 21,
+    defaultValue: '张三'
+  };
+
+  // 配置项示例：静态下拉选择
+  const selectConfig = {
+    code: 'status',
+    inputType: 20, // 单选
+    choiceType: 10, // 枚举
+    enumeration: {
+      '1': '启用',
+      '0': '禁用'
+    }
+  };
+
+  // 配置项示例：SKU 选择器 (多选)
+  const skuSelectConfig = {
+    code: 'skuCodes',
+    inputType: 30, // 多选
+    choiceType: 160, // SKU 选择器
+  };
+
+  // 配置项示例：数据字典选择 (单选)
+  const dictSelectConfig = {
+    code: 'warehouseType',
+    inputType: 20, // 单选
+    choiceType: 20, // 数据字典
+    dictionaryCode: 'SC0001' // 传入字典编码，组件会自动请求接口获取字典数据
+  };
+
+  return (
+    <div>
+      <div style={{ marginBottom: 20 }}>
+        <label>用户名：</label>
+        <RenderCompItem
+          ites={inputConfig}
+          showValue={showValue}
+          handleEdit={handleEdit}
+          regularDataList={[]}
+        />
+      </div>
+
+      <div style={{ marginBottom: 20 }}>
+        <label>状态：</label>
+        <RenderCompItem
+          ites={selectConfig}
+          showValue={showValue}
+          handleEdit={handleEdit}
+          regularDataList={[]}
+        />
+      </div>
+
+      <div style={{ marginBottom: 20 }}>
+        <label>商品SKU：</label>
+        <RenderCompItem
+          ites={skuSelectConfig}
+          showValue={showValue}
+          handleEdit={handleEdit}
+          regularDataList={[]}
+        />
+      </div>
+
+      <div>
+        <label>仓库类型(数据字典)：</label>
+        <RenderCompItem
+          ites={dictSelectConfig}
+          showValue={showValue}
+          handleEdit={handleEdit}
+          regularDataList={[]}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default Demo;
+```
+
+## 5. 依赖说明
+
+该组件依赖以下项目内部组件和库：
+*   `antd`
+*   `bssula` (request)
+*   `@/components/Functional/BsAntdSula` (BsCascader)
+*   `@/index` (BusinessSearchSelect, BusinessTreeSearchSelect)
+*   内部组件: `./Formula`, `./InnerSelect`, `./CustomPlugin/CustomSelector`
+*   工具函数: `../../../utils/utils`
+
+使用前请确保相关依赖已安装且路径正确。

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'}
@@ -1140,7 +1141,12 @@ class RuleObjectComponent extends Component {
       let value = val;
       if (isObj(code)) {
         Object.keys(code).forEach((ite) => {
-          this.handleEditExtraInfoResponse(ite, code[ite], parentDetail,classDataIndex);
+          this.handleEditExtraInfoResponse(
+            ite,
+            code[ite],
+            parentDetail,
+            classDataIndex,
+          );
         });
         return;
       }
@@ -1148,9 +1154,16 @@ class RuleObjectComponent extends Component {
         value = val.map((m) => m.value || m).join(',');
       }
       if (isObj(val)) {
-        value = val.value || val.PCDCode?.join('/');
+        value = val?.value || val.PCDCode?.join('/') || val;
       }
-      this.handleEditExtraInfoResponse('value', value, parentDetail,classDataIndex,code);
+  
+      this.handleEditExtraInfoResponse(
+        'value',
+        value,
+        parentDetail,
+        classDataIndex,
+        code,
+      );
     };
 
     return (

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) => {

package/src/index.ts

@@ -43,8 +43,15 @@ export { default as EllipsisTooltip} from './components/Functional/EllipsisToolt
 export * from './components/Functional/BsAntdSula/index';
 export { default as RuleComponent} from './components/Solution/RuleComponent';
 export { default as RuleSetter} from './components/Solution/RuleSetter';
+export { default as RenderCompItem} from './components/Solution/RuleComponent/RenderCompItem';
+
+export { processDetailButtonsVisible as processDetailButtonsVisible } from './components/Business/DetailPageWrapper';
+
+
 
 // 通用组件
 export { default as ExtendedCollapse } from './components/Common/ExtendedCollapse';
 export { default as Section } from './components/Common/Section';
 export { default as ParagraphCopier } from './components/Common/ParagraphCopier';
+
+export { default as SystemLog } from './components/Business/SystemLog';

package/src/plugin/TableColumnSetting/index.tsx

@@ -495,6 +495,56 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     this.setInitValue(datasource);
   };
 
+  handleResetSetting = () => {
+    const { setShowColumns, datasource = [], setInitialTableInfo, appRequestConfig }: any = this.props;
+    let that = this;
+    let { bsTableCode } = this.state;
+
+    return new Promise((resolve: any, reject: any) => {
+      request({
+        url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
+        method: 'POST',
+        data: {
+          code: that.state.bsTableCode,
+          detail: '',
+        },
+      }).then((res:any) => {
+        if (judgeIsRequestSuccess(res?.data)) {
+          let config =
+          localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+          let configArray = JSON.parse(config);
+          let currentSetting = configArray.filter(
+            (item) => item.code === bsTableCode,
+          );
+          if (currentSetting.length) {
+            currentSetting[0].detail = JSON.stringify([]);
+          } else {
+            configArray.push({
+              code: bsTableCode,
+              detail: JSON.stringify([]),
+            });
+          }
+
+          localStorage.setItem(
+            ENUM.BROWSER_CACHE.COLUMN_CONDITION,
+            JSON.stringify(configArray),
+          );
+
+          message.success('重置表头列成功！');
+
+          setInitialTableInfo(true);
+          this.setState({
+            visible: false,
+          });
+        } else {
+          message.error('重置表头列自定义失败，请稍后尝试');
+          reject('');
+        }
+      });
+    })
+  };
+
+
   onSearch = (e: any) => {
     this.setState({
       searchDataSource: e.target.value,
@@ -532,15 +582,31 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
           footer={[
-            <Button key="back" onClick={this.handleReset}>
-              恢复默认
-            </Button>,
-            <Button key="submit" onClick={this.handleOk}>
-              取消
-            </Button>,
-            <Button key="submit" type="primary" onClick={this.handleOk}>
-              确认
-            </Button>,
+            <div>
+              <Button
+                key="back"
+                onClick={this.handleReset}
+                style={{ marginRight: 0 }}
+              >
+                恢复默认
+              </Button>
+              <Button key="back" onClick={this.handleResetSetting}>
+                重置设置
+              </Button>
+              <span style={{fontSize: '12px', color: '8A8F8D'}}>（列表字段变更会影响列设置功能，变更后请点击重置然后重新设置）</span>
+            </div>,
+            <div>
+              <Button
+                key="submit"
+                onClick={this.handleCancel}
+                style={{ marginRight: 0 }}
+              >
+                取消
+              </Button>
+              <Button key="submit" type="primary" onClick={this.handleOk}>
+                确认
+              </Button>
+            </div>,
           ]}
         >
           <div className={'sort_table'}>

package/src/utils/TableUtils.less

@@ -48,5 +48,5 @@
 }
 
 .card_department {
-  color: #005cff !important;
+  color: #005CFF !important;
 }

package/src/utils/utils.ts

@@ -267,4 +267,44 @@ export const handleConvertResponse = (items: any, total: number): object => {
 
 export const noEmptyArray = (targetObj: any) => {
   return Array.isArray(targetObj) && targetObj.length !== 0;
-};
+};
+
+export const formContainerAndItemLayout = (type: string, title: any, name: string) => {
+  return type === 'form' ? {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        name
+      },
+    },
+    itemLayout: {
+      span: 8, // span表示每项所占的栅格数
+      labelCol: {
+        span: 8,
+      },
+      wrapperCol: {
+        span: 18,
+      },
+    },
+  } : {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        bordered: null,
+        isWhiteCard: true,
+        name
+      },
+    },
+    itemLayout: {
+      wrapperCol: {
+        span: 0,
+      },
+    },
+  }
+}