@kmkf-fe-packages/services-components 1.21.10 → 1.21.11-beta.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.
@@ -1289,6 +1289,7 @@ export var MsgContent = function MsgContent(_ref14) {
1289
1289
  _ref14$options = _ref14.options,
1290
1290
  options = _ref14$options === void 0 ? [] : _ref14$options;
1291
1291
  var msgTypeCh = {
1292
+ pdd: '拼多多',
1292
1293
  ding: '钉钉',
1293
1294
  wechat: '微信',
1294
1295
  qq: 'QQ',
@@ -1333,7 +1334,7 @@ export var MsgContent = function MsgContent(_ref14) {
1333
1334
  var key = item.msgType || 'ding';
1334
1335
  var formatMsgContent = /*#__PURE__*/React.createElement("span", {
1335
1336
  key: index
1336
- }, msgTypeCh[key], "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
1337
+ }, msgTypeCh[key] || key, "-", item.ruleName, "-", currentOption ? currentOption.label : (item === null || item === void 0 ? void 0 : item[valueKey]) || "");
1337
1338
  return /*#__PURE__*/React.createElement("div", {
1338
1339
  key: "wrap_".concat(index),
1339
1340
  style: {
@@ -163,7 +163,7 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
163
163
  return Promise.reject(new Error("请选择宝贝"));
164
164
  }
165
165
  // 如果配置了商品编码不可见,则跳过商品编码校验
166
- var hasNotId = !_this.showHeader.includes("outerId") && (value || []).some(function (item) {
166
+ var hasNotId = _this.showHeader.includes("outerId") && (value || []).some(function (item) {
167
167
  return !item.outerId;
168
168
  });
169
169
  if (hasNotId) {
@@ -115,7 +115,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
115
115
  return Promise.resolve();
116
116
  }
117
117
  var number = /^(\-|\+)?\d+(\.\d+)?$/;
118
- var mail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/;
118
+ var mail = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.([a-zA-Z]{2,})$/;
119
119
  var phone = /^1\d{10}$/;
120
120
  var testList = [];
121
121
  ((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.isNumber) && testList.push(number);
@@ -39,10 +39,15 @@ var typeMap = {
39
39
  label: '等待执行',
40
40
  color: '#e7780f'
41
41
  }, {
42
- oldValue: '等待发送',
42
+ oldValue: '不满足条件,无需执行',
43
43
  value: '不满足条件,无需执行',
44
44
  label: '不满足条件,无需执行',
45
45
  color: '#8A8A8A'
46
+ }, {
47
+ oldValue: '暂不满足条件,等待执行',
48
+ value: '暂不满足条件,等待执行',
49
+ label: '暂不满足条件,等待执行',
50
+ color: '#4D90F7'
46
51
  }],
47
52
  key: 'msgStatusValues',
48
53
  code: 'msgStatus4Search',
@@ -55,6 +60,7 @@ var typeMap = {
55
60
  }
56
61
  };
57
62
  var msgTypeCh = {
63
+ pdd: '拼多多',
58
64
  ding: '钉钉',
59
65
  wechat: '微信',
60
66
  qq: 'QQ',
@@ -134,7 +140,7 @@ var MsgStatus = /*#__PURE__*/_createClass(function MsgStatus(options) {
134
140
  return item[(_typeMap$_this$type14 = typeMap[_this.type]) === null || _typeMap$_this$type14 === void 0 ? void 0 : _typeMap$_this$type14.valueKey] === option.value;
135
141
  });
136
142
  var key = item.msgType || 'ding';
137
- return "".concat(msgTypeCh[key], "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '');
143
+ return "".concat(msgTypeCh[key] || key, "-").concat(item.ruleName, ":").concat(currentOption ? (currentOption === null || currentOption === void 0 ? void 0 : currentOption.label) || '' : (item === null || item === void 0 ? void 0 : item[(_typeMap$_this$type15 = typeMap[_this.type]) === null || _typeMap$_this$type15 === void 0 ? void 0 : _typeMap$_this$type15.valueKey]) || '');
138
144
  }).join(',');
139
145
  });
140
146
  _defineProperty(this, "editRender", function (p) {
@@ -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, BsE3Goods, BsE3Reissue } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicCascader | JstSendGood | KmErpSendGood | MsgStatus | 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 | JstSupply | BsGoods | BsE3Goods | BsE3Reissue | BsExchange | BsReissue | BsReturn | 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 | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | AfterSalesOrderId;
3
+ export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | ItemEnCode | 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 | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | BsE3Reissue | BsExchange | BsReissue | BsReturn | 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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "1.21.10",
3
+ "version": "1.21.11-beta.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": "1.21.10",
25
- "@kmkf-fe-packages/kmkf-utils": "1.21.10",
24
+ "@kmkf-fe-packages/basic-components": "1.21.11-beta.0",
25
+ "@kmkf-fe-packages/kmkf-utils": "1.21.11-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": "2472ef6ad501b258dd664d856e99a54c8b16c282",
44
+ "gitHead": "0d39a6c4c1da201edc28989162501b6fbd8e1077",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }