@kmkf-fe-packages/basic-components 2.0.54-beta.5 → 2.0.54-beta.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
|
@@ -12591,9 +12591,7 @@ var useGetColumns = (function (type) {
|
|
|
12591
12591
|
loading = _useState4[0],
|
|
12592
12592
|
setLoading = _useState4[1];
|
|
12593
12593
|
var showColumnsDataIndexList = useMemo(function () {
|
|
12594
|
-
return columns.
|
|
12595
|
-
return Object.hasOwn(item, 'dataIndex');
|
|
12596
|
-
}).map(function (item) {
|
|
12594
|
+
return columns.map(function (item) {
|
|
12597
12595
|
return item.dataIndex;
|
|
12598
12596
|
});
|
|
12599
12597
|
}, [columns]);
|
|
@@ -15934,6 +15932,7 @@ var GoodsModalMap = {
|
|
|
15934
15932
|
BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
|
|
15935
15933
|
GY_GOODS: GyGoodsModal$2,
|
|
15936
15934
|
GY_REISSUE_GOODS: GyGoodsModal$2,
|
|
15935
|
+
GY_RETURN_GOODS: GyGoodsModal$2,
|
|
15937
15936
|
JST_GOODS: JstGoodsModal,
|
|
15938
15937
|
JST_REISSUE_GOODS: JstGoodsModal,
|
|
15939
15938
|
JST_RETURN_GOODS: JstGoodsModal,
|
|
@@ -16006,7 +16005,7 @@ var getButtonText = function getButtonText() {
|
|
|
16006
16005
|
if (['WDT_REISSUE_GOODS'].includes(type)) {
|
|
16007
16006
|
return '选择旺店通商品';
|
|
16008
16007
|
}
|
|
16009
|
-
if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
|
|
16008
|
+
if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
|
|
16010
16009
|
return '选择管易ERP商品';
|
|
16011
16010
|
}
|
|
16012
16011
|
if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
|
|
@@ -16309,7 +16308,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
16309
16308
|
canUpdateNumber: canUpdateNumber
|
|
16310
16309
|
});
|
|
16311
16310
|
});
|
|
16312
|
-
} else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
|
|
16311
|
+
} else if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
|
|
16313
16312
|
newList = list.map(function (item) {
|
|
16314
16313
|
var goodName = item.goodName,
|
|
16315
16314
|
goodShortName = item.goodShortName,
|
|
@@ -19872,7 +19871,7 @@ var typeMap$4 = {
|
|
|
19872
19871
|
}
|
|
19873
19872
|
};
|
|
19874
19873
|
var GyReissue = function GyReissue(props) {
|
|
19875
|
-
var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
|
|
19874
|
+
var _typeMap$type28, _typeMap$type29, _typeMap$type30, _systemOrder$orders, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
|
|
19876
19875
|
var value = props.value,
|
|
19877
19876
|
onChange = props.onChange,
|
|
19878
19877
|
_props$reasonList = props.reasonList,
|
|
@@ -20044,10 +20043,9 @@ var GyReissue = function GyReissue(props) {
|
|
|
20044
20043
|
pushGyLog('afterSelectedGoodsChange', newValue);
|
|
20045
20044
|
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
|
|
20046
20045
|
//系统单选择后展示选择商品按钮，系统单未选择的时候不展示
|
|
20047
|
-
var
|
|
20048
|
-
|
|
20049
|
-
|
|
20050
|
-
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
|
|
20046
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder];
|
|
20047
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]);
|
|
20048
|
+
var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
|
|
20051
20049
|
return /*#__PURE__*/React.createElement("div", {
|
|
20052
20050
|
id: "TEST_GY",
|
|
20053
20051
|
onClick: function onClick() {
|
|
@@ -20107,6 +20105,8 @@ var GyReissue = function GyReissue(props) {
|
|
|
20107
20105
|
disabled: disabled,
|
|
20108
20106
|
canUpdateNumber: showChangeBtn,
|
|
20109
20107
|
showChangeBtn: showChangeBtn,
|
|
20108
|
+
showErpGoodsBtn: showErpGoodsBtn,
|
|
20109
|
+
alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
|
|
20110
20110
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
20111
20111
|
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
|
|
20112
20112
|
onChange: function onChange(val) {
|
|
@@ -20145,7 +20145,7 @@ var typeMap$5 = {
|
|
|
20145
20145
|
}
|
|
20146
20146
|
};
|
|
20147
20147
|
var GyReturnGoods = function GyReturnGoods(props) {
|
|
20148
|
-
var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
|
|
20148
|
+
var _typeMap$type10, _typeMap$type27, _systemOrder$orders, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
|
|
20149
20149
|
var value = props.value,
|
|
20150
20150
|
onChange = props.onChange,
|
|
20151
20151
|
_props$reasonList = props.reasonList,
|
|
@@ -20338,10 +20338,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
|
|
|
20338
20338
|
}))));
|
|
20339
20339
|
};
|
|
20340
20340
|
//系统单选择后展示选择商品按钮，系统单未选择的时候不展示
|
|
20341
|
-
var
|
|
20342
|
-
|
|
20343
|
-
|
|
20344
|
-
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
|
|
20341
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder];
|
|
20342
|
+
var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
|
|
20343
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]);
|
|
20345
20344
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
|
|
20346
20345
|
gutter: 8,
|
|
20347
20346
|
wrap: true
|
|
@@ -20403,7 +20402,8 @@ var GyReturnGoods = function GyReturnGoods(props) {
|
|
|
20403
20402
|
},
|
|
20404
20403
|
onModeChange: handleModeChange,
|
|
20405
20404
|
isStrict: isStrict,
|
|
20406
|
-
showErpGoodsBtn:
|
|
20405
|
+
showErpGoodsBtn: showErpGoodsBtn,
|
|
20406
|
+
alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
|
|
20407
20407
|
tradeGoods: {
|
|
20408
20408
|
originDataSource: getGoodDetails({
|
|
20409
20409
|
mode: isStrict
|
package/dist/index.js
CHANGED
|
@@ -12603,9 +12603,7 @@ var useGetColumns = (function (type) {
|
|
|
12603
12603
|
loading = _useState4[0],
|
|
12604
12604
|
setLoading = _useState4[1];
|
|
12605
12605
|
var showColumnsDataIndexList = React.useMemo(function () {
|
|
12606
|
-
return columns.
|
|
12607
|
-
return Object.hasOwn(item, 'dataIndex');
|
|
12608
|
-
}).map(function (item) {
|
|
12606
|
+
return columns.map(function (item) {
|
|
12609
12607
|
return item.dataIndex;
|
|
12610
12608
|
});
|
|
12611
12609
|
}, [columns]);
|
|
@@ -15946,6 +15944,7 @@ var GoodsModalMap = {
|
|
|
15946
15944
|
BS_E3_EXCHANGE_GOODS: BsE3GoodsModal,
|
|
15947
15945
|
GY_GOODS: GyGoodsModal$2,
|
|
15948
15946
|
GY_REISSUE_GOODS: GyGoodsModal$2,
|
|
15947
|
+
GY_RETURN_GOODS: GyGoodsModal$2,
|
|
15949
15948
|
JST_GOODS: JstGoodsModal,
|
|
15950
15949
|
JST_REISSUE_GOODS: JstGoodsModal,
|
|
15951
15950
|
JST_RETURN_GOODS: JstGoodsModal,
|
|
@@ -16018,7 +16017,7 @@ var getButtonText = function getButtonText() {
|
|
|
16018
16017
|
if (['WDT_REISSUE_GOODS'].includes(type)) {
|
|
16019
16018
|
return '选择旺店通商品';
|
|
16020
16019
|
}
|
|
16021
|
-
if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
|
|
16020
|
+
if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
|
|
16022
16021
|
return '选择管易ERP商品';
|
|
16023
16022
|
}
|
|
16024
16023
|
if (['JST_GOODS', 'JST_REISSUE_GOODS', 'JST_RETURN_GOODS', 'JST_EXCHANGE_GOODS'].includes(type)) {
|
|
@@ -16321,7 +16320,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
16321
16320
|
canUpdateNumber: canUpdateNumber
|
|
16322
16321
|
});
|
|
16323
16322
|
});
|
|
16324
|
-
} else if (['GY_GOODS', 'GY_REISSUE_GOODS'].includes(type)) {
|
|
16323
|
+
} else if (['GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS'].includes(type)) {
|
|
16325
16324
|
newList = list.map(function (item) {
|
|
16326
16325
|
var goodName = item.goodName,
|
|
16327
16326
|
goodShortName = item.goodShortName,
|
|
@@ -19884,7 +19883,7 @@ var typeMap$4 = {
|
|
|
19884
19883
|
}
|
|
19885
19884
|
};
|
|
19886
19885
|
var GyReissue = function GyReissue(props) {
|
|
19887
|
-
var _typeMap$type28, _typeMap$type30, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
|
|
19886
|
+
var _typeMap$type28, _typeMap$type29, _typeMap$type30, _systemOrder$orders, _typeMap$type31, _value$typeMap$type$s5, _typeMap$type32, _typeMap$type33, _typeMap$type34;
|
|
19888
19887
|
var value = props.value,
|
|
19889
19888
|
onChange = props.onChange,
|
|
19890
19889
|
_props$reasonList = props.reasonList,
|
|
@@ -20056,10 +20055,9 @@ var GyReissue = function GyReissue(props) {
|
|
|
20056
20055
|
kmkfUtils.pushGyLog('afterSelectedGoodsChange', newValue);
|
|
20057
20056
|
}, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type28 = typeMap$4[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.key)], isStrict]);
|
|
20058
20057
|
//系统单选择后展示选择商品按钮，系统单未选择的时候不展示
|
|
20059
|
-
var
|
|
20060
|
-
|
|
20061
|
-
|
|
20062
|
-
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]]);
|
|
20058
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type29 = typeMap$4[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.systemOrder];
|
|
20059
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type30 = typeMap$4[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.systemOrderNo]);
|
|
20060
|
+
var showErpGoodsBtn = showChangeBtn || type === 'GY_REISSUE_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
|
|
20063
20061
|
return /*#__PURE__*/React__default['default'].createElement("div", {
|
|
20064
20062
|
id: "TEST_GY",
|
|
20065
20063
|
onClick: function onClick() {
|
|
@@ -20119,6 +20117,8 @@ var GyReissue = function GyReissue(props) {
|
|
|
20119
20117
|
disabled: disabled,
|
|
20120
20118
|
canUpdateNumber: showChangeBtn,
|
|
20121
20119
|
showChangeBtn: showChangeBtn,
|
|
20120
|
+
showErpGoodsBtn: showErpGoodsBtn,
|
|
20121
|
+
alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
|
|
20122
20122
|
shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
|
|
20123
20123
|
value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$4 === null || typeMap$4 === void 0 ? void 0 : (_typeMap$type34 = typeMap$4[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)],
|
|
20124
20124
|
onChange: function onChange(val) {
|
|
@@ -20157,7 +20157,7 @@ var typeMap$5 = {
|
|
|
20157
20157
|
}
|
|
20158
20158
|
};
|
|
20159
20159
|
var GyReturnGoods = function GyReturnGoods(props) {
|
|
20160
|
-
var _typeMap$type10, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
|
|
20160
|
+
var _typeMap$type10, _typeMap$type27, _systemOrder$orders, _typeMap$type28, _typeMap$type29, _value$typeMap$type$s5, _typeMap$type30, _typeMap$type31, _typeMap$type32;
|
|
20161
20161
|
var value = props.value,
|
|
20162
20162
|
onChange = props.onChange,
|
|
20163
20163
|
_props$reasonList = props.reasonList,
|
|
@@ -20350,10 +20350,9 @@ var GyReturnGoods = function GyReturnGoods(props) {
|
|
|
20350
20350
|
}))));
|
|
20351
20351
|
};
|
|
20352
20352
|
//系统单选择后展示选择商品按钮，系统单未选择的时候不展示
|
|
20353
|
-
var
|
|
20354
|
-
|
|
20355
|
-
|
|
20356
|
-
}, [value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]]);
|
|
20353
|
+
var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type27 = typeMap$5[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrder];
|
|
20354
|
+
var showErpGoodsBtn = type === 'GY_RETURN_GOODS' && systemOrder && systemOrder.orderNo && !((_systemOrder$orders = systemOrder.orders) === null || _systemOrder$orders === void 0 ? void 0 : _systemOrder$orders.length);
|
|
20355
|
+
var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type28 = typeMap$5[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderNo]);
|
|
20357
20356
|
return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Row, {
|
|
20358
20357
|
gutter: 8,
|
|
20359
20358
|
wrap: true
|
|
@@ -20415,7 +20414,8 @@ var GyReturnGoods = function GyReturnGoods(props) {
|
|
|
20415
20414
|
},
|
|
20416
20415
|
onModeChange: handleModeChange,
|
|
20417
20416
|
isStrict: isStrict,
|
|
20418
|
-
showErpGoodsBtn:
|
|
20417
|
+
showErpGoodsBtn: showErpGoodsBtn,
|
|
20418
|
+
alwaysShowChooseErpGoodsBtn: showErpGoodsBtn,
|
|
20419
20419
|
tradeGoods: {
|
|
20420
20420
|
originDataSource: getGoodDetails({
|
|
20421
20421
|
mode: isStrict
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import type {
|
|
2
|
+
import type { ColumnType } from 'antd/es/table';
|
|
3
3
|
type ColumnItemType = {
|
|
4
4
|
dataIndex: string;
|
|
5
5
|
title: string;
|
|
@@ -7,5 +7,5 @@ type ColumnItemType = {
|
|
|
7
7
|
width?: number;
|
|
8
8
|
show?: boolean;
|
|
9
9
|
};
|
|
10
|
-
declare const _default: (type: string) => [
|
|
10
|
+
declare const _default: (type: string) => [ColumnType<ColumnItemType>[], string[], boolean];
|
|
11
11
|
export default _default;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.0.54-beta.
|
|
3
|
+
"version": "2.0.54-beta.9",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"homepage": "",
|
|
6
6
|
"license": "ISC",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.9",
|
|
24
24
|
"ahooks": "^3.7.4",
|
|
25
25
|
"bignumber.js": "^9.1.2",
|
|
26
26
|
"kmkf-monitor": "^0.8.9",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"publishConfig": {
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "17f78623bc60797fa9cc0c20ab87c7cd78854703"
|
|
69
69
|
}
|