@kmkf-fe-packages/services-components 0.11.0-alpha.13 → 0.11.0-alpha.15

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

@@ -1,8 +1,8 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
-import React from 'react';
-import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
-import ExpressCompany from '../common/expressCompany';
-import ExpressCode from '../common/expressCode';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
+import React from "react";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import ExpressCompany from "../common/expressCompany";
+import ExpressCode from "../common/expressCode";
 declare class BsLogistics implements ComponentInterface {
     name: string;
     id: string;
@@ -15,13 +15,13 @@ declare class BsLogistics implements ComponentInterface {
     }[];
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
+    componentConfig: ComponentInterface["componentConfig"];
     expressDateInstance: InstanceType<typeof ExpressData>;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     expressCompany: ExpressCompany;
     expressCode: ExpressCode;
     constructor(options: PickOption);

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

@@ -8,28 +8,28 @@ 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 { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
-import some from 'lodash/some';
+import React from "react";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import some from "lodash/some";
 import GetFormItem from "../../GetFormItem";
 import { JstGoodImage } from "../../Common";
-import { JstGoods } from '@kmkf-fe-packages/basic-components';
+import { JstGoods } from "@kmkf-fe-packages/basic-components";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import ExpressCompany from "../common/expressCompany";
 import ExpressCode from "../common/expressCode";
 var typeMap = {
   BS_LOGISTICS: {
-    key: 'bsLogisticsList',
-    name: 'bs',
-    company: 'bsLogisticsCompany',
-    code: 'bsLogisticsCode'
+    key: "bsLogisticsList",
+    name: "bs",
+    company: "bsLogisticsCompany",
+    code: "bsLogisticsCode"
   },
   WLN_LOGISTICS: {
-    key: 'wlnLogisticsList',
-    name: '万里牛',
-    company: 'wlnLogisticsCompany',
-    code: 'wlnLogisticsCode'
+    key: "wlnLogisticsList",
+    name: "万里牛",
+    company: "wlnLogisticsCompany",
+    code: "wlnLogisticsCode"
   }
 };
 var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
@@ -131,24 +131,31 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.expressCompany = new ExpressCompany(_objectSpread(_objectSpread({}, options), {}, {
-    name: '物流公司',
+    name: "物流公司",
     parentName: (_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.name,
     id: "".concat(options.id, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.key, "_").concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.company),
     width: 200
   }));
   this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: '物流单号',
+    name: "物流单号",
     parentName: (_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.name,
     id: "".concat(options.id, "_").concat((_typeMap$options$type7 = typeMap[options.type]) === null || _typeMap$options$type7 === void 0 ? void 0 : _typeMap$options$type7.key, "_").concat((_typeMap$options$type8 = typeMap[options.type]) === null || _typeMap$options$type8 === void 0 ? void 0 : _typeMap$options$type8.code),
     width: 200
   }));
   this.children = [this.expressCompany, this.expressCode];
-  this.dataType = 'object';
+  this.dataType = "object";
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     required: true,
     validator: function validator(_, value) {
+      var showField = _this.componentConfig.showField;
       var hasNo = (value || []).some(function (item) {
-        return item.logisticsCompany && item.logisticsCode;
+        if (showField === "logisticsCompany") {
+          return item.logisticsCompany;
+        } else if (showField === "logisticsCode") {
+          return item.logisticsCode;
+        } else {
+          return item.logisticsCompany && item.logisticsCode;
+        }
       });
       if (!hasNo) {
         return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u7269\u6D41\u4FE1\u606F"));
@@ -158,14 +165,14 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   }] : [];
   this.expressDateInstance = ExpressData.getInstance();
   this.sortChildField = [{
-    name: '物流公司',
+    name: "物流公司",
     key: "".concat(options.id, "_").concat((_typeMap$options$type9 = typeMap[options.type]) === null || _typeMap$options$type9 === void 0 ? void 0 : _typeMap$options$type9.company),
     options: this.expressDateInstance.getExpressData(),
-    dataType: 'string'
+    dataType: "string"
   }, {
-    name: '物流单号',
+    name: "物流单号",
     key: "".concat(options.id, "_").concat((_typeMap$options$type10 = typeMap[options.type]) === null || _typeMap$options$type10 === void 0 ? void 0 : _typeMap$options$type10.code),
-    dataType: 'string'
+    dataType: "string"
   }];
 });
 export default BsLogistics;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.11.0-alpha.13",
+  "version": "0.11.0-alpha.15",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,7 +26,7 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.11.0-alpha.13",
+    "@kmkf-fe-packages/basic-components": "^0.11.0-alpha.15",
     "@kmkf-fe-packages/kmkf-utils": "^0.11.0-alpha.8"
   },
   "peerDependencies": {
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "94d336ec667e9c1ed5d32f940d79d9517b88d36c"
+  "gitHead": "884d0bdb26faabcabff679bede4eb2577943a77a"
 }