@bit-sun/business-component 4.2.0-alpha.6.8 → 4.2.0-alpha.6.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -5472,6 +5472,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
5472
5472
  highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
5473
5473
  fieldComponent = props.fieldComponent,
5474
5474
  onSaveCallback = props.onSaveCallback,
5475
+ _props$returnFormat = props.returnFormat,
5476
+ returnFormat = _props$returnFormat === void 0 ? [] : _props$returnFormat,
5475
5477
  selectBusinessType = props.selectBusinessType;
5476
5478
  var _ref = rCTemp || {},
5477
5479
  url = _ref.url,
@@ -5530,14 +5532,16 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
5530
5532
  var currentPage = 1;
5531
5533
  var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
5532
5534
  var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
5533
- var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
5535
+ var currentSelectProps = _objectSpread2(_objectSpread2({
5536
+ // 回显字段可自定义
5537
+ optionLabelProp: "label"
5538
+ }, selectProps), {}, {
5534
5539
  // 以下属性不可更改----设计配置项
5535
5540
  showArrow: true,
5536
5541
  showSearch: true,
5537
5542
  filterOption: false,
5538
5543
  allowClear: true,
5539
5544
  listHeight: 160,
5540
- optionLabelProp: "label",
5541
5545
  autoClearSearchValue: false,
5542
5546
  placement: 'bottomRight'
5543
5547
  });
@@ -6006,12 +6010,19 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
6006
6010
  };
6007
6011
  var formaData = function formaData(value, source) {
6008
6012
  if (labelInValue) {
6013
+ var getFromat = function getFromat(format, val) {
6014
+ return format.map(function (_ref8) {
6015
+ var key = _ref8.key,
6016
+ value = _ref8.value;
6017
+ return _defineProperty({}, key, val[value]);
6018
+ });
6019
+ };
6009
6020
  var formatResult = value.map(function (i) {
6010
- return {
6021
+ return Object.assign.apply(Object, [{
6011
6022
  key: i[mappingValueField] || i.key,
6012
6023
  label: i[mappingTextField] || i.label,
6013
6024
  value: i[mappingValueField] || i.value
6014
- };
6025
+ }].concat(_toConsumableArray(getFromat(returnFormat, i))));
6015
6026
  });
6016
6027
  onChange(selectMode ? formatResult : formatResult[0], value, source);
6017
6028
  } else {
@@ -7852,6 +7863,116 @@ var AddSelect = function AddSelect(props) {
7852
7863
  acc[key] = typeof value === 'function' ? value === null || value === void 0 ? void 0 : value(record) : value;
7853
7864
  return acc;
7854
7865
  }, {});
7866
+ // 可输入非数字字符
7867
+ if (item.canInputString) {
7868
+ return /*#__PURE__*/React$1.createElement(InputNumber, _objectSpread2(_objectSpread2({
7869
+ min: 0,
7870
+ precision: 0,
7871
+ controls: false
7872
+ }, inputProps), {}, {
7873
+ value: text || '',
7874
+ keyboard: false,
7875
+ onPressEnter: function onPressEnter(e) {
7876
+ e.target.blur();
7877
+ },
7878
+ onBlur: function () {
7879
+ var _onBlur = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
7880
+ var value;
7881
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
7882
+ while (1) switch (_context2.prev = _context2.next) {
7883
+ case 0:
7884
+ value = e.target.value;
7885
+ record[item.dataIndex] = value;
7886
+ editRecord(record);
7887
+ case 3:
7888
+ case "end":
7889
+ return _context2.stop();
7890
+ }
7891
+ }, _callee2);
7892
+ }));
7893
+ function onBlur(_x7) {
7894
+ return _onBlur.apply(this, arguments);
7895
+ }
7896
+ return onBlur;
7897
+ }(),
7898
+ onKeyDown: function onKeyDown(e) {
7899
+ if (e.keyCode === 13 && e.ctrlKey) {
7900
+ var _document$getElementB;
7901
+ handleOk(true);
7902
+ (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
7903
+ }
7904
+ if (e.keyCode === 8 && e.ctrlKey) {
7905
+ var _e$nativeEvent$path$;
7906
+ message$1.success('删除当前行');
7907
+ e.stopPropagation();
7908
+ e.preventDefault();
7909
+ var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
7910
+ if (dom) {
7911
+ dom.select();
7912
+ dom.focus();
7913
+ dom.scrollIntoView(false);
7914
+ }
7915
+ dom = null;
7916
+ deleteRecord(record);
7917
+ }
7918
+ if (e.keyCode === 37 && e.shiftKey) {
7919
+ var _e$nativeEvent$path$2;
7920
+ // 左滑动
7921
+ e.stopPropagation();
7922
+ e.preventDefault();
7923
+ var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
7924
+ if (_dom) {
7925
+ _dom.select();
7926
+ _dom.focus();
7927
+ _dom.scrollIntoView(false);
7928
+ }
7929
+ _dom = null;
7930
+ }
7931
+ if (e.keyCode === 39 && e.shiftKey) {
7932
+ var _e$nativeEvent$path$3;
7933
+ // 右滑
7934
+ e.stopPropagation();
7935
+ e.preventDefault();
7936
+ var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
7937
+ if (_dom2) {
7938
+ _dom2.select();
7939
+ _dom2.focus();
7940
+ _dom2.scrollIntoView(false);
7941
+ }
7942
+ _dom2 = null;
7943
+ }
7944
+ if (e.keyCode === 40) {
7945
+ var _e$nativeEvent$path$4;
7946
+ e.stopPropagation();
7947
+ e.preventDefault();
7948
+ var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
7949
+ if (_dom3) {
7950
+ _dom3.select();
7951
+ _dom3.focus();
7952
+ _dom3.scrollIntoView(false);
7953
+ }
7954
+ _dom3 = null;
7955
+ } else if (e.keyCode === 38) {
7956
+ var _e$nativeEvent$path$5;
7957
+ e.stopPropagation();
7958
+ e.preventDefault();
7959
+ var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
7960
+ if (dom1) {
7961
+ // dom1.value=""
7962
+ // dom1.setSelectionRange(100, 0);
7963
+ dom1.select();
7964
+ dom1.focus();
7965
+ dom1.scrollIntoViewIfNeeded(false);
7966
+ // dom1.value=record['count']
7967
+ }
7968
+ dom1 = null;
7969
+ } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
7970
+ e.stopPropagation();
7971
+ e.preventDefault();
7972
+ }
7973
+ }
7974
+ }));
7975
+ }
7855
7976
  return /*#__PURE__*/React$1.createElement(InputNumber, _objectSpread2(_objectSpread2(_objectSpread2({}, inputProps), {}, {
7856
7977
  value: text || '',
7857
7978
  min: 0,
@@ -7869,16 +7990,16 @@ var AddSelect = function AddSelect(props) {
7869
7990
  // }}
7870
7991
  onKeyDown: function onKeyDown(e) {
7871
7992
  if (e.keyCode === 13 && e.ctrlKey) {
7872
- var _document$getElementB;
7993
+ var _document$getElementB2;
7873
7994
  handleOk(true);
7874
- (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
7995
+ (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
7875
7996
  }
7876
7997
  if (e.keyCode === 8 && e.ctrlKey) {
7877
- var _e$nativeEvent$path$;
7998
+ var _e$nativeEvent$path$6;
7878
7999
  message$1.success('删除当前行');
7879
8000
  e.stopPropagation();
7880
8001
  e.preventDefault();
7881
- var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
8002
+ var dom = (_e$nativeEvent$path$6 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$6 === void 0 ? void 0 : _e$nativeEvent$path$6.getElementsByTagName('input')[currentIndex];
7882
8003
  if (dom) {
7883
8004
  dom.select();
7884
8005
  dom.focus();
@@ -7888,47 +8009,47 @@ var AddSelect = function AddSelect(props) {
7888
8009
  deleteRecord(record);
7889
8010
  }
7890
8011
  if (e.keyCode === 37 && e.shiftKey) {
7891
- var _e$nativeEvent$path$2;
8012
+ var _e$nativeEvent$path$7;
7892
8013
  // 左滑动
7893
8014
  e.stopPropagation();
7894
8015
  e.preventDefault();
7895
- var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
7896
- if (_dom) {
7897
- _dom.select();
7898
- _dom.focus();
7899
- _dom.scrollIntoView(false);
8016
+ var _dom4 = (_e$nativeEvent$path$7 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$7 === void 0 ? void 0 : _e$nativeEvent$path$7.getElementsByTagName('input')[currentIndex - 1];
8017
+ if (_dom4) {
8018
+ _dom4.select();
8019
+ _dom4.focus();
8020
+ _dom4.scrollIntoView(false);
7900
8021
  }
7901
- _dom = null;
8022
+ _dom4 = null;
7902
8023
  }
7903
8024
  if (e.keyCode === 39 && e.shiftKey) {
7904
- var _e$nativeEvent$path$3;
8025
+ var _e$nativeEvent$path$8;
7905
8026
  // 右滑
7906
8027
  e.stopPropagation();
7907
8028
  e.preventDefault();
7908
- var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
7909
- if (_dom2) {
7910
- _dom2.select();
7911
- _dom2.focus();
7912
- _dom2.scrollIntoView(false);
8029
+ var _dom5 = (_e$nativeEvent$path$8 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$8 === void 0 ? void 0 : _e$nativeEvent$path$8.getElementsByTagName('input')[currentIndex + 1];
8030
+ if (_dom5) {
8031
+ _dom5.select();
8032
+ _dom5.focus();
8033
+ _dom5.scrollIntoView(false);
7913
8034
  }
7914
- _dom2 = null;
8035
+ _dom5 = null;
7915
8036
  }
7916
8037
  if (e.keyCode === 40) {
7917
- var _e$nativeEvent$path$4;
8038
+ var _e$nativeEvent$path$9;
7918
8039
  e.stopPropagation();
7919
8040
  e.preventDefault();
7920
- var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
7921
- if (_dom3) {
7922
- _dom3.select();
7923
- _dom3.focus();
7924
- _dom3.scrollIntoView(false);
8041
+ var _dom6 = (_e$nativeEvent$path$9 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$9 === void 0 ? void 0 : _e$nativeEvent$path$9.getElementsByTagName('input')[currentIndex];
8042
+ if (_dom6) {
8043
+ _dom6.select();
8044
+ _dom6.focus();
8045
+ _dom6.scrollIntoView(false);
7925
8046
  }
7926
- _dom3 = null;
8047
+ _dom6 = null;
7927
8048
  } else if (e.keyCode === 38) {
7928
- var _e$nativeEvent$path$5;
8049
+ var _e$nativeEvent$path$10;
7929
8050
  e.stopPropagation();
7930
8051
  e.preventDefault();
7931
- var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
8052
+ var dom1 = (_e$nativeEvent$path$10 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$10 === void 0 ? void 0 : _e$nativeEvent$path$10.getElementsByTagName('input')[currentIndex];
7932
8053
  if (dom1) {
7933
8054
  // dom1.value=""
7934
8055
  // dom1.setSelectionRange(100, 0);
@@ -7962,19 +8083,19 @@ var AddSelect = function AddSelect(props) {
7962
8083
  return /*#__PURE__*/React$1.createElement(Select, _objectSpread2(_objectSpread2({}, item.selectProps), {}, {
7963
8084
  value: text || null,
7964
8085
  onChange: function () {
7965
- var _onChange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
8086
+ var _onChange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value) {
7966
8087
  var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules;
7967
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
7968
- while (1) switch (_context2.prev = _context2.next) {
8088
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
8089
+ while (1) switch (_context3.prev = _context3.next) {
7969
8090
  case 0:
7970
8091
  dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
7971
8092
  return d[selectKey] == value;
7972
8093
  })) || {};
7973
8094
  if (!(item === null || item === void 0 ? void 0 : item.selectChangeCallback)) {
7974
- _context2.next = 6;
8095
+ _context3.next = 6;
7975
8096
  break;
7976
8097
  }
7977
- _context2.next = 4;
8098
+ _context3.next = 4;
7978
8099
  return item === null || item === void 0 ? void 0 : (_item$selectChangeCal = item.selectChangeCallback) === null || _item$selectChangeCal === void 0 ? void 0 : _item$selectChangeCal.call(item, popvalue, setPopValue, {
7979
8100
  record: record,
7980
8101
  index: index,
@@ -7985,7 +8106,7 @@ var AddSelect = function AddSelect(props) {
7985
8106
  editRecord: editRecord
7986
8107
  });
7987
8108
  case 4:
7988
- _context2.next = 25;
8109
+ _context3.next = 25;
7989
8110
  break;
7990
8111
  case 6:
7991
8112
  // 更新当前行数据函数
@@ -8000,12 +8121,12 @@ var AddSelect = function AddSelect(props) {
8000
8121
  }
8001
8122
  }; // 处理校验,默认不校验
8002
8123
  isCheckPass = true;
8003
- _context2.prev = 8;
8124
+ _context3.prev = 8;
8004
8125
  if (!(item === null || item === void 0 ? void 0 : item.selectCheckCallback)) {
8005
- _context2.next = 15;
8126
+ _context3.next = 15;
8006
8127
  break;
8007
8128
  }
8008
- _context2.next = 12;
8129
+ _context3.next = 12;
8009
8130
  return item === null || item === void 0 ? void 0 : item.selectCheckCallback(popvalue, {
8010
8131
  record: record,
8011
8132
  index: index,
@@ -8015,21 +8136,21 @@ var AddSelect = function AddSelect(props) {
8015
8136
  dataSourceSelectItem: dataSourceSelectItem
8016
8137
  });
8017
8138
  case 12:
8018
- isCheckPass = _context2.sent;
8019
- _context2.next = 19;
8139
+ isCheckPass = _context3.sent;
8140
+ _context3.next = 19;
8020
8141
  break;
8021
8142
  case 15:
8022
- _context2.next = 17;
8143
+ _context3.next = 17;
8023
8144
  return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
8024
8145
  case 17:
8025
- isConformToTheRules = _context2.sent;
8146
+ isConformToTheRules = _context3.sent;
8026
8147
  isCheckPass = !isConformToTheRules;
8027
8148
  case 19:
8028
- _context2.next = 23;
8149
+ _context3.next = 23;
8029
8150
  break;
8030
8151
  case 21:
8031
- _context2.prev = 21;
8032
- _context2.t0 = _context2["catch"](8);
8152
+ _context3.prev = 21;
8153
+ _context3.t0 = _context3["catch"](8);
8033
8154
  case 23:
8034
8155
  if (isCheckPass) {
8035
8156
  changeValue(value, dataSourceSelectItem);
@@ -8040,11 +8161,11 @@ var AddSelect = function AddSelect(props) {
8040
8161
  editRecord(record);
8041
8162
  case 25:
8042
8163
  case "end":
8043
- return _context2.stop();
8164
+ return _context3.stop();
8044
8165
  }
8045
- }, _callee2, null, [[8, 21]]);
8166
+ }, _callee3, null, [[8, 21]]);
8046
8167
  }));
8047
- function onChange(_x7) {
8168
+ function onChange(_x8) {
8048
8169
  return _onChange.apply(this, arguments);
8049
8170
  }
8050
8171
  return onChange;
@@ -8304,8 +8425,8 @@ var AddSelect = function AddSelect(props) {
8304
8425
  }
8305
8426
  }
8306
8427
  setTimeout(function () {
8307
- var _document$getElementB2;
8308
- (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
8428
+ var _document$getElementB3;
8429
+ (_document$getElementB3 = document.getElementById("first-query")) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
8309
8430
  }, 50);
8310
8431
  };
8311
8432
  // 将格式化完的数据回显到 表格中
@@ -8335,7 +8456,7 @@ var AddSelect = function AddSelect(props) {
8335
8456
  handleLoading(isContinue, true);
8336
8457
  onSaveCallback(popvalue).then(function (res) {
8337
8458
  {
8338
- var _Object$keys2, _document$getElementB3;
8459
+ var _Object$keys2, _document$getElementB4;
8339
8460
  // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
8340
8461
  var initSuccessMessage = '保存成功';
8341
8462
  var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
@@ -8345,7 +8466,7 @@ var AddSelect = function AddSelect(props) {
8345
8466
  message$1.success(initSuccessMessage);
8346
8467
  }
8347
8468
  deleteSelectRows();
8348
- (_document$getElementB3 = document.getElementById('first-query')) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
8469
+ (_document$getElementB4 = document.getElementById('first-query')) === null || _document$getElementB4 === void 0 ? void 0 : _document$getElementB4.focus();
8349
8470
  !isContinue && handleCancel();
8350
8471
  }
8351
8472
  handleLoading(isContinue, false);
@@ -10523,10 +10644,10 @@ function commonFun(type, prefixUrl, parentProps) {
10523
10644
  selectProps = _objectSpread2({
10524
10645
  placeholder: '输入商品(SPU)编码或名称',
10525
10646
  renderTableColumns: [{
10526
- title: '商品编码(SPU)',
10647
+ title: 'SPU编码',
10527
10648
  dataIndex: 'itemCode'
10528
10649
  }, {
10529
- title: '商品名称(SPU)',
10650
+ title: 'SPU名称',
10530
10651
  dataIndex: 'name'
10531
10652
  }]
10532
10653
  }, selectConfigProps);
@@ -10543,11 +10664,11 @@ function commonFun(type, prefixUrl, parentProps) {
10543
10664
  }, requestConfigProp);
10544
10665
  tableSearchForm = [{
10545
10666
  name: 'itemCode*multiInput',
10546
- label: '商品编码(SPU)',
10667
+ label: 'SPU编码',
10547
10668
  type: 'multipleQueryInput'
10548
10669
  }, {
10549
10670
  name: 'name*multiInput',
10550
- label: '商品名称(SPU)',
10671
+ label: 'SPU名称',
10551
10672
  type: 'multipleQueryInput'
10552
10673
  }, {
10553
10674
  name: 'qp-brandId-in',
@@ -10641,11 +10762,11 @@ function commonFun(type, prefixUrl, parentProps) {
10641
10762
  dataIndex: 'keyIndex',
10642
10763
  defaultSort: 0
10643
10764
  }, {
10644
- title: '商品编码(SPU)',
10765
+ title: 'SPU编码',
10645
10766
  dataIndex: 'itemCode',
10646
10767
  defaultSort: 1
10647
10768
  }, {
10648
- title: '商品名称(SPU) ',
10769
+ title: 'SPU名称',
10649
10770
  dataIndex: 'name',
10650
10771
  defaultSort: 2
10651
10772
  }, {
@@ -10999,7 +11120,7 @@ function commonFun(type, prefixUrl, parentProps) {
10999
11120
  options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
11000
11121
  }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
11001
11122
  var fieldLoadSource = fieldsRequest.map(function (i) {
11002
- return loadSelectSource$1(i.url, i.params, options);
11123
+ return loadSelectSource$1(i.url, i.params, i.options);
11003
11124
  });
11004
11125
  requestConfig = _objectSpread2({
11005
11126
  url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
@@ -11348,6 +11469,14 @@ function commonFun(type, prefixUrl, parentProps) {
11348
11469
  render: function render(text) {
11349
11470
  return getDictionaryTextByValue$1('SC00004', text);
11350
11471
  }
11472
+ }, {
11473
+ title: '运营组名称',
11474
+ dataIndex: 'groupCode',
11475
+ defaultSort: 7,
11476
+ render: function render(text, record) {
11477
+ return (record === null || record === void 0 ? void 0 : record.groupName) ? "\u3010".concat(text, "\u3011").concat(record === null || record === void 0 ? void 0 : record.groupName) : "";
11478
+ },
11479
+ width: 100
11351
11480
  }, {
11352
11481
  title: '所属销售渠道',
11353
11482
  dataIndex: 'channelName',
@@ -11369,7 +11498,7 @@ function commonFun(type, prefixUrl, parentProps) {
11369
11498
  }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
11370
11499
  title: '状态',
11371
11500
  dataIndex: 'isEnable',
11372
- defaultSort: 7,
11501
+ defaultSort: 8,
11373
11502
  render: function render(text) {
11374
11503
  return getDictionaryTextByValue$1('SC00001', text);
11375
11504
  }
@@ -11911,12 +12040,17 @@ function commonFun(type, prefixUrl, parentProps) {
11911
12040
  sourceName: 'code'
11912
12041
  }, requestConfigProp);
11913
12042
  tableSearchForm = [{
11914
- name: 'qp-name-like',
11915
- label: '店铺名称'
11916
- }, {
11917
- name: 'qp-code-like',
11918
- label: '店铺编码'
12043
+ name: 'name*multiInput',
12044
+ label: '店铺名称',
12045
+ type: 'multipleQueryInput'
11919
12046
  }, {
12047
+ name: 'code*multiInput',
12048
+ label: '店铺编码',
12049
+ type: 'multipleQueryInput'
12050
+ },
12051
+ // { name: 'qp-name-like', label: '店铺名称' },
12052
+ // { name: 'qp-code-like', label: '店铺编码' },
12053
+ {
11920
12054
  name: 'qp-conglomerateCode-in',
11921
12055
  type: 'select',
11922
12056
  label: '归属集团',
@@ -12458,7 +12592,7 @@ function commonFun(type, prefixUrl, parentProps) {
12458
12592
  name: 'qp-email-like',
12459
12593
  label: '邮箱'
12460
12594
  }, {
12461
- name: 'qp-officeTelephone-like',
12595
+ name: 'qp-phone-like',
12462
12596
  label: '手机号'
12463
12597
  }];
12464
12598
  var _queryHeaderParams13 = getQueryHeadersList({
@@ -12575,7 +12709,7 @@ function commonFun(type, prefixUrl, parentProps) {
12575
12709
  name: 'qp-email-like',
12576
12710
  label: '邮箱'
12577
12711
  }, {
12578
- name: 'qp-officeTelephone-like',
12712
+ name: 'qp-phone-like',
12579
12713
  label: '手机号'
12580
12714
  }]);
12581
12715
  var _queryHeaderParams14 = getQueryHeadersList({
@@ -38479,7 +38613,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
38479
38613
  display: 'flex',
38480
38614
  marginBottom: '0px',
38481
38615
  padding: '10px 0px'
38482
- }
38616
+ },
38617
+ key: itemDetail.elementId
38483
38618
  }, /*#__PURE__*/React$1.createElement("div", {
38484
38619
  className: 'logical_operate_content',
38485
38620
  style: {
package/dist/index.js CHANGED
@@ -5495,6 +5495,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
5495
5495
  highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
5496
5496
  fieldComponent = props.fieldComponent,
5497
5497
  onSaveCallback = props.onSaveCallback,
5498
+ _props$returnFormat = props.returnFormat,
5499
+ returnFormat = _props$returnFormat === void 0 ? [] : _props$returnFormat,
5498
5500
  selectBusinessType = props.selectBusinessType;
5499
5501
  var _ref = rCTemp || {},
5500
5502
  url = _ref.url,
@@ -5553,14 +5555,16 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
5553
5555
  var currentPage = 1;
5554
5556
  var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
5555
5557
  var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
5556
- var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
5558
+ var currentSelectProps = _objectSpread2(_objectSpread2({
5559
+ // 回显字段可自定义
5560
+ optionLabelProp: "label"
5561
+ }, selectProps), {}, {
5557
5562
  // 以下属性不可更改----设计配置项
5558
5563
  showArrow: true,
5559
5564
  showSearch: true,
5560
5565
  filterOption: false,
5561
5566
  allowClear: true,
5562
5567
  listHeight: 160,
5563
- optionLabelProp: "label",
5564
5568
  autoClearSearchValue: false,
5565
5569
  placement: 'bottomRight'
5566
5570
  });
@@ -6029,12 +6033,19 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
6029
6033
  };
6030
6034
  var formaData = function formaData(value, source) {
6031
6035
  if (labelInValue) {
6036
+ var getFromat = function getFromat(format, val) {
6037
+ return format.map(function (_ref8) {
6038
+ var key = _ref8.key,
6039
+ value = _ref8.value;
6040
+ return _defineProperty({}, key, val[value]);
6041
+ });
6042
+ };
6032
6043
  var formatResult = value.map(function (i) {
6033
- return {
6044
+ return Object.assign.apply(Object, [{
6034
6045
  key: i[mappingValueField] || i.key,
6035
6046
  label: i[mappingTextField] || i.label,
6036
6047
  value: i[mappingValueField] || i.value
6037
- };
6048
+ }].concat(_toConsumableArray(getFromat(returnFormat, i))));
6038
6049
  });
6039
6050
  onChange(selectMode ? formatResult : formatResult[0], value, source);
6040
6051
  } else {
@@ -7875,6 +7886,116 @@ var AddSelect = function AddSelect(props) {
7875
7886
  acc[key] = typeof value === 'function' ? value === null || value === void 0 ? void 0 : value(record) : value;
7876
7887
  return acc;
7877
7888
  }, {});
7889
+ // 可输入非数字字符
7890
+ if (item.canInputString) {
7891
+ return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2({
7892
+ min: 0,
7893
+ precision: 0,
7894
+ controls: false
7895
+ }, inputProps), {}, {
7896
+ value: text || '',
7897
+ keyboard: false,
7898
+ onPressEnter: function onPressEnter(e) {
7899
+ e.target.blur();
7900
+ },
7901
+ onBlur: function () {
7902
+ var _onBlur = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
7903
+ var value;
7904
+ return _regeneratorRuntime().wrap(function _callee2$(_context2) {
7905
+ while (1) switch (_context2.prev = _context2.next) {
7906
+ case 0:
7907
+ value = e.target.value;
7908
+ record[item.dataIndex] = value;
7909
+ editRecord(record);
7910
+ case 3:
7911
+ case "end":
7912
+ return _context2.stop();
7913
+ }
7914
+ }, _callee2);
7915
+ }));
7916
+ function onBlur(_x7) {
7917
+ return _onBlur.apply(this, arguments);
7918
+ }
7919
+ return onBlur;
7920
+ }(),
7921
+ onKeyDown: function onKeyDown(e) {
7922
+ if (e.keyCode === 13 && e.ctrlKey) {
7923
+ var _document$getElementB;
7924
+ handleOk(true);
7925
+ (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
7926
+ }
7927
+ if (e.keyCode === 8 && e.ctrlKey) {
7928
+ var _e$nativeEvent$path$;
7929
+ antd.message.success('删除当前行');
7930
+ e.stopPropagation();
7931
+ e.preventDefault();
7932
+ var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
7933
+ if (dom) {
7934
+ dom.select();
7935
+ dom.focus();
7936
+ dom.scrollIntoView(false);
7937
+ }
7938
+ dom = null;
7939
+ deleteRecord(record);
7940
+ }
7941
+ if (e.keyCode === 37 && e.shiftKey) {
7942
+ var _e$nativeEvent$path$2;
7943
+ // 左滑动
7944
+ e.stopPropagation();
7945
+ e.preventDefault();
7946
+ var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
7947
+ if (_dom) {
7948
+ _dom.select();
7949
+ _dom.focus();
7950
+ _dom.scrollIntoView(false);
7951
+ }
7952
+ _dom = null;
7953
+ }
7954
+ if (e.keyCode === 39 && e.shiftKey) {
7955
+ var _e$nativeEvent$path$3;
7956
+ // 右滑
7957
+ e.stopPropagation();
7958
+ e.preventDefault();
7959
+ var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
7960
+ if (_dom2) {
7961
+ _dom2.select();
7962
+ _dom2.focus();
7963
+ _dom2.scrollIntoView(false);
7964
+ }
7965
+ _dom2 = null;
7966
+ }
7967
+ if (e.keyCode === 40) {
7968
+ var _e$nativeEvent$path$4;
7969
+ e.stopPropagation();
7970
+ e.preventDefault();
7971
+ var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
7972
+ if (_dom3) {
7973
+ _dom3.select();
7974
+ _dom3.focus();
7975
+ _dom3.scrollIntoView(false);
7976
+ }
7977
+ _dom3 = null;
7978
+ } else if (e.keyCode === 38) {
7979
+ var _e$nativeEvent$path$5;
7980
+ e.stopPropagation();
7981
+ e.preventDefault();
7982
+ var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
7983
+ if (dom1) {
7984
+ // dom1.value=""
7985
+ // dom1.setSelectionRange(100, 0);
7986
+ dom1.select();
7987
+ dom1.focus();
7988
+ dom1.scrollIntoViewIfNeeded(false);
7989
+ // dom1.value=record['count']
7990
+ }
7991
+ dom1 = null;
7992
+ } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
7993
+ e.stopPropagation();
7994
+ e.preventDefault();
7995
+ }
7996
+ }
7997
+ }));
7998
+ }
7878
7999
  return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2(_objectSpread2({}, inputProps), {}, {
7879
8000
  value: text || '',
7880
8001
  min: 0,
@@ -7892,16 +8013,16 @@ var AddSelect = function AddSelect(props) {
7892
8013
  // }}
7893
8014
  onKeyDown: function onKeyDown(e) {
7894
8015
  if (e.keyCode === 13 && e.ctrlKey) {
7895
- var _document$getElementB;
8016
+ var _document$getElementB2;
7896
8017
  handleOk(true);
7897
- (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
8018
+ (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
7898
8019
  }
7899
8020
  if (e.keyCode === 8 && e.ctrlKey) {
7900
- var _e$nativeEvent$path$;
8021
+ var _e$nativeEvent$path$6;
7901
8022
  antd.message.success('删除当前行');
7902
8023
  e.stopPropagation();
7903
8024
  e.preventDefault();
7904
- var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
8025
+ var dom = (_e$nativeEvent$path$6 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$6 === void 0 ? void 0 : _e$nativeEvent$path$6.getElementsByTagName('input')[currentIndex];
7905
8026
  if (dom) {
7906
8027
  dom.select();
7907
8028
  dom.focus();
@@ -7911,47 +8032,47 @@ var AddSelect = function AddSelect(props) {
7911
8032
  deleteRecord(record);
7912
8033
  }
7913
8034
  if (e.keyCode === 37 && e.shiftKey) {
7914
- var _e$nativeEvent$path$2;
8035
+ var _e$nativeEvent$path$7;
7915
8036
  // 左滑动
7916
8037
  e.stopPropagation();
7917
8038
  e.preventDefault();
7918
- var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
7919
- if (_dom) {
7920
- _dom.select();
7921
- _dom.focus();
7922
- _dom.scrollIntoView(false);
8039
+ var _dom4 = (_e$nativeEvent$path$7 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$7 === void 0 ? void 0 : _e$nativeEvent$path$7.getElementsByTagName('input')[currentIndex - 1];
8040
+ if (_dom4) {
8041
+ _dom4.select();
8042
+ _dom4.focus();
8043
+ _dom4.scrollIntoView(false);
7923
8044
  }
7924
- _dom = null;
8045
+ _dom4 = null;
7925
8046
  }
7926
8047
  if (e.keyCode === 39 && e.shiftKey) {
7927
- var _e$nativeEvent$path$3;
8048
+ var _e$nativeEvent$path$8;
7928
8049
  // 右滑
7929
8050
  e.stopPropagation();
7930
8051
  e.preventDefault();
7931
- var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
7932
- if (_dom2) {
7933
- _dom2.select();
7934
- _dom2.focus();
7935
- _dom2.scrollIntoView(false);
8052
+ var _dom5 = (_e$nativeEvent$path$8 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$8 === void 0 ? void 0 : _e$nativeEvent$path$8.getElementsByTagName('input')[currentIndex + 1];
8053
+ if (_dom5) {
8054
+ _dom5.select();
8055
+ _dom5.focus();
8056
+ _dom5.scrollIntoView(false);
7936
8057
  }
7937
- _dom2 = null;
8058
+ _dom5 = null;
7938
8059
  }
7939
8060
  if (e.keyCode === 40) {
7940
- var _e$nativeEvent$path$4;
8061
+ var _e$nativeEvent$path$9;
7941
8062
  e.stopPropagation();
7942
8063
  e.preventDefault();
7943
- var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
7944
- if (_dom3) {
7945
- _dom3.select();
7946
- _dom3.focus();
7947
- _dom3.scrollIntoView(false);
8064
+ var _dom6 = (_e$nativeEvent$path$9 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$9 === void 0 ? void 0 : _e$nativeEvent$path$9.getElementsByTagName('input')[currentIndex];
8065
+ if (_dom6) {
8066
+ _dom6.select();
8067
+ _dom6.focus();
8068
+ _dom6.scrollIntoView(false);
7948
8069
  }
7949
- _dom3 = null;
8070
+ _dom6 = null;
7950
8071
  } else if (e.keyCode === 38) {
7951
- var _e$nativeEvent$path$5;
8072
+ var _e$nativeEvent$path$10;
7952
8073
  e.stopPropagation();
7953
8074
  e.preventDefault();
7954
- var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
8075
+ var dom1 = (_e$nativeEvent$path$10 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$10 === void 0 ? void 0 : _e$nativeEvent$path$10.getElementsByTagName('input')[currentIndex];
7955
8076
  if (dom1) {
7956
8077
  // dom1.value=""
7957
8078
  // dom1.setSelectionRange(100, 0);
@@ -7985,19 +8106,19 @@ var AddSelect = function AddSelect(props) {
7985
8106
  return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, item.selectProps), {}, {
7986
8107
  value: text || null,
7987
8108
  onChange: function () {
7988
- var _onChange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
8109
+ var _onChange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(value) {
7989
8110
  var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules;
7990
- return _regeneratorRuntime().wrap(function _callee2$(_context2) {
7991
- while (1) switch (_context2.prev = _context2.next) {
8111
+ return _regeneratorRuntime().wrap(function _callee3$(_context3) {
8112
+ while (1) switch (_context3.prev = _context3.next) {
7992
8113
  case 0:
7993
8114
  dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
7994
8115
  return d[selectKey] == value;
7995
8116
  })) || {};
7996
8117
  if (!(item === null || item === void 0 ? void 0 : item.selectChangeCallback)) {
7997
- _context2.next = 6;
8118
+ _context3.next = 6;
7998
8119
  break;
7999
8120
  }
8000
- _context2.next = 4;
8121
+ _context3.next = 4;
8001
8122
  return item === null || item === void 0 ? void 0 : (_item$selectChangeCal = item.selectChangeCallback) === null || _item$selectChangeCal === void 0 ? void 0 : _item$selectChangeCal.call(item, popvalue, setPopValue, {
8002
8123
  record: record,
8003
8124
  index: index,
@@ -8008,7 +8129,7 @@ var AddSelect = function AddSelect(props) {
8008
8129
  editRecord: editRecord
8009
8130
  });
8010
8131
  case 4:
8011
- _context2.next = 25;
8132
+ _context3.next = 25;
8012
8133
  break;
8013
8134
  case 6:
8014
8135
  // 更新当前行数据函数
@@ -8023,12 +8144,12 @@ var AddSelect = function AddSelect(props) {
8023
8144
  }
8024
8145
  }; // 处理校验,默认不校验
8025
8146
  isCheckPass = true;
8026
- _context2.prev = 8;
8147
+ _context3.prev = 8;
8027
8148
  if (!(item === null || item === void 0 ? void 0 : item.selectCheckCallback)) {
8028
- _context2.next = 15;
8149
+ _context3.next = 15;
8029
8150
  break;
8030
8151
  }
8031
- _context2.next = 12;
8152
+ _context3.next = 12;
8032
8153
  return item === null || item === void 0 ? void 0 : item.selectCheckCallback(popvalue, {
8033
8154
  record: record,
8034
8155
  index: index,
@@ -8038,21 +8159,21 @@ var AddSelect = function AddSelect(props) {
8038
8159
  dataSourceSelectItem: dataSourceSelectItem
8039
8160
  });
8040
8161
  case 12:
8041
- isCheckPass = _context2.sent;
8042
- _context2.next = 19;
8162
+ isCheckPass = _context3.sent;
8163
+ _context3.next = 19;
8043
8164
  break;
8044
8165
  case 15:
8045
- _context2.next = 17;
8166
+ _context3.next = 17;
8046
8167
  return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
8047
8168
  case 17:
8048
- isConformToTheRules = _context2.sent;
8169
+ isConformToTheRules = _context3.sent;
8049
8170
  isCheckPass = !isConformToTheRules;
8050
8171
  case 19:
8051
- _context2.next = 23;
8172
+ _context3.next = 23;
8052
8173
  break;
8053
8174
  case 21:
8054
- _context2.prev = 21;
8055
- _context2.t0 = _context2["catch"](8);
8175
+ _context3.prev = 21;
8176
+ _context3.t0 = _context3["catch"](8);
8056
8177
  case 23:
8057
8178
  if (isCheckPass) {
8058
8179
  changeValue(value, dataSourceSelectItem);
@@ -8063,11 +8184,11 @@ var AddSelect = function AddSelect(props) {
8063
8184
  editRecord(record);
8064
8185
  case 25:
8065
8186
  case "end":
8066
- return _context2.stop();
8187
+ return _context3.stop();
8067
8188
  }
8068
- }, _callee2, null, [[8, 21]]);
8189
+ }, _callee3, null, [[8, 21]]);
8069
8190
  }));
8070
- function onChange(_x7) {
8191
+ function onChange(_x8) {
8071
8192
  return _onChange.apply(this, arguments);
8072
8193
  }
8073
8194
  return onChange;
@@ -8327,8 +8448,8 @@ var AddSelect = function AddSelect(props) {
8327
8448
  }
8328
8449
  }
8329
8450
  setTimeout(function () {
8330
- var _document$getElementB2;
8331
- (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
8451
+ var _document$getElementB3;
8452
+ (_document$getElementB3 = document.getElementById("first-query")) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
8332
8453
  }, 50);
8333
8454
  };
8334
8455
  // 将格式化完的数据回显到 表格中
@@ -8358,7 +8479,7 @@ var AddSelect = function AddSelect(props) {
8358
8479
  handleLoading(isContinue, true);
8359
8480
  onSaveCallback(popvalue).then(function (res) {
8360
8481
  {
8361
- var _Object$keys2, _document$getElementB3;
8482
+ var _Object$keys2, _document$getElementB4;
8362
8483
  // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
8363
8484
  var initSuccessMessage = '保存成功';
8364
8485
  var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
@@ -8368,7 +8489,7 @@ var AddSelect = function AddSelect(props) {
8368
8489
  antd.message.success(initSuccessMessage);
8369
8490
  }
8370
8491
  deleteSelectRows();
8371
- (_document$getElementB3 = document.getElementById('first-query')) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
8492
+ (_document$getElementB4 = document.getElementById('first-query')) === null || _document$getElementB4 === void 0 ? void 0 : _document$getElementB4.focus();
8372
8493
  !isContinue && handleCancel();
8373
8494
  }
8374
8495
  handleLoading(isContinue, false);
@@ -10546,10 +10667,10 @@ function commonFun(type, prefixUrl, parentProps) {
10546
10667
  selectProps = _objectSpread2({
10547
10668
  placeholder: '输入商品(SPU)编码或名称',
10548
10669
  renderTableColumns: [{
10549
- title: '商品编码(SPU)',
10670
+ title: 'SPU编码',
10550
10671
  dataIndex: 'itemCode'
10551
10672
  }, {
10552
- title: '商品名称(SPU)',
10673
+ title: 'SPU名称',
10553
10674
  dataIndex: 'name'
10554
10675
  }]
10555
10676
  }, selectConfigProps);
@@ -10566,11 +10687,11 @@ function commonFun(type, prefixUrl, parentProps) {
10566
10687
  }, requestConfigProp);
10567
10688
  tableSearchForm = [{
10568
10689
  name: 'itemCode*multiInput',
10569
- label: '商品编码(SPU)',
10690
+ label: 'SPU编码',
10570
10691
  type: 'multipleQueryInput'
10571
10692
  }, {
10572
10693
  name: 'name*multiInput',
10573
- label: '商品名称(SPU)',
10694
+ label: 'SPU名称',
10574
10695
  type: 'multipleQueryInput'
10575
10696
  }, {
10576
10697
  name: 'qp-brandId-in',
@@ -10664,11 +10785,11 @@ function commonFun(type, prefixUrl, parentProps) {
10664
10785
  dataIndex: 'keyIndex',
10665
10786
  defaultSort: 0
10666
10787
  }, {
10667
- title: '商品编码(SPU)',
10788
+ title: 'SPU编码',
10668
10789
  dataIndex: 'itemCode',
10669
10790
  defaultSort: 1
10670
10791
  }, {
10671
- title: '商品名称(SPU) ',
10792
+ title: 'SPU名称',
10672
10793
  dataIndex: 'name',
10673
10794
  defaultSort: 2
10674
10795
  }, {
@@ -11022,7 +11143,7 @@ function commonFun(type, prefixUrl, parentProps) {
11022
11143
  options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
11023
11144
  }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
11024
11145
  var fieldLoadSource = fieldsRequest.map(function (i) {
11025
- return loadSelectSource$1(i.url, i.params, options);
11146
+ return loadSelectSource$1(i.url, i.params, i.options);
11026
11147
  });
11027
11148
  requestConfig = _objectSpread2({
11028
11149
  url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
@@ -11371,6 +11492,14 @@ function commonFun(type, prefixUrl, parentProps) {
11371
11492
  render: function render(text) {
11372
11493
  return getDictionaryTextByValue$1('SC00004', text);
11373
11494
  }
11495
+ }, {
11496
+ title: '运营组名称',
11497
+ dataIndex: 'groupCode',
11498
+ defaultSort: 7,
11499
+ render: function render(text, record) {
11500
+ return (record === null || record === void 0 ? void 0 : record.groupName) ? "\u3010".concat(text, "\u3011").concat(record === null || record === void 0 ? void 0 : record.groupName) : "";
11501
+ },
11502
+ width: 100
11374
11503
  }, {
11375
11504
  title: '所属销售渠道',
11376
11505
  dataIndex: 'channelName',
@@ -11392,7 +11521,7 @@ function commonFun(type, prefixUrl, parentProps) {
11392
11521
  }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
11393
11522
  title: '状态',
11394
11523
  dataIndex: 'isEnable',
11395
- defaultSort: 7,
11524
+ defaultSort: 8,
11396
11525
  render: function render(text) {
11397
11526
  return getDictionaryTextByValue$1('SC00001', text);
11398
11527
  }
@@ -11934,12 +12063,17 @@ function commonFun(type, prefixUrl, parentProps) {
11934
12063
  sourceName: 'code'
11935
12064
  }, requestConfigProp);
11936
12065
  tableSearchForm = [{
11937
- name: 'qp-name-like',
11938
- label: '店铺名称'
11939
- }, {
11940
- name: 'qp-code-like',
11941
- label: '店铺编码'
12066
+ name: 'name*multiInput',
12067
+ label: '店铺名称',
12068
+ type: 'multipleQueryInput'
11942
12069
  }, {
12070
+ name: 'code*multiInput',
12071
+ label: '店铺编码',
12072
+ type: 'multipleQueryInput'
12073
+ },
12074
+ // { name: 'qp-name-like', label: '店铺名称' },
12075
+ // { name: 'qp-code-like', label: '店铺编码' },
12076
+ {
11943
12077
  name: 'qp-conglomerateCode-in',
11944
12078
  type: 'select',
11945
12079
  label: '归属集团',
@@ -12481,7 +12615,7 @@ function commonFun(type, prefixUrl, parentProps) {
12481
12615
  name: 'qp-email-like',
12482
12616
  label: '邮箱'
12483
12617
  }, {
12484
- name: 'qp-officeTelephone-like',
12618
+ name: 'qp-phone-like',
12485
12619
  label: '手机号'
12486
12620
  }];
12487
12621
  var _queryHeaderParams13 = getQueryHeadersList({
@@ -12598,7 +12732,7 @@ function commonFun(type, prefixUrl, parentProps) {
12598
12732
  name: 'qp-email-like',
12599
12733
  label: '邮箱'
12600
12734
  }, {
12601
- name: 'qp-officeTelephone-like',
12735
+ name: 'qp-phone-like',
12602
12736
  label: '手机号'
12603
12737
  }]);
12604
12738
  var _queryHeaderParams14 = getQueryHeadersList({
@@ -38502,7 +38636,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
38502
38636
  display: 'flex',
38503
38637
  marginBottom: '0px',
38504
38638
  padding: '10px 0px'
38505
- }
38639
+ },
38640
+ key: itemDetail.elementId
38506
38641
  }, /*#__PURE__*/React__default['default'].createElement("div", {
38507
38642
  className: 'logical_operate_content',
38508
38643
  style: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "4.2.0-alpha.6.8",
3
+ "version": "4.2.0-alpha.6.9",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -523,11 +523,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
523
523
  placeholder: '输入商品(SPU)编码或名称',
524
524
  renderTableColumns: [
525
525
  {
526
- title: '商品编码(SPU)',
526
+ title: 'SPU编码',
527
527
  dataIndex: 'itemCode',
528
528
  },
529
529
  {
530
- title: '商品名称(SPU)',
530
+ title: 'SPU名称',
531
531
  dataIndex: 'name',
532
532
  },
533
533
  ],
@@ -547,8 +547,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
547
547
  ...requestConfigProp,
548
548
  }
549
549
  tableSearchForm = [
550
- { name: 'itemCode*multiInput', label: '商品编码(SPU)', type: 'multipleQueryInput' },
551
- { name: 'name*multiInput', label: '商品名称(SPU)', type: 'multipleQueryInput' },
550
+ { name: 'itemCode*multiInput', label: 'SPU编码', type: 'multipleQueryInput' },
551
+ { name: 'name*multiInput', label: 'SPU名称', type: 'multipleQueryInput' },
552
552
  { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
553
553
  type: 'select',
554
554
  props: {
@@ -626,12 +626,12 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
626
626
  defaultSort: 0,
627
627
  },
628
628
  {
629
- title: '商品编码(SPU)',
629
+ title: 'SPU编码',
630
630
  dataIndex: 'itemCode',
631
631
  defaultSort: 1,
632
632
  },
633
633
  {
634
- title: '商品名称(SPU) ',
634
+ title: 'SPU名称',
635
635
  dataIndex: 'name',
636
636
  defaultSort: 2,
637
637
  },
@@ -970,7 +970,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
970
970
  ['colorName', 'categoryId', 'classId', 'brandId'],
971
971
  hiddenFields,
972
972
  );
973
- const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params,options));
973
+ const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params, i.options));
974
974
  requestConfig = {
975
975
  url: `${prefixUrl.selectPrefix}/skc/skcSelect`,
976
976
  filter: 'qp-code,name-orGroup,like', // 过滤参数
@@ -1302,6 +1302,13 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1302
1302
  defaultSort: 3,
1303
1303
  render: (text: number) => getDictionaryTextByValue('SC00004', text),
1304
1304
  },
1305
+ {
1306
+ title: '运营组名称',
1307
+ dataIndex: 'groupCode',
1308
+ defaultSort: 7,
1309
+ render: (text: any, record) => record?.groupName ? `【${text}】${record?.groupName}` : "",
1310
+ width: 100,
1311
+ },
1305
1312
  {
1306
1313
  title: '所属销售渠道',
1307
1314
  dataIndex: 'channelName',
@@ -1324,7 +1331,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1324
1331
  ...(modalTableBusProps?.needStatusSearch?[{
1325
1332
  title: '状态',
1326
1333
  dataIndex: 'isEnable',
1327
- defaultSort: 7,
1334
+ defaultSort: 8,
1328
1335
  render: (text: number) => getDictionaryTextByValue('SC00001', text),
1329
1336
  }]:[]),
1330
1337
  ],
@@ -1860,8 +1867,10 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
1860
1867
  ...requestConfigProp,
1861
1868
  }
1862
1869
  tableSearchForm = [
1863
- { name: 'qp-name-like', label: '店铺名称' },
1864
- { name: 'qp-code-like', label: '店铺编码' },
1870
+ { name: 'name*multiInput', label: '店铺名称', type: 'multipleQueryInput' },
1871
+ { name: 'code*multiInput', label: '店铺编码', type: 'multipleQueryInput' },
1872
+ // { name: 'qp-name-like', label: '店铺名称' },
1873
+ // { name: 'qp-code-like', label: '店铺编码' },
1865
1874
  { name: 'qp-conglomerateCode-in', type: 'select', label: '归属集团', field: {
1866
1875
  type: 'select',
1867
1876
  props: {
@@ -2380,7 +2389,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2380
2389
  },
2381
2390
  } },
2382
2391
  { name: 'qp-email-like', label: '邮箱' },
2383
- { name: 'qp-officeTelephone-like', label: '手机号' },
2392
+ { name: 'qp-phone-like', label: '手机号' },
2384
2393
  ]
2385
2394
  const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2386
2395
  Promise.all([
@@ -2488,7 +2497,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
2488
2497
  } },
2489
2498
  ...(modalTableBusProps?.needTypeSearch?[{ name: 'qp-employmentType-eq', type: 'select', label: '员工类型', initialSource: employeeType }]:[]),
2490
2499
  { name: 'qp-email-like', label: '邮箱' },
2491
- { name: 'qp-officeTelephone-like', label: '手机号' },
2500
+ { name: 'qp-phone-like', label: '手机号' },
2492
2501
  ]
2493
2502
  const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
2494
2503
  Promise.all([
@@ -222,6 +222,98 @@ const AddSelect = (props: any) => {
222
222
  acc[key] = typeof value === 'function' ? value?.(record) : value;
223
223
  return acc;
224
224
  }, {});
225
+
226
+ // 可输入非数字字符
227
+ if(item.canInputString) {
228
+ return (
229
+ <InputNumber
230
+ min={0}
231
+ precision={0}
232
+ controls={false}
233
+ {...inputProps}
234
+ value={text || ''}
235
+ keyboard={false}
236
+ onPressEnter={(e: any) => {
237
+ e.target.blur();
238
+ }}
239
+ onBlur={async (e: any) => {
240
+ const {
241
+ target: { value },
242
+ } = e;
243
+ record[item.dataIndex] = value
244
+ editRecord(record)
245
+ }}
246
+ onKeyDown={(e) => {
247
+ if(e.keyCode === 13 && e.ctrlKey) {
248
+ handleOk(true)
249
+ document.getElementById("first-query")?.focus()
250
+ }
251
+ if(e.keyCode === 8 && e.ctrlKey) {
252
+ message.success('删除当前行')
253
+ e.stopPropagation();
254
+ e.preventDefault();
255
+ let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
256
+ if (dom) {
257
+ dom.select();
258
+ dom.focus();
259
+ dom.scrollIntoView(false)
260
+ }
261
+ dom = null
262
+ deleteRecord(record, popvalue);
263
+ }
264
+ if (e.keyCode === 37 && e.shiftKey) { // 左滑动
265
+ e.stopPropagation();
266
+ e.preventDefault();
267
+ let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex - 1]
268
+ if (dom) {
269
+ dom.select();
270
+ dom.focus();
271
+ dom.scrollIntoView(false)
272
+ }
273
+ dom = null
274
+ }
275
+ if (e.keyCode === 39 && e.shiftKey) { // 右滑
276
+ e.stopPropagation();
277
+ e.preventDefault();
278
+ let dom = e.nativeEvent.path[5].children[index + 1]?.getElementsByTagName('input')[currentIndex + 1]
279
+ if (dom) {
280
+ dom.select();
281
+ dom.focus();
282
+ dom.scrollIntoView(false)
283
+ }
284
+ dom = null
285
+ }
286
+ if (e.keyCode === 40) {
287
+ e.stopPropagation();
288
+ e.preventDefault();
289
+ let dom = e.nativeEvent.path[5].children[index + 2]?.getElementsByTagName('input')[currentIndex]
290
+ if (dom) {
291
+ dom.select();
292
+ dom.focus();
293
+ dom.scrollIntoView(false)
294
+ }
295
+ dom = null
296
+ } else if (e.keyCode === 38) {
297
+ e.stopPropagation();
298
+ e.preventDefault();
299
+ let dom1 = e.nativeEvent.path[5].children[index]?.getElementsByTagName('input')[currentIndex]
300
+ if (dom1) {
301
+ // dom1.value=""
302
+ // dom1.setSelectionRange(100, 0);
303
+ dom1.select();
304
+ dom1.focus();
305
+ dom1.scrollIntoViewIfNeeded(false)
306
+ // dom1.value=record['count']
307
+ }
308
+ dom1 = null
309
+ } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
310
+ e.stopPropagation();
311
+ e.preventDefault();
312
+ }
313
+ }}
314
+ />
315
+ );
316
+ }
225
317
 
226
318
  return (
227
319
  <InputNumber
@@ -32,6 +32,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
32
32
  highestPopContainer = undefined,
33
33
  fieldComponent,
34
34
  onSaveCallback,
35
+ returnFormat = [],
35
36
  selectBusinessType,
36
37
  } = props;
37
38
  const {
@@ -66,6 +67,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
66
67
  const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
67
68
  const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
68
69
  const currentSelectProps = {
70
+ // 回显字段可自定义
71
+ optionLabelProp: "label",
69
72
  ...selectProps,
70
73
  // 以下属性不可更改----设计配置项
71
74
  showArrow: true,
@@ -73,7 +76,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
73
76
  filterOption: false,
74
77
  allowClear: true,
75
78
  listHeight: 160,
76
- optionLabelProp: "label",
77
79
  autoClearSearchValue: false,
78
80
  placement: 'bottomRight'
79
81
  }
@@ -431,7 +433,8 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
431
433
 
432
434
  const formaData = (value: any, source: any) => {
433
435
  if (labelInValue) {
434
- const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
436
+ const getFromat = (format, val) => format.map(({key,value})=> ({[key]:val[value]}))
437
+ 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))))
435
438
  onChange(selectMode ? formatResult : formatResult[0], value,source)
436
439
  } else {
437
440
  const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')
@@ -748,6 +748,7 @@ class RuleObjectComponent extends Component {
748
748
  <div
749
749
  className={'rule_line_content'}
750
750
  style={{ display: 'flex', marginBottom: '0px', padding: '10px 0px' }}
751
+ key={itemDetail.elementId}
751
752
  >
752
753
  <div
753
754
  className={'logical_operate_content'}