@kmkf-fe-packages/services-components 2.3.19-beta.8 → 2.4.1
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 +19 -52
- package/dist/esm/components/CommonHeaderGood/index.js +0 -8
- package/dist/esm/components/CommonSystemOrder/index.js +0 -7
- package/dist/esm/factory.d.ts +1 -1
- package/dist/esm/factory.js +0 -1
- 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/BS/BsSystemOrder").default | import("../components/Cascader").default | import("../components/
|
|
3
|
+
export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/BS/BsLogistics").default | import("../components/BS/BsSystemOrder").default | import("../components/Cascader").default | import("../components/CommonInput").default | import("../components/CommonMultiStatus").default | import("../components/Input").default | import("../components/JST/JstSendGood").default | import("../components/KM/KmExchange").default | import("../components/Logistics").default | LogisticsMoreInterception | import("../components/MsgStatus").default | import("../components/OrderSubForm").default | import("../components/Payment").default | import("../components/PicturePro").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/ReturnWarehouse").default | import("../components/ReceiverAddress").default | import("../components/StatusSelect").default | import("../components/SubForm").default | import("../components/TypeInput").default | import("../components/Address").default | import("../components/Checkbox").default | import("../components/DataTime").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/CommonDataTime").default | import("../components/TradeId").default | import("../components/ShopName").default | import("../components/BuyerNick").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/TradeDateTime").default | import("../components/ReturnLogistics").default | import("../components/ActualPayment").default | import("../components/Remark").default | import("../components/Alipay").default | import("../components/EItemSelect").default | import("../components/EItemId").default | import("../components/EItemEnCode").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSupply").default | import("../components/BS/BsGoods").default | import("../components/BsE3/BsGoods").default | import("../components/Public/Exchange").default | import("../components/BsE3/BsReissueE3").default | import("../components/BS/BsExchange").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | 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/CompletedUser").default | import("../components/FlowWorkOrderId").default | import("../components/Calculation").default | import("../components/CommonSystemOrder").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/BS/BsPosting").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").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/AfterSalesOrderId").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/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,7 +26,6 @@ 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;
|
|
30
29
|
var children = _ref.children,
|
|
31
30
|
_ref$requestList = _ref.requestList,
|
|
32
31
|
requestList = _ref$requestList === void 0 ? [] : _ref$requestList,
|
|
@@ -43,25 +42,20 @@ var Global = function Global(_ref) {
|
|
|
43
42
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
44
43
|
loading = _useState4[0],
|
|
45
44
|
setLoading = _useState4[1];
|
|
46
|
-
var _useState5 = useState({}),
|
|
47
|
-
_useState6 = _slicedToArray(_useState5, 2),
|
|
48
|
-
userInfo = _useState6[0],
|
|
49
|
-
setUserInfo = _useState6[1];
|
|
50
45
|
var reduxDataMap = useMemo(function () {
|
|
51
46
|
return reduxData;
|
|
52
47
|
}, [JSON.stringify(reduxData)]);
|
|
53
48
|
useEffect(function () {
|
|
54
49
|
try {
|
|
55
50
|
var _reduxData$main, _reduxData$workOrder, _reduxData$global;
|
|
56
|
-
var
|
|
57
|
-
var companyUserConfig = cloneDeep(
|
|
51
|
+
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) || {};
|
|
52
|
+
var companyUserConfig = cloneDeep(userInfo.companyUserConfig);
|
|
58
53
|
if (companyUserConfig && typeof companyUserConfig === "string") {
|
|
59
|
-
|
|
54
|
+
userInfo = _objectSpread(_objectSpread({}, userInfo), {}, {
|
|
60
55
|
companyUserConfig: JSON.parse(companyUserConfig)
|
|
61
56
|
});
|
|
62
57
|
}
|
|
63
|
-
|
|
64
|
-
localStorage.setItem("reduxData_userInfo", JSON.stringify(_userInfo));
|
|
58
|
+
localStorage.setItem("reduxData_userInfo", JSON.stringify(userInfo));
|
|
65
59
|
} catch (e) {
|
|
66
60
|
console.error(e);
|
|
67
61
|
}
|
|
@@ -217,47 +211,20 @@ var Global = function Global(_ref) {
|
|
|
217
211
|
}
|
|
218
212
|
});
|
|
219
213
|
}
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
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"),
|
|
259
|
-
type: "warning",
|
|
260
|
-
closable: true
|
|
261
|
-
}), children);
|
|
214
|
+
if (allState === "failed") {
|
|
215
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Alert, {
|
|
216
|
+
message: "\u6570\u636E\u52A0\u8F7D\u5F02\u5E38,\u53EF\u80FD\u5F71\u54CD\u90E8\u5206\u7EC4\u4EF6\u4F7F\u7528",
|
|
217
|
+
type: "warning",
|
|
218
|
+
action: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
|
|
219
|
+
loading: loading,
|
|
220
|
+
type: "primary",
|
|
221
|
+
key: "console",
|
|
222
|
+
onClick: reloadData,
|
|
223
|
+
size: "small"
|
|
224
|
+
}, "\u5237\u65B0\u91CD\u8BD5")),
|
|
225
|
+
closable: true
|
|
226
|
+
}), children);
|
|
227
|
+
}
|
|
228
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, children);
|
|
262
229
|
};
|
|
263
230
|
export default Global;
|
|
@@ -1472,10 +1472,6 @@ var GoodHeaderMap = {
|
|
|
1472
1472
|
},
|
|
1473
1473
|
KM_GOODS: {
|
|
1474
1474
|
headerMap: {
|
|
1475
|
-
sysItemOuterId: {
|
|
1476
|
-
name: "系统主商家编码",
|
|
1477
|
-
width: 250
|
|
1478
|
-
},
|
|
1479
1475
|
sysSkuPropertiesName: {
|
|
1480
1476
|
name: "规格名称",
|
|
1481
1477
|
width: 250
|
|
@@ -1557,10 +1553,6 @@ var GoodHeaderMap = {
|
|
|
1557
1553
|
},
|
|
1558
1554
|
KM_REISSUE_GOODS: {
|
|
1559
1555
|
headerMap: {
|
|
1560
|
-
sysItemOuterId: {
|
|
1561
|
-
name: "系统主商家编码",
|
|
1562
|
-
width: 250
|
|
1563
|
-
},
|
|
1564
1556
|
sysSkuPropertiesName: {
|
|
1565
1557
|
name: "规格名称",
|
|
1566
1558
|
width: 250
|
|
@@ -36,13 +36,6 @@ var typeMap = {
|
|
|
36
36
|
type: 3,
|
|
37
37
|
valueKey: "billNo"
|
|
38
38
|
},
|
|
39
|
-
SWAP_OUT_TRADE_ID: {
|
|
40
|
-
key: "tradeItemList",
|
|
41
|
-
code: "tradeIdList",
|
|
42
|
-
name: "换出系统订单号",
|
|
43
|
-
type: 3,
|
|
44
|
-
valueKey: "billNo"
|
|
45
|
-
},
|
|
46
39
|
EXCHANGE_TRADE_ID: {
|
|
47
40
|
key: "tradeItemList",
|
|
48
41
|
code: "tradeIdList",
|
package/dist/esm/factory.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
|
|
2
2
|
import { PickOption } from "./type";
|
|
3
|
-
export declare const factory: (type: string, options: PickOption) => BsSystemOrder | BasicCascader |
|
|
3
|
+
export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicCascader | CommonInput | CommonMultiStatus | BasicInput | JstSendGood | KmExchange | Logistics | LogisticsMoreInterception | MsgStatus | OrderSubForm | Payment | BasicPicturePro | PublicGoods | PublicReissueGoods | ReturnWarehouse | ReceiverAddress | StatusSelect | SubForm | BasicTypeInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | TradeDateTime | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | FlowOverallStatusSelect;
|
package/dist/esm/factory.js
CHANGED
|
@@ -206,7 +206,6 @@ export var factory = function factory(type, options) {
|
|
|
206
206
|
case "JST_RETURN_GOODS":
|
|
207
207
|
return new PublicReissueGoods(options);
|
|
208
208
|
case "REISSUE_TRADE_ID":
|
|
209
|
-
case "SWAP_OUT_TRADE_ID":
|
|
210
209
|
case "ERP_AFTER_SALE_TRADE_ID":
|
|
211
210
|
case "BS_DELIVERY_NO":
|
|
212
211
|
case "RETURN_GOODS_TRADE_ID":
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/services-components",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.1",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
]
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@kmkf-fe-packages/basic-components": "2.
|
|
25
|
-
"@kmkf-fe-packages/kmkf-utils": "2.
|
|
24
|
+
"@kmkf-fe-packages/basic-components": "2.4.1",
|
|
25
|
+
"@kmkf-fe-packages/kmkf-utils": "2.4.1",
|
|
26
26
|
"b64-to-blob": "^1.2.19",
|
|
27
27
|
"html2canvas": "^1.4.1",
|
|
28
28
|
"react-pdf-js": "^5.1.0"
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "d3137c66c0026c9ab302b8daa6ec0a65e4d8b3a7",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|