@kmkf-fe-packages/kmkf-utils 2.0.0 → 2.0.2-beta.0
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/constants/index.d.ts +1 -1
- package/dist/esm/constants/index.js +2 -2
- package/dist/esm/servers/KM/index.d.ts +2 -1
- package/dist/esm/servers/KM/index.js +2 -1
- package/dist/esm/servers/KM/logisticsData.d.ts +6 -0
- package/dist/esm/servers/KM/logisticsData.js +42 -0
- package/dist/esm/utils/FetchAll.d.ts +2 -1
- package/dist/esm/utils/FetchAll.js +4 -2
- package/dist/esm/utils/SendData.d.ts +1 -1
- package/dist/esm/utils/SendData.js +9 -6
- package/dist/esm/utils/bsE3OrderBackFormValues.d.ts +1 -1
- package/dist/esm/utils/bsE3OrderBackFormValues.js +16 -11
- package/dist/esm/utils/getExpression.js +6 -6
- package/dist/esm/utils/kmOrderBackFormValues.d.ts +1 -0
- package/dist/esm/utils/kmOrderBackFormValues.js +22 -19
- package/dist/esm/utils/unTransField.js +1 -1
- package/package.json +3 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
1
2
|
export { default as columnsGoodsList } from "./columnsGoodsList";
|
|
2
3
|
export declare const getMapping: (data: {
|
|
3
4
|
dataIndex: string;
|
|
@@ -5,4 +6,3 @@ export declare const getMapping: (data: {
|
|
|
5
6
|
}[]) => {
|
|
6
7
|
[key: string]: string;
|
|
7
8
|
};
|
|
8
|
-
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
1
2
|
export { default as columnsGoodsList } from "./columnsGoodsList";
|
|
2
3
|
export var getMapping = function getMapping(data) {
|
|
3
4
|
var mapping = {};
|
|
@@ -5,5 +6,4 @@ export var getMapping = function getMapping(data) {
|
|
|
5
6
|
mapping[item.dataIndex] = item.title;
|
|
6
7
|
});
|
|
7
8
|
return mapping;
|
|
8
|
-
};
|
|
9
|
-
export { default as msgTypeCh } from "./msgTypeMapping";
|
|
9
|
+
};
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export * from
|
|
1
|
+
export * from "./warehouseData";
|
|
2
|
+
export * from "./logisticsData";
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export * from "./warehouseData";
|
|
1
|
+
export * from "./warehouseData";
|
|
2
|
+
export * from "./logisticsData";
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
|
|
3
|
+
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
4
|
+
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
5
|
+
import request from "../../request";
|
|
6
|
+
var queryKMLogisticsList = function queryKMLogisticsList() {
|
|
7
|
+
return request({
|
|
8
|
+
url: "/qy/gdfw/template/queryKmLogistics/noLogin",
|
|
9
|
+
method: "post",
|
|
10
|
+
data: {}
|
|
11
|
+
});
|
|
12
|
+
};
|
|
13
|
+
export var getLogisticsDataAsync = /*#__PURE__*/function () {
|
|
14
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
15
|
+
var result, list, logisticsList;
|
|
16
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
17
|
+
while (1) switch (_context.prev = _context.next) {
|
|
18
|
+
case 0:
|
|
19
|
+
_context.next = 2;
|
|
20
|
+
return queryKMLogisticsList();
|
|
21
|
+
case 2:
|
|
22
|
+
result = _context.sent;
|
|
23
|
+
list = [];
|
|
24
|
+
logisticsList = (result === null || result === void 0 ? void 0 : result.data) || [];
|
|
25
|
+
logisticsList === null || logisticsList === void 0 ? void 0 : logisticsList.map(function (item) {
|
|
26
|
+
list.push({
|
|
27
|
+
label: item.name,
|
|
28
|
+
value: item.name
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
return _context.abrupt("return", list);
|
|
32
|
+
case 7:
|
|
33
|
+
case "end":
|
|
34
|
+
return _context.stop();
|
|
35
|
+
}
|
|
36
|
+
}, _callee);
|
|
37
|
+
}));
|
|
38
|
+
return function getLogisticsDataAsync() {
|
|
39
|
+
return _ref.apply(this, arguments);
|
|
40
|
+
};
|
|
41
|
+
}();
|
|
42
|
+
export default getLogisticsDataAsync;
|
|
@@ -3,8 +3,9 @@ export declare function fetchAll<T = any, D = any>(key: string, fetchAction: (pa
|
|
|
3
3
|
pageSize: number;
|
|
4
4
|
}) => Promise<{
|
|
5
5
|
data?: D;
|
|
6
|
-
}>, getList: (data: D) => T[], { pageNo, pageSize, useCache }?: {
|
|
6
|
+
}>, getList: (data: D) => T[], { pageNo, pageSize, useCache, maxCount }?: {
|
|
7
7
|
pageNo?: number | undefined;
|
|
8
8
|
pageSize?: number | undefined;
|
|
9
9
|
useCache?: boolean | undefined;
|
|
10
|
+
maxCount?: number | undefined;
|
|
10
11
|
}): Promise<T[]>;
|
|
@@ -12,7 +12,9 @@ export function fetchAll(key, fetchAction, getList) {
|
|
|
12
12
|
_ref$pageSize = _ref.pageSize,
|
|
13
13
|
pageSize = _ref$pageSize === void 0 ? 100 : _ref$pageSize,
|
|
14
14
|
_ref$useCache = _ref.useCache,
|
|
15
|
-
useCache = _ref$useCache === void 0 ? true : _ref$useCache
|
|
15
|
+
useCache = _ref$useCache === void 0 ? true : _ref$useCache,
|
|
16
|
+
_ref$maxCount = _ref.maxCount,
|
|
17
|
+
maxCount = _ref$maxCount === void 0 ? 0 : _ref$maxCount;
|
|
16
18
|
if (!singletonPromiseMap.has(key)) {
|
|
17
19
|
singletonPromiseMap.set(key, new Promise(function (resolve, reject) {
|
|
18
20
|
var list = [];
|
|
@@ -25,7 +27,7 @@ export function fetchAll(key, fetchAction, getList) {
|
|
|
25
27
|
if (res.data) {
|
|
26
28
|
var newList = getList(res.data);
|
|
27
29
|
list.push.apply(list, _toConsumableArray(newList));
|
|
28
|
-
if (pageSize === newList.length) {
|
|
30
|
+
if (pageSize === newList.length && (!maxCount || maxCount > list.length)) {
|
|
29
31
|
pagePointer++;
|
|
30
32
|
fetchList();
|
|
31
33
|
} else {
|
|
@@ -18,6 +18,6 @@ declare class SendData {
|
|
|
18
18
|
export declare class SendDataCenter {
|
|
19
19
|
static instanceMap: Map<SendGoodPlatform, SendData>;
|
|
20
20
|
static getInstance(platform: SendGoodPlatform): SendData;
|
|
21
|
-
static
|
|
21
|
+
static getPromises(hasErpData: Record<string, boolean>, notJudgedErp: boolean): (() => Promise<void>)[];
|
|
22
22
|
}
|
|
23
23
|
export {};
|
|
@@ -22,7 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
|
22
22
|
case 0:
|
|
23
23
|
_context.next = 2;
|
|
24
24
|
return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
|
|
25
|
-
console.log("
|
|
25
|
+
console.log("发货仓数据---", _this.platform, list);
|
|
26
26
|
_this.sendData = list;
|
|
27
27
|
});
|
|
28
28
|
case 2:
|
|
@@ -77,11 +77,14 @@ export var SendDataCenter = /*#__PURE__*/function () {
|
|
|
77
77
|
return this.instanceMap.get(platform);
|
|
78
78
|
}
|
|
79
79
|
}, {
|
|
80
|
-
key: "
|
|
81
|
-
value: function
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
]
|
|
80
|
+
key: "getPromises",
|
|
81
|
+
value: function getPromises(hasErpData, notJudgedErp) {
|
|
82
|
+
var hasWdt = hasErpData.hasWdt,
|
|
83
|
+
hasGy = hasErpData.hasGy;
|
|
84
|
+
var promises = [this.getInstance("km").fetchData];
|
|
85
|
+
if (hasWdt || notJudgedErp) promises.push(this.getInstance("wdt").fetchData);
|
|
86
|
+
if (hasGy || notJudgedErp) promises.push(this.getInstance("gy").fetchData);
|
|
87
|
+
return promises;
|
|
85
88
|
}
|
|
86
89
|
}]);
|
|
87
90
|
return SendDataCenter;
|
|
@@ -20,7 +20,7 @@ export declare const BS_E3_SYSTEM_ORDER_CONFIG: {
|
|
|
20
20
|
};
|
|
21
21
|
export declare const BS_E3_BOOLEAN_STATUS_MAP: Record<number, string>;
|
|
22
22
|
export declare const BS_E3_ORDER_STATUS_MAP: Record<number, string>;
|
|
23
|
-
export declare const updateBsE3GoodsHandle: (orders?: any[]) => any;
|
|
23
|
+
export declare const updateBsE3GoodsHandle: (orders?: any[], goodsPriceKey?: string) => any;
|
|
24
24
|
export declare const bsE3OrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
25
25
|
export declare const bsE3OrderTransform: (detail: any, form: any) => {
|
|
26
26
|
bsE3SystemOrder: {
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
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
|
-
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
|
-
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; }
|
|
5
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
-
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); }
|
|
7
2
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
8
3
|
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."); }
|
|
9
4
|
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); }
|
|
10
5
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
11
6
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
12
7
|
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; }
|
|
8
|
+
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; }
|
|
9
|
+
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; }
|
|
10
|
+
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; }
|
|
11
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
12
|
+
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); }
|
|
13
13
|
import uuid from "./getUUid";
|
|
14
14
|
export var BS_E3_SYSTEM_ORDER_CONFIG = {
|
|
15
15
|
key: "bsE3SystemShowOrder",
|
|
@@ -116,14 +116,19 @@ export var BS_E3_ORDER_STATUS_MAP = {
|
|
|
116
116
|
};
|
|
117
117
|
export var updateBsE3GoodsHandle = function updateBsE3GoodsHandle() {
|
|
118
118
|
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
119
|
+
var goodsPriceKey = arguments.length > 1 ? arguments[1] : undefined;
|
|
119
120
|
var list = orders.reduce(function (prv, next) {
|
|
120
121
|
var _next$orderDetailGets;
|
|
121
122
|
var goods = next === null || next === void 0 ? void 0 : (_next$orderDetailGets = next.orderDetailGets) === null || _next$orderDetailGets === void 0 ? void 0 : _next$orderDetailGets.map(function (item) {
|
|
122
|
-
var
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
123
|
+
var _newItem$uuid;
|
|
124
|
+
var newItem = _objectSpread({}, item);
|
|
125
|
+
newItem.mark = "是";
|
|
126
|
+
newItem.canDelete = true;
|
|
127
|
+
newItem.uuid = (_newItem$uuid = newItem.uuid) !== null && _newItem$uuid !== void 0 ? _newItem$uuid : uuid();
|
|
128
|
+
if (goodsPriceKey) {
|
|
129
|
+
newItem.goodsPrice = newItem[goodsPriceKey];
|
|
130
|
+
}
|
|
131
|
+
return newItem;
|
|
127
132
|
});
|
|
128
133
|
prv.push.apply(prv, _toConsumableArray(goods));
|
|
129
134
|
return prv;
|
|
@@ -395,7 +400,7 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
|
|
|
395
400
|
},
|
|
396
401
|
// TODO: 当只有一条系统单时默认选中该系统单
|
|
397
402
|
bsE3SystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
|
|
398
|
-
bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]]).filter(function (good) {
|
|
403
|
+
bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]], 'sharePrice').filter(function (good) {
|
|
399
404
|
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
400
405
|
}) : [],
|
|
401
406
|
bsE3Goods: {
|
|
@@ -52,15 +52,15 @@ var getExpression = function getExpression(condition, l, r) {
|
|
|
52
52
|
var _intersection3, _intersection4;
|
|
53
53
|
return Array.isArray(l) ? ((_intersection3 = intersection(r, l)) === null || _intersection3 === void 0 ? void 0 : _intersection3.length) > 0 : ((_intersection4 = intersection(r, [l])) === null || _intersection4 === void 0 ? void 0 : _intersection4.length) > 0;
|
|
54
54
|
}
|
|
55
|
+
if (condition === 'ARRAY_OBJECT_INCLUDE') {
|
|
56
|
+
var _intersection5;
|
|
57
|
+
return ((_intersection5 = intersection(extractPrimitiveValues(l), r)) === null || _intersection5 === void 0 ? void 0 : _intersection5.length) > 0;
|
|
58
|
+
}
|
|
55
59
|
if (condition === 'NINCLUDE') {
|
|
56
|
-
var
|
|
57
|
-
var _include = Array.isArray(l) ? ((
|
|
60
|
+
var _intersection6, _intersection7;
|
|
61
|
+
var _include = Array.isArray(l) ? ((_intersection6 = intersection(r, l)) === null || _intersection6 === void 0 ? void 0 : _intersection6.length) > 0 : ((_intersection7 = intersection(r, [l])) === null || _intersection7 === void 0 ? void 0 : _intersection7.length) > 0;
|
|
58
62
|
return !_include;
|
|
59
63
|
}
|
|
60
|
-
if (condition === 'ARRAY_OBJECT_INCLUDE') {
|
|
61
|
-
var _intersection7;
|
|
62
|
-
return ((_intersection7 = intersection(extractPrimitiveValues(l), r)) === null || _intersection7 === void 0 ? void 0 : _intersection7.length) > 0;
|
|
63
|
-
}
|
|
64
64
|
return false;
|
|
65
65
|
};
|
|
66
66
|
export default getExpression;
|
|
@@ -14,6 +14,9 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
|
|
|
14
14
|
case "KM_SYSTEM_ORDER":
|
|
15
15
|
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.kmSystemOrder;
|
|
16
16
|
break;
|
|
17
|
+
case "KM_LOGISTICS":
|
|
18
|
+
prv[uniqueKey] = updateKmItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.kmLogistics, "logistics", config);
|
|
19
|
+
break;
|
|
17
20
|
case "KM_SEND_GOOD":
|
|
18
21
|
prv[uniqueKey] = updateKmItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.kmSendGood, "send", config);
|
|
19
22
|
}
|
|
@@ -82,34 +85,34 @@ var KM_ORDER_STATUS = {
|
|
|
82
85
|
CANCEL: "交易作废"
|
|
83
86
|
};
|
|
84
87
|
export var KM_SYSTEM_ORDER_CONFIG = {
|
|
85
|
-
key:
|
|
86
|
-
name:
|
|
87
|
-
selectId:
|
|
88
|
+
key: "kmSystemShowOrder",
|
|
89
|
+
name: "快麦",
|
|
90
|
+
selectId: "kmSystemSelectIds",
|
|
88
91
|
columns: [{
|
|
89
|
-
dataIndex:
|
|
90
|
-
title:
|
|
92
|
+
dataIndex: "billType",
|
|
93
|
+
title: "订单类型",
|
|
91
94
|
width: 150,
|
|
92
95
|
render: function render(val) {
|
|
93
|
-
var types = typeof val ===
|
|
94
|
-
return types.map(getKmOrderTypeValue).join(
|
|
96
|
+
var types = typeof val === "string" ? val.split(",") : Array.isArray(val) ? val : [val];
|
|
97
|
+
return types.map(getKmOrderTypeValue).join(",");
|
|
95
98
|
}
|
|
96
99
|
}, {
|
|
97
|
-
dataIndex:
|
|
98
|
-
title:
|
|
100
|
+
dataIndex: "billNo",
|
|
101
|
+
title: "系统订单号",
|
|
99
102
|
width: 160
|
|
100
103
|
}, {
|
|
101
|
-
dataIndex:
|
|
102
|
-
title:
|
|
104
|
+
dataIndex: "sysStatus",
|
|
105
|
+
title: "订单系统状态",
|
|
103
106
|
width: 150,
|
|
104
107
|
render: function render(val) {
|
|
105
108
|
return KM_ORDER_STATUS[val] || val;
|
|
106
109
|
}
|
|
107
110
|
}, {
|
|
108
|
-
dataIndex:
|
|
109
|
-
title:
|
|
111
|
+
dataIndex: "billTag",
|
|
112
|
+
title: "订单标签",
|
|
110
113
|
width: 150,
|
|
111
114
|
render: function render(val) {
|
|
112
|
-
return Array.isArray(val) ? val.join(
|
|
115
|
+
return Array.isArray(val) ? val.join(",") : val;
|
|
113
116
|
}
|
|
114
117
|
}]
|
|
115
118
|
};
|
|
@@ -118,7 +121,7 @@ var updateKmItemListHandle = function updateKmItemListHandle(list, type, comList
|
|
|
118
121
|
if (type === "logistics") {
|
|
119
122
|
var _comList$find, _currentCom$component;
|
|
120
123
|
var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
|
|
121
|
-
return item.workOrderComponentType ===
|
|
124
|
+
return item.workOrderComponentType === "KM_LOGISTICS";
|
|
122
125
|
});
|
|
123
126
|
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
124
127
|
if (notOrderBack) {
|
|
@@ -133,7 +136,7 @@ var updateKmItemListHandle = function updateKmItemListHandle(list, type, comList
|
|
|
133
136
|
} else if (type === "send") {
|
|
134
137
|
var _comList$find2, _currentCom$component2;
|
|
135
138
|
var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
|
|
136
|
-
return item.workOrderComponentType ===
|
|
139
|
+
return item.workOrderComponentType === "KM_SEND_GOOD";
|
|
137
140
|
});
|
|
138
141
|
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
139
142
|
if (_notOrderBack) {
|
|
@@ -159,9 +162,8 @@ var updateKmItemListHandle = function updateKmItemListHandle(list, type, comList
|
|
|
159
162
|
items: items
|
|
160
163
|
};
|
|
161
164
|
if (type === "logistics") {
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
// params.logisticsCode = next?.logisticsNo;
|
|
165
|
+
params.logisticsCompany = next === null || next === void 0 ? void 0 : next.expressCompanyName;
|
|
166
|
+
params.logisticsCode = next === null || next === void 0 ? void 0 : next.outSid;
|
|
165
167
|
} else if (type === "send") {
|
|
166
168
|
params.sendId = next.warehouseId;
|
|
167
169
|
// 名字是一个下拉框,最终存的是id,所以这个地方要用warehouseNo反填
|
|
@@ -251,6 +253,7 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
|
|
|
251
253
|
};
|
|
252
254
|
})
|
|
253
255
|
},
|
|
256
|
+
kmLogistics: updateKmItemListHandle(trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
254
257
|
kmSendGood: updateKmItemListHandle(trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
|
|
255
258
|
};
|
|
256
259
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export default (function (key) {
|
|
2
|
-
return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "checkbox", "multSelect", "rate", "picture", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "label", "kmSendGood", "kmSendId", "kmSendName", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods"].reduce(function (cur, nxt) {
|
|
2
|
+
return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "checkbox", "multSelect", "rate", "picture", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "label", "kmSendGood", "kmSendId", "kmSendName", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList"].reduce(function (cur, nxt) {
|
|
3
3
|
return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
|
|
4
4
|
}, false);
|
|
5
5
|
});
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.0.0",
|
|
3
|
+
"version": "2.0.2-beta.0",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
8
8
|
],
|
|
9
9
|
"scripts": {
|
|
10
|
-
"sync": "yarn build && yalc push",
|
|
11
10
|
"build": "yarn run lint && father build",
|
|
12
11
|
"jest:init": "jest --init",
|
|
13
12
|
"lint": "eslint . --ext .ts",
|
|
14
13
|
"lint:fix": "npx eslint . --ext .ts --fix",
|
|
14
|
+
"sync": "yarn build && yalc push",
|
|
15
15
|
"test": "jest"
|
|
16
16
|
},
|
|
17
17
|
"lint-staged": {
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "6cdb5286c45bf44211747254faca8cf9cc8712af",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|