@bit-sun/business-component 2.1.17 → 2.1.19

package/dist/components/Business/BsSulaQueryTable/setting.d.ts

@@ -10,6 +10,7 @@ declare class SortableTable extends React.Component {
         onSearchSort: boolean;
         isDefaultValue: boolean;
         defaultValue: never[];
+        bsTableCode: string;
     };
     patchUserColumnConfig: (config: any) => void;
     getConfigFromlocalstorage: () => any;

package/dist/index.esm.js

@@ -10793,6 +10793,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
       result = '/user';
       break;
     case 'deliveryMode':
+    case 'ruleTemplate':
       result = '/basic';
       break;
     default:
@@ -12406,6 +12407,60 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
+  // 规则场景选择器
+  if (type === 'ruleTemplate') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/ruleTemplate"),
+      // filter: 'qp-name,code-orGroup,like', // 过滤参数
+      filter: 'qp-name-like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'ruleTemplateCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '规则场景名称'
+    }, {
+      name: 'qp-code-like',
+      label: '规则场景编码'
+    }];
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择规则场景',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '规则场景编码',
+        dataIndex: 'code'
+      }, {
+        title: '规则场景名称',
+        dataIndex: 'name',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        title: '条件对象',
+        dataIndex: 'objectName',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'extName',
+        title: '条件扩展',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'actionName',
+        title: '执行动作',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }]
+    }, modalTableBusProps);
+  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -12456,6 +12511,25 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
   return true;
 });
 
+function handleSelectColumn(c, parentProps) {
+  var result = c;
+  var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
+  var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || [];
+  var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || [];
+  // 过滤不需要展示内容
+  if (exceptColumns === null || exceptColumns === void 0 ? void 0 : exceptColumns.length) {
+    result = result.filter(function (i) {
+      return !exceptColumns.includes(i.dataIndex);
+    });
+  }
+  // 追加
+  if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) ;
+  // 覆盖内容
+  if (coverColumns === null || coverColumns === void 0 ? void 0 : coverColumns.length) {
+    result = coverColumns;
+  }
+  return result;
+}
 var AddSkuSelect = function AddSkuSelect(parProps) {
   var selectProps = {
     mode: 'multiple'
@@ -12464,6 +12538,88 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var initialSelectColumn = [{
+    title: 'SKU编码',
+    width: 150,
+    dataIndex: 'skuCode'
+  }, {
+    title: 'SKU名称',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'name'
+  }, {
+    title: '图片',
+    dataIndex: 'itemUrl',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text, record) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, tableColumnsImage(getSkuImg(record), {
+        width: 28,
+        height: 28
+      }));
+    }
+  }, {
+    title: '数量',
+    width: 100,
+    isInputItem: true,
+    dataIndex: 'count'
+  }, {
+    title: '单位',
+    dataIndex: 'selectUnitCode',
+    width: 80,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text, record) {
+      var _record$packingUnitLi;
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+        var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+        record.selectUnitCode = basePackUnit.unitCode;
+        return basePackUnit.name || basePackUnit.unitCode;
+      }
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+  }, {
+    title: '所属SPU编码',
+    width: 150,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemCode',
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }, {
+    title: '规格',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'propertyNameAndValue'
+  }];
+  var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -12686,87 +12842,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       },
       dataIndex: 'brandName'
     }],
-    selectColumn: [{
-      title: 'SKU编码',
-      width: 150,
-      dataIndex: 'skuCode'
-    }, {
-      title: 'SKU名称',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      },
-      dataIndex: 'name'
-    }, {
-      title: '图片',
-      dataIndex: 'itemUrl',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text, record) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, tableColumnsImage(getSkuImg(record), {
-          width: 28,
-          height: 28
-        }));
-      }
-    }, {
-      title: '数量',
-      width: 100,
-      isInputItem: true,
-      dataIndex: 'count'
-    }, {
-      title: '单位',
-      dataIndex: 'selectUnitCode',
-      width: 80,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text, record) {
-        var _record$packingUnitLi;
-        if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
-          var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
-          record.selectUnitCode = basePackUnit.unitCode;
-          return basePackUnit.name || basePackUnit.unitCode;
-        }
-        return /*#__PURE__*/React.createElement(React.Fragment, null);
-      }
-    }, {
-      title: '所属SPU编码',
-      width: 150,
-      ellipsis: {
-        showTitle: false
-      },
-      dataIndex: 'itemCode',
-      render: function render(text) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      }
-    }, {
-      title: '规格',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      },
-      dataIndex: 'propertyNameAndValue'
-    }]
+    selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -15144,9 +15220,11 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       searchDataSource: false,
       onSearchSort: false,
       isDefaultValue: false,
-      defaultValue: []
+      defaultValue: [],
+      bsTableCode: '' //设置table 列的标识
     };
     _this.patchUserColumnConfig = function (config) {
+      var that = _assertThisInitialized(_this);
       var configvalue = config ? config.map(function (item) {
         return {
           key: item.key,
@@ -15160,7 +15238,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         url: '/user/appConfig/saveUserOrder',
         method: 'POST',
         data: {
-          code: window.location.hash,
+          code: that.state.bsTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : ''
         }
       }).then(function (res) {
@@ -15176,7 +15254,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var configSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === _this.state.bsTableCode;
       });
       if (configSetting.length && configSetting[0].detail) {
         return JSON.parse(configSetting[0].detail);
@@ -15185,17 +15263,19 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
     _this.patchConfigToLocalstorage = function (configvalue) {
       var setShowColumns = _this.props.setShowColumns;
-      var sortDataSource = _this.state.sortDataSource;
+      var _this$state = _this.state,
+        sortDataSource = _this$state.sortDataSource,
+        bsTableCode = _this$state.bsTableCode;
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var currentSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === bsTableCode;
       });
       if (currentSetting.length) {
         currentSetting[0].detail = JSON.stringify(configvalue);
       } else {
         configArray.push({
-          "code": window.location.hash,
+          "code": bsTableCode,
           "detail": JSON.stringify(configvalue)
         });
       }
@@ -15426,10 +15506,10 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       _this.setInitValue();
     };
     _this.handleOk = function (e) {
-      var _this$state = _this.state,
-        sortDataSource = _this$state.sortDataSource,
-        isDefaultValue = _this$state.isDefaultValue,
-        defaultValue = _this$state.defaultValue;
+      var _this$state2 = _this.state,
+        sortDataSource = _this$state2.sortDataSource,
+        isDefaultValue = _this$state2.isDefaultValue,
+        defaultValue = _this$state2.defaultValue;
       if (!sortDataSource.length) {
         message.warning('至少选择一列!');
         return;
@@ -15447,9 +15527,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       });
     };
     _this.handleTableHeadHidden = function (title) {
-      var _this$state2 = _this.state,
-        sortDataSource = _this$state2.sortDataSource,
-        dataSource = _this$state2.dataSource;
+      var _this$state3 = _this.state,
+        sortDataSource = _this$state3.sortDataSource,
+        dataSource = _this$state3.dataSource;
       _this.setState({
         sortDataSource: sortDataSource.filter(function (item) {
           return item.title !== title;
@@ -15508,9 +15588,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       }, restProps));
     };
     _this.onChange = function (e, title) {
-      var _this$state3 = _this.state,
-        sortDataSource = _this$state3.sortDataSource,
-        dataSource = _this$state3.dataSource;
+      var _this$state4 = _this.state,
+        sortDataSource = _this$state4.sortDataSource,
+        dataSource = _this$state4.dataSource;
       if (!e.target.checked) {
         _this.setState({
           sortDataSource: sortDataSource.filter(function (item) {
@@ -15580,7 +15660,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this$props2 = this.props,
         datasource = _this$props2.datasource,
-        showColumn = _this$props2.showColumn;
+        showColumn = _this$props2.showColumn,
+        bsTableCode = _this$props2.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
@@ -15621,19 +15702,20 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
               return innerKey && innerKey === itemKey;
             })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
           });
-        })
+        }),
+        bsTableCode: bsTableCode
       });
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$state4 = this.state,
-        dataSource = _this$state4.dataSource,
-        searchDataSource = _this$state4.searchDataSource,
-        sortDataSource = _this$state4.sortDataSource,
-        visible = _this$state4.visible,
-        onSearchSort = _this$state4.onSearchSort;
+      var _this$state5 = this.state,
+        dataSource = _this$state5.dataSource,
+        searchDataSource = _this$state5.searchDataSource,
+        sortDataSource = _this$state5.sortDataSource,
+        visible = _this$state5.visible,
+        onSearchSort = _this$state5.onSearchSort;
       var seatchDataSource = dataSource.filter(function (item) {
         var _item$title;
         return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchDataSource || '')) > -1;
@@ -15849,12 +15931,14 @@ var index$5 = (function (props) {
     showColumn = _useState12[0],
     setShowColumns = _useState12[1];
   var _props$isPage = props.isPage,
-    pagination = props.pagination;
+    pagination = props.pagination,
+    tableCode = props.tableCode;
   var _useState13 = useState('100vh'),
     _useState14 = _slicedToArray(_useState13, 2),
     height = _useState14[0],
     setHeight = _useState14[1];
   var sortTableRef = useRef(null);
+  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   var getTableHeight = function getTableHeight() {
     var _document$querySelect, _document$querySelect2, _document$querySelect3;
@@ -15876,7 +15960,7 @@ var index$5 = (function (props) {
     var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     var configArray = JSON.parse(config);
     var configSetting = configArray.filter(function (item) {
-      return item.code === window.location.hash;
+      return item.code === bsTableCode;
     });
     if (configSetting.length && configSetting[0].detail) {
       return JSON.parse(configSetting[0].detail);
@@ -16139,7 +16223,8 @@ var index$5 = (function (props) {
           ref: sortTableRef,
           setShowColumns: setShowColumns,
           showColumn: showColumn,
-          datasource: (value === null || value === void 0 ? void 0 : value.columns) || []
+          datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+          bsTableCode: bsTableCode
         }))))
       }
     }, {

package/dist/index.js

@@ -10807,6 +10807,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
       result = '/user';
       break;
     case 'deliveryMode':
+    case 'ruleTemplate':
       result = '/basic';
       break;
     default:
@@ -12420,6 +12421,60 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
+  // 规则场景选择器
+  if (type === 'ruleTemplate') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/ruleTemplate"),
+      // filter: 'qp-name,code-orGroup,like', // 过滤参数
+      filter: 'qp-name-like',
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'ruleTemplateCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: '规则场景名称'
+    }, {
+      name: 'qp-code-like',
+      label: '规则场景编码'
+    }];
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择规则场景',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '规则场景编码',
+        dataIndex: 'code'
+      }, {
+        title: '规则场景名称',
+        dataIndex: 'name',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        title: '条件对象',
+        dataIndex: 'objectName',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'extName',
+        title: '条件扩展',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }, {
+        dataIndex: 'actionName',
+        title: '执行动作',
+        render: function render(text) {
+          return handleTextOverflow(text);
+        }
+      }]
+    }, modalTableBusProps);
+  }
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig,
@@ -12470,6 +12525,25 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
   return true;
 });
 
+function handleSelectColumn(c, parentProps) {
+  var result = c;
+  var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
+  var coverColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.coverColumns) || [];
+  var additionColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.additionColumns) || [];
+  // 过滤不需要展示内容
+  if (exceptColumns === null || exceptColumns === void 0 ? void 0 : exceptColumns.length) {
+    result = result.filter(function (i) {
+      return !exceptColumns.includes(i.dataIndex);
+    });
+  }
+  // 追加
+  if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) ;
+  // 覆盖内容
+  if (coverColumns === null || coverColumns === void 0 ? void 0 : coverColumns.length) {
+    result = coverColumns;
+  }
+  return result;
+}
 var AddSkuSelect = function AddSkuSelect(parProps) {
   var selectProps = {
     mode: 'multiple'
@@ -12478,6 +12552,88 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var initialSelectColumn = [{
+    title: 'SKU编码',
+    width: 150,
+    dataIndex: 'skuCode'
+  }, {
+    title: 'SKU名称',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'name'
+  }, {
+    title: '图片',
+    dataIndex: 'itemUrl',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text, record) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, tableColumnsImage(getSkuImg(record), {
+        width: 28,
+        height: 28
+      }));
+    }
+  }, {
+    title: '数量',
+    width: 100,
+    isInputItem: true,
+    dataIndex: 'count'
+  }, {
+    title: '单位',
+    dataIndex: 'selectUnitCode',
+    width: 80,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text, record) {
+      var _record$packingUnitLi;
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+        var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
+        record.selectUnitCode = basePackUnit.unitCode;
+        return basePackUnit.name || basePackUnit.unitCode;
+      }
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+    }
+  }, {
+    title: '所属SPU编码',
+    width: 150,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemCode',
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }, {
+    title: '规格',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'propertyNameAndValue'
+  }];
+  var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -12700,87 +12856,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       },
       dataIndex: 'brandName'
     }],
-    selectColumn: [{
-      title: 'SKU编码',
-      width: 150,
-      dataIndex: 'skuCode'
-    }, {
-      title: 'SKU名称',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      },
-      dataIndex: 'name'
-    }, {
-      title: '图片',
-      dataIndex: 'itemUrl',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text, record) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, tableColumnsImage(getSkuImg(record), {
-          width: 28,
-          height: 28
-        }));
-      }
-    }, {
-      title: '数量',
-      width: 100,
-      isInputItem: true,
-      dataIndex: 'count'
-    }, {
-      title: '单位',
-      dataIndex: 'selectUnitCode',
-      width: 80,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text, record) {
-        var _record$packingUnitLi;
-        if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
-          var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
-          record.selectUnitCode = basePackUnit.unitCode;
-          return basePackUnit.name || basePackUnit.unitCode;
-        }
-        return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
-      }
-    }, {
-      title: '所属SPU编码',
-      width: 150,
-      ellipsis: {
-        showTitle: false
-      },
-      dataIndex: 'itemCode',
-      render: function render(text) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      }
-    }, {
-      title: '规格',
-      width: 200,
-      ellipsis: {
-        showTitle: false
-      },
-      render: function render(text) {
-        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
-          placement: "topLeft",
-          title: text
-        }, text);
-      },
-      dataIndex: 'propertyNameAndValue'
-    }]
+    selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -15158,9 +15234,11 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       searchDataSource: false,
       onSearchSort: false,
       isDefaultValue: false,
-      defaultValue: []
+      defaultValue: [],
+      bsTableCode: '' //设置table 列的标识
     };
     _this.patchUserColumnConfig = function (config) {
+      var that = _assertThisInitialized(_this);
       var configvalue = config ? config.map(function (item) {
         return {
           key: item.key,
@@ -15174,7 +15252,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         url: '/user/appConfig/saveUserOrder',
         method: 'POST',
         data: {
-          code: window.location.hash,
+          code: that.state.bsTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : ''
         }
       }).then(function (res) {
@@ -15190,7 +15268,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var configSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === _this.state.bsTableCode;
       });
       if (configSetting.length && configSetting[0].detail) {
         return JSON.parse(configSetting[0].detail);
@@ -15199,17 +15277,19 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
     _this.patchConfigToLocalstorage = function (configvalue) {
       var setShowColumns = _this.props.setShowColumns;
-      var sortDataSource = _this.state.sortDataSource;
+      var _this$state = _this.state,
+        sortDataSource = _this$state.sortDataSource,
+        bsTableCode = _this$state.bsTableCode;
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var currentSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === bsTableCode;
       });
       if (currentSetting.length) {
         currentSetting[0].detail = JSON.stringify(configvalue);
       } else {
         configArray.push({
-          "code": window.location.hash,
+          "code": bsTableCode,
           "detail": JSON.stringify(configvalue)
         });
       }
@@ -15440,10 +15520,10 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       _this.setInitValue();
     };
     _this.handleOk = function (e) {
-      var _this$state = _this.state,
-        sortDataSource = _this$state.sortDataSource,
-        isDefaultValue = _this$state.isDefaultValue,
-        defaultValue = _this$state.defaultValue;
+      var _this$state2 = _this.state,
+        sortDataSource = _this$state2.sortDataSource,
+        isDefaultValue = _this$state2.isDefaultValue,
+        defaultValue = _this$state2.defaultValue;
       if (!sortDataSource.length) {
         antd.message.warning('至少选择一列!');
         return;
@@ -15461,9 +15541,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       });
     };
     _this.handleTableHeadHidden = function (title) {
-      var _this$state2 = _this.state,
-        sortDataSource = _this$state2.sortDataSource,
-        dataSource = _this$state2.dataSource;
+      var _this$state3 = _this.state,
+        sortDataSource = _this$state3.sortDataSource,
+        dataSource = _this$state3.dataSource;
       _this.setState({
         sortDataSource: sortDataSource.filter(function (item) {
           return item.title !== title;
@@ -15522,9 +15602,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       }, restProps));
     };
     _this.onChange = function (e, title) {
-      var _this$state3 = _this.state,
-        sortDataSource = _this$state3.sortDataSource,
-        dataSource = _this$state3.dataSource;
+      var _this$state4 = _this.state,
+        sortDataSource = _this$state4.sortDataSource,
+        dataSource = _this$state4.dataSource;
       if (!e.target.checked) {
         _this.setState({
           sortDataSource: sortDataSource.filter(function (item) {
@@ -15594,7 +15674,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this$props2 = this.props,
         datasource = _this$props2.datasource,
-        showColumn = _this$props2.showColumn;
+        showColumn = _this$props2.showColumn,
+        bsTableCode = _this$props2.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
@@ -15635,19 +15716,20 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
               return innerKey && innerKey === itemKey;
             })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
           });
-        })
+        }),
+        bsTableCode: bsTableCode
       });
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
-      var _this$state4 = this.state,
-        dataSource = _this$state4.dataSource,
-        searchDataSource = _this$state4.searchDataSource,
-        sortDataSource = _this$state4.sortDataSource,
-        visible = _this$state4.visible,
-        onSearchSort = _this$state4.onSearchSort;
+      var _this$state5 = this.state,
+        dataSource = _this$state5.dataSource,
+        searchDataSource = _this$state5.searchDataSource,
+        sortDataSource = _this$state5.sortDataSource,
+        visible = _this$state5.visible,
+        onSearchSort = _this$state5.onSearchSort;
       var seatchDataSource = dataSource.filter(function (item) {
         var _item$title;
         return (item === null || item === void 0 ? void 0 : (_item$title = item.title) === null || _item$title === void 0 ? void 0 : _item$title.indexOf(searchDataSource || '')) > -1;
@@ -15863,12 +15945,14 @@ var index$5 = (function (props) {
     showColumn = _useState12[0],
     setShowColumns = _useState12[1];
   var _props$isPage = props.isPage,
-    pagination = props.pagination;
+    pagination = props.pagination,
+    tableCode = props.tableCode;
   var _useState13 = React.useState('100vh'),
     _useState14 = _slicedToArray(_useState13, 2),
     height = _useState14[0],
     setHeight = _useState14[1];
   var sortTableRef = React.useRef(null);
+  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   var getTableHeight = function getTableHeight() {
     var _document$querySelect, _document$querySelect2, _document$querySelect3;
@@ -15890,7 +15974,7 @@ var index$5 = (function (props) {
     var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     var configArray = JSON.parse(config);
     var configSetting = configArray.filter(function (item) {
-      return item.code === window.location.hash;
+      return item.code === bsTableCode;
     });
     if (configSetting.length && configSetting[0].detail) {
       return JSON.parse(configSetting[0].detail);
@@ -16153,7 +16237,8 @@ var index$5 = (function (props) {
           ref: sortTableRef,
           setShowColumns: setShowColumns,
           showColumn: showColumn,
-          datasource: (value === null || value === void 0 ? void 0 : value.columns) || []
+          datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+          bsTableCode: bsTableCode
         }))))
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -11,11 +11,115 @@ import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
 
+function handleSelectColumn(c: any, parentProps: any) {
+  let result = c;
+  const exceptColumns = parentProps?.exceptColumns || [];
+  const coverColumns = parentProps?.coverColumns || [];
+  const additionColumns = parentProps?.additionColumns || [];
+  // 过滤不需要展示内容
+  if(exceptColumns?.length) {
+    result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
+  }
+  // 追加
+  if(additionColumns?.length) {
+    //TODO
+  }
+  // 覆盖内容
+  if(coverColumns?.length) {
+    result = coverColumns;
+  }
+  return result
+}
+
 export const AddSkuSelect = (parProps: any) => {
   const selectProps = {
     mode: 'multiple',
   }
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const initialSelectColumn = [
+    {
+      title: 'SKU编码',
+      width: 150,
+      dataIndex: 'skuCode',
+    },
+    {
+      title: 'SKU名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+      dataIndex: 'name',
+    },
+    {
+      title: '图片',
+      dataIndex: 'itemUrl',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any,record: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {tableColumnsImage(getSkuImg(record),{ width: 28, height: 28 })}
+        </Tooltip>
+      ),
+    },
+    {
+      title: '数量',
+      width: 100,
+      isInputItem: true,
+      dataIndex: 'count',
+    },
+    {
+      title: '单位',
+      dataIndex: 'selectUnitCode',
+      width: 80,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any, record: any) => {
+        if (record?.packingUnitList?.length) {
+          const basePackUnit = record?.packingUnitList[0]
+          record.selectUnitCode = basePackUnit.unitCode
+          return basePackUnit.name || basePackUnit.unitCode
+        }
+
+
+        return <></>
+      },
+    },
+    {
+      title: '所属SPU编码',
+      width: 150,
+      ellipsis: {
+        showTitle: false,
+      },
+      dataIndex: 'itemCode',
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+    },
+    {
+      title: '规格',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+      dataIndex: 'propertyNameAndValue',
+    }
+  ]
+  const mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps)
   const props = {
     buttonText: parProps.buttonText || '新增',
     buttonProps: parProps.buttonProps || {},
@@ -223,89 +327,7 @@ export const AddSkuSelect = (parProps: any) => {
         dataIndex: 'brandName',
       },
     ],
-    selectColumn: [
-      {
-        title: 'SKU编码',
-        width: 150,
-        dataIndex: 'skuCode',
-      },
-      {
-        title: 'SKU名称',
-        width: 200,
-        ellipsis: {
-          showTitle: false,
-        },
-        render: (text: any) => (
-          <Tooltip placement="topLeft" title={text}>
-            {text}
-          </Tooltip>
-        ),
-        dataIndex: 'name',
-      },
-      {
-        title: '图片',
-        dataIndex: 'itemUrl',
-        width: 200,
-        ellipsis: {
-          showTitle: false,
-        },
-        render: (text: any,record: any) => (
-          <Tooltip placement="topLeft" title={text}>
-            {tableColumnsImage(getSkuImg(record),{ width: 28, height: 28 })}
-          </Tooltip>
-        ),
-      },
-      {
-        title: '数量',
-        width: 100,
-        isInputItem: true,
-        dataIndex: 'count',
-      },
-      {
-        title: '单位',
-        dataIndex: 'selectUnitCode',
-        width: 80,
-        ellipsis: {
-          showTitle: false,
-        },
-        render: (text: any, record: any) => {
-          if (record?.packingUnitList?.length) {
-            const basePackUnit = record?.packingUnitList[0]
-            record.selectUnitCode = basePackUnit.unitCode
-            return basePackUnit.name || basePackUnit.unitCode
-          }
-
-
-          return <></>
-        },
-      },
-      {
-        title: '所属SPU编码',
-        width: 150,
-        ellipsis: {
-          showTitle: false,
-        },
-        dataIndex: 'itemCode',
-        render: (text: any) => (
-          <Tooltip placement="topLeft" title={text}>
-            {text}
-          </Tooltip>
-        ),
-      },
-      {
-        title: '规格',
-        width: 200,
-        ellipsis: {
-          showTitle: false,
-        },
-        render: (text: any) => (
-          <Tooltip placement="topLeft" title={text}>
-            {text}
-          </Tooltip>
-        ),
-        dataIndex: 'propertyNameAndValue',
-      }
-    ]
+    selectColumn: mTpSelectColumn
   }
 
   return (

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

@@ -59,11 +59,12 @@ export default (props: any) => {
   const [value, setValue]: any = useState(props);
   const [showColumn, setShowColumns] = useState([]);
 
-  const { isPage = true, pagination } = props;
+  const { isPage = true, pagination, tableCode } = props;
 
   const [height, setHeight]: any = useState('100vh');
   const sortTableRef = useRef(null);
-
+  
+  const bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   const getTableHeight = () => {
     const cancelHeight = window.top == window ? 303 : 223;
@@ -101,7 +102,7 @@ export default (props: any) => {
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     let configArray = JSON.parse(config);
     let configSetting = configArray.filter(
-      (item) => item.code === window.location.hash,
+      (item) => item.code === bsTableCode,
     );
 
     if (configSetting.length && configSetting[0].detail) {
@@ -371,6 +372,7 @@ export default (props: any) => {
                     setShowColumns={setShowColumns}
                     showColumn={showColumn}
                     datasource={value?.columns || []}
+                    bsTableCode={bsTableCode}
                   />
                 </span>
               </Tooltip>

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

@@ -42,9 +42,11 @@ class SortableTable extends React.Component {
     onSearchSort: false,
     isDefaultValue: false,
     defaultValue: [],
+    bsTableCode: '', //设置table 列的标识
   };
 
   patchUserColumnConfig = (config) => {
+    let that = this;
     let configvalue = config
       ? config.map((item) => ({
           key: item.key,
@@ -58,7 +60,7 @@ class SortableTable extends React.Component {
       url: '/user/appConfig/saveUserOrder',
       method: 'POST',
       data: {
-        code: window.location.hash,
+        code: that.state.bsTableCode,
         detail: configvalue ? JSON.stringify(configvalue) : '',
       },
     }).then((res:any) => {
@@ -74,7 +76,7 @@ class SortableTable extends React.Component {
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     let configArray = JSON.parse(config);
     let configSetting = configArray.filter(
-      (item) => item.code === window.location.hash,
+      (item) => item.code === this.state.bsTableCode,
     );
 
     if (configSetting.length && configSetting[0].detail) {
@@ -85,15 +87,15 @@ class SortableTable extends React.Component {
 
   patchConfigToLocalstorage = (configvalue) => {
     const { setShowColumns } = this.props;
-    const { sortDataSource } = this.state;
+    const { sortDataSource, bsTableCode } = this.state;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
     let configArray = JSON.parse(config)
-    let currentSetting = configArray.filter(item => item.code === window.location.hash)
+    let currentSetting = configArray.filter(item => item.code === bsTableCode)
     if (currentSetting.length) {
       currentSetting[0].detail = JSON.stringify(configvalue)
     } else {
       configArray.push({
-        "code": window.location.hash,
+        "code": bsTableCode,
         "detail": JSON.stringify(configvalue)
       })
     }
@@ -147,7 +149,7 @@ class SortableTable extends React.Component {
   };
 
   componentDidMount() {
-    const { datasource, showColumn }: any =
+    const { datasource, showColumn, bsTableCode }: any =
       this.props;
     let config = this.getConfigFromlocalstorage();
 
@@ -196,6 +198,7 @@ class SortableTable extends React.Component {
               }
             )[0]?.width || item.width,
         })),
+      bsTableCode
     });
   }
 

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -1474,5 +1474,57 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 规则场景选择器
+  if(type === 'ruleTemplate') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/ruleTemplate`,
+      // filter: 'qp-name,code-orGroup,like', // 过滤参数
+      filter: 'qp-name-like', // 过滤参数
+      mappingTextField: 'name',
+      mappingTextShowKeyField: 'code',
+      mappingValueField: 'code',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'ruleTemplateCode',
+      ...requestConfigProp
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: '规则场景名称' },
+      { name: 'qp-code-like', label: '规则场景编码' },
+    ]
+    modalTableProps = {
+      modalTableTitle: '选择规则场景',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '规则场景编码',
+          dataIndex: 'code',
+        },
+        {
+          title: '规则场景名称',
+          dataIndex: 'name',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          title: '条件对象',
+          dataIndex: 'objectName',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'extName',
+          title: '条件扩展',
+          render: (text: any) => handleTextOverflow(text),
+        },
+        {
+          dataIndex: 'actionName',
+          title: '执行动作',
+          render: (text: any) => handleTextOverflow(text),
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   return { modalTableProps, requestConfig, needModalTable };
 }

package/src/components/Business/SearchSelect/index.md

@@ -1135,3 +1135,63 @@ export default () => {
 ```
 
 More skills for writing demo: https://d.umijs.org/guide/demo-principle
+
+
+## 规则场景选择器 Select-GZCJ-001
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 1,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    selectProps,
+    selectBusinessType: 'ruleTemplate',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
+More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/Business/SearchSelect/utils.ts

@@ -87,7 +87,7 @@ const handleDefaultPrefixUrl = (type: string) => {
     case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
       result =  '/user';
       break;
-    case 'deliveryMode':
+    case 'deliveryMode': case 'ruleTemplate':
       result =  '/basic';
       break;
     default:

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

@@ -53,6 +53,38 @@ export default () => {
     tableSearchForm: [
       { name: 'qp-name-like', label: 'SKU名称' }, // field: { type: 'input', props: { placeholder: '8888'}}
       { name: 'qp-code-like', label: 'SKU编码' },
+      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } }
     ],
     tableColumns: [
       {