@kmkf-fe-packages/services-components 2.2.44-beta.7 → 2.2.44-beta.71
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/esm/Hooks/useColumnsConfig.d.ts +1 -1
- package/dist/esm/commonComponents/GlobalContext/index.js +52 -19
- package/dist/esm/commonComponents/GlobalContext/orderQuery/useGetErpAddressData.js +11 -10
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.d.ts +2 -1
- package/dist/esm/commonComponents/QueryLogisticsTrack/index.js +4 -2
- package/dist/esm/components/BS/BsSystemOrder/index.d.ts +8 -0
- package/dist/esm/components/BS/BsSystemOrder/index.js +43 -8
- package/dist/esm/components/Cascader/index.d.ts +8 -6
- package/dist/esm/components/Cascader/index.js +26 -22
- package/dist/esm/components/Common/index.d.ts +1 -1
- package/dist/esm/components/Common/index.js +3 -2
- package/dist/esm/components/CommonHeaderGood/index.js +14 -2
- package/dist/esm/components/CommonMultiStatus/index.js +73 -36
- package/dist/esm/components/LogisticsMoreInterception/index.js +1 -0
- package/dist/esm/components/Payment/index.d.ts +13 -12
- package/dist/esm/components/Payment/index.js +31 -11
- package/dist/esm/components/PicturePro/index.d.ts +9 -0
- package/dist/esm/components/PicturePro/index.js +17 -0
- package/dist/esm/components/PostIng/index.d.ts +1 -1
- package/dist/esm/components/Public/Goods/index.d.ts +9 -0
- package/dist/esm/components/Public/Goods/index.js +23 -2
- package/dist/esm/components/ReceiverAddress/index.d.ts +7 -6
- package/dist/esm/components/ReceiverAddress/index.js +41 -27
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +1 -0
- package/package.json +4 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import LogisticsInterception from "../components/LogisticsInterception";
|
|
2
2
|
import LogisticsMoreInterception from "../components/LogisticsMoreInterception";
|
|
3
|
-
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/
|
|
3
|
+
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/ActualPayment").default | import("../components/Address").default | import("../components/AfterSalesOrderId").default | import("../components/Alipay").default | import("../components/BS/BsExchange").default | import("../components/BS/BsGoods").default | import("../components/BS/BsLogistics").default | import("../components/BS/BsPosting").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/BS/BsSystemOrder").default | import("../components/BsE3/BsGoods").default | import("../components/BsE3/BsReissueE3").default | import("../components/BuyerNick").default | import("../components/Calculation").default | import("../components/Cascader").default | import("../components/Checkbox").default | import("../components/CommonDataTime").default | import("../components/CommonInput").default | import("../components/CommonMultiStatus").default | import("../components/CommonSystemOrder").default | import("../components/CompletedUser").default | import("../components/DataTime").default | import("../components/EItemEnCode").default | import("../components/EItemId").default | import("../components/EItemSelect").default | import("../components/Input").default | import("../components/TypeInput").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/PicturePro").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/SubForm").default | import("../components/TradeId").default | import("../components/ShopName").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/ReceiverAddress").default | import("../components/TradeDateTime").default | import("../components/Logistics").default | import("../components/ReturnLogistics").default | import("../components/Remark").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Payment").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSendGood").default | import("../components/JST/JstSupply").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/Exchange").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | LogisticsMoreInterception | import("../components/LogisticsTrajectory").default | import("../components/LogisticsMoreTrajectory").default | import("../components/PlatForm").default | import("../components/ShopInput").default | import("../components/Submitter").default | import("../components/PrevSubmitter").default | import("../components/FlowCreator").default | import("../components/Handler").default | import("../components/FlowWorkOrderId").default | import("../components/StatusSelect").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").default | import("../components/MsgStatus").default | import("../components/WDT/WdtGoods").default | import("../components/WDT/WdtRessuie").default | import("../components/WDT/WdtReturn").default | import("../components/WDT/WdtExchange").default | import("../components/WDT/WdtShopSelect").default | import("../components/KM/KmVideo").default | import("../components/PaymentVoucherCode").default | import("../components/Label").default | import("../components/MemberLevel").default | import("../components/GY/GyGoods").default | import("../components/GY/GyReissue").default | import("../components/GY/GyReturn").default | import("../components/Public/AsyncSelect").default | import("../components/SKX/SkxIdInputSelect").default | import("../components/SKX/SkxGoods").default | import("../components/OrderSubForm").default | import("../components/FlowOverallStatusSelect").default;
|
|
4
4
|
export declare const useColumnsConfig: ({ queryWorkOrderDetail, flatTemplateList, shopList, sortState, onChangeSort, handleReset, handleSubmit, handleChangeSingleWorkOrderMark, userList, tbAppKey, isShare, openSingleColumnsFilter, openSingleColumnsSort, }: {
|
|
5
5
|
queryWorkOrderDetail?: ((p: any) => void) | undefined;
|
|
6
6
|
flatTemplateList?: any;
|
|
@@ -26,6 +26,7 @@ import useGetRequest from "./orderQuery/useGetRequest";
|
|
|
26
26
|
* 尽量不要直接使用redux,飞鸽项目redux并不会读取最近的store数据,使用redux会有问题,暂时使用从外部传入redux数据的方式
|
|
27
27
|
* **/
|
|
28
28
|
var Global = function Global(_ref) {
|
|
29
|
+
var _userInfo$quotaInfo, _userInfo$quotaInfo2, _userInfo$quotaInfo3, _userInfo$quotaInfo4;
|
|
29
30
|
var children = _ref.children,
|
|
30
31
|
_ref$requestList = _ref.requestList,
|
|
31
32
|
requestList = _ref$requestList === void 0 ? [] : _ref$requestList,
|
|
@@ -42,20 +43,25 @@ var Global = function Global(_ref) {
|
|
|
42
43
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
43
44
|
loading = _useState4[0],
|
|
44
45
|
setLoading = _useState4[1];
|
|
46
|
+
var _useState5 = useState({}),
|
|
47
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
48
|
+
userInfo = _useState6[0],
|
|
49
|
+
setUserInfo = _useState6[1];
|
|
45
50
|
var reduxDataMap = useMemo(function () {
|
|
46
51
|
return reduxData;
|
|
47
52
|
}, [JSON.stringify(reduxData)]);
|
|
48
53
|
useEffect(function () {
|
|
49
54
|
try {
|
|
50
55
|
var _reduxData$main, _reduxData$workOrder, _reduxData$global;
|
|
51
|
-
var
|
|
52
|
-
var companyUserConfig = cloneDeep(
|
|
56
|
+
var _userInfo = (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) || (reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) || {};
|
|
57
|
+
var companyUserConfig = cloneDeep(_userInfo.companyUserConfig);
|
|
53
58
|
if (companyUserConfig && typeof companyUserConfig === "string") {
|
|
54
|
-
|
|
59
|
+
_userInfo = _objectSpread(_objectSpread({}, _userInfo), {}, {
|
|
55
60
|
companyUserConfig: JSON.parse(companyUserConfig)
|
|
56
61
|
});
|
|
57
62
|
}
|
|
58
|
-
|
|
63
|
+
setUserInfo(_userInfo);
|
|
64
|
+
localStorage.setItem("reduxData_userInfo", JSON.stringify(_userInfo));
|
|
59
65
|
} catch (e) {
|
|
60
66
|
console.error(e);
|
|
61
67
|
}
|
|
@@ -211,20 +217,47 @@ var Global = function Global(_ref) {
|
|
|
211
217
|
}
|
|
212
218
|
});
|
|
213
219
|
}
|
|
214
|
-
if (allState === "failed") {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
220
|
+
// if (allState === "failed") {
|
|
221
|
+
// return (
|
|
222
|
+
// <>
|
|
223
|
+
// <Alert
|
|
224
|
+
// message="数据加载异常,可能影响部分组件使用"
|
|
225
|
+
// type="warning"
|
|
226
|
+
// action={
|
|
227
|
+
// <Space>
|
|
228
|
+
// <Button
|
|
229
|
+
// loading={loading}
|
|
230
|
+
// type="primary"
|
|
231
|
+
// key="console"
|
|
232
|
+
// onClick={reloadData}
|
|
233
|
+
// size="small"
|
|
234
|
+
// >
|
|
235
|
+
// 刷新重试
|
|
236
|
+
// </Button>
|
|
237
|
+
// </Space>
|
|
238
|
+
// }
|
|
239
|
+
// closable
|
|
240
|
+
// />
|
|
241
|
+
// {children}
|
|
242
|
+
// </>
|
|
243
|
+
// );
|
|
244
|
+
// }
|
|
245
|
+
|
|
246
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, allState === "failed" && /*#__PURE__*/React.createElement(Alert, {
|
|
247
|
+
message: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u53EF\u80FD\u5F71\u54CD\u90E8\u5206\u7EC4\u4EF6\u4F7F\u7528",
|
|
248
|
+
type: "warning",
|
|
249
|
+
action: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
|
|
250
|
+
loading: loading,
|
|
251
|
+
type: "primary",
|
|
252
|
+
key: "console",
|
|
253
|
+
onClick: reloadData,
|
|
254
|
+
size: "small"
|
|
255
|
+
}, "\u5237\u65B0\u91CD\u8BD5")),
|
|
256
|
+
closable: true
|
|
257
|
+
}), (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo = userInfo.quotaInfo) === null || _userInfo$quotaInfo === void 0 ? void 0 : _userInfo$quotaInfo.workOrderRemainDays) > 0 && (userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo2 = userInfo.quotaInfo) === null || _userInfo$quotaInfo2 === void 0 ? void 0 : _userInfo$quotaInfo2.workOrderRemainDays) < 15 && /*#__PURE__*/React.createElement(Alert, {
|
|
258
|
+
message: "\u5DE5\u5355\u6761\u6570\u5373\u5C06\u6D88\u8017\u5B8C\uFF0C\u5269\u4F59\u5DE5\u5355\u6761\u6570\uFF1A".concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo3 = userInfo.quotaInfo) === null || _userInfo$quotaInfo3 === void 0 ? void 0 : _userInfo$quotaInfo3.workOrderRemain) || 0, "\u6761\uFF0C\u9884\u8BA1\u5269\u4F59\u4F7F\u7528").concat((userInfo === null || userInfo === void 0 ? void 0 : (_userInfo$quotaInfo4 = userInfo.quotaInfo) === null || _userInfo$quotaInfo4 === void 0 ? void 0 : _userInfo$quotaInfo4.workOrderRemainDays) || 0, "\u5929\uFF0C\u6D88\u8017\u5B8C\u540E\u65E0\u6CD5\u65B0\u5EFA\u5DE5\u5355\u53CA\u6267\u884CRPA\u76F8\u5173\u4EFB\u52A1"),
|
|
259
|
+
type: "warning",
|
|
260
|
+
closable: true
|
|
261
|
+
}), children);
|
|
229
262
|
};
|
|
230
263
|
export default Global;
|
|
@@ -33,27 +33,28 @@ function useGetErpAddressData(reduxData, notJudgedErp) {
|
|
|
33
33
|
promises = [];
|
|
34
34
|
if (hasBs || notJudgedErp) promises.push(servers.queryBsAddressData);
|
|
35
35
|
if (hasWdt || notJudgedErp) promises.push(servers.queryWdtAddressData);
|
|
36
|
-
|
|
36
|
+
// JKY用的系统的地址,暂时不需要查询
|
|
37
|
+
// if (hasJky || notJudgedErp) promises.push(servers.queryJkyAddressData);
|
|
37
38
|
if (hasGy || notJudgedErp) promises.push(servers.queryGyAddressData);
|
|
38
39
|
if (hasJst || notJudgedErp) promises.push(servers.queryJstAddressData);
|
|
39
|
-
_context.prev =
|
|
40
|
-
_context.next =
|
|
40
|
+
_context.prev = 7;
|
|
41
|
+
_context.next = 10;
|
|
41
42
|
return Promise.all(promises.map(function (promise) {
|
|
42
43
|
return promise();
|
|
43
44
|
}));
|
|
44
|
-
case
|
|
45
|
+
case 10:
|
|
45
46
|
setGlobalState("success");
|
|
46
|
-
_context.next =
|
|
47
|
+
_context.next = 16;
|
|
47
48
|
break;
|
|
48
|
-
case
|
|
49
|
-
_context.prev =
|
|
50
|
-
_context.t0 = _context["catch"](
|
|
49
|
+
case 13:
|
|
50
|
+
_context.prev = 13;
|
|
51
|
+
_context.t0 = _context["catch"](7);
|
|
51
52
|
setGlobalState("failed");
|
|
52
|
-
case
|
|
53
|
+
case 16:
|
|
53
54
|
case "end":
|
|
54
55
|
return _context.stop();
|
|
55
56
|
}
|
|
56
|
-
}, _callee, null, [[
|
|
57
|
+
}, _callee, null, [[7, 13]]);
|
|
57
58
|
}));
|
|
58
59
|
return function asyncQueryData(_x2, _x3, _x4) {
|
|
59
60
|
return _ref.apply(this, arguments);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, }: {
|
|
2
|
+
declare const QueryLogisticsTrack: ({ title, modelWidth, interceptCompany, interceptCode, interceptSenderMobile, interceptCompanyName, shopUk, }: {
|
|
3
3
|
title?: string | undefined;
|
|
4
4
|
modelWidth?: string | number | undefined;
|
|
5
5
|
interceptCompany?: string | undefined;
|
|
6
6
|
interceptCode: string;
|
|
7
7
|
interceptSenderMobile?: string | number | undefined;
|
|
8
8
|
interceptCompanyName?: string | undefined;
|
|
9
|
+
shopUk?: string | undefined;
|
|
9
10
|
}) => React.JSX.Element;
|
|
10
11
|
export default QueryLogisticsTrack;
|
|
@@ -20,7 +20,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
20
20
|
interceptCompany = _ref.interceptCompany,
|
|
21
21
|
interceptCode = _ref.interceptCode,
|
|
22
22
|
interceptSenderMobile = _ref.interceptSenderMobile,
|
|
23
|
-
interceptCompanyName = _ref.interceptCompanyName
|
|
23
|
+
interceptCompanyName = _ref.interceptCompanyName,
|
|
24
|
+
shopUk = _ref.shopUk;
|
|
24
25
|
var _useState = useState(""),
|
|
25
26
|
_useState2 = _slicedToArray(_useState, 2),
|
|
26
27
|
inputVal = _useState2[0],
|
|
@@ -97,7 +98,8 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
|
|
|
97
98
|
mailNo: interceptCode,
|
|
98
99
|
cpCode: interceptCompany,
|
|
99
100
|
mobile: interceptSenderMobile || mobile,
|
|
100
|
-
cpName: interceptCompanyName
|
|
101
|
+
cpName: interceptCompanyName,
|
|
102
|
+
shopUk: shopUk
|
|
101
103
|
},
|
|
102
104
|
handleError: function handleError(msg) {
|
|
103
105
|
msg && message.error(msg);
|
|
@@ -13,7 +13,15 @@ declare class BsSystemOrder implements ComponentInterface {
|
|
|
13
13
|
canSort: boolean;
|
|
14
14
|
dataType: ComponentInterface["dataType"];
|
|
15
15
|
children: ComponentInterface[];
|
|
16
|
+
sortChildField: {
|
|
17
|
+
name: string;
|
|
18
|
+
key: string;
|
|
19
|
+
dataType: string;
|
|
20
|
+
[key: string]: any;
|
|
21
|
+
}[];
|
|
22
|
+
compoundConfig: ComponentInterface["compoundConfig"];
|
|
16
23
|
constructor(options: PickOption);
|
|
24
|
+
getSortChildFields: () => any;
|
|
17
25
|
renderClient: (record: any) => React.JSX.Element | null;
|
|
18
26
|
renderPc: () => null;
|
|
19
27
|
renderLog: (r: Record) => React.JSX.Element | null;
|
|
@@ -2,6 +2,12 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
|
|
|
2
2
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
3
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
5
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
6
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
7
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
8
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
9
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
10
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
5
11
|
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
|
|
6
12
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
7
13
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
@@ -34,7 +40,9 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
34
40
|
_getSystemShowHead,
|
|
35
41
|
_typeMap$options$type,
|
|
36
42
|
_options$componentCon,
|
|
37
|
-
_this$
|
|
43
|
+
_this$componentConfig6,
|
|
44
|
+
_typeMap$options$type2,
|
|
45
|
+
_typeMap$options$type3;
|
|
38
46
|
_classCallCheck(this, BsSystemOrder);
|
|
39
47
|
_defineProperty(this, "name", void 0);
|
|
40
48
|
_defineProperty(this, "id", void 0);
|
|
@@ -48,15 +56,40 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
48
56
|
_defineProperty(this, "canSort", void 0);
|
|
49
57
|
_defineProperty(this, "dataType", void 0);
|
|
50
58
|
_defineProperty(this, "children", void 0);
|
|
59
|
+
_defineProperty(this, "sortChildField", void 0);
|
|
60
|
+
_defineProperty(this, "compoundConfig", void 0);
|
|
61
|
+
_defineProperty(this, "getSortChildFields", function () {
|
|
62
|
+
var _typeMap$_this$type, _typeMap$_this$type2, _typeMap$_this$type3, _this$componentConfig;
|
|
63
|
+
return [{
|
|
64
|
+
name: "绑定订单号",
|
|
65
|
+
key: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.orderNo,
|
|
66
|
+
dataType: "string"
|
|
67
|
+
}, {
|
|
68
|
+
name: "选中系统订单号",
|
|
69
|
+
key: (_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.selectId,
|
|
70
|
+
dataType: "array"
|
|
71
|
+
}].concat(_toConsumableArray(getSystemShowHead({
|
|
72
|
+
columns: ((_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.columns) || [],
|
|
73
|
+
showHeader: (_this === null || _this === void 0 ? void 0 : (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
|
|
74
|
+
}).filter(function (item) {
|
|
75
|
+
return !["picUrl"].includes(item.dataIndex);
|
|
76
|
+
}).map(function (item) {
|
|
77
|
+
return {
|
|
78
|
+
name: item.title,
|
|
79
|
+
key: "".concat(_this.id, "_").concat(item.dataIndex),
|
|
80
|
+
dataType: "arrayObject"
|
|
81
|
+
};
|
|
82
|
+
})));
|
|
83
|
+
});
|
|
51
84
|
_defineProperty(this, "renderClient", function (record) {
|
|
52
|
-
var _this$
|
|
85
|
+
var _this$componentConfig2;
|
|
53
86
|
return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
|
|
54
87
|
id: _this.id,
|
|
55
88
|
label: _this.name,
|
|
56
89
|
value: /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
57
90
|
value: record === null || record === void 0 ? void 0 : record["".concat(_this.id)],
|
|
58
91
|
type: _this.type,
|
|
59
|
-
showHeader: ((_this$
|
|
92
|
+
showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
|
|
60
93
|
})
|
|
61
94
|
})) : null;
|
|
62
95
|
});
|
|
@@ -64,7 +97,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
64
97
|
return null;
|
|
65
98
|
});
|
|
66
99
|
_defineProperty(this, "renderLog", function (r) {
|
|
67
|
-
var _this$
|
|
100
|
+
var _this$componentConfig3;
|
|
68
101
|
if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].key)])) return null;
|
|
69
102
|
return /*#__PURE__*/React.createElement(BsSystemOrderTable, {
|
|
70
103
|
value: {
|
|
@@ -72,7 +105,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
72
105
|
selectIds: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[_this.type].selectId)]
|
|
73
106
|
},
|
|
74
107
|
type: _this.type,
|
|
75
|
-
showHeader: ((_this$
|
|
108
|
+
showHeader: ((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showHeader) || []
|
|
76
109
|
});
|
|
77
110
|
});
|
|
78
111
|
_defineProperty(this, "getComponentValue", function (r) {
|
|
@@ -82,7 +115,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
82
115
|
return null;
|
|
83
116
|
});
|
|
84
117
|
_defineProperty(this, "editRender", function (p) {
|
|
85
|
-
var _this$
|
|
118
|
+
var _this$componentConfig4, _this$componentConfig5;
|
|
86
119
|
return /*#__PURE__*/React.createElement(GetFormItem, {
|
|
87
120
|
title: _this.name,
|
|
88
121
|
name: _this.id,
|
|
@@ -90,7 +123,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
90
123
|
required: false,
|
|
91
124
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
92
125
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
93
|
-
tooltip: (_this$
|
|
126
|
+
tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip : "",
|
|
94
127
|
component: /*#__PURE__*/React.createElement(SystemOrder, _extends({}, _this.componentConfig, {
|
|
95
128
|
onChange: p === null || p === void 0 ? void 0 : p.onChange,
|
|
96
129
|
type: _this.type
|
|
@@ -132,7 +165,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
132
165
|
}));
|
|
133
166
|
})) || [];
|
|
134
167
|
this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
|
|
135
|
-
this.rules = this !== null && this !== void 0 && (_this$
|
|
168
|
+
this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
|
|
136
169
|
required: true,
|
|
137
170
|
validator: function validator(_, value) {
|
|
138
171
|
var _value$selectIds;
|
|
@@ -143,5 +176,7 @@ var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {
|
|
|
143
176
|
}
|
|
144
177
|
}] : [];
|
|
145
178
|
this.dataType = "object";
|
|
179
|
+
this.sortChildField = this.getSortChildFields();
|
|
180
|
+
this.compoundConfig = (_typeMap$options$type2 = typeMap[options.type]) !== null && _typeMap$options$type2 !== void 0 && _typeMap$options$type2.compoundConfig ? (_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.compoundConfig(options.id) : [];
|
|
146
181
|
});
|
|
147
182
|
export default BsSystemOrder;
|
|
@@ -1,19 +1,21 @@
|
|
|
1
|
-
import { ComponentInterface, PickOption, ColumnConfig, Record } from
|
|
2
|
-
import React from
|
|
1
|
+
import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
|
|
2
|
+
import React from 'react';
|
|
3
3
|
declare class BasicCascader implements ComponentInterface {
|
|
4
4
|
name: string;
|
|
5
5
|
id: string;
|
|
6
6
|
sortField: string;
|
|
7
7
|
type: string;
|
|
8
8
|
rules: any[];
|
|
9
|
-
componentConfig: ComponentInterface[
|
|
9
|
+
componentConfig: ComponentInterface['componentConfig'];
|
|
10
10
|
isCombinationComponent: boolean;
|
|
11
11
|
formField: string;
|
|
12
12
|
canSort: boolean;
|
|
13
13
|
children: ComponentInterface[];
|
|
14
|
-
dataType: ComponentInterface[
|
|
15
|
-
format: ComponentInterface[
|
|
16
|
-
options: ComponentInterface[
|
|
14
|
+
dataType: ComponentInterface['dataType'];
|
|
15
|
+
format: ComponentInterface['format'];
|
|
16
|
+
options: ComponentInterface['options'];
|
|
17
|
+
exampleValue?: string;
|
|
18
|
+
standardDateType: ComponentInterface['standardDateType'];
|
|
17
19
|
constructor(options: PickOption);
|
|
18
20
|
/**
|
|
19
21
|
* 通过值计算展示内容
|
|
@@ -6,13 +6,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
6
6
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
7
7
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
8
8
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
9
|
-
import React from
|
|
10
|
-
import { Cascader } from
|
|
11
|
-
import intersection from
|
|
9
|
+
import React from 'react';
|
|
10
|
+
import { Cascader } from 'antd';
|
|
11
|
+
import intersection from 'lodash/intersection';
|
|
12
12
|
import GetFormItem from "../GetFormItem";
|
|
13
|
-
import { findLabelBySelectValue, transMultSelectOptions, tree } from
|
|
13
|
+
import { findLabelBySelectValue, transMultSelectOptions, tree } from '@kmkf-fe-packages/kmkf-utils';
|
|
14
14
|
import ItemView from "../../commonComponents/ItemView";
|
|
15
|
-
import { isNull, filterFn as _filterFn } from
|
|
15
|
+
import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
|
|
16
16
|
import { SYMBOL } from "../../constant";
|
|
17
17
|
var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
18
18
|
var _this = this,
|
|
@@ -31,11 +31,13 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
31
31
|
_defineProperty(this, "dataType", void 0);
|
|
32
32
|
_defineProperty(this, "format", void 0);
|
|
33
33
|
_defineProperty(this, "options", void 0);
|
|
34
|
+
_defineProperty(this, "exampleValue", void 0);
|
|
35
|
+
_defineProperty(this, "standardDateType", void 0);
|
|
34
36
|
_defineProperty(this, "getValues", function (value) {
|
|
35
37
|
var _findLabelBySelectVal, _findLabelBySelectVal2, _this$componentConfig;
|
|
36
38
|
return (_findLabelBySelectVal = findLabelBySelectValue(value, (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.options)) === null || _findLabelBySelectVal === void 0 ? void 0 : (_findLabelBySelectVal2 = _findLabelBySelectVal.map(function (i) {
|
|
37
39
|
return i.label;
|
|
38
|
-
})) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2.join(
|
|
40
|
+
})) === null || _findLabelBySelectVal2 === void 0 ? void 0 : _findLabelBySelectVal2.join(',');
|
|
39
41
|
});
|
|
40
42
|
_defineProperty(this, "renderClient", function (record) {
|
|
41
43
|
return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
|
|
@@ -51,7 +53,7 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
51
53
|
}
|
|
52
54
|
return /*#__PURE__*/React.createElement("span", null, (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) || []) === null || _ref === void 0 ? void 0 : (_ref$map = _ref.map(function (item) {
|
|
53
55
|
return item === null || item === void 0 ? void 0 : item.label;
|
|
54
|
-
})) === null || _ref$map === void 0 ? void 0 : _ref$map.join(
|
|
56
|
+
})) === null || _ref$map === void 0 ? void 0 : _ref$map.join(','));
|
|
55
57
|
// return (
|
|
56
58
|
// <span>
|
|
57
59
|
// {findLabelBySelectValue(
|
|
@@ -75,11 +77,11 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
75
77
|
_defineProperty(this, "renderExport", function (value, record) {
|
|
76
78
|
var _ref2, _ref2$map;
|
|
77
79
|
if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) === undefined) {
|
|
78
|
-
return
|
|
80
|
+
return '--';
|
|
79
81
|
}
|
|
80
82
|
return (_ref2 = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_multSelect")]) || []) === null || _ref2 === void 0 ? void 0 : (_ref2$map = _ref2.map(function (item) {
|
|
81
83
|
return item === null || item === void 0 ? void 0 : item.label;
|
|
82
|
-
})) === null || _ref2$map === void 0 ? void 0 : _ref2$map.join(
|
|
84
|
+
})) === null || _ref2$map === void 0 ? void 0 : _ref2$map.join(',');
|
|
83
85
|
// return findLabelBySelectValue(
|
|
84
86
|
// (record?.[`${this.id}_multSelect`] || [])?.map(
|
|
85
87
|
// (item: any) => item.actived
|
|
@@ -98,14 +100,14 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
98
100
|
hidden: p === null || p === void 0 ? void 0 : p.hidden,
|
|
99
101
|
required: (_this$componentConfig2 = (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.required) !== null && _this$componentConfig2 !== void 0 ? _this$componentConfig2 : false,
|
|
100
102
|
display: p === null || p === void 0 ? void 0 : p.display,
|
|
101
|
-
tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip :
|
|
103
|
+
tooltip: (_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.showTooltip ? (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.tooltip : '',
|
|
102
104
|
component: /*#__PURE__*/React.createElement(Cascader, _extends({}, _this.componentConfig, {
|
|
103
105
|
placeholder: "\u8BF7\u8F93\u5165".concat(_this.name),
|
|
104
106
|
options: transMultSelectOptions(((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.options) || []),
|
|
105
107
|
fieldNames: {
|
|
106
|
-
label:
|
|
107
|
-
value:
|
|
108
|
-
children:
|
|
108
|
+
label: 'label',
|
|
109
|
+
value: 'actived',
|
|
110
|
+
children: 'children'
|
|
109
111
|
},
|
|
110
112
|
showSearch: true,
|
|
111
113
|
onChange: p === null || p === void 0 ? void 0 : p.onChange
|
|
@@ -122,26 +124,26 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
122
124
|
// 过滤组件id
|
|
123
125
|
name: item.name,
|
|
124
126
|
// 过滤组件名称
|
|
125
|
-
filterComponentType:
|
|
127
|
+
filterComponentType: 'Cascader',
|
|
126
128
|
props: {
|
|
127
129
|
options: options,
|
|
128
130
|
multiple: true,
|
|
129
|
-
maxTagCount:
|
|
131
|
+
maxTagCount: 'responsive',
|
|
130
132
|
fieldNames: {
|
|
131
|
-
label:
|
|
132
|
-
value:
|
|
133
|
-
children:
|
|
133
|
+
label: 'label',
|
|
134
|
+
value: 'actived',
|
|
135
|
+
children: 'children'
|
|
134
136
|
}
|
|
135
137
|
},
|
|
136
138
|
filterFn: function filterFn(value) {
|
|
137
139
|
return function (i) {
|
|
138
|
-
return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id,
|
|
140
|
+
return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
|
|
139
141
|
};
|
|
140
142
|
},
|
|
141
143
|
formatFilterValue: function formatFilterValue(val) {
|
|
142
144
|
if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
|
|
143
145
|
return val.map(function (item) {
|
|
144
|
-
var node = tree.findNodeByValue(options,
|
|
146
|
+
var node = tree.findNodeByValue(options, 'actived', item[item.length - 1]);
|
|
145
147
|
if (node) {
|
|
146
148
|
var label = node.label,
|
|
147
149
|
actived = node.actived;
|
|
@@ -165,9 +167,11 @@ var BasicCascader = /*#__PURE__*/_createClass(function BasicCascader(_options) {
|
|
|
165
167
|
this.children = [];
|
|
166
168
|
this.isCombinationComponent = false;
|
|
167
169
|
this.canSort = true;
|
|
168
|
-
this.dataType =
|
|
169
|
-
this.format =
|
|
170
|
+
this.dataType = 'array';
|
|
171
|
+
this.format = 'cascader';
|
|
170
172
|
this.options = ((_this$componentConfig7 = this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.options) || [];
|
|
173
|
+
this.standardDateType = 'Array';
|
|
174
|
+
this.exampleValue = '[{"label":"卖家补偿","actived":3},{"label":"麦基修改","actived":"3-1"}]';
|
|
171
175
|
}
|
|
172
176
|
|
|
173
177
|
/**
|
|
@@ -25,7 +25,7 @@ export declare const ShowTotalImage: ({ total, allImage, type, showHeader, }: {
|
|
|
25
25
|
export declare const GoodImage: ({ list, type, showHeader }: any) => React.JSX.Element | null;
|
|
26
26
|
export declare const JstGoodImage: ({ list, type, platformType, logisticsCompanyFormType, }: any) => any;
|
|
27
27
|
export declare const BsExpressRender: ({ list, showField, platformType, logisticsCompanyFormType, }: any) => any;
|
|
28
|
-
export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, }: any) => any;
|
|
28
|
+
export declare const CommonOrderContent: ({ list, valueKey: initValueKey, failValue, options, isShowPopover, idKey, }: any) => any;
|
|
29
29
|
export declare const BsGoodImage: ({ item, index }: {
|
|
30
30
|
item: any;
|
|
31
31
|
index: number;
|
|
@@ -333,7 +333,8 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
333
333
|
_ref8$options = _ref8.options,
|
|
334
334
|
options = _ref8$options === void 0 ? [] : _ref8$options,
|
|
335
335
|
_ref8$isShowPopover = _ref8.isShowPopover,
|
|
336
|
-
isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover
|
|
336
|
+
isShowPopover = _ref8$isShowPopover === void 0 ? true : _ref8$isShowPopover,
|
|
337
|
+
idKey = _ref8.idKey;
|
|
337
338
|
var getContentData = function getContentData(item, index) {
|
|
338
339
|
if (item.platformId) return {
|
|
339
340
|
text: "平台售后单号",
|
|
@@ -345,7 +346,7 @@ export var CommonOrderContent = function CommonOrderContent(_ref8) {
|
|
|
345
346
|
};
|
|
346
347
|
return {
|
|
347
348
|
text: "\u7CFB\u7EDF\u8BA2\u5355\u53F7".concat(index + 1),
|
|
348
|
-
id: item.systemOrderId || item.systemOrderNo
|
|
349
|
+
id: item.systemOrderId || item.systemOrderNo || (item === null || item === void 0 ? void 0 : item[idKey])
|
|
349
350
|
};
|
|
350
351
|
};
|
|
351
352
|
var orderContent = function orderContent(item, index) {
|
|
@@ -1543,6 +1543,10 @@ var GoodHeaderMap = {
|
|
|
1543
1543
|
supplierCode: {
|
|
1544
1544
|
name: "供应商编码",
|
|
1545
1545
|
width: 150
|
|
1546
|
+
},
|
|
1547
|
+
remark: {
|
|
1548
|
+
name: "备注",
|
|
1549
|
+
width: 200
|
|
1546
1550
|
}
|
|
1547
1551
|
},
|
|
1548
1552
|
moneyKey: "money"
|
|
@@ -2147,7 +2151,7 @@ var GoodHeaderMap = {
|
|
|
2147
2151
|
},
|
|
2148
2152
|
sellTotal: {
|
|
2149
2153
|
component: BsHeaderChild,
|
|
2150
|
-
name: "
|
|
2154
|
+
name: "总金额",
|
|
2151
2155
|
key: "sellTotal",
|
|
2152
2156
|
width: 150
|
|
2153
2157
|
},
|
|
@@ -2219,7 +2223,15 @@ var GoodHeaderMap = {
|
|
|
2219
2223
|
component: BsHeaderChild,
|
|
2220
2224
|
name: "是否预售货品",
|
|
2221
2225
|
key: "isPresell",
|
|
2222
|
-
width: 150
|
|
2226
|
+
width: 150,
|
|
2227
|
+
transformValue: function transformValue(val) {
|
|
2228
|
+
if (isNull(val)) return "--";
|
|
2229
|
+
return val === "1" ? "是" : "否";
|
|
2230
|
+
},
|
|
2231
|
+
renderExport: function renderExport(val) {
|
|
2232
|
+
if (isNull(val)) return "--";
|
|
2233
|
+
return val === "1" ? "是" : "否";
|
|
2234
|
+
}
|
|
2223
2235
|
},
|
|
2224
2236
|
brandName: {
|
|
2225
2237
|
component: BsHeaderChild,
|