@kmkf-fe-packages/services-components 1.22.1-beta.51 → 1.22.1-beta.54

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/README.md +1 -1
  2. package/dist/esm/components/Common/constants/gy.js +15 -4
  3. package/dist/esm/components/GY/GyGoods/index.js +3 -3
  4. package/dist/esm/factory.d.ts +1 -1
  5. package/package.json +4 -4
package/README.md CHANGED
@@ -2,4 +2,4 @@
2
2
 
3
3
  - 针对于自定义组件的后缀，在提交的时候是以组件类型的驼峰式来命名的
4
4
 
5
- ---1
5
+ ---11
package/dist/esm/components/Common/constants/gy.js CHANGED
@@ -1,4 +1,9 @@
1
1
  import React from "react";
2
+ var isNumberOrNumberString = function isNumberOrNumberString(value) {
3
+ if (typeof value === "number") return true;
4
+ if (typeof value === "string" && !isNaN(Number(value)) && value.trim() !== "") return true;
5
+ return false;
6
+ };
2
7
  var getColumns = function getColumns() {
3
8
  var data = {
4
9
  //管易商品信息
@@ -39,7 +44,7 @@ var getColumns = function getColumns() {
39
44
  title: "\u5B9E\u9645\u91D1\u989D",
40
45
  width: 150,
41
46
  render: function render(_, record) {
42
- return /*#__PURE__*/React.createElement("span", null, typeof record.qty === "number" && typeof record.price === "number" ? record.qty * record.price : "");
47
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : "");
43
48
  }
44
49
  }, {
45
50
  dataIndex: "originPrice",
@@ -48,7 +53,10 @@ var getColumns = function getColumns() {
48
53
  }, {
49
54
  dataIndex: "originAmount",
50
55
  title: "\u6807\u51C6\u91D1\u989D",
51
- width: 150
56
+ width: 150,
57
+ render: function render(_, record) {
58
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : "");
59
+ }
52
60
  }, {
53
61
  dataIndex: "discountFee",
54
62
  title: "\u8BA9\u5229\u91D1\u989D",
@@ -114,7 +122,7 @@ var getColumns = function getColumns() {
114
122
  title: "\u5B9E\u9645\u91D1\u989D",
115
123
  width: 150,
116
124
  render: function render(_, record) {
117
- return /*#__PURE__*/React.createElement("span", null, typeof record.qty === "number" && typeof record.price === "number" ? record.qty * record.price : "");
125
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : "");
118
126
  }
119
127
  }, {
120
128
  dataIndex: "originPrice",
@@ -123,7 +131,10 @@ var getColumns = function getColumns() {
123
131
  }, {
124
132
  dataIndex: "originAmount",
125
133
  title: "\u6807\u51C6\u91D1\u989D",
126
- width: 150
134
+ width: 150,
135
+ render: function render(_, record) {
136
+ return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : "");
137
+ }
127
138
  }, {
128
139
  dataIndex: "isGift",
129
140
  title: "\u662F\u5426\u8D60\u54C1",
package/dist/esm/components/GY/GyGoods/index.js CHANGED
@@ -40,7 +40,7 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
40
40
  label: _this.name,
41
41
  value: /*#__PURE__*/React.createElement(BsGoodsTable, {
42
42
  type: _this.type,
43
- list: (record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : _record.bsE3Goods) || [],
43
+ list: (record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : _record.gyGoods) || [],
44
44
  showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
45
45
  })
46
46
  })) : null;
@@ -111,8 +111,8 @@ var GyGoods = /*#__PURE__*/_createClass(function GyGoods(options) {
111
111
  this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
112
112
  required: true,
113
113
  validator: function validator(_, value) {
114
- var _value$bsE3Goods;
115
- if (!value || !(value !== null && value !== void 0 && (_value$bsE3Goods = value.bsE3Goods) !== null && _value$bsE3Goods !== void 0 && _value$bsE3Goods.length)) {
114
+ var _value$gyGoods;
115
+ if (!value || !(value !== null && value !== void 0 && (_value$gyGoods = value.gyGoods) !== null && _value$gyGoods !== void 0 && _value$gyGoods.length)) {
116
116
  return Promise.reject(new Error("请选择管易商品"));
117
117
  }
118
118
  return Promise.resolve();
package/dist/esm/factory.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, GyGoods, BsE3Reissue, MemberLevel } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BsLogistics | JstSendGood | MsgStatus | ReissueLogistics | 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 | Payment | JstItemSelect | JstSupply | BsSystemOrder | 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 | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue;
3
+ export declare const factory: (type: string, options: PickOption) => BsLogistics | GyGoods | JstSendGood | MsgStatus | ReissueLogistics | 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 | Payment | JstItemSelect | JstSupply | BsSystemOrder | 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 | MemberLevel | AfterSalesOrderId | GyReissue;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "1.22.1-beta.51",
3
+ "version": "1.22.1-beta.54",
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.22.1-beta.51",
25
- "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.51",
24
+ "@kmkf-fe-packages/basic-components": "1.22.1-beta.54",
25
+ "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.53",
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": "391e837fb7d4604884e841979ee2b993a7d06c9b",
44
+ "gitHead": "f2c791c4f2c83b7bb3057a5dccd4dbf22a058196",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }