@bit-sun/business-component 4.2.0-alpha.6.6 → 4.2.0-alpha.6.7

package/dist/index.esm.js

@@ -5472,8 +5472,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
     fieldComponent = props.fieldComponent,
     onSaveCallback = props.onSaveCallback,
-    _props$returnFormat = props.returnFormat,
-    returnFormat = _props$returnFormat === void 0 ? [] : _props$returnFormat,
     selectBusinessType = props.selectBusinessType;
   var _ref = rCTemp || {},
     url = _ref.url,
@@ -5532,16 +5530,14 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var currentPage = 1;
   var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
   var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
-  var currentSelectProps = _objectSpread2(_objectSpread2({
-    // 回显字段可自定义
-    optionLabelProp: "label"
-  }, selectProps), {}, {
+  var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
     // 以下属性不可更改----设计配置项
     showArrow: true,
     showSearch: true,
     filterOption: false,
     allowClear: true,
     listHeight: 160,
+    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   });
@@ -6010,19 +6006,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var formaData = function formaData(value, source) {
     if (labelInValue) {
-      var getFromat = function getFromat(format, val) {
-        return format.map(function (_ref8) {
-          var key = _ref8.key,
-            value = _ref8.value;
-          return _defineProperty({}, key, val[value]);
-        });
-      };
       var formatResult = value.map(function (i) {
-        return Object.assign.apply(Object, [{
+        return {
           key: i[mappingValueField] || i.key,
           label: i[mappingTextField] || i.label,
           value: i[mappingValueField] || i.value
-        }].concat(_toConsumableArray(getFromat(returnFormat, i))));
+        };
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
     } else {
@@ -10644,10 +10633,10 @@ function commonFun(type, prefixUrl, parentProps) {
     selectProps = _objectSpread2({
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [{
-        title: 'SPU编码',
+        title: '商品编码(SPU)',
         dataIndex: 'itemCode'
       }, {
-        title: 'SPU名称',
+        title: '商品名称(SPU)',
         dataIndex: 'name'
       }]
     }, selectConfigProps);
@@ -10664,11 +10653,11 @@ function commonFun(type, prefixUrl, parentProps) {
     }, requestConfigProp);
     tableSearchForm = [{
       name: 'itemCode*multiInput',
-      label: 'SPU编码',
+      label: '商品编码(SPU)',
       type: 'multipleQueryInput'
     }, {
       name: 'name*multiInput',
-      label: 'SPU名称',
+      label: '商品名称(SPU)',
       type: 'multipleQueryInput'
     }, {
       name: 'qp-brandId-in',
@@ -10762,11 +10751,11 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'keyIndex',
         defaultSort: 0
       }, {
-        title: 'SPU编码',
+        title: '商品编码(SPU)',
         dataIndex: 'itemCode',
         defaultSort: 1
       }, {
-        title: 'SPU名称',
+        title: '商品名称(SPU) ',
         dataIndex: 'name',
         defaultSort: 2
       }, {
@@ -11469,6 +11458,14 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00004', text);
         }
+      }, {
+        title: '运营组名称',
+        dataIndex: 'groupCode',
+        defaultSort: 7,
+        render: function render(text, record) {
+          return (record === null || record === void 0 ? void 0 : record.groupName) ? "\u3010".concat(text, "\u3011").concat(record === null || record === void 0 ? void 0 : record.groupName) : "";
+        },
+        width: 100
       }, {
         title: '所属销售渠道',
         dataIndex: 'channelName',
@@ -11490,7 +11487,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
         title: '状态',
         dataIndex: 'isEnable',
-        defaultSort: 7,
+        defaultSort: 8,
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
@@ -12032,12 +12029,17 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '店铺名称'
-    }, {
-      name: 'qp-code-like',
-      label: '店铺编码'
+      name: 'name*multiInput',
+      label: '店铺名称',
+      type: 'multipleQueryInput'
     }, {
+      name: 'code*multiInput',
+      label: '店铺编码',
+      type: 'multipleQueryInput'
+    },
+    // { name: 'qp-name-like', label: '店铺名称' },
+    // { name: 'qp-code-like', label: '店铺编码' },
+    {
       name: 'qp-conglomerateCode-in',
       type: 'select',
       label: '归属集团',
@@ -38600,7 +38602,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           display: 'flex',
           marginBottom: '0px',
           padding: '10px 0px'
-        }
+        },
+        key: itemDetail.elementId
       }, /*#__PURE__*/React$1.createElement("div", {
         className: 'logical_operate_content',
         style: {

package/dist/index.js

@@ -5495,8 +5495,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
     fieldComponent = props.fieldComponent,
     onSaveCallback = props.onSaveCallback,
-    _props$returnFormat = props.returnFormat,
-    returnFormat = _props$returnFormat === void 0 ? [] : _props$returnFormat,
     selectBusinessType = props.selectBusinessType;
   var _ref = rCTemp || {},
     url = _ref.url,
@@ -5555,16 +5553,14 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var currentPage = 1;
   var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
   var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
-  var currentSelectProps = _objectSpread2(_objectSpread2({
-    // 回显字段可自定义
-    optionLabelProp: "label"
-  }, selectProps), {}, {
+  var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
     // 以下属性不可更改----设计配置项
     showArrow: true,
     showSearch: true,
     filterOption: false,
     allowClear: true,
     listHeight: 160,
+    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   });
@@ -6033,19 +6029,12 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var formaData = function formaData(value, source) {
     if (labelInValue) {
-      var getFromat = function getFromat(format, val) {
-        return format.map(function (_ref8) {
-          var key = _ref8.key,
-            value = _ref8.value;
-          return _defineProperty({}, key, val[value]);
-        });
-      };
       var formatResult = value.map(function (i) {
-        return Object.assign.apply(Object, [{
+        return {
           key: i[mappingValueField] || i.key,
           label: i[mappingTextField] || i.label,
           value: i[mappingValueField] || i.value
-        }].concat(_toConsumableArray(getFromat(returnFormat, i))));
+        };
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
     } else {
@@ -10667,10 +10656,10 @@ function commonFun(type, prefixUrl, parentProps) {
     selectProps = _objectSpread2({
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [{
-        title: 'SPU编码',
+        title: '商品编码(SPU)',
         dataIndex: 'itemCode'
       }, {
-        title: 'SPU名称',
+        title: '商品名称(SPU)',
         dataIndex: 'name'
       }]
     }, selectConfigProps);
@@ -10687,11 +10676,11 @@ function commonFun(type, prefixUrl, parentProps) {
     }, requestConfigProp);
     tableSearchForm = [{
       name: 'itemCode*multiInput',
-      label: 'SPU编码',
+      label: '商品编码(SPU)',
       type: 'multipleQueryInput'
     }, {
       name: 'name*multiInput',
-      label: 'SPU名称',
+      label: '商品名称(SPU)',
       type: 'multipleQueryInput'
     }, {
       name: 'qp-brandId-in',
@@ -10785,11 +10774,11 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'keyIndex',
         defaultSort: 0
       }, {
-        title: 'SPU编码',
+        title: '商品编码(SPU)',
         dataIndex: 'itemCode',
         defaultSort: 1
       }, {
-        title: 'SPU名称',
+        title: '商品名称(SPU) ',
         dataIndex: 'name',
         defaultSort: 2
       }, {
@@ -11492,6 +11481,14 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00004', text);
         }
+      }, {
+        title: '运营组名称',
+        dataIndex: 'groupCode',
+        defaultSort: 7,
+        render: function render(text, record) {
+          return (record === null || record === void 0 ? void 0 : record.groupName) ? "\u3010".concat(text, "\u3011").concat(record === null || record === void 0 ? void 0 : record.groupName) : "";
+        },
+        width: 100
       }, {
         title: '所属销售渠道',
         dataIndex: 'channelName',
@@ -11513,7 +11510,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
         title: '状态',
         dataIndex: 'isEnable',
-        defaultSort: 7,
+        defaultSort: 8,
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
@@ -12055,12 +12052,17 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '店铺名称'
-    }, {
-      name: 'qp-code-like',
-      label: '店铺编码'
+      name: 'name*multiInput',
+      label: '店铺名称',
+      type: 'multipleQueryInput'
     }, {
+      name: 'code*multiInput',
+      label: '店铺编码',
+      type: 'multipleQueryInput'
+    },
+    // { name: 'qp-name-like', label: '店铺名称' },
+    // { name: 'qp-code-like', label: '店铺编码' },
+    {
       name: 'qp-conglomerateCode-in',
       type: 'select',
       label: '归属集团',
@@ -38623,7 +38625,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           display: 'flex',
           marginBottom: '0px',
           padding: '10px 0px'
-        }
+        },
+        key: itemDetail.elementId
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'logical_operate_content',
         style: {

package/package.json

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

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

@@ -523,11 +523,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [
         {
-          title: 'SPU编码',
+          title: '商品编码(SPU)',
           dataIndex: 'itemCode',
         },
         {
-          title: 'SPU名称',
+          title: '商品名称(SPU)',
           dataIndex: 'name',
         },
       ],
@@ -547,8 +547,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'itemCode*multiInput', label: 'SPU编码', type: 'multipleQueryInput' },
-      { name: 'name*multiInput', label: 'SPU名称', type: 'multipleQueryInput' },
+      { name: 'itemCode*multiInput', label: '商品编码(SPU)', type: 'multipleQueryInput' },
+      { name: 'name*multiInput', label: '商品名称(SPU)', type: 'multipleQueryInput' },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -626,12 +626,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 0,
         },
         {
-          title: 'SPU编码',
+          title: '商品编码(SPU)',
           dataIndex: 'itemCode',
           defaultSort: 1,
         },
         {
-          title: 'SPU名称',
+          title: '商品名称(SPU) ',
           dataIndex: 'name',
           defaultSort: 2,
         },
@@ -970,7 +970,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ['colorName', 'categoryId', 'classId', 'brandId'],
       hiddenFields,
     );
-    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params, i.options));
+    const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,i.options));
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
       filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -1302,6 +1302,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           defaultSort: 3,
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
+        {
+          title: '运营组名称',
+          dataIndex: 'groupCode',
+          defaultSort: 7,
+          render: (text: any, record) => record?.groupName ? `【${text}】${record?.groupName}` : "",
+          width: 100,
+        },
         {
           title: '所属销售渠道',
           dataIndex: 'channelName',
@@ -1324,7 +1331,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         ...(modalTableBusProps?.needStatusSearch?[{
           title: '状态',
           dataIndex: 'isEnable',
-          defaultSort: 7,
+          defaultSort: 8,
           render: (text: number) => getDictionaryTextByValue('SC00001', text),
         }]:[]),
       ],
@@ -1860,8 +1867,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: '店铺名称' },
-      { name: 'qp-code-like', label: '店铺编码' },
+      { name: 'name*multiInput', label: '店铺名称', type: 'multipleQueryInput' },
+      { name: 'code*multiInput', label: '店铺编码', type: 'multipleQueryInput' },
+      // { name: 'qp-name-like', label: '店铺名称' },
+      // { name: 'qp-code-like', label: '店铺编码' },
       { name: 'qp-conglomerateCode-in', type: 'select', label: '归属集团', field: {
           type: 'select',
           props: {

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

@@ -32,7 +32,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     highestPopContainer = undefined,
     fieldComponent,
     onSaveCallback,
-    returnFormat = [],
     selectBusinessType,
   } = props;
   const {
@@ -67,8 +66,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
   const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
   const currentSelectProps = {
-    // 回显字段可自定义
-    optionLabelProp: "label",
     ...selectProps,
     // 以下属性不可更改----设计配置项
     showArrow: true,
@@ -76,6 +73,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     filterOption: false,
     allowClear: true,
     listHeight: 160,
+    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   }
@@ -433,8 +431,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
-      const getFromat = (format, val) => format.map(({key,value})=> ({[key]:val[value]}))
-      const formatResult = value.map((i: any) => (Object.assign({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }, ...getFromat(returnFormat, i))))
+      const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
       onChange(selectMode ? formatResult : formatResult[0], value,source)
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')

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

@@ -748,6 +748,7 @@ class RuleObjectComponent extends Component {
       <div
         className={'rule_line_content'}
         style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
+        key={itemDetail.elementId}
       >
         <div
           className={'logical_operate_content'}