@bit-sun/business-component 4.2.0-alpha.21 → 4.2.0-alpha.23

package/dist/index.js

@@ -5362,8 +5362,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
     isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
-    _ref$requestType = _ref.requestType,
-    requestType = _ref$requestType === void 0 ? 'get' : _ref$requestType;
+    _ref$requestType = _ref.requestType;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5650,9 +5649,16 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     var getRequest;
     var methodName = method === null || method === void 0 ? void 0 : (_method$toLocaleLower = method.toLocaleLowerCase) === null || _method$toLocaleLower === void 0 ? void 0 : _method$toLocaleLower.call(method);
     if (['post', 'patch', 'put'].includes(methodName)) {
-      getRequest = requestUtil[methodName]("".concat(url).concat(convertUrlQueryParams(queryParams)), convertBodyParams(_objectSpread2(_objectSpread2({}, queryParams), {}, {
-        requestType: requestType
-      })), {
+      var bodyData = convertBodyParams(queryParams);
+      var urlStr = convertUrlQueryParams(queryParams);
+      // Fix: support sending params in body
+      if (requestConfig.isBodyRequest) {
+        if (!bodyData) {
+          bodyData = convertQueryParams(queryParams);
+        }
+        urlStr = '';
+      }
+      getRequest = requestUtil[methodName]("".concat(url).concat(urlStr), bodyData, {
         headers: _objectSpread2({}, extralHeaders)
       });
     } else {
@@ -10501,6 +10507,25 @@ function commonFun(type, prefixUrl, parentProps) {
       field: {
         type: 'proppertySelector'
       }
+    }, {
+      name: 'qp-itemLabelId-in',
+      type: 'select',
+      label: '商品标签',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }];
     var defaultQSHL = [{
       isOpen: true,
@@ -10518,9 +10543,14 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams2, 'qp-brandId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-categoryId-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-categoryId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/label"), {
+      pageSize: 500,
+      currentPage: 1,
+      'qp-labelType-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-itemLabelId-in'))]).then(function (x) {
       formatSource(x, 0, 3, tableSearchForm, ['id', 'name']);
       formatTreeDataSource(x, 1, 4, tableSearchForm);
+      formatSource(x, 2, 6, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
@@ -10674,6 +10704,25 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-itemLabelId-in',
+      type: 'select',
+      label: '商品标签',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }];
     var _queryHeaderParams3 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -10689,10 +10738,15 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams3, 'qp-categoryId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams3, 'qp-classId-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams3, 'qp-classId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/label"), {
+      pageSize: 500,
+      currentPage: 1,
+      'qp-labelType-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams3, 'qp-itemLabelId-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
       formatTreeDataSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm, ['id', 'name']);
+      formatSource(x, 3, 5, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商品(SPU) ',
@@ -10869,6 +10923,25 @@ function commonFun(type, prefixUrl, parentProps) {
           mode: 'multiple'
         }
       }
+    }, {
+      name: 'qp-itemLabelId-in',
+      type: 'select',
+      label: '商品标签',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }];
     var _queryHeaderParams4 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -10884,10 +10957,15 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams4, 'qp-categoryId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams4, 'qp-classId-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams4, 'qp-classId-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/label"), {
+      pageSize: 500,
+      currentPage: 1,
+      'qp-labelType-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams4, 'qp-itemLabelId-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
       formatTreeDataSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm, ['id', 'name']);
+      formatSource(x, 3, 10, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SPU',
@@ -34585,11 +34663,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
         itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
         _this$props2$others = _this$props2.others,
         others = _this$props2$others === void 0 ? {} : _this$props2$others,
-        propertyCode = _this$props2.propertyCode;
+        propertyCode = _this$props2.propertyCode,
+        isQueryParams = _this$props2.isQueryParams;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '180px'
       };
+      if (isQueryParams) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          defaultValue: values.join(','),
+          disabled: disabled,
+          style: styleCommon,
+          onBlur: function onBlur(e) {
+            values = e.target.value.split(',');
+            valueNames = e.target.value.split(',');
+            callback(values, valueNames);
+          }
+        });
+      }
       if (!selectOperation) return /*#__PURE__*/React__default['default'].createElement(antd.Input, {
         disabled: true,
         style: styleCommon
@@ -37115,7 +37206,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
-      options: []
+      options: [],
+      isQueryParams: false
     };
     return _this;
   }
@@ -37135,13 +37227,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3.initialThresholdQuery,
         queryIdentify = _this$props3.queryIdentify,
         propertyCode = _this$props3.propertyCode,
-        queryIdentifyType = _this$props3.queryIdentifyType;
+        queryIdentifyType = _this$props3.queryIdentifyType,
+        isQueryParams = _this$props3.isQueryParams;
       this.setState({
         selectOperation: selectOperation,
         thresholdQuery: initialThresholdQuery ? _objectSpread2({}, initialThresholdQuery) : {},
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        isQueryParams: isQueryParams,
         others: others,
         fieldValues: _toConsumableArray(values),
         options: options
@@ -38348,6 +38442,18 @@ function RenderCompItem(props) {
 }
 
 var RangePicker$2 = antd.DatePicker.RangePicker;
+var FIXED_DATA_TYPES = {
+  10: '字符串',
+  20: '短整数',
+  21: '长整数',
+  22: '小数',
+  40: '数组',
+  41: '布尔值',
+  12: '富文本',
+  30: '日期',
+  31: '时间',
+  32: '日期时间'
+};
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   function RuleObjectComponent(props) {
     var _this;
@@ -38391,6 +38497,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
               value: element.id,
               id: element.id,
               dataTypeCode: element.valueType,
+              entityValueType: element.entityValueType,
+              entityInputType: element.entityInputType,
               dataChoiceBusinessType: element.choiceType,
               dataInputBusinessType: element.inputType,
               info: element.info,
@@ -38412,6 +38520,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           metaObjectCode: _this.props.metaObjectCode || item.code
         }, item), {}, {
           dataTypeCode: item.valueType,
+          entityValueType: item.entityValueType,
+          entityInputType: item.entityInputType,
           dataChoiceBusinessType: item.choiceType,
           dataInputBusinessType: item.inputType
         }));
@@ -38445,6 +38555,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: element.id,
           id: element.id,
           dataTypeCode: element.valueType,
+          entityValueType: element.entityValueType,
+          entityInputType: element.entityInputType,
           dataChoiceBusinessType: element.choiceType,
           dataInputBusinessType: element.inputType,
           info: element.info,
@@ -38806,7 +38918,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$reqCondit, _itemDetail$reqCondit2, _itemDetail$reqCondit3, _itemDetail$reqCondit4;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
@@ -38814,7 +38926,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3$initialT === void 0 ? {} : _this$props3$initialT,
         disabled = _this$props3.disabled,
         systemVariableList = _this$props3.systemVariableList,
-        needShowInsertSQL = _this$props3.needShowInsertSQL;
+        needShowInsertSQL = _this$props3.needShowInsertSQL,
+        needShowReqCondition = _this$props3.needShowReqCondition;
       var thresholdQuery = _objectSpread2(_objectSpread2({}, initialThresholdQuery), relateDatas);
       var finalIndex = floorIndex + 1;
       var queryIdentify = '';
@@ -38905,6 +39018,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           itemDetail.elementId = nodeInfo.triggerNode.props.id;
           itemDetail.elementName = nodeInfo.triggerNode.props.title;
           itemDetail.dataTypeCode = nodeInfo.triggerNode.props.dataTypeCode;
+          itemDetail.entityValueType = nodeInfo.triggerNode.props.entityValueType;
+          itemDetail.entityInputType = nodeInfo.triggerNode.props.entityInputType;
           itemDetail.metaObjectCode = nodeInfo.triggerNode.props.metaObjectCode;
           itemDetail.isInsertParam = false;
           if (needShowInsertSQL) {
@@ -39074,12 +39189,13 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '取消插入SQL' : '插入SQL')), /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
-          display: itemDetail.operationType == 'logic' && !disabled ? 'block' : 'none'
+          display: itemDetail.operationType == 'logic' && (!disabled || itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit === void 0 ? void 0 : _itemDetail$reqCondit.length)) ? 'block' : 'none'
         }
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         style: {
           color: '#008fe0',
-          cursor: 'pointer'
+          cursor: 'pointer',
+          display: disabled ? 'none' : 'inline'
         },
         type: "link",
         onClick: function onClick() {
@@ -39091,7 +39207,107 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           fontSize: '14px',
           marginRight: '5px'
         }
-      }), "\u6DFB\u52A0\u6761\u4EF6"))));
+      }), "\u6DFB\u52A0\u6761\u4EF6"), needShowReqCondition && /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          marginLeft: 10,
+          display: disabled ? 'none' : 'inline'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+        type: "link",
+        disabled: disabled && (!itemDetail.reqConditionData || !itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit2 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit2 === void 0 ? void 0 : _itemDetail$reqCondit2.length)),
+        style: {
+          padding: 0,
+          height: 'auto'
+        },
+        onClick: function onClick() {
+          return _this.handleReqConditionToggle(itemDetail);
+        }
+      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), (itemDetail.isReqCondition || disabled && itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit3 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit3 === void 0 ? void 0 : _itemDetail$reqCondit3.length)) && itemDetail.reqConditionData && /*#__PURE__*/React__default['default'].createElement("div", {
+        style: {
+          marginTop: 10,
+          display: disabled && (!itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit4 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit4 === void 0 ? void 0 : _itemDetail$reqCondit4.length)) ? 'none' : 'flex',
+          alignItems: 'center',
+          background: '#f5f5f5',
+          padding: '10px',
+          borderRadius: '4px'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          marginRight: 8,
+          flexShrink: 0
+        }
+      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+        disabled: disabled,
+        style: {
+          width: 150,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.reqParamName,
+        onChange: function onChange(e) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamName', e.target.value);
+        }
+      }), /*#__PURE__*/React__default['default'].createElement("span", {
+        style: {
+          marginRight: 8,
+          flexShrink: 0
+        }
+      }, "\u7C7B\u578B:"), /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        disabled: disabled,
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.dataTypeCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'dataTypeCode', val);
+        }
+      }, Object.keys(FIXED_DATA_TYPES).map(function (code) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+          key: code,
+          value: code
+        }, FIXED_DATA_TYPES[code]);
+      })), /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        disabled: disabled,
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.operationCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'operationCode', val);
+        }
+      }, [{
+        'code': '1',
+        'name': '在集合'
+      }, {
+        'code': '2',
+        'name': '不等于'
+      }, {
+        code: '3',
+        name: '小于'
+      }, {
+        code: '4',
+        name: '大于'
+      }, {
+        code: '5',
+        name: '等于'
+      }].map(function (op) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+          key: op.code,
+          value: op.code
+        }, op.name);
+      })), /*#__PURE__*/React__default['default'].createElement(RuleField, {
+        customerWidth: '180px',
+        isQueryParams: true,
+        selectOperation: itemDetail.reqConditionData.operationCode,
+        dataTypeCode: itemDetail.reqConditionData.dataTypeCode,
+        values: itemDetail.reqConditionData.params || [],
+        valueNames: itemDetail.reqConditionData.paramNames || [],
+        callback: function callback(newValues, newValueNames) {
+          return _this.handleReqDataChange(itemDetail, 'params', newValues, newValueNames);
+        },
+        disabled: disabled
+      })))));
     };
     _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex, key) {
       var ruleClassData = _this.state.ruleClassData;
@@ -39407,6 +39623,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       delete itemDetail.params;
       delete itemDetail.paramNames;
       delete itemDetail.dataTypeCode;
+      delete itemDetail.entityValueType;
+      delete itemDetail.entityInputType;
       delete itemDetail.elementId;
       delete itemDetail.elementName;
       delete itemDetail.metaObjectCode;
@@ -39457,6 +39675,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             parentDetail.elementId = parentDetail.subExpression[0].elementId;
             parentDetail.elementName = parentDetail.subExpression[0].elementName;
             parentDetail.dataTypeCode = parentDetail.subExpression[0].dataTypeCode;
+            parentDetail.entityValueType = parentDetail.subExpression[0].entityValueType;
+            parentDetail.entityInputType = parentDetail.subExpression[0].entityInputType;
             delete parentDetail.subExpression;
           }
         }
@@ -39530,6 +39750,55 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    _this.handleReqConditionToggle = function (itemDetail) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      itemDetail.isReqCondition = !itemDetail.isReqCondition;
+      if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
+        itemDetail.reqConditionData = {
+          operationType: 'relation',
+          dataTypeCode: '10',
+          entityInputType: '10',
+          entityValueType: '10',
+          operationCode: '',
+          reqParamName: '',
+          params: [],
+          paramNames: []
+        };
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
+    _this.handleReqDataChange = function (itemDetail, field, value, valueNames) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      if (!itemDetail.reqConditionData) return;
+      if (field === 'dataTypeCode') {
+        itemDetail.reqConditionData.dataTypeCode = value;
+        itemDetail.reqConditionData.entityInputType = value;
+        itemDetail.reqConditionData.entityValueType = value;
+        itemDetail.reqConditionData.operationCode = '';
+        itemDetail.reqConditionData.params = [];
+        itemDetail.reqConditionData.paramNames = [];
+      } else if (field === 'operationCode') {
+        itemDetail.reqConditionData.operationCode = value;
+      } else if (field === 'reqParamName') {
+        itemDetail.reqConditionData.reqParamName = value;
+      } else if (field === 'params') {
+        itemDetail.reqConditionData.params = value;
+        if (valueNames) {
+          itemDetail.reqConditionData.paramNames = valueNames;
+        }
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
     _this.state = {
       editNameIndex: 0,
       isEdit: false,

package/package.json

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

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

@@ -440,6 +440,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       { name: 'UNIQUE_SPEC', label: '属性', field: {
           type: 'proppertySelector',
         } },
+      { name: 'qp-itemLabelId-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,
+          },
+        } },
     ]
     const defaultQSHL = [
       {
@@ -459,9 +473,15 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
+        currentPage: 1,
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 3, tableSearchForm,['id','name'])
       formatTreeDataSource(x,1, 4, tableSearchForm)
+      formatSource(x,2, 6, tableSearchForm,['id','name'])
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
@@ -609,6 +629,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      { name: 'qp-itemLabelId-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,
+          },
+        } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -625,10 +659,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
+        currentPage: 1,
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['id','name']);
       formatTreeDataSource(x,1, 3, tableSearchForm);
       formatSource(x,2, 4, tableSearchForm,['id','name']);
+      formatSource(x,3, 5, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择商品(SPU) ',
@@ -802,6 +842,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             }
           }
         },
+        { name: 'qp-itemLabelId-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,
+          },
+        } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -818,10 +872,16 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-classId-in')),
+      loadSelectSource(`${prefixUrl.formSelectFix}/label`, {
+        pageSize: 500,
+        currentPage: 1,
+        'qp-labelType-eq': 1,
+      },getQueryHeadersItem(queryHeaderParams,'qp-itemLabelId-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['id','name']);
       formatTreeDataSource(x,1, 3, tableSearchForm);
       formatSource(x,2, 4, tableSearchForm,['id','name']);
+      formatSource(x,3, 10, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择SPU',

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

@@ -150,7 +150,7 @@ export default () => {
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'shopFile2',
+    selectBusinessType: 'skuCommodity',
   };
 
   const onTabChange = (key) => {
@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'spuCommodityWithProperty',
+    selectBusinessType: 'spuCommodity',
   };
 
   const onTabChange = (key) => {