@bit-sun/business-component 2.2.0-alpha.31 → 2.2.0-alpha.33

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 (10) hide show
  1. package/dist/components/Business/JsonQueryTable/static.d.ts +1 -1
  2. package/dist/index.esm.js +29 -10
  3. package/dist/index.js +29 -10
  4. package/package.json +1 -1
  5. package/src/components/Business/JsonQueryTable/static.ts +1 -1
  6. package/src/components/Business/SearchSelect/BusinessUtils.ts +8 -6
  7. package/src/components/Business/SearchSelect/index.md +1 -1
  8. package/src/components/Business/moreTreeTable/index.tsx +2 -0
  9. package/src/components/Functional/AddSelect/index.tsx +8 -1
  10. package/src/components/Functional/BillEntry/index.tsx +7 -1
package/dist/components/Business/JsonQueryTable/static.d.ts CHANGED
@@ -30,7 +30,7 @@ export declare const choiceType: Readonly<{
30
30
  280: "库存组织选择器";
31
31
  310: "配送方式选择器";
32
32
  330: "变量";
33
- 340: "规则场景选择器";
33
+ 340: "规则模板选择器";
34
34
  350: "营销区域选择器";
35
35
  }>;
36
36
  export declare const inputType: any;
package/dist/index.esm.js CHANGED
@@ -10793,8 +10793,15 @@ var AddSelect = function AddSelect(props) {
10793
10793
  handleLoading(isContinue, true);
10794
10794
  onSaveCallback(popvalue).then(function (res) {
10795
10795
  {
10796
- var _document$getElementB3;
10797
- message.success('保存成功');
10796
+ var _Object$keys, _document$getElementB3;
10797
+ // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
10798
+ var initSuccessMessage = '保存成功';
10799
+ var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
10800
+ if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
10801
+ (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
10802
+ } else {
10803
+ message.success(initSuccessMessage);
10804
+ }
10798
10805
  deleteSelectRows();
10799
10806
  (_document$getElementB3 = document.getElementById('first-query')) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
10800
10807
  !isContinue && handleCancel();
@@ -12067,7 +12074,14 @@ var BillEntry = function BillEntry(_ref3) {
12067
12074
  setLoading(true);
12068
12075
  onSaveCallback(data).then(function (res) {
12069
12076
  {
12070
- message.success('保存成功');
12077
+ var _Object$keys;
12078
+ var initSuccessMessage = '保存成功';
12079
+ var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
12080
+ if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
12081
+ (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
12082
+ } else {
12083
+ message.success(initSuccessMessage);
12084
+ }
12071
12085
  }
12072
12086
  setLoading(false);
12073
12087
  }).catch(function (Error) {
@@ -13491,6 +13505,8 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
13491
13505
  mappingTextField: 'name',
13492
13506
  mappingValueField: 'code',
13493
13507
  otherParams: {
13508
+ 'qp-isMain-eq': 1,
13509
+ 'qp-status-eq': 1,
13494
13510
  sorter: 'desc-id'
13495
13511
  },
13496
13512
  sourceName: 'customCode'
@@ -14129,7 +14145,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
14129
14145
  }]
14130
14146
  }, modalTableBusProps);
14131
14147
  }
14132
- // 规则场景选择器
14148
+ // 规则模板选择器
14133
14149
  if (type === 'ruleTemplate') {
14134
14150
  requestConfig = _objectSpread2({
14135
14151
  url: "".concat(prefixUrl.selectPrefix, "/ruleTemplate"),
@@ -14144,19 +14160,19 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
14144
14160
  }, requestConfigProp);
14145
14161
  tableSearchForm = [{
14146
14162
  name: 'qp-name-like',
14147
- label: '规则场景名称'
14163
+ label: '规则模板名称'
14148
14164
  }, {
14149
14165
  name: 'qp-code-like',
14150
- label: '规则场景编码'
14166
+ label: '规则模板编码'
14151
14167
  }];
14152
14168
  modalTableProps = _objectSpread2({
14153
- modalTableTitle: '选择规则场景',
14169
+ modalTableTitle: '选择规则模板',
14154
14170
  tableSearchForm: tableSearchForm,
14155
14171
  tableColumns: [{
14156
- title: '规则场景编码',
14172
+ title: '规则模板编码',
14157
14173
  dataIndex: 'code'
14158
14174
  }, {
14159
- title: '规则场景名称',
14175
+ title: '规则模板名称',
14160
14176
  dataIndex: 'name',
14161
14177
  render: function render(text) {
14162
14178
  return handleTextOverflow(text);
@@ -22603,8 +22619,11 @@ var index$7 = /*#__PURE__*/forwardRef(function (props, ref) {
22603
22619
  }, /*#__PURE__*/React.createElement("tbody", null, config.colLastData.map(function (item, index) {
22604
22620
  var fixedTop = item.fixed ? "".concat(index * 40 + config.colHeaderToTop, "px") : 0;
22605
22621
  return /*#__PURE__*/React.createElement("tr", null, colTableData.map(function (record, index) {
22622
+ var _record$_rowConfig;
22623
+ var tdHidden = (record === null || record === void 0 ? void 0 : (_record$_rowConfig = record['_rowConfig']) === null || _record$_rowConfig === void 0 ? void 0 : _record$_rowConfig.hidden) ? 'none' : 'table-cell';
22606
22624
  return /*#__PURE__*/React.createElement("td", {
22607
22625
  style: {
22626
+ display: tdHidden,
22608
22627
  background: index % 2 === 1 || item.fixed ? '#f7f8fb' : '#fff',
22609
22628
  minWidth: '100px',
22610
22629
  width: "".concat(itemWidth, "px"),
@@ -29612,7 +29631,7 @@ var choiceType = Object.freeze({
29612
29631
  280: '库存组织选择器',
29613
29632
  310: '配送方式选择器',
29614
29633
  330: '变量',
29615
- 340: '规则场景选择器',
29634
+ 340: '规则模板选择器',
29616
29635
  350: '营销区域选择器'
29617
29636
  });
29618
29637
  var inputType = {
package/dist/index.js CHANGED
@@ -10811,8 +10811,15 @@ var AddSelect = function AddSelect(props) {
10811
10811
  handleLoading(isContinue, true);
10812
10812
  onSaveCallback(popvalue).then(function (res) {
10813
10813
  {
10814
- var _document$getElementB3;
10815
- antd.message.success('保存成功');
10814
+ var _Object$keys, _document$getElementB3;
10815
+ // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
10816
+ var initSuccessMessage = '保存成功';
10817
+ var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
10818
+ if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
10819
+ (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? antd.message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
10820
+ } else {
10821
+ antd.message.success(initSuccessMessage);
10822
+ }
10816
10823
  deleteSelectRows();
10817
10824
  (_document$getElementB3 = document.getElementById('first-query')) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
10818
10825
  !isContinue && handleCancel();
@@ -12085,7 +12092,14 @@ var BillEntry = function BillEntry(_ref3) {
12085
12092
  setLoading(true);
12086
12093
  onSaveCallback(data).then(function (res) {
12087
12094
  {
12088
- antd.message.success('保存成功');
12095
+ var _Object$keys;
12096
+ var initSuccessMessage = '保存成功';
12097
+ var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
12098
+ if (rmsbi && ((_Object$keys = Object.keys(rmsbi)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
12099
+ (rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.needThrowSuccess) ? antd.message.success((rmsbi === null || rmsbi === void 0 ? void 0 : rmsbi.successMessage) || initSuccessMessage) : null;
12100
+ } else {
12101
+ antd.message.success(initSuccessMessage);
12102
+ }
12089
12103
  }
12090
12104
  setLoading(false);
12091
12105
  }).catch(function (Error) {
@@ -13509,6 +13523,8 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
13509
13523
  mappingTextField: 'name',
13510
13524
  mappingValueField: 'code',
13511
13525
  otherParams: {
13526
+ 'qp-isMain-eq': 1,
13527
+ 'qp-status-eq': 1,
13512
13528
  sorter: 'desc-id'
13513
13529
  },
13514
13530
  sourceName: 'customCode'
@@ -14147,7 +14163,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
14147
14163
  }]
14148
14164
  }, modalTableBusProps);
14149
14165
  }
14150
- // 规则场景选择器
14166
+ // 规则模板选择器
14151
14167
  if (type === 'ruleTemplate') {
14152
14168
  requestConfig = _objectSpread2({
14153
14169
  url: "".concat(prefixUrl.selectPrefix, "/ruleTemplate"),
@@ -14162,19 +14178,19 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
14162
14178
  }, requestConfigProp);
14163
14179
  tableSearchForm = [{
14164
14180
  name: 'qp-name-like',
14165
- label: '规则场景名称'
14181
+ label: '规则模板名称'
14166
14182
  }, {
14167
14183
  name: 'qp-code-like',
14168
- label: '规则场景编码'
14184
+ label: '规则模板编码'
14169
14185
  }];
14170
14186
  modalTableProps = _objectSpread2({
14171
- modalTableTitle: '选择规则场景',
14187
+ modalTableTitle: '选择规则模板',
14172
14188
  tableSearchForm: tableSearchForm,
14173
14189
  tableColumns: [{
14174
- title: '规则场景编码',
14190
+ title: '规则模板编码',
14175
14191
  dataIndex: 'code'
14176
14192
  }, {
14177
- title: '规则场景名称',
14193
+ title: '规则模板名称',
14178
14194
  dataIndex: 'name',
14179
14195
  render: function render(text) {
14180
14196
  return handleTextOverflow(text);
@@ -22621,8 +22637,11 @@ var index$7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
22621
22637
  }, /*#__PURE__*/React__default['default'].createElement("tbody", null, config.colLastData.map(function (item, index) {
22622
22638
  var fixedTop = item.fixed ? "".concat(index * 40 + config.colHeaderToTop, "px") : 0;
22623
22639
  return /*#__PURE__*/React__default['default'].createElement("tr", null, colTableData.map(function (record, index) {
22640
+ var _record$_rowConfig;
22641
+ var tdHidden = (record === null || record === void 0 ? void 0 : (_record$_rowConfig = record['_rowConfig']) === null || _record$_rowConfig === void 0 ? void 0 : _record$_rowConfig.hidden) ? 'none' : 'table-cell';
22624
22642
  return /*#__PURE__*/React__default['default'].createElement("td", {
22625
22643
  style: {
22644
+ display: tdHidden,
22626
22645
  background: index % 2 === 1 || item.fixed ? '#f7f8fb' : '#fff',
22627
22646
  minWidth: '100px',
22628
22647
  width: "".concat(itemWidth, "px"),
@@ -29630,7 +29649,7 @@ var choiceType = Object.freeze({
29630
29649
  280: '库存组织选择器',
29631
29650
  310: '配送方式选择器',
29632
29651
  330: '变量',
29633
- 340: '规则场景选择器',
29652
+ 340: '规则模板选择器',
29634
29653
  350: '营销区域选择器'
29635
29654
  });
29636
29655
  var inputType = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bit-sun/business-component",
3
- "version": "2.2.0-alpha.31",
3
+ "version": "2.2.0-alpha.33",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
package/src/components/Business/JsonQueryTable/static.ts CHANGED
@@ -365,7 +365,7 @@ export const choiceType = Object.freeze({
365
365
 
366
366
  310: '配送方式选择器',
367
367
  330: '变量',
368
- 340: '规则场景选择器',
368
+ 340: '规则模板选择器',
369
369
  350: '营销区域选择器',
370
370
  });
371
371
  export const inputType:any ={
package/src/components/Business/SearchSelect/BusinessUtils.ts CHANGED
@@ -1088,6 +1088,8 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
1088
1088
  mappingTextField: 'name',
1089
1089
  mappingValueField: 'code',
1090
1090
  otherParams: {
1091
+ 'qp-isMain-eq': 1, // 员工权限过滤，若不需要不要加
1092
+ 'qp-status-eq': 1, // 1启用 0禁用
1091
1093
  sorter: 'desc-id'
1092
1094
  }, // 默认参数
1093
1095
  sourceName: 'customCode',
@@ -1675,7 +1677,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
1675
1677
  }
1676
1678
  }
1677
1679
 
1678
- // 规则场景选择器
1680
+ // 规则模板选择器
1679
1681
  if(type === 'ruleTemplate') {
1680
1682
  requestConfig = {
1681
1683
  url: `${prefixUrl.selectPrefix}/ruleTemplate`,
@@ -1690,19 +1692,19 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
1690
1692
  ...requestConfigProp
1691
1693
  }
1692
1694
  tableSearchForm = [
1693
- { name: 'qp-name-like', label: '规则场景名称' },
1694
- { name: 'qp-code-like', label: '规则场景编码' },
1695
+ { name: 'qp-name-like', label: '规则模板名称' },
1696
+ { name: 'qp-code-like', label: '规则模板编码' },
1695
1697
  ]
1696
1698
  modalTableProps = {
1697
- modalTableTitle: '选择规则场景',
1699
+ modalTableTitle: '选择规则模板',
1698
1700
  tableSearchForm,
1699
1701
  tableColumns: [
1700
1702
  {
1701
- title: '规则场景编码',
1703
+ title: '规则模板编码',
1702
1704
  dataIndex: 'code',
1703
1705
  },
1704
1706
  {
1705
- title: '规则场景名称',
1707
+ title: '规则模板名称',
1706
1708
  dataIndex: 'name',
1707
1709
  render: (text: any) => handleTextOverflow(text),
1708
1710
  },
package/src/components/Business/SearchSelect/index.md CHANGED
@@ -1259,7 +1259,7 @@ export default () => {
1259
1259
  More skills for writing demo: https://d.umijs.org/guide/demo-principle
1260
1260
 
1261
1261
 
1262
- ## 规则场景选择器 Select-GZCJ-001
1262
+ ## 规则模板选择器 Select-GZCJ-001
1263
1263
 
1264
1264
  ```tsx
1265
1265
  import React, { useState } from 'react';
package/src/components/Business/moreTreeTable/index.tsx CHANGED
@@ -292,9 +292,11 @@ export default forwardRef((props, ref) => {
292
292
  return (
293
293
  <tr>
294
294
  {colTableData.map((record, index) => {
295
+ let tdHidden = record?.['_rowConfig']?.hidden ? 'none' : 'table-cell'
295
296
  return (
296
297
  <td
297
298
  style={{
299
+ display: tdHidden,
298
300
  background: (index % 2 === 1) || item.fixed ? '#f7f8fb' : '#fff',
299
301
  minWidth: '100px',
300
302
  width: `${itemWidth}px`,
package/src/components/Functional/AddSelect/index.tsx CHANGED
@@ -808,7 +808,14 @@ const AddSelect = (props: any) => {
808
808
  handleLoading(isContinue,true)
809
809
  onSaveCallback(popvalue).then(res => {
810
810
  if(true) {
811
- message.success('保存成功')
811
+ // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
812
+ let initSuccessMessage = '保存成功'
813
+ const rmsbi = res?.messageSuccessBackInfo || {};
814
+ if(rmsbi && Object.keys(rmsbi)?.length){
815
+ rmsbi?.needThrowSuccess ? message.success(rmsbi?.successMessage || initSuccessMessage) : null
816
+ } else {
817
+ message.success(initSuccessMessage)
818
+ }
812
819
  deleteSelectRows();
813
820
  document.getElementById('first-query')?.focus()
814
821
  !isContinue && handleCancel();
package/src/components/Functional/BillEntry/index.tsx CHANGED
@@ -669,7 +669,13 @@ const BillEntry: React.FC = ({ onSaveCallback, validDataUrl="/items/sku/import/c
669
669
  setLoading(true)
670
670
  onSaveCallback(data).then(res => {
671
671
  if(true) {
672
- message.success('保存成功')
672
+ let initSuccessMessage = '保存成功'
673
+ const rmsbi = res?.messageSuccessBackInfo || {};
674
+ if(rmsbi && Object.keys(rmsbi)?.length){
675
+ rmsbi?.needThrowSuccess ? message.success(rmsbi?.successMessage || initSuccessMessage) : null
676
+ } else {
677
+ message.success(initSuccessMessage)
678
+ }
673
679
  }
674
680
  setLoading(false)
675
681
  }).catch(Error => {