@kmkf-fe-packages/basic-components 2.10.18 → 2.10.20
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 +124 -34
- package/dist/src/business/Remark/YouzanStar.d.ts +9 -0
- package/dist/src/business/Remark/index.d.ts +4 -1
- package/dist/src/constants/columnsBaseInfoMap.d.ts +3 -0
- package/dist/src/index.d.ts +2 -1
- package/dist/src/jst/Goods/index.d.ts +1 -1
- package/package.json +3 -3
package/dist/index.esm.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
|
|
|
3
3
|
import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
|
|
4
4
|
import request, { extend as extend$1 } from 'umi-request';
|
|
5
5
|
import { CopyToClipboard } from 'react-copy-to-clipboard';
|
|
6
|
-
import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
|
|
6
|
+
import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, normalizeYouzanStar, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, DxdSuppliersData, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, updateDxdGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
|
|
7
7
|
import every from 'lodash/every';
|
|
8
8
|
import maxBy from 'lodash/maxBy';
|
|
9
9
|
import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
|
|
@@ -10469,6 +10469,7 @@ var SubForm = function SubForm(props) {
|
|
|
10469
10469
|
maxCount = props.maxCount;
|
|
10470
10470
|
var ref = useRef(null);
|
|
10471
10471
|
var isRequest = useRef(false);
|
|
10472
|
+
var cursorIdRef = useRef(null);
|
|
10472
10473
|
var _useState = useState(false),
|
|
10473
10474
|
_useState2 = _slicedToArray(_useState, 2),
|
|
10474
10475
|
open = _useState2[0],
|
|
@@ -10712,6 +10713,7 @@ var SubForm = function SubForm(props) {
|
|
|
10712
10713
|
};
|
|
10713
10714
|
var getWorkOrderList = /*#__PURE__*/function () {
|
|
10714
10715
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
10716
|
+
var _cursorIdRef$current;
|
|
10715
10717
|
var _ref2,
|
|
10716
10718
|
_ref2$pageNo,
|
|
10717
10719
|
pageNo,
|
|
@@ -10719,9 +10721,12 @@ var SubForm = function SubForm(props) {
|
|
|
10719
10721
|
componentList,
|
|
10720
10722
|
params,
|
|
10721
10723
|
queryComponents,
|
|
10724
|
+
cursorParams,
|
|
10725
|
+
queryKey,
|
|
10722
10726
|
res,
|
|
10723
10727
|
data,
|
|
10724
10728
|
success,
|
|
10729
|
+
_cursorIdRef$current2,
|
|
10725
10730
|
transDataSourceItem,
|
|
10726
10731
|
headerKeys,
|
|
10727
10732
|
newList,
|
|
@@ -10744,6 +10749,8 @@ var SubForm = function SubForm(props) {
|
|
|
10744
10749
|
templateKey: workOrderTemplateId,
|
|
10745
10750
|
needReturnRepeatValue: true,
|
|
10746
10751
|
needFilterShopByPermission: needFilterShopByPermission,
|
|
10752
|
+
needTotal: false,
|
|
10753
|
+
useNext: true,
|
|
10747
10754
|
queryComponents: [{
|
|
10748
10755
|
key: 'flowStatus',
|
|
10749
10756
|
symbol: 'in',
|
|
@@ -10756,30 +10763,45 @@ var SubForm = function SubForm(props) {
|
|
|
10756
10763
|
symbol: 'in',
|
|
10757
10764
|
value: flowStatus
|
|
10758
10765
|
}];
|
|
10759
|
-
|
|
10760
|
-
|
|
10761
|
-
|
|
10762
|
-
|
|
10763
|
-
|
|
10764
|
-
|
|
10766
|
+
queryComponents.push({
|
|
10767
|
+
key: selectKey,
|
|
10768
|
+
symbol: 'in',
|
|
10769
|
+
value: [inputValue]
|
|
10770
|
+
});
|
|
10771
|
+
params.queryComponents = queryComponents;
|
|
10772
|
+
}
|
|
10773
|
+
params.queryComponents = params.queryComponents.filter(function (item) {
|
|
10774
|
+
var _item$value;
|
|
10775
|
+
if (item.key === 'flowStatus' && ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.length) === 4) {
|
|
10776
|
+
return false;
|
|
10765
10777
|
} else {
|
|
10766
|
-
|
|
10767
|
-
key: selectKey,
|
|
10768
|
-
symbol: 'in',
|
|
10769
|
-
value: [inputValue]
|
|
10770
|
-
});
|
|
10778
|
+
return true;
|
|
10771
10779
|
}
|
|
10772
|
-
|
|
10780
|
+
});
|
|
10781
|
+
cursorParams = _objectSpread2({}, params);
|
|
10782
|
+
delete cursorParams.pageNo;
|
|
10783
|
+
queryKey = JSON.stringify(cursorParams);
|
|
10784
|
+
if (((_cursorIdRef$current = cursorIdRef.current) === null || _cursorIdRef$current === void 0 ? void 0 : _cursorIdRef$current.queryKey) === queryKey) {
|
|
10785
|
+
if (cursorIdRef.current.cursorId) {
|
|
10786
|
+
params.cursorId = cursorIdRef.current.cursorId;
|
|
10787
|
+
}
|
|
10788
|
+
} else {
|
|
10789
|
+
cursorIdRef.current = {
|
|
10790
|
+
queryKey: queryKey
|
|
10791
|
+
};
|
|
10773
10792
|
}
|
|
10774
|
-
_context.next =
|
|
10775
|
-
return extendRequest('/qy/view/
|
|
10793
|
+
_context.next = 12;
|
|
10794
|
+
return extendRequest('/qy/view/workOrderListCached', {
|
|
10776
10795
|
method: 'post',
|
|
10777
10796
|
data: params
|
|
10778
10797
|
});
|
|
10779
|
-
case
|
|
10798
|
+
case 12:
|
|
10780
10799
|
res = _context.sent;
|
|
10781
10800
|
data = res.data, success = res.success;
|
|
10782
10801
|
if (success) {
|
|
10802
|
+
if ((data === null || data === void 0 ? void 0 : data.cursorId) && ((_cursorIdRef$current2 = cursorIdRef.current) === null || _cursorIdRef$current2 === void 0 ? void 0 : _cursorIdRef$current2.queryKey) === queryKey) {
|
|
10803
|
+
cursorIdRef.current.cursorId = data.cursorId;
|
|
10804
|
+
}
|
|
10783
10805
|
transDataSourceItem = transformWorkOrderData(componentDtoList.length ? componentDtoList : componentList, 'edit');
|
|
10784
10806
|
headerKeys = correlationList.map(function (t) {
|
|
10785
10807
|
return t.key;
|
|
@@ -10805,7 +10827,7 @@ var SubForm = function SubForm(props) {
|
|
|
10805
10827
|
setHasMore((data === null || data === void 0 ? void 0 : data.list.length) === pageSize);
|
|
10806
10828
|
isRequest.current = false;
|
|
10807
10829
|
}
|
|
10808
|
-
case
|
|
10830
|
+
case 15:
|
|
10809
10831
|
case "end":
|
|
10810
10832
|
return _context.stop();
|
|
10811
10833
|
}
|
|
@@ -11193,6 +11215,39 @@ function ApaasAddress(props) {
|
|
|
11193
11215
|
}));
|
|
11194
11216
|
}
|
|
11195
11217
|
|
|
11218
|
+
var YouzanStar = function YouzanStar(_ref) {
|
|
11219
|
+
var disabled = _ref.disabled,
|
|
11220
|
+
compact = _ref.compact,
|
|
11221
|
+
value = _ref.value,
|
|
11222
|
+
_onChange = _ref.onChange;
|
|
11223
|
+
var star = normalizeYouzanStar(value);
|
|
11224
|
+
if (compact) {
|
|
11225
|
+
return star ? /*#__PURE__*/React.createElement("span", {
|
|
11226
|
+
style: {
|
|
11227
|
+
display: 'inline-flex',
|
|
11228
|
+
alignItems: 'center',
|
|
11229
|
+
gap: 4,
|
|
11230
|
+
color: '#f8da14'
|
|
11231
|
+
}
|
|
11232
|
+
}, /*#__PURE__*/React.createElement("span", null, star), /*#__PURE__*/React.createElement(Rate$1, {
|
|
11233
|
+
count: 1,
|
|
11234
|
+
disabled: true,
|
|
11235
|
+
value: 1,
|
|
11236
|
+
style: {
|
|
11237
|
+
color: '#f8da14'
|
|
11238
|
+
}
|
|
11239
|
+
})) : null;
|
|
11240
|
+
}
|
|
11241
|
+
return /*#__PURE__*/React.createElement(Rate$1, {
|
|
11242
|
+
allowClear: !disabled,
|
|
11243
|
+
disabled: disabled,
|
|
11244
|
+
value: star || 0,
|
|
11245
|
+
onChange: function onChange(nextValue) {
|
|
11246
|
+
return _onChange === null || _onChange === void 0 ? void 0 : _onChange(normalizeYouzanStar(nextValue));
|
|
11247
|
+
}
|
|
11248
|
+
});
|
|
11249
|
+
};
|
|
11250
|
+
|
|
11196
11251
|
var trade0 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1MEQ1MkIyMjIzQUIxMUU0QjU5NjkwNDQxQkU4N0E1MiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1MEQ1MkIyMzIzQUIxMUU0QjU5NjkwNDQxQkU4N0E1MiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjUwRDUyQjIwMjNBQjExRTRCNTk2OTA0NDFCRTg3QTUyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjUwRDUyQjIxMjNBQjExRTRCNTk2OTA0NDFCRTg3QTUyIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+PFEh+QAAAPhJREFUeNqM0MFKAkEcx/FZNcwSihBBT3oRog4RBHnqoiA+SuAL7J73Fbz7Ah5DOiw5QcdOQUhECoL1BBpC0/eP/0URUf/wYWaH+c3Ofzzf97+NMR1kcY85BuiqLxSRD8PQppgk0MC7WdQBLpWPsWzGC+qy+QEVfMBpKB7lwBKOcBUEwZkEnnCoJ/+YZbkVUjncSOBZF8sr11qvOHQngRHecK3NSnkbSDWT1tq/KIrOtfFIr9aGxRRpnGhgmNLJI1qYyW95vt/4LjR6yiAHZvDqOedkscDHpzwdm2tmS0kPhk0TSeOWcG5nQKuHY1T3DfR1vNgW+BdgACxMP/P+iLA3AAAAAElFTkSuQmCC";
|
|
11197
11252
|
|
|
11198
11253
|
var trade1 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpFQ0NGNkNCNjIzQUExMUU0OTZDM0UxQUI1MEVCOUU2RSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpFQ0NGNkNCNzIzQUExMUU0OTZDM0UxQUI1MEVCOUU2RSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkVDQ0Y2Q0I0MjNBQTExRTQ5NkMzRTFBQjUwRUI5RTZFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkVDQ0Y2Q0I1MjNBQTExRTQ5NkMzRTFBQjUwRUI5RTZFIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+WQ64bQAAAPVJREFUeNqM0M9KQkEUx/GZwUDNhYQItjKCQNyEEOSqVZtewHcQfIE2Posv0FIiWvQHLDeuBBEXUgTX3LmxRHH6njgXrnC5eODDzFzmNzPn2jdrZ8aYDnJoYo0x7tQUxyhebrcvlsCcRYARGma3NviSzegRuHZMujjDBF43hmMKZWRx/u7ckQSekMYBviOn+wipAi4k8KofT/RZcRWGriTwgSFq2qyUjSF142hko886xQJ93KKt/X1GbvpJ6eQBLfzKtRyyCnfQaJ6hggwGxntv+LUlLPEo6yTSg+HE4D/NlBMLJqFcZH6PQ9T3DTzrWE0K/AkwAPKxWrUjgeKsAAAAAElFTkSuQmCC";
|
|
@@ -11209,6 +11264,7 @@ var TextArea$2 = Input.TextArea;
|
|
|
11209
11264
|
var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
|
|
11210
11265
|
var RemarkInput = function RemarkInput(props) {
|
|
11211
11266
|
var isShowFlag = props.isShowFlag,
|
|
11267
|
+
isYouzan = props.isYouzan,
|
|
11212
11268
|
value = props.value,
|
|
11213
11269
|
onChange = props.onChange,
|
|
11214
11270
|
disabled = props.disabled;
|
|
@@ -11225,6 +11281,11 @@ var RemarkInput = function RemarkInput(props) {
|
|
|
11225
11281
|
});
|
|
11226
11282
|
onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
|
|
11227
11283
|
};
|
|
11284
|
+
var changeStar = function changeStar(star) {
|
|
11285
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
|
|
11286
|
+
flag: star
|
|
11287
|
+
}));
|
|
11288
|
+
};
|
|
11228
11289
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TextArea$2, {
|
|
11229
11290
|
disabled: disabled,
|
|
11230
11291
|
rows: 4,
|
|
@@ -11232,7 +11293,19 @@ var RemarkInput = function RemarkInput(props) {
|
|
|
11232
11293
|
placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8",
|
|
11233
11294
|
key: "remark",
|
|
11234
11295
|
onChange: changeRemark
|
|
11235
|
-
}), isShowFlag && /*#__PURE__*/React.createElement(
|
|
11296
|
+
}), isShowFlag && isYouzan && /*#__PURE__*/React.createElement("div", {
|
|
11297
|
+
style: {
|
|
11298
|
+
marginTop: '12px'
|
|
11299
|
+
}
|
|
11300
|
+
}, /*#__PURE__*/React.createElement("span", {
|
|
11301
|
+
style: {
|
|
11302
|
+
marginRight: '8px'
|
|
11303
|
+
}
|
|
11304
|
+
}, "\u661F\u6807\uFF1A"), /*#__PURE__*/React.createElement(YouzanStar, {
|
|
11305
|
+
disabled: disabled,
|
|
11306
|
+
value: value === null || value === void 0 ? void 0 : value.flag,
|
|
11307
|
+
onChange: changeStar
|
|
11308
|
+
})), isShowFlag && !isYouzan && /*#__PURE__*/React.createElement(Radio.Group, {
|
|
11236
11309
|
style: {
|
|
11237
11310
|
marginTop: '12px'
|
|
11238
11311
|
},
|
|
@@ -14391,7 +14464,6 @@ var jstGoods = function jstGoods(props) {
|
|
|
14391
14464
|
showField = _props$showField === void 0 ? '' : _props$showField,
|
|
14392
14465
|
_props$platformType = props.platformType,
|
|
14393
14466
|
platformType = _props$platformType === void 0 ? 'default' : _props$platformType,
|
|
14394
|
-
onlyShowFieldSelect = props.onlyShowFieldSelect,
|
|
14395
14467
|
logisticsCompanyFormType = props.logisticsCompanyFormType,
|
|
14396
14468
|
form = props.form;
|
|
14397
14469
|
var _useState = useState(0),
|
|
@@ -14453,12 +14525,10 @@ var jstGoods = function jstGoods(props) {
|
|
|
14453
14525
|
}), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, t.title), /*#__PURE__*/React.createElement("div", null, "\u7F16\u7801\uFF1A", t.skuId))));
|
|
14454
14526
|
}));
|
|
14455
14527
|
};
|
|
14456
|
-
var handleSelected = function handleSelected(val, type, option
|
|
14528
|
+
var handleSelected = function handleSelected(val, type, option) {
|
|
14457
14529
|
var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
|
|
14458
14530
|
changeOrderInfo[type] = val;
|
|
14459
|
-
|
|
14460
|
-
changeOrderInfo['sendId'] = option.value;
|
|
14461
|
-
}
|
|
14531
|
+
changeOrderInfo['sendId'] = option.value;
|
|
14462
14532
|
if (isSelectName && type === 'sendName') {
|
|
14463
14533
|
if (isSendGoodSavedId) {
|
|
14464
14534
|
// 如果发货仓名称存的是id,将名称存入快照
|
|
@@ -14473,12 +14543,10 @@ var jstGoods = function jstGoods(props) {
|
|
|
14473
14543
|
newList[changeIndex] = changeOrderInfo;
|
|
14474
14544
|
onChange === null || onChange === void 0 ? void 0 : onChange(newList);
|
|
14475
14545
|
};
|
|
14476
|
-
var handleSelectedReturn = function handleSelectedReturn(val, type, option
|
|
14546
|
+
var handleSelectedReturn = function handleSelectedReturn(val, type, option) {
|
|
14477
14547
|
var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
|
|
14478
14548
|
changeOrderInfo[type] = val;
|
|
14479
|
-
|
|
14480
|
-
changeOrderInfo['returnWarehouseId'] = option.value;
|
|
14481
|
-
}
|
|
14549
|
+
changeOrderInfo['returnWarehouseId'] = option.value;
|
|
14482
14550
|
if (isSelectName && type === 'returnWarehouseName') {
|
|
14483
14551
|
// 如果发货仓名称存的是name,将id存入快照,同时把id替换成名称
|
|
14484
14552
|
changeOrderInfo['sendSnapshotId'] = option.value;
|
|
@@ -14585,7 +14653,7 @@ var jstGoods = function jstGoods(props) {
|
|
|
14585
14653
|
filterOption: filterOption,
|
|
14586
14654
|
value: ((_value$changeIndex10 = value[changeIndex]) === null || _value$changeIndex10 === void 0 ? void 0 : _value$changeIndex10.sendSnapshotId) || ((_value$changeIndex11 = value[changeIndex]) === null || _value$changeIndex11 === void 0 ? void 0 : _value$changeIndex11.sendName) || null,
|
|
14587
14655
|
onChange: function onChange(value, option) {
|
|
14588
|
-
return handleSelected(value, 'sendName', option
|
|
14656
|
+
return handleSelected(value, 'sendName', option);
|
|
14589
14657
|
}
|
|
14590
14658
|
}) : /*#__PURE__*/React.createElement(Input, {
|
|
14591
14659
|
disabled: disabled,
|
|
@@ -14620,7 +14688,7 @@ var jstGoods = function jstGoods(props) {
|
|
|
14620
14688
|
filterOption: filterOption,
|
|
14621
14689
|
value: ((_value$changeIndex15 = value[changeIndex]) === null || _value$changeIndex15 === void 0 ? void 0 : _value$changeIndex15.sendSnapshotId) || ((_value$changeIndex16 = value[changeIndex]) === null || _value$changeIndex16 === void 0 ? void 0 : _value$changeIndex16.returnWarehouseName) || null,
|
|
14622
14690
|
onChange: function onChange(value, option) {
|
|
14623
|
-
return handleSelectedReturn(value, 'returnWarehouseName', option
|
|
14691
|
+
return handleSelectedReturn(value, 'returnWarehouseName', option);
|
|
14624
14692
|
}
|
|
14625
14693
|
}) : /*#__PURE__*/React.createElement(Input, {
|
|
14626
14694
|
disabled: disabled,
|
|
@@ -23088,6 +23156,7 @@ var getColumns$5 = function getColumns() {
|
|
|
23088
23156
|
}, {
|
|
23089
23157
|
dataIndex: 'qty',
|
|
23090
23158
|
title: "\u7533\u8BF7\u6570\u91CF",
|
|
23159
|
+
conditionTitle: "\u7533\u8BF7\u603B\u6570\u91CF",
|
|
23091
23160
|
width: 150,
|
|
23092
23161
|
align: 'center',
|
|
23093
23162
|
ellipsis: true,
|
|
@@ -25135,6 +25204,18 @@ var getColumns$b = function getColumns(_ref) {
|
|
|
25135
25204
|
};
|
|
25136
25205
|
};
|
|
25137
25206
|
|
|
25207
|
+
var MIN_COLUMN_WIDTH = 80;
|
|
25208
|
+
var MAX_COLUMN_WIDTH = 600;
|
|
25209
|
+
var resolveColumnWidth = function resolveColumnWidth(width, defaultWidth) {
|
|
25210
|
+
if (width === undefined || width === null || width === '') {
|
|
25211
|
+
return defaultWidth;
|
|
25212
|
+
}
|
|
25213
|
+
var parsedWidth = Number(width);
|
|
25214
|
+
if (!isFinite(parsedWidth)) {
|
|
25215
|
+
return defaultWidth;
|
|
25216
|
+
}
|
|
25217
|
+
return Math.min(MAX_COLUMN_WIDTH, Math.max(MIN_COLUMN_WIDTH, Math.round(parsedWidth)));
|
|
25218
|
+
};
|
|
25138
25219
|
var getColumnsMap$1 = function getColumnsMap(args) {
|
|
25139
25220
|
var _ref = args || {},
|
|
25140
25221
|
_ref$text = _ref.text,
|
|
@@ -25228,11 +25309,13 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
|
|
|
25228
25309
|
var newColumns = {};
|
|
25229
25310
|
Object.keys(clone_columnsMap).forEach(function (key) {
|
|
25230
25311
|
newColumns[key] = clone_columnsMap[key].map(function (col) {
|
|
25231
|
-
return {
|
|
25312
|
+
return _objectSpread2({
|
|
25232
25313
|
title: col.title,
|
|
25233
25314
|
dataIndex: col.dataIndex,
|
|
25234
25315
|
disabled: !!col.validator
|
|
25235
|
-
}
|
|
25316
|
+
}, key === 'KM_REISSUE_GOODS' ? {
|
|
25317
|
+
width: col.width
|
|
25318
|
+
} : {});
|
|
25236
25319
|
});
|
|
25237
25320
|
});
|
|
25238
25321
|
return newColumns;
|
|
@@ -26253,7 +26336,9 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
26253
26336
|
});
|
|
26254
26337
|
// 如果列应该显示(show不为false)或者有验证器,则返回对应的列配置
|
|
26255
26338
|
if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
|
|
26256
|
-
return currentCol
|
|
26339
|
+
return _objectSpread2(_objectSpread2({}, currentCol), {}, {
|
|
26340
|
+
width: resolveColumnWidth(col.width, currentCol.width)
|
|
26341
|
+
});
|
|
26257
26342
|
}
|
|
26258
26343
|
return undefined;
|
|
26259
26344
|
}).filter(Boolean);
|
|
@@ -26324,6 +26409,11 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
26324
26409
|
}
|
|
26325
26410
|
}].concat(_toConsumableArray(list));
|
|
26326
26411
|
}, [showHeader, value, disabled, hoveredRowIndex]);
|
|
26412
|
+
var tableScrollX = useMemo(function () {
|
|
26413
|
+
return newColumns.reduce(function (total, column) {
|
|
26414
|
+
return total + (Number(column.width) || 0);
|
|
26415
|
+
}, 0);
|
|
26416
|
+
}, [newColumns]);
|
|
26327
26417
|
var onSubmit = function onSubmit(list) {
|
|
26328
26418
|
var newList = processGoods$1({
|
|
26329
26419
|
list: list,
|
|
@@ -26403,7 +26493,7 @@ var GoodItem$1 = function GoodItem(props) {
|
|
|
26403
26493
|
size: "small",
|
|
26404
26494
|
pagination: false,
|
|
26405
26495
|
scroll: {
|
|
26406
|
-
x:
|
|
26496
|
+
x: tableScrollX
|
|
26407
26497
|
},
|
|
26408
26498
|
locale: {
|
|
26409
26499
|
emptyText: '暂无数据'
|
|
@@ -33390,4 +33480,4 @@ var FIELD_COLUMNS_MAP = {
|
|
|
33390
33480
|
PLATFORM_AFTER_SALES_ORDER: PLATFORM_AFTER_SALES_ORDER_CONFIG.columns
|
|
33391
33481
|
};
|
|
33392
33482
|
|
|
33393
|
-
export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$a as getDxdColumns, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap };
|
|
33483
|
+
export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasImage, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, FIELD_COLUMNS_MAP, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MAX_COLUMN_WIDTH, MIN_COLUMN_WIDTH, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, YouzanStar, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$a as getDxdColumns, getColumns$4 as getGyColumns, getColumns$9 as getJkyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap, renderSplitMap, resolveColumnWidth };
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
export interface YouzanStarProps {
|
|
3
|
+
disabled?: boolean;
|
|
4
|
+
compact?: boolean;
|
|
5
|
+
value?: number | string;
|
|
6
|
+
onChange?: (value?: number) => void;
|
|
7
|
+
}
|
|
8
|
+
declare const YouzanStar: ({ disabled, compact, value, onChange }: YouzanStarProps) => React.JSX.Element | null;
|
|
9
|
+
export default YouzanStar;
|
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import YouzanStar from './YouzanStar';
|
|
2
3
|
interface ValueType {
|
|
3
4
|
remark?: string;
|
|
4
|
-
flag?: number;
|
|
5
|
+
flag?: number | string;
|
|
5
6
|
}
|
|
6
7
|
interface RemarkType {
|
|
7
8
|
isShowFlag: boolean;
|
|
9
|
+
isYouzan?: boolean;
|
|
8
10
|
disabled?: boolean;
|
|
9
11
|
value: ValueType;
|
|
10
12
|
onChange: (value: ValueType) => void;
|
|
11
13
|
}
|
|
12
14
|
declare const RemarkInput: (props: Partial<RemarkType>) => React.JSX.Element;
|
|
15
|
+
export { YouzanStar };
|
|
13
16
|
export default RemarkInput;
|
|
@@ -9,6 +9,9 @@ type ColumnsItemType = {
|
|
|
9
9
|
};
|
|
10
10
|
type ColumnsMapType = Record<string, ColumnsItemType[]>;
|
|
11
11
|
export type GetColumnsBaseInfoMapFnType = (...args: any[]) => ColumnsMapType;
|
|
12
|
+
export declare const MIN_COLUMN_WIDTH = 80;
|
|
13
|
+
export declare const MAX_COLUMN_WIDTH = 600;
|
|
14
|
+
export declare const resolveColumnWidth: (width: unknown, defaultWidth?: number) => number | undefined;
|
|
12
15
|
export declare const getColumnsMap: GetColumnsBaseInfoMapFnType;
|
|
13
16
|
export declare const erpColumnsMap: ColumnsMapType;
|
|
14
17
|
export declare const erpFormValidator: (_rule: any, value: any, type: string, extraParams?: Record<string, any>) => any;
|
package/dist/src/index.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export { default as TradeId } from './business/TradeId';
|
|
|
25
25
|
export { default as ShopName } from './business/ShopName';
|
|
26
26
|
export { default as Address } from './business/Address';
|
|
27
27
|
export { default as Remark } from './business/Remark';
|
|
28
|
+
export { YouzanStar } from './business/Remark';
|
|
28
29
|
export { default as ExpressLogistics } from './business/ExpressLogistics';
|
|
29
30
|
export { default as ReturnLogistics } from './business/ExpressLogistics';
|
|
30
31
|
export { default as AliPay } from './business/AliPay';
|
|
@@ -73,6 +74,6 @@ export { default as KmVideo } from './km/KmVideo';
|
|
|
73
74
|
export { default as OrderSubFormUtils } from './apaas/OrderSubForm/utils';
|
|
74
75
|
export { default as SkxIdInputSelect } from './skx/IdInputSelect';
|
|
75
76
|
export { default as SkxGoods } from './skx/Goods';
|
|
76
|
-
export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
|
|
77
|
+
export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, MAX_COLUMN_WIDTH, MIN_COLUMN_WIDTH, resolveColumnWidth, } from './constants/columnsBaseInfoMap';
|
|
77
78
|
export { default as SYSTEM_ORDER_COLUMNS_MAP, FIELD_COLUMNS_MAP } from './constants/systemOrderColumnsMap';
|
|
78
79
|
export { default as erpModalColumnsMap } from './bs/component/model/Columns';
|
|
@@ -10,7 +10,7 @@ interface JstGoodsProps {
|
|
|
10
10
|
onBlur?: (val: any) => void;
|
|
11
11
|
showField: string;
|
|
12
12
|
platformType?: string;
|
|
13
|
-
onlyShowFieldSelect
|
|
13
|
+
onlyShowFieldSelect?: boolean;
|
|
14
14
|
expressDateInstance: InstanceType<typeof ExpressData>;
|
|
15
15
|
logisticsCompanyFormType?: string;
|
|
16
16
|
form?: FormInstance;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/basic-components",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.20",
|
|
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.10.
|
|
23
|
+
"@kmkf-fe-packages/kmkf-utils": "2.10.20",
|
|
24
24
|
"ahooks": "^3.7.4",
|
|
25
25
|
"ali-react-table": "2.6.1",
|
|
26
26
|
"bignumber.js": "^9.1.2",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "35e842426da4373ec5caafc58e77a9f54be77bc0"
|
|
70
70
|
}
|