@bit-sun/business-component 4.2.0-alpha.6.12 → 4.2.0-alpha.6.15
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.
|
@@ -141,7 +141,7 @@ declare class DataValidation extends React.Component {
|
|
|
141
141
|
naturalCompare: (a: any, b: any) => any;
|
|
142
142
|
customSort: (a: any, b: any) => any;
|
|
143
143
|
sortData: (sorterKey: string) => void;
|
|
144
|
-
resetData: () => void
|
|
144
|
+
resetData: () => Promise<void>;
|
|
145
145
|
filterData: (type: string) => void;
|
|
146
146
|
toggleData: () => void;
|
|
147
147
|
onChange: (e: any) => void;
|
package/dist/index.esm.js
CHANGED
|
@@ -2987,95 +2987,109 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
2987
2987
|
data: luckysheet.transToCellData(newData)
|
|
2988
2988
|
});
|
|
2989
2989
|
};
|
|
2990
|
-
_this.resetData = function () {
|
|
2990
|
+
_this.resetData = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
2991
2991
|
var _customerColumnsMappi;
|
|
2992
|
-
var _this$props
|
|
2993
|
-
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2997
|
-
|
|
2998
|
-
|
|
2999
|
-
isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
|
|
3000
|
-
customerColumnsMapping = _this$props.customerColumnsMapping,
|
|
3001
|
-
checkSharedValue = _this$props.checkSharedValue;
|
|
3002
|
-
var resultData = _this.getData().filter(function (d) {
|
|
3003
|
-
return _.compact(Object.values(d)).length;
|
|
3004
|
-
});
|
|
3005
|
-
var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
|
|
3006
|
-
return !!(c === null || c === void 0 ? void 0 : c.name);
|
|
3007
|
-
})) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
|
|
3008
|
-
return c.name;
|
|
3009
|
-
}) : columns;
|
|
3010
|
-
// 处理业务参数
|
|
3011
|
-
var otherParams = {};
|
|
3012
|
-
if (isBrandAuth) {
|
|
3013
|
-
otherParams = {
|
|
3014
|
-
brandAuth: 'ctl-withAuth'
|
|
3015
|
-
};
|
|
3016
|
-
}
|
|
3017
|
-
// 处理校验参数，隐藏校验参数（公用的部分）
|
|
3018
|
-
if (checkSharedValue) {
|
|
3019
|
-
resultData = resultData.map(function (d) {
|
|
3020
|
-
return _objectSpread2(_objectSpread2({}, d), checkSharedValue);
|
|
3021
|
-
});
|
|
3022
|
-
}
|
|
3023
|
-
requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
|
|
3024
|
-
columns: resultColumns,
|
|
3025
|
-
data: resultData,
|
|
3026
|
-
checkStockNum: isCheckStockNum
|
|
3027
|
-
})).then(function (result) {
|
|
3028
|
-
result = result.data;
|
|
3029
|
-
if (judgeIsRequestError(result)) {
|
|
3030
|
-
message$1.error(result.msg);
|
|
3031
|
-
return;
|
|
3032
|
-
}
|
|
3033
|
-
var items = _this.state.items;
|
|
3034
|
-
var validIndex = items.length;
|
|
3035
|
-
var res = result.data;
|
|
3036
|
-
var sheetData = luckysheet.getSheetData();
|
|
3037
|
-
sheetData.map(function (item, index) {
|
|
3038
|
-
if (!res[index]) return item;
|
|
3039
|
-
var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
|
|
3040
|
-
return i === 'skuCode';
|
|
3041
|
-
});
|
|
3042
|
-
if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
|
|
3043
|
-
return i === 'skuCode';
|
|
3044
|
-
})) && item[changeVMIndex].v !== res[index].skuCode) {
|
|
3045
|
-
item[changeVMIndex].v = res[index].skuCode;
|
|
3046
|
-
item[changeVMIndex].m = res[index].skuCode;
|
|
3047
|
-
}
|
|
3048
|
-
if (res[index].flag) {
|
|
3049
|
-
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3050
|
-
v: '通过',
|
|
3051
|
-
m: '通过',
|
|
3052
|
-
fc: 'green' //字体颜色为 "#990000"
|
|
3053
|
-
});
|
|
3054
|
-
} else {
|
|
3055
|
-
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3056
|
-
v: res[index].checkResults,
|
|
3057
|
-
m: res[index].checkResults,
|
|
3058
|
-
fc: 'red' //字体颜色为 "#990000"
|
|
2992
|
+
var _this$props, validDataUrl, validDataParams, updateData, columns, isBrandAuth, _this$props$isCheckSt, isCheckStockNum, customerColumnsMapping, checkSharedValue, beforeCheckCallback, resultData, resultColumns, otherParams;
|
|
2993
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
2994
|
+
while (1) switch (_context.prev = _context.next) {
|
|
2995
|
+
case 0:
|
|
2996
|
+
_this$props = _this.props, validDataUrl = _this$props.validDataUrl, validDataParams = _this$props.validDataParams, updateData = _this$props.updateData, columns = _this$props.columns, isBrandAuth = _this$props.isBrandAuth, _this$props$isCheckSt = _this$props.isCheckStockNum, isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt, customerColumnsMapping = _this$props.customerColumnsMapping, checkSharedValue = _this$props.checkSharedValue, beforeCheckCallback = _this$props.beforeCheckCallback;
|
|
2997
|
+
resultData = _this.getData().filter(function (d) {
|
|
2998
|
+
return _.compact(Object.values(d)).length;
|
|
3059
2999
|
});
|
|
3060
|
-
|
|
3061
|
-
|
|
3062
|
-
|
|
3063
|
-
|
|
3064
|
-
|
|
3065
|
-
|
|
3066
|
-
|
|
3067
|
-
|
|
3068
|
-
|
|
3069
|
-
|
|
3070
|
-
|
|
3071
|
-
|
|
3072
|
-
|
|
3073
|
-
|
|
3074
|
-
|
|
3075
|
-
|
|
3076
|
-
|
|
3077
|
-
|
|
3078
|
-
|
|
3000
|
+
resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
|
|
3001
|
+
return !!(c === null || c === void 0 ? void 0 : c.name);
|
|
3002
|
+
})) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
|
|
3003
|
+
return c.name;
|
|
3004
|
+
}) : columns; // 处理业务参数
|
|
3005
|
+
otherParams = {};
|
|
3006
|
+
if (isBrandAuth) {
|
|
3007
|
+
otherParams = {
|
|
3008
|
+
brandAuth: 'ctl-withAuth'
|
|
3009
|
+
};
|
|
3010
|
+
}
|
|
3011
|
+
// 处理校验参数，隐藏校验参数（公用的部分）
|
|
3012
|
+
if (checkSharedValue) {
|
|
3013
|
+
resultData = resultData.map(function (d) {
|
|
3014
|
+
return _objectSpread2(_objectSpread2({}, d), checkSharedValue);
|
|
3015
|
+
});
|
|
3016
|
+
}
|
|
3017
|
+
// 调用回调函数
|
|
3018
|
+
if (!beforeCheckCallback) {
|
|
3019
|
+
_context.next = 12;
|
|
3020
|
+
break;
|
|
3021
|
+
}
|
|
3022
|
+
_context.next = 9;
|
|
3023
|
+
return beforeCheckCallback(resultData);
|
|
3024
|
+
case 9:
|
|
3025
|
+
resultData = _context.sent;
|
|
3026
|
+
if (resultData) {
|
|
3027
|
+
_context.next = 12;
|
|
3028
|
+
break;
|
|
3029
|
+
}
|
|
3030
|
+
return _context.abrupt("return");
|
|
3031
|
+
case 12:
|
|
3032
|
+
requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
|
|
3033
|
+
columns: resultColumns,
|
|
3034
|
+
data: resultData,
|
|
3035
|
+
checkStockNum: isCheckStockNum
|
|
3036
|
+
})).then(function (result) {
|
|
3037
|
+
result = result.data;
|
|
3038
|
+
if (judgeIsRequestError(result)) {
|
|
3039
|
+
message$1.error(result.msg);
|
|
3040
|
+
return;
|
|
3041
|
+
}
|
|
3042
|
+
var items = _this.state.items;
|
|
3043
|
+
var validIndex = items.length;
|
|
3044
|
+
var res = result.data;
|
|
3045
|
+
var sheetData = luckysheet.getSheetData();
|
|
3046
|
+
sheetData.map(function (item, index) {
|
|
3047
|
+
if (!res[index]) return item;
|
|
3048
|
+
var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
|
|
3049
|
+
return i === 'skuCode';
|
|
3050
|
+
});
|
|
3051
|
+
if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
|
|
3052
|
+
return i === 'skuCode';
|
|
3053
|
+
})) && item[changeVMIndex].v !== res[index].skuCode) {
|
|
3054
|
+
item[changeVMIndex].v = res[index].skuCode;
|
|
3055
|
+
item[changeVMIndex].m = res[index].skuCode;
|
|
3056
|
+
}
|
|
3057
|
+
if (res[index].flag) {
|
|
3058
|
+
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3059
|
+
v: '通过',
|
|
3060
|
+
m: '通过',
|
|
3061
|
+
fc: 'green' //字体颜色为 "#990000"
|
|
3062
|
+
});
|
|
3063
|
+
} else {
|
|
3064
|
+
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3065
|
+
v: res[index].checkResults,
|
|
3066
|
+
m: res[index].checkResults,
|
|
3067
|
+
fc: 'red' //字体颜色为 "#990000"
|
|
3068
|
+
});
|
|
3069
|
+
}
|
|
3070
|
+
item[validIndex].ct = {
|
|
3071
|
+
fa: 'General',
|
|
3072
|
+
t: 'g'
|
|
3073
|
+
};
|
|
3074
|
+
});
|
|
3075
|
+
// sheetData.map((item, index) => {
|
|
3076
|
+
// luckysheet.setCellValue(index + 1, 4, 345)
|
|
3077
|
+
// })
|
|
3078
|
+
luckysheet.create(_this.setConfig(luckysheet.transToCellData(sheetData)));
|
|
3079
|
+
_this.setState({
|
|
3080
|
+
data: luckysheet.transToCellData(sheetData),
|
|
3081
|
+
errorListCheck: false,
|
|
3082
|
+
resultData: res
|
|
3083
|
+
});
|
|
3084
|
+
console.log(setExportData);
|
|
3085
|
+
setExportData([123123]);
|
|
3086
|
+
}).catch(function (err) {});
|
|
3087
|
+
case 13:
|
|
3088
|
+
case "end":
|
|
3089
|
+
return _context.stop();
|
|
3090
|
+
}
|
|
3091
|
+
}, _callee);
|
|
3092
|
+
}));
|
|
3079
3093
|
_this.filterData = function (type) {
|
|
3080
3094
|
var _this$state = _this.state,
|
|
3081
3095
|
showErrorData = _this$state.showErrorData,
|
|
@@ -3232,8 +3246,8 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3232
3246
|
if (!(res === null || res === void 0 ? void 0 : res[index])) return item;
|
|
3233
3247
|
var rowItem = res[index];
|
|
3234
3248
|
item === null || item === void 0 ? void 0 : item.forEach(function (element, colIndex) {
|
|
3235
|
-
var
|
|
3236
|
-
var colKey = (
|
|
3249
|
+
var _ref5;
|
|
3250
|
+
var colKey = (_ref5 = Object.keys(rowItem) || []) === null || _ref5 === void 0 ? void 0 : _ref5[colIndex];
|
|
3237
3251
|
if (!(rowItem === null || rowItem === void 0 ? void 0 : rowItem[colKey])) return element;
|
|
3238
3252
|
element.m = rowItem[colKey];
|
|
3239
3253
|
element.v = rowItem[colKey];
|
|
@@ -3309,10 +3323,10 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3309
3323
|
notExcelImport = _this$props6.notExcelImport,
|
|
3310
3324
|
excelImportConfig = _this$props6.excelImportConfig,
|
|
3311
3325
|
getTemplate = _this$props6.getTemplate;
|
|
3312
|
-
var
|
|
3313
|
-
size =
|
|
3314
|
-
accept =
|
|
3315
|
-
suffixRule =
|
|
3326
|
+
var _ref6 = excelImportConfig || {},
|
|
3327
|
+
size = _ref6.size,
|
|
3328
|
+
accept = _ref6.accept,
|
|
3329
|
+
suffixRule = _ref6.suffixRule;
|
|
3316
3330
|
var totalSummary = this.getCount();
|
|
3317
3331
|
var sheetMap = this.getSheetMap();
|
|
3318
3332
|
var callBackFun = this.importExcelToLuckySheet;
|
|
@@ -3338,9 +3352,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3338
3352
|
var _Object$keys;
|
|
3339
3353
|
if (!(sheetMap && ((_Object$keys = Object.keys(sheetMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length))) return;
|
|
3340
3354
|
if (info.file.status !== 'uploading') {
|
|
3341
|
-
var
|
|
3342
|
-
file =
|
|
3343
|
-
fileList =
|
|
3355
|
+
var _ref7 = info || {},
|
|
3356
|
+
file = _ref7.file,
|
|
3357
|
+
fileList = _ref7.fileList;
|
|
3344
3358
|
readerXlsxToList(file, fileList, null, null, {
|
|
3345
3359
|
callback: function callback(excelData) {
|
|
3346
3360
|
callBackFun(excelData);
|
|
@@ -12349,6 +12363,24 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12349
12363
|
}
|
|
12350
12364
|
},
|
|
12351
12365
|
initialSource: getDictionarySource$1('BUSINESS_StoreType')
|
|
12366
|
+
}, {
|
|
12367
|
+
name: "qp-brandCode-in",
|
|
12368
|
+
label: "品牌",
|
|
12369
|
+
field: {
|
|
12370
|
+
type: 'select',
|
|
12371
|
+
props: {
|
|
12372
|
+
mode: 'multiple',
|
|
12373
|
+
notFoundContent: '暂无数据',
|
|
12374
|
+
allowClear: true,
|
|
12375
|
+
showSearch: true,
|
|
12376
|
+
showArrow: true,
|
|
12377
|
+
maxTagCount: 1,
|
|
12378
|
+
optionFilterProp: 'children',
|
|
12379
|
+
filterOption: function filterOption(input, option) {
|
|
12380
|
+
return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
|
12381
|
+
}
|
|
12382
|
+
}
|
|
12383
|
+
}
|
|
12352
12384
|
}];
|
|
12353
12385
|
var _queryHeaderParams12 = getQueryHeadersList({
|
|
12354
12386
|
querySelectHeadersList: querySelectHeadersList,
|
|
@@ -12364,7 +12396,11 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12364
12396
|
'qp-type-in': '1,2'
|
|
12365
12397
|
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
|
|
12366
12398
|
'qp-status-eq': 1
|
|
12367
|
-
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))
|
|
12399
|
+
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
|
|
12400
|
+
pageSize: 5000,
|
|
12401
|
+
currentPage: 1,
|
|
12402
|
+
'ctl-withAuth': true
|
|
12403
|
+
}, getQueryHeadersItem(_queryHeaderParams12, 'ctl-withAuth'))]).then(function (x) {
|
|
12368
12404
|
var channelDisabledJude = function channelDisabledJude(data) {
|
|
12369
12405
|
return data['parentCode'] === '0';
|
|
12370
12406
|
}; // 所属销售渠道 树节点不能点判断
|
|
@@ -12374,6 +12410,7 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12374
12410
|
formatSource(x, 0, 3, tableSearchForm);
|
|
12375
12411
|
formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
|
|
12376
12412
|
formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
|
|
12413
|
+
formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
|
|
12377
12414
|
});
|
|
12378
12415
|
modalTableProps = _objectSpread2({
|
|
12379
12416
|
modalTableTitle: '选择商店',
|
package/dist/index.js
CHANGED
|
@@ -3010,95 +3010,109 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3010
3010
|
data: luckysheet.transToCellData(newData)
|
|
3011
3011
|
});
|
|
3012
3012
|
};
|
|
3013
|
-
_this.resetData = function () {
|
|
3013
|
+
_this.resetData = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
3014
3014
|
var _customerColumnsMappi;
|
|
3015
|
-
var _this$props
|
|
3016
|
-
|
|
3017
|
-
|
|
3018
|
-
|
|
3019
|
-
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
|
|
3023
|
-
customerColumnsMapping = _this$props.customerColumnsMapping,
|
|
3024
|
-
checkSharedValue = _this$props.checkSharedValue;
|
|
3025
|
-
var resultData = _this.getData().filter(function (d) {
|
|
3026
|
-
return ___default['default'].compact(Object.values(d)).length;
|
|
3027
|
-
});
|
|
3028
|
-
var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
|
|
3029
|
-
return !!(c === null || c === void 0 ? void 0 : c.name);
|
|
3030
|
-
})) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
|
|
3031
|
-
return c.name;
|
|
3032
|
-
}) : columns;
|
|
3033
|
-
// 处理业务参数
|
|
3034
|
-
var otherParams = {};
|
|
3035
|
-
if (isBrandAuth) {
|
|
3036
|
-
otherParams = {
|
|
3037
|
-
brandAuth: 'ctl-withAuth'
|
|
3038
|
-
};
|
|
3039
|
-
}
|
|
3040
|
-
// 处理校验参数，隐藏校验参数（公用的部分）
|
|
3041
|
-
if (checkSharedValue) {
|
|
3042
|
-
resultData = resultData.map(function (d) {
|
|
3043
|
-
return _objectSpread2(_objectSpread2({}, d), checkSharedValue);
|
|
3044
|
-
});
|
|
3045
|
-
}
|
|
3046
|
-
requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
|
|
3047
|
-
columns: resultColumns,
|
|
3048
|
-
data: resultData,
|
|
3049
|
-
checkStockNum: isCheckStockNum
|
|
3050
|
-
})).then(function (result) {
|
|
3051
|
-
result = result.data;
|
|
3052
|
-
if (judgeIsRequestError(result)) {
|
|
3053
|
-
antd.message.error(result.msg);
|
|
3054
|
-
return;
|
|
3055
|
-
}
|
|
3056
|
-
var items = _this.state.items;
|
|
3057
|
-
var validIndex = items.length;
|
|
3058
|
-
var res = result.data;
|
|
3059
|
-
var sheetData = luckysheet.getSheetData();
|
|
3060
|
-
sheetData.map(function (item, index) {
|
|
3061
|
-
if (!res[index]) return item;
|
|
3062
|
-
var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
|
|
3063
|
-
return i === 'skuCode';
|
|
3064
|
-
});
|
|
3065
|
-
if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
|
|
3066
|
-
return i === 'skuCode';
|
|
3067
|
-
})) && item[changeVMIndex].v !== res[index].skuCode) {
|
|
3068
|
-
item[changeVMIndex].v = res[index].skuCode;
|
|
3069
|
-
item[changeVMIndex].m = res[index].skuCode;
|
|
3070
|
-
}
|
|
3071
|
-
if (res[index].flag) {
|
|
3072
|
-
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3073
|
-
v: '通过',
|
|
3074
|
-
m: '通过',
|
|
3075
|
-
fc: 'green' //字体颜色为 "#990000"
|
|
3076
|
-
});
|
|
3077
|
-
} else {
|
|
3078
|
-
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3079
|
-
v: res[index].checkResults,
|
|
3080
|
-
m: res[index].checkResults,
|
|
3081
|
-
fc: 'red' //字体颜色为 "#990000"
|
|
3015
|
+
var _this$props, validDataUrl, validDataParams, updateData, columns, isBrandAuth, _this$props$isCheckSt, isCheckStockNum, customerColumnsMapping, checkSharedValue, beforeCheckCallback, resultData, resultColumns, otherParams;
|
|
3016
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
3017
|
+
while (1) switch (_context.prev = _context.next) {
|
|
3018
|
+
case 0:
|
|
3019
|
+
_this$props = _this.props, validDataUrl = _this$props.validDataUrl, validDataParams = _this$props.validDataParams, updateData = _this$props.updateData, columns = _this$props.columns, isBrandAuth = _this$props.isBrandAuth, _this$props$isCheckSt = _this$props.isCheckStockNum, isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt, customerColumnsMapping = _this$props.customerColumnsMapping, checkSharedValue = _this$props.checkSharedValue, beforeCheckCallback = _this$props.beforeCheckCallback;
|
|
3020
|
+
resultData = _this.getData().filter(function (d) {
|
|
3021
|
+
return ___default['default'].compact(Object.values(d)).length;
|
|
3082
3022
|
});
|
|
3083
|
-
|
|
3084
|
-
|
|
3085
|
-
|
|
3086
|
-
|
|
3087
|
-
|
|
3088
|
-
|
|
3089
|
-
|
|
3090
|
-
|
|
3091
|
-
|
|
3092
|
-
|
|
3093
|
-
|
|
3094
|
-
|
|
3095
|
-
|
|
3096
|
-
|
|
3097
|
-
|
|
3098
|
-
|
|
3099
|
-
|
|
3100
|
-
|
|
3101
|
-
|
|
3023
|
+
resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
|
|
3024
|
+
return !!(c === null || c === void 0 ? void 0 : c.name);
|
|
3025
|
+
})) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
|
|
3026
|
+
return c.name;
|
|
3027
|
+
}) : columns; // 处理业务参数
|
|
3028
|
+
otherParams = {};
|
|
3029
|
+
if (isBrandAuth) {
|
|
3030
|
+
otherParams = {
|
|
3031
|
+
brandAuth: 'ctl-withAuth'
|
|
3032
|
+
};
|
|
3033
|
+
}
|
|
3034
|
+
// 处理校验参数，隐藏校验参数（公用的部分）
|
|
3035
|
+
if (checkSharedValue) {
|
|
3036
|
+
resultData = resultData.map(function (d) {
|
|
3037
|
+
return _objectSpread2(_objectSpread2({}, d), checkSharedValue);
|
|
3038
|
+
});
|
|
3039
|
+
}
|
|
3040
|
+
// 调用回调函数
|
|
3041
|
+
if (!beforeCheckCallback) {
|
|
3042
|
+
_context.next = 12;
|
|
3043
|
+
break;
|
|
3044
|
+
}
|
|
3045
|
+
_context.next = 9;
|
|
3046
|
+
return beforeCheckCallback(resultData);
|
|
3047
|
+
case 9:
|
|
3048
|
+
resultData = _context.sent;
|
|
3049
|
+
if (resultData) {
|
|
3050
|
+
_context.next = 12;
|
|
3051
|
+
break;
|
|
3052
|
+
}
|
|
3053
|
+
return _context.abrupt("return");
|
|
3054
|
+
case 12:
|
|
3055
|
+
requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
|
|
3056
|
+
columns: resultColumns,
|
|
3057
|
+
data: resultData,
|
|
3058
|
+
checkStockNum: isCheckStockNum
|
|
3059
|
+
})).then(function (result) {
|
|
3060
|
+
result = result.data;
|
|
3061
|
+
if (judgeIsRequestError(result)) {
|
|
3062
|
+
antd.message.error(result.msg);
|
|
3063
|
+
return;
|
|
3064
|
+
}
|
|
3065
|
+
var items = _this.state.items;
|
|
3066
|
+
var validIndex = items.length;
|
|
3067
|
+
var res = result.data;
|
|
3068
|
+
var sheetData = luckysheet.getSheetData();
|
|
3069
|
+
sheetData.map(function (item, index) {
|
|
3070
|
+
if (!res[index]) return item;
|
|
3071
|
+
var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
|
|
3072
|
+
return i === 'skuCode';
|
|
3073
|
+
});
|
|
3074
|
+
if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
|
|
3075
|
+
return i === 'skuCode';
|
|
3076
|
+
})) && item[changeVMIndex].v !== res[index].skuCode) {
|
|
3077
|
+
item[changeVMIndex].v = res[index].skuCode;
|
|
3078
|
+
item[changeVMIndex].m = res[index].skuCode;
|
|
3079
|
+
}
|
|
3080
|
+
if (res[index].flag) {
|
|
3081
|
+
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3082
|
+
v: '通过',
|
|
3083
|
+
m: '通过',
|
|
3084
|
+
fc: 'green' //字体颜色为 "#990000"
|
|
3085
|
+
});
|
|
3086
|
+
} else {
|
|
3087
|
+
item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
|
|
3088
|
+
v: res[index].checkResults,
|
|
3089
|
+
m: res[index].checkResults,
|
|
3090
|
+
fc: 'red' //字体颜色为 "#990000"
|
|
3091
|
+
});
|
|
3092
|
+
}
|
|
3093
|
+
item[validIndex].ct = {
|
|
3094
|
+
fa: 'General',
|
|
3095
|
+
t: 'g'
|
|
3096
|
+
};
|
|
3097
|
+
});
|
|
3098
|
+
// sheetData.map((item, index) => {
|
|
3099
|
+
// luckysheet.setCellValue(index + 1, 4, 345)
|
|
3100
|
+
// })
|
|
3101
|
+
luckysheet.create(_this.setConfig(luckysheet.transToCellData(sheetData)));
|
|
3102
|
+
_this.setState({
|
|
3103
|
+
data: luckysheet.transToCellData(sheetData),
|
|
3104
|
+
errorListCheck: false,
|
|
3105
|
+
resultData: res
|
|
3106
|
+
});
|
|
3107
|
+
console.log(setExportData);
|
|
3108
|
+
setExportData([123123]);
|
|
3109
|
+
}).catch(function (err) {});
|
|
3110
|
+
case 13:
|
|
3111
|
+
case "end":
|
|
3112
|
+
return _context.stop();
|
|
3113
|
+
}
|
|
3114
|
+
}, _callee);
|
|
3115
|
+
}));
|
|
3102
3116
|
_this.filterData = function (type) {
|
|
3103
3117
|
var _this$state = _this.state,
|
|
3104
3118
|
showErrorData = _this$state.showErrorData,
|
|
@@ -3255,8 +3269,8 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3255
3269
|
if (!(res === null || res === void 0 ? void 0 : res[index])) return item;
|
|
3256
3270
|
var rowItem = res[index];
|
|
3257
3271
|
item === null || item === void 0 ? void 0 : item.forEach(function (element, colIndex) {
|
|
3258
|
-
var
|
|
3259
|
-
var colKey = (
|
|
3272
|
+
var _ref5;
|
|
3273
|
+
var colKey = (_ref5 = Object.keys(rowItem) || []) === null || _ref5 === void 0 ? void 0 : _ref5[colIndex];
|
|
3260
3274
|
if (!(rowItem === null || rowItem === void 0 ? void 0 : rowItem[colKey])) return element;
|
|
3261
3275
|
element.m = rowItem[colKey];
|
|
3262
3276
|
element.v = rowItem[colKey];
|
|
@@ -3332,10 +3346,10 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3332
3346
|
notExcelImport = _this$props6.notExcelImport,
|
|
3333
3347
|
excelImportConfig = _this$props6.excelImportConfig,
|
|
3334
3348
|
getTemplate = _this$props6.getTemplate;
|
|
3335
|
-
var
|
|
3336
|
-
size =
|
|
3337
|
-
accept =
|
|
3338
|
-
suffixRule =
|
|
3349
|
+
var _ref6 = excelImportConfig || {},
|
|
3350
|
+
size = _ref6.size,
|
|
3351
|
+
accept = _ref6.accept,
|
|
3352
|
+
suffixRule = _ref6.suffixRule;
|
|
3339
3353
|
var totalSummary = this.getCount();
|
|
3340
3354
|
var sheetMap = this.getSheetMap();
|
|
3341
3355
|
var callBackFun = this.importExcelToLuckySheet;
|
|
@@ -3361,9 +3375,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
|
|
|
3361
3375
|
var _Object$keys;
|
|
3362
3376
|
if (!(sheetMap && ((_Object$keys = Object.keys(sheetMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length))) return;
|
|
3363
3377
|
if (info.file.status !== 'uploading') {
|
|
3364
|
-
var
|
|
3365
|
-
file =
|
|
3366
|
-
fileList =
|
|
3378
|
+
var _ref7 = info || {},
|
|
3379
|
+
file = _ref7.file,
|
|
3380
|
+
fileList = _ref7.fileList;
|
|
3367
3381
|
readerXlsxToList(file, fileList, null, null, {
|
|
3368
3382
|
callback: function callback(excelData) {
|
|
3369
3383
|
callBackFun(excelData);
|
|
@@ -12372,6 +12386,24 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12372
12386
|
}
|
|
12373
12387
|
},
|
|
12374
12388
|
initialSource: getDictionarySource$1('BUSINESS_StoreType')
|
|
12389
|
+
}, {
|
|
12390
|
+
name: "qp-brandCode-in",
|
|
12391
|
+
label: "品牌",
|
|
12392
|
+
field: {
|
|
12393
|
+
type: 'select',
|
|
12394
|
+
props: {
|
|
12395
|
+
mode: 'multiple',
|
|
12396
|
+
notFoundContent: '暂无数据',
|
|
12397
|
+
allowClear: true,
|
|
12398
|
+
showSearch: true,
|
|
12399
|
+
showArrow: true,
|
|
12400
|
+
maxTagCount: 1,
|
|
12401
|
+
optionFilterProp: 'children',
|
|
12402
|
+
filterOption: function filterOption(input, option) {
|
|
12403
|
+
return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
|
12404
|
+
}
|
|
12405
|
+
}
|
|
12406
|
+
}
|
|
12375
12407
|
}];
|
|
12376
12408
|
var _queryHeaderParams12 = getQueryHeadersList({
|
|
12377
12409
|
querySelectHeadersList: querySelectHeadersList,
|
|
@@ -12387,7 +12419,11 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12387
12419
|
'qp-type-in': '1,2'
|
|
12388
12420
|
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
|
|
12389
12421
|
'qp-status-eq': 1
|
|
12390
|
-
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in'))
|
|
12422
|
+
}, getQueryHeadersItem(_queryHeaderParams12, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
|
|
12423
|
+
pageSize: 5000,
|
|
12424
|
+
currentPage: 1,
|
|
12425
|
+
'ctl-withAuth': true
|
|
12426
|
+
}, getQueryHeadersItem(_queryHeaderParams12, 'ctl-withAuth'))]).then(function (x) {
|
|
12391
12427
|
var channelDisabledJude = function channelDisabledJude(data) {
|
|
12392
12428
|
return data['parentCode'] === '0';
|
|
12393
12429
|
}; // 所属销售渠道 树节点不能点判断
|
|
@@ -12397,6 +12433,7 @@ function commonFun(type, prefixUrl, parentProps) {
|
|
|
12397
12433
|
formatSource(x, 0, 3, tableSearchForm);
|
|
12398
12434
|
formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
|
|
12399
12435
|
formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
|
|
12436
|
+
formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
|
|
12400
12437
|
});
|
|
12401
12438
|
modalTableProps = _objectSpread2({
|
|
12402
12439
|
modalTableTitle: '选择商店',
|
package/package.json
CHANGED
|
@@ -2120,6 +2120,24 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2120
2120
|
} ,
|
|
2121
2121
|
initialSource: getDictionarySource('BUSINESS_StoreType')
|
|
2122
2122
|
},
|
|
2123
|
+
{
|
|
2124
|
+
name: "qp-brandCode-in",
|
|
2125
|
+
label: "品牌",
|
|
2126
|
+
field: {
|
|
2127
|
+
type:'select',
|
|
2128
|
+
props: {
|
|
2129
|
+
mode: 'multiple',
|
|
2130
|
+
notFoundContent: '暂无数据',
|
|
2131
|
+
allowClear: true,
|
|
2132
|
+
showSearch: true,
|
|
2133
|
+
showArrow: true,
|
|
2134
|
+
maxTagCount: 1,
|
|
2135
|
+
optionFilterProp: 'children',
|
|
2136
|
+
filterOption: (input: string, option: { props: { children: string } }) =>
|
|
2137
|
+
option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
|
|
2138
|
+
},
|
|
2139
|
+
},
|
|
2140
|
+
},
|
|
2123
2141
|
]
|
|
2124
2142
|
const queryHeaderParams = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
|
|
2125
2143
|
Promise.all([
|
|
@@ -2136,12 +2154,18 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
|
|
|
2136
2154
|
loadSelectSource(`${prefixUrl.formSelectFix}/tagNode/getTree/10`, {
|
|
2137
2155
|
'qp-status-eq': 1,
|
|
2138
2156
|
},getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
|
|
2157
|
+
loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
|
|
2158
|
+
pageSize: 5000,
|
|
2159
|
+
currentPage: 1,
|
|
2160
|
+
'ctl-withAuth': true,
|
|
2161
|
+
},getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
|
|
2139
2162
|
]).then((x: any)=>{
|
|
2140
2163
|
const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
|
|
2141
2164
|
const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
|
|
2142
2165
|
formatSource(x,0, 3, tableSearchForm);
|
|
2143
2166
|
formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
|
|
2144
2167
|
formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
|
|
2168
|
+
formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
|
|
2145
2169
|
})
|
|
2146
2170
|
modalTableProps = {
|
|
2147
2171
|
modalTableTitle: '选择商店',
|
|
@@ -477,8 +477,9 @@ customSort = (a, b) => {
|
|
|
477
477
|
});
|
|
478
478
|
}
|
|
479
479
|
|
|
480
|
-
resetData = () => {
|
|
481
|
-
const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue } = this.props;
|
|
480
|
+
resetData = async () => {
|
|
481
|
+
const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true, customerColumnsMapping, checkSharedValue, beforeCheckCallback } = this.props;
|
|
482
|
+
|
|
482
483
|
let resultData = this.getData().filter(d => {
|
|
483
484
|
return _.compact(Object.values(d)).length
|
|
484
485
|
})
|
|
@@ -501,6 +502,14 @@ customSort = (a, b) => {
|
|
|
501
502
|
})
|
|
502
503
|
}
|
|
503
504
|
|
|
505
|
+
// 调用回调函数
|
|
506
|
+
if(beforeCheckCallback){
|
|
507
|
+
resultData = await beforeCheckCallback(resultData);
|
|
508
|
+
if(!resultData){
|
|
509
|
+
return;
|
|
510
|
+
}
|
|
511
|
+
}
|
|
512
|
+
|
|
504
513
|
request
|
|
505
514
|
.post(validDataUrl, {
|
|
506
515
|
...otherParams,
|