@kmkf-fe-packages/services-components 1.15.0-alpha.0 → 1.15.0-beta.3

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.
Files changed (5) hide show
  1. package/dist/esm/components/TradeId/index.d.ts +5 -5
  2. package/dist/esm/components/TradeId/index.js +13 -10
  3. package/dist/esm/factory.d.ts +1 -1
  4. package/dist/esm/service/api.js +5 -2
  5. package/package.json +4 -4
package/dist/esm/components/TradeId/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { ComponentInterface, PickOption, Record, ColumnConfig } from '../../type';
2
- import React from 'react';
1
+ import { ComponentInterface, PickOption, Record, ColumnConfig } from "../../type";
2
+ import React from "react";
3
3
  declare class ETradeId implements ComponentInterface {
4
4
  name: string;
5
5
  id: string;
@@ -8,13 +8,13 @@ declare class ETradeId implements ComponentInterface {
8
8
  rules: any[];
9
9
  showContains: boolean;
10
10
  onlyContainsString: boolean;
11
- componentConfig: ComponentInterface['componentConfig'];
12
- effects: ComponentInterface['effects'];
11
+ componentConfig: ComponentInterface["componentConfig"];
12
+ effects: ComponentInterface["effects"];
13
13
  isCombinationComponent: boolean;
14
14
  formField: string;
15
15
  canSort: boolean;
16
16
  children: ComponentInterface[];
17
- dataType: ComponentInterface['dataType'];
17
+ dataType: ComponentInterface["dataType"];
18
18
  constructor(options: PickOption);
19
19
  renderClient: (record: any) => React.JSX.Element | null;
20
20
  renderPc: (value: unknown, record: Record) => React.JSX.Element;
package/dist/esm/components/TradeId/index.js CHANGED
@@ -6,11 +6,11 @@ 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 'react';
10
- import { TradeId } from '@kmkf-fe-packages/basic-components';
9
+ import React from "react";
10
+ import { TradeId } from "@kmkf-fe-packages/basic-components";
11
11
  import GetFormItem from "../GetFormItem";
12
12
  import ItemView from "../../commonComponents/ItemView";
13
- import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
13
+ import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
14
14
  import { SYMBOL, batchInput } from "../../constant";
15
15
  import CopyText from "../../commonComponents/CopyText";
16
16
  var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
@@ -48,7 +48,10 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
48
48
  return e.stopPropagation();
49
49
  }
50
50
  }, /*#__PURE__*/React.createElement(CopyText, {
51
- text: record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]
51
+ text: record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")],
52
+ style: {
53
+ color: ((record === null || record === void 0 ? void 0 : record.repeatValueKeys) || []).includes("".concat(_this.id, "_tradeId")) ? "red" : "inherit"
54
+ }
52
55
  }));
53
56
  });
54
57
  _defineProperty(this, "renderLog", function (r) {
@@ -60,13 +63,13 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
60
63
  });
61
64
  _defineProperty(this, "renderExport", function (value, record) {
62
65
  var _record;
63
- return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record !== void 0 ? _record : '--';
66
+ return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record !== void 0 ? _record : "--";
64
67
  });
65
68
  _defineProperty(this, "editRender", function (p) {
66
69
  var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$componentConfig4, _this$effects, _this$effects2;
67
70
  var onTradeIdBlur = function onTradeIdBlur(e) {
68
71
  var _p$onBlur;
69
- p === null || p === void 0 ? void 0 : (_p$onBlur = p.onBlur) === null || _p$onBlur === void 0 ? void 0 : _p$onBlur.call(p, e.target.value, 'tradeId');
72
+ p === null || p === void 0 ? void 0 : (_p$onBlur = p.onBlur) === null || _p$onBlur === void 0 ? void 0 : _p$onBlur.call(p, e.target.value, "tradeId");
70
73
  };
71
74
  return /*#__PURE__*/React.createElement(GetFormItem, {
72
75
  title: _this.name,
@@ -75,7 +78,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
75
78
  hidden: p === null || p === void 0 ? void 0 : p.hidden,
76
79
  display: p === null || p === void 0 ? void 0 : p.display,
77
80
  required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
78
- tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
81
+ tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
79
82
  component: /*#__PURE__*/React.createElement(TradeId, _extends({}, _this.componentConfig, {
80
83
  shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
81
84
  shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
@@ -92,10 +95,10 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
92
95
  // 过滤组件id
93
96
  name: item.name,
94
97
  // 过滤组件名称
95
- filterComponentType: 'Input',
98
+ filterComponentType: "Input",
96
99
  filterFn: function filterFn(value) {
97
100
  return function (i) {
98
- return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'tradeId'), value);
101
+ return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "tradeId"), value);
99
102
  };
100
103
  },
101
104
  formatFilterValue: function formatFilterValue(input) {
@@ -116,6 +119,6 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
116
119
  this.isCombinationComponent = false;
117
120
  this.canSort = true;
118
121
  this.children = [];
119
- this.dataType = 'string';
122
+ this.dataType = "string";
120
123
  });
121
124
  export default ETradeId;
package/dist/esm/factory.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, 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, KmErpSendGood, AfterSalesOrderId } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BasicCascader | StatusSelect | BasicInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | 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 | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | KmErpSendGood | AfterSalesOrderId;
3
+ export declare const factory: (type: string, options: PickOption) => BasicCascader | BasicInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | 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 | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | KmErpSendGood | AfterSalesOrderId;
package/dist/esm/service/api.js CHANGED
@@ -138,12 +138,14 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
138
138
  typeMap = {},
139
139
  statusMap = {},
140
140
  typeObj = {},
141
- statusObj = {};
141
+ statusObj = {},
142
+ mainStatusObj = {};
142
143
  expressList.forEach(function (item) {
143
144
  var _item$logisticsStatus, _item$interceptionTyp;
144
145
  if (item !== null && item !== void 0 && (_item$logisticsStatus = item.logisticsStatusList) !== null && _item$logisticsStatus !== void 0 && _item$logisticsStatus.length) {
145
146
  item.logisticsStatusList.forEach(function (t) {
146
147
  statusMap["".concat(t.value)] = t.label;
148
+ mainStatusObj["".concat(t.value)] = t.mainStatus;
147
149
  if (statusObj[t.label]) {
148
150
  statusObj[t.label] = statusObj[t.label].add(t.value);
149
151
  } else {
@@ -208,7 +210,8 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
208
210
  if (!tempObj[type]) {
209
211
  tempList.push({
210
212
  label: instance.statusNameMap[key],
211
- value: type
213
+ value: type,
214
+ mainStatus: mainStatusObj[key]
212
215
  });
213
216
  tempObj[type] = instance.statusNameMap[key];
214
217
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "1.15.0-alpha.0",
3
+ "version": "1.15.0-beta.3",
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": "1.15.0-alpha.0",
25
- "@kmkf-fe-packages/kmkf-utils": "1.15.0-alpha.0",
24
+ "@kmkf-fe-packages/basic-components": "1.15.0-beta.0",
25
+ "@kmkf-fe-packages/kmkf-utils": "1.15.0-beta.0",
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": "d1f83615fb9d8fc5d94f0f68f75cd80f22a6e893",
44
+ "gitHead": "0c2bf249c5874c900edbf119d99f734f28d316ba",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }