@bit-sun/business-component 4.2.0-alpha.6.17 → 4.2.0-alpha.6.18-jw

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.
Files changed (6) hide show
  1. package/dist/index.esm.js +53 -37
  2. package/dist/index.js +53 -37
  3. package/package.json +1 -1
  4. package/src/components/Business/BsSulaQueryTable/index.tsx +10 -10
  5. package/src/components/Solution/RuleComponent/RenderCompItem.tsx +9 -1
  6. package/src/components/Solution/RuleComponent/ruleFiled.js +25 -1
package/dist/index.esm.js CHANGED
@@ -302,19 +302,17 @@ function _regeneratorDefine(e, r, n, t) {
302
302
  i = 0;
303
303
  }
304
304
  _regeneratorDefine = function (e, r, n, t) {
305
- if (r) i ? i(e, r, {
305
+ function o(r, n) {
306
+ _regeneratorDefine(e, r, function (e) {
307
+ return this._invoke(r, n, e);
308
+ });
309
+ }
310
+ r ? i ? i(e, r, {
306
311
  value: n,
307
312
  enumerable: !t,
308
313
  configurable: !t,
309
314
  writable: !t
310
- }) : e[r] = n;else {
311
- function o(r, n) {
312
- _regeneratorDefine(e, r, function (e) {
313
- return this._invoke(r, n, e);
314
- });
315
- }
316
- o("next", 0), o("throw", 1), o("return", 2);
317
- }
315
+ }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
318
316
  }, _regeneratorDefine(e, r, n, t);
319
317
  }
320
318
  function _setPrototypeOf(t, e) {
@@ -7538,7 +7536,7 @@ var AddSelect = function AddSelect(props) {
7538
7536
  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
7539
7537
  var result, _t;
7540
7538
  return _regenerator().w(function (_context) {
7541
- while (1) switch (_context.n) {
7539
+ while (1) switch (_context.p = _context.n) {
7542
7540
  case 0:
7543
7541
  if (!(bType == 'skc' && tList.some(function (i) {
7544
7542
  return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
@@ -7904,7 +7902,7 @@ var AddSelect = function AddSelect(props) {
7904
7902
  var _onChange = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(value) {
7905
7903
  var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules, _t2;
7906
7904
  return _regenerator().w(function (_context3) {
7907
- while (1) switch (_context3.n) {
7905
+ while (1) switch (_context3.p = _context3.n) {
7908
7906
  case 0:
7909
7907
  dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
7910
7908
  return d[selectKey] == value;
@@ -14810,7 +14808,7 @@ function getStorageVale(storageKeyString) {
14810
14808
  var _storageKeyString$spl = storageKeyString.split('.'),
14811
14809
  _storageKeyString$spl2 = _toArray(_storageKeyString$spl),
14812
14810
  localstorage = _storageKeyString$spl2[0],
14813
- restKeyArrays = _storageKeyString$spl2.slice(1);
14811
+ restKeyArrays = _arrayLikeToArray(_storageKeyString$spl2).slice(1);
14814
14812
  var localStorageInfo = window.localStorage.getItem(localstorage);
14815
14813
  if (!restKeyArrays.length) return localStorageInfo;
14816
14814
  var returnVal = JSON.parse(localStorageInfo || '{}');
@@ -19262,8 +19260,7 @@ var BsSulaQueryTable = (function (props) {
19262
19260
  setPagePath = _useState0[1];
19263
19261
  var _useLocation = useLocation(),
19264
19262
  pathname = _useLocation.pathname,
19265
- _useLocation$state = _useLocation.state,
19266
- state = _useLocation$state === void 0 ? {} : _useLocation$state;
19263
+ _useLocation$state = _useLocation.state;
19267
19264
  var _useState1 = useState(false),
19268
19265
  _useState10 = _slicedToArray(_useState1, 2),
19269
19266
  isFullScreen = _useState10[0],
@@ -19739,17 +19736,16 @@ var BsSulaQueryTable = (function (props) {
19739
19736
  isFullScreen: isFullScreen
19740
19737
  });
19741
19738
  useEffect(function () {
19742
- if (!localStorage.getItem('isTabChange') || (state === null || state === void 0 ? void 0 : state.updateCurrentPage)) {
19743
- if (pagePath === pathname) {
19744
- var _config$ref, _config$ref$current, _config$ref$current$t, _config$ref$current$t2;
19745
- // @ts-ignore
19746
- (_config$ref = config.ref) === null || _config$ref === void 0 ? void 0 : (_config$ref$current = _config$ref.current) === null || _config$ref$current === void 0 ? void 0 : (_config$ref$current$t = _config$ref$current.tableRef) === null || _config$ref$current$t === void 0 ? void 0 : (_config$ref$current$t2 = _config$ref$current$t.current) === null || _config$ref$current$t2 === void 0 ? void 0 : _config$ref$current$t2.refreshTable();
19747
- }
19748
- }
19749
- setTimeout(function () {
19750
- // 处理页面刷新两面
19751
- localStorage.removeItem('isTabChange');
19752
- }, 0);
19739
+ // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
19740
+ // if (pagePath === pathname) {
19741
+ // // @ts-ignore
19742
+ // config.ref?.current?.tableRef?.current?.refreshTable();
19743
+ // }
19744
+ // }
19745
+ // setTimeout(() => {
19746
+ // // 处理页面刷新两面
19747
+ // localStorage.removeItem('isTabChange');
19748
+ // }, 0);
19753
19749
  }, [pathname]);
19754
19750
  var expandedRowKeys = props === null || props === void 0 ? void 0 : (_props$expandable = props.expandable) === null || _props$expandable === void 0 ? void 0 : _props$expandable.expandedRowKeys;
19755
19751
  //todo summary属性已经被使用，为了兼容之前的，现在使用 summaryList
@@ -19917,7 +19913,7 @@ var matchPath = function matchPath(pathname) {
19917
19913
  if (!match) return null;
19918
19914
  var _match = _toArray(match),
19919
19915
  url = _match[0],
19920
- values = _match.slice(1);
19916
+ values = _arrayLikeToArray(_match).slice(1);
19921
19917
  var isExact = pathname === url;
19922
19918
  if (exact && !isExact) return null;
19923
19919
  return {
@@ -32597,7 +32593,7 @@ var JsonQueryTable = /*#__PURE__*/React$1.memo(function (props) {
32597
32593
  });
32598
32594
  Promise.all(axiosArr).then(function (_ref5) {
32599
32595
  var _ref6 = _toArray(_ref5),
32600
- resArr = _ref6.slice(0);
32596
+ resArr = _arrayLikeToArray(_ref6).slice(0);
32601
32597
  var configParams = {};
32602
32598
  detailTablesSetting.map(function (item, index) {
32603
32599
  var _resArr$index;
@@ -35995,7 +35991,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
35995
35991
  }
35996
35992
  }
35997
35993
  // 配送方式选择器
35998
- if (dataChoiceBusinessType == 310) {
35994
+ if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
35999
35995
  if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
36000
35996
  return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(BusinessSearchSelect$1, {
36001
35997
  selectBusinessType: "deliveryMode",
@@ -36009,9 +36005,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36009
36005
  disabled: disabled,
36010
36006
  labelInValue: true,
36011
36007
  value: values[0],
36012
- requestConfig: {
36008
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36009
+ otherParams: {
36010
+ // 配送方式只选择标准配送方式
36011
+ 'qp-recordChannnelCode-eq': 80
36012
+ }
36013
+ } : {}), {}, {
36013
36014
  filterInit: 'qp-code-in'
36014
- },
36015
+ }),
36015
36016
  onChange: function onChange(value) {
36016
36017
  if (dataInputBusinessType === 12) {
36017
36018
  values[0] = value.map(function (i) {
@@ -36041,9 +36042,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36041
36042
  disabled: disabled,
36042
36043
  labelInValue: true,
36043
36044
  value: values[1],
36044
- requestConfig: {
36045
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36046
+ otherParams: {
36047
+ // 配送方式只选择标准配送方式
36048
+ 'qp-recordChannnelCode-eq': 80
36049
+ }
36050
+ } : {}), {}, {
36045
36051
  filterInit: 'qp-code-in'
36046
- },
36052
+ }),
36047
36053
  onChange: function onChange(value) {
36048
36054
  if (dataInputBusinessType === 12) {
36049
36055
  values[1] = value.map(function (i) {
@@ -36087,9 +36093,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36087
36093
  disabled: disabled,
36088
36094
  labelInValue: true,
36089
36095
  value: _currentValue0,
36090
- requestConfig: {
36096
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36097
+ otherParams: {
36098
+ // 配送方式只选择标准配送方式
36099
+ 'qp-recordChannnelCode-eq': 80
36100
+ }
36101
+ } : {}), {}, {
36091
36102
  filterInit: 'qp-code-in'
36092
- },
36103
+ }),
36093
36104
  onChange: function onChange(value) {
36094
36105
  if (dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1) {
36095
36106
  values = value.map(function (i) {
@@ -37789,7 +37800,7 @@ function RenderCompItem(props) {
37789
37800
  getPopupContainer: function getPopupContainer() {
37790
37801
  return document.body;
37791
37802
  }
37792
- })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 && (/*#__PURE__*/React$1.createElement(BusinessSearchSelect$1, {
37803
+ })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && ((ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 || (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311) && (/*#__PURE__*/React$1.createElement(BusinessSearchSelect$1, {
37793
37804
  selectBusinessType: "deliveryMode",
37794
37805
  selectProps: _objectSpread2({
37795
37806
  style: styleCommon,
@@ -37801,9 +37812,14 @@ function RenderCompItem(props) {
37801
37812
  disabled: disabled,
37802
37813
  labelInValue: true,
37803
37814
  value: showValue(ites.code),
37804
- requestConfig: {
37815
+ requestConfig: _objectSpread2(_objectSpread2({}, (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311 ? {
37816
+ otherParams: {
37817
+ // 配送方式只选择标准配送方式
37818
+ 'qp-recordChannnelCode-eq': 80
37819
+ }
37820
+ } : {}), {}, {
37805
37821
  filterInit: 'qp-code-in'
37806
- },
37822
+ }),
37807
37823
  onChange: function onChange(value) {
37808
37824
  handleEdit(ites.code, value);
37809
37825
  },
package/dist/index.js CHANGED
@@ -325,19 +325,17 @@ function _regeneratorDefine(e, r, n, t) {
325
325
  i = 0;
326
326
  }
327
327
  _regeneratorDefine = function (e, r, n, t) {
328
- if (r) i ? i(e, r, {
328
+ function o(r, n) {
329
+ _regeneratorDefine(e, r, function (e) {
330
+ return this._invoke(r, n, e);
331
+ });
332
+ }
333
+ r ? i ? i(e, r, {
329
334
  value: n,
330
335
  enumerable: !t,
331
336
  configurable: !t,
332
337
  writable: !t
333
- }) : e[r] = n;else {
334
- function o(r, n) {
335
- _regeneratorDefine(e, r, function (e) {
336
- return this._invoke(r, n, e);
337
- });
338
- }
339
- o("next", 0), o("throw", 1), o("return", 2);
340
- }
338
+ }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
341
339
  }, _regeneratorDefine(e, r, n, t);
342
340
  }
343
341
  function _setPrototypeOf(t, e) {
@@ -7561,7 +7559,7 @@ var AddSelect = function AddSelect(props) {
7561
7559
  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
7562
7560
  var result, _t;
7563
7561
  return _regenerator().w(function (_context) {
7564
- while (1) switch (_context.n) {
7562
+ while (1) switch (_context.p = _context.n) {
7565
7563
  case 0:
7566
7564
  if (!(bType == 'skc' && tList.some(function (i) {
7567
7565
  return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
@@ -7927,7 +7925,7 @@ var AddSelect = function AddSelect(props) {
7927
7925
  var _onChange = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(value) {
7928
7926
  var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules, _t2;
7929
7927
  return _regenerator().w(function (_context3) {
7930
- while (1) switch (_context3.n) {
7928
+ while (1) switch (_context3.p = _context3.n) {
7931
7929
  case 0:
7932
7930
  dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
7933
7931
  return d[selectKey] == value;
@@ -14833,7 +14831,7 @@ function getStorageVale(storageKeyString) {
14833
14831
  var _storageKeyString$spl = storageKeyString.split('.'),
14834
14832
  _storageKeyString$spl2 = _toArray(_storageKeyString$spl),
14835
14833
  localstorage = _storageKeyString$spl2[0],
14836
- restKeyArrays = _storageKeyString$spl2.slice(1);
14834
+ restKeyArrays = _arrayLikeToArray(_storageKeyString$spl2).slice(1);
14837
14835
  var localStorageInfo = window.localStorage.getItem(localstorage);
14838
14836
  if (!restKeyArrays.length) return localStorageInfo;
14839
14837
  var returnVal = JSON.parse(localStorageInfo || '{}');
@@ -19285,8 +19283,7 @@ var BsSulaQueryTable = (function (props) {
19285
19283
  setPagePath = _useState0[1];
19286
19284
  var _useLocation = umi.useLocation(),
19287
19285
  pathname = _useLocation.pathname,
19288
- _useLocation$state = _useLocation.state,
19289
- state = _useLocation$state === void 0 ? {} : _useLocation$state;
19286
+ _useLocation$state = _useLocation.state;
19290
19287
  var _useState1 = React$1.useState(false),
19291
19288
  _useState10 = _slicedToArray(_useState1, 2),
19292
19289
  isFullScreen = _useState10[0],
@@ -19762,17 +19759,16 @@ var BsSulaQueryTable = (function (props) {
19762
19759
  isFullScreen: isFullScreen
19763
19760
  });
19764
19761
  React$1.useEffect(function () {
19765
- if (!localStorage.getItem('isTabChange') || (state === null || state === void 0 ? void 0 : state.updateCurrentPage)) {
19766
- if (pagePath === pathname) {
19767
- var _config$ref, _config$ref$current, _config$ref$current$t, _config$ref$current$t2;
19768
- // @ts-ignore
19769
- (_config$ref = config.ref) === null || _config$ref === void 0 ? void 0 : (_config$ref$current = _config$ref.current) === null || _config$ref$current === void 0 ? void 0 : (_config$ref$current$t = _config$ref$current.tableRef) === null || _config$ref$current$t === void 0 ? void 0 : (_config$ref$current$t2 = _config$ref$current$t.current) === null || _config$ref$current$t2 === void 0 ? void 0 : _config$ref$current$t2.refreshTable();
19770
- }
19771
- }
19772
- setTimeout(function () {
19773
- // 处理页面刷新两面
19774
- localStorage.removeItem('isTabChange');
19775
- }, 0);
19762
+ // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
19763
+ // if (pagePath === pathname) {
19764
+ // // @ts-ignore
19765
+ // config.ref?.current?.tableRef?.current?.refreshTable();
19766
+ // }
19767
+ // }
19768
+ // setTimeout(() => {
19769
+ // // 处理页面刷新两面
19770
+ // localStorage.removeItem('isTabChange');
19771
+ // }, 0);
19776
19772
  }, [pathname]);
19777
19773
  var expandedRowKeys = props === null || props === void 0 ? void 0 : (_props$expandable = props.expandable) === null || _props$expandable === void 0 ? void 0 : _props$expandable.expandedRowKeys;
19778
19774
  //todo summary属性已经被使用，为了兼容之前的，现在使用 summaryList
@@ -19940,7 +19936,7 @@ var matchPath = function matchPath(pathname) {
19940
19936
  if (!match) return null;
19941
19937
  var _match = _toArray(match),
19942
19938
  url = _match[0],
19943
- values = _match.slice(1);
19939
+ values = _arrayLikeToArray(_match).slice(1);
19944
19940
  var isExact = pathname === url;
19945
19941
  if (exact && !isExact) return null;
19946
19942
  return {
@@ -32620,7 +32616,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
32620
32616
  });
32621
32617
  Promise.all(axiosArr).then(function (_ref5) {
32622
32618
  var _ref6 = _toArray(_ref5),
32623
- resArr = _ref6.slice(0);
32619
+ resArr = _arrayLikeToArray(_ref6).slice(0);
32624
32620
  var configParams = {};
32625
32621
  detailTablesSetting.map(function (item, index) {
32626
32622
  var _resArr$index;
@@ -36018,7 +36014,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
36018
36014
  }
36019
36015
  }
36020
36016
  // 配送方式选择器
36021
- if (dataChoiceBusinessType == 310) {
36017
+ if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
36022
36018
  if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
36023
36019
  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
36024
36020
  selectBusinessType: "deliveryMode",
@@ -36032,9 +36028,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36032
36028
  disabled: disabled,
36033
36029
  labelInValue: true,
36034
36030
  value: values[0],
36035
- requestConfig: {
36031
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36032
+ otherParams: {
36033
+ // 配送方式只选择标准配送方式
36034
+ 'qp-recordChannnelCode-eq': 80
36035
+ }
36036
+ } : {}), {}, {
36036
36037
  filterInit: 'qp-code-in'
36037
- },
36038
+ }),
36038
36039
  onChange: function onChange(value) {
36039
36040
  if (dataInputBusinessType === 12) {
36040
36041
  values[0] = value.map(function (i) {
@@ -36064,9 +36065,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36064
36065
  disabled: disabled,
36065
36066
  labelInValue: true,
36066
36067
  value: values[1],
36067
- requestConfig: {
36068
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36069
+ otherParams: {
36070
+ // 配送方式只选择标准配送方式
36071
+ 'qp-recordChannnelCode-eq': 80
36072
+ }
36073
+ } : {}), {}, {
36068
36074
  filterInit: 'qp-code-in'
36069
- },
36075
+ }),
36070
36076
  onChange: function onChange(value) {
36071
36077
  if (dataInputBusinessType === 12) {
36072
36078
  values[1] = value.map(function (i) {
@@ -36110,9 +36116,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
36110
36116
  disabled: disabled,
36111
36117
  labelInValue: true,
36112
36118
  value: _currentValue0,
36113
- requestConfig: {
36119
+ requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
36120
+ otherParams: {
36121
+ // 配送方式只选择标准配送方式
36122
+ 'qp-recordChannnelCode-eq': 80
36123
+ }
36124
+ } : {}), {}, {
36114
36125
  filterInit: 'qp-code-in'
36115
- },
36126
+ }),
36116
36127
  onChange: function onChange(value) {
36117
36128
  if (dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1) {
36118
36129
  values = value.map(function (i) {
@@ -37812,7 +37823,7 @@ function RenderCompItem(props) {
37812
37823
  getPopupContainer: function getPopupContainer() {
37813
37824
  return document.body;
37814
37825
  }
37815
- })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 && (/*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
37826
+ })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && ((ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 || (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311) && (/*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
37816
37827
  selectBusinessType: "deliveryMode",
37817
37828
  selectProps: _objectSpread2({
37818
37829
  style: styleCommon,
@@ -37824,9 +37835,14 @@ function RenderCompItem(props) {
37824
37835
  disabled: disabled,
37825
37836
  labelInValue: true,
37826
37837
  value: showValue(ites.code),
37827
- requestConfig: {
37838
+ requestConfig: _objectSpread2(_objectSpread2({}, (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311 ? {
37839
+ otherParams: {
37840
+ // 配送方式只选择标准配送方式
37841
+ 'qp-recordChannnelCode-eq': 80
37842
+ }
37843
+ } : {}), {}, {
37828
37844
  filterInit: 'qp-code-in'
37829
- },
37845
+ }),
37830
37846
  onChange: function onChange(value) {
37831
37847
  handleEdit(ites.code, value);
37832
37848
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "4.2.0-alpha.6.17",
3
+ "version": "4.2.0-alpha.6.18-jw",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
package/src/components/Business/BsSulaQueryTable/index.tsx CHANGED
@@ -852,16 +852,16 @@ export default (props: any) => {
852
852
  };
853
853
 
854
854
  useEffect(() => {
855
- if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
856
- if (pagePath === pathname) {
857
- // @ts-ignore
858
- config.ref?.current?.tableRef?.current?.refreshTable();
859
- }
860
- }
861
- setTimeout(() => {
862
- // 处理页面刷新两面
863
- localStorage.removeItem('isTabChange');
864
- }, 0);
855
+ // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
856
+ // if (pagePath === pathname) {
857
+ // // @ts-ignore
858
+ // config.ref?.current?.tableRef?.current?.refreshTable();
859
+ // }
860
+ // }
861
+ // setTimeout(() => {
862
+ // // 处理页面刷新两面
863
+ // localStorage.removeItem('isTabChange');
864
+ // }, 0);
865
865
  }, [pathname]);
866
866
 
867
867
  const expandedRowKeys = props?.expandable?.expandedRowKeys;
package/src/components/Solution/RuleComponent/RenderCompItem.tsx CHANGED
@@ -589,7 +589,7 @@ export default function RenderCompItem(props:any){
589
589
  null}
590
590
  {/* 单选/多选 配送方式选择器 */}
591
591
  {((ites?.inputType === 20 || ites?.inputType === 30) &&
592
- ites?.choiceType === 310 && (
592
+ (ites?.choiceType === 310 || ites?.choiceType === 311)&& (
593
593
  <BusinessSearchSelect
594
594
  selectBusinessType="deliveryMode"
595
595
  selectProps={{
@@ -606,6 +606,14 @@ export default function RenderCompItem(props:any){
606
606
  labelInValue={true}
607
607
  value={showValue(ites.code)}
608
608
  requestConfig={{
609
+ ...(ites?.choiceType === 311
610
+ ? {
611
+ otherParams: {
612
+ // 配送方式只选择标准配送方式
613
+ 'qp-recordChannnelCode-eq': 80,
614
+ },
615
+ }
616
+ : {}),
609
617
  filterInit: 'qp-code-in',
610
618
  }}
611
619
  onChange={(value) => {
package/src/components/Solution/RuleComponent/ruleFiled.js CHANGED
@@ -1932,7 +1932,7 @@ export default class RuleField extends Component {
1932
1932
  }
1933
1933
  }
1934
1934
  // 配送方式选择器
1935
- if (dataChoiceBusinessType == 310) {
1935
+ if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
1936
1936
  if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
1937
1937
  return (
1938
1938
  <>
@@ -1952,6 +1952,14 @@ export default class RuleField extends Component {
1952
1952
  labelInValue={true}
1953
1953
  value={values[0]}
1954
1954
  requestConfig={{
1955
+ ...(dataChoiceBusinessType === 311
1956
+ ? {
1957
+ otherParams: {
1958
+ // 配送方式只选择标准配送方式
1959
+ 'qp-recordChannnelCode-eq': 80,
1960
+ },
1961
+ }
1962
+ : {}),
1955
1963
  filterInit: 'qp-code-in',
1956
1964
  }}
1957
1965
  onChange={(value) => {
@@ -1983,6 +1991,14 @@ export default class RuleField extends Component {
1983
1991
  labelInValue={true}
1984
1992
  value={values[1]}
1985
1993
  requestConfig={{
1994
+ ...(dataChoiceBusinessType === 311
1995
+ ? {
1996
+ otherParams: {
1997
+ // 配送方式只选择标准配送方式
1998
+ 'qp-recordChannnelCode-eq': 80,
1999
+ },
2000
+ }
2001
+ : {}),
1986
2002
  filterInit: 'qp-code-in',
1987
2003
  }}
1988
2004
  onChange={(value) => {
@@ -2020,6 +2036,14 @@ export default class RuleField extends Component {
2020
2036
  labelInValue={true}
2021
2037
  value={currentValue}
2022
2038
  requestConfig={{
2039
+ ...(dataChoiceBusinessType === 311
2040
+ ? {
2041
+ otherParams: {
2042
+ // 配送方式只选择标准配送方式
2043
+ 'qp-recordChannnelCode-eq': 80,
2044
+ },
2045
+ }
2046
+ : {}),
2023
2047
  filterInit: 'qp-code-in',
2024
2048
  }}
2025
2049
  onChange={(value) => {