@kmkf-fe-packages/services-components 2.0.54-beta.0 → 2.0.54-beta.2

package/dist/esm/components/Common/constants/columnsBaseInfoMap.js

@@ -7,9 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import system from "./system";
 import bs_e3 from "./bs_e3";
 import bs from "./bs";
-import wdt from "./wdt";
-import gy from "./gy";
-import { getJstColumns, getWlnColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getWlnColumns, getGyColumns, getWdtColumns } from "@kmkf-fe-packages/basic-components";
 import defaultColumns from "./defaultColumns";
 export var getColumnsMap = function getColumnsMap(args) {
   var _ref = args || {},
@@ -17,9 +15,12 @@ export var getColumnsMap = function getColumnsMap(args) {
     text = _ref$text === void 0 ? "" : _ref$text;
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
     text: text
-  })), bs_e3()), wdt({
-    text: text
-  })), gy()), getJstColumns({
+  })), bs_e3()), getWdtColumns({
+    text: text,
+    disabled: true
+  })), getGyColumns({
+    disabled: true
+  })), getJstColumns({
     disabled: true
   })), getWlnColumns({
     text: text

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

@@ -480,16 +480,18 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
     if (isStringArray) {
       baseInfoColumns = initBaseInfoColumns.filter(function (col) {
-        return showHeader.includes(col.dataIndex);
+        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.filter(function (col) {
-        return col.show !== false;
-      }).map(function (col) {
+      baseInfoColumns = showHeader.map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol ? currentCol : undefined;
+        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
+        if (currentCol && (col.show !== false || currentCol !== null && currentCol !== void 0 && currentCol.validator)) {
+          return currentCol;
+        }
+        return undefined;
       }).filter(Boolean);
     }
     var columnList = [{

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

@@ -1,10 +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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -22,6 +18,7 @@ import ItemView from "../../commonComponents/ItemView";
 import { isNull, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
 import { BsHeaderPic, BsHeaderChild } from "../BS/common";
 import ReissueGift from "../BsE3/ReissueGift";
+import { erpColumnsMap } from "@kmkf-fe-packages/basic-components";
 var GoodHeaderMap = {
   WDT_GOODS: {
     headerMap: {
@@ -880,36 +877,36 @@ var GoodHeaderMap = {
       iId: "款式编码",
       pic: {
         component: BsHeaderPic,
-        name: '商品图片'
+        name: "商品图片"
       },
       propertiesValue: "规格值",
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       qty: "数量",
       saleAmount: {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         },
         renderExport: function renderExport(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         }
       },
@@ -917,10 +914,10 @@ var GoodHeaderMap = {
       isGift: {
         name: "是否赠品",
         transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         }
       },
       outerOiId: "子订单号"
@@ -934,35 +931,35 @@ var GoodHeaderMap = {
       iId: "款式编码",
       pic: {
         component: BsHeaderPic,
-        name: '商品图片'
+        name: "商品图片"
       },
       propertiesValue: "规格值",
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       qty: "数量",
       isGift: {
         name: "是否赠品",
         transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         }
       },
       remark: "备注"
@@ -976,36 +973,36 @@ var GoodHeaderMap = {
       iId: "款式编码",
       pic: {
         component: BsHeaderPic,
-        name: '商品图片'
+        name: "商品图片"
       },
       propertiesValue: "规格值",
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       qty: "数量",
       saleAmount: {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         },
         renderExport: function renderExport(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         }
       },
@@ -1013,10 +1010,10 @@ var GoodHeaderMap = {
       isGift: {
         name: "是否赠品",
         transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         }
       },
       remark: "备注",
@@ -1031,46 +1028,46 @@ var GoodHeaderMap = {
       iId: "款式编码",
       pic: {
         component: BsHeaderPic,
-        name: '商品图片'
+        name: "商品图片"
       },
       propertiesValue: "规格值",
       saleBasePrice: {
         name: "原价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       salePrice: {
         name: "单价",
         transformValue: function transformValue(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         },
         renderExport: function renderExport(price) {
-          return price || price === 0 ? Number(price).toFixed(2) : '';
+          return price || price === 0 ? Number(price).toFixed(2) : "";
         }
       },
       qty: "数量",
       saleAmount: {
         name: "总金额",
         transformValue: function transformValue(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         },
         renderExport: function renderExport(val, record, parentName) {
-          if (!record) return '--';
+          if (!record) return "--";
           return (record["".concat(parentName, "_qty")] || 0) * (+record["".concat(parentName, "_salePrice")] || 0);
         }
       },
       isGift: {
         name: "是否赠品",
         transformValue: function transformValue(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          return typeof val !== 'boolean' ? '' : val ? '是' : '否';
+          return typeof val !== "boolean" ? "" : val ? "是" : "否";
         }
       },
       remark: "备注"
@@ -1080,73 +1077,73 @@ var GoodHeaderMap = {
   WLN_GOODS: {
     headerMap: {
       wlnItemName: {
-        name: '商品名称',
+        name: "商品名称",
         width: 250
       },
       goodsCode: {
-        name: '商品编码',
+        name: "商品编码",
         width: 250
       },
       skuCode: {
-        name: 'sku编码',
+        name: "sku编码",
         width: 250
       },
       skuName: {
-        name: '线上sku名称',
+        name: "线上sku名称",
         width: 250
       },
       olnSkuCode: {
-        name: '线上sku编码',
+        name: "线上sku编码",
         width: 150
       },
       sku: {
-        name: '线上sku id',
+        name: "线上sku id",
         width: 150
       },
       name: {
-        name: '线上商品名称',
+        name: "线上商品名称",
         width: 250
       },
       pic: {
-        name: '线上图片',
+        name: "线上图片",
         width: 100,
         component: BsHeaderPic
       },
       olnItemCOde: {
-        name: '线上商品编码',
+        name: "线上商品编码",
         width: 150
       },
       code: {
-        name: '线上商品id',
+        name: "线上商品id",
         width: 150
       },
       barCode: {
-        name: '商品条码',
+        name: "商品条码",
         width: 150
       },
       money: {
-        name: '实付金额',
+        name: "实付金额",
         width: 100
       },
       number: {
-        name: '数量',
+        name: "数量",
         width: 100
       },
-      share: '应收款',
+      share: "应收款",
       type: {
-        name: '赠品类型',
+        name: "赠品类型",
         width: 100
       },
       isPackage: {
         width: 100,
         name: "是否组合商品",
         transformValue: function transformValue(val) {
-          if (isNull(val)) return '--';
-          return val ? '是' : '否';
+          if (isNull(val)) return "--";
+          return val ? "是" : "否";
         },
         renderExport: function renderExport(val) {
-          if (isNull(val)) return '--';
-          return val ? '是' : '否';
+          if (isNull(val)) return "--";
+          return val ? "是" : "否";
         }
       }
     },
@@ -1233,56 +1230,74 @@ var CommonHeaderGoods = /*#__PURE__*/function () {
     value: function getChildren(options) {
       var _options$componentCon,
         _this2 = this;
+      var initBaseInfoColumns = erpColumnsMap[this.type];
       var showHeader = options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.showHeader;
+
+      // 提取公共的类型判断逻辑
       var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === "string";
       var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === "[object Object]";
-      var dataIndexList = [];
-      if (isStringArray) {
-        dataIndexList = showHeader;
-      } else if (isObjectArray) {
-        dataIndexList = showHeader.map(function (item) {
-          return item.dataIndex;
-        });
-      }
+
+      // 获取需要显示的列索引列表
+      var getDataIndexList = function getDataIndexList() {
+        if (isStringArray) {
+          return showHeader;
+        }
+        if (isObjectArray) {
+          return showHeader.filter(function (item) {
+            var currentCol = initBaseInfoColumns.find(function (col) {
+              return col.dataIndex === item.dataIndex;
+            });
+            return item.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator);
+          }).map(function (item) {
+            return item.dataIndex;
+          });
+        }
+        return [];
+      };
+      var dataIndexList = getDataIndexList();
       var getKeyIndex = function getKeyIndex(id) {
         return dataIndexList.indexOf(id.split("_").pop() || "");
       };
-      var list = _toConsumableArray(Object.keys(GoodHeaderMap[this.type].headerMap).reduce(function (prv, key) {
-        if (Array.isArray(showHeader) && (isStringArray && showHeader.includes(key) || isObjectArray && showHeader.filter(function (item) {
-          return item.show !== false;
-        }).map(function (item) {
-          return item.dataIndex;
-        }).includes(key))) {
-          var _this2$itemKey;
-          var target = typeof GoodHeaderMap[_this2.type].headerMap[key] === 'string' ? {
-            component: BsHeaderChild,
-            name: GoodHeaderMap[_this2.type].headerMap[key],
-            key: key,
-            width: 80
-          } : {
-            component: GoodHeaderMap[_this2.type].headerMap[key].component || BsHeaderChild,
-            name: ((_this2$itemKey = _this2.itemKey) === null || _this2$itemKey === void 0 ? void 0 : _this2$itemKey[key]) || GoodHeaderMap[_this2.type].headerMap[key].name,
-            key: GoodHeaderMap[_this2.type].headerMap[key].key || key,
-            width: GoodHeaderMap[_this2.type].headerMap[key].width || 80,
-            transformValue: GoodHeaderMap[_this2.type].headerMap[key].transformValue,
-            renderExport: GoodHeaderMap[_this2.type].headerMap[key].renderExport
-          };
-          prv.push(new target.component(_objectSpread(_objectSpread({}, options), {}, {
-            name: target.name,
-            id: "".concat(options.id, "_").concat(target.key),
-            width: target.width,
+
+      // 创建表头组件配置
+      var createHeaderConfig = function createHeaderConfig(key) {
+        var _this2$itemKey;
+        var headerConfig = GoodHeaderMap[_this2.type].headerMap[key];
+        var isStringConfig = typeof headerConfig === "string";
+        return {
+          component: isStringConfig ? BsHeaderChild : headerConfig.component || BsHeaderChild,
+          name: isStringConfig ? headerConfig : ((_this2$itemKey = _this2.itemKey) === null || _this2$itemKey === void 0 ? void 0 : _this2$itemKey[key]) || headerConfig.name,
+          key: isStringConfig ? key : headerConfig.key || key,
+          width: isStringConfig ? 80 : headerConfig.width || 80,
+          transformValue: isStringConfig ? undefined : headerConfig.transformValue,
+          renderExport: isStringConfig ? undefined : headerConfig.renderExport
+        };
+      };
+
+      // 处理表头组件列表
+      var headerComponents = Object.keys(GoodHeaderMap[this.type].headerMap).reduce(function (acc, key) {
+        var shouldShow = Array.isArray(showHeader) && (isStringArray && showHeader.includes(key) || isObjectArray && dataIndexList.includes(key));
+        if (shouldShow) {
+          var config = createHeaderConfig(key);
+          acc.push(new config.component(_objectSpread(_objectSpread({}, options), {}, {
+            name: config.name,
+            id: "".concat(options.id, "_").concat(config.key),
+            width: config.width,
             parentName: options.id,
-            transformValue: target.transformValue,
-            renderExport: target.renderExport
+            transformValue: config.transformValue,
+            renderExport: config.renderExport
           })));
         }
-        return prv;
-      }, []).sort(function (a, b) {
+        return acc;
+      }, []);
+
+      // 排序并返回结果
+      return headerComponents.sort(function (a, b) {
         if (Array.isArray(showHeader)) {
           return getKeyIndex(a.id) - getKeyIndex(b.id);
         }
-      }));
-      return list;
+        return 0;
+      });
     }
   }]);
   return CommonHeaderGoods;

package/dist/esm/components/GY/GyReissue/index.js

@@ -12,20 +12,11 @@ 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 { GyReissue as Reissue } from "@kmkf-fe-packages/basic-components";
+import { GyReissue as Reissue, erpColumnsMap } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import CommonHeaderGoods from "../../CommonHeaderGood";
-function toNum(value) {
-  if (typeof value === "string") {
-    return value ? +value : void 0;
-  }
-  if (typeof value === "number") {
-    return value;
-  }
-  return void 0;
-}
 var typeMap = {
   GY_REISSUE_GOODS: {
     key: "gyReissueGoods",
@@ -36,16 +27,11 @@ var typeMap = {
     errMsg: "请选择管易补发商品",
     validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var goodsName = "";
-      if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-        var res = typeof qty === "number" ? qty < 1 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.goodName ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : "";
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      var qtyValidator = erpColumnsMap["GY_REISSUE_GOODS"].find(function (column) {
+        return column.dataIndex === "qty";
+      }).validator(_rule, value);
+      if (qtyValidator) {
+        return qtyValidator;
       }
       return Promise.resolve();
     }

package/dist/esm/components/GY/GyReturn/index.js

@@ -15,17 +15,8 @@ import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common";
 import CommonHeaderGoods from "../../CommonHeaderGood";
-import { GyReturn as Return } from "@kmkf-fe-packages/basic-components";
+import { GyReturn as Return, erpColumnsMap } from "@kmkf-fe-packages/basic-components";
 import { BsType, SystemOrderNo } from "../../BS/common/index";
-function toNum(value) {
-  if (typeof value === "string") {
-    return value ? +value : void 0;
-  }
-  if (typeof value === "number") {
-    return value;
-  }
-  return void 0;
-}
 var typeMap = {
   GY_RETURN_GOODS: {
     key: "gyReturnGoods",
@@ -35,16 +26,11 @@ var typeMap = {
     errMsg: "请选择管易退货商品",
     validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var goodsName = "";
-      if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
-        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-        var res = typeof qty === "number" ? qty < 1 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.goodName ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : "";
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      var qtyValidator = erpColumnsMap["GY_RETURN_GOODS"].find(function (column) {
+        return column.dataIndex === "qty";
+      }).validator(_rule, value);
+      if (qtyValidator) {
+        return qtyValidator;
       }
       return Promise.resolve();
     }

package/dist/esm/components/PicturePro/PictureUrl.d.ts

@@ -19,7 +19,6 @@ declare class PictureUrl implements ComponentInterface {
     renderPc: (value: unknown, record: Record) => React.JSX.Element;
     renderLog: () => null;
     getComponentValue: (r: Record) => any;
-    renderExport: () => null;
     editRender: () => null;
     filterConfig: () => never[];
 }

package/dist/esm/components/PicturePro/PictureUrl.js

@@ -68,9 +68,6 @@ var PictureUrl = /*#__PURE__*/_createClass(function PictureUrl(options) {
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
-  _defineProperty(this, "renderExport", function () {
-    return null;
-  });
   _defineProperty(this, "editRender", function () {
     return null;
   });

package/dist/esm/components/Public/ReissueGoods/index.d.ts

@@ -1,7 +1,7 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
 import React from "react";
 import { BsType, BsMemo, BsHeaderGood, SystemOrderNo } from "../../BS/common/index";
-import SystemOrderType from '../SystemOrderType';
+import SystemOrderType from "../SystemOrderType";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 declare class PublicReissue implements ComponentInterface {
     name: string;

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

@@ -12,53 +12,35 @@ 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 { PublicReissue as Reissue } from "@kmkf-fe-packages/basic-components";
+import { PublicReissue as Reissue, erpColumnsMap } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 import { BsGoodsTable } from "../../Common/index";
 import { BsType, BsMemo, SystemOrderNo } from "../../BS/common/index";
 import SystemOrderType from "../SystemOrderType";
 import CommonHeaderGoods from "../../CommonHeaderGood";
-function toNum(value) {
-  if (typeof value === "string") {
-    return value ? +value : void 0;
-  }
-  if (typeof value === "number") {
-    return value;
-  }
-  return void 0;
-}
 var typeMap = {
   JST_REISSUE_GOODS: {
     key: "jstReissueGoods",
     typeName: "jstReissueType",
     remark: "jstReissueType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    systemOrderBillType: 'jstSystemOrderBillType',
+    systemOrderBillType: "jstSystemOrderBillType",
     errMsg: "请选择聚水潭补发商品",
     name: "聚水潭",
-    compType: '补发',
+    compType: "补发",
     validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var goodsName = "";
-      if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-        var res = typeof qty === "number" ? qty < 1 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      var qtyValidator = erpColumnsMap["JST_REISSUE_GOODS"].find(function (column) {
+        return column.dataIndex === "qty";
+      }).validator(_rule, value);
+      if (qtyValidator) {
+        return qtyValidator;
       }
-      if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-        var v = toNum(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-        var res = typeof v === "number" ? v < 0 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
+      var salePriceValidator = erpColumnsMap["JST_REISSUE_GOODS"].find(function (column) {
+        return column.dataIndex === "salePrice";
+      }).validator(_rule, value);
+      if (salePriceValidator) {
+        return salePriceValidator;
       }
       return Promise.resolve();
     }
@@ -68,32 +50,23 @@ var typeMap = {
     typeName: "jstReturnType",
     remark: "jstReturnType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    systemOrderBillType: 'jstSystemOrderBillType',
+    systemOrderBillType: "jstSystemOrderBillType",
     errMsg: "请选择聚水潭退货商品",
     name: "聚水潭",
-    compType: '退货',
+    compType: "退货",
     validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var goodsName = "";
-      if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-        var res = typeof qty === "number" ? qty < 1 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      var qtyValidator = erpColumnsMap["JST_RETURN_GOODS"].find(function (column) {
+        return column.dataIndex === "qty";
+      }).validator(_rule, value);
+      if (qtyValidator) {
+        return qtyValidator;
       }
-      if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-        var v = toNum(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-        var res = typeof v === "number" ? v < 0 : true;
-        if (res) {
-          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-        }
-        return res;
-      })) {
-        return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
+      var salePriceValidator = erpColumnsMap["JST_RETURN_GOODS"].find(function (column) {
+        return column.dataIndex === "salePrice";
+      }).validator(_rule, value);
+      if (salePriceValidator) {
+        return salePriceValidator;
       }
       return Promise.resolve();
     }

package/package.json

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