ls-pro-common 1.0.28 → 1.0.31

package/es/components/InputTable.js

@@ -10,7 +10,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps"],
     _excluded2 = ["current", "pageSize"];
 import React from "react";
 import { useRef, useState, useEffect, useContext } from 'react';
@@ -66,6 +66,7 @@ function InputTable(prop) {
       allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
       _prop$keepSelect = prop.keepSelect,
       keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
+      fieldProps = prop.fieldProps,
       rest = _objectWithoutProperties(prop, _excluded);
 
   var textNameProp = textName || name + '__text';
@@ -148,7 +149,6 @@ function InputTable(prop) {
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     columns: columns,
     request: loadData,
-    rowKey: valueField,
     manualRequest: false,
     actionRef: tableRef,
     search: {
@@ -219,7 +219,7 @@ function InputTable(prop) {
     name: name
   })), rest.label ? /*#__PURE__*/React.createElement(ProFormText, _extends({
     name: textNameProp
-  }, rest), /*#__PURE__*/React.createElement(_Input, {
+  }, rest), /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -232,9 +232,15 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/React.createElement(MoreOutlined, null)),
+    }, /*#__PURE__*/React.createElement(MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      if (readonly) return;
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current6;
@@ -257,7 +263,7 @@ function InputTable(prop) {
     },
     readOnly: readonly,
     allowClear: allowClear
-  })) : /*#__PURE__*/React.createElement(_Input, _extends({
+  }, fieldProps))) : /*#__PURE__*/React.createElement(_Input, _extends({
     suffix: /*#__PURE__*/React.createElement(_Popover, {
       content: /*#__PURE__*/React.createElement("div", {
         style: {
@@ -270,9 +276,15 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/React.createElement(MoreOutlined, null)),
+    }, /*#__PURE__*/React.createElement(MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      if (readonly) return;
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current8;
@@ -299,7 +311,7 @@ function InputTable(prop) {
     readOnly: readonly,
     value: text,
     allowClear: allowClear
-  }, rest === null || rest === void 0 ? void 0 : rest.fieldProps)));
+  }, fieldProps)));
 }
 
 export default InputTable;

package/es/utils/index.d.ts

@@ -82,6 +82,14 @@ export declare const treeEach: (list: any[], fn: (item: any, index: any, list: a
  * @returns 返回符合条件的第一条对象
  */
 export declare const treeFind: (list: any[], key: string, val: any, children?: string) => any;
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+export declare const handleSizeCols: (orgSizeHeader: any[], typeWidth?: number, sizeWidth?: number) => any[];
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/es/utils/index.js

@@ -217,6 +217,99 @@ export var treeFind = function treeFind(list, key, val) {
 
   return item;
 };
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+
+export var handleSizeCols = function handleSizeCols(orgSizeHeader) {
+  var typeWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 120;
+  var sizeWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100;
+  // f1~f100 当所有尺码组都为null时，删除不需要的尺码。
+  var arr = orgSizeHeader.map(function (o) {
+    var _loop = function _loop(key) {
+      if (orgSizeHeader.every(function (item) {
+        return !item['f' + key];
+      })) {
+        delete o['f' + key];
+      }
+    };
+
+    for (var key = 1; key <= 100; key++) {
+      _loop(key);
+    }
+
+    return o;
+  }); // 多表头时找到最底层的表头
+
+  var findNext = function findNext(item) {
+    if (item.children.length) {
+      return findNext(item.children[0]);
+    }
+
+    return item;
+  };
+
+  var headers = []; // 用于保存返回表头
+
+  var header; // 用于保存每个配码的表头信息
+
+  arr.forEach(function (h, i) {
+    // 先处理尺码组
+    header = {
+      dataIndex: 'sizeTypeNo',
+      title: h.sizeTypeNo,
+      width: typeWidth,
+      ellipsis: true
+    }; //当返回多个尺码组时，需要用children支持多表头
+
+    if (arr.length > i + 1) {
+      header.children = [];
+    } // 第一个尺码组，直接添加，第二个之后，加到上一个的children中。
+
+
+    if (i === 0) {
+      headers.push(header);
+    } else {
+      findNext(headers.find(function (o) {
+        return o.dataIndex === 'sizeTypeNo';
+      })).children.push(header);
+    } // 处理 f1~f100
+
+
+    var _loop2 = function _loop2(k) {
+      if (k === 'sizeTypeNo') return "continue";
+      header = {
+        dataIndex: k,
+        title: h[k] || ' ',
+        width: sizeWidth,
+        ellipsis: true
+      };
+
+      if (arr.length > i + 1) {
+        header.children = [];
+      }
+
+      if (i === 0) {
+        headers.push(header);
+      } else {
+        findNext(headers.find(function (o) {
+          return o.dataIndex === k;
+        })).children.push(header);
+      }
+    };
+
+    for (var k in h) {
+      var _ret = _loop2(k);
+
+      if (_ret === "continue") continue;
+    }
+  });
+  return headers;
+};
 export var isDev = location.href.includes("//localhost");
 /** @name 用户信息 */
 

package/lib/components/InputTable.js

@@ -43,7 +43,7 @@ var _icons = require("@ant-design/icons");
 
 var _http = require("../http");
 
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange", "beforeLoad", "afterLoad", "isV2", "allowClear", "keepSelect", "fieldProps"],
     _excluded2 = ["current", "pageSize"];
 
 function InputTable(prop) {
@@ -93,6 +93,7 @@ function InputTable(prop) {
       allowClear = _prop$allowClear === void 0 ? true : _prop$allowClear,
       _prop$keepSelect = prop.keepSelect,
       keepSelect = _prop$keepSelect === void 0 ? false : _prop$keepSelect,
+      fieldProps = prop.fieldProps,
       rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
   var textNameProp = textName || name + '__text';
 
@@ -175,7 +176,6 @@ function InputTable(prop) {
   var tableDom = /*#__PURE__*/_react.default.createElement(_lsProTable.default, (0, _extends2.default)({
     columns: columns,
     request: loadData,
-    rowKey: valueField,
     manualRequest: false,
     actionRef: tableRef,
     search: {
@@ -247,7 +247,7 @@ function InputTable(prop) {
     name: name
   })), rest.label ? /*#__PURE__*/_react.default.createElement(_lsProForm.ProFormText, (0, _extends2.default)({
     name: textNameProp
-  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, {
+  }, rest), /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
     suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
       content: /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -260,9 +260,15 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)),
+    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      if (readonly) return;
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current6;
@@ -285,7 +291,7 @@ function InputTable(prop) {
     },
     readOnly: readonly,
     allowClear: allowClear
-  })) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
+  }, fieldProps))) : /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({
     suffix: /*#__PURE__*/_react.default.createElement(_popover.default, {
       content: /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -298,9 +304,15 @@ function InputTable(prop) {
       trigger: "click",
       visible: visible,
       onVisibleChange: setVisible
-    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, null)),
+    }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
+      onClick: function onClick(e) {
+        setVisible(true);
+        e.stopPropagation && e.stopPropagation();
+      }
+    })),
     onClick: function onClick() {
-      return setVisible(true);
+      if (readonly) return;
+      setVisible(true);
     },
     onInput: function onInput(e) {
       var _formRef$current8;
@@ -327,7 +339,7 @@ function InputTable(prop) {
     readOnly: readonly,
     value: text,
     allowClear: allowClear
-  }, rest === null || rest === void 0 ? void 0 : rest.fieldProps)));
+  }, fieldProps)));
 }
 
 var _default = InputTable;

package/lib/utils/index.d.ts

@@ -82,6 +82,14 @@ export declare const treeEach: (list: any[], fn: (item: any, index: any, list: a
  * @returns 返回符合条件的第一条对象
  */
 export declare const treeFind: (list: any[], key: string, val: any, children?: string) => any;
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+export declare const handleSizeCols: (orgSizeHeader: any[], typeWidth?: number, sizeWidth?: number) => any[];
 export declare const isDev: boolean;
 export declare type UserType = {
     id?: string;

package/lib/utils/index.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "getUrlQuery", {
     return _utils.getUrlQuery;
   }
 });
-exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.getUserName = exports.getUserInfo = void 0;
+exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.isDev = exports.handleSizeCols = exports.getUserName = exports.getUserInfo = void 0;
 Object.defineProperty(exports, "setUrlQuery", {
   enumerable: true,
   get: function get() {
@@ -306,8 +306,104 @@ var treeFind = function treeFind(list, key, val) {
 
   return item;
 };
+/**
+ * 处理普通的尺码横排
+ * @param orgSizeHeader 后端返回的原始尺码组表头
+ * @param typeWidth 尺码组宽 sizeTypeNo，默认120
+ * @param sizeWidth 尺码宽f1~f100， 默认100
+ * @returns 返回已处理好的表头[{dataIndex:sizeTypeNo,title:'国标码',width:120,children[...]},{dataIndex:'f1',...}...]
+ */
+
 
 exports.treeFind = treeFind;
+
+var handleSizeCols = function handleSizeCols(orgSizeHeader) {
+  var typeWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 120;
+  var sizeWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 100;
+  // f1~f100 当所有尺码组都为null时，删除不需要的尺码。
+  var arr = orgSizeHeader.map(function (o) {
+    var _loop = function _loop(key) {
+      if (orgSizeHeader.every(function (item) {
+        return !item['f' + key];
+      })) {
+        delete o['f' + key];
+      }
+    };
+
+    for (var key = 1; key <= 100; key++) {
+      _loop(key);
+    }
+
+    return o;
+  }); // 多表头时找到最底层的表头
+
+  var findNext = function findNext(item) {
+    if (item.children.length) {
+      return findNext(item.children[0]);
+    }
+
+    return item;
+  };
+
+  var headers = []; // 用于保存返回表头
+
+  var header; // 用于保存每个配码的表头信息
+
+  arr.forEach(function (h, i) {
+    // 先处理尺码组
+    header = {
+      dataIndex: 'sizeTypeNo',
+      title: h.sizeTypeNo,
+      width: typeWidth,
+      ellipsis: true
+    }; //当返回多个尺码组时，需要用children支持多表头
+
+    if (arr.length > i + 1) {
+      header.children = [];
+    } // 第一个尺码组，直接添加，第二个之后，加到上一个的children中。
+
+
+    if (i === 0) {
+      headers.push(header);
+    } else {
+      findNext(headers.find(function (o) {
+        return o.dataIndex === 'sizeTypeNo';
+      })).children.push(header);
+    } // 处理 f1~f100
+
+
+    var _loop2 = function _loop2(k) {
+      if (k === 'sizeTypeNo') return "continue";
+      header = {
+        dataIndex: k,
+        title: h[k] || ' ',
+        width: sizeWidth,
+        ellipsis: true
+      };
+
+      if (arr.length > i + 1) {
+        header.children = [];
+      }
+
+      if (i === 0) {
+        headers.push(header);
+      } else {
+        findNext(headers.find(function (o) {
+          return o.dataIndex === k;
+        })).children.push(header);
+      }
+    };
+
+    for (var k in h) {
+      var _ret = _loop2(k);
+
+      if (_ret === "continue") continue;
+    }
+  });
+  return headers;
+};
+
+exports.handleSizeCols = handleSizeCols;
 var isDev = location.href.includes("//localhost");
 /** @name 用户信息 */
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.28",
+  "version": "1.0.31",
   "description": "ls-pro-common",
   "keywords": [
-    "antd",
-    "admin",
+    "antd",  
     "ant-design",
-    "ant-design-pro"
+    "ant-design-pro",
+    "ls-pro-common"
   ],
   "sideEffects": [
     "*.less"
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.25",
+    "ls-pro-table": "2.62.26",
     "ls-pro-form": "1.52.24",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",