@kmkf-fe-packages/services-components 0.24.0 → 0.24.1-alpha.0

package/dist/esm/components/EItemEnCode/index.d.ts

@@ -1,5 +1,6 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
+import { BsHeaderGood } from "../BS/common/index";
 declare class EItemEncode implements ComponentInterface {
     name: string;
     id: string;
@@ -12,13 +13,16 @@ declare class EItemEncode implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    goods: BsHeaderGood;
+    dataType: ComponentInterface["dataType"];
+    showHeader: string[];
+    platform?: ComponentInterface["platform"];
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
-    renderPc: (value: unknown, record: Record) => React.JSX.Element;
+    renderPc: (value: unknown, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: unknown, record: Record) => any;
+    renderExport: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
         searchDefaultConditions: "like";
@@ -26,7 +30,6 @@ declare class EItemEncode implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
-    };
+    }[];
 }
 export default EItemEncode;

package/dist/esm/components/EItemEnCode/index.js

@@ -1,4 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -6,16 +8,18 @@ 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 ItemEncode from "./ItemEncode";
-import { GoodImage } from "../Common";
+import { GoodImage, TBGoodTable } from "../Common";
+import { BsHeaderGood } from "../BS/common/index";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
   var _this = this,
-    _this$componentConfig;
+    _this$componentConfig,
+    _this$componentConfig2;
   _classCallCheck(this, EItemEncode);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -28,43 +32,49 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
   _defineProperty(this, "formField", void 0);
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
+  _defineProperty(this, "goods", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "showHeader", void 0);
+  _defineProperty(this, "platform", void 0);
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    if (isNull(record === null || record === void 0 ? void 0 : record[_this.id])) return null;
+    return /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
       value: /*#__PURE__*/React.createElement(GoodImage, {
         list: record === null || record === void 0 ? void 0 : record[_this.id],
+        showHeader: _this.showHeader,
         type: "itemCode"
       })
-    }) : null;
+    });
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_itemList")]) === undefined) {
-      return /*#__PURE__*/React.createElement("span", null, "--");
-    }
-    //兼容多个商品
-    return /*#__PURE__*/React.createElement("span", {
-      onClick: function onClick(e) {
-        return e.stopPropagation();
-      }
-    }, /*#__PURE__*/React.createElement(GoodImage, {
-      list: record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_itemList")],
-      type: "itemCode"
-    }));
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: /*#__PURE__*/React.createElement(TBGoodTable, {
+        list: (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) || [],
+        showHeader: _this.showHeader
+      })
+    })) : null;
   });
   _defineProperty(this, "renderLog", function (r) {
     if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_itemList")])) return null;
-    return _this.renderPc(undefined, r);
+    return /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: /*#__PURE__*/React.createElement(GoodImage, {
+        list: r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_itemList")],
+        showHeader: _this.showHeader,
+        type: "itemCode"
+      })
+    });
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_itemList")];
   });
-  _defineProperty(this, "renderExport", function (value, record) {
-    var _ref;
-    return (_ref = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_itemList")]) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
-      return item.outerId;
-    }).join(' ');
+  _defineProperty(this, "renderExport", function () {
+    return null;
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$effects, _this$effects2;
@@ -74,7 +84,9 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
       rules: _this.rules,
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
-      component: /*#__PURE__*/React.createElement(ItemEncode, _extends({}, _this.componentConfig, {
+      component: /*#__PURE__*/React.createElement(ItemEncode, _extends({
+        isSingleRow: _this.platform === 'pc'
+      }, _this.componentConfig, {
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
         shopList: (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList,
         width: "90%"
@@ -82,50 +94,62 @@ var EItemEncode = /*#__PURE__*/_createClass(function EItemEncode(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return {
+    return [{
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_itemList"),
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'Input',
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref2;
-          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, 'itemList') || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
-            var _String;
-            return item !== null && item !== void 0 && item.outerId ? (_String = String(item === null || item === void 0 ? void 0 : item.outerId)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
-          });
-        };
-      }
-    };
+      filterComponentType: "Input"
+    }];
   });
   this.name = options.name;
   this.id = options.id;
+  this.platform = options.platform;
   this.sortField = "".concat(options.id, "_itemList");
   this.formField = "".concat(options.id, "_itemList");
   this.type = options.type;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
-  this.isCombinationComponent = false;
+  this.showHeader = ((_this$componentConfig = this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.showHeader) || ["title",
+  // 商品名称
+  "outerId",
+  // 商品编码
+  "picUrl",
+  // 图片
+  "numIid",
+  // 商品id
+  "skuId",
+  // skuId
+  "outerSkuId",
+  // sku编码
+  "propertiesName" // sku 信息
+  ];
+
+  this.isCombinationComponent = true;
   this.canSort = false;
-  this.children = [];
-  this.rules = this !== null && this !== void 0 && (_this$componentConfig = this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? [{
+  this.goods = new BsHeaderGood(_objectSpread(_objectSpread({}, options), {}, {
+    id: "".concat(options.id, "_itemList"),
+    name: "商品信息"
+  }));
+  this.children = [this.goods];
+  this.rules = this !== null && this !== void 0 && (_this$componentConfig2 = this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? [{
     required: true,
     validator: function validator(_, value) {
       if (!value || !value.length) {
-        return Promise.reject(new Error('请选择宝贝'));
+        return Promise.reject(new Error("请选择宝贝"));
       }
-      var hasNotId = (value || []).some(function (item) {
+      // 如果配置了商品编码不可见，则跳过商品编码校验
+      var hasNotId = !_this.showHeader.includes("outerId") && (value || []).some(function (item) {
         return !item.outerId;
       });
       if (hasNotId) {
-        return Promise.reject(new Error('请输入商品编码'));
+        return Promise.reject(new Error("请输入商品编码"));
       }
       return Promise.resolve();
     }
   }] : [];
-  this.dataType = 'object';
+  this.dataType = "object";
 });
 export default EItemEncode;

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, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonDataTime | CommonMultiStatus | CommonSystemOrder | CompletedUser | BasicDataTime | ItemEnCode | ItemId | ItemSelect | ErpTradeId | BasicFile | FlowCreator | FlowMarkSelect | FlowStatusSelect | FlowTag | FlowWorkOrderId | BasicGrade | Handler | HandlerDeadLine | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | Logistics | LogisticsInterception | LogisticsMoreTrajectory | LogisticsTrajectory | MsgStatus | BasicMultSelect | NodeDeadLine | NodeStayDuration | Ordinary | Payment | BasicPicture | PlatForm | BasicPosting | PrevSubmitter | BasicRadio | BasicRate | ReceiverAddress | ReceiverMobile | ReceiverName | ERemark | ReturnLogistics | BasicSelect | ShopInput | ShopName | StatusSelect | Submitter | SystemOrderNo | TemplateSelect | BasicTextArea | ThirdItemSelect | TradeDateTime | TradeId | WlnGoods | WorkOrderId;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | BsReissue | BsSystemOrder | CommonMultiStatus | CommonSystemOrder | ItemEnCode | BasicInput | JstLogistics | JstSendGood | Logistics | LogisticsMoreTrajectory | Payment | BasicPosting | TradeId | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | CommonDataTime | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | ThirdItemSelect | JstItemSelect | JstSupply | BsGoods | BsExchange | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | MsgStatus;

package/dist/esm/type.d.ts

@@ -52,6 +52,7 @@ export interface ComponentInterface {
     options?: Array<any>;
     templateId?: string;
     workOrderUniqueKey?: string;
+    platform?: PlatForm;
     /**
      * @description 组件下标
      * @deprecated 已弃用字段,后续版本不在使用
@@ -233,7 +234,7 @@ export interface ComponentInterface {
     getComponentValue: (r: Record) => any;
     formDataTransform?: (r: any) => any;
 }
-export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey">;
+export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform">;
 export declare type ColumnConfig = {
     id: string;
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.24.0",
+  "version": "0.24.1-alpha.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.24.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.24.0"
+    "@kmkf-fe-packages/basic-components": "^0.24.1-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.24.1-alpha.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "133439d300dbb2cca26ccac67026ec0190d71a84",
+  "gitHead": "fb6199d073f8d5c64a35e124c48796d64284bf24",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }