@bit-sun/business-component 2.3.12 → 2.3.14

package/dist/components/Business/SearchSelect/common.d.ts

@@ -6,6 +6,10 @@ declare const shopFile2Type: {
     text: string;
     value: string;
 }[];
+declare const shopFile2Status: {
+    text: string;
+    value: number;
+}[];
 declare const arrivalPaySupportList: {
     text: string;
     value: number;
@@ -14,4 +18,4 @@ declare const sharingType: {
     text: string;
     value: string;
 }[];
-export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type };
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status };

package/dist/index.esm.js

@@ -2607,7 +2607,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _ref$init = _ref.init,
     init = _ref$init === void 0 ? true : _ref$init,
     _ref$extralHeaders = _ref.extralHeaders,
-    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders;
+    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders,
+    _ref$specialBracket = _ref.specialBracket,
+    specialBracket = _ref$specialBracket === void 0 ? false : _ref$specialBracket;
   var resultSourceKey = handleSourceName(sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode');
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   var initVal = value || (selectMode ? [] : null);
@@ -2914,7 +2916,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -2932,7 +2934,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -3166,13 +3168,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var LightHeightOption = function LightHeightOption(props) {
     var filterTxt = props.filterTxt,
       text = props.text;
-    var heightLightTxt = function heightLightTxt(txt, heightTxt) {
+    var heightLightTxt = function heightLightTxt(text, heightTxt) {
       if (heightTxt === '') {
-        return txt;
+        return text;
       }
       // 前面filterOption 不区分大小写，这里用i
       var regexp = new RegExp(heightTxt, 'gi');
-      return txt.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
+      return text.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
     return /*#__PURE__*/React.createElement(Tooltip, {
       title: text
@@ -3378,6 +3380,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       })
     }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
+  var handleSelectOptionsShowValue = function handleSelectOptionsShowValue(specialBracket, item) {
+    var showText = Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText;
+    return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: 'search_select'
   }, fieldComponent ? /*#__PURE__*/React.createElement("div", {
@@ -3447,7 +3453,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.textShowKey, "       ").concat(Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText),
+      text: handleSelectOptionsShowValue(specialBracket, item),
       filterTxt: searchValue
     }));
   })), needModalTable && /*#__PURE__*/React.createElement(Button, {
@@ -6599,6 +6605,13 @@ var shopFile2Type = [{
   text: "自营B2C",
   value: 'B2C'
 }];
+var shopFile2Status = [{
+  text: "启用",
+  value: 10
+}, {
+  text: "禁用",
+  value: 20
+}];
 var arrivalPaySupportList = [{
   text: "支持",
   value: 1
@@ -7554,10 +7567,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'physicalWarehouseName',
       mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7590,7 +7604,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
@@ -7613,10 +7632,16 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00002', text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []), [{
         title: '所属公司',
         dataIndex: 'companyName'
-      }]
+      }])
     }, modalTableBusProps);
   }
   if (type === 'realWarehouse') {
@@ -7626,10 +7651,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'realWarehouseName',
       mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7643,7 +7669,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择逻辑仓',
       tableSearchForm: tableSearchForm,
@@ -7659,7 +7690,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00004', text);
         }
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   if (type === 'ownerWarehouse') {
@@ -7669,10 +7706,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'operationWarehouseCode',
       mappingValueField: 'operationWarehouseCode',
-      otherParams: {
-        'qp-status-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-status-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7700,7 +7738,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-status-eq',
+      type: 'select',
+      label: '运营仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
     })]).then(function (x) {
@@ -7718,7 +7761,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '运营组',
         dataIndex: 'groupName'
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -8137,6 +8186,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
+    }, {
+      name: 'qp-status-in',
+      type: 'select',
+      label: '商店状态',
+      initialSource: shopFile2Status
     }, {
       name: 'qp-orgCode-in',
       type: 'select',
@@ -8162,7 +8216,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
     })]).then(function (x) {
-      formatSource(x, 0, 3, tableSearchForm);
+      formatSource(x, 0, 4, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -8182,6 +8236,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
             return i.value === text;
           })) === null || _shopFile2Type$find === void 0 ? void 0 : _shopFile2Type$find.text;
         }
+      }, {
+        title: '启用状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          var _shopFile2Status$find;
+          return (_shopFile2Status$find = shopFile2Status.find(function (i) {
+            return i.value === text;
+          })) === null || _shopFile2Status$find === void 0 ? void 0 : _shopFile2Status$find.text;
+        }
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName'

package/dist/index.js

@@ -2626,7 +2626,9 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _ref$init = _ref.init,
     init = _ref$init === void 0 ? true : _ref$init,
     _ref$extralHeaders = _ref.extralHeaders,
-    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders;
+    extralHeaders = _ref$extralHeaders === void 0 ? {} : _ref$extralHeaders,
+    _ref$specialBracket = _ref.specialBracket,
+    specialBracket = _ref$specialBracket === void 0 ? false : _ref$specialBracket;
   var resultSourceKey = handleSourceName(sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode');
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   var initVal = value || (selectMode ? [] : null);
@@ -2933,7 +2935,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -2951,7 +2953,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
             }
           }
           return _objectSpread2(_objectSpread2({}, item), {}, {
-            text: item[mappingTextField],
+            text: specialBracket ? "\u3010".concat(item[mappingValueField], "\u3011").concat(item[mappingTextField]) : item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
@@ -3185,13 +3187,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var LightHeightOption = function LightHeightOption(props) {
     var filterTxt = props.filterTxt,
       text = props.text;
-    var heightLightTxt = function heightLightTxt(txt, heightTxt) {
+    var heightLightTxt = function heightLightTxt(text, heightTxt) {
       if (heightTxt === '') {
-        return txt;
+        return text;
       }
       // 前面filterOption 不区分大小写，这里用i
       var regexp = new RegExp(heightTxt, 'gi');
-      return txt.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
+      return text.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
     return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
       title: text
@@ -3397,6 +3399,10 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       })
     }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
+  var handleSelectOptionsShowValue = function handleSelectOptionsShowValue(specialBracket, item) {
+    var showText = Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText;
+    return specialBracket ? "\u3010".concat(item.textShowKey, "\u3011").concat(showText) : "".concat(item.textShowKey, "       ").concat(showText);
+  };
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'search_select'
   }, fieldComponent ? /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3466,7 +3472,7 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.textShowKey, "       ").concat(Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText),
+      text: handleSelectOptionsShowValue(specialBracket, item),
       filterTxt: searchValue
     }));
   })), needModalTable && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -6618,6 +6624,13 @@ var shopFile2Type = [{
   text: "自营B2C",
   value: 'B2C'
 }];
+var shopFile2Status = [{
+  text: "启用",
+  value: 10
+}, {
+  text: "禁用",
+  value: 20
+}];
 var arrivalPaySupportList = [{
   text: "支持",
   value: 1
@@ -7573,10 +7586,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'physicalWarehouseName',
       mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7609,7 +7623,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
@@ -7632,10 +7651,16 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00002', text);
         }
-      }, {
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []), [{
         title: '所属公司',
         dataIndex: 'companyName'
-      }]
+      }])
     }, modalTableBusProps);
   }
   if (type === 'realWarehouse') {
@@ -7645,10 +7670,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'realWarehouseName',
       mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
-      otherParams: {
-        'qp-isEnable-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-isEnable-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7662,7 +7688,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '逻辑仓类型',
       initialSource: getDictionarySource$1('SC00004')
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择逻辑仓',
       tableSearchForm: tableSearchForm,
@@ -7678,7 +7709,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         render: function render(text) {
           return getDictionaryTextByValue('SC00004', text);
         }
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   if (type === 'ownerWarehouse') {
@@ -7688,10 +7725,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingTextField: 'name',
       mappingTextShowKeyField: 'operationWarehouseCode',
       mappingValueField: 'operationWarehouseCode',
-      otherParams: {
-        'qp-status-eq': 1,
+      otherParams: _objectSpread2(_objectSpread2({}, (modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? {} : {
+        'qp-status-eq': 1
+      }), {}, {
         sorter: 'desc-id'
-      },
+      }),
       sourceName: 'qp-operationWarehouseCode-in'
     }, requestConfigProp);
     tableSearchForm = [{
@@ -7719,7 +7757,12 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
-    }];
+    }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+      name: 'qp-status-eq',
+      type: 'select',
+      label: '运营仓状态',
+      initialSource: getDictionarySource$1('SC00001')
+    }] : []));
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
     })]).then(function (x) {
@@ -7737,7 +7780,13 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '运营组',
         dataIndex: 'groupName'
-      }]
+      }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
+        title: '状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }] : []))
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -8156,6 +8205,11 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
+    }, {
+      name: 'qp-status-in',
+      type: 'select',
+      label: '商店状态',
+      initialSource: shopFile2Status
     }, {
       name: 'qp-orgCode-in',
       type: 'select',
@@ -8181,7 +8235,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
     })]).then(function (x) {
-      formatSource(x, 0, 3, tableSearchForm);
+      formatSource(x, 0, 4, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -8201,6 +8255,15 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
             return i.value === text;
           })) === null || _shopFile2Type$find === void 0 ? void 0 : _shopFile2Type$find.text;
         }
+      }, {
+        title: '启用状态',
+        dataIndex: 'status',
+        render: function render(text) {
+          var _shopFile2Status$find;
+          return (_shopFile2Status$find = shopFile2Status.find(function (i) {
+            return i.value === text;
+          })) === null || _shopFile2Status$find === void 0 ? void 0 : _shopFile2Status$find.text;
+        }
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName'

package/package.json

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

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

@@ -1,6 +1,6 @@
 // 此文件用于 处理业务组件 所用到的公共方法
 // @ts-nocheck
-import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type } from './common';
+import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from './utils';
 import { handleTextOverflow, tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -775,7 +775,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
-        'qp-isEnable-eq': 1,
+        ...(modalTableBusProps?.needStatusSearch?{}:{'qp-isEnable-eq': 1}),
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
@@ -799,6 +799,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '物理仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
@@ -826,6 +827,11 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           dataIndex: 'physicalWarehouseType',
           render: (text: number) => getDictionaryTextByValue('SC00002', text),
         },
+        ...(modalTableBusProps?.needStatusSearch?[{
+          title: '状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        }]:[]),
         {
           title: '所属公司',
           dataIndex: 'companyName',
@@ -842,7 +848,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
-        'qp-isEnable-eq': 1,
+        ...(modalTableBusProps?.needStatusSearch?{}:{'qp-isEnable-eq': 1}),
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
@@ -852,6 +858,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
       { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
       { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
     ]
     modalTableProps = {
       modalTableTitle: '选择逻辑仓',
@@ -870,6 +877,11 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           dataIndex: 'realWarehouseType',
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        ...(modalTableBusProps?.needStatusSearch?[{
+          title: '状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        }]:[]),
       ],
       ...modalTableBusProps,
     }
@@ -882,7 +894,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       mappingTextShowKeyField: 'operationWarehouseCode',
       mappingValueField: 'operationWarehouseCode',
       otherParams: {
-        'qp-status-eq': 1,
+        ...(modalTableBusProps?.needStatusSearch?{}:{'qp-status-eq': 1}),
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'qp-operationWarehouseCode-in',
@@ -905,6 +917,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
         } },
+      ...(modalTableBusProps?.needStatusSearch?[{ name: 'qp-status-eq', type: 'select', label: '运营仓状态', initialSource: getDictionarySource('SC00001')  }]:[])
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/groupInfo/listNoPage`, { 'qp-status-eq': 1 }),
@@ -927,6 +940,11 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           title: '运营组',
           dataIndex: 'groupName',
         },
+        ...(modalTableBusProps?.needStatusSearch?[{
+          title: '状态',
+          dataIndex: 'status',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        }]:[]),
       ],
       ...modalTableBusProps,
     }
@@ -1312,6 +1330,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       { name: 'qp-name-like', label: '商店名称' },
       { name: 'qp-code-like', label: '商店编码' },
       { name: 'qp-type-in', type: 'select', label: '商店类型', initialSource: shopFile2Type },
+      { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
       { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
           type: 'select',
           props: {
@@ -1334,7 +1353,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         'qp-status-eq': 10
       }),
     ]).then((x: any)=>{
-      formatSource(x,0, 3, tableSearchForm);
+      formatSource(x,0, 4, tableSearchForm);
     })
     modalTableProps = {
       modalTableTitle: '选择商店',
@@ -1353,6 +1372,11 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           dataIndex: 'type',
           render: (text: number) => shopFile2Type.find((i: any) => i.value === text)?.text,
         },
+        {
+          title: '启用状态',
+          dataIndex: 'status',
+          render: (text: number) => shopFile2Status.find((i: any) => i.value === text)?.text,
+        },
         {
           title: '所属销售组织',
           dataIndex: 'orgName',

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

@@ -28,6 +28,17 @@ const shopFile2Type = [
   }
 ]
 
+const shopFile2Status = [
+  {
+    text: "启用",
+    value: 10,
+  },
+  {
+    text: "禁用",
+    value: 20,
+  }
+]
+
 const arrivalPaySupportList = [
   {
     text: "支持",
@@ -50,4 +61,4 @@ const sharingType = [
   }
 ]
 
-export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type }
+export { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type, shopFile2Status }

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

@@ -428,8 +428,9 @@ export default () => {
       filterInit: 'qp-id-in'
     },
     // modalTableProps: {
-    //   modalTableTitle: '选择物理仓-更改title测试',
-    //   needModalTable: false
+      // modalTableTitle: '选择物理仓-更改title测试',
+      // needModalTable: false
+      // needStatusSearch: true
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
@@ -501,6 +502,9 @@ export default () => {
     //   sourceName: 'warehouseIds',
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // modalTableProps: {
+    //   needStatusSearch: true
+    // },
     selectProps,
     selectBusinessType: 'realWarehouse',
   };
@@ -559,6 +563,9 @@ export default () => {
       setValue(value)
     },
     selectProps,
+    modalTableProps: {
+      needStatusSearch: true
+    },
     selectBusinessType: 'ownerWarehouse',
   };
 

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

@@ -39,6 +39,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     mappingTextShowTextField,
     init = true,// 是否初始请求
     extralHeaders = {},// 额外请求头参数
+    specialBracket = false,// 是否使用特殊括弧显示选项 【value】text
   } = requestConfig || {};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || 'supplierCode')
 
@@ -311,7 +312,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: item[mappingTextField],
+                  text: specialBracket 
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                    : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
@@ -332,7 +335,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: item[mappingTextField],
+                  text: specialBracket 
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                    : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
@@ -538,13 +543,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     const {
       filterTxt, text,
     } = props
-    const heightLightTxt = (txt, heightTxt) => {
+    const heightLightTxt = (text, heightTxt) => {
       if (heightTxt === '') {
-        return txt
+        return text
       }
       // 前面filterOption 不区分大小写，这里用i
       const regexp = new RegExp(heightTxt, 'gi')
-      return txt.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
+      return text.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
     }
     return (
       <Tooltip title={text}>
@@ -725,6 +730,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     )
   }
 
+  const handleSelectOptionsShowValue = (specialBracket: boolean, item: object) => {
+    let showText = Array.isArray(item.textShowText) &&
+      item.textShowText.join('    ') || item.textShowText;
+    return specialBracket 
+      ? `【${item.textShowKey}】${showText}`
+      : `${item.textShowKey}       ${showText}`
+  };
+
   return (
     <div className={'search_select'}>
       {fieldComponent ?
@@ -774,7 +787,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>
-                {LightHeightOption({ text: `${item.textShowKey}       ${Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText}`, filterTxt: searchValue })}
+                {LightHeightOption({ 
+                  text: handleSelectOptionsShowValue(specialBracket, item), 
+                  filterTxt: searchValue 
+                })}
               </Option>
             ))}
           </Select>