@kmkf-fe-packages/services-components 2.2.24 → 2.2.25

package/dist/esm/components/WDT/WdtRessuie/index.js

@@ -12,7 +12,7 @@ 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 { WdtReissue as Reissue } from "@kmkf-fe-packages/basic-components";
+import { WdtReissue as Reissue, erpFormValidator } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, BsHeaderGood, SystemOrderNo } from "../../BS/common/index";
@@ -24,7 +24,15 @@ var typeMap = {
     typeName: "wdtReissueType",
     remark: "wdtReissueType_memo",
     systemOrderNo: "wdtSystemOrderNo",
-    errMsg: "请选择旺店通补发商品"
+    errMsg: "请选择旺店通补发商品",
+    validator: function validator(_rule, value, type) {
+      if (!_rule.required) return Promise.resolve();
+      var validatorFlag = erpFormValidator(_rule, value, type);
+      if (validatorFlag) {
+        return validatorFlag;
+      }
+      return Promise.resolve();
+    }
   }
 };
 var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
@@ -95,7 +103,7 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
       component: /*#__PURE__*/React.createElement(Reissue, _extends({}, _this.componentConfig, {
         maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
@@ -176,8 +184,9 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
   }));
   this.children = [this.bsType, this.systemOrderNo, this.bsMemo, this.reissueGoods];
   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 ? void 0 : (_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.required;
+  this.rules = [{
+    required: isRequired,
     validator: function validator(_, value) {
       var _value, _typeMap$options$type6;
       if (!value || !(value !== null && value !== void 0 && (_value = value["".concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.key)]) !== null && _value !== void 0 && _value.length)) {
@@ -186,7 +195,15 @@ var WdtReissue = /*#__PURE__*/_createClass(function WdtReissue(options) {
       }
       return Promise.resolve();
     }
-  }] : [];
+  }, {
+    required: isRequired,
+    validator: function validator(_rule, value) {
+      var _typeMap$options$type8, _typeMap$options$type9;
+      return ((_typeMap$options$type8 = typeMap[options.type]) === null || _typeMap$options$type8 === void 0 ? void 0 : (_typeMap$options$type9 = _typeMap$options$type8.validator) === null || _typeMap$options$type9 === void 0 ? void 0 : _typeMap$options$type9.call(_typeMap$options$type8, _rule, value, options.type)) || function () {
+        return Promise.resolve();
+      };
+    }
+  }];
   this.dataType = "object";
 });
 export default WdtReissue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.2.24",
+  "version": "2.2.25",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,7 +21,7 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.2.24",
+    "@kmkf-fe-packages/basic-components": "2.2.25",
     "@kmkf-fe-packages/kmkf-utils": "2.2.24",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35bc1e4833e1bcb1255c9c43cb3c807d2544e88c",
+  "gitHead": "eb88c3c93e2a120ed15b41688edff56c7faaf043",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }