@kmkf-fe-packages/basic-components 2.2.13-beta.37 → 2.2.13-beta.41

package/dist/index.esm.js

@@ -17764,7 +17764,7 @@ var relationComponentUniqueKeyMap = {
     // 产品分类
     goodClass: {
       relationComponentKey: '8gozpyUFtA',
-      reflectKey: 'c66dt8s48A_input',
+      reflectKey: '2h8KRbxMjD_input',
       transformValue: function transformValue(value, config) {
         return goodClassTransformValue(value, config);
       }
@@ -20501,19 +20501,6 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
-          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -21800,8 +21787,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21821,6 +21809,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21857,8 +21853,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21870,7 +21874,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React.createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,

package/dist/index.js

@@ -17779,7 +17779,7 @@ var relationComponentUniqueKeyMap = {
     // 产品分类
     goodClass: {
       relationComponentKey: '8gozpyUFtA',
-      reflectKey: 'c66dt8s48A_input',
+      reflectKey: '2h8KRbxMjD_input',
       transformValue: function transformValue(value, config) {
         return goodClassTransformValue(value, config);
       }
@@ -20516,19 +20516,6 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'sellCount',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var productName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jyGoods) || []).some(function (goods) {
-          var qty = toNum$3(goods === null || goods === void 0 ? void 0 : goods.sellCount);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -21815,8 +21802,9 @@ var GoodItem$1 = function GoodItem(props) {
     var COLUMNS_INFO = COLUMNS_MAP(text);
     return COLUMNS_INFO(type);
   };
-  var newColumns = React.useMemo(function () {
-    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+  var getShowFilterColumns = React.useCallback(function (_ref2) {
+    var showHeader = _ref2.showHeader,
+      initBaseInfoColumns = _ref2.initBaseInfoColumns;
     var baseInfoColumns = [];
     var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21836,6 +21824,14 @@ var GoodItem$1 = function GoodItem(props) {
         return undefined;
       }).filter(Boolean);
     }
+    return baseInfoColumns;
+  }, [showHeader]);
+  var newColumns = React.useMemo(function () {
+    var initBaseInfoColumns = GOODS_INFO_COLUMNS();
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
     var columnList = [{
       dataIndex: '',
       title: '序号',
@@ -21872,8 +21868,16 @@ var GoodItem$1 = function GoodItem(props) {
     return columnList;
   }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderModalColumns = React.useMemo(function () {
-    var list = newColumns.filter(function (col) {
-      return !['操作', '序号'].includes(col.title);
+    var initBaseInfoColumns = COLUMNS_MAP('', {
+      operate: false,
+      disabled: true
+    })(type);
+    var baseInfoColumns = getShowFilterColumns({
+      showHeader: showHeader,
+      initBaseInfoColumns: initBaseInfoColumns
+    });
+    var list = baseInfoColumns.filter(function (col) {
+      return !['操作'].includes(col.title);
     });
     return [{
       dataIndex: '',
@@ -21885,7 +21889,7 @@ var GoodItem$1 = function GoodItem(props) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, index + 1);
       }
     }].concat(_toConsumableArray(list));
-  }, [newColumns]);
+  }, [showHeader, value, disabled, hoveredRowIndex]);
   var orderColumns = React.useMemo(function () {
     var columns = COLUMNS_MAP('', {
       operate: false,

package/dist/src/constants/systemOrderColumnsMap.d.ts

@@ -0,0 +1,66 @@
+export declare const SYSTEM_ORDER_COLUMNS_MAP: {
+    BS_SYSTEM_ORDER: {
+        title: string;
+        dataIndex: string;
+        width: number;
+    }[];
+    KM_SYSTEM_ORDER: ({
+        dataIndex: string;
+        title: string;
+        width: number;
+        render?: undefined;
+        renderExport?: undefined;
+    } | {
+        dataIndex: string;
+        title: string;
+        width: number;
+        render: (val: "WAIT_AUDIT" | "WAIT_FINANCE_AUDIT" | "WAIT_MANUAL_AUDIT" | "FINISHED_AUDIT" | "WAIT_EXPRESS_PRINT" | "SYS_STATUS_WAIT_DELIVERY_PRINT" | "WAIT_PACKAGE" | "WAIT_WEIGHT" | "WAIT_SEND_GOODS" | "WAIT_DEST_SEND_GOODS" | "SELLER_SEND_GOODS" | "FINISHED" | "CLOSED" | "CANCEL") => string;
+        renderExport: (val: "WAIT_AUDIT" | "WAIT_FINANCE_AUDIT" | "WAIT_MANUAL_AUDIT" | "FINISHED_AUDIT" | "WAIT_EXPRESS_PRINT" | "SYS_STATUS_WAIT_DELIVERY_PRINT" | "WAIT_PACKAGE" | "WAIT_WEIGHT" | "WAIT_SEND_GOODS" | "WAIT_DEST_SEND_GOODS" | "SELLER_SEND_GOODS" | "FINISHED" | "CLOSED" | "CANCEL") => string;
+    } | {
+        dataIndex: string;
+        title: string;
+        width: number;
+        render: (val: string[]) => string;
+        renderExport: (val: string[]) => string;
+    })[];
+    WLN_SYSTEM_ORDER: {
+        title: string;
+        dataIndex: string;
+        width: number;
+    }[];
+    WDT_SYSTEM_ORDER: {
+        title: string;
+        dataIndex: string;
+        width: number;
+    }[];
+    BS_E3_SYSTEM_ORDER: ({
+        title: string;
+        dataIndex: string;
+        width: number;
+        ellipsis: boolean;
+        render?: undefined;
+        renderExport?: undefined;
+    } | {
+        title: string;
+        dataIndex: string;
+        width: number;
+        ellipsis: boolean;
+        render: (val: any) => any;
+        renderExport: (val: any) => any;
+    })[];
+    GY_SYSTEM_ORDER: {
+        dataIndex: string;
+        title: string;
+        width: number;
+    }[];
+    JST_SYSTEM_ORDER: {
+        dataIndex: string;
+        title: string;
+        width: number;
+    }[];
+    JY_SYSTEM_ORDER: {
+        dataIndex: string;
+        title: string;
+        width: number;
+    }[];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.37",
+  "version": "2.2.13-beta.41",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3977215f50acaf734d943755b66458971d4451d7"
+  "gitHead": "8ec9755f3e3bba526213352ed0cea61c7050638c"
 }