@kmkf-fe-packages/services-components 2.10.28 → 2.10.29

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

@@ -31,7 +31,7 @@ declare class BasicPosting implements ComponentInterface {
     sortColumns: SortColumnsField;
     headerProvince: boolean;
     constructor(options: PickOption);
-    getChildren: () => (City | Detail | District | Province | ReceiverMobile | ReceiverName | undefined)[];
+    getChildren: () => (Province | City | District | Detail | ReceiverName | ReceiverMobile | undefined)[];
     getSortColumns: (sortColumns: string | undefined) => SortColumnsField;
     renderPc: (value: any, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/Public/AsyncSelect/index.js

@@ -14,7 +14,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { AsyncSelect as BasicAsyncSelect } from "@kmkf-fe-packages/basic-components";
-import { isNull, servers } from "@kmkf-fe-packages/kmkf-utils";
+import { servers } from "@kmkf-fe-packages/kmkf-utils";
 import ItemView from "../../../commonComponents/ItemView";
 import { filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../../constant";
@@ -30,24 +30,6 @@ var typeMap = {
     name: "旺店通标签",
     mode: "multiple",
     api: servers.WDT.getTagsDataAsync,
-    //旗舰版暂时限制最多选择一个
-    maxSelectCount: function maxSelectCount() {
-      var version = "flagship";
-      try {
-        var userInfo = JSON.parse(localStorage.getItem("reduxData_userInfo") || "{}");
-        if (isNull(userInfo)) {
-          version = "flagship";
-        } else {
-          var _userInfo$companyUser, _companyUserConfig, _companyUserConfig$pl, _companyUserConfig$pl2;
-          var companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
-          if (typeof companyUserConfig === "string") {
-            companyUserConfig = JSON.parse(companyUserConfig);
-          }
-          version = ((_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl = _companyUserConfig.plugins) === null || _companyUserConfig$pl === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig$pl.wdt) === null || _companyUserConfig$pl2 === void 0 ? void 0 : _companyUserConfig$pl2.version) || "flagship";
-        }
-      } catch (error) {}
-      if (version === "flagship") return 1;
-    },
     handleOptions: function handleOptions(options) {
       var ext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var _ext$componentConfig = ext.componentConfig,
@@ -61,6 +43,25 @@ var typeMap = {
     }
   }
 };
+var getWdtVersion = function getWdtVersion() {
+  try {
+    var _userInfo$companyUser, _companyUserConfig, _companyUserConfig$pl, _companyUserConfig$pl2;
+    var userInfo = JSON.parse(localStorage.getItem("reduxData_userInfo") || "{}");
+    var companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
+    if (typeof companyUserConfig === "string") {
+      companyUserConfig = JSON.parse(companyUserConfig);
+    }
+    return ((_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl = _companyUserConfig.plugins) === null || _companyUserConfig$pl === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig$pl.wdt) === null || _companyUserConfig$pl2 === void 0 ? void 0 : _companyUserConfig$pl2.version) || "flagship";
+  } catch (error) {
+    return "flagship";
+  }
+};
+var getWdtTagsMaxSelectCount = function getWdtTagsMaxSelectCount() {
+  var componentConfig = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  if (componentConfig.selectMode === "single") return 1;
+  if (componentConfig.selectMode === "multiple") return undefined;
+  return getWdtVersion() === "flagship" ? 1 : undefined;
+};
 var AsyncSelect = /*#__PURE__*/function () {
   // options: ComponentInterface["options"];
 
@@ -196,7 +197,7 @@ var AsyncSelect = /*#__PURE__*/function () {
     this.rules = [];
     this.align = "left";
     this.mode = (_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.mode;
-    this.maxSelectCount = typeof ((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.maxSelectCount) === "function" ? typeMap[options.type].maxSelectCount() : (_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.maxSelectCount;
+    this.maxSelectCount = options.type === "WDT_TAGS" ? getWdtTagsMaxSelectCount(this.componentConfig) : typeof ((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.maxSelectCount) === "function" ? typeMap[options.type].maxSelectCount() : (_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.maxSelectCount;
     this.getOptionsAsync().then(function (list) {
       _this.asyncOptions = list;
     });

package/dist/esm/components/Public/Goods/index.js

@@ -14,7 +14,7 @@ import { BsGoodsTable } from "../../Common";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
-import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
+import { CommonGoods as Goods, erpFormValidator } from "@kmkf-fe-packages/basic-components";
 import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 import { SYMBOL } from "../../../constant";
 var CONFIG_MAP = {
@@ -41,7 +41,15 @@ var CONFIG_MAP = {
   },
   DXD_SUPPLIERS: {
     name: "大希地供应商",
-    key: "dxdSuppliers"
+    key: "dxdSuppliers",
+    validator: function validator(_rule, value, type, componentConfig) {
+      if (!_rule.required) return Promise.resolve();
+      var validatorResult = erpFormValidator(_rule, value, type, componentConfig);
+      if (validatorResult) {
+        return validatorResult;
+      }
+      return Promise.resolve();
+    }
   },
   TTX_GOODS: {
     name: "通天晓",
@@ -163,17 +171,26 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
   }));
   this.children = [this.headers];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
-  this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
-    required: true,
+  var isRequired = !!(this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required);
+  this.rules = [{
+    required: isRequired,
     validator: function validator(_, value) {
       var _value$key;
-      if (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length)) {
+      if (isRequired && (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length))) {
         var _CONFIG_MAP$_this$typ6;
         return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat((_CONFIG_MAP$_this$typ6 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ6 === void 0 ? void 0 : _CONFIG_MAP$_this$typ6.name, "\u5546\u54C1")));
       }
       return Promise.resolve();
     }
-  }] : [];
+  }, {
+    required: isRequired,
+    validator: function validator(_rule, value) {
+      var _CONFIG_MAP$_this$typ7, _CONFIG_MAP$_this$typ8;
+      return ((_CONFIG_MAP$_this$typ7 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ7 === void 0 ? void 0 : (_CONFIG_MAP$_this$typ8 = _CONFIG_MAP$_this$typ7.validator) === null || _CONFIG_MAP$_this$typ8 === void 0 ? void 0 : _CONFIG_MAP$_this$typ8.call(_CONFIG_MAP$_this$typ7, _rule, value, _this.type, _this.componentConfig)) || function () {
+        return Promise.resolve();
+      };
+    }
+  }];
   this.dataType = "object";
   this.sortChildField = this.getSortChildFields();
   this.exampleValue = ((_CONFIG_MAP$this$type2 = CONFIG_MAP[this.type]) === null || _CONFIG_MAP$this$type2 === void 0 ? void 0 : _CONFIG_MAP$this$type2.exampleValue) || "";

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, 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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, DxdShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonMultiStatus | JstSendGood | LogisticsInterception | LogisticsMoreInterception | AsyncSelect | PublicGoods | ERemark | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
+export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | JstSendGood | AsyncSelect | PublicGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.10.28",
+  "version": "2.10.29",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.10.28",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.28",
+    "@kmkf-fe-packages/basic-components": "2.10.29",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.29",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6214b113903df9c8f0bffb7106bd36bf39240a21",
+  "gitHead": "bc7629679c5254fa413acb1b6bb74c06aae65cba",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }