@kmkf-fe-packages/services-components 0.7.15-alpha.80 → 0.7.15-alpha.81

package/dist/esm/components/BS/BsExchange/index.js

@@ -10,7 +10,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 import React from "react";
 import GetFormItem from "../../GetFormItem";
-import { BsGoodsTable, BsExchangeList } from "../../Common";
+import { BsGoodsTable } from "../../Common";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { BsExchange as Exchange } from "@kmkf-fe-packages/basic-components";
@@ -163,23 +163,25 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   _defineProperty(this, "swapOutGoods", void 0);
   _defineProperty(this, "giftGoods", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    var _record, _record$bsExchangeTyp, _this$componentConfig, _record2, _record2$bsExchangeTy, _this$componentConfig2, _record3, _record3$bsExchangeTy, _this$componentConfig3;
-    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), ["1", "3"].includes(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : (_record$bsExchangeTyp = _record.bsExchangeType) === null || _record$bsExchangeTyp === void 0 ? void 0 : _record$bsExchangeTyp[0]) ? /*#__PURE__*/React.createElement(ItemView, {
+    var _this$componentConfig, _this$componentConfig2, _record, _record$bsExchangeTyp, _this$componentConfig3;
+    var bsExchangeReturnGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsExchangeReturnGoods")]) || "[]");
+    var bsExchangeSwapOutGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_bsExchangeSwapOutGoods")]) || "[]");
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
-      label: "".concat(_this.name),
+      label: "".concat(_this.name, "-\u9000\u56DE"),
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
-        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeReturnGoods) || [],
+        list: bsExchangeReturnGoods || [],
         showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
       })
-    }) : null, ["2", "4"].includes(record === null || record === void 0 ? void 0 : (_record2 = record["".concat(_this.id)]) === null || _record2 === void 0 ? void 0 : (_record2$bsExchangeTy = _record2.bsExchangeType) === null || _record2$bsExchangeTy === void 0 ? void 0 : _record2$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
-      id: _this.id,
-      label: "".concat(_this.name),
-      value: /*#__PURE__*/React.createElement(BsExchangeList, {
-        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeSwapOutGoods) || [],
+    }), /*#__PURE__*/React.createElement(ItemView, {
+      id: "".concat(_this.id, "-out"),
+      label: "".concat(_this.name, "-\u6362\u51FA"),
+      value: /*#__PURE__*/React.createElement(BsGoodsTable, {
+        list: bsExchangeSwapOutGoods || [],
         showHeader: ((_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.showHeader) || []
       })
-    }) : null, ["3", "4"].includes(record === null || record === void 0 ? void 0 : (_record3 = record["".concat(_this.id)]) === null || _record3 === void 0 ? void 0 : (_record3$bsExchangeTy = _record3.bsExchangeType) === null || _record3$bsExchangeTy === void 0 ? void 0 : _record3$bsExchangeTy[0]) ? /*#__PURE__*/React.createElement(ItemView, {
-      id: _this.id,
+    }), ["3", "4"].includes(record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id)]) === null || _record === void 0 ? void 0 : (_record$bsExchangeTyp = _record.bsExchangeType) === null || _record$bsExchangeTyp === void 0 ? void 0 : _record$bsExchangeTyp[0]) && record !== null && record !== void 0 && record["".concat(_this.id)].bsExchangeGiftGoods.length ? /*#__PURE__*/React.createElement(ItemView, {
+      id: "".concat(_this.id, "-gift"),
       label: "".concat(_this.name, "-\u8D60\u54C1"),
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
         list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsExchangeGiftGoods) || [],

package/dist/esm/components/BS/BsReissue/index.d.ts

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
-import React from 'react';
-import { BsType, BsMemo, BsHeaderGood } from '../common/index';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
+import React from "react";
+import { BsType, BsMemo, BsHeaderGood } from "../common/index";
 declare class BsReissue implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
-    effects: ComponentInterface['effects'];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     bsType: BsType;
     bsMemo: BsMemo;
     reissueGoods: BsHeaderGood;

package/dist/esm/components/BS/BsReissue/index.js

@@ -8,54 +8,54 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 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; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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); }
-import React from 'react';
+import React from "react";
 import GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
-import { BsReissue as Reissue } from '@kmkf-fe-packages/basic-components';
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { BsReissue as Reissue } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common";
 import { BsType, BsMemo, BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType, BsHeaderGood } from "../common/index";
 var childHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: '图片',
-    key: 'pic'
+    name: "图片",
+    key: "pic"
   },
   name: {
     component: BsHeaderName,
-    name: '名称',
-    key: 'name'
+    name: "名称",
+    key: "name"
   },
   code: {
     component: BsHeaderCode,
-    name: '编码',
-    key: 'code'
+    name: "编码",
+    key: "code"
   },
   sku: {
     component: BsHeaderSku,
-    name: 'sku编码',
-    key: 'sku'
+    name: "sku编码",
+    key: "sku"
   },
   money: {
     component: BsHeaderMoney,
-    name: '实付金额',
-    key: 'money'
+    name: "实付金额",
+    key: "money"
   },
   number: {
     component: BsHeaderNumber,
-    name: '数量',
-    key: 'number'
+    name: "数量",
+    key: "number"
   },
   share: {
     component: BsHeaderShare,
-    name: '分摊价',
-    key: 'share'
+    name: "分摊价",
+    key: "share"
   },
   type: {
     component: BsHeaderType,
-    name: '赠品类型',
-    key: 'giftType'
+    name: "赠品类型",
+    key: "giftType"
   }
 };
 var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
@@ -79,15 +79,15 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   _defineProperty(this, "reissueGoods", void 0);
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;
-    console.log('bsreissue', record);
-    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), /*#__PURE__*/React.createElement(ItemView, {
+    console.log("bsreissue", record);
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.bsMemo.renderClient(record), record !== null && record !== void 0 && record["".concat(_this.id)].bsReissueGoods.length ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
       value: /*#__PURE__*/React.createElement(BsGoodsTable, {
         list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)].bsReissueGoods) || [],
         showHeader: ((_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || []
       })
-    })) : null;
+    }) : null) : null;
   });
   _defineProperty(this, "renderPc", function () {
     return null;
@@ -124,13 +124,13 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
       type: item.type,
       id: "".concat(item.id, "_bsReissueType"),
       name: "".concat(item.name, "-\u8865\u53D1\u7C7B\u578B"),
-      filterComponentType: 'Cascader',
+      filterComponentType: "Cascader",
       props: {
         options: item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.reasonList,
         fieldNames: {
-          label: 'label',
-          value: 'value',
-          children: 'children'
+          label: "label",
+          value: "value",
+          children: "children"
         }
       },
       formatFilterValue: function formatFilterValue(val) {
@@ -148,7 +148,7 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
       type: item.type,
       id: "".concat(item.id, "_bsReissueGoods"),
       name: "".concat(_this.name),
-      filterComponentType: 'Input'
+      filterComponentType: "Input"
     }];
   });
   this.name = options.name;
@@ -161,15 +161,15 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   this.canSort = false;
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsReissueType_type"),
-    name: '补发类型'
+    name: "补发类型"
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsReissueType_memo"),
-    name: '补发备注'
+    name: "补发备注"
   }));
   this.reissueGoods = new BsHeaderGood(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsReissueGoods"),
-    name: '商品信息'
+    name: "商品信息"
   }));
   this.children = [this.bsType, this.bsMemo, this.reissueGoods
   // ...(options?.componentConfig?.showHeader || []).reduce(
@@ -195,11 +195,11 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
     validator: function validator(_, value) {
       var _value$bsReissueGoods;
       if (!value || !(value !== null && value !== void 0 && (_value$bsReissueGoods = value.bsReissueGoods) !== null && _value$bsReissueGoods !== void 0 && _value$bsReissueGoods.length)) {
-        return Promise.reject(new Error('请选择bs补发商品'));
+        return Promise.reject(new Error("请选择bs补发商品"));
       }
       return Promise.resolve();
     }
   }] : [];
-  this.dataType = 'object';
+  this.dataType = "object";
 });
 export default BsReissue;

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsExchange | BasicFile | JstLogistics | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId;
+export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsReissue | BuyerNick | BasicCascader | BasicCheckbox | CommonDataTime | CompletedUser | BasicDataTime | ItemEnCode | ItemId | ItemSelect | ErpTradeId | BasicFile | FlowStatusSelect | FlowWorkOrderId | BasicGrade | Handler | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | Logistics | LogisticsInterception | LogisticsTrajectory | BasicMultSelect | Ordinary | Payment | BasicPicture | PlatForm | BasicPosting | BasicRadio | BasicRate | ReceiverAddress | ReceiverMobile | ReceiverName | ERemark | ReturnLogistics | BasicSelect | ShopInput | ShopName | Submitter | SystemOrderNo | TemplateSelect | BasicTextArea | ThirdItemSelect | TradeDateTime | TradeId | WorkOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.15-alpha.80",
+  "version": "0.7.15-alpha.81",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.80",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.80"
+    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.81",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.81"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "e6ac39ff8747f20ae01cfe55783171f7eafb6143"
+  "gitHead": "c37ab9de56ecb7357a7a3aa21d9e1cf66931e8ca"
 }